update

README.md

@@ -1,4 +1,4 @@
-# 三区综合分析系统[sis_zhfx]
+# 三区综合分析系统[hb_sis_zhfx]
 
 * 注：需创建自己的 GIT 分支进行代码开发，开发完调试完毕后再自行合并至主干分支。
 * 关于主题样式的开发，应遵循以下开发提规章：

src/views/specific/fdl.vue

@@ -48,34 +48,37 @@
               cellspacing="0"
             >
               <tbody>
-                      <tr>
+                <tr>
                   <td style="width: 4vh"></td>
                   <template v-for="(x, i) of GsList" :key="i">
                     <td style="width: 3vh">本期</td>
                     <td style="width: 3vh">同期</td>
                   </template>
                 </tr>
-                  <tr v-for="(items,key,index) in stations" :key="index">
-                    <td class="td-item" style="width: 4vh">{{items.name}}</td>
-                    <template v-for="(item, index) of items.children" :key="index">
-                      <td style="width: 3vh">
-                        {{ item.current }}
-                        <template v-if="item.compare === -1">
-                          <span class="svg-icon svg-icon-yellow">
-                            <svg-icon svgid="svg-arrow-dpwn-1" />
-                          </span>
-                        </template>
-                        <template v-if="item.compare === 1">
-                          <span class="svg-icon svg-icon-green">
-                            <svg-icon svgid="svg-arrow-up-1" />
-                          </span>
-                        </template>
-                      </td>
-                      <td style="width: 3vh">
-                        {{ item.sameperiod }}
-                      </td>
-                    </template>
-                  </tr>
+                <tr v-for="(items, key, index) in stations" :key="index">
+                  <td class="td-item" style="width: 4vh">{{ items.name }}</td>
+                  <template
+                    v-for="(item, index) of items.children"
+                    :key="index"
+                  >
+                    <td style="width: 3vh">
+                      {{ item.current }}
+                      <template v-if="item.compare === -1">
+                        <span class="svg-icon svg-icon-yellow">
+                          <svg-icon svgid="svg-arrow-dpwn-1" />
+                        </span>
+                      </template>
+                      <template v-if="item.compare === 1">
+                        <span class="svg-icon svg-icon-green">
+                          <svg-icon svgid="svg-arrow-up-1" />
+                        </span>
+                      </template>
+                    </td>
+                    <td style="width: 3vh">
+                      {{ item.sameperiod }}
+                    </td>
+                  </template>
+                </tr>
                 <!-- <tr>
                   <td style="width: 4vh"></td>
                   <template v-for="(x, i) of MhsLists" :key="i">
