1.health5改显示顺序；2.首页改单位名称；3.table3.vue小改，跟table2保持一致；4.sisview最终版；

src/components/coms/table/table3.vue

@@ -16,6 +16,7 @@
       :width="col.width"
       :min-width="col.minWidth"
       :sortable="col.sortable"
+	  :sort-orders="sortOrder"
       :sort-by="col.field + '.count'"
       :show-overflow-tooltip="!col.slot"
       :fixed="col.fixed"
@@ -39,7 +40,7 @@
     v-if="pageable"
     @current-change="handleCurrentChange"
     :current-page="currentPage"
-    :page-size="pageSize"
+    v-modal:page-size="selfPageSize"
     :total="data.total"
     v-bind="elPaggingProps"
   >
@@ -135,6 +136,12 @@ export default {
       if (this.pageable) return this.currentPage * this.pageSize;
       else return this.data.data.length;
     },
+	sortOrder:{
+	  type:Array,
+	  default:()  =>{
+		return ['descending', 'ascending', null]
+	  }
+	}
   },
   // 函数
   methods: {
@@ -157,6 +164,7 @@ export default {
   },
   created() {
     // 创建后
+	this.selfPageSize = this.pageSize
   },
   beforeMount() {
     // 渲染前

src/views/HealthControl/Health5.vue

@@ -72,17 +72,16 @@ export default {
         subUrl: "healthmain/findHealthMatrixMap",
         success(res) {
           if (res.code == 200) {
-            //以下解析顺序不可变
+            that.stationsList.push(res.data.fczbmap.MHS_FDC)
             that.stationsList.push(res.data.fczbmap.NSS_FDC)
-            that.stationsList.push(res.data.fczbmap.XS_FDC)
-            that.stationsList.push(res.data.fczbmap.SBQ_FDC)
             that.stationsList.push(res.data.fczbmap.QS_FDC)
-            that.stationsList.push(res.data.fczbmap.MHS_FDC)
+            that.stationsList.push(res.data.fczbmap.SBQ_FDC)
+            that.stationsList.push(res.data.fczbmap.XS_FDC)
+            that.windturbineList.push(res.data.fjmap[0]) //麻黄山
             that.windturbineList.push(res.data.fjmap[1]) //牛首山
-            that.windturbineList.push(res.data.fjmap[4]) //香山
-            that.windturbineList.push(res.data.fjmap[3]) //石板泉
             that.windturbineList.push(res.data.fjmap[2]) //青山
-            that.windturbineList.push(res.data.fjmap[0]) //麻黄山
+            that.windturbineList.push(res.data.fjmap[3]) //石板泉
+            that.windturbineList.push(res.data.fjmap[4]) //香山
           }
         },
       });

src/views/Home/Home.vue

@@ -188,7 +188,7 @@
                   </td>
                   <td class="value green">
                      <!-- {{ wpId === "0" ? jczbmap.jpeyhl  : gxkmap.nyxxs }} -->
-                    {{ wpId === "0" ? jczbmap.jpeyhl * 10000 : gxkmap.nyxxs }}
+                    {{ wpId === "0" ? jczbmap.jpeyhl : gxkmap.nyxxs }}
                   </td>
                   <!-- <td class="unit gray">
                     {{ wpId === "0" ? "万吨" : "小时" }}
@@ -203,7 +203,7 @@
                   </td>
                   <td class="value green">
                     <!-- {{ wpId === "0" ? jczbmap.jpeyht  : gxkmap.ndxkyss }} -->
-                     {{ wpId === "0" ? (jczbmap.jpeyht * 10000).toFixed(0) : gxkmap.ndxkyss }}
+                     {{ wpId === "0" ? jczbmap.jpeyht : gxkmap.ndxkyss }}
                   </td>
                   <!-- <td class="unit gray">{{ wpId === "0" ? "万吨" : "%" }}</td> -->
                   <td class="unit gray">{{ wpId === "0" ? "吨" : "%" }}</td>
@@ -214,7 +214,7 @@
                   </td>
                   <td class="value green">
                     <!-- {{ wpId === "0" ? jczbmap.jys  : gxkmap.ngzxs }} -->
-                     {{ wpId === "0" ? (jczbmap.jys * 10000).toFixed(0) : gxkmap.ngzxs }}
+                     {{ wpId === "0" ? jczbmap.jys : gxkmap.ngzxs }}
                   </td>
                   <!-- <td class="unit gray">
                     {{ wpId === "0" ? "万吨" : "小时" }}
@@ -229,7 +229,7 @@
                   </td>
                   <td class="value green">
                     <!-- {{ wpId === "0" ? jczbmap.jybm  : gxkmap.ndjxs }} -->
-                      {{ wpId === "0" ? jczbmap.jybm * 10000 : gxkmap.ndjxs }}
+                      {{ wpId === "0" ? jczbmap.jybm : gxkmap.ndjxs }}
                   </td>
                   <!-- <td class="unit gray">
                     {{ wpId === "0" ? "万吨" : "小时" }}

src/views/sisView/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="sisViewBox">
     <div class="viewItem">
-      <clock :width="330" :height="280" />
+      <clock :width="330" :height="300" />
       <div class="viewTitle">综<br /><br />合<br /><br />参<br /><br />数</div>
-      <div class="contentBox" style="height: 280px;">
+      <div class="contentBox" style="height: 300px;">
         <div class="contentItem">
           <div class="itemName size5">装机容量</div>
           <div class="itemNum">{{items.zjrl}}</div>
@@ -363,10 +363,10 @@ export default {
     display: flex;
     justify-content: start;
     align-items: center;
-    margin: 10px 0;
+    margin:15px 0 0 0;
 
     &:first-child {
-      margin: 0 0 10px 0;
+      margin: 0;
     }
 
     .viewTitle {