Merge branch 'sl3' of http://61.161.152.110:10101/r/electronic-map into wsy

src/assets/styles/form.less

@@ -2,7 +2,7 @@
 .main-body {
   .query {
     display: flex;
-    justify-content: space-between;
+    // justify-content: space-between;
 
     &.left {
       justify-content: flex-start;
@@ -79,6 +79,7 @@
 
     .query-actions {
       flex: 0 0 auto;
+      margin-left: 50px;
     }
   }
 

src/components/chart/bar/list-bar-chart2.vue

@@ -322,5 +322,6 @@ export default {
   width: 100%;
   height: 100%;
   display: inline-block;
+  cursor: default;
 }
 </style>

src/components/coms/tabs/tab.vue

@@ -55,7 +55,7 @@ export default {
   font-size: 12px;
   .tab-item {
     padding: 0.37vh 1.852vh;
-    cursor: pointer;
+    cursor: context-menu;
 
     &.active {
       color: @green;

src/views/Decision/Decision2.vue

@@ -2,16 +2,7 @@
 	<div class="decision-page-2">
 		<div class="query mg-b-8">
 			<div class="query-items">
-				<div class="query-item">
-					<div class="lable">场站：</div>
-					<div class="search-input">
-						<el-select v-model="value1" @change="ChangZhanChange(value1)" multiple placeholder="请选择"
-							popper-class="select">
-							<el-option v-for="item in ChangZhan" :key="item.id" :value="item.id" :label="item.name">
-							</el-option>
-						</el-select>
-					</div>
-				</div>
+				
 				<div class="query-item">
 					<div class="lable">项目：</div>
 					<div class="search-input">
@@ -86,7 +77,7 @@
 			</el-row>
 			<div>
 				<panel title="损失电量分析">
-					<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
+					<multiple-bar-chart :height="'calc(100vh - 21.5vh - 500px)'" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
 						:units='["(万KWh)"]' />
 				</panel>
 			</div>
@@ -991,7 +982,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 239px;
+				height: 145px;
 			}
 
 			th,

src/views/Decision/Decision2Cjdb.vue

@@ -60,7 +60,7 @@
 			</el-row>
 			<div>
 				<panel title="损失电量分析">
-					<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
+					<multiple-bar-chart :height="'calc(100vh - 21.3vh - 500px)'" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
 						:units='["(万KWh)"]' />
 				</panel>
 			</div>
@@ -914,7 +914,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 239px;
+				height: 145px;
 			}
 
 			th,

src/views/Decision/Decision2Cndb.vue

@@ -49,7 +49,7 @@
 			<el-row :type="'flex'" class="content">
 				<el-col :span="24" class="pd-l-8">
 					<panel title="损失电量分析">
-						<multiple-bar-chart height="400px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
+						<multiple-bar-chart height="30vh" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
 							:units='["(万KWh)"]' />
 					</panel>
 				</el-col>
@@ -881,7 +881,7 @@
 			overflow: auto;
 
 			tbody {
-				height: calc(100vh - 65vh);
+				height: calc(100vh - 60vh);
 			}
 
 			th,

src/views/Decision/Decision2Xldb.vue

@@ -80,7 +80,7 @@
 			</el-row>
 			<div>
 				<panel title="损失电量分析">
-					<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
+					<multiple-bar-chart :height="'calc(100vh - 21.3vh - 550px)'" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
 						:units='["(万KWh)"]' />
 				</panel>
 			</div>
@@ -1006,7 +1006,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 239px;
+				height: 200px;
 			}
 
 			th,

src/views/Decision/Decision2Xmdb.vue

@@ -70,7 +70,7 @@
 			</el-row>
 			<div>
 				<panel title="损失电量分析">
-					<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
+					<multiple-bar-chart :height="'calc(100vh - 21.3vh - 550px)'" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
 						:units='["(万KWh)"]' />
 				</panel>
 			</div>
@@ -949,7 +949,7 @@
 			overflow: auto;
 
 			tbody {
-				height: 239px;
+				height: 200px;
 			}
 
 			th,

src/views/Decision/Decision3.vue

@@ -49,7 +49,7 @@
 			</div>
 		</div>
 		<!-- 列表 -->
-		<div class="info" v-show="detailShow==1">
+		<div v-show="detailShow==1">
 			<div class="mg-b-16">
 				<div class="project-table">
 					<Table :data="tableData" ref="curRef"></Table>
@@ -91,7 +91,7 @@
 				</el-col>
 			</el-row>
 			<panel title="损失电量分析">
-				<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
+				<multiple-bar-chart :height="'calc(100vh - 21.3vh - 430px)'" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
 					:units='["(万KWh)"]' />
 			</panel>
 		</div>
@@ -1139,38 +1139,6 @@
 				height: calc(100vh - 24.5vh);
 			}
 		}