@@ -261,7 +264,7 @@ export default {
   },
   data() {
     return {
-       stations:{},
+      stations: {},
       monthData: [],
       MhsLists: [],
       NshList: [],
@@ -349,13 +352,13 @@ export default {
           year: year,
         })
         .then((res) => {
-           let stations = {}
-        let company ={
-          id:'0',
-          name:'公司',
-          children: []
-        }
-              this.list = res.data.map((item) => {
+          let stations = {};
+          let company = {
+            id: "0",
+            name: "公司",
+            children: [],
+          };
+          this.list = res.data.map((item) => {
             for (let key in item) {
               if (!site.includes(key)) {
                 if (this.isNumber(item[key])) {
@@ -366,29 +369,30 @@ export default {
                 }
               }
             }
-          
-            if(item.wpid === "0"){
-              company.children.push(item)
+
+            if (item.wpid === "0") {
+              company.children.push(item);
             }
-            if(!stations[item.wpid] && item.wpid !== "0" ){
+            if (!stations[item.wpid] && item.wpid !== "0") {
               stations[item.wpid] = {
-                id:item.wpid,
-                name:item.wpname||'',
-                children: []
-              }
+                id: item.wpid,
+                name: item.wpname || "",
+                children: [],
+              };
             }
-            stations[item.wpid]?.children.push(item)
+            stations[item.wpid]?.children.push(item);
             if (item.wpid === "0") {
               GsList.push(item);
-            } 
+            }
           });
-          stations.company = company
+          stations.company = company;
           for (const item in stations) {
-            stations[item].children = stations[item].children.sort(this.compare("month"));
+            stations[item].children = stations[item].children.sort(
+              this.compare("month")
+            );
           }
           console.log(stations);
-          this.stations = stations
-
+          this.stations = stations;
 
           this.MhsLists = MhsLists.sort(this.compare("month"));
           this.NshList = NshList.sort(this.compare("month"));

src/views/specific/fnlyl.vue

@@ -34,9 +34,9 @@
           <table style="width: 100%" border="0" cellspacing="0">
             <thead>
               <tr>
-                <th rowspan="2" class="type1" style="width: 4vh"></th>
+                <th rowspan="2" class="type1" style="width: 4vw"></th>
                 <template v-for="m of monthData" :key="m">
-                  <th style="width: 6vh" class="type1" rowspan="2">{{ m }}</th>
+                  <th style="width: 6vw" class="type1" rowspan="2">{{ m }}</th>
                 </template>
               </tr>
             </thead>
@@ -49,16 +49,16 @@
             >
               <tbody>
                 <tr>
-                  <td style="width: 4vh"></td>
+                  <td style="width: 4vw"></td>
                   <template v-for="(x, i) of GsList" :key="i">
-                    <td style="width: 3vh">本期</td>
-                    <td style="width: 3vh">同期</td>
+                    <td style="width: 3vw">本期</td>
+                    <td style="width: 3vw">同期</td>
                   </template>
                 </tr>
                   <tr v-for="(items,key,index) in stations" :key="index">
-                    <td class="td-item" style="width: 4vh">{{items.name}}</td>
+                    <td class="td-item" style="width: 4vw">{{items.name}}</td>
                     <template v-for="(item, index) of items.children" :key="index">
-                      <td style="width: 3vh">
+                      <td style="width: 3vw">
                         {{ item.current }}
                         <template v-if="item.compare === -1">
                           <span class="svg-icon svg-icon-yellow">
@@ -71,7 +71,7 @@
                           </span>
                         </template>
                       </td>
-                      <td style="width: 3vh">
+                      <td style="width: 3vw">
                         {{ item.sameperiod }}
                       </td>
                     </template>
@@ -235,11 +235,11 @@ export default {
   data() {
     return {
       monthData: [],
-      MhsLists: [],
-      NshList: [],
-      QshList: [],
-      SbaqList: [],
-      XshList: [],
+      // MhsLists: [],
+      // NshList: [],
+      // QshList: [],
+      // SbaqList: [],
+      // XshList: [],
       GsList: [],
       units: [],
       stations:{},
@@ -248,7 +248,7 @@ export default {
       pickerOptions: {},
       bardata: { area: [], legend: [], data: [] }, // 损失电量分析echart数值
       lineData: [],
-      timmer: null,
+      // timmer: null,
       monthValue: this.getmonthValue(),
       list: [],
       DayPower: {
@@ -274,8 +274,8 @@ export default {
     // });
   },
   unmounted() {
-    clearInterval(this.timmer);
-    this.timmer = null;
+    // clearInterval(this.timmer);
+    // this.timmer = null;
   },
   mounted() {},
   methods: {
@@ -302,11 +302,11 @@ export default {
       return typeof val === "number" && !isNaN(val);
     },
     getLists(showLoading) {
-      let MhsLists = [];
-      let NshList = [];
-      let QshList = [];
-      let SbaqList = [];
-      let XshList = [];
+      // let MhsLists = [];
+      // let NshList = [];
+      // let QshList = [];
+      // let SbaqList = [];
+      // let XshList = [];
       let GsList = [];
       let _this = this;
       let year = "";
@@ -360,16 +360,16 @@ export default {
           this.stations = stations
 
           
-          this.MhsLists = MhsLists.sort(this.compare("month"));
-          this.NshList = NshList.sort(this.compare("month"));
-          this.QshList = QshList.sort(this.compare("month"));
-          this.SbaqList = SbaqList.sort(this.compare("month"));
-          this.XshList = XshList.sort(this.compare("month"));
+          // this.MhsLists = MhsLists.sort(this.compare("month"));
+          // this.NshList = NshList.sort(this.compare("month"));
+          // this.QshList = QshList.sort(this.compare("month"));
+          // this.SbaqList = SbaqList.sort(this.compare("month"));
+          // this.XshList = XshList.sort(this.compare("month"));
           this.GsList = GsList.sort(this.compare("month"));
 
           let nowCureent = [];
           let sameCureent = [];
-          let monthData = [];
+          // let monthData = [];
           let monthsAll = [];
           this.GsList.map((item) => {
             let objs = {};

src/views/specific/ztfx.vue

@@ -1114,8 +1114,6 @@
                   <th style="width: 105px">同期</th>
                   <th style="width: 105px">当年</th>
                   <th style="width: 105px">同期</th>
-                  <th style="width: 105px">当年</th>
-                  <th style="width: 105px">同期</th>
                 </tr>
               </thead>
             </table>