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

src/components/chart/pie/dual-pie-chart.vue

@@ -23,52 +23,52 @@ export default {
     innerData: {
       type: Array,
       default: () => [
-        {
-          value: 700,
-          unit: "个",
-          name: "行业大类1",
-        },
-        {
-          value: 679,
-          unit: "个",
-          name: "行业大类2",
-        },
-        {
-          value: 1548,
-          unit: "个",
-          name: "行业大类3",
-        },
+        // {
+        //   value: 700,
+        //   unit: "个",
+        //   name: "行业大类1",
+        // },
+        // {
+        //   value: 679,
+        //   unit: "个",
+        //   name: "行业大类2",
+        // },
+        // {
+        //   value: 1548,
+        //   unit: "个",
+        //   name: "行业大类3",
+        // },
       ],
     },
     // 外部饼图数据
     outerData: {
       type: Array,
       default: () => [
-        {
-          value: 310,
-          unit: "个",
-          name: "邮件营销",
-        },
-        {
-          value: 234,
-          unit: "个",
-          name: "联盟广告",
-        },
-        {
-          value: 335,
-          unit: "个",
-          name: "视频广告",
-        },
-        {
-          value: 548,
-          unit: "个",
-          name: "百度",
-        },
-        {
-          value: 351,
-          unit: "个",
-          name: "谷歌",
-        },
+        // {
+        //   value: 310,
+        //   unit: "个",
+        //   name: "邮件营销",
+        // },
+        // {
+        //   value: 234,
+        //   unit: "个",
+        //   name: "联盟广告",
+        // },
+        // {
+        //   value: 335,
+        //   unit: "个",
+        //   name: "视频广告",
+        // },
+        // {
+        //   value: 548,
+        //   unit: "个",
+        //   name: "百度",
+        // },
+        // {
+        //   value: 351,
+        //   unit: "个",
+        //   name: "谷歌",
+        // },
       ],
     },
     // 颜色

src/router/index.js

@@ -603,7 +603,7 @@ const routes = [{
 	path: "/globalMonitor", // 全局监视
 	name: "globalMonitor",
 	component: () =>
-		import( /* webpackChunkName: "globalMonitor" */ "../views/Others/index.vue"),
+		import( /* webpackChunkName: "globalMonitor" */ "../views/globalMonitor/index.vue"),
 }, 
 /***********************************************************安全管控************************************************************* */
 {

src/store/index.js

@@ -12,6 +12,7 @@ const state = {
   menuData: [],
   windturbineMap: {},
   moudleName: "",
+  tqmapName: "",
 };
 
 //改变状态的方法
@@ -30,6 +31,9 @@ const mutations = {
   },
   changeModuleName(state, newData) {
     state.moudleName = newData;
+  },
+  changeTqmapName(state, newData) {
+    state.tqmapName = newData;
   }
 };
 
@@ -45,6 +49,9 @@ const actions = {
   },
   changeModuleName(context, str) {
     context.commit("changeModuleName", str);
+  },
+  changeTqmapName(context, str) {
+    context.commit("changeTqmapName", str);
   }
 };
 

src/views/Home/Home.vue

@@ -5,7 +5,7 @@
         <Row type="flex" class="weather">
           <Col :span="24">
             <com-panel
-              :title="tqmap.name || '---'"
+              :title="$store.state.tqmapName || tqmap.name || '------'"
               :sub-title="nowTime + ' 实况'"
               icon="fa fa-map-marker"
             >
@@ -104,7 +104,11 @@
               @click="
                 showDoneChart({
                   data: DayPower,
-                  dialogTitle: planBtnName.indexOf('电站') !== -1 || planBtnName.indexOf('光电厂') !== -1 ? '日照强度' : '日发电量',
+                  dialogTitle:
+                    planBtnName.indexOf('电站') !== -1 ||
+                    planBtnName.indexOf('光电厂') !== -1
+                      ? '日照强度'
+                      : '日发电量',
                   dialogType: 'doneLineChart',
                 })
               "
@@ -528,8 +532,14 @@
             <row align="middle">
               <div class="situation-item fengji">
                 <div class="icon fengji-icon svg-icon svg-icon-white">
-                  <svg-icon class="" :svgid="wpId === '-2' || wpId.indexOf('GDC') !== -1 ?  'svg-photovoltaic' : 'svg-风机'" />
-				  
+                  <svg-icon
+                    class=""
+                    :svgid="
+                      wpId === '-2' || wpId.indexOf('GDC') !== -1
+                        ? 'svg-photovoltaic'
+                        : 'svg-风机'
+                    "
+                  />
                 </div>
                 <div class="info">
                   <div class="title green">接入设备</div>
@@ -978,13 +988,24 @@ export default {
         success(res) {
           that.powerData = [
             {
-              title: that.wpId === '-2' || that.wpId.indexOf('GDC') !== -1 ? "日照强度" : "风速",
+              title:
+                that.wpId === "-2" || that.wpId.indexOf("GDC") !== -1
+                  ? "日照强度"
+                  : "风速",
               value: res.data.jczbmap.ssfs,
-              dialogTitle: that.wpId == 0 ? '详情' : that.wpId === '-2' || that.wpId.indexOf('GDC') !== -1 ? "日照强度详情" : "风速详情",
+              dialogTitle:
+                that.wpId == 0
+                  ? "详情"
+                  : that.wpId === "-2" || that.wpId.indexOf("GDC") !== -1
+                  ? "日照强度详情"
+                  : "风速详情",
               subUrl: "genreset/findGLDetail",
               targetName: "ssfs",
               dialogType: "powerLineChart",
-              max: that.wpId === '-2' || that.wpId.indexOf('GDC') !== -1 ? 1200 : 40,
+              max:
+                that.wpId === "-2" || that.wpId.indexOf("GDC") !== -1
+                  ? 1200
+                  : 40,
             },
             {
               title: "保证功率",
@@ -1084,18 +1105,19 @@ export default {
         },
         success(res) {
           let rdlKey = ["value1", "value2", "value3", "speed"];
-		  let dw = {
-			  units:"",
-			  title:""
-		  };
-		  that.wpId === '-2' || that.wpId.indexOf('GDC') !== -1 ? 
-		  dw={
-			  units:"(w/㎡)",
-			  title:"日照"
-		  } : dw={
-			  units:"(m/s)",
-			  title:"风速"
-		  };
+          let dw = {
+            units: "",
+            title: "",
+          };
+          that.wpId === "-2" || that.wpId.indexOf("GDC") !== -1
+            ? (dw = {
+                units: "(w/㎡)",
+                title: "日照",
+              })
+            : (dw = {
+                units: "(m/s)",
+                title: "风速",
+              });
           let DayPower = {
             units: ["(万kWh)", dw.units],
             value: [
@@ -1157,7 +1179,7 @@ export default {
               value: [],
             },
             {
-              title: that.wpId === '-2' ? "日照强度" : "平均风速",
+              title: that.wpId === "-2" ? "日照强度" : "平均风速",
               smooth: true,
               value: [],
             },
@@ -1255,8 +1277,8 @@ export default {
       this.changeShowType(wpId, planBtnName);
     },
     changeShowBackType(wpId, planBtnName) {
-		this.historyWpId = wpId;
-		this.historyPlanBtnName = planBtnName;
+      this.historyWpId = wpId;
+      this.historyPlanBtnName = planBtnName;
       this.changeShowType(this.historyWpId, this.historyPlanBtnName);
     },
     // 打开弹窗
@@ -1313,17 +1335,23 @@ export default {
       this.dialogTitle = res.dialogTitle;
       this.dialogType = res.dialogType;
 
-	  let hour = this.nowTime.split(":")[0];
-	  let minute = this.nowTime.split(":")[1] < 30 ? minute = 1 : minute = 2;
-	  let valueLength = (hour * 2) + 1 + minute;
-	  
-	  res.data.value && res.data.value.forEach((ele,index)=>{
-		  if(this.wpId === '0'){
-			  ele.title.indexOf('电场') !== -1 ? ele.title+='[风速]' : ele.title;
-			  ele.title.indexOf('电站') !== -1 ? ele.title+='[日照]' : ele.title;
-		  }
-		  ele.value.splice(valueLength,48)
-	  })
+      let hour = this.nowTime.split(":")[0];
+      let minute =
+        this.nowTime.split(":")[1] < 30 ? (minute = 1) : (minute = 2);
+      let valueLength = hour * 2 + 1 + minute;
+
+      res.data.value &&
+        res.data.value.forEach((ele, index) => {
+          if (this.wpId === "0") {
+            ele.title.indexOf("电场") !== -1
+              ? (ele.title += "[风速]")
+              : ele.title;
+            ele.title.indexOf("电站") !== -1
+              ? (ele.title += "[日照]")
+              : ele.title;
+          }
+          ele.value.splice(valueLength, 48);
+        });
       this.powerLineChartData = res.data.value;
       if (res.dialogTitle === "详情") {
         this.powerLineChartYAxises = [
@@ -1340,7 +1368,7 @@ export default {
             unit: "(w/㎡)",
           },
         ];
-      }else if(res.dialogTitle === "风速详情") {
+      } else if (res.dialogTitle === "风速详情") {
         this.powerLineChartYAxises = [
           {
             min: 0,
@@ -1349,16 +1377,16 @@ export default {
             unit: "(m/s)",
           },
         ];
-      }else if(res.dialogTitle === "日照强度详情") {
-	    this.powerLineChartYAxises = [
-		  {
-		    min: 0,
-		    name: "日照",
-		    position: "right",
-		    unit: "(w/㎡)",
-		  },
-	    ];
-	  }else {
+      } else if (res.dialogTitle === "日照强度详情") {
+        this.powerLineChartYAxises = [
+          {
+            min: 0,
+            name: "日照",
+            position: "right",
+            unit: "(w/㎡)",
+          },
+        ];
+      } else {
         this.powerLineChartYAxises = [
           {
             min: 0,

src/views/Home/components/map.vue

@@ -199,14 +199,14 @@
         @clickFj="clickFj"
         @changePeriod="changePeriod"
       ></XHGDC>
-	  
-	  <!-- 海子井 -->
-	  <HZJGDC
-	    v-if="mapName === 'HZJ_GDC'"
-	    :data="sourceMap"
-	    @clickFj="clickFj"
-	    @changePeriod="changePeriod"
-	  ></HZJGDC>
+
+      <!-- 海子井 -->
+      <HZJGDC
+        v-if="mapName === 'HZJ_GDC'"
+        :data="sourceMap"
+        @clickFj="clickFj"
+        @changePeriod="changePeriod"
+      ></HZJGDC>
     </div>
   </div>
 </template>
@@ -253,7 +253,7 @@ export default {
     DWKGDC,
     PLGDC,
     XHGDC,
-	HZJGDC,
+    HZJGDC,
     SvgIcon,
   },
   props: {
@@ -338,6 +338,7 @@ export default {
       this.currentMode = "NX";
       this.mapName = "nx";
       this.mapIndex = -1;
+      this.$store.dispatch("changeTqmapName", "");
       this.$emit("mapClickBack", wpId, planBtnName);
     },
     clickLabel(wpId, planBtnName) {

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

@@ -1159,6 +1159,7 @@ export default {
   // 函数
   methods: {
     clickLabel(wpId, planBtnName) {
+      this.$store.dispatch("changeTqmapName", planBtnName);
       this.$emit("clickLabel", wpId, planBtnName);
     },
     popupHide: function () {

src/views/Home/components/weather.vue

@@ -40,14 +40,14 @@
           <div class="svg-icon svg-icon-sm svg-icon-green other-icon">
             <svg-icon svgid="svg-日出" />
           </div>
-          <div class="value">{{ sunrise }}</div>
+          <div class="value">{{ sourceMap.richushijian }}</div>
           <div class="text">日出时间</div>
         </Col>
         <Col>
           <div class="svg-icon svg-icon-sm svg-icon-green other-icon">
             <svg-icon svgid="svg-日落" />
           </div>
-          <div class="value">{{ sunset }}</div>
+          <div class="value">{{ sourceMap.riluoshijian }}</div>
           <div class="text">日落时间</div>
         </Col>
       </Row>

src/views/LightMatrix/LightMatrix.vue

@@ -123,7 +123,7 @@
                     >
                       <SvgIcon svgid="svg-A"></SvgIcon>
                     </i>
-                    <span>{{ cItem.fdl }}</span>
+                    <span>{{ cItem.fs }}</span>
                   </div>
                   <div class="num">
                     <i
@@ -149,7 +149,7 @@
                     >
                       <SvgIcon svgid="svg-V"></SvgIcon>
                     </i>
-                    <span>{{ cItem.fs }}</span>
+                    <span>{{ cItem.fdl }}</span>
                   </div>
                 </div>
               </div>

src/views/NewPages/alarm-center-1.vue

@@ -607,6 +607,7 @@ export default {
           enddate: enddate,
         },
       });
+
       ////////
       this.tableData = [];
       const resData = data.data;
@@ -649,7 +650,6 @@ export default {
           map[k] = resData[i][k];
         }
       }
-      console.log("map", map);
       // nmap为新的map 整理数据结构
       const nmap = {};
       for (let kv in map) {
@@ -662,7 +662,6 @@ export default {
         }
         nmap[kv] = nchildMap;
       }
-      console.log("nmap", nmap);
       windNum = Object.keys(nmap);
       var cascaderOptions = [];
       var root = {}; // 原始根节点
@@ -702,7 +701,6 @@ export default {
         }
       }
       this.cascaderOptions = cascaderOptions;
-      console.log(123123, cascaderOptions);
     },
     fx() {
       this.startdate = new Date(this.startdate).formatDate("yyyy-MM-dd");

src/views/NewPages/area-line-chart.vue

@@ -375,6 +375,7 @@ export default {
         yAxis: [
           {
             type: "value",
+            splitLine: { show: false },
           },
           {
             type: "value",
@@ -394,6 +395,7 @@ export default {
               show: false,
             },
             splitLine: {
+              show: false,
               lineStyle: {
                 type: "dashed",
                 dashOffset: 10,
@@ -404,12 +406,14 @@ export default {
           {
             data: [this.areaData[0].name],
             axisLabel: { show: false },
+            splitLine: { show: false },
           },
           {
             name: "风速",
             type: "value",
             min: 0,
             max: 30,
+            splitLine: { show: false },
           },
         ],
         series: [],

src/views/NewPages/dj1.vue

@@ -648,7 +648,7 @@
             <dual-pie-chart
               height="350px"
               :innerData="yearWindPieData"
-              :outerData="myearWindPieData"
+              :outerData="yearWindPieData"
             />
           </panel>
         </el-col>

src/views/alarmCenter/boosterAlarm.vue

@@ -5,7 +5,12 @@
         <div class="query-item">
           <div class="lable">场站：</div>
           <div class="search-input">
-            <el-select v-model="stationId" clearable placeholder="请选择" popper-class="select">
+            <el-select
+              v-model="stationId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
               <el-option
                 v-for="item in ChangZhan"
                 :key="item.id"
@@ -39,6 +44,24 @@
             ></el-date-picker>
           </div>
         </div>
+        <div class="query-item">
+          <div class="lable">等级：</div>
+          <div class="search-input">
+            <el-select
+              v-model="level"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in levelArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
+            </el-select>
+          </div>
+        </div>
         <div class="query-actions">
           <button class="btn green" @click="getTable()">查询</button>
           <button class="btn green" @click="exportExcel()">导出</button>
@@ -70,6 +93,33 @@ export default {
     let that = this;
     return {
       ChangZhan: [],
+      levelArray: [
+        {
+          id: "",
+          name: "请选择",
+        },
+        {
+          id: "1",
+          name: "低",
+        },
+        {
+          id: "2",
+          name: "中低",
+        },
+        {
+          id: "3",
+          name: "中",
+        },
+        {
+          id: "4",
+          name: "中高",
+        },
+        {
+          id: "5",
+          name: "高",
+        },
+      ],
+      level: "",
       stationId: "MHS_FDC",
       startDate: "",
       endDate: "",
@@ -84,7 +134,7 @@ export default {
             is_num: false,
             is_light: false,
             sortable: true,
-            id: "id"
+            id: "id",
           },
           {
             name: "变电站",
@@ -92,7 +142,7 @@ export default {
             is_num: false,
             is_light: false,
             sortable: true,
-            id: "id"
+            id: "id",
           },
 
           {
@@ -101,7 +151,7 @@ export default {
             is_num: false,
             is_light: false,
             sortable: true,
-            id: "id"
+            id: "id",
           },
           {
             name: "报警描述",
@@ -109,7 +159,7 @@ export default {
             is_num: false,
             is_light: false,
             sortable: true,
-            id: "id"
+            id: "id",
           },
           {
             name: "处理方式",
@@ -117,12 +167,12 @@ export default {
             is_num: false,
             is_light: false,
             sortable: true,
-            id: "id"
-          }
+            id: "id",
+          },
         ],
         data: [],
-        currentPageTotal: 0
-      }
+        currentPageTotal: 0,
+      },
     };
   },
   created() {
@@ -144,7 +194,7 @@ export default {
         success(res) {
           that.ChangZhan = res.data;
           that.stationId = res.data[0].id;
-        }
+        },
       });
     },
     getTable() {
@@ -161,13 +211,14 @@ export default {
           starttime: this.startDate,
           endtime: this.endDate,
           pagenum: this.pageIndex,
-          pagesize: this.pageSize
+          pagesize: this.pageSize,
+          rank: that.level,
         },
         success(res) {
           that.tableData.data = res.data.records;
           that.tableLoading = false;
           that.tableData.total = res.data.total;
-        }
+        },
       });
     },
     onChangePage(params) {
@@ -175,10 +226,10 @@ export default {
       this.pageSize = params.pageSize;
       this.getTable();
     },
-    exportExcel(){
-        this.BASE.exportExcel(this.tableData,"升压站报警");
-    }
-  }
+    exportExcel() {
+      this.BASE.exportExcel(this.tableData, "升压站报警");
+    },
+  },
 };
 </script>
 <style scoped>

src/views/alarmCenter/scadaAlarm.vue

@@ -156,23 +156,23 @@ export default {
         },
         {
           id: "1",
-          name: "一级",
+          name: "低",
         },
         {
           id: "2",
-          name: "二级",
+          name: "中低",
         },
         {
           id: "3",
-          name: "三级",
+          name: "中",
         },
         {
           id: "4",
-          name: "四级",
+          name: "中高",
         },
         {
           id: "5",
-          name: "五级",
+          name: "高",
         },
       ],
       level: "",
@@ -315,13 +315,13 @@ export default {
           windturbineid: this.wtId,
           pagenum: this.pageIndex,
           pagesize: this.pageSize,
+          rank: that.level,
         },
         success(res) {
           if (res.data) {
-			  let rank = ['低','中低','中','中高','高'];
-			  res.data.records.forEach((ele,index) =>{
-				ele.rank = rank[parseInt(ele.rank) - 1]
-			  })
+            res.data.records.forEach((ele, index) => {
+              ele.rank = that.levelArray[parseInt(ele.rank)]?.name;
+            });
             that.tableData.data = res.data.records;
             that.tableData.total = res.data.total;
           } else {