Merge branch 'mw' of http://124.70.43.205:3000/yangxiao/sis_zhfx

src/components/arcgis/NSS_FDC.vue

@@ -0,0 +1,502 @@
+<template>
+  <div style="width: 100%; height: 100%">
+    <arcgis
+      class="arcgis-layer"
+      @when="when"
+      ref="arcgis"
+      :data="arcgisData"
+      @clickMap="clickMap"
+    >
+      <template
+        v-for="(fan, index) of fans"
+        :key="index"
+        v-slot:[fan.attributes.code]
+      >
+        <svg
+          v-if="fan.attributes.code != '升压站'"
+          @click="clickFan(fan.attributes.code)"
+          class="can-click esri-component"
+          version="1.1"
+          xmlns="http://www.w3.org/2000/svg"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          viewBox="0 0 200 240"
+          enable-background="new 0 0 200 240"
+          xml:space="preserve"
+          width="66"
+          height="66"
+        >
+          <!-- 底座 -->
+          <g>
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              :fill="colors[fan.attributes.state][2]"
+              d="M100.681,156.137c24.579,0,44.505,8.548,44.505,19.094
+                            c0,10.545-19.926,19.093-44.505,19.093c-24.577,0-42.878-8.548-42.878-19.093C57.803,164.685,76.104,156.137,100.681,156.137z"
+            />
+          </g>
+          <!-- 后面的脑袋 -->
+          <g>
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              :fill="colors[fan.attributes.state][0]"
+              d="M92.875,76.372l27.897-18.417c0,0,4.108-0.096,7.891,2.681
+                                c4.305,3.156,1.86,9.235,1.86,9.235l-24.374,23.292L92.875,76.372z"
+            />
+          </g>
+          <!-- 柱 -->
+          <g>
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              :fill="colors[fan.attributes.state][0]"
+              d="M92.152,175.229h18.689l-4.876-94.254H97.84L92.152,175.229z"
+            />
+          </g>
+          <!-- 风扇 -->
+          <g>
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              :fill="colors[fan.attributes.state][1]"
+              d="M109.007,85.525l-16.061,0.268l7.396-83.773L109.007,85.525z"
+            />
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              :fill="colors[fan.attributes.state][1]"
+              d="M95.219,75.597l8.265,13.771l-76.25,35.483L95.219,75.597z
+                            M99.108,89.634l7.795-14.04l68.854,48.291L99.108,89.634z"
+            />
+            <animateTransform
+              v-if="fan.attributes.rotate"
+              attributeName="transform"
+              attributeType="XML"
+              type="rotate"
+              from="0 100 82"
+              to="359 100 82"
+              :dur="fan.attributes.dur + 's'"
+              repeatCount="indefinite"
+            />
+          </g>
+          <!-- 前面的尖 -->
+          <g>
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              :fill="colors[fan.attributes.state][2]"
+              d="M92.863,72.903c0,0,13.912-0.343,17.098,4.352
+                            c2.984,4.397-2.58,15.473-2.58,15.473l-24.376,0.436L92.863,72.903z"
+            />
+          </g>
+          <!-- 文字 -->
+          <g>
+            <text
+              x="100"
+              y="240"
+              fill="#ffffff"
+              font-size="40"
+              text-anchor="middle"
+              alignment-baseline="baseline"
+            >
+              {{ fan.attributes.code }}
+            </text>
+          </g>
+        </svg>
+        <div v-if="fan.attributes.code == '升压站'">
+          <div class="syz-img">
+            <img :src="syzImg" />
+          </div>
+          <div class="white font-sm mr-t-8" style="text-align: center">
+            {{ fan.attributes.code }}
+          </div>
+        </div>
+      </template>
+    </arcgis>
+  </div>
+</template>
+
+<script>
+import arcgis from "./arcgis.vue";
+import dataService from "@/helper/data.js";
+
+export default {
+  // 名称
+  name: "Map",
+  // 使用组件
+  components: {
+    arcgis,
+  },
+  props: {
+    wpId: {
+      type: String,
+      default: "",
+    },
+  },
+  // 数据
+  data() {
+    return {
+      wpnumMap: {}, //风机监视数量
+      wpInfoMap: {}, //风机详情
+      fjmap: [], // 风机名
+      sourceId: "",
+      arcgisData: {
+        mode: "2D", // 模式 2D 3D
+        title: "宁夏地图", // 标题
+        center: [107.0391975, 37.31469028], // 初始中心点 106.230909, 38.487193
+        height: 654, // 3D地图初始相机高度
+        tilt: 65, // 俯视角
+        scale: 30000,
+        rotation: -45,
+        ox: -600,
+        oy: -50,
+      },
+      showPopup: false,
+      mapToolIndex: 0,
+      fans: [],
+      colors: {
+        0: ["#05bb4c", "#4ad476", "#9fedb2"],
+        1: ["#4b55ae", "#959dc7", "#d3d6e0"],
+        2: ["#BA3237", "#d4807d", "#eddad8"],
+        3: ["#606769", "#757575", "#AFAFAF"],
+        4: ["#e17e23", "#fabf78", "#ffebcc"],
+        5: ["#c531c7", "#e080dc", "#fadef7"],
+        6: ["#c531c7", "#e080dc", "#fadef7"],
+      },
+      syzImg: require("@assets/png/booster-station.png"),
+    };
+  },
+  created() {
+    let that = this;
+    that.sourceId = this.wpId;
+    that.$nextTick(() => {
+      that.requestData();
+    });
+  },
+  // 函数
+  methods: {
+    select(res) {
+      this.$router.replace({
+        path: `/monitor/windsite/map/${res.code}`,
+      });
+    },
+    // 风机状态监视
+    requestData() {
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "monitor/findGeneralAppearance",
+        data: {
+          wpId: that.wpId,
+        },
+        success(res) {
+          if (res.code == 200) {
+            that.wpnumMap = res.data.fczbmap.jczbmap;
+            that.wpInfoMap = res.data.wxssmap;
+            that.fjmap = res.data.fjmap[0];
+          }
+        },
+      });
+    },
+    when: function () {
+      let jsonObj = dataService.get("arcgis-nss");
+	  console.log(jsonObj)
+      this.fans = jsonObj;
+      jsonObj.forEach((item) => {
+        let obj = this.fjmap.find((t) => {
+          let wtid = t.wtId.replace("01_", "");
+          if (wtid == item.attributes.code) return t;
+        });
+        if (obj) {
+          item.attributes.state = String(obj.fjzt);
+        } else {
+          item.attributes.state = "4";
+        }
+        switch (item.attributes.state) {
+          case "0": //待机
+            item.attributes.rotate = false; // 转
+            item.attributes.dur = 8; // 转一圈时间
+            break;
+          case "1": //运行
+            item.attributes.rotate = true; // 转
+            item.attributes.dur = 2; // 转一圈时间
+            break;
+          case "2": //故障
+            item.attributes.rotate = false; // 不转
+            item.attributes.dur = 8;
+            break;
+          case "3": //中断
+            item.attributes.rotate = false; // 不转
+            item.attributes.dur = 8;
+            break;
+          case "4": //维护
+            item.attributes.rotate = false; // 不转
+            item.attributes.dur = 8;
+            break;
+          case "5": //限电
+            item.attributes.rotate = true; // 转
+            item.attributes.dur = 6;
+            break;
+          case "6": //停机
+            item.attributes.rotate = false; // 不转
+            item.attributes.dur = 8;
+            break;
+          default:
+            item.attributes.rotate = false;
+            item.attributes.dur = 8;
+            break;
+        }
+        this.$refs.arcgis.addHtmlPoint(
+          [item.geometry.x, item.geometry.y],
+          item.attributes.code,
+          33,
+          50,
+          false
+        );
+      });
+      let lineJsonObj = dataService.get("arcgis-nx-fc1-line");
+      this.$refs.arcgis.addFanByJson(jsonObj, lineJsonObj);
+    },
+    clickMap: function (info) {
+      console.log(info);
+    },
+    clickFan: function (code) {
+      let wtId = code.replace("G", "G01_");
+      this.$router.push(`/monitor/windsite/info/${this.wpId}/${wtId}`);
+    },
+    popupBack: function () {
+      this.showPopup = false;
+    },
+    clickMapTool: function (index) {
+      //   this.mapToolIndex = index;
+      this.showPopup = !this.showPopup;
+    },
+  },
+  watch: {
+    wpId(res) {
+      this.sourceId = res;
+      if (res) {
+        this.requestData();
+      }
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@titleHeight: 40px;
+
+.map-1 {
+  width: 100%;
+  height: calc(100vh - 90px);
+  display: flex;
+  flex-direction: column;
+
+  .btn-group-tabs {
+    display: flex;
+    flex-direction: row;
+  }
+
+  .can-click {
+    cursor: pointer;
+  }
+
+  .syz-img {
+    width: 65px;
+    height: 47px;
+
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .panel-title {
+    width: 100%;
+    background-color: fade(@darkgray, 40%);
+    margin-top: 16px;
+    padding: 6px;
+    display: flex;
+    align-items: center;
+
+    .panel-title-name {
+      color: @green;
+      display: flex;
+      align-items: center;
+      line-height: 0;
+      font-size: 0;
+
+      i,
+      span {
+        margin: 0 0 0 16px;
+        line-height: 0;
+        font-size: 13px;
+      }
+    }
+
+    .sub-title-item {
+      display: flex;
+      align-items: center;
+      margin-left: 16px;
+
+      .sub-title {
+        font-size: 13px;
+        margin-left: 6px;
+      }
+
+      .sub-count {
+        font-size: 13px;
+        font-weight: 500;
+      }
+
+      img {
+        height: 31px;
+      }
+    }
+  }
+
+  .panel-body {
+    flex-grow: 1;
+    background-color: fade(@darkgray, 20%);
+    padding: 8px;
+    overflow: auto;
+    position: relative;
+
+    .arcgis-layer {
+      z-index: 1;
+    }
+
+    .map-popup-panel {
+      width: 760px;
+      position: absolute;
+      left: 71px;
+      top: 22px;
+      z-index: 2;
+
+      .map-popup-panel-header {
+        width: 100%;
+        background: fade(#152221, 90%);
+        display: flex;
+
+        .map-popup-panel-title {
+          padding: 17px 24px;
+          font-size: @fontsize-s;
+          position: relative;
+
+          &::before,
+          &::after {
+            position: absolute;
+            width: calc(50% - 6px);
+            bottom: 0;
+            border-bottom: 2px solid @green;
+          }
+
+          &::before {
+            content: "";
+            left: 0;
+          }
+
+          &::after {
+            content: "";
+            right: 0;
+          }
+
+          span {
+            position: absolute;
+            width: 11.3px;
+            height: 11.3px;
+            border-left: 2px solid @green;
+            border-top: 2px solid @green;
+            left: calc(50% - 5.65px);
+            bottom: -3px;
+            transform: rotate(45deg);
+          }
+        }
+
+        .map-popup-panel-date {
+          flex-grow: 1;
+          padding: 17px 24px;
+          font-size: @fontsize-s;
+          text-align: right;
+          border-bottom: 2px solid @green;
+        }
+
+        .map-popup-panel-back {
+          margin-left: auto;
+          width: 54px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          position: relative;
+          cursor: pointer;
+
+          &::after {
+            content: "";
+            position: absolute;
+            left: 0;
+            height: 50%;
+            border-left: 1px solid @gray;
+            top: 25%;
+          }
+        }
+      }
+
+      .map-popup-panel-body {
+        background: fade(#152221, 75%);
+        border: 1px solid fade(@darkgray, 40);
+        border-top: 0px;
+
+        .table-form {
+          .text,
+          .unit {
+            font-weight: 400;
+          }
+
+          .unit {
+            min-width: auto;
+          }
+
+          .value,
+          .unit {
+            text-align: left;
+          }
+        }
+      }
+    }
+
+    .map-tool {
+      position: absolute;
+      right: 22px;
+      top: 22px;
+      z-index: 2;
+      background: #152221af;
+      padding: 18px 14px;
+
+      .m-btn {
+        width: 124px;
+        height: 44px;
+        background: #152221bf;
+        border: 1px solid #152221bf;
+        color: #ffffff;
+        transition: all 0.3s;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+
+        &:hover,
+        &.active {
+          background: #05bb4c33;
+          border: 1px solid #05bb4c;
+          color: #05bb4c;
+        }
+
+        + .m-btn {
+          margin-top: 16px;
+        }
+      }
+    }
+  }
+}
+</style>

src/router/index.js

@@ -151,7 +151,7 @@ const routes = [{
 },
 {
 	path: "/decision/zbtjfx", // 节能减排KPI
-	name: "decision1",
+	name: "zbtjfx",
 	component: () =>
 		import( /* webpackChunkName: "decision1" */ "../views/Decision/zbtjfx.vue"),
 },

src/views/Decision/Decision3Db.vue

@@ -45,7 +45,7 @@
           </div>
         </div>
         <div class="query-item">
-          <div class="lable">开始日期：</div>
+          <div class="lable">日期：</div>
           <div class="search-input">
             <el-date-picker
               v-model="value4"
@@ -385,6 +385,7 @@ export default {
           date: that.value4,
         },
         success(res) {
+			console.log(res)
           var data = res.data;
 
           var arrName = [],
@@ -430,6 +431,7 @@ export default {
               value: arr,
             });
           }
+		  console.log(tempArray)
           that.list = tempArray;
         },
       });
@@ -452,6 +454,11 @@ export default {
       // 重置状态end
     },
   },
+  watch: {
+      value4(){
+          this.AjaxCommon();
+      }
+  }
 };
 </script>
 

