状态监视的数据修改、各个矩阵的状态切换修改、点击跳转详情的参数修改

src/views/LightMatrix/LightMatrix.vue

@@ -7,24 +7,6 @@
       <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>
@@ -32,17 +14,13 @@
                 <SvgIcon svgid="svg-photovoltaic"></SvgIcon>
               </span>
             </div>
-            <div
-              class="panel-item-gf-right curStyle"
-              @click="tabChange(panelData.first.category)"
-            >
+            <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-new">
             <div class="panel-left">
               <i class="svg-icon svg-icon-write">
@@ -59,18 +37,14 @@
           </div> -->
         </Col>
         <Col :span="3" v-for="(data, index) of panelData.datas" :key="index">
-          <div
-            class="panel-item-new curStyle"
-            :class="data.color"
-            @click="tabChange(data.category)"
-          >
-            <div class="panel-left">
+          <div class="panel-item-new curStyle" :class="data.color" @click="changeShow(data.category,data.fjZT)">
+            <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] || "---" }}
@@ -103,143 +77,75 @@
             </div>
           </div>
           <div class="panel-body">
-            <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 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
+              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>
                 </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 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="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 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>
-
             <!-- 站位用 保证卡片布局最后一行不会有问题 -->
             <i class="blank" v-for="i in pItem.length" :key="i"></i>
           </div>
