Merge remote-tracking branch 'origin/master'

psdc-ui/src/views/analyse/nhtj/index.vue

@@ -209,7 +209,15 @@ function getTableFun(){
     "pageNum": currentPage.value,
     "pageSize": pageSize.value
   }).then((res)=>{
+
     total.value = res.total;
+    for(let i in res.rows){
+      if(res.rows[i].monthDate){
+        res.rows[i].monthDate=res.rows[i].monthDate.slice(0,7)
+      }else if(res.rows[i].yearDate){
+        res.rows[i].yearDate=res.rows[i].yearDate.slice(0,4)
+      }
+    }
     dataTable.value = res.rows
     console.log('发电量数据',dataTable.value)
   })

psdc-ui/src/views/system/device/index.vue

@@ -300,7 +300,7 @@ const data = reactive({
   timingList:[],
   queryParams: '',
   queryParams1: {
-    "deviceModel": "温度传感器"
+    "deviceModel": null
   },
   sceneCode:null,
   dateRange:[],
@@ -502,8 +502,9 @@ function cancel2() {
 
 /** 导出按钮操作 */
 function handleExport() {
-  console.log(data.sceneCode)
+  data.queryParams1.deviceModel = data.sceneCode
   proxy.download("system/device/index/daochuDevs",{
+    ...queryParams1.value
   },`device_${new Date().getTime()}.xlsx`);
 };
 /** 新增策略处理 */