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

src/views/Decision/Decision3Db.vue

@@ -153,7 +153,7 @@
 				value2: [],
 				value4: "",
 				fzyData: [],
-				list: [],
+				list: [{value: [{text: "",value: 0,}]}],
 				listName: [],
 				TypeClass:0,
 				ajaxArr:['daydjhxdbtop','monthdjhxdbtop','yeardjhxdbtop'],
@@ -241,6 +241,13 @@
 						let thisItem = [];
 						jfpl = data.pop(); //静风频率
 						fzy = data.pop(); //风资源
+						if(fzy['1'] == null){
+							that.BASE.showMsg({
+								msg:'此风机无数据',
+								type:'success'
+							});
+							return false;
+						}
 						data.forEach((ele, index) => {
 							for (let key in ele) {
 								if (key !== "name") {

src/views/Decision/Decision4.vue

@@ -59,6 +59,7 @@
 						},
 						{
 							name: "值际",
+							width:"200px",
 							field: "dutyname",
 							is_num: false,
 							is_light: false,
@@ -97,7 +98,7 @@
 							name: "限电损失",
 							field: "rationingloss",
 							is_num: false,
-							is_light: true,
+							is_light: false,
 						},
 						{
 							name: "受累损失",

src/views/LightMatrix1/LightMatrix1.vue

@@ -342,9 +342,9 @@ export default {
           path: `/monitor/windsite/info/${item.wpId}/${item.wtId}`,
         });
       } else {
-        // this.$router.push({
-        //   path: `/info/inverter-info/${item.wpId}/${item.wtId}`
-        // });
+        this.$router.push({
+          path: `windsite/inverter-info/${item.wpId}/${item.wtId}`
+        });
       }
     },
   },

src/views/WindSite/pages/Home/Home.vue

@@ -75,10 +75,10 @@
                   </span>
                 </div>
                 <div class="status ">
-                  <span class="svg-icon svg-icon-yellow">
+                  <span class="svg-icon svg-icon-pink">
                     <svg-icon svgid="svg-limit-power" style="margin:3px 0.3704vh -3px 0;" />
                   </span>
-                  <span class="text yellow">
+                  <span class="text pink">
                     限电
                   </span>
                 </div>
@@ -237,7 +237,7 @@
 <script>
 import HoverBarChart from "../../../../components/chart/bar/hover-bar-chart.vue";
 import MultipleBarChart from "../../../../components/chart/bar/multiple-bar-chart.vue";
-import MultipleLineChart from "../../../../components/chart/line/multiple-line-chart.vue";
+import MultipleLineChart from "../../../../components/chart/line/double-line-chart.vue";
 import NormalLineChart from "../../../../components/chart/line/normal-line-chart.vue";
 import DualPieChart from "../../../../components/chart/pie/dual-pie-chart.vue";
 import BtnGroupDouble from "../../../../components/coms/btn/btn-group-double.vue";
@@ -452,42 +452,42 @@ export default {
               value: [
                 {
                   title: "应发功率",
-                  yAxisIndex: 1, // 使用单位
+                  smooth: true, // 使用单位
                   value: [],
                 },
                 {
                   title: "实发功率",
-                  yAxisIndex: 1, // 使用单位
+                  smooth: true, // 使用单位
                   value: [],
                 },
                 {
                   title: "理论功率",
-                  yAxisIndex: 1, // 使用单位
+                  smooth: true, // 使用单位
                   value: [],
                 },
                 {
                   title: "预测功率",
-                  yAxisIndex: 1, // 使用单位
+                  smooth: true, // 使用单位
                   value: [],
                 },
                 {
                   title: "保证功率",
-                  yAxisIndex: 1, // 使用单位
+                  smooth: true, // 使用单位
                   value: [],
                 },
                 {
                   title: "平均风速",
-                  yAxisIndex: 1, // 使用单位
+                  smooth: true, // 使用单位
                   value: [],
                 },
                 {
                   title: "小时预测功率",
-                  yAxisIndex: 1, // 使用单位
+                  smooth: true, // 使用单位
                   value: [],
                 },
                 {
                   title: "最有功率律",
-                  yAxisIndex: 1, // 使用单位
+                  smooth: true, // 使用单位
                   value: [],
                 },
               ],

src/views/WindSite/pages/Home/light-matrix.vue

@@ -53,9 +53,15 @@ export default {
 
     // 页面跳转
     jumpUrl(wpId, wtId){
-      this.$router.push({
-        path: `/monitor/windsite/info/${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}`
+	    });
+	  }
     }
   },
   // 生命周期钩子

src/views/WindSite/pages/Matrix.vue

@@ -23,9 +23,13 @@
             </div>
           </div>
           <div class="card-right">
+            <div class="num">{{ cItem.fs }} 
+				<block v-if='cItem.wpId.indexOf("FDC") !== -1'>m/s</block>
+				<block v-else>W/m²</block>
+			</div>
+			<div class="num" v-if='cItem.wpId.indexOf("FDC") == -1' style="height:0.25rem;"> </div>
             <div class="num">{{ cItem.gl }} kW</div>
-            <div class="num">{{ cItem.fs }} m/s</div>
-            <div class="num">{{ cItem.fdjzs }} rpm</div>
+            <div class="num" v-if='cItem.wpId.indexOf("FDC") !== -1'>{{ cItem.fdjzs }} rpm</div>
           </div>
         </div>
         <div class="card-percent">