Merge branch 'mw2' of http://61.161.152.110:10101/r/electronic-map into mw2

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

@@ -98,7 +98,7 @@ export default {
           itemGap: 8,
         },
         radar: {
-          center: ["35%", "50%"],
+          center: ["25%", "50%"],
           radius: "80%",
           startAngle: 90,
           splitNumber: 8,
@@ -233,7 +233,7 @@ export default {
             clockwise: false,
             startAngle: 90,
             radius: "70%",
-            center: ["35%", "50%"],
+            center: ["25%", "50%"],
             hoverAnimation: false,
             roseType: "radius", //area
             data: this.list,

src/router/index.js

@@ -775,6 +775,11 @@ component:() => import("../views/MalfunctionWarning/MalfunctionWarning.vue")
 	name: "boosterAlarm",
 	component: () => import("../views/alarmCenter/boosterAlarm.vue")
 },
+{
+	path: "/others/otherComponent",
+	name: "otherComponent",
+	component: () => import("../views/Others/otherComponent.vue")
+},
 // 报警中心-SCADA报警
 {
 	path: "/others/alarmCenter/scadaAlarm",

src/views/HealthControl/assess/assessindex.vue

@@ -111,7 +111,7 @@ export default {
       hisDialogVisible: false,
       hisDialogTitle:"",
       ChangZhan: [],
-      value1: "XS_FDC",
+      value1: "MHS_FDC",
       date: "",
       shows: "d",
       showTitle: "风机日信息量化评级管理",
@@ -474,6 +474,7 @@ export default {
           data: data,
           success(res) {
             that.dialogData1 = [res.data.gaid1, res.data.gaid2];
+			console.log(that.dialogData1)
           }
         });
         that.API.requestData({

src/views/HealthControl/dayinfo.vue

@@ -33,7 +33,7 @@
             <td class="white">{{item.name}}</td>
             <td class="white" v-for="row of gridDatas" :key="row">{{row[item.field]}}</td>
             <td class="white" v-for="row of gridDatas" :key="row">{{row[item.rank]}}</td>
-            <td class="white" v-for="row of gridDatas" :key="row">{{row[item.score]}}</td>
+            <td class="white" v-for="row of gridDatas" :key="row">{{row[item.score]?row[item.score]:0}}</td>
           </tr>
         </table>
       </div>

src/views/LightMatrix1/LightMatrix1.vue

@@ -1,4 +1,5 @@
-<template>
+<template >
+	<el-scrollbar>
   <div class="light-matrix">
     <Row class="panel-2" type="">
       <Col :span="12" class="left-50-16">
@@ -190,6 +191,7 @@
       </div>
     </div>
   </div>
+  </el-scrollbar>
 </template>
 
 <script>
@@ -508,7 +510,6 @@ export default {
 <style lang="less" scoped>
 @panelHeight: 6.481vh;
 @titleHeight: 2.7778vh;
-
 .light-matrix {
   // width: calc(100% - 1.111vh);
   height: calc(100vh - 7.222vh);
@@ -802,4 +803,4 @@ export default {
     text-align: center;
   }
 }
-</style>
+</style>

src/views/Others/otherComponent.vue

@@ -0,0 +1,191 @@
+<template>
+	<tab :data="tabData" @select="select" />
+	<el-row>
+		<el-col :span="3">
+			<el-tree :data="elTreeData.data[currTab]" :props="elTreeData.defaultProps" @node-click="handleNodeClick"></el-tree>
+		</el-col>
+		<el-col :span="21">
+			<tab :data="tabData2[currTab]" @select="select2" />
+			<Fj v-if="currTab == 0" :currTab="currTab2" height="85vh"/>
+			<Syz v-if="currTab == 1" :currTab="currTab2" height="85vh"/>
+		</el-col>
+	</el-row>
+</template>
+
+<script>
+	import Tab from "../../components/coms/tabs/tab.vue";
+	import Fj from "./otherComponentFj.vue";
+	import Syz from "./otherComponentSyz.vue";
+	export default {
+		components: {Tab,Fj,Syz},
+		data() {
+			return {
+				currTab: 0,
+				currTab2: 0,
+				tabData: [{
+						id: "0",
+						text: "风机",
+					},
+					{
+						id: "1",
+						text: "升压站",
+					}
+				],
+				tabData2: [
+					[{
+							id: "0",
+							text: "位置",
+						},
+						{
+							id: "1",
+							text: "技术参数",
+						},
+						{
+							id: "2",
+							text: "预防性维护",
+						},
+						{
+							id: "3",
+							text: "设备历史",
+						},
+						{
+							id: "4",
+							text: "设备维护操作记录",
+						}
+					],
+					[{
+							id: "0",
+							text: "位置2",
+						},
+						{
+							id: "1",
+							text: "技术参数",
+						},
+						{
+							id: "2",
+							text: "预防性维护",
+						},
+						{
+							id: "3",
+							text: "设备历史",
+						},
+						{
+							id: "4",
+							text: "设备维护操作记录",
+						}
+					],
+				],
+				elTreeData: {
+					data: [[{
+							label: "一级 1",
+							children: [{
+								label: "二级 1-1",
+								children: [{
+									label: "三级 1-1-1",
+								}, ],
+							}, ],
+						},
+						{
+							label: "一级 2",
+							children: [{
+									label: "二级 2-1",
+									children: [{
+										label: "三级 2-1-1",
+									}, ],
+								},
+								{
+									label: "二级 2-2",
+									children: [{
+										label: "三级 2-2-1",
+									}, ],
+								},
+							],
+						},
+						{
+							label: "一级 3",
+							children: [{
+									label: "二级 3-1",
+									children: [{
+										label: "三级 3-1-1",
+									}, ],
+								},
+								{
+									label: "二级 3-2",
+									children: [{
+										label: "三级 3-2-1",
+									}, ],
+								},
+							],
+						},
+					],
+					[{
+							label: "mw一级 1",
+							children: [{
+								label: "二级 1-1",
+								children: [{
+									label: "三级 1-1-1",
+								}, ],
+							}, ],
+						},
+						{
+							label: "一级 2",
+							children: [{
+									label: "二级 2-1",
+									children: [{
+										label: "三级 2-1-1",
+									}, ],
+								},
+								{
+									label: "二级 2-2",
+									children: [{
+										label: "三级 2-2-1",
+									}, ],
+								},
+							],
+						},
+						{
+							label: "一级 3",
+							children: [{
+									label: "二级 3-1",
+									children: [{
+										label: "三级 3-1-1",
+									}, ],
+								},
+								{
+									label: "二级 3-2",
+									children: [{
+										label: "三级 3-2-1",
+									}, ],
+								},
+							],
+						},
+					]],
+					defaultProps: {
+						children: "children",
+						label: "label",
+					},
+				},
+			};
+		},
+		methods: {
+			select(data) {
+				if (data.id != this.currTab) {
+					this.currTab = parseInt(data.id);
+					this.currTab2 = 0;
+				}
+			},
+			select2(data) {
+				console.log(data)
+				this.currTab2 = parseInt(data.id);
+			},
+		},
+		created() {
+
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/Others/otherComponentFj.vue

@@ -0,0 +1,49 @@
+<template>
+	<el-scrollbar v-if="currTab == 0" :height="height">
+	 风机1
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 1" :height="height">
+	 2
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 2" :height="height">
+	 3
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 3" :height="height">
+	 4
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 4" :height="height">
+	 5
+	</el-scrollbar>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		data() {
+			return {
+				
+			};
+		},
+		props:{
+			currTab:{
+			  type: Number
+			},
+			height: {
+			  type: String
+			},
+		},
+		methods:{
+			
+		},
+		created() {
+
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/Others/otherComponentSyz.vue

@@ -0,0 +1,49 @@
+<template>
+	<el-scrollbar v-if="currTab == 0" :height="height">
+	升压站 1
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 1" :height="height">
+	 2
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 2" :height="height">
+	 3
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 3" :height="height">
+	 4
+	</el-scrollbar>
+	<el-scrollbar v-if="currTab == 4" :height="height">
+	 5
+	</el-scrollbar>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		data() {
+			return {
+				
+			};
+		},
+		props:{
+			currTab:{
+			  type: Number
+			},
+			height: {
+			  type: String
+			},
+		},
+		methods:{
+			
+		},
+		created() {
+
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/WindSite/components/generalappearance/mch.vue

@@ -1500,18 +1500,12 @@
 						const spKey = fmtNumber(key.replace(/[^0-9]/gi, ""));
 						const dgDom = $("#_x23_" + spKey).find("text");
 						
-						console.log(key,spKey)
-						
-
 						if (dgDom && key.indexOf("dl") !== -1) {
-							// dgDom.eq(0).html(item);
-							dgDom.eq(0).html(111);
+							dgDom.eq(0).html(item);
 						} else if (dgDom && key.indexOf("dy") !== -1) {
-							// dgDom.eq(1).html(item);
-							dgDom.eq(1).html(222);
+							dgDom.eq(1).html(item);
 						} else if (dgDom && key.indexOf("yg") !== -1) {
-							// dgDom.eq(2).html(item);
-							dgDom.eq(2).html(333);
+							dgDom.eq(2).html(item);
 						}
 					}
 				}

src/views/allLifeManage/tab1.vue

@@ -344,10 +344,10 @@ export default {
               });
               that.tableData.data = res.data.records || [];
             } else {
-              that.BASE.showMsg({
-                type: "warning",
-                msg: "所选日期区间之内暂无数据，请重试",
-              });
+              // that.BASE.showMsg({
+              //   type: "warning",
+              //   msg: "所选日期区间之内暂无数据，请重试",
+              // });
             }
             that.showDialog = true;
           },

src/views/nxfx/qxpclfx.vue

@@ -89,7 +89,7 @@ export default {
       cur: 0,
       optionData: ["月曲线偏差率排行榜", "日曲线偏差率排行榜"],
       ChangZhan: [],
-      value1: "XS_FDC",
+      value1: "MHS_FDC",
       date: "",
       date2: "",
       shows: true,

src/views/sisView/index.vue

@@ -1,39 +1,39 @@
 <template>
   <div class="sisViewBox">
     <div class="viewItem">
-      <clock :width="330" :height="300" />
+      <clock :width="330" :height="280" />
       <div class="viewTitle">综<br /><br />合<br /><br />参<br /><br />数</div>
-      <div class="contentBox">
+      <div class="contentBox" style="height: 280px;">
         <div class="contentItem">
-          <div class="itemName">装机容量</div>
+          <div class="itemName size5">装机容量</div>
           <div class="itemNum">{{items.zjrl}}</div>
           <div class="itemUnit">MW</div>
-          <div class="itemName">安全天数</div>
+          <div class="itemName size6">安全天数</div>
           <div class="itemNum">{{items.aqts}}</div>
           <div class="itemUnit">天</div>
-          <div class="itemName">总功率</div>
+          <div class="itemName size5">总功率</div>
           <div class="itemNum">{{items.zgl}}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
-          <div class="itemName">日发电量</div>
+          <div class="itemName size5">日发电量</div>
           <div class="itemNum">{{items.rfdl}}</div>
           <div class="itemUnit">万kWh</div>
-          <div class="itemName">年利用小时</div>
+          <div class="itemName size6">年利用小时</div>
           <div class="itemNum">{{items.nlyxs}}</div>
           <div class="itemUnit">小时</div>
-          <div class="itemName">年发电量</div>
+          <div class="itemName size5">年发电量</div>
           <div class="itemNum">{{items.nfdl}}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
-          <div class="itemName">上网电量</div>
+          <div class="itemName size5">上网电量</div>
           <div class="itemNum">{{items.swdl}}</div>
           <div class="itemUnit">万kWh</div>
-          <div class="itemName">月利用小时</div>
+          <div class="itemName size6">月利用小时</div>
           <div class="itemNum">{{items.ylyxs}}</div>
           <div class="itemUnit">小时</div>
-          <div class="itemName">月发电量</div>
+          <div class="itemName size5">月发电量</div>
           <div class="itemNum">{{items.yfdl}}</div>
           <div class="itemUnit">万kWh</div>
         </div>
@@ -41,10 +41,10 @@
           <div class="itemName">复位及时率</div>
           <div class="itemNum">{{items.fwjsl}}</div>
           <div class="itemUnit">%</div>
-          <div class="itemName">年计划电量</div>
+          <div class="itemName size6">年计划电量</div>
           <div class="itemNum">{{items.njhdl}}</div>
           <div class="itemUnit">万kWh</div>
-          <div class="itemName">年完成率</div>
+          <div class="itemName size5">年完成率</div>
           <div class="itemNum">{{items.nwcl}}</div>
           <div class="itemUnit">%</div>
         </div>
@@ -52,10 +52,10 @@
           <div class="itemName">转换及时率</div>
           <div class="itemNum">{{items.zhjsl}}</div>
           <div class="itemUnit">%</div>
-          <div class="itemName">月计划电量</div>
+          <div class="itemName size6">月计划电量</div>
           <div class="itemNum">{{items.yjhdl}}</div>
           <div class="itemUnit">万kWh</div>
-          <div class="itemName">月完成率</div>
+          <div class="itemName size5">月完成率</div>
           <div class="itemNum">{{items.ywcl}}</div>
           <div class="itemUnit">%</div>
         </div>
@@ -63,10 +63,10 @@
           <div class="itemName">消缺及时率</div>
           <div class="itemNum">{{items.xqjsl}}</div>
           <div class="itemUnit">%</div>
-          <div class="itemName noPd">综合厂用电率</div>
+          <div class="itemName">综合厂用电率</div>
           <div class="itemNum">{{items.zhcydl}}</div>
           <div class="itemUnit">%</div>
-          <div class="itemName">月M&nbsp;T&nbsp;B&nbsp;F</div>
+          <div class="itemName size5">月M&nbsp;T&nbsp;B&nbsp;F</div>
           <div class="itemNum">{{items.ymtbf}}</div>
           <div class="itemUnit">小时</div>
         </div>
@@ -74,10 +74,10 @@
           <div class="itemName">风能利用率</div>
           <div class="itemNum">{{items.fnlyl}}</div>
           <div class="itemUnit">%</div>
-          <div class="itemName noPd">设备可利用率</div>
+          <div class="itemName">设备可利用率</div>
           <div class="itemNum">{{items.sbklyl}}</div>
           <div class="itemUnit">%</div>
-          <div class="itemName">月可靠性</div>
+          <div class="itemName size5">月可靠性</div>
           <div class="itemNum">{{items.ykkx}}</div>
           <div class="itemUnit">%</div>
         </div>
@@ -323,13 +323,16 @@ export default {
 	  var that = this;
 	  that.API.requestData({
 	    method: "GET",
-	    baseURL: "bigscreen/list",
 	    subUrl: "http://10.155.32.4:8034/bigscreen/list",
 	    success(res) {
 			var keys = Object.keys(res.data);
 			var items = res.data;
 			keys.forEach(ele=>{
-				items[ele] = items[ele].toFixed(2)
+				if(items[ele].toFixed(2).split('.')[1] == '00'){
+					items[ele] = items[ele].toFixed(2).split('.')[0]
+				}else{
+					items[ele] = items[ele].toFixed(2)
+				}
 			})
 			that.items = items;
 	    },
@@ -349,7 +352,7 @@ export default {
 
 <style lang="less" scoped>
 .sisViewBox {
-  width: 100%;
+  width: 1881px;
   height: 100%;
   display: flex;
   justify-content: start;
@@ -370,7 +373,7 @@ export default {
       font-family: Arial, Helvetica, sans-serif;
       width: 30px;
       padding: 10px 40px;
-      font-size: 30px;
+      font-size: 29px;
       font-weight: 700;
       color: #ff0;
       text-decoration: none;
@@ -384,35 +387,38 @@ export default {
 
     .contentBox {
       display: flex;
-      justify-content: start;
+      justify-content: space-around;
       align-items: flex-start;
       flex-direction: column;
       font-family: Georgia, "Times New Roman", Times, serif;
-      font-size: 30px;
+      font-size: 29px;
 
       .contentItem {
         display: flex;
         justify-content: start;
         align-items: center;
         padding: 2px 0;
-
+		
+		.size5{
+			width: 165px;
+		}
+		
+		.size6{
+			width: 195px;
+		}
+		
         .itemName {
-          width: 220px;
+          min-width: 136px;
           padding: 0 10px;
           text-align: justify;
           text-align-last: justify;
-
-          &.noPd {
-            width: 220px;
-            padding: 0 0 0 10px;
-          }
         }
 
         .itemNum {
           font-family: Arial, Helvetica, sans-serif;
-          color: #f25656;
-          width: 140px;
-          text-align: center;
+          color: red;
+          width: 187px;
+		  margin-left: 15px;
         }
 
         .itemUnit {