Merge branch 'mw2' of ssh://61.161.152.110:29418/electronic-map into tjj2

# Conflicts:
#	src/views/Others/index.vue

src/components/other/healthReport/index.vue

@@ -395,12 +395,16 @@
 
       <div class="textBox">
         <el-form>
-          <el-form-item class="imp fw text-indent-2">功率对部件温度影响</el-form-item>
-          <el-form-item class="text-indent-2">
-			  统计周期内，{{partwdContent}}
+          <el-form-item class="imp fw text-indent-2"
+            >功率对部件温度影响</el-form-item
+          >
+          <el-form-item class="text-indent-2"
+            >统计周期内，齿轮箱温度“900-1050”、
+            “1200-1350”大于平均值；主轴温度“450-600”、
+            “1200-1350”大于平均值。（只显示大于平均值的，没有就不显示，如果完全没有就显示在统计周期内，各个部件温度良好）
           </el-form-item>
           <div class="logHead">
-            功率对部件温度影响统计
+            功率对部件温度影响统计（红字对比平均值高，绿字对比平均值低）
           </div>
           <el-table
             empty-text="暂无数据"
@@ -423,7 +427,7 @@
             <el-table-column prop="min750" label="750-900"></el-table-column>
             <el-table-column prop="min900" label="900-1050"></el-table-column>
             <el-table-column prop="min1050" label="1050-1200"></el-table-column>
-            <el-table-column prop="min1200" label="1200-1350" class="red"></el-table-column>
+            <el-table-column prop="min1200" label="1200-1350"></el-table-column>
             <el-table-column prop="min1350" label="1350-1500"></el-table-column>
           </el-table>
         </el-form>
@@ -435,8 +439,8 @@
             ><b>部件劣化状态</b></el-form-item
           >
           <el-form-item class="imp fw">总览：</el-form-item>
-          <el-form-item class="text-indent-2">
-			  统计周期内，发电机劣化频次为1次，齿轮箱劣化频次为0次；变桨劣化频次为0次；主轴劣化频次为1次。
+          <el-form-item class="text-indent-2"
+            >统计周期内，发电机劣化频次为1次，齿轮箱劣化频次为0次；变桨劣化频次为0次；主轴劣化频次为1次。
           </el-form-item>
           <div class="logHead">部件劣化频次总览</div>
           <el-table
