Ver código fonte

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

shilin 3 anos atrás
pai
commit
0d9db85abf

+ 9 - 0
src/views/LightMatrix1/LightMatrix1.vue

@@ -303,7 +303,10 @@ export default {
     // 切换显示种类
     changeShow(category, fjzt, skipFill) {
       if (!skipFill) {
+        console.log('!skipFill:',!skipFill)
         if (this.fillCategory === category) {
+          console.log('fillCategory:',this.fillCategory)
+          console.log('fillFjz:',this.fillFjzt)
           this.fillCategory = null;
           this.fillFjzt = null;
         } else {
@@ -315,15 +318,19 @@ export default {
       let fjmap = this.BASE.deepCopy(this.sourceMap.fjmap);
 
       fjmap.forEach((pEle) => {
+        console.log('pele:',pEle)
         pEle.forEach((cEle) => {
+          console.log('cele:',cEle)
           cEle.isShow = true;
           if (!this.fillCategory) {
             cEle.isShow = true;
+            // cEle.isShow=false;
           } else if (cEle.wpId.indexOf(category.split("_")[1]) !== -1) {
             if (isNumber(fjzt)) {
               cEle.fjzt === fjzt ? (cEle.isShow = true) : (cEle.isShow = false);
             } else {
               cEle.isShow = true;
+              // cEle.isShow = false;
             }
           } else {
             cEle.isShow = true;
@@ -342,6 +349,7 @@ export default {
         subUrl: "matrix/matrixPush",
         success(res) {
           if (res) {
+            console.log('resmap:',res)
             let sourceMap = res.data;
             let fjmap = [];
             for (let key in sourceMap) {
@@ -357,6 +365,7 @@ export default {
               }
             }
             that.sourceMap = sourceMap;
+            console.log('sourceMap:',that.sourceMap)
             if (that.fillCategory) {
               that.changeShow(that.fillCategory, that.fillFjzt, true);
             }

+ 743 - 14
src/views/LightMatrix3/LightMatrix3.vue

@@ -13,7 +13,10 @@
               <SvgIcon svgid="svg-wind-site"></SvgIcon>
             </span>
           </div>
-          <div class="panel-item-gf-right">
+          <div
+            class="panel-item-gf-right curStyle"
+            @click="changeShow( panelData.first.category)"
+          >
             <div class="panel-item-gf-up">{{ panelData.first.text }}</div>
             <div class="panel-item-gf-down">
               {{ sourceMap[panelData.first.key] || "---" }}
@@ -27,7 +30,10 @@
             :key="index"
             :class="data.color"
           >
-            <div class="panel-item-left">
+            <div
+              class="panel-item-left curStyle"
+              @click="changeShow(data.category,data.fjZT)"
+            >
               <div class="panel-item-li">
                 <span>{{ data.name }}</span>
               </div>
@@ -38,8 +44,8 @@
                 <span v-else>{{ sourceMap[data.key] || "---" }}</span>
               </div>
             </div>
-            <div class="panel-item-right">
-              <div class="panel-item-ri">
+            <div class="panel-item-right curStyle">
+              <div class="panel-item-ri" @click="changeShow(data.category1,data.fjZT)">
                 <span>
                   <i
                     class="svg-icon svg-icon-sm"
@@ -51,7 +57,7 @@
                 >
                 <span>{{ sourceMap[data.key1] || "---" }}</span>
               </div>
-              <div class="panel-item-ri">
+              <div class="panel-item-ri" @click="changeShow(data.category2,data.fjZT)">
                 <span>
                   <i
                     class="svg-icon svg-icon-sm"
@@ -90,10 +96,12 @@
             </div>
           </div>
           <div class="panel-body">
+            <!-- 接入风机 -->
             <div
               class="card"
               v-for="(cItem, cIndex) in pItem"
               :key="cIndex"
+              v-show="cItem.isShow"
               :class="cItem.color"
               @click="goDetails(cItem)"
             >
@@ -125,10 +133,568 @@
                           : 'svg-icon-white'
                       "
                     >
+                      <SvgIcon svgid="svg-W"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.fs }}</span>
+                  </div>
+
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
+                      <SvgIcon svgid="svg-P"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.gl }}</span>
+                  </div>
+
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
+                      <SvgIcon svgid="svg-R"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.fdjzs.toFixed(2) }}</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <!-- 待机 -->
+            <!-- <div
+              class="card"
+              v-for="(cItem, cIndex) in fjArr"
+              :key="cIndex"
+              :class="cItem.color"
+              @click="goDetails(cItem)"
+            >
+              <div v-if="(fjStatus = 'dj')">
+                <div class="card-panel">
+                  <div class="card-left">
+                    <div class="tag">{{ cItem.wtnum }}</div>
+                    <div class="icon">
+                      <span
+                        class="svg-icon svg-icon-sm"
+                        :class="
+                          cItem.color == 'black'
+                            ? 'svg-icon-black'
+                            : cItem.color == 'gray'
+                            ? 'svg-icon-gray'
+                            : 'svg-icon-write'
+                        "
+                      >
+                        <SvgIcon :svgid="mapping[cItem.color]"></SvgIcon>
+                      </span>
+                    </div>
+                  </div>
+                  <div class="card-right">
+            
+                    <div class="num">
+                      <i
+                        class="svg-icon svg-icon-sm"
+                        :class="
+                          cItem.color != 'red'
+                            ? 'svg-icon-' + cItem.color
+                            : 'svg-icon-white'
+                        "
+                      >
+                        <SvgIcon svgid="svg-W"></SvgIcon>
+                      </i>
+                      <span>{{ cItem.fs }}</span>
+                    </div>
+
+                
+                    <div class="num">
+                      <i
+                        class="svg-icon svg-icon-sm"
+                        :class="
+                          cItem.color != 'red'
+                            ? 'svg-icon-' + cItem.color
+                            : 'svg-icon-white'
+                        "
+                      >
+                        <SvgIcon svgid="svg-P"></SvgIcon>
+                      </i>
+                      <span>{{ cItem.gl }}</span>
+                    </div>
+
+              
+                    <div class="num">
+                      <i
+                        class="svg-icon svg-icon-sm"
+                        :class="
+                          cItem.color != 'red'
+                            ? 'svg-icon-' + cItem.color
+                            : 'svg-icon-white'
+                        "
+                      >
+                        <SvgIcon svgid="svg-R"></SvgIcon>
+                      </i>
+                      <span>{{ cItem.fdjzs.toFixed(2) }}</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div> -->
+            <!-- 运行 -->
+            <!-- <div
+              class="card"
+              v-for="(cItem, cIndex) in fjArr"
+              :key="cIndex"
+              :class="cItem.color"
+              @click="goDetails(cItem)"
+            >
+              <div v-if="fjStatus == 'yx'">
+                <div class="card-panel">
+                  <div class="card-left">
+                    <div class="tag">{{ cItem.wtnum }}</div>
+                    <div class="icon">
+                      <span
+                        class="svg-icon svg-icon-sm"
+                        :class="
+                          cItem.color == 'black'
+                            ? 'svg-icon-black'
+                            : cItem.color == 'gray'
+                            ? 'svg-icon-gray'
+                            : 'svg-icon-write'
+                        "
+                      >
+                        <SvgIcon :svgid="mapping[cItem.color]"></SvgIcon>
+                      </span>
+                    </div>
+                  </div>
+                  <div class="card-right">
+                    <div class="num">
+                      <i
+                        class="svg-icon svg-icon-sm"
+                        :class="
+                          cItem.color != 'red'
+                            ? 'svg-icon-' + cItem.color
+                            : 'svg-icon-white'
+                        "
+                      >
+                        <SvgIcon svgid="svg-W"></SvgIcon>
+                      </i>
+                      <span>{{ cItem.fs }}</span>
+                    </div>
+
+                    <div class="num">
+                      <i
+                        class="svg-icon svg-icon-sm"
+                        :class="
+                          cItem.color != 'red'
+                            ? 'svg-icon-' + cItem.color
+                            : 'svg-icon-white'
+                        "
+                      >
+                        <SvgIcon svgid="svg-P"></SvgIcon>
+                      </i>
+                      <span>{{ cItem.gl }}</span>
+                    </div>
+
+                    <div class="num">
+                      <i
+                        class="svg-icon svg-icon-sm"
+                        :class="
+                          cItem.color != 'red'
+                            ? 'svg-icon-' + cItem.color
+                            : 'svg-icon-white'
+                        "
+                      >
+                        <SvgIcon svgid="svg-R"></SvgIcon>
+                      </i>
+                      <span>{{ cItem.fdjzs.toFixed(2) }}</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div> -->
+
+            <!-- <div
+              class="card"
+              v-for="(cItem, cIndex) in pItem"
+              :key="cIndex"
+              :class="cItem.color"
+              @click="goDetails(cItem)"
+            >
+              <div class="card-panel">
+                <div class="card-left">
+                  <div class="tag">{{ cItem.wtnum }} </div>
+                  <div class="icon">
+                    <span
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color == 'black'
+                          ? 'svg-icon-black'
+                          : cItem.color == 'gray'
+                          ? 'svg-icon-gray'
+                          : 'svg-icon-write'
+                      "
+                    >
+                      <SvgIcon :svgid="mapping[cItem.color]"></SvgIcon>
+                    </span>
+                  </div>
+                </div>
+                <div class="card-right">
+             
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
+                      <SvgIcon svgid="svg-W"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.fs }}</span>
+                  </div>
+
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
+                      <SvgIcon svgid="svg-P"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.gl }}</span>
+                  </div>
+
+            
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
+                      <SvgIcon svgid="svg-R"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.fdjzs.toFixed(2) }}</span>
+                  </div>
+                </div>
+              </div>
+            </div> -->
+
+            <i class="blank" v-for="i in pItem.length" :key="i"></i>
+          </div>
+        </div>
+      </div>
+      <!-- 待机 -->
+      <!-- <div class="panel-box">
+        <div v-for="(pItem, pIndex) in sourceMap.fjmap" :key="pIndex">
+          <div class="panel-title">
+            <div class="panel-title-name">
+              <i class="svg-icon svg-icon-sm svg-icon-green">
+                <SvgIcon :svgid="'svg-wind-site'"></SvgIcon>
+              </i>
+              <span>{{ sourceMap.fczbmap[pItem[pIndex].wpId].name }}</span>
+              <div
+                class="sub-title-item"
+                v-for="(data, index) of tables[0].subTitleDatas"
+                :key="index"
+              >
+                <span class="sub-title">{{ data.text }}</span>
+                <span class="sub-count" :class="data.color">{{
+                  sourceMap.fczbmap[pItem[pIndex].wpId][data.key]
+                }}</span>
+              </div>
+            </div>
+          </div>
+          <div class="panel-body">
+            <div
+              class="card"
+              v-for="(cItem, cIndex) in fjArr"
+              :key="cIndex"
+              :class="cItem.color"
+              @click="goDetails(cItem)"
+            >
+           <div v-if="fjStatus='dj'">
+              <div class="card-panel">
+                <div class="card-left">
+                  <div class="tag">{{ cItem.wtnum }} </div>
+                  <div class="icon">
+                    <span
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color == 'black'
+                          ? 'svg-icon-black'
+                          : cItem.color == 'gray'
+                          ? 'svg-icon-gray'
+                          : 'svg-icon-write'
+                      "
+                    >
+                      <SvgIcon :svgid="mapping[cItem.color]"></SvgIcon>
+                    </span>
+                  </div>
+                </div>
+                <div class="card-right">
+              
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
+                      <SvgIcon svgid="svg-W"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.fs }}</span>
+                  </div>
+
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
+                      <SvgIcon svgid="svg-P"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.gl }}</span>
+                  </div>
+
+                
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
+                      <SvgIcon svgid="svg-R"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.fdjzs.toFixed(2) }}</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            </div>
+             <div
+              class="card"
+              v-for="(cItem, cIndex) in fjArr"
+              :key="cIndex"
+              :class="cItem.color"
+              @click="goDetails(cItem)"
+            >
+            <div v-if="fjStatus='dj'">
+              <div class="card-panel">
+                <div class="card-left">
+                  <div class="tag">{{ cItem.wtnum }} </div>
+                  <div class="icon">
+                    <span
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color == 'black'
+                          ? 'svg-icon-black'
+                          : cItem.color == 'gray'
+                          ? 'svg-icon-gray'
+                          : 'svg-icon-write'
+                      "
+                    >
+                      <SvgIcon :svgid="mapping[cItem.color]"></SvgIcon>
+                    </span>
+                  </div>
+                </div>
+                <div class="card-right">
+            
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
+                      <SvgIcon svgid="svg-W"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.fs }}</span>
+                  </div>
+
+            
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
                       <SvgIcon svgid="svg-P"></SvgIcon>
                     </i>
