Merge remote-tracking branch 'origin/master'

src/views/module_cmms/repairManage/RepairManageList.vue

@@ -214,7 +214,7 @@
           {
             title:'设备名称',
             align:"center",
-            dataIndex: 'equipmentname'
+            dataIndex: 'equipmentid_dictText'
           },
           {
             title:'设备编号',

src/views/module_cmms/spotcheck/modules/SpotcheckForm.vue

@@ -254,6 +254,8 @@
         getAction(`/cmmsSpotcheck/cmmsSpotcheck/getInfoByEquipmentid/${value}`).then((res) => {
           console.log(999,res)
           // this.model = res.result
+          this.model.equipmentcode = res.result.equipmentcode
+          this.model.equipmentname = res.result.equipmentname
           this.model.contentname = res.result.contentname
           this.model.contentcode = res.result.contentcode
           this.model.spotcheckdate = res.result.spotcheckdate
@@ -293,6 +295,8 @@
                 // 下面两句：将带有时分秒的去掉，只传年月日
                 // const time = this.model.spotcheckdate
                 // this.modelWX.faultdate=time.replace(/ \d+(:\d+){2}/,'');
+                this.modelWX.equipmentcode = this.model.equipmentcode
+                this.modelWX.equipmentname = this.model.equipmentname
                 this.modelWX.faultdate = this.model.spotcheckdate
                 this.modelWX.faultdesc = this.model.description
                 this.modelWX.repairname = this.model.repairname

src/views/module_ems/energyAnalyse/meterReadData/index.vue

@@ -167,6 +167,9 @@ export default {
       },
       superFieldList: [],
       dataSource: [],
+      queryParam: {
+        params:{}
+      }
     }
   },
   created() {
@@ -186,8 +189,10 @@ export default {
   methods: {
     onChangeDate(date, dateString){
       console.log(date, dateString);
-      this.queryParam.beginTime= dateString[0]
-      this.queryParam.endTime= dateString[1]
+      // this.queryParam.beginTime= dateString[0]
+      // this.queryParam.endTime= dateString[1]
+      this.queryParam.params.beginTime= dateString[0]
+      this.queryParam.params.endTime= dateString[1]
     },
     // 后端好了需要删掉
     getTest() {