-		.com-panel {
-			.panel-title {
-				color: @gray-l;
-			}
-
-			.tools {
-				display: flex;
-
-				.tool-block {
-					display: flex;
-					align-items: center;
-					margin-left: 0.741vh;
-
-					.legend {
-						flex: auto;
-						width: 0.741vh;
-						height: 0.741vh;
-						margin-right: 0.741vh;
-
-						&.long {
-							width: 2.963vh;
-							height: 0.37vh;
-						}
-					}
-
-					.legend-text {
-						color: @gray-l;
-						font-size: @fontsize-s;
-					}
-				}
-			}
-		}
 
 		.info {
 			overflow: auto;
@@ -1182,6 +1150,7 @@
 
 			.com-table {
 				tbody {
+					height: 145px;
 					padding-right: 0px;
 				}
 

src/views/Home/Home.vue

@@ -925,7 +925,7 @@ export default {
                 value: [],
               },
               {
-                title: "实时风速",
+                title: "风速",
                 yAxisIndex: 1,
                 value: [],
               },
@@ -1239,7 +1239,7 @@ export default {
           }
 
           .value {
-            text-align: right;
+            text-align: left;
             font-size: 12px;
           }
         }

src/views/Knowledge/Knowledge1.vue

@@ -46,7 +46,7 @@
           </div>
         </div>
       </div>
-      <div class="query-actions" style="margin-right: 800px">
+      <div class="query-actions">
         <button class="btn green" @click="onClickSearch">搜索</button>
       </div>
     </div>

src/views/Knowledge/Knowledge2.vue

@@ -9,7 +9,7 @@
           </div>
         </div>
       </div>
-      <div class="query-actions" style="margin-right: 1500px">
+      <div class="query-actions">
         <button class="btn green" @click="onClickSearch">搜索</button>
       </div>
     </div>

src/views/Knowledge/Knowledge3.vue

@@ -9,7 +9,7 @@
           </div>
         </div>
       </div>
-      <div class="query-actions" style="margin-right: 1500px">
+      <div class="query-actions">
         <button class="btn green" @click="onClickSearch">搜索</button>
       </div>
     </div>

src/views/Knowledge/Knowledge4.vue

@@ -9,7 +9,7 @@
           </div>
         </div>
       </div>
-      <div class="query-actions" style="margin-right: 1500px">
+      <div class="query-actions">
         <button class="btn green" @click="onClickSearch">搜索</button>
       </div>
     </div>

src/views/Knowledge/Knowledge5.vue

@@ -9,7 +9,7 @@
           </div>
         </div>
       </div>
-      <div class="query-actions" style="margin-right: 1500px">
+      <div class="query-actions">
         <button class="btn green" @click="onClickSearch">搜索</button>
       </div>
     </div>

src/views/Knowledge/Knowledge6.vue

@@ -21,7 +21,7 @@
           </div>
         </div>
       </div>
-      <div class="query-actions" style="margin-right: 1500px">
+      <div class="query-actions">
         <button class="btn green" @click="onClickSearch">搜索</button>
       </div>
     </div>

src/views/Knowledge/Knowledge7.vue

@@ -45,7 +45,7 @@
           </div>
         </div>
       </div>
-      <div class="query-actions" style="margin-right: 1000px">
+      <div class="query-actions">
         <button class="btn green" @click="onClickSearch">搜索</button>
       </div>
     </div>

src/views/LightMatrix1/LightMatrix1.vue

@@ -13,37 +13,53 @@
               <SvgIcon svgid="svg-wind-site"></SvgIcon>
             </span>
           </div>
-          <div class="item write curStyle" @click="changeShow('jrfj_FDC')">
-            <div>接入风机</div>
-            <div>{{ sourceMap.fcjrnum || "---" }}</div>
+          <div class="item write" @click="changeShow('jrfj_FDC')">
+            <div class="curStyle">
+              <div>接入风机</div>
+              <div>{{ sourceMap.fcjrnum || "---" }}</div>
+            </div>
           </div>
-          <div class="item blue curStyle" @click="changeShow('yx_FDC', 1)">
-            <div>· 运行</div>
-            <div>{{ sourceMap.fcyxnum || "---" }}</div>
+          <div class="item blue" @click="changeShow('yx_FDC', 1)">
+            <div class="curStyle">
+              <div>· 运行</div>
+              <div>{{ sourceMap.fcyxnum || "---" }}</div>
+            </div>
           </div>
-          <div class="item green curStyle" @click="changeShow('dj_FDC', 0)">
-            <div>· 待机</div>
-            <div>{{ sourceMap.fcdjnum || "---" }}</div>
+          <div class="item green" @click="changeShow('dj_FDC', 0)">
+            <div class="curStyle">
+              <div>· 待机</div>
+              <div>{{ sourceMap.fcdjnum || "---" }}</div>
+            </div>
           </div>
-          <div class="item pink curStyle" @click="changeShow('xd_FDC', 5)">
-            <div>· 限电</div>
-            <div>{{ sourceMap.fcxdnum || "---" }}</div>
+          <div class="item pink" @click="changeShow('xd_FDC', 5)">
+            <div class="curStyle">
+              <div>· 限电</div>
+              <div>{{ sourceMap.fcxdnum || "---" }}</div>
+            </div> 
           </div>
-          <div class="item red curStyle" @click="changeShow('gz_FDC', 2)">
-            <div>· 故障</div>
-            <div>{{ sourceMap.fcgznum || "---" }}</div>
+          <div class="item red" @click="changeShow('gz_FDC', 2)">
+            <div class="curStyle">
+              <div>· 故障</div>
+              <div>{{ sourceMap.fcgznum || "---" }}</div>
+            </div> 
           </div>
-          <div class="item orange curStyle" @click="changeShow('jx_FDC', 4)">
-            <div>· 检修</div>
-            <div>{{ sourceMap.fcwhnum || "---" }}</div>
+          <div class="item orange" @click="changeShow('jx_FDC', 4)">
+            <div class="curStyle">
+              <div>· 检修</div>
+              <div>{{ sourceMap.fcwhnum || "---" }}</div>
+            </div> 
           </div>
-          <div class="item write curStyle" @click="changeShow('sl_FDC', 6)">
-            <div>· 受累</div>
-            <div>{{ sourceMap.fcslnum || "---" }}</div>
+          <div class="item write" @click="changeShow('sl_FDC', 6)">
+            <div class="curStyle">
+              <div>· 受累</div>
+              <div>{{ sourceMap.fcslnum || "---" }}</div>
+            </div> 
           </div>
-          <div class="item gray curStyle" @click="changeShow('lx_FDC', 3)">
-            <div>· 离线</div>
-            <div>{{ sourceMap.fclxnum || "---" }}</div>
+          <div class="item gray" @click="changeShow('lx_FDC', 3)">
+            <div class="curStyle">
+              <div>· 离线</div>
+              <div>{{ sourceMap.fclxnum || "---" }}</div>
+            </div>     
           </div>
         </div>
       </Col>
@@ -62,37 +78,53 @@
               ></SvgIcon>
             </span>
           </div>
-          <div class="item write curStyle" @click="changeShow('jrfj1_GDC')">
-            <div>逆变器</div>
-            <div>{{ sourceMap.gfjrnum || "---" }}</div>
+          <div class="item write" @click="changeShow('jrfj1_GDC')">
+            <div class="curStyle">
+              <div>逆变器</div>
+              <div>{{ sourceMap.gfjrnum || "---" }}</div>
+            </div>     
           </div>
-          <div class="item blue curStyle" @click="changeShow('yx1_GDC', 1)">
-            <div>· 运行</div>
-            <div>{{ sourceMap.gfyxnum || "---" }}</div>
+          <div class="item blue" @click="changeShow('yx1_GDC', 1)">
+            <div class="curStyle">
+              <div>· 运行</div>
+              <div>{{ sourceMap.gfyxnum || "---" }}</div>
+            </div>   
           </div>
-          <div class="item greenv curStyle" @click="changeShow('dj1_GDC', 0)">
-            <div>· 待机</div>
-            <div>{{ sourceMap.gfdjnum || "---" }}</div>
+          <div class="item greenv" @click="changeShow('dj1_GDC', 0)">
+            <div class="curStyle">
+              <div>· 待机</div>
+              <div>{{ sourceMap.gfdjnum || "---" }}</div>
+            </div>   
           </div>
-          <div class="item pink curStyle" @click="changeShow('xd1_GDC', 5)">
-            <div>· 限电</div>
-            <div>{{ sourceMap.gfxdnum || "---" }}</div>
+          <div class="item pink" @click="changeShow('xd1_GDC', 5)">
+            <div class="curStyle">
+              <div>· 限电</div>
+              <div>{{ sourceMap.gfxdnum || "---" }}</div>
+            </div>   
           </div>
-          <div class="item red curStyle" @click="changeShow('gz1_GDC', 2)">
-            <div>· 故障</div>
-            <div>{{ sourceMap.gfgznum || "---" }}</div>
+          <div class="item red" @click="changeShow('gz1_GDC', 2)">
+            <div class="curStyle">
+              <div>· 故障</div>
+              <div>{{ sourceMap.gfgznum || "---" }}</div>
+            </div>   
           </div>
-          <div class="item orange curStyle" @click="changeShow('jx1_GDC', 4)">
-            <div>· 检修</div>
-            <div>{{ sourceMap.gfwhnum || "---" }}</div>
+          <div class="item orange" @click="changeShow('jx1_GDC', 4)">
+            <div class="curStyle">
+              <div>· 检修</div>
+              <div>{{ sourceMap.gfwhnum || "---" }}</div>
+            </div>   
           </div>
-          <div class="item write curStyle" @click="changeShow('sl1_GDC', 6)">
-            <div>· 受累</div>
-            <div>{{ sourceMap.gfslnum || "---" }}</div>
+          <div class="item write" @click="changeShow('sl1_GDC', 6)">
+            <div class="curStyle">
+              <div>· 受累</div>
+              <div>{{ sourceMap.gfslnum || "---" }}</div>
+            </div>     
           </div>
           <div class="item gray curStyle" @click="changeShow('lx1_GDC', 3)">
-            <div>· 离线</div>
-            <div>{{ sourceMap.gflxnum || "---" }}</div>
+            <div class="curStyle">
+              <div>· 离线</div>
+              <div>{{ sourceMap.gflxnum || "---" }}</div>
+            </div>     
           </div>
         </div>
       </Col>

src/views/LightMatrix3/LightMatrix3.vue

@@ -446,6 +446,11 @@ export default {
         },
       });
     },
