Browse Source

状态监视详情页tab修改时场站和icon显示bug的修改,海子井溢出界面的调整、健康推荐界面样式和数据的修改、

darker 3 years ago
parent
commit
2d749bea5f

+ 1 - 0
package.json

@@ -24,6 +24,7 @@
     "jquery": "^3.6.0",
     "jspdf": "^2.3.1",
     "jszip": "^3.7.1",
+    "papaparse": "^5.3.1",
     "stompjs": "^2.3.3",
     "three": "^0.129.0",
     "vivus": "^0.4.6",

+ 8 - 1
src/views/HealthControl/HealthTab4.vue

@@ -77,12 +77,19 @@
       <ComTable :data="tableData" height="80vh"></ComTable>
     </div>
     <div class="dialog-box">
-      <el-dialog
+      <!-- <el-dialog
         title="日信息对比"
         v-model="dialogVisible"
         width="1200px"
         custom-class="modal"
         :close-on-click-modal="false"
+      > -->
+         <el-dialog
+        title="消缺跟踪"
+        v-model="dialogVisible"
+        width="1200px"
+        custom-class="modal"
+        :close-on-click-modal="false"
       >
         <info-history :formdata="trackDate"/>
       </el-dialog>

+ 3 - 2
src/views/HealthControl/infotrack.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="track-info">
-    <div class="form-info">
+    <div class="form-info" style="flex:none">
       <div class="work-flow">
         <div class="work-flow-line"></div>
         <div :class="['work-flow-item', item.name == statu(form) ? 'active' : '']" v-for="(item, i) in svgarr" :key="i">
