Merge branch 'master' of http://124.70.43.205:3000/yangxiao/sis_zhfx into mw

public/static/config/modeConfig.js

@@ -16,7 +16,7 @@ const tilesMaxLevel = 18;
 const adapterUrl = "http://10.155.32.4:8011/";
 
 // 切换模块时是否提示当前模块名称(用于对内介绍项目时便捷显示模块名称)
-const showModuleName = 0;
+const showModuleName = 1;
 
 if (localTest) {
     // baseURL = "http://192.168.10.13:8082/" // 联机调试 - 石林

src/components/other/healthReport/index.vue

@@ -202,7 +202,7 @@
         </el-form>
       </div>
 
-      <div class="textBox">
+      <!-- <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2">切入切出：</el-form-item>
           <el-form-item class="text-indent-2"
@@ -233,7 +233,7 @@
             <el-table-column prop="dfqc" label="大风切出"></el-table-column>
           </el-table>
         </el-form>
-      </div>
+      </div> -->
 
       <div class="textBox">
         <el-form>
@@ -290,7 +290,7 @@
               }}分钟。</font
             >
           </el-form-item>
-          <div class="logHead">部件隐患对比（次|分钟）</div>
+          <!-- <div class="logHead">部件隐患对比（次|分钟）</div>
           <el-table
             empty-text="暂无数据"
             :data="bjyhdbs"
@@ -336,7 +336,7 @@
               <el-table-column prop="tdgcount"></el-table-column>
               <el-table-column prop="tdgtimes"></el-table-column>
             </el-table-column>
-          </el-table>
+          </el-table> -->
           <div class="logHead">隐患模型对比</div>
           <el-table
             empty-text="暂无数据"
@@ -364,15 +364,15 @@
 
       <div class="textBox">
         <el-form>
-          <el-form-item class="imp fw text-indent-2">故障分类：</el-form-item>
+          <!-- <el-form-item class="imp fw text-indent-2">故障分类：</el-form-item>
           <el-form-item class="text-indent-2">
             统计周期内，机舱振动类故障频次为88次，持续时长51分钟。（只显示发生故障的，如没有发生过故障的不用文字描述）
           </el-form-item>
-          <el-form-item class="text-indent-2">
+          <el-form-item class="text-indent-2"> -->
             <!-- 其中以（明细故障mwData）发生频次最高，为mwData次；（明细故障mwData）次之，为mwData次；（明细故障mwData）第三，为mwData次。 -->
-          </el-form-item>
-          <div class="logHead">故障分类统计</div>
-          <el-table
+          <!-- </el-form-item> -->
+          <!-- <div class="logHead">故障分类统计</div> -->
+          <!-- <el-table
             empty-text="暂无数据"
             :data="faultclass"
             :header-cell-style="{
@@ -412,11 +412,11 @@
                 label="同期"
               ></el-table-column>
             </el-table-column>
-          </el-table>
+          </el-table> -->
         </el-form>
       </div>
 
-      <div class="textBox">
+      <!-- <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2"
             >功率对部件温度影响</el-form-item
@@ -454,7 +454,7 @@
             <el-table-column prop="min1350" label="1350-1500"></el-table-column>
           </el-table>
         </el-form>
-      </div>
+      </div> -->
 
       <div class="textBox">
         <el-form>

src/views/layout/Menu.vue

@@ -397,11 +397,11 @@ export default {
                   icon: "svg-等级评估",
                   path: "/health/assess/index",
                 },
-                {
-                  text: "自组合评级",
-                  icon: "svg-wind-site",
-                  path: "/health/assess/selfEvaluate",
-                },
+                // {
+                //   text: "自组合评级",
+                //   icon: "svg-wind-site",
+                //   path: "/health/assess/selfEvaluate",
+                // },
               ],
             },
             {
@@ -483,11 +483,11 @@ export default {
                   icon: "svg-wind-site",
                   path: "/health/nxfx/phdffx",
                 },
-                {
-                  text: "切入切出分析",
-                  icon: "svg-wind-site",
-                  path: "/health/nxfx/cutAnalyse",
-                },
+                // {
+                //   text: "切入切出分析",
+                //   icon: "svg-wind-site",
+                //   path: "/health/nxfx/cutAnalyse",
+                // },
                 {
                   text: "曲线偏差率分析",
                   icon: "svg-wind-site",

src/views/report/bdzcx.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$TPS2QU06ZT1TOYKPQNNSTOL1S4PMDU4S.rpttpl&id=admin&pw=gdnxfd123&showmenu=false&showparams=true&calcnow=true --disable-features=SameSiteByDefaultCookies"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$TPS2QU06ZT1TOYKPQNNSTOL1S4PMDU4S.rpttpl&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true --disable-features=SameSiteByDefaultCookies"
     }
   }
 }

src/views/singleAnalysis/index.vue

@@ -231,7 +231,7 @@ export default {
       that.year = new Date(this.recorddate).formatDate("yyyy");
       that.month = new Date(this.recorddate).formatDate("MM");
       that.dialogVisible = true;
-      // this.$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() {

src/views/singleAnalysis/znzhfx.vue

@@ -364,14 +364,11 @@ export default {
     };
   },
   created() {
-    // this.wtId = this.$route.params.wtId;
-    // this.year = this.$route.params.year;
-    // this.month = this.$route.params.month;
+    this.wtId = this.$route.params.wtId;
+    this.year = this.$route.params.year;
+    this.month = this.$route.params.month;
     this.search();
     this.searchChart();
-	while(true){
-		console.log()
-	}
   },
   filters: {
     tabrowfil(val) {