+                    <span>{{ cItem.gl }}</span>
+                  </div>
+
+       
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
+                      <SvgIcon svgid="svg-R"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.fdjzs.toFixed(2) }}</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            </div>
+         
+            <i class="blank" v-for="i in pItem.length" :key="i"></i>
+          </div>
+        </div>
+      </div> -->
+      <!-- 运行 -->
+      <!-- <div class="panel-box">
+        <div v-for="(pItem, pIndex) in sourceMap.fjmap" :key="pIndex">
+          <div class="panel-title">
+            <div class="panel-title-name">
+              <i class="svg-icon svg-icon-sm svg-icon-green">
+                <SvgIcon :svgid="'svg-wind-site'"></SvgIcon>
+              </i>
+              <span>{{ sourceMap.fczbmap[pItem[pIndex].wpId].name }}</span>
+              <div
+                class="sub-title-item"
+                v-for="(data, index) of tables[0].subTitleDatas"
+                :key="index"
+              >
+                <span class="sub-title">{{ data.text }}</span>
+                <span class="sub-count" :class="data.color">{{
+                  sourceMap.fczbmap[pItem[pIndex].wpId][data.key]
+                }}</span>
+              </div>
+            </div>
+          </div>
+          <div class="panel-body">
+            <div
+              class="card"
+              v-for="(cItem, cIndex) in fjArr"
+              :key="cIndex"
+              :class="cItem.color"
+              @click="goDetails(cItem)"
+            >
+            <div v-if="fjStatus=='yx'">
+              <div class="card-panel">
+                <div class="card-left">
+                  <div class="tag">{{ cItem.wtnum }} </div>
+                  <div class="icon">
+                    <span
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color == 'black'
+                          ? 'svg-icon-black'
+                          : cItem.color == 'gray'
+                          ? 'svg-icon-gray'
+                          : 'svg-icon-write'
+                      "
+                    >
+                      <SvgIcon :svgid="mapping[cItem.color]"></SvgIcon>
+                    </span>
+                  </div>
+                </div>
+                <div class="card-right">
+              
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
+                      <SvgIcon svgid="svg-W"></SvgIcon>
+                    </i>
                     <span>{{ cItem.fs }}</span>
                   </div>
