Browse Source

修复各个矩阵重复点击的bug

darker 3 years ago
parent
commit
7cf6f03284

+ 1 - 1
package.json

@@ -18,7 +18,7 @@
     "core-js": "^3.6.5",
     "echarts": "^5.1.1",
     "echarts-gl": "^2.0.4",
-    "element-plus": "^1.1.0-beta.4",
+    "element-plus": "^1.1.0-beta.7",
     "es6-promise": "^4.2.8",
     "file-saver": "^2.0.5",
     "font-awesome": "^4.7.0",

+ 195 - 80
src/views/LightMatrix/LightMatrix.vue

@@ -7,6 +7,24 @@
       <div class="dot right bottom"></div>
       <Row>
         <Col :span="3">
+          <!-- <div class="panel-item-gf">
+            <div class="panel-item-gf-left">
+              <div class="loop"></div>
+              <span class="svg-icon svg-icon-gray svg-icon-md">
+                <SvgIcon svgid="svg-photovoltaic"></SvgIcon>
+              </span>
+            </div>
+            <div
+              class="panel-item-gf-right curStyle"
+              @click="changeShow(panelData.first.category)"
+            >
+              <div class="panel-item-gf-up">接入光伏</div>
+              <div class="panel-item-gf-down">
+                {{ sourceMap[panelData.first.key] || "---" }}
+              </div>
+            </div>
+          </div> -->
+
           <div class="panel-item-gf">
             <div class="panel-item-gf-left">
               <div class="loop"></div>
@@ -14,13 +32,17 @@
                 <SvgIcon svgid="svg-photovoltaic"></SvgIcon>
               </span>
             </div>
-            <div class="panel-item-gf-right curStyle" @click="changeShow(panelData.first.category)">
+            <div
+              class="panel-item-gf-right curStyle"
+              @click="tabChange(panelData.first.category)"
+            >
               <div class="panel-item-gf-up">接入光伏</div>
               <div class="panel-item-gf-down">
                 {{ sourceMap[panelData.first.key] || "---" }}
               </div>
             </div>
           </div>
+
           <!-- <div class="panel-item-gf-new">
             <div class="panel-left">
               <i class="svg-icon svg-icon-write">
@@ -37,14 +59,18 @@
           </div> -->
         </Col>
         <Col :span="3" v-for="(data, index) of panelData.datas" :key="index">
-          <div class="panel-item-new curStyle" :class="data.color" @click="changeShow(data.category,data.fjZT)">
-            <div class="panel-left" >
+          <div
+            class="panel-item-new curStyle"
+            :class="data.color"
+            @click="tabChange(data.category)"
+          >
+            <div class="panel-left">
               <i class="svg-icon" :class="'svg-icon-' + data.color">
                 <SvgIcon :svgid="data.nameIcon"></SvgIcon>
               </i>
               <!-- <span class="text">{{ data.text1 }}</span> -->
             </div>
-            <div class="panel-right" >
+            <div class="panel-right">
               <span class="text">台数</span>
               <span class="value">
                 {{ sourceMap[data.key1] || "---" }}
@@ -77,75 +103,143 @@
             </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="gotoInverter(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="cItem.icon"></SvgIcon>
-                    </span>
+            <div v-for="(cItem, cIndex) in pItem" :key="cIndex">
+              <div
+                class="card"
+                v-if="cItem.fjzt == this.currentFjzt"
+                :class="cItem.color"
+                @click="gotoInverter(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="cItem.icon"></SvgIcon>
+                      </span>
+                    </div>
                   </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-A"></SvgIcon>
-                    </i>
-                    <span>{{ cItem.fdl }}</span>
+                  <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-A"></SvgIcon>
+                      </i>
+                      <span>{{ cItem.fdl }}</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-W"></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-V"></SvgIcon>
+                      </i>
+                      <span>{{ cItem.fs }}</span>
+                    </div>
                   </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-W"></SvgIcon>
-                    </i>
-                    <span>{{ cItem.gl }}</span>
+                </div>
+              </div>
+              <div
+                class="card"
+                v-else-if="this.currentFjzt == 100"
+                :class="cItem.color"
+                @click="gotoInverter(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="cItem.icon"></SvgIcon>
+                      </span>
+                    </div>
                   </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-V"></SvgIcon>
-                    </i>
-                    <span>{{ cItem.fs }}</span>
+                  <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-A"></SvgIcon>
+                      </i>
+                      <span>{{ cItem.fdl }}</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-W"></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-V"></SvgIcon>
+                      </i>
+                      <span>{{ cItem.fs }}</span>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
+
             <!-- 站位用 保证卡片布局最后一行不会有问题 -->
             <i class="blank" v-for="i in pItem.length" :key="i"></i>
           </div>