src/views/HealthControl/HealthTab1.vue

@@ -150,9 +150,10 @@ export default {
       this.reportshow = true;
       this.reportparams = {
         wtId: item.wtid,
-        recorddate: new Date(item.createdate).formatDate("yyyy-MM-dd"),
+        recorddate: recorddate,
       };
-	  // this.$refs.eport.getReport(item.wtid,recorddate);
+	  console.log(this.reportparams)
+	  this.$refs.eport.getReport(item.wtid,recorddate);
     },
     // 关闭健康报告
     closed() {

src/views/HealthControl/zhpj/jxpj.vue

@@ -46,7 +46,7 @@
 				dialogData1: [],
 				dialogData2: [],
 				column: [],
-				indicator: ["复位及时率(%)", "mttf", "缺陷下单及时率(%)", "缺陷验收及时率(%)", "设备利用小时", "限电损失率(%)","性能损失率(%)", "综合场用电量", "状态转换及时率(%)"],
+				indicator: ["风能利用率(%)","计划检修损失率(%)","非计划检修损失率(%)","缺陷下单及时率(%)","到达消缺地点及时率(%)","真实消缺及时率(%)","MTBF(小时)","MTTR(小时)"],
 				tableData: {
 					column: [{
 							name: "",
@@ -73,7 +73,7 @@
 						},
 						{
 							name: "场站",
-						 field: "wpid",
+							field: "wpid",
 							is_num: false,
 							is_light: false,
 						},
@@ -93,96 +93,74 @@
 							width: '70px',
 						},
 						{
-						 name: "风能利用率(%)",
+							name: "风能利用率(%)",
 							field: "fnlyl",
-						 is_num: false,
-							is_light: false,
-							sortable: true,
-						},
-						{
-							name: "复位及时率(%)",
-							field: "fwjsl",
-							is_num: false,
-							is_light: false,
-						 sortable: true,
-						},
-						{
-							name: "mttf",
-							field: "mttf",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "平均小风切入风速",
-							field: "pjxfqrfs",
+							name: "计划检修损失率(%)",
+							field: "jhjxssl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
-
 						{
-							name: "缺陷下单及时率(%)",
-						 field: "qxxdjsl",
+							name: "非计划检修损失率(%)",
+							field: "fjhjxssl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "缺陷验收及时率(%)",
-							field: "qxysjsl",
+							name: "缺陷单接单及时率(%)",
+							field: "qxdjdjsl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "设备利用小时",
-							field: "sblyxs",
+							name: "到达消缺地点及时率(%)",
+							field: "ddxqddjsl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失率(%)",
-							field: "xdssl",
+							name: "真实消缺及时率(%)",
+							field: "zsxqjsl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失率(%)",
-							field: "xnssl",
+							name: "MTBF(小时)",
+							field: "mtbf",
 							is_num: false,
 							is_light: false,
-						 sortable: true,
+							sortable: true,
 						},
 						{
-							name: "综合场用电量",
-							field: "zhcydl",
+							name: "MTTR(小时)",
+							field: "mttr",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "状态转换及时率(%)",
-							field: "ztzhjsl",
+							name: "操作",
+							field: "sjbz",
 							is_num: false,
 							is_light: false,
 							sortable: true,
-						},
-						{
-						  name: "操作",
-						  field: "sjbz",
-						  is_num: false,
-						  is_light: false,
-						  sortable: true,
-						  id: "id",
-						  template: () => {
-						    return "<el-button type='text' style='cursor: pointer;'>详情</el-button>";
-						  },
-						  click: function (event, data) {
-							  that.contrast(that.dataIds.add(data.id))
-						  },
+							id: "id",
+							template: () => {
+								return "<el-button type='text' style='cursor: pointer;'>详情</el-button>";
+							},
+							click: function(event, data) {
+								that.contrast(that.dataIds.add(data.id))
+							},
 						},
 					],
 					data: [],
@@ -237,11 +215,11 @@
 				if (that.dataIds.size == 2 || one) {
 					that.dialogVisible = true;
 					const tmpArr = Array.from(that.dataIds);
-					if(one){
+					if (one) {
 						const data = {
 							gaid1: tmpArr[0]
 						};
-					}else{
+					} else {
 						const data = {
 							gaid1: tmpArr[0],
 							gaid2: tmpArr[1],
@@ -272,7 +250,8 @@
 									rank: ele2.field + 'pm',
 									score: ele2.field + 'pf'
 								})
-								let data1Name = '',data2Name = '';
+								let data1Name = '',
+									data2Name = '';
 								dialogData1.forEach((ele3, index3) => {
 									if (index3 == 0) {
 										data1.push({
@@ -281,8 +260,8 @@
 										})
 										data1Name = ele3.wpid
 									}
-									
-									if(that.dataIds.size == 2){
+
+									if (that.dataIds.size == 2) {
 										if (index3 == 1) {
 											data2.push({
 												name: ele,
@@ -292,27 +271,31 @@
 										}
 									}
 								})
-								data1.push({name: data1Name});
-								if(that.dataIds.size == 2){
-									data2.push({name: data2Name});
+								data1.push({
+									name: data1Name
+								});
+								if (that.dataIds.size == 2) {
+									data2.push({
+										name: data2Name
+									});
 								}
 							}
 						})
 					})
 					that.column = column;
 					if (data1) {
-						chartData[0].data.push(that.getChartData(data1,chartData[0].indicator));
+						chartData[0].data.push(that.getChartData(data1, chartData[0].indicator));
 					}
-					if(that.dataIds.size == 2){
+					if (that.dataIds.size == 2) {
 						if (data2) {
-							chartData[0].data.push(that.getChartData(data2,chartData[0].indicator));
+							chartData[0].data.push(that.getChartData(data2, chartData[0].indicator));
 						}
 					}
 					that.dialogData2 = chartData;
 				}
 				this.clearCheckBox();
 			},
-			getChartData(resData,indicator) {
+			getChartData(resData, indicator) {
 				const chartData = {};
 				const rowMap = {};
 				resData.forEach(function(rowData, index) {
@@ -320,7 +303,7 @@
 				});
 				chartData["name"] = resData[resData.length - 1]["name"];
 				chartData["value"] = [];
-				indicator.forEach(ele=>{
+				indicator.forEach(ele => {
 					chartData["value"].push(rowMap[ele]);
 				})
 				return chartData;

src/views/Home/components/map.vue

@@ -118,48 +118,34 @@
     </div>
     <div class="map-img">
       <!-- 宁夏地图总览 -->
-      <SvgMapNX
-        v-if="mapName === 'nx'"
-        :show="showType"
-        :data="sourceMap"
-        :xtData="xtMap"
-        @clickLabel="clickLabel"
-      ></SvgMapNX>
+      <SvgMapNX v-if="mapName === 'nx'" :show="showType" :data="sourceMap" :xtData="xtMap" @clickLabel="clickLabel" ></SvgMapNX>
+	  
       <!-- 麻黄山风电场 -->
-      <MHSFDC
-        v-if="mapName === 'MHS_FDC'"
-        :data="sourceMap"
-        @clickFj="clickFj"
-        @changePeriod="changePeriod"
-      ></MHSFDC>
+      <MHSFDC v-if="mapName === 'MHS_FDC'" :data="sourceMap" @clickFj="clickFj" @changePeriod="changePeriod" ></MHSFDC>
+	  
       <!-- 香山风电场 -->
-      <XSFDC
-        v-if="mapName === 'XS_FDC'"
-        :data="sourceMap"
-        @clickFj="clickFj"
-        @changePeriod="changePeriod"
-      ></XSFDC>
+      <XSFDC v-if="mapName === 'XS_FDC'" :data="sourceMap" @clickFj="clickFj" @changePeriod="changePeriod" ></XSFDC>
+	  
       <!-- 牛首山风电场 -->
-      <NSSFDC
-        v-if="mapName === 'NSS_FDC'"
-        :data="sourceMap"
-        @clickFj="clickFj"
-        @changePeriod="changePeriod"
-      ></NSSFDC>
+      <NSSFDC v-if="mapName === 'NSS_FDC'" :data="sourceMap" @clickFj="clickFj" @changePeriod="changePeriod" ></NSSFDC>
+	  
       <!-- 青山风电场 -->
-      <QSFDC
-        v-if="mapName === 'QS_FDC'"
-        :data="sourceMap"
-        @clickFj="clickFj"
-        @changePeriod="changePeriod"
-      ></QSFDC>
+      <QSFDC v-if="mapName === 'QS_FDC'" :data="sourceMap" @clickFj="clickFj" @changePeriod="changePeriod" ></QSFDC>
+	  
       <!-- 石板泉风电场 -->
-      <SBQFDC
-        v-if="mapName === 'SBQ_FDC'"
-        :data="sourceMap"
-        @clickFj="clickFj"
-        @changePeriod="changePeriod"
-      ></SBQFDC>
+      <SBQFDC v-if="mapName === 'SBQ_FDC'" :data="sourceMap" @clickFj="clickFj" @changePeriod="changePeriod" ></SBQFDC>
+	  
+	  <!-- 马场湖 -->
+	  <MCHGDC v-if="mapName === 'MCH_GDC'" :data="sourceMap" @clickFj="clickFj" @changePeriod="changePeriod" ></MCHGDC>
+	  
+	  <!-- 大武口 -->
+	  <DWKGDC v-if="mapName === 'DWK_GDC'" :data="sourceMap" @clickFj="clickFj" @changePeriod="changePeriod" ></DWKGDC>
+	  
+	  <!-- 平罗 -->
+	  <PLGDC v-if="mapName === 'PL_GDC'" :data="sourceMap" @clickFj="clickFj" @changePeriod="changePeriod" ></PLGDC>
+	  
+	  <!-- 宣和 -->
+	  <XHGDC v-if="mapName === 'XH_GDC'" :data="sourceMap" @clickFj="clickFj" @changePeriod="changePeriod" ></XHGDC>
     </div>
   </div>
 </template>
@@ -179,6 +165,15 @@ import QSFDC from "./map/QS_FDC.vue";
 // 石板泉风电场
 import SBQFDC from "./map/SBQ_FDC.vue";
 
+// 马场湖
+import MCHGDC from "./map/MCH_GDC.vue";
+// 大武口
+import DWKGDC from "./map/DWK_GDC.vue";
+// 平罗
+import PLGDC from "./map/PL_GDC.vue";
+// 马场湖
+import XHGDC from "./map/XH_GDC.vue";
+
 import SvgIcon from "../../../components/coms/icon/svg-icon.vue";
 import compassIcon from "@/assets/icon/svg_fill/compass.svg";
 export default {
@@ -192,6 +187,10 @@ export default {
     NSSFDC,
     QSFDC,
     SBQFDC,
+	MCHGDC,
+	DWKGDC,
+	PLGDC,
+	XHGDC,
     SvgIcon,
   },
   props: {
@@ -304,6 +303,7 @@ export default {
       this.safeDay = res;
     },
     data(res) {
+		console.log(res)
       this.sourceMap = res;
     },
     xtData(res) {

src/views/Home/components/map/svg-map-nx.vue

@@ -188,7 +188,7 @@
           <g
             v-if="showType === 'all' || showType === 'gf'"
             class="item-label"
-            @click.stop="clickLabel('MCH_GDC', '马场湖光电厂')"
+            @click.stop="clickLabel('MCH_GDC', '马场湖光电场')"
             @mouseover="mouseover(1)"
             @mouseout="mouseout"
           >
@@ -214,7 +214,7 @@
           <g
             v-if="showType === 'all' || showType === 'gf'"
             class="item-label"
-            @click.stop="clickLabel('XH_GDC', '宣和光电厂')"
+            @click.stop="clickLabel('XH_GDC', '宣和光电场')"
             @mouseover="mouseover(2)"
             @mouseout="mouseout"
           >
@@ -267,7 +267,7 @@
           <g
             v-if="showType === 'all' || showType === 'gf'"
             class="item-label"
-            @click="clickLabel('DWK_GDC', '大武口电厂')"
+            @click="clickLabel('DWK_GDC', '大武口光电场')"
             @mouseover="mouseover(4)"
             @mouseout="mouseout"
           >
@@ -293,7 +293,7 @@
           <g
             v-if="showType === 'all' || showType === 'gf'"
             class="item-label"
-            @click="clickLabel('PL_GDC', '平罗光电厂')"
+            @click="clickLabel('PL_GDC', '平罗光电场')"
             @mouseover="mouseover(5)"
             @mouseout="mouseout"
           >

src/views/Others/index.vue

@@ -152,9 +152,9 @@ export default {
         SBQ_FDC: "石板泉风电场",
         XS_FDC: "香山风电场",
         DWK_GDC: "大武口电站",
-        PL_GDC: "平罗光伏电站",
-        XH_GDC: "宣和光伏发电站",
-        MCH_GDC: "马场湖光发伏电站",
+        PL_GDC: "平罗电站",
+        XH_GDC: "宣和电站",
+        MCH_GDC: "马场湖电站",
         JSFW: "计算服务测点",
       },
       earlyAlarmData: {},

src/views/Status/components/static.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="status-panel">
     <div class="pause" v-if="true">中断</div>
-    <ComPanel class="status-com-panel" :title="'海子井光伏电站'">
+    <ComPanel class="status-com-panel" :title="'海子井电站'">
       <div class="p-body">
         <div class="category-box">
           <div class="score">

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

@@ -398,7 +398,7 @@
 								</g>
 								<g>
 									<rect x="237.573" y="303.046" fill="#5A5784" width="34.448" height="9.842"></rect>
-									<text transform="matrix(1 0 0 1 242.2554 309.9297)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="5.9439">光伏备份</text>
+									<text transform="matrix(1 0 0 1 242.2554 309.9297)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="5.9439">光伏备用</text>
 								</g>
 								<g>
 									<rect x="325.137" y="303.418" fill="#5A5784" width="34.447" height="9.842"></rect>

src/views/WindSite/pages/BoosterStation.vue

@@ -134,11 +134,19 @@ export default {
                 text: ele.name,
                 code: ele.id,
               });
+			  if(ele.id == 'QS_FDC'){
+				// 当点击为宋六时
+				btnGroup[0].btns.push({
+				  text: '宋堡第六风电场',
+				  code: 'QS3_FDC',
+				});
+			  }
             } else {
 				btnGroup[1].btns.push({
 				  text: ele.name,
 				  code: ele.id,
 				});
+				
 				if(ele.id == 'PL_GDC'){
 					btnGroup[1].btns.push({
 					  text: '平罗二期光伏电站',
@@ -147,13 +155,6 @@ export default {
 				}
             }
           });
-			
-			
-			// 当点击为宋六时
-			btnGroup[0].btns.push({
-			  text: '宋堡第六风电场',
-			  code: 'QS3_FDC',
-			});
           that.btnGroups = btnGroup;
           that.renderBtnActiveIndex();
         },

src/views/WindSite/pages/Map.vue

@@ -53,6 +53,7 @@
     </div>
     <div class="panel-body">
       <MHSFDC wpId="MHS_FDC" v-if="wpId.indexOf('FDC') !== -1" />
+	  <NSSFDC wpId="NSS_FDC" v-if="wpId.indexOf('FDC') !== -1" />
       <PLGDC wpId="PL_GDC" v-if="wpId.indexOf('GDC') !== -1" />
       <div class="map-popup-panel" v-show="showPopup">
         <!-- <div class="map-popup-panel-header">
@@ -164,6 +165,7 @@
 import BtnGroup2 from "@com/coms/btn/btn-group-double.vue";
 // import SvgIcon from "@com/coms/icon/svg-icon.vue";
 import MHSFDC from "@com/arcgis/MHS_FDC.vue";
+import NSSFDC from "@com/arcgis/NSS_FDC.vue";
 import PLGDC from "@com/arcgis/PL_GDC.vue";
 import dataService from "@/helper/data.js";
 
@@ -174,6 +176,7 @@ export default {
   components: {
     BtnGroup2,
     MHSFDC,
+	NSSFDC,
     PLGDC
   },
   // 数据

src/views/warn/gfgj.vue

@@ -5,21 +5,12 @@
 				<div class="query-item">
 					<div class="lable">光伏：</div>
 					<div class="search-input">
-						<el-select v-model="wpId" clearable placeholder="请选择" popper-class="select" @change=" (wpId) => { Windturbines(); } ">
+						<el-select v-model="wpId" clearable placeholder="请选择" popper-class="select" >
 							<el-option v-for="item in ChangZhan" :key="item.id" :value="item.id" :label="item.name"></el-option>
 						</el-select>
 					</div>
 				</div>
 				<div class="query-item">
-					<div class="lable">机组：</div>
-					<div class="search-input">
-						<el-select v-model="wtId" placeholder="请选择" popper-class="select">
-							<el-option v-for="item in windturbines" :key="item.id" :label="item.name" :value="item.id">
-							</el-option>
-						</el-select>
-					</div>
-				</div>
-				<div class="query-item">
 				  <div class="lable">描述：</div>
 				  <div class="search-input">
 				    <el-input v-model="alarmDesc" placeholder="报警描述"></el-input>
@@ -66,8 +57,6 @@
 				waitAjax:true,//等待执行完了再加载table
 				ChangZhan: [],
 				wpId: "",
-				wtId: "",
-				windturbines: [],
 				alarmDesc: "",
 				startDate: "",
 				endDate: "",
@@ -80,36 +69,24 @@
 							field: "stationName",
 							is_num: false,
 							is_light: false,
-							id: "id",
-						},
-						{
-							name: "机组",
-							field: "windturbineName",
-							is_num: false,
-							is_light: false,
-							id: "id",
-						},
-
+						}, 
 						{
 							name: "报警时间",
 							field: "alertTime",
 							is_num: false,
 							is_light: false,
-							id: "id",
 						},
 						{
 							name: "报警描述",
 							field: "alertText",
 							is_num: false,
 							is_light: false,
-							id: "id",
 						},
 						{
 							name: "报警类别",
-							field: "category2",
+							field: "category1",
 							is_num: false,
 							is_light: false,
-							id: "id",
 						},
 						{
 							name: "报警等级",
@@ -117,7 +94,6 @@
 							is_num: false,
 							is_light: false,
 							sortable: true,
-							id: "id",
 						},
 					],
 					data: [],
@@ -142,7 +118,6 @@
 					success(res) {
 						that.ChangZhan = res.data;
 						that.wpId = res.data[0].id;
-						that.Windturbines(that.wpId)
 						if(that.waitAjax){
 							that.getTable();
 							that.waitAjax=false;
@@ -150,24 +125,6 @@
 					},
 				});
 			},
-			Windturbines(wpId) {
-				let that = this;
-				that.API.requestData({
-					method: "GET",
-					baseURL: "http://10.155.32.4:8082/",
-					subUrl: "powercompare/windturbineAjax",
-					data: {
-						wpId: wpId
-					},
-					success(res) {
-						that.windturbines = res.data;
-						that.windturbines.unshift({
-							id: "",
-							name: "请选择"
-						});
-					},
-				});
-			},
 			getTable() {
 				let that = this;
 				this.tableLoading = true;
@@ -182,7 +139,6 @@
 						starttime: this.startDate,
 						endtime: this.endDate,
 						keyword: this.alarmDesc,
-						windturbineid: this.wtId,
 						pagenum: this.pageIndex,
 						pagesize: this.pageSize,
 					},
@@ -192,6 +148,7 @@
 							let data = res.data.records;
 							data.forEach(ele=>{
 								ele.messageType = messageType[parseInt(ele.messageType) - 1];
+								ele.category1 == 'GF' ? ele.category1 = '光伏': ele.category1 = '升压站';
 							})
 							that.tableData.data = data;
 							that.tableData.total = res.data.total;