@@ -275,19 +181,18 @@ 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",
@@ -299,7 +204,7 @@ export default {
           {
             color: "purple",
             name: "运行",
-            category: "yx_GDC",
+            category:'yx_GDC',
             fjZT: 1,
             nameIcon: "svg-normal-power",
             numIcon: "svg-drop-output",
@@ -311,7 +216,7 @@ export default {
           {
             color: "pink",
             name: "限电",
-            category: "xd_GDC",
+            category:'xd_GDC',
             fjZT: 5,
             nameIcon: "svg-limit-power",
             numIcon: "svg-downtime",
@@ -323,8 +228,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: "故障停机",
@@ -335,7 +240,7 @@ export default {
           {
             color: "orange",
             name: "检修",
-            category: "jx_GDC",
+            category:'jx_GDC',
             fjZT: 4,
             nameIcon: "svg-jx-downtime",
             numIcon: "svg-field-involved",
@@ -347,9 +252,8 @@ export default {
           {
             color: "write",
             name: "受累",
-            category: "sl_GDC",
-            // fjZT: 12,
-            fjZT: 6,
+            category:'sl_GDC',
+            fjZT: 12,
             nameIcon: "svg-intranet-involvement",
             numIcon: "svg-environment",
             text1: "电网",
@@ -360,8 +264,8 @@ export default {
           {
             color: "gray",
             name: "离线",
-            category: "lx_GDC",
-            fjZT: 3,
+            category:'lx_GDC',
+            fjZT:3,
             nameIcon: "svg-offline",
             key: "gflxnum",
             numIcon: "svg-unknown",
@@ -488,42 +392,23 @@ 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) {
-        console.log("!skipFill:", !skipFill);
-        if (this.fillCategory === category) {
-          console.log("fillCategory:", this.fillCategory);
-          console.log("fillFjzt:", this.fillFjzt);
-          this.fillCategory = null;
-          this.fillFjzt = null;
-        } else {
+      // if (!skipFill) {
+      //   console.log("!skipFill:", !skipFill);
+      //   if (this.fillCategory === category) {
+      //     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);
+      //   }
+      // }
 
       let fjmap = this.BASE.deepCopy(this.sourceMap.fjmap);
 
@@ -559,7 +444,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") {
@@ -1271,7 +1156,7 @@ export default {
       }
     }
   }
-  .curStyle {
+    .curStyle {
     cursor: pointer;
   }
 }

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,70 +61,10 @@
               <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>
@@ -186,79 +126,12 @@
               <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>
@@ -271,18 +144,15 @@
               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>
@@ -295,56 +165,24 @@
               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 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
+            class="card"
+            v-for="(cItem, cIndex) of pItem"
+            :key="cIndex"
+            v-show="cItem.isShow"
+            :class="cItem.color"
+            @click="goDetails(cItem)"
+          >
+            {{ cItem.wtnum }}
           </div>
           <!-- 站位用 保证卡片布局最后一行不会有问题 -->
           <i class="blank" v-for="i in pItem.length" :key="i"></i>
@@ -381,8 +219,6 @@ export default {
       sourceMap: {}, // 核心数据
       fillCategory: null, // 过滤条件
       fillFjzt: null, // 过滤条件
-      currentFjzt: 100,
-      isFDC: false,
       fcStateArray: [
         {
           text: "接入台数",
@@ -502,7 +338,7 @@ export default {
           key: "lxts",
         },
         {
-          text: "光照强度",
+          text: "日照强度",
           color: "gray",
           key: "ssfs",
         },
@@ -561,106 +397,45 @@ 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) {
-      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 {
+      // 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("skipFill:",skipFill)
+      //   }
+      // }
 
       let fjmap = this.BASE.deepCopy(this.sourceMap.fjmap);
 
       fjmap.forEach((pEle) => {
-        // console.log("pele:", pEle);
+        console.log("pele:", pEle);
         pEle.forEach((cEle) => {
-          // console.log("cele:", cEle);
-          // console.log('celeShow:',cEle.isShow)
-          // cEle.isShow = true;
-          cEle.isShow = false;
-          //  console.log('show1:',cEle.isShow)
+          console.log("cele:", cEle);
+          cEle.isShow = true;
           if (!this.fillCategory) {
-            // cEle.isShow = true;
-            cEle.fjzt === fjzt ? (cEle.isShow = true) : (cEle.isShow = false);
-            // console.log("show2:", cEle.isShow);
+            cEle.isShow = true;
             // 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;
-              // console.log('show4:',cEle.isShow)
-              cEle.isShow = false;
+              cEle.isShow = true;
+              // cEle.isShow = false;
             }
           } else {
-            //  this.fillCategory == category ? (cEle.isShow = true) : (cEle.isShow = false);
-            // cEle.isShow = true
-            cEle.isShow = false;
+            cEle.isShow = true;
           }
         });
-        // console.log(pEle);
       });
-      // console.log(fjmap);
       this.sourceMap.fjmap = fjmap;
-      // console.log('sourceMap:',this.sourceMap.fjmap)
     },
 
     // 请求服务
@@ -672,7 +447,7 @@ export default {
         subUrl: "matrix/matrixPush",
         success(res) {
           if (res) {
-            // console.log("resmap:", res);
+            console.log("resmap:", res);
             let sourceMap = res.data;
             let fjmap = [];
             for (let key in sourceMap) {
@@ -688,7 +463,7 @@ export default {
               }
             }
             that.sourceMap = sourceMap;
-            // console.log("sourceMap:", that.sourceMap);
+            console.log("sourceMap:", that.sourceMap);
             if (that.fillCategory) {
               that.changeShow(that.fillCategory, that.fillFjzt, true);
             }

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,16 +20,6 @@
           >
             <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>
@@ -74,34 +64,11 @@
             </div>
           </div>
           <div class="panel-body">
-            <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.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
-              class="card"  
-             v-else-if="this.currentFjzt == 100"
+            <div
+              class="card"
+              v-for="(cItem, cIndex) in pItem"
+              :key="cIndex"
+              v-show="cItem.isShow"
               :class="cItem.color"
               @click="goDetails(cItem)"
             >
@@ -123,8 +90,6 @@
                 <div class="percent" :style="'width: ' + cItem.lyl + '%'"></div>
               </div>
             </div>
-            </div>
-           
             <!-- 站位用 保证卡片布局最后一行不会有问题 -->
             <i class="blank" v-for="i in pItem.length" :key="i"></i>
           </div>
@@ -158,7 +123,6 @@ export default {
       sourceMap: {}, // 核心数据
       fillCategory: null, // 过滤条件
       fillFjzt: null, // 过滤条件
-      currentFjzt: 100,
       panel1Data: {
         first: {
           icon: "fa fa-user",
@@ -377,43 +341,21 @@ 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)
-        if (this.fillCategory === category) {
-          // console.log('fillCategory:',this.fillCategory)
-          // console.log('fillFjz:',this.fillFjzt)
-          this.fillCategory = null;
-          this.fillFjzt = null;
-        } else {
+      // 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;
-        }
-      }
+      //   }
+      // }
 
       let fjmap = this.BASE.deepCopy(this.sourceMap.fjmap);
 
@@ -422,26 +364,18 @@ 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)
           }
         });
       });
@@ -471,14 +405,10 @@ 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 = {};
           }

src/views/LightMatrix3/LightMatrix3.vue

@@ -13,18 +13,9 @@
               <SvgIcon svgid="svg-wind-site"></SvgIcon>
             </span>
           </div>
-          <!-- <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] || "---" }}
-            </div>
-          </div> -->
           <div
             class="panel-item-gf-right curStyle"
-            @click="tabChange(panelData.first.category)"
+            @click="changeShow( panelData.first.category)"
           >
             <div class="panel-item-gf-up">{{ panelData.first.text }}</div>
             <div class="panel-item-gf-down">
@@ -39,23 +30,9 @@
             :key="index"
             :class="data.color"
           >
-            <!-- <div
-              class="panel-item-left curStyle"
-              @click="changeShow(data.category,data.fjZT)"
-            >
-              <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-left curStyle"
-              @click="tabChange(data.category)"
+              @click="changeShow(data.category,data.fjZT)"
             >
               <div class="panel-item-li">
                 <span>{{ data.name }}</span>
@@ -68,19 +45,7 @@
               </div>
             </div>
             <div class="panel-item-right curStyle">
-              <!-- <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)">
+              <div class="panel-item-ri" @click="changeShow(data.category1,data.fjZT1)">
                 <span>
                   <i
                     class="svg-icon svg-icon-sm"
@@ -92,8 +57,7 @@
                 >
                 <span>{{ sourceMap[data.key1] || "---" }}</span>
               </div>
-
-              <div class="panel-item-ri" @click="tabChange(data.category2)">
+              <div class="panel-item-ri" @click="changeShow(data.category2,data.fjZT2)">
                 <span>
                   <i
                     class="svg-icon svg-icon-sm"
@@ -105,18 +69,6 @@
                 </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>
@@ -145,147 +97,77 @@
           </div>
           <div class="panel-body">
             <!-- 接入风机 -->
-            <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
+              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>
                 </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 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 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-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>
+                  <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"
@@ -890,7 +772,6 @@ export default {
       sourceMap: {}, // 核心数据
       fillCategory: null, // 过滤条件
       fillFjzt: null, // 过滤条件
-      currentFjzt: 100,
       fjStatus: "all",
       fjArr: [],
       fjNum: 0,
@@ -924,126 +805,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: 4,
+            category:'xd_FDC',
+            fjZT: 5,
             nameIcon: "svg-limit-power",
             calcStr: ["fcxdjclnum", "fcxdtjnum"],
             numIcon: "svg-downtime",
             text1: "限电降出力",
-            category1: "jclxd_FDC",
-            fjZT1: 4,
+            category1:'fcxdjcl_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: "cnsl_FDC",
-            fjZT2: 9,
+            category2:'fccnsljx_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",
           },
         ],
@@ -1176,7 +1057,7 @@ export default {
         case 12: // 离线
           return "gray";
         case 13: // 未知
-          return "gray";
+          return "gray"
       }
       //     switch (fjzt) {
       //   case 0: // 待机
@@ -1222,7 +1103,7 @@ export default {
       //     return "gray";
       //   case 19: // 未知
       //     return "gray";
-
+          
       // }
     },
 
@@ -1238,7 +1119,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;
@@ -1281,72 +1162,23 @@ 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) {
-      if (!skipFill) {
-        // console.log("!skipFill:", !skipFill);
-        if (this.fillCategory === category) {
-          // console.log("fillCategory:", this.fillCategory);
-          // console.log("fillFjzt:", this.fillFjzt);
-          this.fillCategory = null;
-          this.fillFjzt = null;
-        } else {
+     changeShow(category, fjzt, skipFill) {
+      // if (!skipFill) {
+        // console.log('!skipFill:',!skipFill)
+        // if (this.fillCategory === category) {
+        //   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)
+        // }
+      // }
 
       let fjmap = this.BASE.deepCopy(this.sourceMap.fjmap);
 
@@ -1407,10 +1239,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 {

src/views/Others/index.vue

@@ -1,115 +1,69 @@
 <template>
   <div class="swiperBox">
-    <el-carousel
-      style="width: 100%; margin: 5vh 0"
-      trigger="click"
-      type="card"
-      height="80vh"
-      :autoplay="false"
-      indicator-position="none"
-      :initial-index="1"
-      arrow="none"
-      @change="changeSwiper"
-    >
+    <el-carousel style="width: 100%; margin: 5vh 0" trigger="click" type="card" height="80vh" :autoplay="false" indicator-position="none" :initial-index="1" arrow="none" @change="changeSwiper">
       <!-- card-1 -->
       <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
           <p class="itemTitle">
-            原始数据查询
-            <i
-              class="itemMoreBtn el-icon-more"
-              @click="jumpUrl('/realSearch')"
-            ></i>
+            记录查询
           </p>
           <div class="df-table">
-            <ComTable height="30vh" :data="tableData1" :pageSize="20" >
-            </ComTable>
-             <ComTable height="30vh" :data="tableData2" :pageSize="20">
-            </ComTable>
-          </div>
-          <!-- <div class="imageBox">
-            <div class="imgItem" @click="jumpUrl('/realSearch')">
-              <el-image class="img" src="./static/img/oa日报.png" fit="fill" />
-              <p class="imgTitle">测点数据查询</p>
+            <div class="sjcx-item" v-for="item in earlyAlarmColumn" :key="item" @click="jumpUrl(item.url)">
+              <div class="sjcx-name">{{item.name}}</div>
+              <div class="sjcx-value">{{earlyAlarmData[item.key] || '0'}}</div>
             </div>
-            <div class="imgItem" @click="jumpUrl('/historySearch')">
-              <el-image
-                class="img"
-                src="./static/img/新能源日报.png"
-                fit="fill"
-              />
-              <p class="imgTitle">测点历史数据查询</p>
-            </div>
-          </div> -->
+          </div>
         </div>
       </el-carousel-item>
 
       <!-- card-2 -->
+
       <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
           <p class="itemTitle">
-            预警记录
+            报表管理
             <!-- <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i> -->
           </p>
-          <div class="df-table">
-            <ComTable height="30vh" :data="tableData3" :pageSize="20">
-            </ComTable>
-            <ComTable height="30vh" :data="tableData4" :pageSize="20">
-            </ComTable>
-          </div>
-          <!-- <div class="imageBox1">
-            <div class="imgItem1" @click="jumpUrl('/new/alarmcenter')">
-              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
-              <p class="imgTitle">预警管理</p>
+          <div class="imageBox1">
+            <div class="imgItem1" @click="jumpUrl('/others/tjfx')">
+              <el-image class="img1" src="./static/img/o统计分析.png" fit="fill" />
+              <p class="imgTitle">统计分析</p>
             </div>
-            <div class="imgItem1" @click="jumpUrl('/new/tjsj')">
-              <el-image
-                class="img1"
-                src="./static/img/新能源日报.png"
-                fit="fill"
-              />
-              <p class="imgTitle">停机事件管理</p>
+            <div class="imgItem1" @click="jumpUrl('/others/bdzcx')">
+              <el-image class="img1" src="./static/img/o表底值查询.png" fit="fill" />
+              <p class="imgTitle">表底值查询</p>
             </div>
-            <div class="imgItem1" @click="jumpUrl('/new/xdgl')">
-              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
-              <p class="imgTitle">限电管理</p>
+            <div class="imgItem1" @click="jumpUrl('/others/xnyrb')">
+              <el-image class="img1" src="./static/img/o新能源日报.png" fit="fill" />
+              <p class="imgTitle">新能源日报</p>
             </div>
-            <div class="imgItem1" @click="jumpUrl('/alarmCenter/boosterAlarm')">
-              <el-image
-                class="img1"
-                src="./static/img/新能源日报.png"
-                fit="fill"
-              />
-              <p class="imgTitle">升压站报警</p>
+            <div class="imgItem1" @click="jumpUrl('/others/xnyfdscyb')">
+              <el-image class="img1" src="./static/img/o新能源月报.png" fit="fill" />
+              <p class="imgTitle">新能源风电生产月报</p>
             </div>
-            <div class="imgItem1" @click="jumpUrl('/alarmCenter/scadaAlarm')">
-              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
-              <p class="imgTitle">SCADA报警</p>
+            <div class="imgItem1" @click="jumpUrl('/others/fdczzdy')">
+              <el-image class="img1" src="./static/img/o风场自定义.png" fit="fill" />
+              <p class="imgTitle">风电场站自定义</p>
             </div>
-            <div class="imgItem1" @click="jumpUrl('/alarmCenter/customAlarm')">
-              <el-image
-                class="img1"
-                src="./static/img/新能源日报.png"
-                fit="fill"
-              />
-              <p class="imgTitle">自定义报警</p>
+            <div class="imgItem1" @click="jumpUrl('/others/fdxmzdy')">
+              <el-image class="img1" src="./static/img/o风电自定义.png" fit="fill" />
+              <p class="imgTitle">风电项目自定义</p>
             </div>
-          </div> -->
+          </div>
         </div>
       </el-carousel-item>
-
       <!-- card-3 -->
       <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
           <p class="itemTitle">
-            专家知识
-            <!-- <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i> -->
+            数据查询
           </p>
-           <div class="df-table">
-                <ComTable height="30vh" :data="tableData5" :pageSize="20">
-            </ComTable>
-           </div>
-       
+          <div class="df-table" @click="jumpUrl('/others/realSearch')">
+            <div class="sjcx-item" v-for="(value, key) in wppointColumn" :key="key">
+              <div class="sjcx-name">{{value}}</div>
+              <div class="sjcx-value">{{wppointnum[key]}}</div>
+            </div>
+          </div>
         </div>
       </el-carousel-item>
 
@@ -127,74 +81,58 @@
         </div>
       </el-carousel-item> -->
       <!-- card-5 -->
+      <!-- <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+        <div class="itemBox">
+          <p class="itemTitle">
+            专家知识
+          </p>
+          <div class="df-table">
+            <ComTable height="30vh" :data="tableData3">
+            </ComTable>
+          </div>
+        </div>
+      </el-carousel-item> -->
       <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
           <p class="itemTitle">
-            报表管理
+            专家知识
             <!-- <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i> -->
           </p>
           <div class="imageBox1">
-            <div class="imgItem1" @click="jumpUrl('/tjfx')">
-              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
-              <p class="imgTitle">统计分析</p>
+            <div class="imgItem1" @click="jumpUrl('/others/knowledge/knowledge')">
+              <el-image class="img1" src="./static/img/o故障体系.png" fit="fill" />
+              <p class="imgTitle">故障体系</p>
             </div>
-            <div class="imgItem1" @click="jumpUrl('/bdzcx')">
-              <el-image
-                class="img1"
-                src="./static/img/新能源日报.png"
-                fit="fill"
-              />
-              <p class="imgTitle">表底值查询</p>
+            <div class="imgItem1" @click="jumpUrl('/others/knowledge/knowledge7')">
+              <el-image class="img1" src="./static/img/o预警知识.png" fit="fill" />
+              <p class="imgTitle">预警知识</p>
             </div>
-            <div class="imgItem1" @click="jumpUrl('/xnyrb')">
-              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
-              <p class="imgTitle">新能源日报</p>
+            <div class="imgItem1" @click="jumpUrl('/others/knowledge/knowledge5')">
+              <el-image class="img1" src="./static/img/o特征参数.png" fit="fill" />
+              <p class="imgTitle">特征参数</p>
             </div>
-                     <div class="imgItem1" @click="jumpUrl('/xnyfdscyb')">
-              <el-image
-                class="img1"
-                src="./static/img/新能源日报.png"
-                fit="fill"
-              />
-              <p class="imgTitle">新能源风电生产月报</p>
+            <div class="imgItem1" @click="jumpUrl('/others/knowledge/knowledge6')">
+              <el-image class="img1" src="./static/img/o检修方案.png" fit="fill" />
+              <p class="imgTitle">排查、检修方案</p>
             </div>
-            <div class="imgItem1" @click="jumpUrl('/missfdrb')">
-              <el-image
-                class="img1"
-                src="./static/img/新能源日报.png"
-                fit="fill"
-              />
-              <p class="imgTitle">动态报表</p>
+            <div class="imgItem1" @click="jumpUrl('/health/gzzd/malfunctionDiagnose')">
+              <el-image class="img1" src="./static/img/o评价体系.png" fit="fill" />
+              <p class="imgTitle">评价体系</p>
             </div>
-            <div class="imgItem1" @click="jumpUrl('/missgfrb')">
-              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
-              <p class="imgTitle">项目动态报表</p>
+            <div class="imgItem1" @click="jumpUrl('/health/frist')">
+              <el-image class="img1" src="./static/img/o人工智能.png" fit="fill" />
+              <p class="imgTitle">人工智能</p>
             </div>
-   
           </div>
         </div>
       </el-carousel-item>
-      <!-- card-6 -->
-      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
-        <div class="itemBox">
-          <p class="itemTitle">
-            自定制报表管理
-            <!-- <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i> -->
-          </p>
-           <div class="df-table">
-                     <ComTable height="30vh" :data="tableData6" :pageSize="20">
-            </ComTable>
-           </div>
-
-        </div>
-      </el-carousel-item>
     </el-carousel>
   </div>
 </template>
 
 <script>
 import $ from "jquery";
-import ComTable from "@com/coms/table/table.vue";
+import ComTable from "./table.vue";
 export default {
   // 名称
   name: "cutAnalyse",
@@ -206,6 +144,46 @@ export default {
   data() {
     const that = this;
     return {
+      wppointnum: {},
+      wppointColumn: {
+        MHS_FDC: "麻黄山风电场",
+        NSS_FDC: "牛首山风电场",
+        QS_FDC: "青山风电场",
+        SBQ_FDC: "石板泉风电场",
+        XS_FDC: "香山风电场",
+        DWK_GDC: "大武口电站",
+        PL_GDC: "平罗光伏电站",
+        XH_GDC: "宣和光伏发电站",
+        MCH_GDC: "马场湖光发伏电站",
+        JSFW: "计算服务测点",
+      },
+      earlyAlarmData: {},
+      earlyAlarmColumn: [
+        {
+          name: "升压站告警",
+          key: "syzgj",
+          url: "/others/alarmCenter/boosterAlarm",
+        },
+        {
+          name: "升压站动作",
+          key: "",
+          url: "/others/alarmCenter/boosterAlarm",
+        },
+        { name: "限电事件", key: "xd", url: "/others/alarmCenter/xdgl" },
+        { name: "停机事件", key: "tj", url: "/others/alarmCenter/tjsj" },
+        { name: "状态转换记录", key: "", url: "" },
+        {
+          name: "风机告警",
+          key: "fjgj",
+          url: "/others/alarmCenter/scadaAlarm",
+        },
+        {
+          name: "风机预警",
+          key: "fjyj",
+          url: "/others/alarmCenter/alarmcenter",
+        },
+        { name: "操作记录", key: "", url: "" },
+      ],
       tableData1: {
         column: [
           {
@@ -222,21 +200,16 @@ export default {
             is_light: false,
             sortable: true,
           },
-        ],
-        data: [],
-      },
-      tableData2: {
-        column: [
           {
             name: "设备结构",
-            field: "pointId",
+            field: "timeDate",
             is_num: false,
             is_light: false,
             sortable: true,
           },
           {
             name: "关键参数",
-            field: "pointName",
+            field: "value",
             is_num: false,
             is_light: false,
             sortable: true,
@@ -244,7 +217,7 @@ export default {
         ],
         data: [],
       },
-       tableData3: {
+      tableData2: {
         column: [
           {
             name: "状态",
@@ -260,31 +233,24 @@ export default {
             is_light: false,
             sortable: true,
           },
-      
-        ],
-        data: [],
-      },
-             tableData4: {
-        column: [
           {
             name: "类型",
-            field: "pointId",
+            field: "timeDate",
             is_num: false,
             is_light: false,
             sortable: true,
           },
           {
-            name: "当日数量",
-            field: "pointName",
+            name: "等级",
+            field: "value",
             is_num: false,
             is_light: false,
             sortable: true,
           },
-      
         ],
         data: [],
       },
-          tableData5: {
+      tableData3: {
         column: [
           {
             name: "名称",
@@ -303,25 +269,7 @@ export default {
         ],
         data: [],
       },
-              tableData6: {
-        column: [
-          {
-            name: "名称",
-            field: "pointId",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "数量",
-            field: "pointName",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-        ],
-        data: [],
-      },         tableData7: {
+      tableData4: {
         column: [
           {
             name: "名称",
@@ -354,12 +302,9 @@ export default {
           .css({ background: "rgb(4, 12, 11)", border: "1px solid #05bb4c" });
         for (let i = 0; i < swiperDom.length; i++) {
           if (i !== index) {
-            swiperDom
-              .eq(i)
-              .find(".el-carousel__mask")
-              .css({
-                background: "rgb(4, 12, 11)",
-              });
+            swiperDom.eq(i).find(".el-carousel__mask").css({
+              background: "rgb(4, 12, 11)",
+            });
             swiperDom.eq(i).css({
               background: "rgb(4, 12, 11)",
               border: "1px solid rgba(5, 187, 76, 0.5)",
@@ -381,111 +326,78 @@ export default {
           index: 1,
           pointId: "青山风电场",
           pointName: 3763,
+          timeDate: "1号机",
+          value: "16.93",
         },
         {
           index: 2,
           pointId: "石板泉风电场",
           pointName: 4500,
+          timeDate: "2号机",
+          value: "20.56",
         },
         {
           index: 3,
           pointId: "牛首山风电场",
           pointName: 3863,
+          timeDate: "3号机",
+          value: "38",
         },
         {
           index: 4,
           pointId: "香山风电场",
           pointName: 3654,
+          timeDate: "4号机",
+          value: "54",
         },
         {
           index: 5,
           pointId: "麻黄山风电场",
           pointName: 1863,
+          timeDate: "5号机",
+          value: "18",
         },
       ];
       that.tableData1.data = tableArr1;
       console.log("tableData1:", that.tableData1);
-          let tableArr2 = [
-        {
-          index: 1,
-          pointId: "1号机",
-          pointName: 16.93,
-        },
-        {
-          index: 2,
-          pointId: "2号机",
-          pointName: 20.56,
-        },
-        {
-          index: 3,
-          pointId: "3号机",
-          pointName: 38,
-        },
-        {
-          index: 4,
-          pointId: "4号机",
-          pointName: 54,
-        },
-        {
-          index: 5,
-          pointId: "5号机",
-          pointName: 18,
-        },
-      ];
-      that.tableData2.data = tableArr2;
-      console.log("tableData2:", that.tableData2);
-                let tableArr3 = [
+
+      let tableArr2 = [
         {
           index: 1,
           pointId: "停机事件管理",
-          pointName: 16.93,
+          pointName: 11.93,
+          timeDate: "升压站动作",
+          value: "2",
         },
         {
           index: 2,
           pointId: "限电管理",
-          pointName: 20.56,
+          pointName: 21.56,
+          timeDate: "升压站告警",
+          value: "5",
         },
         {
           index: 3,
           pointId: "状态转换记录",
-          pointName: 38,
+          pointName: 82,
+          timeDate: "风机告警",
+          value: "3",
         },
         {
           index: 4,
           pointId: "操作记录",
           pointName: 54,
+          timeDate: "风机预警",
+          value: "1",
         },
       ];
-      that.tableData3.data = tableArr3;
-
-                let tableArr4 = [
-        {
-          index: 1,
-          pointId: "升压站动作",
-          pointName: 16.93,
-        },
-        {
-          index: 2,
-          pointId: "升压站告警",
-          pointName: 20.56,
-        },
-        {
-          index: 3,
-          pointId: "风机告警",
-          pointName: 38,
-        },
-        {
-          index: 4,
-          pointId: "风机预警",
-          pointName: 54,
-        },
-      ];
-      that.tableData4.data = tableArr4;
+      that.tableData2.data = tableArr2;
+      console.log("tableData2:", that.tableData2);
 
-         let tableArr5 = [
+      let tableArr3 = [
         {
           index: 1,
-          pointId: "故障指示列表",
+          pointId: "故障知识列表",
           pointName: 16.93,
         },
         {
@@ -503,26 +415,26 @@ export default {
           pointId: "预警知识",
           pointName: 54,
         },
-             {
+        {
           index: 5,
           pointId: "特征参数",
           pointName: 44,
         },
-             {
+        {
           index: 6,
           pointId: "风险辨识知识",
           pointName: 24,
         },
-             {
+        {
           index: 7,
           pointId: "作业指导知识",
           pointName: 14,
         },
       ];
-      that.tableData5.data = tableArr5;
+      that.tableData3.data = tableArr3;
+      console.log("tableData3:", that.tableData3);
 
-      
-         let tableArr6 = [
+      let tableArr4 = [
         {
           index: 1,
           pointId: "风电场站自定义",
@@ -544,12 +456,29 @@ export default {
           pointName: 54,
         },
       ];
-      that.tableData6.data = tableArr6;
-
-      
-
+      that.tableData4.data = tableArr4;
+      console.log("tableData4:", that.tableData4);
+    },
+    getWppointnum() {
+      const that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "yaw/getWppointnum",
+        success(res) {
+          that.wppointnum = res.data;
+        },
+      });
+    },
+    async getEarlyAlarmData() {
+      const that = this;
+      const { data } = await that.API.requestData({
+        method: "GET",
+        baseURL: "http://192.168.1.18:8075/",
+        subUrl: "alarm/count/todaycount",
+        success(res) {},
+      });
+      this.earlyAlarmData = data.data;
     },
-
   },
 
   created() {},
@@ -560,6 +489,8 @@ export default {
       this.changeSwiper(1);
     });
     that.getTableData();
+    this.getWppointnum();
+    this.getEarlyAlarmData();
   },
 
   unmounted() {},
@@ -572,30 +503,53 @@ export default {
   width: 100%;
   height: 100%;
   font-size: 20px;
-.df-table{
-  /deep/ .com-table thead tr th {
-    background-color: rgba(83, 98, 104, 0.2);
-    height: 30px;
-    line-height: 30px;
-    color: #9ca5a8;
-    font-weight: 400;
-    font-size: 20px !important;
-    position: sticky;
-    top: 0;
-    cursor: pointer;
-}
-/deep/ .com-table tbody tr td {
-    padding: 4px;
-    color: #393a3a;
-    text-align: center;
-    font-size: 20px !important;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-
-}
+  .df-table {
+    /deep/ .com-table thead tr th {
+      background-color: rgba(83, 98, 104, 0.2);
+      height: 30px;
+      line-height: 30px;
+      color: #9ca5a8;
+      font-weight: 400;
+      font-size: 20px !important;
+      position: sticky;
+      top: 0;
+      cursor: pointer;
+    }
+    /deep/ .com-table tbody tr td {
+      padding: 4px;
+      color: #393a3a;
+      text-align: center;
+      font-size: 20px !important;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .sjcx-item:nth-child(2n) {
+      background-color: rgba(96, 103, 105, 0.2);
+    }
+    .sjcx-item:hover {
+      color: #05bb4c;
+    }
+    .sjcx-item {
+      cursor: pointer;
+      // background-color: #edbf03;
+      display: flex;
+      height: 6.68vh;
+      line-height: 6.68vh;
+      font-size: 18pt;
+      text-align: center;
+      color: #9ca5a8;
+      .sjcx-name {
+        // background-color:aqua;
+        flex: 0 0 50%;
+      }
+      .sjcx-value {
+        // text-align: left;
+        // background-color:rosybrown;
+        flex: 0 0 50%;
+      }
+    }
+  }
   .itemTitle {
     width: 100%;
     display: flex;

src/views/Status/Status.vue

@@ -1,13 +1,21 @@
 <template>
   <div class="status">
     <div class="panel-box">
-      <StatusPanel class="panel-item" v-for="(data, index) of datas" :key="index" :data="data"></StatusPanel>
+      <StatusPanel
+        class="panel-item"
+        v-for="(data, index) of datas"
+        :key="index"
+        :data="data"
+      ></StatusPanel>
       <StatusPanelStatic class="panel-item" />
     </div>
     <div class="table-box">
       <ComTable :data="tableData"></ComTable>
     </div>
-  </div> 
+    <div class="table-box">
+       <ComTable :data="tableData1"></ComTable>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -25,7 +33,7 @@ export default {
   components: {
     StatusPanel,
     ComTable,
-    StatusPanelStatic
+    StatusPanelStatic,
   },
   // 数据
   data() {
@@ -33,6 +41,12 @@ export default {
       timmer: null, // 遮罩开关
       sourceMap: {}, // 核心数据
       datas: [],
+      wpId1:"",
+      dwkGzqd: "",
+      plGzqd: "",
+      zhGzqd: "",
+      mchGzqd: "",
+      hzjGzqd: "",
       tableData: {
         column: [
           {
@@ -178,6 +192,152 @@ export default {
         ],
         data: [],
       },
+         tableData1: {
+        column: [
+          {
+            name: "场站名称",
+            field: "wpName",
+            unit: "",
+            is_num: false,
+            is_light: false,
+          },
+          // {
+          //   name: "调度名称",
+          //   field: "ddname",
+          //   unit: "",
+          //   is_num: false,
+          //   is_light: false,
+          // },
+          {
+            name: "装机容量",
+            field: "zjrl",
+            unit: "MW",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "发电量",
+            field: "fdl",
+            unit: "万kwh",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "上网电量",
+            field: "swdl",
+            unit: "万kwh",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "利用小时",
+            field: "lyxs",
+            unit: "",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            // name: "风速m/s",
+            name:"光照强度w/m2",
+            field: "fs",
+            unit: "日照强度w/m2",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "功率",
+            field: "gl",
+            unit: "MW",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "出线功率",
+            field: "cxgl",
+            unit: "MW",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "理论功率",
+            field: "llgl",
+            unit: "MW",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "保证功率",
+            field: "bzgl",
+            unit: "MW",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "预测功率",
+            field: "ycgl",
+            unit: "MW",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "AGC指令",
+            field: "agczl",
+            unit: "MW",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "理论发电量",
+            field: "llfdl",
+            unit: "万kwh",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "SCADA发电量",
+            field: "scadafdl",
+            unit: "万kwh",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "维修损失电量",
+            field: "whss",
+            unit: "万kwh",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "故障损失电量",
+            field: "gzss",
+            unit: "万kwh",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "受理损失电量",
+            field: "slss",
+            unit: "万kwh",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "限电损失电量",
+            field: "xdss",
+            unit: "万kwh",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "性能损失电量",
+            field: "xnss",
+            unit: "万kwh",
+            is_num: true,
+            is_light: false,
+          },
+        ],
+        data: [],
+      },
     };
   },
 
@@ -191,10 +351,16 @@ export default {
         subUrl: "monitor/monitor",
         success(res) {
           if (res.data) {
+            // console.log("resData:", res.data);
             let sourceMap = res.data;
             let datas = [];
             let data = [];
+            let data1 = [];
             sourceMap.maps.forEach((ele) => {
+              sourceMap.vos.forEach((vEle) => {});
+              that.wpId1=sourceMap.vos.find((findEle) => {
+                  return findEle.wpName === ele.name;
+                }).wpId
               datas.push({
                 title: ele.name,
                 wpId: sourceMap.vos.find((findEle) => {
@@ -216,7 +382,6 @@ export default {
                     { text: "受累", num: ele.slts || 0, color: "blue" },
                     { text: "离线", num: ele.lxts, color: "gray" },
                   ],
-                  
                 },
                 items: [
                   {
@@ -234,10 +399,10 @@ export default {
                     f3: ele.uab,
                     f4: "Ia",
                     f5: ele.ia,
-                    is_light:  !ele.zxzt_syzzt,
+                    is_light: !ele.zxzt_syzzt,
                   },
                   {
-                    f1: "风功:",
+                    f1: ele.name.includes("风") ? "风功:" : "光功:",
                     f2: "未来15分钟",
                     f3: ele.ycgl,
                     f4: "",
@@ -246,10 +411,16 @@ export default {
                   },
                   {
                     f1: "测风塔:",
-                    f2: "风速",
-                    f3: (ele.cftfs || 0) + "m/s",
-                    f4: "风向",
-                    f5: ele.cftfx || 0,
+                    // f2: "风速",
+                    f2: ele.name.includes("风") ? "风速" : "光照强度",
+                    // f3: (ele.cftfs || 0) + "m/s",
+                    f3: ele.name.includes("风")
+                      ? (ele.cftfs || 0) + "m/s"
+                      : sourceMap.vos.find((findEle) => {
+                          return findEle.wpName === ele.name;
+                        }).fs,
+                    f4: ele.name.includes("风") ? "风向" : "",
+                    f5: ele.name.includes("风") ? ele.cftfx || 0 : "",
                     is_light: !ele.zxzt_cftzt,
                   },
                   {
@@ -264,24 +435,77 @@ export default {
               });
             });
 
-            sourceMap.vos.forEach((ele) => {
+        //风电场
+               let fdcArr = sourceMap.vos.filter((ele)=>{
+                 return ele.wpId.includes('FDC')      
+               })
+               let fdhj = sourceMap.vos.filter((ele)=>{
+                 return ele.wpId.includes('-1')
+               })
+                  let zj = sourceMap.vos.filter((ele)=>{
+                 return ele.wpId.includes('0')
+               })
+               fdcArr.push(fdhj[0],zj[0])
+              //  console.log(fdcArr)
+                 fdcArr.forEach((ele) => {
+              // console.log('vos:', sourceMap.vos)
               ele.row_span = [];
               ele.col_span = [];
               ele.is_light = false;
               data.push(ele);
             });
 
+            //光电厂
+                 let gdcArr = sourceMap.vos.filter((ele)=>{
+                 return ele.wpId.includes('GDC')      
+               })
+               let gdhj = sourceMap.vos.filter((ele)=>{
+                 return ele.wpId.includes('-2')
+               })
+               gdcArr.push(gdhj[0],zj[0])
+              //  console.log(gdcArr)
+                 gdcArr.forEach((ele) => {
+              // console.log('vos:', sourceMap.vos)
+              ele.row_span = [];
+              ele.col_span = [];
+              ele.is_light = false;
+              data1.push(ele);
+            });
+
+            // sourceMap.vos.forEach((ele) => {
+            //   console.log('vos:', sourceMap.vos)
+            //   ele.row_span = [];
+            //   ele.col_span = [];
+            //   ele.is_light = false;
+            //   data.push(ele);
+            // });
+
+          //  for(let i=0;i<sourceMap.vos.length;i++){
+          //     //  console.log('vos:',sourceMap.vos)
+          //      data.push(sourceMap.vos[0],sourceMap.vos[1],sourceMap.vos[2],sourceMap.vos[3],sourceMap.vos[4],sourceMap.vos[5],sourceMap.vos[11])
+          //      data1.push(sourceMap.vos[6],sourceMap.vos[7],sourceMap.vos[8],sourceMap.vos[9],sourceMap.vos[10],sourceMap.vos[11])
+          //  }
+          //  that.unique(data,that.wpId1);
+          // //  that.unique(data1,sourceMap.vos.find((findEle) => {
+          // //         return findEle.wpName === ele.name;
+          // //       }).wpId);
+          //  console.log('vosData:',data);
+          // //  console.log('vosData1:',data1)
+
             that.sourceMap = sourceMap;
             that.datas = datas;
             that.tableData.data = data;
+            that.tableData1.data = data1;
           } else {
             that.sourceMap = {};
             that.datas = [];
             that.tableData.data = [];
+            that.tableData1.data = [];
           }
         },
       });
     },
+
   },
 
   created() {

src/views/WindSite/pages/Info/Info.vue

@@ -234,6 +234,7 @@ export default {
   created() {
     let that = this;
     that.wpId = that.$route.params.wpId;
+    that.wtId = that.$route.params.wtId;
     that.$nextTick(() => {
       that.requestData(false);
       that.timmer = setInterval(() => {