update

数据查询-导出统一修改

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:
                 # 从数据源开关/默认关闭

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
                 });
             },

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,

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 = [];

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,//工具栏上显示导出按钮