+	goDetails(item) {
+	  this.$router.push({
+	    path: `/monitor/windsite/info/${item.wpId}/${item.wtId}`,
+	  });
+	},
   },
 
   created() {
@@ -838,6 +843,7 @@ export default {
       }
 
       .card {
+		  cursor: pointer;
         margin-right: 4px;
         margin-top: 4px;
         flex: 1 0 118px;

src/views/Others/table.vue

@@ -0,0 +1,226 @@
+<template>
+  <table class="com-table">
+    <thead>
+      <tr>
+        <th v-for="(col, index) of data.column" :key="index" :class="{ light: col.is_light }" :style="{ width: col.width }" @click="onSort(col)">
+          {{ col.name }}
+        </th>
+      </tr>
+    </thead>
+    <el-scrollbar>
+      <tbody :style="{ height: height }">
+        <tr v-for="(row, index) of tableData" :key="index">
+          <td
+            v-for="(col, i) of data.column"
+            :key="i"
+            :style="{ width: col.width }"
+            :class="{ light: hoverRow == row || hoverCol == col, num: col.is_num, 'always-light': col.is_light || row.is_light }"
+            @mouseenter="hover(row, col)"
+            @mouseleave="leave()"
+          >
+            <component :is="col.type ? col.type : 'span'" v-bind="col.props" v-html="template(col, row[col.field])" @click="onClick(col, row)"> </component>
+          </td>
+        </tr>
+      </tbody>
+    </el-scrollbar>
+    <el-pagination class="mg-t-8" v-if="pageable" @current-change="handleCurrentChange" :current-page="currentPage" :page-size="pageSize" :total="data.total" v-bind="elPaggingProps"> </el-pagination>
+  </table>
+</template>
+
+<script>
+export default {
+  // 名称
+  name: "ComTable",
+  // 使用组件
+  components: {},
+  // 传入参数
+  props: {
+    /**
+             * {
+                    column: [{
+                        name: "风机名称",
+                        field: "name",
+                        type:'div',
+                        width:'', // 宽度
+                        is_num: false, // 是否为数字
+                        is_light: false, // 是否高亮
+                        template:function(){ }
+                        click:function(){} //点击事件
+                        sortable:fasle // 排序
+                        // 新增用于在表格中使用动态三方组件
+                        type:'el-tag', // * 新增 用于传入三方组件名称 实现三方组件引入  component :is 方式实现
+                        props:{}, // * 新增 用户传入三方组件的 props 与type同时使用
+                    },{
+                        name: "冷却风温度",
+                        field: "lqf",
+                        is_num: true,
+                        is_light: false
+                    }],
+                    data: [{
+                        name: "1E01",
+                        lqf: 15.78,
+                        is_light: false
+                    }],
+                    total:200
+                }
+             */
+    data: Object,
+    // hover 样式
+    showHover: {
+      type: Boolean,
+      default: true,
+    },
+    // 列高亮
+    showColHover: {
+      type: Boolean,
+      default: false,
+    },
+    canScroll: {
+      type: Boolean,
+      default: true,
+    },
+    pageSize: {
+      type: Number,
+      default: 0,
+    },
+    height: {
+      type: String,
+      default: "",
+    },
+    // 新增 支持 pagging 组件
+    // elPaggingProps: {
+    //   type: Object,
+    //   default: () => {
+    //     return {
+    //       layout: "total, sizes, prev, pager, next, jumper",
+    //       // "page-sizes": [100, 200, 300, 400],
+    //     };
+    //   },
+    // },
+  },
+  // 自定义事件
+  emits: {
+    // 分页事件
+    // onPagging: null,
+  },
+  // 数据
+  data() {
+    return {
+      hoverRow: -1,
+      hoverCol: -1,
+      sortCol: "",
+      sortType: "",
+      currentPage: 1,
+    };
+  },
+  computed: {
+    tableData() {
+      let that = this;
+      if (this.sortCol == "") {
+        return this.data.data;
+      } else {
+        let data = this.data.data;
+
+        data.sort((a, b) => {
+          let rev = 1;
+          if (that.sortType == "ASC") rev = 1;
+          else if (that.sortType == "DESC") rev = -1;
+
+          if (a[that.sortCol] > b[that.sortCol]) return rev * 1;
+          if (a[that.sortCol] < b[that.sortCol]) return rev * -1;
+          return 0;
+        });
+        return data;
+      }
+    },
+    pageable() {
+      return this.pageSize != 0;
+    },
+    pages() {
+      if (this.pageable) return parseInt(this.data.total / this.pageSize) + 1;
+      else return 0;
+    },
+    startRow() {
+      if (this.pageable) return (this.currentPage - 1) * this.pageSize;
+      else return 0;
+    },
+    endRow() {
+      if (this.pageable) return this.currentPage * this.pageSize;
+      else return this.data.data.length;
+    },
+  },
+  // 函数
+  methods: {
+    clearCheckBox(time){
+      this.$nextTick(()=>{
+        setTimeout(()=>{
+          const domArray = document.querySelectorAll(".curCheckBox");
+          for(let i=0;i<domArray.length;i++){
+            domArray[i].checked=false;
+          }
+        },(time || 300));
+      });
+    },
+    onClick(col, data) {
+      if (col.click) col.click(event, data);
+    },
+    onSort(col) {
+      if (col.sortable == true) {
+        this.sortCol = col.field;
+        switch (this.sortType) {
+          case "":
+            this.sortType = "DESC";
+            break;
+          case "DESC":
+            this.sortType = "ASC";
+            break;
+          case "ASC":
+            this.sortType = "";
+            break;
+        }
+      }
+    },
+    template(col, data) {
+      if (!col.template) return data;
+      else return col.template(data);
+    },
+    hover(row, col) {
+      if (this.showHover) {
+        this.hoverRow = row;
+        if (this.showColHover) this.hoverCol = col;
+      }
+    },
+    leave() {
+      this.hoverRow = -1;
+      this.hoverCol = -1;
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.$emit("onPagging", {
+        pageIndex: this.currentPage,
+        pageSize: this.pageSize,
+        start: this.startRow,
+        end: this.endRow,
+      });
+    },
+  },
+  // 生命周期钩子
+  beforeCreate() {
+    // 创建前
+  },
+  created() {
+    // 创建后
+  },
+  beforeMount() {
+    // 渲染前
+  },
+  mounted() {
+    // 渲染后
+    console.log('tabthis:',this)
+  },
+  beforeUpdate() {},
+  updated() {},
+};
+</script>
+
+<style lang="less"></style>

src/views/WindSite/components/boosterstation/nss.vue

@@ -5,7 +5,7 @@
         <previewPicture>
           <template v-slot:svg>
             <svg
-			  class="svg"
+			        class="svg"
               xmlns="http://www.w3.org/2000/svg"
               xmlns:xlink="http://www.w3.org/1999/xlink"
               version="1.1"

src/views/WindSite/pages/Home/Home.vue

@@ -58,31 +58,31 @@
             </div>
             <div class="situation">
               <row class="icon-status">
-                <div class="status ">
-                  <span class="svg-icon svg-icon-purple">
+                <div class="status">
+                  <span class="svg-icon svg-icon-green">
                     <svg-icon svgid="svg-standby" />
                   </span>
-                  <span class="text purple">
+                  <span class="text green"> 
                     待机
                   </span>
                 </div>
-                <div class="status ">
-                  <span class="svg-icon svg-icon-green">
+                <div class="status">
+                  <span class="svg-icon svg-icon-purple">
                     <svg-icon svgid="svg-normal-power" />
                   </span>
-                  <span class="text green">
+                  <span class="text purple">
                     运行
                   </span>
                 </div>
-                <div class="status ">
+                <div class="status">
                   <span class="svg-icon svg-icon-pink">
-                    <svg-icon svgid="svg-limit-power" style="margin:3px 0.3704vh -3px 0;" />
+                    <svg-icon svgid="svg-limit-power"/>
                   </span>
                   <span class="text pink">
                     限电
                   </span>
                 </div>
-                <div class="status ">
+                <div class="status">
                   <span class="svg-icon svg-icon-red">
                     <svg-icon svgid="svg-gz-downtime" />
                   </span>
@@ -90,7 +90,7 @@
                     故障
                   </span>
                 </div>
-                <div class="status ">
+                <div class="status">
                   <span class="svg-icon svg-icon-orange">
                     <svg-icon svgid="svg-jx-downtime" />
                   </span>
@@ -98,7 +98,7 @@
                     检修
                   </span>
                 </div>
-                <div class="status ">
+                <div class="status">
                   <span class="svg-icon svg-icon-gray">
                     <svg-icon svgid="svg-offline" />
                   </span>
@@ -106,7 +106,7 @@
                     离线
                   </span>
                 </div>
-                <div class="status ">
+                <div class="status">
                   <span class="svg-icon svg-icon-white">
                     <svg-icon svgid="svg-intranet-involvement" />
                   </span>
@@ -117,57 +117,36 @@
               </row>
               <row>
                 <div class="status">
-                  <span class="text gray">
-                    待风
-                  </span>
                   <span class="value">
                     {{ jczbmap.djnum }}
                   </span>
                 </div>
                 <div class="status">
-                  <span class="text gray">
-                    正常出力
-                  </span>
                   <span class="value">
                     {{ jczbmap.zcfdnum }}
                   </span>
                 </div>
                 <div class="status">
-                  <span class="text gray">
-                    降出力
-                  </span>
                   <span class="value">
                     {{ jczbmap.xdjclnum }}
                   </span>
                 </div>
                 <div class="status">
-                  <span class="text gray">
-                    故障停机
-                  </span>
                   <span class="value">
                     {{ jczbmap.gztjnum }}
                   </span>
                 </div>
                 <div class="status">
-                  <span class="text gray">
-                    检修停机
-                  </span>
                   <span class="value">
                     {{ jczbmap.jxtjnum }}
                   </span>
                 </div>
                 <div class="status">
-                  <span class="text gray">
-                    电网
-                  </span>
                   <span class="value">
                     {{ jczbmap.dwslnum }}
                   </span>
                 </div>
                 <div class="status">
-                  <span class="text gray">
-                    离线
-                  </span>
                   <span class="value">
                     {{ jczbmap.lxnum }}
                   </span>
@@ -412,7 +391,7 @@ export default {
         case 0:
           return "green";
         case 1:
-          return "blue";
+          return "purple";
         case 2:
           return "red";
         case 3:
@@ -783,17 +762,19 @@ export default {
       }
 
       .info {
+        width: 60px;
         display: flex;
         flex-direction: column;
         justify-content: center;
 
         .text {
+          text-align: center;
           font-size: 12px;
           margin-bottom: 1.111vh;
         }
 
         .value {
-          text-align: right;
+          text-align: center;
           font-size: 24px;
         }
       }
@@ -809,9 +790,10 @@ export default {
 
       .status {
         flex: 1;
-        width: 75px;
+        // width: 75px;
         display: flex;
-        align-items: center;
+        // align-items: center;
+        justify-content: center;
         padding: 4px 0;
 
         svg {
@@ -826,6 +808,7 @@ export default {
         }
 
         .value {
+          text-align: center;
           font-size: 12px;
           padding-right: 0.741vh;
         }

src/views/specific/ztfx.vue

@@ -1549,22 +1549,22 @@
     <el-row :gutter="20" class="pie-chart-panel">
         <el-col :span="6">
             <panel title="当月理论平衡分析">
-              <dual-pie-chart height="27.296vh" width="500px" :innerData=innerDataCurentsChart :outerData=innerDataCurentsChart />
+              <dual-pie-chart height="27.296vh" :innerData=innerDataCurentsChart :outerData=innerDataCurentsChart />
             </panel>
           </el-col>
           <el-col :span="6">
             <panel title="同期理论平衡分析">
-              <dual-pie-chart height="27.296vh" width="500px" :innerData=innerDataSameChart :outerData=innerDataSameChart />
+              <dual-pie-chart height="27.296vh" :innerData=innerDataSameChart :outerData=innerDataSameChart />
             </panel>
           </el-col>
           <el-col :span="6">
             <panel title="当年理论平衡分析">
-              <dual-pie-chart height="27.296vh" width="500px" :innerData=innerDataCurentsYearChart :outerData=innerDataCurentsYearChart />
+              <dual-pie-chart height="27.296vh" :innerData=innerDataCurentsYearChart :outerData=innerDataCurentsYearChart />
             </panel>
           </el-col>
           <el-col :span="6">
             <panel title="年同期理论平衡分析">
-              <dual-pie-chart height="27.296vh" width="500px" :innerData=innerDataSameYearChart :outerData=innerDataSameYearChart />
+              <dual-pie-chart height="27.296vh" :innerData=innerDataSameYearChart :outerData=innerDataSameYearChart />
             </panel>
           </el-col>
       </el-row>