1.表盘页面sisview完成；2.改health6页面的默认显示页面状态；3.dj1页面玫瑰图字母改中文【数据和旧版sis不一致，需后台配合】

src/router/index.js

@@ -25,12 +25,12 @@ const routes = [{
 	component: () =>
 		import( /* webpackChunkName: "Demo" */ "../views/Demo.vue"),
 },
-// {
-// 	path: "/sisView",
-// 	name: "sisView",
-// 	component: () =>
-// 		import( /* webpackChunkName: "sisView" */ "../views/sisView/index.vue"),
-// },
+{
+	path: "/sisView",
+	name: "sisView",
+	component: () =>
+		import( /* webpackChunkName: "sisView" */ "../views/sisView/index.vue"),
+},
 {
 	path: "/monitor/status", // 状态监视
 	name: "Status",

src/views/HealthControl/Health6.vue

@@ -95,7 +95,7 @@ export default {
   components: { SvgIcon, Panel, MultipleLineChart, BarLineChart, Row, Col, DualPieChart },
   data() {
     return {
-      type: "1",
+      type: "2",
       status: "1",
       healPieData: [],
       stopPieData: [],

src/views/HealthControl/healthTab4History.vue

@@ -112,6 +112,7 @@
 			},
 			handleNodeClick(data) {
 				this.location = data.id;
+				this.searchTab();
 			},
 		},
 		watch: {

src/views/NewPages/dj1.vue

@@ -517,7 +517,7 @@
               <radar-chart
                 :width="'100%'"
                 :height="'350px'"
-                :value="zzrzdfsData"
+                :value="rzdfsData"
               />
             </div>
           </panel>
@@ -1419,8 +1419,9 @@ export default {
           };
 
           if (res.data.data) {
+			  mgtData.indicator = ["北", "北北西", "北西", "西北西", "西", "西南西", "南西", "南南西", "南", "南南东", "东南", "东南东","东", "东北东", "北东", "北北东"]
             res.data.data.forEach((ele) => {
-              mgtData.indicator.push(ele.name);
+              // mgtData.indicator.push(ele.name);
               mgtData.data[0].value.push(ele.data1);
             });
           }

src/views/layout/Menu.vue

@@ -356,7 +356,7 @@ export default {
             {
               text: "故障诊断",
               icon: "svg-故障诊断",
-              path: "//health/gzzdmalfunctionDiagnose",
+              path: "/health/gzzd/malfunctionDiagnose",
               children: [
                 {
                   text: "故障诊断",

src/views/sisView/index.vue

@@ -6,79 +6,79 @@
       <div class="contentBox">
         <div class="contentItem">
           <div class="itemName">装机容量</div>
-          <div class="itemNum">123</div>
+          <div class="itemNum">{{items.zjrl}}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName">安全天数</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.aqts}}</div>
           <div class="itemUnit">天</div>
           <div class="itemName">总功率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.zgl}}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">日发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.rfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">年利用小时</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.nlyxs}}</div>
           <div class="itemUnit">小时</div>
           <div class="itemName">年发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.nfdl}}</div>
           <div class="itemUnit">万kwh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">上网电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.swdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">月利用小时</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.ylyxs}}</div>
           <div class="itemUnit">小时</div>
           <div class="itemName">月发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.yfdl}}</div>
           <div class="itemUnit">万kwh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">复位及时率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.fwjsl}}</div>
           <div class="itemUnit">%</div>
           <div class="itemName">年计划电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.njhdl}}</div>
           <div class="itemUnit">万kwh</div>
-          <div class="itemName">完成率</div>
-          <div class="itemNum"></div>
+          <div class="itemName">年完成率</div>
+          <div class="itemNum">{{items.nwcl}}</div>
           <div class="itemUnit">%</div>
         </div>
         <div class="contentItem">
           <div class="itemName">转换及时率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.zhjsl}}</div>
           <div class="itemUnit">%</div>
           <div class="itemName">月计划电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.yjhdl}}</div>
           <div class="itemUnit">万kwh</div>