@@ -353,7 +353,8 @@ export default {
 .track-info {
   display: flex;
   .form-info {
-    flex: 0 0 720px;
+    width: 100%;
+    // flex: 0 0 720px;
     .work-flow {
       height: 132px;
       width: 100%;

+ 3 - 1
src/views/Status/Status.vue

@@ -47,7 +47,8 @@ export default {
       timmer: null, // 遮罩开关
       sourceMap: {}, // 核心数据
       datas: [],
-      wpId1: "",
+      // wpId1: "",
+      wpId:"",
       dwkGzqd: "",
       plGzqd: "",
       zhGzqd: "",
@@ -514,6 +515,7 @@ export default {
               that.wpId1 = sourceMap.vos.find((findEle) => {
                 return findEle.wpName === ele.name;
               }).wpId;
+              // console.log('wpid1:',that.wpId1)
               datas.push({
                 title: ele.name,
                 wpId: sourceMap.vos.find((findEle) => {

+ 1 - 0
src/views/Status/components/status-panel.vue

@@ -80,6 +80,7 @@ export default {
         path: `/monitor/windsite/home/${wpId}`,
         // query: { wpId: id },
       });
+      console.log('wpid:',wpId)
     },
   },
   // 生命周期钩子

+ 37 - 12
src/views/WindSite/pages/Home/Home.vue

@@ -7,8 +7,8 @@
       <div class="mg-b-16">
         <btn-group-double :btnGroups="btnGroups" :rowIndex="0" :index="1" @select="select" />
       </div>
-      <row v-if="paramsId.includes('FDC')">
-        <wind-site-weather :time="nowTime" :data="tqmap" />
+      <!-- <row v-if="paramsId.includes('FDC')">
+        <wind-site-weather :time="nowTime" :data="tqmap" :paramsId="resCode" />
         <panel-3 class="wind-site-info">
           <row align="middle">
             <div class="info-item">
@@ -155,9 +155,9 @@
             </div>
           </row>
         </panel-3>
-      </row>
-       <row v-if="paramsId.includes('GDC')">
-        <wind-site-weather :time="nowTime" :data="tqmap" />
+      </row> -->
+       <row >
+        <wind-site-weather :time="nowTime" :data="tqmap" :paramsId="resCode" />
         <panel-3 class="wind-site-info">
           <row align="middle">
             <div class="info-item">
@@ -187,7 +187,7 @@
             <div class="info-item">
               <div class="value">{{ jczbmap.ssfs }}</div>
               <!-- <div class="text">实时风速</div> -->
-              <div class="text">平均功率</div>
+              <div class="text">{{resCode.includes('FDC')?'实时风速':'平均功率'}} </div>
             </div>
             <div class="info-item">
               <div class="value">{{ jczbmap.sjgl }}</div>
@@ -197,12 +197,25 @@
         </panel-3>
         <panel-3 class="wind-running-info">
           <row align="middle">
-            <div class="fengji">
+            <div class="fengji" v-if=" resCode.indexOf('GDC') == -1  ">
               <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="text green" v-if="resCode.includes('FDC') && resCode != ''">接入风机 </div>
+                  <div class="text green" v-else-if="resCode.includes('GDC') && resCode != ''">接入光伏 </div> -->
+                <div class="value">{{ jczbmap.jrts }}</div>
+              </div>
+            </div>
+            <div class="fengji"  v-else-if=" resCode.indexOf('FDC') == -1 ">
+              <div class="fengji-icon svg-icon svg-icon-white">
+                <svg-icon class="" svgid="svg-gf-matrix" />
+              </div>
+              <div class="info">
                 <div class="text green">接入光伏</div>
+                 <!-- <div class="text green" v-if="resCode.includes('FDC') && resCode != ''">接入风机 </div>
+                  <div class="text green" v-else-if="resCode.includes('GDC') && resCode != ''">接入光伏 </div> -->
                 <div class="value">{{ jczbmap.jrts }}</div>
               </div>
             </div>
@@ -313,11 +326,11 @@
           </panel>
         </div>
         <div class="mg-l-16" style="flex:1 1 auto;" ref="lineChart">
-          <panel title="4小时功率曲线图" v-if="paramsId.includes('FDC')">
+          <panel title="4小时功率曲线图" v-if="resCode.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')">
+           <panel title="4小时功率曲线图" v-if="resCode.includes('GDC')">
             <multiple-line-chart height="18.519vh" v-if="Powertrend1" :list="Powertrend1.value" :units="Powertrend1.units"
               :showLegend="true" />
           </panel>
@@ -550,7 +563,12 @@ export default {
         path: `/monitor/windsite/home/${res.code}`,
       });
       that.resCode = res.code;
-      console.log('resCode:',res)
+      // console.log('resCode:',that.resCode)
+      // console.log('ParamsId:',that.paramsId)
+       console.log('paramsId:',that.paramsId.indexOf('FDC'))
+    console.log('resCode:',that.resCode.indexOf('FDC'))
+    console.log('paramsId:',that.paramsId.indexOf('GDC'))
+    console.log('resCode:',that.resCode.indexOf('GDC'))
     },
     // 根据风机状态码返回对应 class
     getColor (fjzt) {
@@ -589,7 +607,7 @@ export default {
         },
         success (res) {
           if (res.data) {
-            console.log('resWpinfo:',res.data)
+            // console.log('resWpinfo:',res.data)
             that.tqmap = res.data.tqmap;
             that.tqmap.name = res.data.jczbmap.name
             that.tqmap.resCode = that.resCode
@@ -894,6 +912,11 @@ export default {
     let that = this;
     that.wpId = that.$route.params.wpId;
     that.paramsId = that.$route.params.wpId;
+    that.resCode = that.$route.params.wpId;
+    console.log('paramsId:',that.paramsId.indexOf('FDC'))
+    console.log('resCode:',that.resCode.indexOf('FDC'))
+    console.log('paramsId:',that.paramsId.indexOf('GDC'))
+    console.log('resCode:',that.resCode.indexOf('GDC'))
     that.$nextTick(() => {
       that.getWp();
       that.requestData(false);
@@ -1047,7 +1070,9 @@ export default {
   }
 
   .light-matrix-panel {
-    height: 100%;
+        width: 673px;
+    overflow-y:scroll;
+    height: 240px;
 
     .panel-body {
       height: 100%;

+ 3 - 2
src/views/WindSite/pages/Home/light-matrix.vue

@@ -46,6 +46,7 @@ export default {
         this.$el.style.width = "1000px";
       } else if (this.list.length > 168) {
         this.$el.style.width = "1168px";
+          // this.$el.style.width = "100%";
       }
       let myevent = new Event("resize");
       window.dispatchEvent(myevent);
@@ -77,7 +78,7 @@ export default {
   mounted() {
     // 渲染后
     this.$nextTick(() => {
-      this.calculateWidth();
+      // this.calculateWidth();
     });
   },
   beforeUpdate() {
@@ -86,7 +87,7 @@ export default {
   updated() {
     // 数据更新后
     this.$nextTick(() => {
-      this.calculateWidth();
+      // this.calculateWidth();
     });
   },
 };

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

@@ -74,7 +74,8 @@ export default {
     data:{
       type:Object,
       default:() => { }
-    }
+    },
+    paramsId:'',
   },
   data() {
     return {
@@ -93,9 +94,9 @@ export default {
     };
   },
   created(){
-    let that = this;
-    that.paramsId = that.$route.params.wpId
-    console.log("paramsId:",that.$route.params.wpId)
+    // let that = this;
+    // that.paramsId = that.$route.params.wpId
+    // console.log("paramsId:",that.$route.params.wpId)
   },
   mounted(){
     this.sourceMap=this.data;
@@ -105,7 +106,7 @@ export default {
   watch:{
     data(res){
       this.sourceMap=res;
-       console.log('map:',this.sourceMap)
+      //  console.log('map:',this.sourceMap)
     },
     time(value){
       this.nowTime = value