设备列表、电价列表、综合搜索、图表详情优化

src/views/ems/site/powerTariff/index.vue

@@ -105,8 +105,9 @@ export default {
     //获取站点列表
     getZdList(){
       this.searchLoading=true
-      getAllSites().then(response => {
+      return getAllSites().then(response => {
         this.siteList = response?.data || []
+       if( this.siteList.length>0 ) this.siteId = this.siteList[0].siteId
       }).finally(() => {this.searchLoading=false})
     },
     changeDefaultYear(){
@@ -114,7 +115,6 @@ export default {
     },
     getData(reset=false){
       reset && this.resetTableData()
-      console.log('湖区====',reset,this.tableData.length,this.tableTotal,this.pageNum);
       if(!reset && this.tableData.length>=this.tableTotal) return
       this.loading=true;
       const date = new Date(this.defaultYear).getFullYear()
@@ -163,8 +163,10 @@ export default {
   },
   mounted() {
     this.defaultYear = new Date()
-    this.getZdList()
-    this.getData(true)
+    this.loading=true
+    this.getZdList().then(()=>{
+      this.getData(true)
+    })
   }
 }
 </script>

src/views/ems/site/sblb/index.vue

@@ -37,12 +37,12 @@
         label="设备名称">
       </el-table-column>
       <el-table-column
-        prop="deviceType"
-        label="设备类型">
+        prop="categoryName"
+        label="设备类别">
       </el-table-column>
       <el-table-column
         prop="communicationStatus"
-        label="通信状态">
+        label="在线状态">
         <template slot-scope="scope">
           <span>{{$store.state.ems.communicationStatusOptions[scope.row.communicationStatus]}}</span>
         </template>
@@ -251,14 +251,19 @@ export default {
     //获取站点列表
     getZdList(){
       this.searchLoading=true
-      getAllSites().then(response => {
+      return getAllSites().then(response => {
         this.siteList = response?.data || []
+        if(this.siteList.length>0) this.siteId = this.siteList[0].siteId
       }).finally(() => {this.searchLoading=false})
     }
   },
   mounted() {
-    this.onReset()
-    this.getZdList()
+    this.loading=true
+    this.siteId=''
+    this.pageNum =1//每次搜索从1开始搜索
+    this.getZdList().then(()=>{
+      this.getData()
+    })
   }
 }
 </script>