+
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
+                      <SvgIcon svgid="svg-P"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.gl }}</span>
+                  </div>
+
+                
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
+                      <SvgIcon svgid="svg-R"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.fdjzs.toFixed(2) }}</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            </div>
+             <div
+              class="card"
+              v-for="(cItem, cIndex) in fjArr"
+              :key="cIndex"
+              :class="cItem.color"
+              @click="goDetails(cItem)"
+            >
+            <div  v-if="fjStatus=='yx'">
+              <div class="card-panel">
+                <div class="card-left">
+                  <div class="tag">{{ cItem.wtnum }} </div>
+                  <div class="icon">
+                    <span
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color == 'black'
+                          ? 'svg-icon-black'
+                          : cItem.color == 'gray'
+                          ? 'svg-icon-gray'
+                          : 'svg-icon-write'
+                      "
+                    >
+                      <SvgIcon :svgid="mapping[cItem.color]"></SvgIcon>
+                    </span>
+                  </div>
+                </div>
+                <div class="card-right">
+               
                   <div class="num">
                     <i
                       class="svg-icon svg-icon-sm"
@@ -140,8 +706,25 @@
                     >
                       <SvgIcon svgid="svg-W"></SvgIcon>
                     </i>
+                    <span>{{ cItem.fs }}</span>
+                  </div>
+
+         
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      :class="
+                        cItem.color != 'red'
+                          ? 'svg-icon-' + cItem.color
+                          : 'svg-icon-white'
+                      "
+                    >
+                      <SvgIcon svgid="svg-P"></SvgIcon>
+                    </i>
                     <span>{{ cItem.gl }}</span>
                   </div>
