调整能耗管理中 实时抄表中显示表的码数

src/views/energy/energy.vue

@@ -151,7 +151,8 @@
               />
               <el-table-column align="center" prop="buildAddress" label="楼栋" />
               <el-table-column align="center" prop="address" label="位置" />
-              <el-table-column align="center" prop="meterPower" :label="table2Type==0?'水(吨)':'电(度)'" />
+              <el-table-column align="center" prop="meterPowerRecord" v-if="table2Type==0" label="水表码数" />
+              <el-table-column align="center" prop="meterPowerRecord" v-if="table2Type==1" label="电表码数" />
               <el-table-column align="center" prop="meterNo" width="130" label="表号" />
               <el-table-column align="center" prop="createTime" width="190" label="通讯时间" />
             </el-table>
@@ -399,7 +400,7 @@ const echarts1 = async () => {
     legend: {
       orient: "horizontal",
       bottom: "15%",
-      left: "27%",
+      left: "28%",
       itemGap: 20,
       itemWidth: 15,
       itemHeight: 15,
@@ -408,7 +409,7 @@ const echarts1 = async () => {
       {
         type: "pie",
         radius: ["40%", "56%"],
-        center: ["35%", "35%"],
+        center: ["35%", "36%"],
         color: ["rgba(67, 181, 244, 1)", "#D4EDFB"],
         hoverAnimation: false,
         startAngle: 70,

src/views/statistic/statistic.vue

@@ -717,30 +717,30 @@ const getAdminId = async () => {
 
 onBeforeMount(async () => {
   api.value = store.state.user.api;
-  // getList();
-  if(store.state.user.gradeId){
-    searchInput.grade=store.state.user.gradeId
-  }
-  if(store.state.user.classId){
-    searchInput.class=store.state.user.classId
-  }
-  if(store.state.user.dateTime){
-    searchInput.createTime=store.state.user.dateTime
-  }
   getAdminId();
-  console.log(
-    store.state.user.classId,
-    store.state.user.gradeId,
-    store.state.user.dateTime,
-    '所传过来的参数'
-  );
+  // getList();
+  // if(store.state.user.gradeId){
+  //   searchInput.grade=store.state.user.gradeId
+  // }
+  // if(store.state.user.classId){
+  //   searchInput.class=store.state.user.classId
+  // }
+  // if(store.state.user.dateTime){
+  //   searchInput.createTime=store.state.user.dateTime
+  // }
+  // console.log(
+  //   store.state.user.classId,
+  //   store.state.user.gradeId,
+  //   store.state.user.dateTime,
+  //   '所传过来的参数'
+  // );
   
 });
 onUnmounted(() => {
   // document.removeEventListener("keyup", Enters);
-  store.state.user.classId=""
-  store.state.user.gradeId=""
-  store.state.user.dateTime=""
+  // store.state.user.classId=""
+  // store.state.user.gradeId=""
+  // store.state.user.dateTime=""
 });
 </script>