@@ -1096,8 +1100,6 @@ export default {
       fnlyls: [],
       //功率对部件温度影响
       partwds: [],
-	  // 功率对部件温度影响的头部文字介绍
-	  partwdContent:[],
       // 性能评价
       xnpjjg: [],
       //性能评价明细
@@ -2033,8 +2035,7 @@ export default {
             // 功率对部件温度影响
             that.partwds = [];
             let partwds = res.data.healthreport.partwds;
-            let partwd = [],
-				partwdContent = '';
+            let partwd = [];
             partwds.forEach((item, i) => {
               let bj = "";
               if (item.part == "zk") {
@@ -2071,17 +2072,7 @@ export default {
                 min1200: item.power == "1200kw-1350kw" ? item.value : 0,
                 min1350: item.power == "1350kw-1500kw" ? item.value : 0,
               });
-			  
-			  if(item.power == "1200kw-1350kw" || item.power == "1350kw-1500kw"){
-				  partwdContent += item.type+','
-			  }
-			  // （红字对比平均值高，绿字对比平均值低）
             });
-			if(partwdContent){
-				that.partwdContent = partwdContent.substring(0,partwdContent.length-1) +'大于平均值';
-			}else{
-				that.partwdContent = '各个部件温度良好。'
-			}
             that.partwds = partwd;
 
             // 性能评价结果
@@ -2633,6 +2624,5 @@ export default {
   .el-table td {
     color: black;
   }
-  .red{color: #BA3237;}
 }
 </style>

src/views/Home/Home.vue

@@ -945,6 +945,7 @@ export default {
           wpId: that.wpId,
         },
         success(res) {
+          console.log('resWeather:',res)
           const keys = ["wd", "sd"];
           let weatherChart = [
             {
@@ -990,6 +991,7 @@ export default {
           id: that.wpId,
         },
         success(res) {
+          console.log('basicData:',res)
           that.powerData = [
             {
               title: "风速",

src/views/NewPages/iframe4.vue

@@ -2,23 +2,19 @@
   <div class="iframe4">
     <!-- <iframe src="http://10.75.17.10/doc/page/preview.asp" frameborder="0" class="iframe-2"></iframe> -->
     <div class="iframe-1">
-      <div class="iframe4-title" @click="jumpUrl('/save/personnel')">人员健康</div>
       <personnel></personnel>
     </div>
     <div class="iframe-2">
-      <div class="iframe4-title">视频监视</div>
-      <div class="videoDiv" v-for="(pItem, pIndex) in videoArray" :key="pIndex" width="95%" height="48vh" @click="openVideoDialog(pItem)">
+      <div v-for="(pItem, pIndex) in videoArray" :key="pIndex" width="95%" height="48vh" @click="openVideoDialog(pItem)">
         <div class="mask"></div>
         <iframe :src="pItem.url + pItem.token" />
       </div>
     </div>
     <div class="iframe-3">
-      <div class="iframe4-title" @click="openUrl('http://192.168.1.52/webiui/#/online')">智能安全帽</div>
       <iframe src="http://192.168.1.52/webiui/#/online" frameborder="0"></iframe>
     </div>
     <div class="iframe-4">
-      <div class="iframe4-title">数字孪生</div>
-      <div class="iframe-4-body"></div>
+      <!-- <personnel></personnel> -->
     </div>
     <el-dialog top="50px" v-model="showVideoDialog" width="80vw" :destroy-on-close="true" :custom-class="videoDialogClass">
       <iframe class="videoBoxiframe" width="100%" height="600px" :src="dialogVideoUrl" />
@@ -77,12 +73,6 @@ export default {
         this.showVideoDialog = true;
       }
     },
-    jumpUrl(url) {
-      this.$router.push(url);
-    },
-    openUrl(url) {
-      window.open(url);
-    },
   },
   created() {},
 };
@@ -90,6 +80,8 @@ export default {
 
 <style lang="less">
 .iframe4 {
+  // width: 98.5vw;
+  // height: 98.5vh;
   background: url(../../assets/background-iframe4.png) no-repeat;
   background-size: 100% 100%;
   background-position-y: -5.1vh;
@@ -100,19 +92,12 @@ export default {
   .iframe-2,
   .iframe-3,
   .iframe-4 {
+    // position: fixed;
+    // z-index: 1;
     width: 36.8vw;
     height: 37.31vh;
   }
-  .iframe4-title {
-    position: absolute;
-    text-align: center;
-    width: 36.8vw;
-    margin-top: -3.3vh;
-    text-align: center;
-    font-size: 14pt;
-    color: #b3bdc0;
-    cursor: pointer;
-  }
+
   .iframe-1 {
     margin-left: 6.5vw;
     margin-top: 5.3vh;
@@ -128,7 +113,7 @@ export default {
     margin-left: 11.9vw;
     margin-top: 5.5vh;
     position: relative;
-    .videoDiv {
+    div {
       display: flex;
       height: 18.2vh;
       width: 12.2vw;
@@ -140,7 +125,6 @@ export default {
         // float: left;
       }
       .mask {
-        cursor: pointer;
         flex: 0 0 100%;
         position: absolute;
         left: 0;
@@ -151,32 +135,18 @@ export default {
       }
     }
   }
-  .iframe-3,
-  .iframe-4 {
-    margin-top: -2.2vh;
-    height: calc(36.5vh);
-    width: 36.77vw;
-  }
   .iframe-3 {
+    height: calc(36.6vh);
     margin-left: 6.5vw;
-    // background-color: seashell;
+    margin-top: -0.7vh;
+    background-color:seashell;
     iframe {
       height: 100%;
       width: 100%;
     }
   }
-  .el-dialog {
+  .modal.el-dialog {
     background: rgba(18, 29, 28, 0.95);
-  }
-  .iframe-4 {
-    margin-left: 11.9vw;
-    .iframe-4-body {
-      background-image: url("../../assets/3D.png");
-      // background-color: aqua;
-      background-size: cover;
-      height: 100%;
-      width: 100%;
     }
-  }
 }
 </style>

src/views/Others/index.vue

@@ -2,10 +2,27 @@
   <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">
       <!-- card-1 -->
+            <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
       <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
           <p class="itemTitle">
             记录查询
+            数据查询
+          </p>
+          <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>
+
+      <!-- card-2 -->
+      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+        <div class="itemBox">
+          <p class="itemTitle">
+            预警记录
           </p>
           <div class="df-table">
             <div class="sjcx-item" v-for="item in earlyAlarmColumn" :key="item" @click="jumpUrl(item.url)">
@@ -15,9 +32,38 @@
           </div>
         </div>
       </el-carousel-item>
+     
 
       <!-- card-2 -->
+      <!-- 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="tableData3" :pageSize="20">
+            </ComTable>
+          </div>
+        </div>
+      </el-carousel-item>
 
+ <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+      <!-- card-4 -->
+      <!-- <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>
+           <ComTable height="30vh" :data="tableData7" :pageSize="20">
+            </ComTable>
+            <ComTable height="30vh" :data="tableData8" :pageSize="20">
+            </ComTable>
+        </div>
+      </el-carousel-item> -->
+      <!-- card-5 -->
       <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
           <p class="itemTitle">
@@ -27,32 +73,40 @@
           <div class="imageBox1">
             <div class="imgItem1" @click="jumpUrl('/others/tjfx')">
               <el-image class="img1" src="./static/img/o统计分析.png" fit="fill" />
+              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
               <p class="imgTitle">统计分析</p>
             </div>
             <div class="imgItem1" @click="jumpUrl('/others/bdzcx')">
               <el-image class="img1" src="./static/img/o表底值查询.png" fit="fill" />
+              <el-image class="img1" src="./static/img/新能源日报.png" fit="fill" />
               <p class="imgTitle">表底值查询</p>
             </div>
             <div class="imgItem1" @click="jumpUrl('/others/xnyrb')">
               <el-image class="img1" src="./static/img/o新能源日报.png" fit="fill" />
+              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
               <p class="imgTitle">新能源日报</p>
             </div>
             <div class="imgItem1" @click="jumpUrl('/others/xnyfdscyb')">
               <el-image class="img1" src="./static/img/o新能源月报.png" fit="fill" />
+              <el-image class="img1" src="./static/img/新能源日报.png" fit="fill" />
               <p class="imgTitle">新能源风电生产月报</p>
             </div>
             <div class="imgItem1" @click="jumpUrl('/others/fdczzdy')">
               <el-image class="img1" src="./static/img/o风场自定义.png" fit="fill" />
+              <el-image class="img1" src="./static/img/新能源日报.png" fit="fill" />
               <p class="imgTitle">风电场站自定义</p>
             </div>
             <div class="imgItem1" @click="jumpUrl('/others/fdxmzdy')">
               <el-image class="img1" src="./static/img/o风电自定义.png" fit="fill" />
+              <el-image class="img1" src="./static/img/oa日报.png" fit="fill" />
               <p class="imgTitle">风电项目自定义</p>
             </div>
           </div>
         </div>
       </el-carousel-item>
       <!-- card-3 -->
+        <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+      <!-- card-6 -->
       <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
           <p class="itemTitle">
@@ -67,6 +121,7 @@
         </div>
       </el-carousel-item>
 
+
       <!-- card-4 -->
       <!-- <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
@@ -81,51 +136,21 @@
         </div>
       </el-carousel-item> -->
       <!-- card-5 -->
-      <!-- <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+            <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">
+            <ComTable height="30vh" :data="tableData3" >
+            <ComTable height="30vh" :data="tableData4" :pageSize="20">
             </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('/others/knowledge/knowledge')">
-              <el-image class="img1" src="./static/img/o故障体系.png" fit="fill" />
-              <p class="imgTitle">故障体系</p>
-            </div>
-            <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('/others/knowledge/knowledge5')">
-              <el-image class="img1" src="./static/img/o特征参数.png" fit="fill" />
-              <p class="imgTitle">特征参数</p>
-            </div>
-            <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('/health/gzzd/malfunctionDiagnose')">
-              <el-image class="img1" src="./static/img/o评价体系.png" fit="fill" />
-              <p class="imgTitle">评价体系</p>
-            </div>
-            <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>
+      
     </el-carousel>
   </div>
 </template>
@@ -159,29 +184,19 @@ export default {
       },
       earlyAlarmData: {},
       earlyAlarmColumn: [
-        {
-          name: "升压站告警",
-          key: "syzgj",
-          url: "/others/alarmCenter/boosterAlarm",
-        },
-        {
-          name: "升压站动作",
-          key: "",
-          url: "/others/alarmCenter/boosterAlarm",
-        },
+        { 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: "tj", url: "/others/alarmCenter/tjsj" },
+        { name: "限电管理", key: "xd", url: "/others/alarmCenter/xdgl" },
+        { name: "状态转换记录", key: "", url: "" },
+        { name: "操作记录", key: "", url: "" },
+        { name: "升压站动作", key: "", url: "" },
+        { name: "升压站告警", key: "syzgj", url: "/others/alarmCenter/boosterAlarm" },
+        { name: "风机告警", key: "fjgj", url: "/others/alarmCenter/scadaAlarm" },
+        { name: "风机预警", key: "fjyj", url: "/others/alarmCenter/alarmcenter" },
         { name: "操作记录", key: "", url: "" },
       ],
       tableData1: {
@@ -471,11 +486,12 @@ export default {
     },
     async getEarlyAlarmData() {
       const that = this;
-      const { data } = await that.API.requestData({
+      const {data} = await that.API.requestData({
         method: "GET",
         baseURL: "http://192.168.1.18:8075/",
         subUrl: "alarm/count/todaycount",
-        success(res) {},
+        success(res) {
+          },
       });
       this.earlyAlarmData = data.data;
     },

src/views/SandTable/SandTable.vue

@@ -751,10 +751,6 @@ export default {
               name: ele.relatePartsText,
             });
           }
-		  
-		  // 这句warnChartData.pop();在项目演示结束后删除，因为条数过多，显示导致侧边栏和图表图层重合而加的
-		  warnChartData.pop();
-		 
           that.warnChartData = warnChartData;
         },
       });

src/views/WindSite/WindSite.vue

@@ -1,187 +1,203 @@
 <template>
-	<div class="wind-site">
-		<div class="page-common-body">
-			<div class="page-common-body-router">
-				<router-view />
-			</div>
-			<div class="page-common-body-menu">
-				<div class="page-common-body-menu-box">
-					<div class="page-common-body-menu-border left top"></div>
-					<div class="page-common-body-menu-border left bottom"></div>
-					<div class="page-common-body-menu-border right top"></div>
-					<div class="page-common-body-menu-border right bottom"></div>
-					<router-link v-for="(menuData, index) of menuDatas" :key="index" :to="menuData.path" >
-						<div class="page-common-body-menu-item"
-							:class="{ active: activeIndex == index}" @click="clickMenu(index)">
-							<span class="svg-icon" :class="activeIndex == index ? 'svg-icon-yellow' : 'svg-icon-green'">
-								<SvgIcon :svgid="menuData.icon"></SvgIcon>
-							</span>
-						</div>
-					</router-link>
-				</div>
-			</div>
-		</div>
-	</div>
+  <div class="wind-site">
+    <div class="page-common-body">
+      <div class="page-common-body-router">
+        <router-view />
+      </div>
+      <div class="page-common-body-menu">
+        <div class="page-common-body-menu-box">
+          <div class="page-common-body-menu-border left top"></div>
+          <div class="page-common-body-menu-border left bottom"></div>
+          <div class="page-common-body-menu-border right top"></div>
+          <div class="page-common-body-menu-border right bottom"></div>
+          <router-link v-for="(menuData, index) of menuDatas" :key="index" :to="menuData.path">
+            <div class="page-common-body-menu-item" @click="clickMenu(index)" :class="{ active: activeIndex == index }">
+              <span class="svg-icon" :class="activeIndex == index ? 'svg-icon-yellow' : 'svg-icon-green'">
+                <SvgIcon :svgid="menuData.icon"></SvgIcon>
+              </span>
+            </div>
+          </router-link>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
-	import SvgIcon from "@com/coms/icon/svg-icon.vue";
-	import $ from "jquery";
-	export default {
-		// 名称
-		name: "WindSite",
-		// 使用组件
-		components: {
-			SvgIcon,
-		},
-		// 数据
-		data() {
-			return {
-				endPath: 0,
-				windsitePath: '',
-				activeIndex: 0,
-				menuDatas: [{
-						icon: "svg-s场站监视",
-						path: "/monitor/windsite/home",
-					},
-					{
-						icon: "svg-s总貌",
-						path: "/monitor/windsite/generalappearance",
-					},
-					{
-						icon: "svg-s升压站",
-						path: "/monitor/windsite/boosterstation",
-					},
-					{
-						icon: "svg-matrix",
-						path: "/monitor/windsite/matrix",
-					},
-					{
-						icon: "svg-s测风塔",
-						path: "/monitor/windsite/tower",
-					},
-					{
-						icon: "svg-s地图",
-						path: "/monitor/windsite/map",
-					},
-					{
-						icon: "svg-s指标列表",
-						path: "/monitor/windsite/draughtfanlist",
-					},
-					{
-						icon: "svg-wind-site",
-						path: '/monitor/windsite/info/MHS_FDC/MG01_01',
-					},
-					
-				],
-			};
-		},
-		// 函数
-		methods: {
-			clickMenu: function(index) {
-			  this.activeIndex = index;
-			},
-			menu() {
-				this.menuDatas.forEach((ele) => {
-					if (ele.icon == 'svg-wind-site') {
-						ele.path = ele.path
-					} else {
-						ele.path = ele.path + "/" + this.$route.params.wpId;
-					}
-				});
-			},
-		},
-		created() {
-			this.menu();
-		},
-	};
+import SvgIcon from "@com/coms/icon/svg-icon.vue";
+export default {
+  // 名称
+  name: "WindSite",
+  // 使用组件
+  components: {
+    SvgIcon,
+  },
+  // 数据
+  data() {
+    return {
+      activeIndex: 0,
+      menuDatas: [
+        {
+          icon: "svg-s场站监视",
+          path: "/monitor/windsite/home",
+        },
+        {
+          icon: "svg-s指标列表",
+          path: "/monitor/windsite/draughtfanlist",
+        },
+        // {
+        //   icon: "svg-agc",
+        //   path: "/monitor/windsite/matrix",
+        // },
+        // {
+        //   icon: "svg-agc",
+        //   path: "/monitor/windsite/lightmatrix",
+        // },
+        // {
+        //   icon: "svg-intranet-involvement",
+        //   path: "/monitor/windsite/box",
+        // },
+        // {
+        //   icon: "svg-matrix",
+        //   path: "/monitor/windsite/info",
+        // },
+        {
+          icon: "svg-s测风塔",
+          path: "/monitor/windsite/tower",
+        },
+        // {
+        //   icon: "svg-easy-compass",
+        //   path: "/monitor/windsite/Inverter-Info",
+        // },
+        // {
+        //   icon: "svg-easy-compass",
+        //   path: "/monitor/windsite/map",
+        // },
+        // {
+        //   icon: "svg-easy-compass",
+        //   path: "/monitor/windsite/map1",
+        // },
+        {
+          icon: "svg-matrix",
+          path: "/monitor/windsite/matrix",
+        },
+        {
+          icon: "svg-s总貌",
+          path: "/monitor/windsite/generalappearance",
+        },
+        {
+          icon: "svg-s升压站",
+          path: "/monitor/windsite/boosterstation",
+        },
+        {
+          icon: "svg-s地图",
+          path: "/monitor/windsite/map",
+        },
+      ],
+    };
+  },
+  // 函数
+  methods: {
+    clickMenu: function(index) {
+      this.activeIndex = index;
+    },
+  },
+
+  created() {
+    this.menuDatas.forEach((ele) => {
+      ele.path = ele.path + "/" + this.$route.params.wpId;
+    });
+  },
+
+  mounted() {},
+};
 </script>
 
 <style lang="less" scoped>
-	.wind-site {
-		.page-common-body {
-			display: flex;
-			flex-direction: row;
-			margin-top: 0.741vh;
-
-			.page-common-body-router {
-				overflow: auto;
-				overflow-x: hidden;
-				height: calc(100vh - 7.037vh);
-				flex: 1 1 auto;
-			}
-
-			.page-common-body-menu {
-				width: 7.407vh;
-				padding: 0 1.481vh 1.481vh 1.481vh;
-
-				.page-common-body-menu-box {
-					border: 0.093vh solid @darkgray;
-					background-color: fade(@darkgray, 30%);
-					padding: 2.222vh 0.185vh;
-					position: relative;
-
-					.page-common-body-menu-border {
-						position: absolute;
-						width: 0.37vh;
-						height: 0.37vh;
-						background-color: @write;
-						border-radius: 50%;
-
-						&.left {
-							left: -0.185vh;
-						}
-
-						&.right {
-							right: -0.185vh;
-						}
-
-						&.top {
-							top: -0.185vh;
-						}
-
-						&.bottom {
-							bottom: -0.185vh;
-						}
-					}
-
-					.page-common-body-menu-item {
-						border: 0.093vh solid fade(@green, 40%);
-						width: 3.889vh;
-						height: 3.889vh;
-						border-radius: 0.278vh;
-						margin-top: 0.741vh;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						cursor: pointer;
-
-						a {
-							line-height: 0;
-						}
-
-						// &:first-child {
-						//   margin-top: 0;
-						// }
-
-						&.active {
-							border-color: fade(@yellow, 40%);
-							position: relative;
-
-							&::after {
-								content: "";
-								width: calc(100% - 0.37vh);
-								height: calc(100% - 0.37vh);
-								position: absolute;
-								border: 0.093vh solid @yellow;
-								box-shadow: 0 0 0.37vh @yellow;
-								top: 0.093vh;
-								left: 0.093vh;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-</style>
+.wind-site {
+  .page-common-body {
+    display: flex;
+    flex-direction: row;
+    margin-top: 0.741vh;
+
+    .page-common-body-router {
+      overflow: auto;
+      overflow-x: hidden;
+      height: calc(100vh - 7.037vh);
+      flex: 1 1 auto;
+    }
+
+    .page-common-body-menu {
+      width: 7.407vh;
+      padding: 0 1.481vh 1.481vh 1.481vh;
+
+      .page-common-body-menu-box {
+        border: 0.093vh solid @darkgray;
+        background-color: fade(@darkgray, 30%);
+        padding: 2.222vh 0.185vh;
+        position: relative;
+
+        .page-common-body-menu-border {
+          position: absolute;
+          width: 0.37vh;
+          height: 0.37vh;
+          background-color: @write;
+          border-radius: 50%;
+
+          &.left {
+            left: -0.185vh;
+          }
+
+          &.right {
+            right: -0.185vh;
+          }
+
+          &.top {
+            top: -0.185vh;
+          }
+
+          &.bottom {
+            bottom: -0.185vh;
+          }
+        }
+
+        .page-common-body-menu-item {
+          border: 0.093vh solid fade(@green, 40%);
+          width: 3.889vh;
+          height: 3.889vh;
+          border-radius: 0.278vh;
+          margin-top: 0.741vh;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          cursor: pointer;
+
+          a {
+            line-height: 0;
+          }
+
+          // &:first-child {
+          //   margin-top: 0;
+          // }
+
+          &.active {
+            border-color: fade(@yellow, 40%);
+            position: relative;
+
+            &::after {
+              content: "";
+              width: calc(100% - 0.37vh);
+              height: calc(100% - 0.37vh);
+              position: absolute;
+              border: 0.093vh solid @yellow;
+              box-shadow: 0 0 0.37vh @yellow;
+              top: 0.093vh;
+              left: 0.093vh;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/views/WindSite/components/boosterstation/BoosterStation.js

@@ -11,12 +11,10 @@ export class BoosterStation {
 			"qs3ubkv110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0002" },
 			"qs3uckv110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0003" },
 			"qs3uabkv110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0009" },
-			"qs3fhz110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0012" },
 			"qs3uakv110r": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0001" },
 			"qs3laa110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0004" },
 			"qs3pmw110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0013" },
 			"qs3qmvar110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0014" },
-			"qs3cos110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0016" },
 			"qs3uakv35r": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0053" },
 			"qs3laa35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0056" },
 			"qs3pmw35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0116" },
@@ -25,13 +23,8 @@ export class BoosterStation {
 			"qs3ubkv35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0538" },
 			"qs3uckv35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0539" },
 			"qs3uabkv35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0573" },
-			"qs3fhz35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0639" },
 			"qs3ymwd": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0162" },
 			"qs3rzwd": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0161" },
-			"qs3ruakv": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0059" },
-			"qs3rlaa": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0062" },
-			"qs3rpmw": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0123" },
-			"qs3rqmvar": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0124" },
 			"qs3dw": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0155" },
 			"qs3uabkvc": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0573" },
 			"qs3ubckv": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0574" },
@@ -247,7 +240,7 @@ export class BoosterStation {
 			"qsqmvarzb1s": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0459" },
 			"qscoszb1s": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0461" },
 			"qsuakvzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0177" },
-			"qsuabkvzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0183" },
+			"qsuabkvzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0162" },
 			"qs3uozb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0005" },
 			"qslaazb2x": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0708" },
 			"qspmwzb2x": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0714" },
@@ -257,7 +250,7 @@ export class BoosterStation {
 			"qsrzwdzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0481" },
 			"qsdwzb2": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI1249" },
 			"qsuakvzb1": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0161" },
-			"qsuabkvzb1": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0167" },
+			"qsuabkvzb1": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0178" },
 			"qs3u0vzb1": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0006" },
 			"qslaazb1x": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0468" },
 			"qspmwzb1x": { tag: "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0474" },

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

@@ -1359,13 +1359,13 @@
                 <g>
                   <text transform="matrix(1 0 0 1 24.1226 476.4844)">
                     <tspan
-                      x="-7"
+                      x="0"
                       y="0"
                       fill="#97A1A2"
                       font-family="'MicrosoftYaHei'"
                       font-size="11.3899"
                     >
-                      Uab
+                      Ub
                     </tspan>
                     <tspan
                       x="15.778"
@@ -1559,13 +1559,13 @@
                 <g>
                   <text transform="matrix(1 0 0 1 937.8662 460.2295)">
                     <tspan
-                      x="5"
+                      x="0"
                       y="0"
                       fill="#97A1A2"
                       font-family="'MicrosoftYaHei'"
                       font-size="11.3899"
                     >
-                      Ua
+                      Uab
                     </tspan>
                     <tspan
                       x="22.074"
@@ -1605,7 +1605,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="11.3899"
                     >
-                      Uab
+                      Ubc
                     </tspan>
                     <tspan
                       x="21.49"

src/views/WindSite/pages/BoosterStation.vue

@@ -33,7 +33,7 @@
     <PL1 class="booster-station-body" v-if="wpId === 'PL_GDC'" />
 
     <!-- 平罗二期 -->
-    <PL2 class="booster-station-body" v-if="wpId === 'PL_GDC'" />
+    <PL2 class="booster-station-body" v-if="wpId === 'PL2_GDC'" />
 
     <!-- 宣和 -->
     <XH class="booster-station-body" v-if="wpId === 'XH_GDC'" />
@@ -140,6 +140,10 @@ export default {
               });
             }
           });
+			btnGroup[1].btns.push({
+			  text: '平罗二期光伏电站',
+			  code: 'PL2_GDC',
+			});
 			
 			// 当点击为宋六时
 			btnGroup[0].btns.push({

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

@@ -68,8 +68,8 @@
       <el-col :span="10" class="background">
         <el-row type="flex" justify="center" :align="'middle'" class="power-load">
           <!-- 功率复核 PowerLoad -->
-          <el-col v-for="(item , index) in PowerLoad" :key="item" :span="6">
-            <dash-pie-chart :title="item.title" :value="sourceMap.jczbmap && sourceMap.jczbmap[item.key]" height="9.722vh" :max="index==0 ? 100 : 2500"/>
+          <el-col v-for="item in PowerLoad" :key="item" :span="6">
+            <dash-pie-chart :title="item.title" :value="sourceMap.jczbmap && sourceMap.jczbmap[item.key]" height="9.722vh" />
           </el-col>
         </el-row>
       </el-col>

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

@@ -234,20 +234,18 @@ export default {
   created() {
     let that = this;
     that.wpId = that.$route.params.wpId;
-	that.wtId = that.$route.params.wtId;
-	this.$router.replace(`/monitor/windsite/info/${that.wpId}/${that.wtId}`);
     that.$nextTick(() => {
       that.requestData(false);
-      // that.timmer = setInterval(() => {
-      //   that.requestData(false);
-      // }, that.$store.state.websocketTimeSec);
+      that.timmer = setInterval(() => {
+        that.requestData(false);
+      }, that.$store.state.websocketTimeSec);
     });
   },
 
-  // unmounted() {
-  //   clearInterval(this.timmer);
-  //   this.timmer = null;
-  // },
+  unmounted() {
+    clearInterval(this.timmer);
+    this.timmer = null;
+  },
 
   watch:{
     // "$route"(res){
@@ -259,10 +257,6 @@ export default {
     //     this.requestData(false);
     //   }, this.$store.state.websocketTimeSec);
     // }
-	sourceMap(res){
-		console.log(res)
-		this.sourceMap = res;
-	}
   }
 };
 </script>

src/views/WindSite/pages/Matrix.vue

@@ -12,7 +12,7 @@
       </div>
     </div>
     <div class="panel-body">
-      <div class="card" v-for="(cItem, cIndex) of sourceMap.fjmap[0]" :key="cIndex" :class="cItem.color" @click="jumpUrl(cItem.wpId,cItem.wtId)">
+      <div class="card" v-for="(cItem, cIndex) of sourceMap.fjmap[0]" :key="cIndex" :class="cItem.color">
         <div class="card-panel">
           <div class="card-left">
             <div class="tag">{{ cItem.wtnum }}</div>
@@ -214,17 +214,6 @@ export default {
         path: `/monitor/windsite/matrix/${res.code}`,
       });
     },
-	jumpUrl(wpId, wtId){
-		if (wpId.indexOf("FDC") !== -1) {
-		  this.$router.push({
-		    path: `/monitor/windsite/info/${wpId}/${wtId}`
-		  });
-		} else {
-		  this.$router.push({
-		    path: `../../windsite/inverter-info/${wpId}/${wtId}`
-		  });
-		}
-	  },
   },
 
   created() {
@@ -318,7 +307,6 @@ export default {
       flex: 1 0 125px;
     }
     .card {
-		cursor: pointer;
       margin-right: 4px;
       margin-top: 4px;
       flex: 1 0 125px;

src/views/WindSite/pages/Tower.vue

@@ -43,7 +43,7 @@
         </div>
       </div>
     </Panel>
-    <toolbar-panel class="rose-chart" title="72小时功率曲线图">
+    <toolbar-panel class="rose-chart" title="功率曲线">
       <!-- <template v-slot:tools>
       </template> -->
       <!-- <template v-slot:default> -->
@@ -98,20 +98,20 @@ export default {
       cftmap: {},
       glvos: [],
       rmgtmap: {
-        indicator: ["N0", "N1"],
+        indicator: ["N0", "N1", "N2", "N3", "N4", "N5"],
         data: [
           {
-            value: [44200, 14200],
+            value: [44200, 14200, 20000, 35000, 50000, 38000],
             name: "",
           },
         ],
       },
       rmgtTitle: "",
       ymgtmap: {
-        indicator: ["N0", "N1"],
+        indicator: ["N0", "N1", "N2", "N3", "N4", "N5"],
         data: [
           {
-            value: [0, 14200],
+            value: [44200, 14200, 20000, 35000, 50000, 38000],
             name: "",
           },
         ],
@@ -141,84 +141,127 @@ export default {
   // 函数
   methods: {
     requestLine() {
-		 let that = this;
-		that.API.requestData({
-		  method: "POST",
-		  subUrl: "/monitor/findCftInfo",
-		  timeout: 60000,
-		  data: {
-		    wpId: that.wpId,
-		  },
-		success(res) {
-			var data = res.data;
-			that.cftmap = data.cftmap;
-			// 日资源玫瑰图
-			var rmgtmapIndicator = [],
-				rmgtmapData = [];
-			data.rmgtmap.data.forEach(item =>{
-				rmgtmapIndicator.push(item.name);
-				rmgtmapData.push(item.data1)
-			})
-			that.rmgtmap = {
-				indicator: rmgtmapIndicator,
-				data: [{value: rmgtmapData}]
-			};
-			// 月资源玫瑰图
-			var ymgtmapIndicator = [],
-				ymgtmapData = [];
-			data.ymgtmap.data.forEach(item =>{
-				ymgtmapIndicator.push(item.name);
-				ymgtmapData.push(item.data1)
-			})
-			that.ymgtmap = {
-				indicator: ymgtmapIndicator,
-				data: [{value: ymgtmapData}]
-			};
-			
-			// 72小时功率曲线图
-			let glKey = ["value2","value1","value5","value4","value7","value6"];
-			let Powertrend = [
-			  {
-			    title: "实发功率",
-			    smooth: true,
-			    value: [],
-			  },
-			  {
-			    title: "理论功率",
-			    smooth: true,
-			    value: [],
-			  },
-			  {
-			    title: "保证功率",
-			    smooth: true,
-			    value: [],
-			  },
-			  {
-			    title: "4小时预测功率",
-			    smooth: true,
-			    value: [],
-			  },
-			  {
-			    title: "24小时预测功率",
-			    smooth: true,
-			    value: [],
-			  },
-			  {
-			    title: "平均风速",
-			    smooth: true,
-			    value: [],
-			  },
-			];
-			glKey.forEach((keyEle, keyIndex) => {
-			  res.data.glvos.forEach((cEle) => {
-			    Powertrend[keyIndex].value.push({
-			      text: new Date(cEle.time).formatDate("hh:mm"),
-			      value: cEle[keyEle],
-			    });
-			  });
-			});
-			that.Powertrend = Powertrend;
-		}})
+      let that = this;
+      that.API.requestData({
+        method: "POST",
+        subUrl: "genreset/findPowerInfo",
+        timeout: 60000,
+        data: {
+          id: that.wpId,
+        },
+        success(res) {
+
+          let rdlKey = ["value1", "value2", "value3", "speed"];
+          let DayPower = {
+            // 图表所用单位
+            units: ["(万kWh)", "(m/s)"],
+            value: [
+              {
+                title: "发电量",
+                yAxisIndex: 0,
+                value: [],
+              },
+              {
+                title: "上网电量",
+                yAxisIndex: 0,
+                value: [],
+              },
+              {
+                title: "购网电量",
+                yAxisIndex: 0,
+                value: [],
+              },
+              {
+                title: "实时风速",
+                yAxisIndex: 1,
+                value: [],
+              },
+            ],
+          };
+
+          let glKey = [
+            "value1",
+            "value2",
+            "value3",
+            "value4",
+            "value5",
+            "value6",
+            "value7",
+          ];
+          let Powertrend = [
+            {
+              title: "应发功率",
+              smooth: true,
+              value: [],
+            },
+            {
+              title: "实发功率",
+              smooth: true,
+              value: [],
+            },
+            {
+              title: "理论功率",
+              smooth: true,
+              value: [],
+            },
+            {
+              title: "4小时预测功率",
+              smooth: true,
+              value: [],
+            },
+            {
+              title: "保证功率",
+              smooth: true,
+              value: [],
+            },
+            {
+              title: "平均风速",
+              smooth: true,
+              value: [],
+            },
+            {
+              title: "24小时预测功率",
+              smooth: true,
+              value: [],
+            },
+          ];
+
+          rdlKey.forEach((keyEle, keyIndex) => {
+            res.data.rdlvos.forEach((cEle) => {
+              DayPower.value[keyIndex].value.push({
+                text: cEle.timestr,
+                value: cEle[keyEle],
+              });
+            });
+          });
+
+          glKey.forEach((keyEle, keyIndex) => {
+            res.data.glvos.forEach((cEle) => {
+              Powertrend[keyIndex].value.push({
+                text: new Date(cEle.time).formatDate("hh:mm"),
+                value: cEle[keyEle],
+              });
+            });
+          });
+
+          that.DayPower = DayPower;
+          that.Powertrend = Powertrend;
+        },
+      });
+    },
+    requestData(showLoading) {
+      let that = this;
+      that.API.requestData({
+        showLoading,
+        method: "POST",
+        subUrl: "monitor/findCftInfo",
+        data: {
+          wpId: that.wpId,
+        },
+        success(res) {
+          that.cftmap = res.data.cftmap;
+        },
+      });
     },
     getWp () {
       let that = this;
@@ -264,7 +307,7 @@ export default {
       });
       this.wpId = res.code;
       this.renderBtnActiveIndex ();
-      // this.requestData(false);
+      this.requestData(false);
       this.requestLine();
     },
   },
@@ -274,10 +317,10 @@ export default {
     that.wpId = that.$route.params.wpId;
     that.getWp();
     that.$nextTick(() => {
-      // that.requestData(false);
+      that.requestData(false);
       that.requestLine();
       that.timmer = setInterval(() => {
-        // that.requestData(false);
+        that.requestData(false);
         that.requestLine();
       }, 60 * 1000);
     });

src/views/layout/Menu.vue

@@ -3,7 +3,7 @@
     <ul class="menu-list">
       <li class="menu-item" v-for="(menu, index) of currentMenu" :key="menu" @click="click(index)" :class="{ active: activeIndex == index }" @mouseenter="subMenuShow(menu.children, index)">
         <router-link :to="menu.path">
-          <el-tooltip class="item" effect="dark" :content="menu.text" placement="bottom" :show-after="500" :enterable="false" :hide-after="10">
+          <el-tooltip class="item" effect="dark" :content="menu.text" placement="bottom" :show-after="500" :enterable="false" hide-after="10">
             <div class="menu-icon svg-icon" :class="activeIndex == index ? 'svg-icon-green' : 'svg-icon-gray'">
               <SvgIcon :svgid="menu.icon"></SvgIcon>
             </div>
@@ -356,7 +356,7 @@ export default {
             {
               text: "故障诊断",
               icon: "svg-故障诊断",
-              path: "/health/gzzd/malfunctionDiagnose",
+              path: "//health/gzzdmalfunctionDiagnose",
               children: [
                 {
                   text: "故障诊断",

src/views/malfunctionRecall/index.vue

@@ -1,288 +1,347 @@
 <template>
-	<div class="knowledge-2">
-		<div class="query mg-b-8">
-			<div class="query-items">
-				<div class="query-item">
-					<div class="lable">场站：</div>
-					<div class="search-input">
-						<el-select v-model="wpId" clearable placeholder="请选择" popper-class="select" @change=" (wpId) => { getWt(wpId, true); } ">
-							<el-option v-for="item in wpArray" :key="item.id" :value="item.id" :label="item.name" />
-						</el-select>
-					</div>
-				</div>
-				<div class="query-item">
-					<div class="lable">风机：</div>
-					<div class="search-input">
-						<el-select v-model="wtId" clearable placeholder="请选择" popper-class="select">
-							<el-option v-for="item in wtArray" :key="item.id" :value="item.id" :label="item.name" />
-						</el-select>
-					</div>
-				</div>
-				<div class="query-item">
-					<div class="query-item">
-						<div class="lable">开始日期：</div>
-						<div class="search-input">
-							<el-date-picker v-model="value1" @change="BeginChange(value1)" type="date"
-								value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
-							</el-date-picker>
-						</div>
-					</div>
-					<div class="query-item">
-						<div class="lable">结束日期：</div>
-						<div class="search-input">
-							<el-date-picker v-model="value2" @change="EndChange(value2)" type="date"
-								value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
-							</el-date-picker>
-							<div class="unit svg-icon svg-icon-gray">
-								<svg-icon :svgid="''" />
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="query-actions" style="margin-right: 1500px">
-				<button class="btn green" @click="onClickSearch">查询</button>
-			</div>
-		</div>
-		<div>
-			<ComTable :data="tableData" height="85vh"></ComTable>
-		</div>
-		<div>
-			<el-dialog title="故障诊断" v-model="dialogVisible" width="1400px" top="5vh" custom-class="modal hide-header"
-				:close-on-click-modal="false" :before-close="onClickDialogClose" :destroy-on-close='true'>
-				<fault-diagnosis :data="rowitem" />
-			</el-dialog>
-		</div>
-	</div>
+  <div class="knowledge-2">
+    <div class="query mg-b-8">
+      <div class="query-items">
+        <div class="query-item">
+          <div class="lable">场站：</div>
+          <div class="search-input">
+            <el-select
+              v-model="wpId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+              @change="
+                (wpId) => {
+                  getWt(wpId, true);
+                }
+              "
+            >
+              <el-option
+                v-for="item in wpArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
+            </el-select>
+          </div>
+        </div>
+        <div class="query-item">
+          <div class="lable">风机：</div>
+          <div class="search-input">
+            <el-select
+              v-model="wtId"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in wtArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
+            </el-select>
+          </div>
+        </div>
+        <!-- <div class="query-item">
+          <div class="lable">类型：</div>
+          <div class="search-input">
+            <el-select
+              v-model="type"
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in typeArray"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
+            </el-select>
+          </div>
+        </div> -->
+        <div class="query-item">
+          <div class="query-item">
+            <div class="lable">开始日期：</div>
+            <div class="search-input">
+              <el-date-picker
+                v-model="value1"
+                @change="BeginChange(value1)"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="选择日期"
+                popper-class="date-select"
+              >
+              </el-date-picker>
+            </div>
+          </div>
+          <div class="query-item">
+            <div class="lable">结束日期：</div>
+            <div class="search-input">
+              <el-date-picker
+                v-model="value2"
+                @change="EndChange(value2)"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="选择日期"
+                popper-class="date-select"
+              >
+              </el-date-picker>
+              <div class="unit svg-icon svg-icon-gray">
+                <svg-icon :svgid="''" />
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="query-actions" style="margin-right: 1500px">
+        <button class="btn green" @click="onClickSearch">查询</button>
+      </div>
+    </div>
+    <div>
+      <ComTable :data="tableData" height="85vh"></ComTable>
+    </div>
+    <div>
+      <el-dialog
+        title="故障诊断"
+        v-model="dialogVisible"
+        width="1400px"
+        top="10vh"
+        custom-class="modal hide-header"
+        :close-on-click-modal="false"
+        :before-close="onClickDialogClose"
+      >
+        <fault-diagnosis :data="rowitem"/>
+      </el-dialog>
+    </div>
+  </div>
 </template>
 
 <script>
-	import ComTable from "@com/coms/table/table.vue";
-	import FaultDiagnosis from "./components/fault-diagnosis.vue";
+import ComTable from "@com/coms/table/table.vue";
+import FaultDiagnosis from "./components/fault-diagnosis.vue";
 
-	export default {
-		components: {
-			ComTable,
-			FaultDiagnosis
-		},
-		data() {
-			const that = this;
-			return {
-				value1: "",
-				value2: "",
-				wpId: "",
-				wpArray: [],
-				rowitem: "",
-				wpName: "",
-				wtId: "",
-				type: "2",
-				dialogVisible: false,
-				tableData: {
-					column: [{
-							name: "场站",
-							field: "wpName",
-							is_num: true,
-							is_light: false,
-						},
-						{
-							name: "机组",
-							field: "windTurbineId",
-							is_num: false,
-							is_light: false,
-						},
-						{
-							name: "开始时刻",
-							field: "stopTime",
-							is_num: false,
-							is_light: false,
-						},
-						{
-							name: "结束时刻",
-							field: "startTime",
-							is_num: false,
-							is_light: false,
-						},
-						{
-							name: "停机小时数(h)",
-							field: "stopHours",
-							is_num: false,
-							is_light: false,
-						},
-						{
-							name: "停机类型",
-							field: "warnDesc",
-							is_num: false,
-							is_light: false,
-						},
-						{
-							name: "损失电量(kWh)",
-							field: "lossPower",
-							is_num: false,
-							is_light: false,
-						},
-						{
-							name: "操作",
-							field: "",
-							is_num: false,
-							is_light: false,
-							template() {
-								return "<el-button type='text' style='cursor: pointer;'>回溯</el-button>";
-							},
-							click(e, row) {
-								that.onClickOption(row);
-							},
-						},
-					],
-					data: [],
-				},
-			};
-		},
-		created() {
-			this.value1 = new Date(new Date().getTime() - 3600 * 1000 * 24).formatDate(
-				"yyyy-MM-dd"
-			);
-			this.value2 = this.getTime(2);
-			this.getWp();
-		},
-		methods: {
-			getTime(val) {
-				//时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
-				var date = new Date();
-				var year = date.getFullYear(),
-					month = date.getMonth() + 1,
-					day = date.getDate();
-				month >= 1 && month <= 9 ? (month = "0" + month) : "";
-				day >= 0 && day <= 9 ? (day = "0" + day) : "";
-				var begin = year + "-" + month + "-01";
-				var end = year + "-" + month + "-" + day;
-				if (val == 1) {
-					return begin;
-				} else if (val == 2) {
-					return end;
-				}
-			},
-			// 获取风场
-			getWp(reGetWp) {
-				let that = this;
-				that.API.requestData({
-					baseURL: "http://10.155.32.4:9001",
-					subUrl: "benchmarking/wplist",
-					success(res) {
-						that.wpArray = res.data;
-						that.wpId = res.data[0].id;
-						that.wpName = res.data[0].wpName;
-						that.getWt(that.wpId, reGetWp);
-						that.requestSafeList();
-					},
-				});
-			},
+export default {
+  components: { ComTable, FaultDiagnosis },
+  data() {
+    const that = this;
+    return {
+      value1: "",
+      value2: "",
+      wpId: "",
+      wpArray: [],
+      rowitem: "",
+      wpName: "",
+      wtId: "",
+      type: "2",
+      dialogVisible: false,
+      tableData: {
+        column: [
+          {
+            name: "场站",
+            field: "wpName",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "机组",
+            field: "windTurbineId",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "开始时刻",
+            field: "stopTime",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "结束时刻",
+            field: "startTime",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "停机小时数(h)",
+            field: "stopHours",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "停机类型",
+            field: "warnDesc",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "损失电量(kWh)",
+            field: "lossPower",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "操作",
+            field: "",
+            is_num: false,
+            is_light: false,
+            template() {
+              return "<el-button type='text' style='cursor: pointer;'>回溯</el-button>";
+            },
+             click(e, row) {
+              that.onClickOption(row);
+            },
+          },
+        ],
+        data: [],
+      },
+    };
+  },
+  created() {
+    this.value1 = new Date(new Date().getTime() - 3600 * 1000 * 24).formatDate(
+      "yyyy-MM-dd"
+    );
+    this.value2 = this.getTime(2);
+    this.getWp();
+  },
+  methods: {
+    getTime(val) {
+      //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
+      var date = new Date();
+      var year = date.getFullYear(),
+        month = date.getMonth() + 1,
+        day = date.getDate();
+      month >= 1 && month <= 9 ? (month = "0" + month) : "";
+      day >= 0 && day <= 9 ? (day = "0" + day) : "";
+      var begin = year + "-" + month + "-01";
+      var end = year + "-" + month + "-" + day;
+      if (val == 1) {
+        return begin;
+      } else if (val == 2) {
+        return end;
+      }
+    },
+    // 获取风场
+    getWp(reGetWp) {
+      let that = this;
+      that.API.requestData({
+        baseURL: "http://10.155.32.4:9001",
+        subUrl: "benchmarking/wplist",
+        success(res) {
+          that.wpArray = res.data;
+          that.wpId = res.data[0].id;
+          that.wpName = res.data[0].wpName;
+          that.getWt(that.wpId, reGetWp);
+          that.requestSafeList();
+        },
+      });
+    },
 
-			// 获取风机
-			getWt(wpid, reGetWp) {
-				let that = this;
-				if (that.wpId) {
-					that.API.requestData({
-						method: "GET",
-						baseURL: "http://10.155.32.4:9001",
-						subUrl: "benchmarking/wtList",
-						data: {
-							wpid,
-						},
-						success(res) {
-							that.wtArray = res.data;
-						},
-					});
-				}
-			},
-			BeginChange(vl) {
-				this.value1 = vl;
-			},
-			EndChange(vl) {
-				this.value2 = vl;
-			},
-			typeChange(vl) {
-				this.type = vl;
-			},
-			// 搜索按钮
-			onClickSearch() {
-				this.requestSafeList();
-			},
-			// 获取停机事件
-			requestSafeList() {
-				let that = this;
+    // 获取风机
+    getWt(wpid, reGetWp) {
+      let that = this;
+      if (that.wpId) {
+        that.API.requestData({
+          method: "GET",
+          baseURL: "http://10.155.32.4:9001",
+          subUrl: "benchmarking/wtList",
+          data: {
+            wpid,
+          },
+          success(res) {
+            that.wtArray = res.data;
+            // that.wtId = res.data[0].id;
+          },
+        });
+      }
+    },
+    BeginChange(vl) {
+      this.value1 = vl;
+    },
+    EndChange(vl) {
+      this.value2 = vl;
+    },
+    typeChange(vl) {
+      this.type = vl;
+    },
+    // 搜索按钮
+    onClickSearch() {
+      this.requestSafeList();
+    },
+    // 获取停机事件
+    requestSafeList() {
+      let that = this;
 
-				let data = {
-					tablepar: {
-						pageNum: 1,
-						pageSize: 1000,
-					},
-					beginDate: that.value1,
-					endDate: that.value2,
-					wpId: that.wpId,
-				};
+      let data = {
+        tablepar: {
+          pageNum: 1,
+          pageSize: 1000,
+        },
+        beginDate: that.value1,
+        endDate: that.value2,
+        wpId: that.wpId,
+      };
 
-				if (that.wtId != "") data.wtId = that.wtId;
-				if (that.type != "") data.type = that.type;
+      if (that.wtId != "") data.wtId = that.wtId;
+      if (that.type != "") data.type = that.type;
 
-				this.API.requestData({
-					method: "POST",
-					subUrl: "/event/getShutdownevent",
-					data,
-					success(res) {
-						if (res.code == 200) {
-							that.tableData.data = [];
-							if (res.data.list.length) {
-								let data = res.data.list;
-								for (var i = 0; i < data.length; i++) {
-									let obj = {
-										wpName: data[i].wpName,
-										windTurbineId: data[i].windTurbineId,
-										stopTime: new Date(data[i].stopTime).formatDate(
-											"yyyy-MM-dd hh:mm:ss"
-										),
+      this.API.requestData({
+        method: "POST",
+        subUrl: "/event/getShutdownevent",
+        data,
+        success(res) {
+          if (res.code == 200) {
+            that.tableData.data = [];
+            if (res.data.list.length) {
+              let data = res.data.list;
+              for (var i = 0; i < data.length; i++) {
+                let obj = {
+                  wpName: data[i].wpName,
+                  windTurbineId: data[i].windTurbineId,
+                  stopTime: new Date(data[i].stopTime).formatDate(
+                    "yyyy-MM-dd hh:mm:ss"
+                  ),
 
-										stopHours: data[i].stopHours,
-										statusName: data[i].statusName,
-										warnDesc: data[i].warnDesc,
-										lossPower: data[i].lossPower,
-										handleWay: data[i].handleWay,
-									};
-									if (data[i].startTime)
-										obj.startTime = new Date(data[i].startTime).formatDate(
-											"yyyy-MM-dd hh:mm:ss"
-										);
-									that.tableData.data.push(obj);
-								}
-							}
-						}
-					},
-				});
-			},
-			// 回放按钮
-			onClickOption(row) {
-				this.rowitem = row
-				this.dialogVisible = true;
-			},
-			// 关闭弹窗
-			onClickDialogClose() {
-				this.dialogVisible = false;
-			},
-		},
-	};
+                  stopHours: data[i].stopHours,
+                  statusName: data[i].statusName,
+                  warnDesc: data[i].warnDesc,
+                  lossPower: data[i].lossPower,
+                  handleWay: data[i].handleWay,
+                };
+                if (data[i].startTime)
+                  obj.startTime = new Date(data[i].startTime).formatDate(
+                    "yyyy-MM-dd hh:mm:ss"
+                  );
+                that.tableData.data.push(obj);
+              }
+            }
+          }
+        },
+      });
+    },
+    // 回放按钮
+    onClickOption(row) {
+      this.rowitem = row
+      this.dialogVisible = true;
+    },
+    // 关闭弹窗
+    onClickDialogClose() {
+      this.dialogVisible = false;
+    },
+  },
+};
 </script>
 
 <style lang="less" scope>
-	@titleGray: #9ca5a8;
-	@rowGray: #606769;
-	@darkBack: #536268;
-
-	.knowledge-2 {
-		.el-select {
-			width: 200px;
-		}
-
-		.el-input {
-			width: 200px;
-		}
-	}
+@titleGray: #9ca5a8;
+@rowGray: #606769;
+@darkBack: #536268;
+.knowledge-2 {
+  .el-select {
+    width: 200px;
+  }
+  .el-input {
+    width: 200px;
+  }
+}
 </style>