rui.jiang il y a 2 semaines
Parent
commit
8928ecff51

+ 2 - 2
src/router/index.js

@@ -28,8 +28,8 @@ const createRouter = () =>
             iconName: "gps",
             component: () =>
               import(
-                // /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/Index.vue"
-                /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/HD.vue" //华电选择这个
+                /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/Index.vue"
+                // /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/HD.vue" //华电选择这个
               ),
           },
           {

+ 28 - 10
src/views/health/components/envelopecharts.vue

@@ -28,9 +28,14 @@
         </el-checkbox-group>
       </div>
       <!-- 光标 -->
-      <div v-if="BGshow" class="eigenvalue">
+      <div v-if="BGshow" class="eigenvalue eigenvalue--first">
         <el-checkbox-group v-model="checkedGB" @change="handlecursor">
-          <el-checkbox v-for="(item, index) in GBcheckList" :key="index" :label="item.val" :disabled="item.disabled">
+          <el-checkbox
+            v-for="(item, index) in GBcheckList"
+            :key="index"
+            :label="item.val"
+            :disabled="item.disabled"
+          >
             {{ item.val }}
           </el-checkbox>
         </el-checkbox-group>
@@ -266,11 +271,21 @@ export default {
 
       // 构建新的特征频率数据
       const newFeatureLines = {
-        Fr: this.checkedValues.includes("转速频率") ? this.envelopeList.fn_Gen : [],
-        BPFI: this.checkedValues.includes("内圈故障频率") ? this.envelopeList.BPFI : [],
-        BPFO: this.checkedValues.includes("外圈故障频率") ? this.envelopeList.BPFO : [],
-        BSF: this.checkedValues.includes("滚动体故障频率") ? this.envelopeList.BSF : [],
-        FTF: this.checkedValues.includes("保持架频率") ? this.envelopeList.FTF : [],
+        Fr: this.checkedValues.includes("转速频率")
+          ? this.envelopeList.fn_Gen
+          : [],
+        BPFI: this.checkedValues.includes("内圈故障频率")
+          ? this.envelopeList.BPFI
+          : [],
+        BPFO: this.checkedValues.includes("外圈故障频率")
+          ? this.envelopeList.BPFO
+          : [],
+        BSF: this.checkedValues.includes("滚动体故障频率")
+          ? this.envelopeList.BSF
+          : [],
+        FTF: this.checkedValues.includes("保持架频率")
+          ? this.envelopeList.FTF
+          : [],
         B3P: this.checkedValues.includes("叶片频率")
           ? Array.isArray(this.envelopeList.B3P)
             ? this.envelopeList.B3P
@@ -366,7 +381,7 @@ export default {
           text: this.envelopeList.title || this.envelopeListTwo.title,
           left: "center",
         },
-       grid: {
+        grid: {
           left: 60, // 原来是100,适当缩小左右边距
           right: 20,
           bottom: 90, // 给推拽条和坐标轴腾出空间
@@ -514,11 +529,11 @@ export default {
   right: 0;
   font-size: 10px;
   width: 146px;
-  border: 1px solid black;
+  border: 1px solid rgb(182, 182, 182);
   padding: 5px;
   background: #fff;
   z-index: 99;
-
+  border-radius: 5px;
   h5 {
     line-height: 16px;
     height: 16px;
@@ -536,4 +551,7 @@ export default {
     margin-left: 10px;
   }
 }
+.eigenvalue--first {
+  width: 100px;
+}
 </style>

+ 7 - 4
src/views/health/components/spectrogramcharts.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="FD">
       <!-- 光标 -->
-      <div v-if="BGshow" class="eigenvalue">
+      <div v-if="BGshow" class="eigenvalue eigenvalue--first">
         <el-checkbox-group v-model="checkedGB" @change="handlecursor">
           <el-checkbox v-for="(item, index) in GBcheckList" :key="index" :label="item.val" :disabled="item.disabled">
             {{ item.val }}
@@ -528,18 +528,21 @@ export default {
 
 .eigenvalue {
   position: absolute;
-  top: 30px;
+  top: 60px;
   right: 0;
   font-size: 10px;
   width: 146px;
-  border: 1px solid black;
+  border: 1px solid rgb(182, 182, 182);
   padding: 5px;
   background: #fff;
   z-index: 99;
-
+  border-radius: 5px;
   h5 {
     line-height: 16px;
     height: 16px;
   }
 }
+.eigenvalue--first {
+  width: 100px;
+}
 </style>

+ 1 - 1
src/views/health/vibration.vue

@@ -221,7 +221,7 @@
           <el-table-column type="index" label="排序" fixed> </el-table-column>
           <el-table-column prop="timeStamp" label="采样时间" width="180px">
           </el-table-column>
-          <el-table-column label="测点名称" width="150px">
+          <el-table-column label="测点名称" width="200px">
             <template slot-scope="scope">
               {{
                 pointNameMap[scope.row.mesurePointName] ||

+ 1 - 1
src/views/home/Index.vue

@@ -52,7 +52,7 @@ export default {
   data() {
     return {
       loading: false,
-      isShowHd: true, //true 则展示华电的菜单样式,false 则展示默认的左侧边栏菜单
+      isShowHd: false, //true 则展示华电的菜单样式,false 则展示默认的左侧边栏菜单
     };
   },
   methods: {

+ 22 - 22
src/views/home/components/MenuHD.vue

@@ -403,30 +403,30 @@ export default {
 
 
 // 非华电公司放开这个注释下面的
-// .el-submenu__title * {
-//   font-size: 16px;
-// }
-// .el-menu-item * {
-//   font-size: 16px;
-// }
-</style>
-
- <!-- /* 华电时的菜单打开这个 */ -->
- <style lang="scss">
-.el-menu--popup {
-  width: 100% !important;
-  min-width: 120px !important;
-  .el-menu-item {
-    width: 100% !important;
-    min-width: unset !important;
-    text-align: center;
-    padding: 0 5px !important;
-  }
-}
 .el-submenu__title * {
-  font-size: 20px;
+  font-size: 16px;
 }
 .el-menu-item * {
-  font-size: 20px;
+  font-size: 16px;
 }
+</style>
+
+ <!-- /* 华电时的菜单打开这个 */ -->
+ <style lang="scss">
+// .el-menu--popup {
+//   width: 100% !important;
+//   min-width: 120px !important;
+//   .el-menu-item {
+//     width: 100% !important;
+//     min-width: unset !important;
+//     text-align: center;
+//     padding: 0 5px !important;
+//   }
+// }
+// .el-submenu__title * {
+//   font-size: 20px;
+// }
+// .el-menu-item * {
+//   font-size: 20px;
+// }
 </style>