From 639dd5ace98ac2902f0822cdd286c6ef4ce35002 Mon Sep 17 00:00:00 2001 From: Limy <1353020654@qq.com> Date: Thu, 18 Mar 2021 17:11:32 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2-?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application-druid.yml | 4 ++-- .../templates/nanjing/ParaAllShow/ParaAllShow.html | 12 +++++++++--- .../resources/templates/nanjing/Report/Report.html | 6 +++--- .../nanjing/StationParaInfo/StationParaInfo.html | 3 ++- .../WorkTrayHistoryInfo/WorkTrayHistoryInfo.html | 1 + 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 4cd80452..fb5d6bd6 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=FYATJ + url: jdbc:sqlserver://121.36.58.109:1433;SelectMethod=cursor;DatabaseName=SecondNanjing username: sa - password: 123456 + password: haiwei@123 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/ParaAllShow/ParaAllShow.html b/ruoyi-admin/src/main/resources/templates/nanjing/ParaAllShow/ParaAllShow.html index 59eb56e8..240a2f83 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/ParaAllShow/ParaAllShow.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/ParaAllShow/ParaAllShow.html @@ -43,7 +43,7 @@ type: "post", url: prefix + "/paraAllShow", data: formData, - contentType: "application/json;charset=utf-8", + // contentType: "application/json;charset=utf-8", dataType: "json", json: 'callback', processData: false, @@ -93,7 +93,10 @@ search: false, pagination: true, showExport: true,//工具栏上显示导出按钮 - exportDataType: 'all', + exportOptions: { + ignoreColumn: false //忽略第一列和最后一列 + }, + // exportDataType: 'all', columns: columnsArray1 }); @@ -114,7 +117,10 @@ showColumns: false, search: false, pagination: true, - exportDataType: 'all', + exportOptions: { + ignoreColumn: false //忽略第一列和最后一列 + }, + // exportDataType: 'all', columns: columnsArray2 }); }, diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html b/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html index 6727a5cd..e02ee7fc 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html @@ -50,7 +50,7 @@ type: "post", url: ctx + "nanjing/reportData/report", data: formData, - contentType: "application/json;charset=utf-8", + // contentType: "application/json;charset=utf-8", dataType: "json", json: 'callback', processData: false, @@ -100,7 +100,7 @@ exportOptions: { ignoreColumn: false //忽略第一列和最后一列 }, - exportDataType: 'all', + // exportDataType: 'all', fixedColumns: true, fixedNumber: 4, fixedLeftNumber: 4, @@ -159,7 +159,7 @@ type: "post", url: ctx + "nanjing/reportData/export", data: formData, - contentType: "application/json;charset=utf-8", + // contentType: "application/json;charset=utf-8", dataType: "json", json: 'callback', processData: false, diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html b/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html index cdb228be..d4d0fe44 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html @@ -57,12 +57,13 @@ type: "post", url: prefix + "/list", data: formData, - contentType: "application/json;charset=utf-8", + // contentType: "application/json;charset=utf-8", dataType: "json", json: 'callback', processData: false, contentType: false, modalName: "工位参数查询", + showExport: true,//工具栏上显示导出按钮 success: function (json) { console.log(json); var columnsArray1 = []; diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/WorkTrayHistoryInfo.html b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/WorkTrayHistoryInfo.html index 87ca83dc..92a86445 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/WorkTrayHistoryInfo.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/WorkTrayHistoryInfo.html @@ -69,6 +69,7 @@ var options = { url: prefix + "/searchPara", exportUrl: prefix + "/export", + showExport: true,//工具栏上显示导出按钮 modalName: "工位历史生产信息", // datas:formData, showExport: true,//工具栏上显示导出按钮