状态监视详情页数据修改、性能对标详情数据显示bug修改

src/views/Decision/Decision1Mx.vue

@@ -55,7 +55,7 @@
 			</div>
 			<div class="query-actions">
 				<button class="btn" @click="mxClick()">搜索</button>
-				<button class="btn green">明细信息</button>
+				<button class="btn green" >明细信息</button>
 				<button class="btn" @click="exportExcel()">导出</button>
 			</div>
 		</div>

src/views/Decision/Decision2.vue

@@ -631,6 +631,7 @@
 					},
 					success(res) {
 						that.XiangMu = res.data;
+						console.log('Xiangmu:',res.data)
 					}
 				});
 			},
@@ -702,6 +703,7 @@
 					},
 					success(res) {
 						that.ajaxData = res.data;
+						console.log('resData:',res)
 						var dataTab = [], //表格
 							fdl = [],
 							cz = [],

src/views/Decision/Decision3.vue

@@ -135,6 +135,8 @@
 		data() {
 			let that = this;
 			return {
+				detailId:'', //详情id
+				idArr:[],
 				tableIdArr: [], //放checkbox的id数组
 				tableId: [],
 				checkLength: 0, //对标分析只能选择2个
@@ -744,6 +746,12 @@
 					},
 					success(res) {
 						that.ajaxData = res.data;
+						that.idArr = res.data
+						if(res.data.length==1){
+							that.detailId = res.data[0].id
+							console.log('detailId:',that.detailId)
+						}
+						// console.log('ajaxCommon:',res.data)
 						var analyis = [],
 							gzssdl = [],
 							jxssdl = [],
@@ -753,6 +761,7 @@
 
 						that.ajaxData.forEach((item, index) => {
 							that.tableIdArr.push(item.id);
+							// console.log('ajaxTable:',that.tableIdArr)
 							gzssdl.push({
 								text: item.name,
 								value: item.gzssdl
@@ -949,7 +958,11 @@
 			},
 			detailClick(data) {
 				var that = this;
+				// console.log('DetailData:',data)
 				var dataId = that.tableIdArr[data.index - 1];
+				console.log('dataIndex:',data.index)
+				console.log('that.tableIdArr:',that.tableIdArr)
+				console.log('dataId:',dataId)
 				that.clearDb();
 				that.detailShow = 2;
 				that.API.requestData({
@@ -957,13 +970,15 @@
 					baseURL: "http://10.155.32.4:9001/",
 					subUrl: "benchmarking/details",
 					data: {
-						id: dataId,
+						// id: dataId,
+						id:that.idArr.length==1?that.detailId:dataId,
 						beginDate: that.value4,
 						endDate: that.value5,
 						target: '',
 						sort: ''
 					},
 					success(res) {
+						console.log('resDetail:',res)
 						var dataTab = [];
 						res.data.forEach((item, index) => {
 							that.tableIdArr.push(item.id);

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

@@ -7,7 +7,7 @@
       <div class="mg-b-16">
         <btn-group-double :btnGroups="btnGroups" :rowIndex="0" :index="1" @select="select" />
       </div>
-      <row>
+      <row v-if="paramsId.includes('FDC')">
         <wind-site-weather :time="nowTime" :data="tqmap" />
         <panel-3 class="wind-site-info">
           <row align="middle">
@@ -156,6 +156,156 @@
           </row>
         </panel-3>
       </row>
+       <row v-if="paramsId.includes('GDC')">
+        <wind-site-weather :time="nowTime" :data="tqmap" />
+        <panel-3 class="wind-site-info">
+          <row align="middle">
+            <div class="info-item">
+              <div class="value">{{ jczbmap.zjrl }}</div>
+              <div class="text">装机容量</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.rfdl }}</div>
+              <div class="text">日发电量</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.yfdl }}</div>
+              <div class="text">月发电量</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.nfdl }}</div>
+              <div class="text">年发电量</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.ylyxs }}</div>
+              <div class="text">月利用小时</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.nlyxs }}</div>
+              <div class="text">年利用小时</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.ssfs }}</div>
+              <!-- <div class="text">实时风速</div> -->
+              <div class="text">平均功率</div>
+            </div>
+            <div class="info-item">
+              <div class="value">{{ jczbmap.sjgl }}</div>
+              <div class="text">实时功率</div>
+            </div>
+          </row>
+        </panel-3>
+        <panel-3 class="wind-running-info">
+          <row align="middle">
+            <div class="fengji">
+              <div class="fengji-icon svg-icon svg-icon-white">
+                <svg-icon class="" svgid="svg-风机" />
+              </div>
+              <div class="info">
+                <div class="text green">接入光伏</div>
+                <div class="value">{{ jczbmap.jrts }}</div>
+              </div>
+            </div>
+            <div class="situation">
+              <row class="icon-status">
+                <div class="status">
+                  <span class="svg-icon svg-icon-green">
+                    <svg-icon svgid="svg-standby" />
+                  </span>
+                  <span class="text green"> 
+                    待机
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="svg-icon svg-icon-purple">
+                    <svg-icon svgid="svg-normal-power" />
+                  </span>
+                  <span class="text purple">
+                    运行
+                  </span>
+                </div>
+                <div class="status ">
+                  <span class="svg-icon svg-icon-pink">
+                    <svg-icon svgid="svg-limit-power" style="margin:3px 0.3704vh -3px 0;" />
+                  </span>
+                  <span class="text pink">
+                    限电
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="svg-icon svg-icon-red">
+                    <svg-icon svgid="svg-gz-downtime" />
+                  </span>
+                  <span class="text red">
+                    故障
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="svg-icon svg-icon-orange">
+                    <svg-icon svgid="svg-jx-downtime" />
+                  </span>
+                  <span class="text orange">
+                    检修
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="svg-icon svg-icon-gray">
+                    <svg-icon svgid="svg-offline" />
+                  </span>
+                  <span class="text gray">
+                    离线
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="svg-icon svg-icon-white">
+                    <svg-icon svgid="svg-intranet-involvement" />
+                  </span>
+                  <span class="text white">
+                    受累
+                  </span>
+                </div>
+              </row>
+              <row>
+                <div class="status">
+                  <span class="value">
+                    {{ jczbmap.djnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="value">
+                    {{ jczbmap.zcfdnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="value">
+                    {{ jczbmap.xdjclnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="value">
+                    {{ jczbmap.gztjnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="value">
+                    {{ jczbmap.jxtjnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="value">
+                    {{ jczbmap.dwslnum }}
+                  </span>
+                </div>
+                <div class="status">
+                  <span class="value">
+                    {{ jczbmap.lxnum }}
+                  </span>
+                </div>
+              </row>
+            </div>
+          </row>
+        </panel-3>
+      </row>
       <div class="first-info mg-t-16 mg-b-16">
         <div style="flex:0 1 450px;">
           <panel title="场站">
@@ -163,10 +313,14 @@
           </panel>
         </div>
         <div class="mg-l-16" style="flex:1 1 auto;" ref="lineChart">
-          <panel title="4小时功率曲线图">
+          <panel title="4小时功率曲线图" v-if="paramsId.includes('FDC')">
             <multiple-line-chart height="18.519vh" v-if="Powertrend" :list="Powertrend.value" :units="Powertrend.units"
               :showLegend="true" />
           </panel>
+           <panel title="4小时功率曲线图" v-if="paramsId.includes('GDC')">
+            <multiple-line-chart height="18.519vh" v-if="Powertrend1" :list="Powertrend1.value" :units="Powertrend1.units"
+              :showLegend="true" />
+          </panel>
         </div>
         <div class="mg-l-16" style="flex:0 0 400px;">
           <panel class="light-matrix-panel">
@@ -228,7 +382,6 @@ import Panel3 from "../../../../components/coms/panel/panel3.vue";
 import LightMatrix from "./light-matrix.vue";
 import Station from "./Station.vue";
 import WindSiteWeather from "./wind-site-weather.vue";
-
 import BtnGroup2 from "@com/coms/btn/btn-group-double.vue";
 
 export default {
@@ -241,6 +394,8 @@ export default {
     return {
       timmer: null, // 计时器
       timmer2: null,
+      paramsId:"",
+      resCode:"",
       nowTime: "", // 时间
       fjmap: [], // 分机矩阵
       tqmap: {}, // 天气数据
@@ -290,7 +445,7 @@ export default {
         units: ["", ""],
       },
 
-      // 4小时功率曲线图
+      // 4小时功率曲线图(风电场)
       Powertrend: {
         value: [
           {
@@ -299,6 +454,15 @@ export default {
           },
         ],
       },
+      // 4小时功率曲线图(光电场)
+      Powertrend1: {
+        value: [
+          {
+            title: "",
+            value: [],
+          },
+        ],
+      },
 
       // 月发电量对比
       MonthCompare: {
@@ -381,9 +545,12 @@ export default {
     },
 
     select (res) {
+      let that = this;
       this.$router.replace({
         path: `/monitor/windsite/home/${res.code}`,
       });
+      that.resCode = res.code;
+      console.log('resCode:',res)
     },
     // 根据风机状态码返回对应 class
     getColor (fjzt) {
@@ -422,7 +589,10 @@ export default {
         },
         success (res) {
           if (res.data) {
+            console.log('resWpinfo:',res.data)
             that.tqmap = res.data.tqmap;
+            that.tqmap.name = res.data.jczbmap.name
+            that.tqmap.resCode = that.resCode
             let fjmap = [];
             let keys = ["value1", "value2", "value3", "value4", "value5", "value6", "value7", "value9"];
             let Powertrend = {
@@ -471,6 +641,52 @@ export default {
                 },
               ],
             };
+             let Powertrend1 = {
+              // 图表所用单位
+              units: ["(万KWh)", "(风速)"],
+              value: [
+                {
+                  title: "应发功率",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+                {
+                  title: "实发功率",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+                {
+                  title: "理论功率",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+                {
+                  title: "预测功率",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+                {
+                  title: "保证功率",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+                {
+                  title: "平均功率",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+                {
+                  title: "小时预测功率",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+                {
+                  title: "最有功率律",
+                  smooth: true, // 使用单位
+                  value: [],
+                },
+              ],
+            };
 
             let dayPieChartKey = [
               {
@@ -519,6 +735,10 @@ export default {
                   text: new Date(ele.time).formatDate("hh:mm"),
                   value: ele[key],
                 });
+                    Powertrend1.value[keyIndex].value.push({
+                  text: new Date(ele.time).formatDate("hh:mm"),
+                  value: ele[key],
+                });
               });
             });
 
@@ -544,6 +764,7 @@ export default {
 
             that.fjmap = fjmap;
             that.Powertrend = Powertrend;
+            that.Powertrend1 = Powertrend1;
             that.jczbmap = res.data.jczbmap;
             that.pieChartData = {
               dayData,
@@ -553,6 +774,7 @@ export default {
           } else {
             that.fjmap = [];
             that.Powertrend = {};
+            that.Powertrend1 = {};
             that.jczbmap = {};
             that.pieChartData = {
               dayData: [],
@@ -671,6 +893,7 @@ export default {
   created () {
     let that = this;
     that.wpId = that.$route.params.wpId;
+    that.paramsId = that.$route.params.wpId;
     that.$nextTick(() => {
       that.getWp();
       that.requestData(false);

src/views/WindSite/pages/Home/wind-site-weather.vue

@@ -1,7 +1,9 @@
 // 天气分析
 <template>
   <div class="wind-site-weather">
-    <div class="title">风场 {{ nowTime }} 实况</div>
+    <!-- <div class="title">风场 {{ nowTime }} 实况</div> -->
+        <div class="title" v-if="paramsId.includes('FDC')">风场 {{ nowTime }} 实况</div>
+        <div class="title" v-else-if="paramsId.includes('GDC')">光电场 {{ nowTime }} 实况</div>
     <div class="weather">
       <div class="weather-info">
         <span class="svg-icon">
@@ -60,12 +62,13 @@
 </template>
 
 <script>
+import Home from "./Home.vue"
 import Col from "@/components/coms/grid/col.vue";
 import Row from "@/components/coms/grid/row.vue";
 import SvgIcon from "@/components/coms/icon/svg-icon.vue";
 
 export default {
-  components: { Row, Col, SvgIcon },
+  components: { Home,Row, Col, SvgIcon },
   props:{
     time: String,
     data:{
@@ -75,6 +78,7 @@ export default {
   },
   data() {
     return {
+      // paramsId:"",
       sourceMap: {},
       nowTime: "",
       weather: "阴", // 气象法
@@ -88,14 +92,20 @@ export default {
       sunset: "18:50", // 日落
     };
   },
-  created(){},
+  created(){
+    let that = this;
+    that.paramsId = that.$route.params.wpId
+    console.log("paramsId:",that.$route.params.wpId)
+  },
   mounted(){
     this.sourceMap=this.data;
+   
   },
 
   watch:{
     data(res){
       this.sourceMap=res;
+       console.log('map:',this.sourceMap)
     },
     time(value){
       this.nowTime = value