+
+          
                   <div class="num">
                     <i
                       class="svg-icon svg-icon-sm"
@@ -158,11 +741,12 @@
                 </div>
               </div>
             </div>
-            <!-- 站位用 保证卡片布局最后一行不会有问题 -->
+            </div>
+          
             <i class="blank" v-for="i in pItem.length" :key="i"></i>
           </div>
         </div>
-      </div>
+      </div> -->
     </el-scrollbar>
   </div>
 </template>
@@ -170,7 +754,7 @@
 <script>
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
 import util from "@/helper/util.js";
-
+import { isNumber } from "util";
 import store from "@store/index.js";
 
 export default {
@@ -186,6 +770,11 @@ export default {
     return {
       timmer: null, // 遮罩开关
       sourceMap: {}, // 核心数据
+      fillCategory: null, // 过滤条件
+      fillFjzt: null, // 过滤条件
+      fjStatus: "all",
+      fjArr: [],
+      fjNum: 0,
       mapping: {
         green: "svg-standby",
         blue: "svg-normal-power",
@@ -200,83 +789,112 @@ export default {
           icon: "svg-photovoltaic",
           text: "接入风场",
           key: "fcjrnum",
+          category:'jrfj_FDC'
         },
         datas: [
           {
             color: "green",
             name: "待机",
+            category:'dj_FDC',
+            fjZT: 0,
             nameIcon: "svg-standby",
             calcStr: ["fcdjnum", "fcsdtjnum"],
             numIcon: "svg-manual",
             text1: "待风",
+            category1:'df_FDC',
             key1: "fcdjnum",
             text2: "手动停机",
+            category2:'sd_FDC',
             key2: "fcsdtjnum",
           },
           {
             color: "blue",
             name: "运行",
+            category:'yx_FDC',
+            fjZT: 2,
             nameIcon: "svg-normal-power",
             calcStr: ["fczcfdnum", "fcqxjclnum"],
             numIcon: "svg-drop-output",
             text1: "正常发电",
+            category1:'zcfd_FDC',
             key1: "fczcfdnum",
             text2: "降出力运行",
+            category2:'jcl_FDC',
             key2: "fcqxjclnum",
           },
           {
             color: "pink",
             name: "限电",
+            category:'xd_FDC',
+            fjZT: 5,
             nameIcon: "svg-limit-power",
             calcStr: ["fcxdjclnum", "fcxdtjnum"],
             numIcon: "svg-downtime",
             text1: "限电降出力",
+            category1:'xdjcl_FDC',
             key1: "fcxdjclnum",
             text2: "停机",
+            category2:'xdtj_FDC',
             key2: "fcxdtjnum",
           },
           {
             color: "red",
             name: "故障",
+            category:'gz_FDC',
+            fjZT: 6,
             nameIcon: "svg-gz-downtime",
             calcStr: ["fcgztjnum", "fccnsltjnum"],
             numIcon: "svg-field-involved",
             text1: "故障停机",
+            category1:'gztj_FDC',
             key1: "fcgztjnum",
             text2: "场内受累",
+            category2:'cnsl1_FDC',
             key2: "fccnsltjnum",
           },
           {
             color: "orange",
             name: "检修",
+            category:'jx_FDC',
+            fjZT: 8,
             nameIcon: "svg-jx-downtime",
             calcStr: ["fcjxtjnum", "fccnsljxnum"],
             numIcon: "svg-field-involved",
             text1: "检修停机",
+            category1:'jxtj_FDC',
             key1: "fcjxtjnum",
             text2: "产内受累",
+            category2:'cnsl2_FDC',
             key2: "fccnsljxnum",
           },
           {
             color: "write",
             name: "受累",
+            category:'sl_FDC',
+            fjZT: 12,
             calcStr: ["fcdwslnum", "fchjslnum"],
             nameIcon: "svg-intranet-involvement",
             numIcon: "svg-environment",
             text1: "电网",
+            category1:'dwsl_FDC',
             key1: "fcdwslnum",
             text2: "环境",
+            category2:'hjsl_FDC',
             key2: "fchjslnum",
           },
           {
             color: "gray",
             name: "离线",
+            category:'lx_FDC',
+            fjZT:3,
             nameIcon: "svg-offline",
             key: "fclxnum",
             numIcon: "svg-unknown",
             text1: "离线",
+            category1:'lx_FDC',
             key1: "fclxnum",
             text2: "未知",
+            category1:'wz_FDC',
             key2: "fcwznum",
           },
         ],
@@ -409,6 +1027,104 @@ export default {
       }
     },
 
+    // // 切换显示种类
+    // changeShow(index){
+    //   console.log('index:',index)
+    //   let fjmap = this.BASE.deepCopy(this.sourceMap.fjmap);
+    //   if(index==-1){
+    //    this.sourceMap.fjmap=fjmap;
+    //   }else if(index==0){
+    //     console.log('fjmap:',fjmap)
+    //       fjmap.forEach((pVal) => {
+    //        console.log('pval:',pVal)
+    //       let djArr = pVal.filter((v, i, a) => {
+    //         return v.fjzt == 0;
+            
+    //       });
+    //       console.log("djArr:", djArr);
+    //     //  this.sourceMap.fjmap=djArr;
+    //     });
+    //   }
+    // },
+
+    // changeShow1(category, fjzt) {
+    //   let that = this;
+    //   console.log("that:", that);
+    //   console.log("category:", category);
+    //   console.log("fjzt:", fjzt);
+    //   if (category == "svg-standby" || fjzt == 0) {
+    //     that.fjStatus = "dj";
+    //     that.fjNum = 0;
+    //     that.sourceMap.fjmap.forEach((pVal) => {
+    //       //  console.log('pval:',pVal)
+    //       let djArr = pVal.filter((v, i, a) => {
+    //         return v.fjzt == 0;
+    //         console.log("v1:", v);
+    //       });
+    //       console.log("djArr:", djArr);
+    //       that.fjArr = djArr;
+    //     });
+    //     console.log("that1:", that);
+    //     console.log("fjarr:", that.fjArr);
+    //   } else if (category == "svg-normal-power" || fjzt == 2) {
+    //     that.fjStatus == "yx";
+    //     that.fjNum = 2;
+    //     that.sourceMap.fjmap.forEach((pVal) => {
+    //       //  console.log('pval:',pVal)
+    //       let yxArr = pVal.filter((v, i, a) => {
+    //         return v.fjzt == 2;
+    //         console.log("v2:", v);
+    //       });
+    //       console.log("yxArr:", yxArr);
+    //       that.fjArr = yxArr;
+    //     });
+    //     console.log("that2:", that);
+    //     console.log("fjarr:", that.fjArr);
+    //   }
+    // },
+    
+    //切换显示种类
+     changeShow(category, fjzt, skipFill) {
+      if (!skipFill) {
+        console.log('!skipFill:',!skipFill)
+        if (this.fillCategory === category) {
+          console.log('fillCategory:',this.fillCategory)
+          console.log('fillFjz:',this.fillFjzt)
+          this.fillCategory = null;
+          this.fillFjzt = null;
+        } else {
+          this.fillCategory = category;
+          this.fillFjzt = fjzt;
+             console.log('fillCategory:',this.fillCategory)
+          console.log('fillFjz:',this.fillFjzt)
+        }
+      }
+
+      let fjmap = this.BASE.deepCopy(this.sourceMap.fjmap);
+
+      fjmap.forEach((pEle) => {
+        console.log('pele:',pEle)
+        pEle.forEach((cEle) => {
+          console.log('cele:',cEle)
+          cEle.isShow = true;
+          if (!this.fillCategory) {
+            cEle.isShow = true;
+            // cEle.isShow=false;
+          } else if (cEle.wpId.indexOf(category.split("_")[1]) !== -1) {
+            if (isNumber(fjzt)) {
+              cEle.fjzt === fjzt ? (cEle.isShow = true) : (cEle.isShow = false);
+            } else {
+              // cEle.isShow = true;
+              cEle.isShow = false;
+            }
+          } else {
+            cEle.isShow = true;
+          }
+        });
+      });
+      this.sourceMap.fjmap = fjmap;
+    },
+
     calcGfStr(calcStr) {
       return (
         parseInt(this.sourceMap[calcStr[0]]) +
@@ -426,6 +1142,7 @@ export default {
         subUrl: "matrix/matrixDetialPush",
         success(res) {
           if (res.data) {
+            //  console.log("resMap:", res);
             let sourceMap = res.data;
             for (let key in sourceMap) {
               if (key !== "fczbmap" && key !== "fjmap") {
@@ -433,24 +1150,31 @@ export default {
               } else if (key === "fjmap") {
                 sourceMap[key].forEach((pItem) => {
                   pItem.forEach((cItem) => {
+                    // console.log('citemfjzt:',cItem.fjzt)
                     cItem.color = that.getColor(cItem.fjzt);
                     cItem.isShow = true;
                   });
                 });
               }
             }
+
             that.sourceMap = sourceMap;
+            // console.log('sourceMap:',that.sourceMap)
+            if (that.fillCategory) {
+              console.log("thatfillcategory:", that.fillCategory);
+              that.changeShow(that.fillCategory, that.fillFjzt, true);
+            }
           } else {
             that.sourceMap = {};
           }
         },
       });
     },
-	goDetails(item) {
-	  this.$router.push({
-	    path: `/monitor/windsite/info/${item.wpId}/${item.wtId}`,
-	  });
-	},
+    goDetails(item) {
+      this.$router.push({
+        path: `/monitor/windsite/info/${item.wpId}/${item.wtId}`,
+      });
+    },
   },
 
   created() {
@@ -741,10 +1465,12 @@ export default {
         color: @write;
 
         .panel-item-left {
+          cursor: pointer;
           background-color: fade(@write, 15%);
         }
 
         .panel-item-right {
+          cursor: pointer;
           .panel-item-ri {
             &:first-child {
               border-color: @write;
@@ -841,7 +1567,7 @@ export default {
       }
 
       .card {
-		  cursor: pointer;
+        cursor: pointer;
         margin-right: 4px;
         margin-top: 4px;
         flex: 1 0 118px;
@@ -1143,5 +1869,8 @@ export default {
       }
     }
   }
+  .curStyle {
+    cursor: pointer;
+  }
 }
 </style>