Merge branch 'NanMing' of http://git.cc-lotus.info/sckj/mz-cloud into NanMing

ruoyi-ui/src/utils/xxtj/index.js

@@ -2,6 +2,7 @@ import { exportFile } from "table-xlsx";
 
 // 导出表格
 export function handleExport(source, fileName, title='') {
+  console.log(source);
   let temp = JSON.parse(JSON.stringify(source));
   let columns = [],
     dataSource = temp.vales;
@@ -9,11 +10,14 @@ export function handleExport(source, fileName, title='') {
     item.id = index + 1;
   });
   temp.keys.unshift({ label: "序号", prop: "id", width: 60 });
-  temp.keys.forEach((item) => {
+  temp.keys.forEach((item,index) => {
     columns.push({
       title: item.label,
       dataIndex: item.prop,
-      width: item.width == "" ? 160 : item.width,
+      width:index > 1 ? 180 : 80,
+      render(text, record, index){
+        console.log(text, record, index);
+      },
     });
   });
   exportFile({

ruoyi-ui/src/views/search/xxtj/dwxztj/index.vue

@@ -78,13 +78,11 @@ export default {
     // 接收月日期改变的数据
     changeDateMonth(val) {
       this.queryParams.para4 = val
-      console.log(this.queryParams)
       this.getTableList()
     },
     // 接收年日期改变的数据
     changDateYear(val) {
       this.queryParams.para4 = val
-      console.log(this.queryParams)
       this.getTableList()
     },
     // 多选框改变接收子组件的数据
@@ -107,7 +105,6 @@ export default {
       this.queryParams.para3 = this.activeName2
       this.queryParams.para2 = null
       this.queryParams.para4 = null
-      console.log(this.queryParams)
       this.getTableList()
     },
     // 节点单击事件
@@ -123,13 +120,10 @@ export default {
       this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
       this.loading = false
-      console.log(retdata)
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)
-        console.log(data)
         this.formData = data[0]
         this.keys()
-        console.log(this.formData)
       }
     },
     // vales() {
@@ -199,7 +193,6 @@ export default {
           }
         })
         this.formData.keys = arr
-        console.log(this.formData.keys);
     }
   },
   mounted() {},