Merge branch 'new'

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "servebig": "node --max-old-space-size=6000  ./node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
+    "servebig": "node --max-old-space-size=10240  ./node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
     "build": "vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",

src/components/coms/table/table.vue

@@ -85,7 +85,7 @@ export default {
   // 传入参数
   props: {
     /**
-             * {
+             {
                     column: [{
                         name: "风机名称",
                         field: "name",

src/components/other/healthReport/index.vue

@@ -71,6 +71,7 @@
             <el-form-item
               >注：本报告表述了健康管理系统对该设备的健康评级观点，仅供参考，并非是最终的决策的结论、建议。</el-form-item
             >
+          
           </el-form>
         </div>
         <div class="r">
@@ -148,7 +149,6 @@
           </div>
         </el-form>
       </div>
-
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2">对风偏差：</el-form-item>
@@ -486,12 +486,11 @@
           </el-table>
         </el-form>
       </div>
-
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2">发电机：</el-form-item>
-          <el-form-item class="text-indent-2"
-            >关键参数：发电机采用“发电机转速”、“发电机轴A温度”
+          <el-form-item class="text-indent-2">
+            关键参数：发电机采用“发电机转速”、“发电机轴A温度”
             、“发电机轴B温度”为关键参数，该参数在统计周期内数据显示样本在安全运行区内，没有超过进入劣化区
           </el-form-item>
           <div class="logHead">发电机关键参数值</div>
@@ -515,7 +514,6 @@
           </el-table>
         </el-form>
       </div>
-
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2">
@@ -1924,7 +1922,7 @@ export default {
                 }
                 if (that.yhmxdbs2.length == 3) break;
               }
-
+              
               // 部件隐患数据频次时长统计
               let ybmxdj1 = Object.assign([], ybmxdj);
               let ybmxdj2 = Object.assign([], ybmxdj);
@@ -1952,8 +1950,6 @@ export default {
 				    that.qrqcs.push(item);
 				  });
 			}
-            
-            
 
             //设备可利用率
             let sbklyls = that.datas.healthreport.sbklyls;
@@ -2077,12 +2073,10 @@ export default {
               that.fnlyls.push(fnlyl8);
               that.fnlyls.push(fnlyl9);
             }
-
             // 故障分类
             that.faultclass = that.datas.healthreport.faultclass.sort(
               that.compare("monthwarningnum")
             );
-
             // 功率对部件温度影响
             that.partwds = [];
             let partwds = that.datas.healthreport.partwds;
@@ -2561,7 +2555,7 @@ export default {
     params(res) {
       this.reqData = res;
     },
-  },
+  }, 
 };
 </script>
  

src/views/LightMatrix1/LightMatrix1.vue

@@ -13,49 +13,49 @@
               <SvgIcon svgid="svg-wind-site"></SvgIcon>
             </span>
           </div>
-          <div class="item write" @click="changeShow('jrfj_FDC')">
+          <div class="item write" :class="{nb:fillCategory=='jrfj_FDC'}" @click="changeShow('jrfj_FDC')">
             <div class="curStyle">
               <div>接入风机</div>
               <div>{{ sourceMap.fcjrnum || "---" }}</div>
             </div>
           </div>
-          <div class="item blue" @click="changeShow('yx_FDC', 1)">
-            <div class="curStyle">
-              <div>· 运行</div>
-              <div>{{ sourceMap.fcyxnum || "---" }}</div>
-            </div>
-          </div>
-          <div class="item green" @click="changeShow('dj_FDC', 0)">
+          <div class="item green" :class="{nb:fillCategory=='dj_FDC'}" @click="changeShow('dj_FDC', 0)">
             <div class="curStyle">
               <div>· 待机</div>
               <div>{{ sourceMap.fcdjnum || "---" }}</div>
             </div>
           </div>
-          <div class="item pink" @click="changeShow('xd_FDC', 5)">
+           <div class="item blue" :class="{nb:fillCategory=='yx_FDC'}"  @click="changeShow('yx_FDC', 1)">
+            <div class="curStyle"  >
+              <div>· 运行</div>
+              <div>{{ sourceMap.fcyxnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item pink" :class="{nb:fillCategory=='xd_FDC'}" @click="changeShow('xd_FDC', 5)">
             <div class="curStyle">
               <div>· 限电</div>
               <div>{{ sourceMap.fcxdnum || "---" }}</div>
             </div>
           </div>
-          <div class="item red" @click="changeShow('gz_FDC', 2)">
+          <div class="item red" :class="{nb:fillCategory=='gz_FDC'}" @click="changeShow('gz_FDC', 2)">
             <div class="curStyle">
               <div>· 故障</div>
               <div>{{ sourceMap.fcgznum || "---" }}</div>
             </div>
           </div>
-          <div class="item orange" @click="changeShow('jx_FDC', 4)">
+          <div class="item orange" :class="{nb:fillCategory=='jx_FDC'}" @click="changeShow('jx_FDC', 4)">
             <div class="curStyle">
               <div>· 检修</div>
               <div>{{ sourceMap.fcwhnum || "---" }}</div>
             </div>
           </div>
-          <div class="item write" @click="changeShow('sl_FDC', 6)">
+          <div class="item write" :class="{nb:fillCategory=='sl_FDC'}" @click="changeShow('sl_FDC', 6)">
             <div class="curStyle">
               <div>· 受累</div>
               <div>{{ sourceMap.fcslnum || "---" }}</div>
             </div>
           </div>
-          <div class="item gray" @click="changeShow('lx_FDC', 3)">
+          <div class="item gray" :class="{nb:fillCategory=='lx_FDC'}" @click="changeShow('lx_FDC', 3)">
             <div class="curStyle">
               <div>· 离线</div>
               <div>{{ sourceMap.fclxnum || "---" }}</div>
@@ -78,49 +78,49 @@
               ></SvgIcon>
             </span>
           </div>
-          <div class="item write" @click="changeShow('jrfj1_GDC')">
+          <div class="item write" :class="{nb:fillCategory=='jrfj1_GDC'}" @click="changeShow('jrfj1_GDC')">
             <div class="curStyle">
               <div>逆变器</div>
               <div>{{ sourceMap.gfjrnum || "---" }}</div>
             </div>
-          </div>
-          <div class="item blue" @click="changeShow('yx1_GDC', 1)">
+          </div>  
+          <div class="item green"  :class="{nb:fillCategory=='dj1_GDC'}" @click="changeShow('dj1_GDC', 0)">
             <div class="curStyle">
-              <div>· 运行</div>
-              <div>{{ sourceMap.gfyxnum || "---" }}</div>
+              <div>· 待机</div>
+              <div>{{ sourceMap.gfdjnum || "---" }}</div>
             </div>
           </div>
-          <div class="item greenv" @click="changeShow('dj1_GDC', 0)">
+          <div class="item blue" :class="{nb:fillCategory=='yx1_GDC'}" @click="changeShow('yx1_GDC', 1)">
             <div class="curStyle">
-              <div>· 待机</div>
-              <div>{{ sourceMap.gfdjnum || "---" }}</div>
+              <div>· 运行</div>
+              <div>{{ sourceMap.gfyxnum || "---" }}</div>
             </div>
           </div>
-          <div class="item pink" @click="changeShow('xd1_GDC', 5)">
+          <div class="item pink" :class="{nb:fillCategory=='xd1_GDC'}" @click="changeShow('xd1_GDC', 5)">
             <div class="curStyle">
               <div>· 限电</div>
               <div>{{ sourceMap.gfxdnum || "---" }}</div>
             </div>
           </div>
-          <div class="item red" @click="changeShow('gz1_GDC', 2)">
+          <div class="item red" :class="{nb:fillCategory=='gz1_GDC'}" @click="changeShow('gz1_GDC', 2)">
             <div class="curStyle">
               <div>· 故障</div>
               <div>{{ sourceMap.gfgznum || "---" }}</div>
             </div>
           </div>
-          <div class="item orange" @click="changeShow('jx1_GDC', 4)">
+          <div class="item orange" :class="{nb:fillCategory=='jx1_GDC'}" @click="changeShow('jx1_GDC', 4)">
             <div class="curStyle">
               <div>· 检修</div>
               <div>{{ sourceMap.gfwhnum || "---" }}</div>
             </div>
           </div>
-          <div class="item write" @click="changeShow('sl1_GDC', 6)">
+          <div class="item write" :class="{nb:fillCategory=='sl1_GDC'}" @click="changeShow('sl1_GDC', 6)">
             <div class="curStyle">
               <div>· 受累</div>
               <div>{{ sourceMap.gfslnum || "---" }}</div>
             </div>
           </div>
-          <div class="item gray curStyle" @click="changeShow('lx1_GDC', 3)">
+          <div class="item gray curStyle" :class="{nb:fillCategory=='lx1_GDC'}" @click="changeShow('lx1_GDC', 3)">
             <div class="curStyle">
               <div>· 离线</div>
               <div>{{ sourceMap.gflxnum || "---" }}</div>
@@ -187,6 +187,7 @@
           </div>
           <!-- 站位用 保证卡片布局最后一行不会有问题 -->
           <i class="blank" v-for="i in (pItem.length > 44? pItem.length: 44 - pItem.length)" :key="i"></i>
+
         </div>
       </div>
     </div>
@@ -405,13 +406,14 @@ export default {
       // if (!skipFill) {
       //   console.log("!skipFill:", !skipFill);
       //   if (this.fillCategory === category) {
-      //     console.log("fillCategory:", this.fillCategory);
-      //     console.log("fillFjz:", this.fillFjzt);
+          // console.log("fillCategory:", this.fillCategory);
+          // console.log("fillFjz:", this.fillFjzt);
       //     this.fillCategory = null;
       //     this.fillFjzt = null;
       //   } else {
           this.fillCategory = category;
           this.fillFjzt = fjzt;
+          // console.log('66',this.skipFill);
       //   }
       // }
 
@@ -743,7 +745,7 @@ export default {
       .card {
         margin-right: 2px;
         margin-top: 2px;
-        flex: 1 0 40px;
+        flex: 0 0 40px;
         cursor: pointer;
       }
 
@@ -798,5 +800,9 @@ export default {
     cursor: pointer;
     text-align: center;
   }
+  .nb{
+        background: @greenLinearTop;
+        transition: color 0.2s ease-in-out;
+  }
 }
 </style>

src/views/LightMatrix2/LightMatrix2.vue

@@ -12,7 +12,55 @@
               <svg-icon svgid="svg-wind-site"></svg-icon>
             </span>
           </div>
-          <div
+          <div class="item write" :class="{nb:fillCategory=='jrfj_FDC'}" @click="changeShow('jrfj_FDC')">
+            <div class="curStyle">
+              <div>接入风机</div>
+              <div>{{ sourceMap.fcjrnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item green" :class="{nb:fillCategory=='dj_FDC'}" @click="changeShow('dj_FDC', 0)">
+            <div class="curStyle">
+              <div>· 待机</div>
+              <div>{{ sourceMap.fcdjnum || "---" }}</div>
+            </div>
+          </div>
+           <div class="item blue" :class="{nb:fillCategory=='yx_FDC'}"  @click="changeShow('yx_FDC', 1)">
+            <div class="curStyle"  >
+              <div>· 运行</div>
+              <div>{{ sourceMap.fcyxnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item pink" :class="{nb:fillCategory=='xd_FDC'}" @click="changeShow('xd_FDC', 5)">
+            <div class="curStyle">
+              <div>· 限电</div>
+              <div>{{ sourceMap.fcxdnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item red" :class="{nb:fillCategory=='gz_FDC'}" @click="changeShow('gz_FDC', 2)">
+            <div class="curStyle">
+              <div>· 故障</div>
+              <div>{{ sourceMap.fcgznum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item orange" :class="{nb:fillCategory=='jx_FDC'}" @click="changeShow('jx_FDC', 4)">
+            <div class="curStyle">
+              <div>· 检修</div>
+              <div>{{ sourceMap.fcwhnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item write" :class="{nb:fillCategory=='sl_FDC'}" @click="changeShow('sl_FDC', 6)">
+            <div class="curStyle">
+              <div>· 受累</div>
+              <div>{{ sourceMap.fcslnum || "---" }}</div>
+            </div>
+          </div>
+          <div class="item gray" :class="{nb:fillCategory=='lx_FDC'}" @click="changeShow('lx_FDC', 3)">
+            <div class="curStyle">
+              <div>· 离线</div>
+              <div>{{ sourceMap.fclxnum || "---" }}</div>
+            </div>
+          </div>
+          <!-- <div
             class="item curStyle"
             :class="data.color"
             v-for="(data, index) of panel1Data.datas"
@@ -20,7 +68,7 @@
           >
             <div>{{ data.test }}</div>
             <div>{{ sourceMap[data.key] }}</div>
-          </div>
+          </div> -->
         </div>
       </Col>
       <Col :span="12" class="left-50-16">
@@ -919,6 +967,11 @@ export default {
   }
     .curStyle {
     cursor: pointer;
+    text-align: center;
+  }
+   .nb{
+        background: @greenLinearTop;
+        transition: color 0.2s ease-in-out;
   }
 }
 </style>

src/views/WindSite/components/boosterstation/pl1.vue

@@ -939,7 +939,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1561.2717 296.7874)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.6452">
-									315
+									317
 								</text>
 								<text transform="matrix(1 0 0 1 1561.2717 748.2483)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.6452">

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

@@ -210,7 +210,7 @@
             	<g>
             		<rect x="1718.713" y="552.331" fill="none" stroke="#4C497B" stroke-miterlimit="10" width="99.104" height="24.605"/>
             		<rect x="1718.713" y="552.331" opacity="0.7" fill="#1D2A60" enable-background="new    " width="99.104" height="24.605"/>
-            		<text transform="matrix(1 0 0 1 1729.4688 569.1055)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.8514">#6集电线路</text>
+            		<text transform="matrix(1 0 0 1 1729.4688 569.1055)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.8514">#4集电线路</text>
             	</g>
             	<g>
             		<rect x="1718.713" y="671.362" fill="none" stroke="#4C497B" stroke-miterlimit="10" width="99.104" height="24.605"/>
@@ -230,7 +230,7 @@
             	<g>
             		<rect x="14.061" y="679.193" fill="none" stroke="#4C497B" stroke-miterlimit="10" width="99.104" height="24.605"/>
             		<rect x="14.061" y="679.193" opacity="0.7" fill="#1D2A60" enable-background="new    " width="99.104" height="24.605"/>
-            		<text transform="matrix(1 0 0 1 24.8164 695.9678)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.8514">#4集电线路</text>
+            		<text transform="matrix(1 0 0 1 24.8164 695.9678)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14.8514">#6集电线路</text>
             	</g>
             	<text transform="matrix(1 0 0 1 768.9146 346.3823)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14">312</text>
             	<text transform="matrix(1 0 0 1 811.5811 346.3823)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="14">313</text>

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

@@ -198,7 +198,7 @@
               <div class="value">{{ jczbmap.ssfs }}</div>
               <!-- <div class="text">实时风速</div> -->
               <div class="text">
-                {{ resCode.includes("FDC") ? "实时风速" : "平均功率" }}
+                {{ resCode.includes("FDC") ? "实时风速" : "光照强度" }}
               </div>
             </div>
             <div class="info-item">
@@ -266,18 +266,19 @@
                   </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>
+                 <div class="status">
+                  <span class="svg-icon svg-icon-gray">
+                    <svg-icon svgid="svg-offline" />
+                  </span>
+                  <span class="text gray"> 离线 </span>
+                </div>
               </row>
               <row>
                 <div class="status">

src/views/singleAnalysis/index.vue

@@ -20,7 +20,29 @@
             </el-select>
           </div>
         </div>
-        <div class="query-item">
+
+
+          <div class="query-item">
+					<div class="lable">开始日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="recorddate"  type="date"
+							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+						</el-date-picker>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">结束日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="recorddatenew"  type="date"
+							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+						</el-date-picker>
+						<div class="unit svg-icon svg-icon-gray">
+							<svg-icon :svgid="''" />
+						</div>
+					</div>
+				</div>
+
+        <!-- <div class="query-item">
           <div class="lable">日期：</div>
           <div class="search-input">
             <el-date-picker
@@ -31,8 +53,10 @@
               popper-class="date-select"
             >
             </el-date-picker>
+            
           </div>
-        </div>
+        </div> -->
+        
       </div>
       <div class="query-actions">
         <button class="btn green" @click="search()">查询</button>
@@ -89,7 +113,10 @@ export default {
       year: "",
       month: "",
       recorddate: new Date(new Date().getTime() - 3600 * 1000 * 24).formatDate(
-        "yyyy-MM"
+        "yyyy-MM-01"
+      ),
+      recorddatenew: new Date(new Date().getTime() - 3600 * 1000 * 24).formatDate(
+        "yyyy-MM-dd"
       ),
       tableDataEnd: [], //合计
       tableData: {
@@ -135,7 +162,7 @@ export default {
           },
           {
             name: "等效可用系数(%)",
-            field: "tjxs",
+            field: "dxklyxs",
             is_num: false,
             is_light: false,
             sortable: true,
@@ -231,7 +258,7 @@ export default {
       that.year = new Date(this.recorddate).formatDate("yyyy");
       that.month = new Date(this.recorddate).formatDate("MM");
       that.dialogVisible = true;
-      that.$router.push({path:`/decision/znzhfx/${row.windturbineid}/${new Date(this.recorddate).formatDate("yyyy")}/${new Date(this.recorddate).formatDate("MM")}`})
+      that.$router.push({path:`/decision/znzhfx/${row.windturbineid}/${new Date(this.recorddate).formatDate("yyyy")}/${new Date(this.recorddate).formatDate("MM")}`}) 
     },
     // 请求服务
     requestData() {
@@ -261,8 +288,9 @@ export default {
           data: {
             wpId,
             isAsc: that.isAsc,
-            year: new Date(that.recorddate).getFullYear(),
-            month: new Date(that.recorddate).getMonth() + 1,
+            beginDate: that.recorddate,
+            endDate: that.recorddatenew,
+            // date:new Date(that.recorddate).getDate()+1
           },
           success(res) {
             res.data.forEach((ele) => {