-          <div class="itemName">完成率</div>
-          <div class="itemNum"></div>
+          <div class="itemName">月完成率</div>
+          <div class="itemNum">{{items.ywcl}}</div>
           <div class="itemUnit">%</div>
         </div>
         <div class="contentItem">
           <div class="itemName">消缺及时率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.xqjsl}}</div>
           <div class="itemUnit">%</div>
           <div class="itemName noPd">综合厂用电率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.zhcydl}}</div>
           <div class="itemUnit">%</div>
           <div class="itemName">月M&nbsp;T&nbsp;B&nbsp;F</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.ymtbf}}</div>
           <div class="itemUnit">小时</div>
         </div>
         <div class="contentItem">
           <div class="itemName">风能利用率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.fnlyl}}</div>
           <div class="itemUnit">%</div>
           <div class="itemName noPd">设备可利用率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.sbklyl}}</div>
           <div class="itemUnit">%</div>
           <div class="itemName">月可靠性</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.ykkx}}</div>
           <div class="itemUnit">%</div>
         </div>
       </div>
@@ -88,108 +88,108 @@
       <div class="contentBox">
         <div class="contentItem">
           <div class="itemName">装机容量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.fdzjrl}}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName">实时风速</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.fdssfs}}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">月发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.fdyfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">年发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.fdnfdl}}</div>
           <div class="itemUnit">万kwh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">日发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.fdrfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">实时功率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.fdssgl}}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName">利用小时</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.fdylyxs}}</div>
           <div class="itemUnit">小时(月)</div>
           <div class="itemName">利用小时</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.fdnlyxs}}</div>
           <div class="itemUnit">小时(年)</div>
         </div>
         <div class="contentItem">
           <div class="itemName">上网电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.fdswdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">总欠发</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.fdzqf}}</div>
           <div class="itemUnit">万kwh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">牛发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.nssfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">牛欠发</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.nssqf}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">牛风速</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.nssfs}}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">牛功率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.nssgl}}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">麻发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.mhsfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">麻欠发</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.mhsqf}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">麻风速</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.mhsfs}}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">麻功率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.mhsgl}}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">青发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.qsfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">青欠发</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.qsqf}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">青风速</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.qsfs}}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">青功率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.qsgl}}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">石发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.sbqfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">石欠发</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.sbqqf}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">石风速</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.sbqfs}}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">石功率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.sbqgl}}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">香发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.xsfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">香欠发</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.xsqf}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">香风速</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.xsfs}}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">香功率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.xsgl}}</div>
           <div class="itemUnit">MW</div>
         </div>
       </div>
@@ -199,90 +199,90 @@
       <div class="contentBox">
         <div class="contentItem">
           <div class="itemName">装机容量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.gfzjrl}}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName">日照强度</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.gfrzqd}}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">实时功率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.gfssgl}}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">日发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.gfrfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">月发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.gfyfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">年发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.gfnfdl}}</div>
           <div class="itemUnit">万kwh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">上网电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.gfswdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">利用小时</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.gfylyxs}}</div>
           <div class="itemUnit">小时(月)</div>
            <div class="itemName">利用小时</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.gfnlyxs}}</div>
           <div class="itemUnit">小时(年)</div>
         </div>
         <div class="contentItem">
           <div class="itemName">武发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.dwkfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">武日强度</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.dwkrzqd}}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">武功率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.dwkgl}}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">平发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.plfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">平日强度</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.plrzqd}}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">平功率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.plgl}}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">宣发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.xhfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">宣日强度</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.xhrzqd}}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">宣功率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.xhgl}}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">马发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.mchfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">马日强度</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.mchrzqd}}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">马功率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.mchgl}}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">海发电量</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.hzjfdl}}</div>
           <div class="itemUnit">万kwh</div>
           <div class="itemName">海日强度</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.hzjrzqd}}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">海功率</div>
-          <div class="itemNum"></div>
+          <div class="itemNum">{{items.hzjgl}}</div>
           <div class="itemUnit">MW</div>
         </div>
       </div>
@@ -304,7 +304,9 @@ export default {
 
   // 数据
   data() {
-    return {};
+    return {
+		items:{}
+	};
   },
 
   // 函数
@@ -317,9 +319,27 @@ export default {
           .css("height", viewTitle.eq(i).parent(".viewItem").css("height"));
       }
     },
+	viewAjax() {
+	  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)
+			})
+			that.items = items;
+	    },
+	  });
+	},
   },
 
-  created() {},
+  created() {
+	  this.viewAjax();
+  },
 
   mounted() {
     this.resetViewTitleHeight();
@@ -393,7 +413,7 @@ export default {
         .itemNum {
           font-family: Arial, Helvetica, sans-serif;
           color: #f25656;
-          width: 110px;
+          width: 140px;
           text-align: center;
         }