@@ -181,18 +275,19 @@ export default {
       sourceMap: {}, // 核心数据
       fillCategory: null, // 过滤条件
       fillFjzt: null, // 过滤条件
+      currentFjzt: 100,
       panelData: {
         first: {
           icon: "svg-photovoltaic",
           text: "接入光伏",
           key: "gfjrnum",
-          category:'jrgf_GDC'
+          category: "jrgf_GDC",
         },
         datas: [
           {
             color: "green",
             name: "待机",
-            category:'dj_GDC',
+            category: "dj_GDC",
             fjZT: 0,
             nameIcon: "svg-standby",
             numIcon: "svg-manual",
@@ -204,7 +299,7 @@ export default {
           {
             color: "purple",
             name: "运行",
-            category:'yx_GDC',
+            category: "yx_GDC",
             fjZT: 1,
             nameIcon: "svg-normal-power",
             numIcon: "svg-drop-output",
@@ -216,7 +311,7 @@ export default {
           {
             color: "pink",
             name: "限电",
-            category:'xd_GDC',
+            category: "xd_GDC",
             fjZT: 5,
             nameIcon: "svg-limit-power",
             numIcon: "svg-downtime",
@@ -228,8 +323,8 @@ export default {
           {
             color: "red",
             name: "故障",
-            category:'gz_GDC',
-            fjZT:2,
+            category: "gz_GDC",
+            fjZT: 2,
             nameIcon: "svg-gz-downtime",
             numIcon: "svg-field-involved",
             text1: "故障停机",
@@ -240,7 +335,7 @@ export default {
           {
             color: "orange",
             name: "检修",
-            category:'jx_GDC',
+            category: "jx_GDC",
             fjZT: 4,
             nameIcon: "svg-jx-downtime",
             numIcon: "svg-field-involved",
@@ -252,8 +347,9 @@ export default {
           {
             color: "write",
             name: "受累",
-            category:'sl_GDC',
-            fjZT: 12,
+            category: "sl_GDC",
+            // fjZT: 12,
+            fjZT: 6,
             nameIcon: "svg-intranet-involvement",
             numIcon: "svg-environment",
             text1: "电网",
@@ -264,8 +360,8 @@ export default {
           {
             color: "gray",
             name: "离线",
-            category:'lx_GDC',
-            fjZT:3,
+            category: "lx_GDC",
+            fjZT: 3,
             nameIcon: "svg-offline",
             key: "gflxnum",
             numIcon: "svg-unknown",
@@ -392,7 +488,26 @@ export default {
           return "pink";
       }
     },
-
+    tabChange(category) {
+      let that = this;
+      if (category.includes("jrgf")) {
+        that.currentFjzt = 100;
+      } else if (category.includes("yx")) {
+        that.currentFjzt = 1;
+      } else if (category.includes("dj")) {
+        that.currentFjzt = 0;
+      } else if (category.includes("xd")) {
+        that.currentFjzt = 5;
+      } else if (category.includes("gz")) {
+        that.currentFjzt = 2;
+      } else if (category.includes("jx")) {
+        that.currentFjzt = 4;
+      } else if (category.includes("sl")) {
+        that.currentFjzt = 6;
+      } else if (category.includes("lx")) {
+        that.currentFjzt = 3;
+      }
+    },
     //切换显示种类
     changeShow(category, fjzt, skipFill) {
       if (!skipFill) {
@@ -444,7 +559,7 @@ export default {
         subUrl: "matrix/matrixDetialGfPush",
         success(res) {
           if (res.data) {
-            console.log('resMap:',res)
+            console.log("resMap:", res);
             let sourceMap = res.data;
             for (let key in sourceMap) {
               if (key !== "fczbmap" && key !== "fjmap") {
@@ -1156,7 +1271,7 @@ export default {
       }
     }
   }
-    .curStyle {
+  .curStyle {
     cursor: pointer;
   }
 }

+ 256 - 31
src/views/LightMatrix1/LightMatrix1.vue

@@ -2,7 +2,7 @@
   <div class="light-matrix">
     <Row class="panel-2" type="">
       <Col :span="12" class="left-50-16">
-        <div class="panel">
+        <!-- <div class="panel">
           <div class="dot left top"></div>
           <div class="dot left bottom"></div>
           <div class="dot right top"></div>
@@ -13,19 +13,19 @@
               <SvgIcon svgid="svg-wind-site"></SvgIcon>
             </span>
           </div>
-          <div class="item write" @click="changeShow('jrfj_FDC')">
+          <div class="item write" @click="changeShow('jrfj_FDC')" >
             <div class="curStyle">
               <div>接入风机</div>
               <div>{{ sourceMap.fcjrnum || "---" }}</div>
             </div>
           </div>
-          <div class="item blue" @click="changeShow('yx_FDC', 1)">
+          <div class="item blue"  @click="changeShow('yx_FDC',1)" >
             <div class="curStyle">
               <div>· 运行</div>
               <div>{{ sourceMap.fcyxnum || "---" }}</div>
             </div>
           </div>
-          <div class="item green" @click="changeShow('dj_FDC', 0)">
+          <div class="item green" @click="changeShow('dj_FDC',0)">
             <div class="curStyle">
               <div>· 待机</div>
               <div>{{ sourceMap.fcdjnum || "---" }}</div>
@@ -61,10 +61,70 @@
               <div>{{ sourceMap.fclxnum || "---" }}</div>
             </div>
           </div>
+        </div> -->
+        <div class="panel">
+          <div class="dot left top"></div>
+          <div class="dot left bottom"></div>
+          <div class="dot right top"></div>
+          <div class="dot right bottom"></div>
+          <div class="item">
+            <div class="loop"></div>
+            <span class="svg-icon svg-icon-gray svg-icon-md">
+              <SvgIcon svgid="svg-wind-site"></SvgIcon>
+            </span>
+          </div>
+          <div class="item write" @click="tabChange('jrfj_FDC')">
+            <div class="curStyle">
+              <div>接入风机</div>
+              <div>{{ sourceMap.fcjrnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item blue" @click="tabChange('yx_FDC')">
+            <div class="curStyle">
+              <div>· 运行</div>
+              <div>{{ sourceMap.fcyxnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item green" @click="tabChange('dj_FDC')">
+            <div class="curStyle">
+              <div>· 待机</div>
+              <div>{{ sourceMap.fcdjnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item pink" @click="tabChange('xd_FDC')">
+            <div class="curStyle">
+              <div>· 限电</div>
+              <div>{{ sourceMap.fcxdnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item red" @click="tabChange('gz_FDC')">
+            <div class="curStyle">
+              <div>· 故障</div>
+              <div>{{ sourceMap.fcgznum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item orange" @click="tabChange('jx_FDC')">
+            <div class="curStyle">
+              <div>· 检修</div>
+              <div>{{ sourceMap.fcwhnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item write" @click="tabChange('sl_FDC')">
+            <div class="curStyle">
+              <div>· 受累</div>
+              <div>{{ sourceMap.fcslnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item gray" @click="tabChange('lx_FDC')">
+            <div class="curStyle">
+              <div>· 离线</div>
+              <div>{{ sourceMap.fclxnum || "---" }}</div>
+            </div>
+          </div>
         </div>
       </Col>
       <Col :span="12" class="left-50-16">
-        <div class="panel">
+        <!-- <div class="panel">
           <div class="dot left top"></div>
           <div class="dot left bottom"></div>
           <div class="dot right top"></div>
@@ -126,12 +186,79 @@
               <div>{{ sourceMap.gflxnum || "---" }}</div>
             </div>
           </div>
+        </div> -->
+
+        <div class="panel">
+          <div class="dot left top"></div>
+          <div class="dot left bottom"></div>
+          <div class="dot right top"></div>
+          <div class="dot right bottom"></div>
+          <div class="item">
+            <div class="loop"></div>
+            <span class="svg-icon svg-icon-gray svg-icon-md">
+              <SvgIcon
+                :svgid="'svg-photovoltaic'"
+                style="margin: 3px 0px -3px 1px"
+              ></SvgIcon>
+            </span>
+          </div>
+          <div class="item write" @click="tabChange('jrfj1_GDC')">
+            <div class="curStyle">
+              <div>逆变器</div>
+              <div>{{ sourceMap.gfjrnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item blue" @click="tabChange('yx1_GDC')">
+            <div class="curStyle">
+              <div>· 运行</div>
+              <div>{{ sourceMap.gfyxnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item greenv" @click="tabChange('dj1_GDC')">
+            <div class="curStyle">
+              <div>· 待机</div>
+              <div>{{ sourceMap.gfdjnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item pink" @click="tabChange('xd1_GDC')">
+            <div class="curStyle">
+              <div>· 限电</div>
+              <div>{{ sourceMap.gfxdnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item red" @click="tabChange('gz1_GDC')">
+            <div class="curStyle">
+              <div>· 故障</div>
+              <div>{{ sourceMap.gfgznum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item orange" @click="tabChange('jx1_GDC')">
+            <div class="curStyle">
+              <div>· 检修</div>
+              <div>{{ sourceMap.gfwhnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item write" @click="tabChange('sl1_GDC')">
+            <div class="curStyle">
+              <div>· 受累</div>
+              <div>{{ sourceMap.gfslnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item gray curStyle" @click="tabChange('lx1_GDC')">
+            <div class="curStyle">
+              <div>· 离线</div>
+              <div>{{ sourceMap.gflxnum || "---" }}</div>
+            </div>
+          </div>
         </div>
       </Col>
     </Row>
     <div class="panel-box">
       <div v-for="(pItem, pIndex) in sourceMap.fjmap" :key="pIndex">
-        <div class="panel-title" v-if="sourceMap.fjmap[pIndex][0].wpId.includes('FDC')">
+        <div
+          class="panel-title"
+          v-if="sourceMap.fjmap[pIndex][0].wpId.includes('FDC')"
+        >
           <div class="panel-title-name">
             <i class="svg-icon svg-icon-sm svg-icon-green">
               <SvgIcon :svgid="'svg-wind-site'"></SvgIcon>
@@ -144,15 +271,18 @@
               class="sub-title-item"
               v-for="(fcItem, fcIndex) in fcStateArray"
               :key="fcIndex"
-            > 
-                <span class="sub-title">{{ fcItem.text }}</span>
-                <span class="sub-count" :class="fcItem.color">{{
-                  sourceMap.fczbmap[sourceMap.fjmap[pIndex][0].wpId][fcItem.key]
-                }}</span>
+            >
+              <span class="sub-title">{{ fcItem.text }}</span>
+              <span class="sub-count" :class="fcItem.color">{{
+                sourceMap.fczbmap[sourceMap.fjmap[pIndex][0].wpId][fcItem.key]
+              }}</span>
             </div>
           </div>
         </div>
-        <div class="panel-title" v-if="sourceMap.fjmap[pIndex][0].wpId.includes('GDC')">
+        <div
+          class="panel-title"
+          v-if="sourceMap.fjmap[pIndex][0].wpId.includes('GDC')"
+        >
           <div class="panel-title-name">
             <i class="svg-icon svg-icon-sm svg-icon-green">
               <SvgIcon :svgid="'svg-wind-site'"></SvgIcon>
@@ -165,24 +295,56 @@
               class="sub-title-item"
               v-for="(fcItem, fcIndex) in fcStateArray1"
               :key="fcIndex"
-            > 
-                <span class="sub-title">{{ fcItem.text }}</span>
-                <span class="sub-count" :class="fcItem.color">{{
-                  sourceMap.fczbmap[sourceMap.fjmap[pIndex][0].wpId][fcItem.key]
-                }}</span>
+            >
+              <span class="sub-title">{{ fcItem.text }}</span>
+              <span class="sub-count" :class="fcItem.color">{{
+                sourceMap.fczbmap[sourceMap.fjmap[pIndex][0].wpId][fcItem.key]
+              }}</span>
             </div>
           </div>
         </div>
         <div class="panel-body">
-          <div
-            class="card"
-            v-for="(cItem, cIndex) of pItem"
-            :key="cIndex"
-            v-show="cItem.isShow"
-            :class="cItem.color"
-            @click="goDetails(cItem)"
-          >
-            {{ cItem.wtnum }}
+          <div v-for="(cItem, cIndex) of pItem" :key="cIndex">
+            <!-- <div
+              class="card"
+              :class="cItem.color"
+              v-show="cItem.isShow"
+              @click="goDetails(cItem)"
+            >
+              {{ cItem.wtnum }}
+            </div> -->
+            <div v-if="isFDC">
+              <div
+                class="card"
+                :class="cItem.color"
+                v-if="
+                  cItem.fjzt == this.currentFjzt && cItem.wpId.includes('FDC')
+                "
+                @click="goDetails(cItem)"
+              >
+                {{ cItem.wtnum }}
+              </div>
+            </div>
+            <div v-if="!isFDC">
+              <div
+                class="card"
+                :class="cItem.color"
+                v-if="
+                  cItem.fjzt == this.currentFjzt && cItem.wpId.includes('GDC')
+                "
+                @click="goDetails(cItem)"
+              >
+                {{ cItem.wtnum }}
+              </div>
+            </div>
+            <div
+              class="card"
+              :class="cItem.color"
+              v-if="this.currentFjzt == 100"
+              @click="goDetails(cItem)"
+            >
+              {{ cItem.wtnum }}
+            </div>
           </div>
           <!-- 站位用 保证卡片布局最后一行不会有问题 -->
           <i class="blank" v-for="i in pItem.length" :key="i"></i>
@@ -219,6 +381,8 @@ export default {
       sourceMap: {}, // 核心数据
       fillCategory: null, // 过滤条件
       fillFjzt: null, // 过滤条件
+      currentFjzt: 100,
+      isFDC: false,
       fcStateArray: [
         {
           text: "接入台数",
@@ -397,6 +561,52 @@ export default {
           return "pink";
       }
     },
+    tabChange(category) {
+      let that = this;
+      let fjmap = this.BASE.deepCopy(this.sourceMap.fjmap);
+      //  console.log('fjmap:',fjmap)
+      if (category.includes("FDC")) {
+        that.isFDC = true;
+        if (category.includes("jrfj")) {
+          that.currentFjzt = 100;
+        } else if (category.includes("yx")) {
+          that.currentFjzt = 1;
+        } else if (category.includes("dj")) {
+          that.currentFjzt = 0;
+        } else if (category.includes("xd")) {
+          that.currentFjzt = 5;
+        } else if (category.includes("gz")) {
+          that.currentFjzt = 2;
+        } else if (category.includes("jx")) {
+          that.currentFjzt = 4;
+        } else if (category.includes("sl")) {
+          that.currentFjzt = 6;
+        } else if (category.includes("lx")) {
+          that.currentFjzt = 3;
+        }
+      } else if (category.includes("GDC")) {
+        that.isFDC = false;
+        // console.log(this.sourceMap.fjmap);
+        if (category.includes("jrfj1")) {
+          that.currentFjzt = 100;
+        } else if (category.includes("yx1")) {
+          that.currentFjzt = 1;
+        } else if (category.includes("dj1")) {
+          that.currentFjzt = 0;
+        } else if (category.includes("xd1")) {
+          that.currentFjzt = 5;
+        } else if (category.includes("gz1")) {
+          that.currentFjzt = 2;
+        } else if (category.includes("jx1")) {
+          that.currentFjzt = 4;
+        } else if (category.includes("sl1")) {
+          that.currentFjzt = 6;
+        } else if (category.includes("lx1")) {
+          that.currentFjzt = 3;
+        }
+        console.log("isFdc:", that.isFDC);
+      }
+    },
 
     // 切换显示种类
     changeShow(category, fjzt, skipFill) {
@@ -412,6 +622,7 @@ export default {
           this.fillFjzt = fjzt;
         }
       }
+      // console.log("skipFill:",skipFill)
 
       let fjmap = this.BASE.deepCopy(this.sourceMap.fjmap);
 
@@ -419,23 +630,37 @@ export default {
         // console.log("pele:", pEle);
         pEle.forEach((cEle) => {
           // console.log("cele:", cEle);
-          cEle.isShow = true;
+          // console.log('celeShow:',cEle.isShow)
+          // cEle.isShow = true;
+          cEle.isShow = false;
+          //  console.log('show1:',cEle.isShow)
           if (!this.fillCategory) {
-            cEle.isShow = true;
+            // cEle.isShow = true;
+            cEle.fjzt === fjzt ? (cEle.isShow = true) : (cEle.isShow = false);
+            // console.log("show2:", cEle.isShow);
             // cEle.isShow=false;
           } else if (cEle.wpId.indexOf(category.split("_")[1]) !== -1) {
+            // console.log(cEle.wpId,'===',category.split("_")[1])
             if (isNumber(fjzt)) {
               cEle.fjzt === fjzt ? (cEle.isShow = true) : (cEle.isShow = false);
+              //  cEle.fjzt === fjzt ? (cEle.isShow = true) : '';
+              //  console.log('show3:',cEle.isShow)
             } else {
-              cEle.isShow = true;
-              // cEle.isShow = false;
+              // cEle.isShow = true;
+              // console.log('show4:',cEle.isShow)
+              cEle.isShow = false;
             }
           } else {
-            cEle.isShow = true;
+            //  this.fillCategory == category ? (cEle.isShow = true) : (cEle.isShow = false);
+            // cEle.isShow = true
+            cEle.isShow = false;
           }
         });
+        // console.log(pEle);
       });
+      // console.log(fjmap);
       this.sourceMap.fjmap = fjmap;
+      // console.log('sourceMap:',this.sourceMap.fjmap)
     },
 
     // 请求服务

+ 80 - 10
src/views/LightMatrix2/LightMatrix2.vue

@@ -12,7 +12,7 @@
               <svg-icon svgid="svg-wind-site"></svg-icon>
             </span>
           </div>
-          <div
+          <!-- <div
             class="item curStyle"
             :class="data.color"
             v-for="(data, index) of panel1Data.datas"
@@ -20,6 +20,16 @@
           >
             <div>{{ data.test }}</div>
             <div>{{ sourceMap[data.key] }}</div>
+          </div> -->
+
+            <div
+            class="item curStyle"
+            :class="data.color"
+            v-for="(data, index) of panel1Data.datas"
+            :key="index" @click="tabChange(data.category)"
+          >
+            <div>{{ data.test }}</div>
+            <div>{{ sourceMap[data.key] }}</div>
           </div>
         </div>
       </Col>
@@ -64,11 +74,10 @@
             </div>
           </div>
           <div class="panel-body">
-            <div
-              class="card"
-              v-for="(cItem, cIndex) in pItem"
-              :key="cIndex"
-              v-show="cItem.isShow"
+            <div  v-for="(cItem, cIndex) in pItem"  :key="cIndex">
+               <div
+              class="card"  
+              v-if="cItem.fjzt == this.currentFjzt"
               :class="cItem.color"
               @click="goDetails(cItem)"
             >
@@ -90,6 +99,32 @@
                 <div class="percent" :style="'width: ' + cItem.lyl + '%'"></div>
               </div>
             </div>
+               <div
+              class="card"  
+             v-else-if="this.currentFjzt == 100"
+              :class="cItem.color"
+              @click="goDetails(cItem)"
+            >
+              <div class="card-panel">
+                <div class="card-left">
+                  <div class="tag">{{ cItem.wtnum }}</div>
+                </div>
+                <div class="card-right">
+                  <div class="num">{{ cItem.gl }}&nbsp;kw</div>
+                  <div class="num">{{ cItem.fs }}&nbsp;m/s</div>
+                </div>
+              </div>
+              <div class="card-percent">
+                <div class="split-item"></div>
+                <div class="split-item"></div>
+                <div class="split-item"></div>
+                <div class="split-item"></div>
+                <div class="split-item"></div>
+                <div class="percent" :style="'width: ' + cItem.lyl + '%'"></div>
+              </div>
+            </div>
+            </div>
+           
             <!-- 站位用 保证卡片布局最后一行不会有问题 -->
             <i class="blank" v-for="i in pItem.length" :key="i"></i>
           </div>
@@ -123,6 +158,7 @@ export default {
       sourceMap: {}, // 核心数据
       fillCategory: null, // 过滤条件
       fillFjzt: null, // 过滤条件
+      currentFjzt: 100,
       panel1Data: {
         first: {
           icon: "fa fa-user",
@@ -341,14 +377,36 @@ export default {
         ""
       );
     },
+    tabChange(category){
+       let that = this;
+      //  let fjmap = this.BASE.deepCopy(this.sourceMap.fjmap);
+       if (category.includes("jrfj")) {
+          that.currentFjzt = 100;
+        } else if (category.includes("yx")) {
+          that.currentFjzt = 1;
+        } else if (category.includes("dj")) {
+          that.currentFjzt = 0;
+        } else if (category.includes("xd")) {
+          that.currentFjzt = 5;
+        } else if (category.includes("gz")) {
+          that.currentFjzt = 2;
+        } else if (category.includes("jx")) {
+          that.currentFjzt = 4;
+        } else if (category.includes("sl")) {
+          that.currentFjzt = 6;
+        } else if (category.includes("lx")) {
+          that.currentFjzt = 3;
+        }
+
+    },
 
       // 切换显示种类
     changeShow(category, fjzt, skipFill) {
       if (!skipFill) {
-        console.log('!skipFill:',!skipFill)
+        // console.log('!skipFill:',!skipFill)
         if (this.fillCategory === category) {
-          console.log('fillCategory:',this.fillCategory)
-          console.log('fillFjz:',this.fillFjzt)
+          // console.log('fillCategory:',this.fillCategory)
+          // console.log('fillFjz:',this.fillFjzt)
           this.fillCategory = null;
           this.fillFjzt = null;
         } else {
@@ -364,18 +422,26 @@ export default {
         pEle.forEach((cEle) => {
           // console.log('cele:',cEle)
           cEle.isShow = true;
+          // console.log('show1:',cEle.isShow)
+          //  cEle.isShow = false;
           if (!this.fillCategory) {
             cEle.isShow = true;
+            // console.log('show2:',cEle.isShow)
             // cEle.isShow=false;
           } else if (cEle.wpId.indexOf(category.split("_")[1]) !== -1) {
             if (isNumber(fjzt)) {
               cEle.fjzt === fjzt ? (cEle.isShow = true) : (cEle.isShow = false);
+              // if(cEle.fjzt === fjzt){cEle.isShow = true}
+              
+              // console.log('show3:',cEle.isShow)
             } else {
               cEle.isShow = true;
+              // console.log('show4:',cEle.isShow)
               // cEle.isShow = false;
             }
           } else {
             cEle.isShow = true;
+            // console.log('show5:',cEle.isShow)
           }
         });
       });
@@ -405,10 +471,14 @@ export default {
               }
             }
             that.sourceMap = sourceMap;
-                 console.log('sourceMap:',that.sourceMap)
+                //  console.log('sourceMap:',that.sourceMap)
             if (that.fillCategory) {
+              // console.log('fillcategory:',that.fillCategory)
               that.changeShow(that.fillCategory, that.fillFjzt, true);
             }
+            //    if (that.fillCategory) {
+            //   that.changeShow(that.fillCategory, that.fillFjzt, false);
+            // }
           } else {
             that.sourceMap = {};
           }

+ 285 - 117
src/views/LightMatrix3/LightMatrix3.vue

@@ -13,7 +13,7 @@
               <SvgIcon svgid="svg-wind-site"></SvgIcon>
             </span>
           </div>
-          <div
+          <!-- <div
             class="panel-item-gf-right curStyle"
             @click="changeShow( panelData.first.category)"
           >
@@ -21,6 +21,15 @@
             <div class="panel-item-gf-down">
               {{ sourceMap[panelData.first.key] || "---" }}
             </div>
+          </div> -->
+          <div
+            class="panel-item-gf-right curStyle"
+            @click="tabChange(panelData.first.category)"
+          >
+            <div class="panel-item-gf-up">{{ panelData.first.text }}</div>
+            <div class="panel-item-gf-down">
+              {{ sourceMap[panelData.first.key] || "---" }}
+            </div>
           </div>
         </div>
         <div class="header-info">
@@ -30,7 +39,7 @@
             :key="index"
             :class="data.color"
           >
-            <div
+            <!-- <div
               class="panel-item-left curStyle"
               @click="changeShow(data.category,data.fjZT)"
             >
@@ -43,9 +52,35 @@
                 }}</span>
                 <span v-else>{{ sourceMap[data.key] || "---" }}</span>
               </div>
+            </div> -->
+            <div
+              class="panel-item-left curStyle"
+              @click="tabChange(data.category)"
+            >
+              <div class="panel-item-li">
+                <span>{{ data.name }}</span>
+              </div>
+              <div class="panel-item-li">
+                <span v-if="data.calcStr && sourceMap">{{
+                  calcGfStr(data.calcStr) || "---"
+                }}</span>
+                <span v-else>{{ sourceMap[data.key] || "---" }}</span>
+              </div>
             </div>
             <div class="panel-item-right curStyle">
-              <div class="panel-item-ri" @click="changeShow(data.category1,data.fjZT1)">
+              <!-- <div class="panel-item-ri" @click="changeShow(data.category1,data.fjZT1)">
+                <span>
+                  <i
+                    class="svg-icon svg-icon-sm"
+                    :class="'svg-icon-' + data.color"
+                  >
+                    <SvgIcon :svgid="data.nameIcon"></SvgIcon>
+                  </i>
+                  {{ data.text1 }}</span
+                >
+                <span>{{ sourceMap[data.key1] || "---" }}</span>
+              </div> -->
+              <div class="panel-item-ri" @click="tabChange(data.category1)">
                 <span>
                   <i
                     class="svg-icon svg-icon-sm"
@@ -57,7 +92,8 @@
                 >
                 <span>{{ sourceMap[data.key1] || "---" }}</span>
               </div>
-              <div class="panel-item-ri" @click="changeShow(data.category2,data.fjZT2)">
+
+              <div class="panel-item-ri" @click="tabChange(data.category2)">
                 <span>
                   <i
                     class="svg-icon svg-icon-sm"
@@ -69,6 +105,18 @@
                 </span>
                 <span>{{ sourceMap[data.key2] || "---" }}</span>
               </div>
+              <!-- <div class="panel-item-ri" @click="changeShow(data.category2,data.fjZT2)">
+                <span>
+                  <i
+                    class="svg-icon svg-icon-sm"
+                    :class="'svg-icon-' + data.color"
+                  >
+                    <SvgIcon :svgid="data.numIcon"></SvgIcon>
+                  </i>
+                  {{ data.text2 }}
+                </span>
+                <span>{{ sourceMap[data.key2] || "---" }}</span>
+              </div> -->
             </div>
           </div>
         </div>
@@ -97,77 +145,147 @@
           </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)"
-            >
-              <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 v-for="(cItem, cIndex) in pItem" :key="cIndex">
+              <div
+                class="card"
+                v-if="cItem.fjzt == this.currentFjzt"
+                :class="cItem.color"
+                @click="goDetails(cItem)"
+              >
+                <div class="card-panel">
+                  <div class="card-left">
+                    <div class="tag">{{cItem.fjzt}} {{ 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 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="card"
+                v-else-if="this.currentFjzt == 100"
+                :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-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 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"
@@ -772,6 +890,7 @@ export default {
       sourceMap: {}, // 核心数据
       fillCategory: null, // 过滤条件
       fillFjzt: null, // 过滤条件
+      currentFjzt: 100,
       fjStatus: "all",
       fjArr: [],
       fjNum: 0,
@@ -805,126 +924,126 @@ export default {
           icon: "svg-photovoltaic",
           text: "接入风场",
           key: "fcjrnum",
-          category:'jrfj_FDC'
+          category: "jrfj_FDC",
         },
         datas: [
           {
             color: "green",
             name: "待机",
-            category:'dj_FDC',
+            category: "dj_FDC",
             fjZT: 0,
             nameIcon: "svg-standby",
             calcStr: ["fcdjnum", "fcsdtjnum"],
             numIcon: "svg-manual",
             text1: "待风",
-            category1:'df_FDC',
-            fjZT1:0,
+            category1: "df_FDC",
+            fjZT1: 0,
             key1: "fcdjnum",
             text2: "手动停机",
-            category2:'sd_FDC',
-            fjZT2:1,
+            category2: "sd_FDC",
+            fjZT2: 1,
             key2: "fcsdtjnum",
           },
           {
             color: "blue",
             name: "运行",
-            category:'yx_FDC',
+            category: "yx_FDC",
             fjZT: 2,
             nameIcon: "svg-normal-power",
             calcStr: ["fczcfdnum", "fcqxjclnum"],
             numIcon: "svg-drop-output",
             text1: "正常发电",
-            category1:'zcfd_FDC',
-            fjZT1:2,
+            category1: "zcfd_FDC",
+            fjZT1: 2,
             key1: "fczcfdnum",
             text2: "降出力运行",
-            category2:'jcl_FDC',
-            fjZT2:3,
+            category2: "jcl_FDC",
+            fjZT2: 3,
             key2: "fcqxjclnum",
           },
           {
             color: "pink",
             name: "限电",
-            category:'xd_FDC',
-            fjZT: 5,
+            category: "xd_FDC",
+            fjZT: 4,
             nameIcon: "svg-limit-power",
             calcStr: ["fcxdjclnum", "fcxdtjnum"],
             numIcon: "svg-downtime",
             text1: "限电降出力",
-            category1:'fcxdjcl_FDC',
-            fjZT1:4,
+            category1: "jclxd_FDC",
+            fjZT1: 4,
             key1: "fcxdjclnum",
             text2: "停机",
-            category2:'fcxdtj_FDC',
-            fjZT2:5,
+            category2: "fcxdtj_FDC",
+            fjZT2: 5,
             key2: "fcxdtjnum",
           },
           {
             color: "red",
             name: "故障",
-            category:'gz_FDC',
+            category: "gz_FDC",
             fjZT: 6,
             nameIcon: "svg-gz-downtime",
             calcStr: ["fcgztjnum", "fccnsltjnum"],
             numIcon: "svg-field-involved",
             text1: "故障停机",
-            category1:'fcgztj_FDC',
-            fjZT1:6,
+            category1: "fcgztj_FDC",
+            fjZT1: 6,
             key1: "fcgztjnum",
             text2: "场内受累",
-            category2:'fccnsltj_FDC',
-            fjZT2:7,
+            category2: "fccnsltj_FDC",
+            fjZT2: 7,
             key2: "fccnsltjnum",
           },
           {
             color: "orange",
             name: "检修",
-            category:'jx_FDC',
+            category: "jx_FDC",
             fjZT: 8,
             nameIcon: "svg-jx-downtime",
             calcStr: ["fcjxtjnum", "fccnsljxnum"],
             numIcon: "svg-field-involved",
             text1: "检修停机",
-            category1:'fcjxtj_FDC',
-            fjZT1:8,
+            category1: "fcjxtj_FDC",
+            fjZT1: 8,
             key1: "fcjxtjnum",
             text2: "产内受累",
-            category2:'fccnsljx_FDC',
-            fjZT2:9,
+            category2: "cnsl_FDC",
+            fjZT2: 9,
             key2: "fccnsljxnum",
           },
           {
             color: "write",
             name: "受累",
-            category:'sl_FDC',
+            category: "sl_FDC",
             fjZT: 10,
             calcStr: ["fcdwslnum", "fchjslnum"],
             nameIcon: "svg-intranet-involvement",
             numIcon: "svg-environment",
             text1: "电网",
-            category1:'fcdwsl_FDC',
-            fjZT1:10,
+            category1: "fcdwsl_FDC",
+            fjZT1: 10,
             key1: "fcdwslnum",
             text2: "环境",
-            category2:'fchjsl_FDC',
-            fjZT2:11,
+            category2: "fchjsl_FDC",
+            fjZT2: 11,
             key2: "fchjslnum",
           },
           {
             color: "gray",
             name: "离线",
-            category:'lx_FDC',
-            fjZT:12,
+            category: "lx_FDC",
+            fjZT: 12,
             nameIcon: "svg-offline",
             key: "fclxnum",
             numIcon: "svg-unknown",
             text1: "离线",
-            category1:'fclx_FDC',
-            fjZT1:12,
+            category1: "fclx_FDC",
+            fjZT1: 12,
             key1: "fclxnum",
             text2: "未知",
-            category2:'fcwz_FDC',
-            fjZT2:13,
+            category2: "fcwz_FDC",
+            fjZT2: 13,
             key2: "fcwznum",
           },
         ],
@@ -1057,7 +1176,7 @@ export default {
         case 12: // 离线
           return "gray";
         case 13: // 未知
-          return "gray"
+          return "gray";
       }
       //     switch (fjzt) {
       //   case 0: // 待机
@@ -1103,7 +1222,7 @@ export default {
       //     return "gray";
       //   case 19: // 未知
       //     return "gray";
-          
+
       // }
     },
 
@@ -1119,7 +1238,7 @@ export default {
     //        console.log('pval:',pVal)
     //       let djArr = pVal.filter((v, i, a) => {
     //         return v.fjzt == 0;
-            
+
     //       });
     //       console.log("djArr:", djArr);
     //     //  this.sourceMap.fjmap=djArr;
@@ -1162,21 +1281,70 @@ export default {
     //     console.log("fjarr:", that.fjArr);
     //   }
     // },
-    
+    tabChange(category) {
+      let that = this;
+      if (category.includes("jrfj")) {
+        that.currentFjzt = 100;
+      } else if (category.includes("dj")) {
+        that.currentFjzt = 0;
+      } else if (category.includes("df")) {
+        that.currentFjzt = 0;
+      } else if (category.includes("sd")) {
+        that.currentFjzt = 1;
+      } else if (category.includes("yx")) {
+        that.currentFjzt = 2;
+      } else if (category.includes("zcfd")) {
+        that.currentFjzt = 2;
+      } else if (category.includes("jcl")) {
+        that.currentFjzt = 3;
+      } else if (category.includes("xd")) {
+        that.currentFjzt = 4;
+      } 
+      else if (category.includes("jclxd")) {
+        that.currentFjzt = 4;
+      } 
+      else if (category.includes("fcxdtj")) {
+        that.currentFjzt = 5;
+      } else if (category.includes("gz")) {
+        that.currentFjzt = 6;
+      } else if (category.includes("fcgztj")) {
+        that.currentFjzt = 6;
+      } else if (category.includes("fccnsltj")) {
+        that.currentFjzt = 7;
+      } else if (category.includes("jx")) {
+        that.currentFjzt = 8;
+      } else if (category.includes("fcjxtj")) {
+        that.currentFjzt = 8;
+      } else if (category.includes("cnsl")) {
+        that.currentFjzt = 9;
+      } else if (category.includes("sl")) {
+        that.currentFjzt = 10;
+      } else if (category.includes("fcdwsl")) {
+        that.currentFjzt = 10;
+      } else if (category.includes("fchjsl")) {
+        that.currentFjzt = 11;
+      } else if (category.includes("lx")) {
+        that.currentFjzt = 12;
+      } else if (category.includes("fclx")) {
+        that.currentFjzt = 12;
+      } else if (category.includes("fcwz")) {
+        that.currentFjzt = 13;
+      }
+    },
     //切换显示种类
-     changeShow(category, fjzt, skipFill) {
+    changeShow(category, fjzt, skipFill) {
       if (!skipFill) {
-        console.log('!skipFill:',!skipFill)
+        // console.log("!skipFill:", !skipFill);
         if (this.fillCategory === category) {
-          console.log('fillCategory:',this.fillCategory)
-          console.log('fillFjzt:',this.fillFjzt)
+          // console.log("fillCategory:", this.fillCategory);
+          // console.log("fillFjzt:", 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)
+          console.log("fillCategory:", this.fillCategory);
+          console.log("fillFjz:", this.fillFjzt);
         }
       }
 
@@ -1239,10 +1407,10 @@ export default {
             }
 
             that.sourceMap = sourceMap;
-            console.log('sourceMap:',that.sourceMap)
+            // console.log("sourceMap:", that.sourceMap);
             if (that.fillCategory) {
-              console.log("thatfillcategory:", that.fillCategory);
-               console.log('fillFjzt:',this.fillFjzt)
+              // console.log("thatfillcategory:", that.fillCategory);
+              // console.log("fillFjzt:", this.fillFjzt);
               that.changeShow(that.fillCategory, that.fillFjzt, true);
             }
           } else {