Merge branch 'wsy' of http://61.161.152.110:10101/r/electronic-map into sl3

src/components/coms/table/table2.vue

@@ -7,6 +7,7 @@
     style="width: 100%"
     @cell-click="onClick"
     @header-click="onHeaderClick"
+    ref="table"
   >
     <el-table-column
       v-for="(col, cindex) of data.column"
@@ -177,7 +178,12 @@ export default {
   mounted() {
     // 渲染后
   },
-  beforeUpdate() {},
+  beforeUpdate() {
+    this.$nextTick(() => { //在数据加载完，重新渲染表格
+      // 数据刷新是闪烁，加上这个就不闪了 
+      this.$refs['table'].doLayout();
+    })
+  },
   updated() {},
 };
 </script>

src/views/Others/index.vue

@@ -2,7 +2,7 @@
   <div class="swiperBox">
     <el-carousel style="width: 100%; margin: 5vh 0" trigger="click" type="card" height="80vh" :autoplay="false" indicator-position="none" :initial-index="1" arrow="none" @change="changeSwiper">
       <!-- card-1 -->
-            <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
           <p class="itemTitle">
             记录查询
@@ -15,11 +15,10 @@
           </div>
         </div>
       </el-carousel-item>
-     
 
       <!-- card-2 -->
 
- <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
           <p class="itemTitle">
             报表管理
@@ -54,7 +53,7 @@
         </div>
       </el-carousel-item>
       <!-- card-3 -->
-        <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
           <p class="itemTitle">
             数据查询
@@ -68,7 +67,6 @@
         </div>
       </el-carousel-item>
 
-
       <!-- card-4 -->
       <!-- <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
@@ -83,19 +81,51 @@
         </div>
       </el-carousel-item> -->
       <!-- card-5 -->
-            <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+      <!-- <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
         <div class="itemBox">
           <p class="itemTitle">
             专家知识
-            <!-- <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i> -->
           </p>
           <div class="df-table">
-            <ComTable height="30vh" :data="tableData3" >
+            <ComTable height="30vh" :data="tableData3">
             </ComTable>
           </div>
         </div>
+      </el-carousel-item> -->
+      <el-carousel-item style="padding: 20px; background: rgb(4, 12, 11)">
+        <div class="itemBox">
+          <p class="itemTitle">
+            专家知识
+            <!-- <i class="itemMoreBtn el-icon-more" @click="jumpUrl('/realSearch')"></i> -->
+          </p>
+          <div class="imageBox1">
+            <div class="imgItem1" @click="jumpUrl('/others/knowledge/knowledge')">
+              <el-image class="img1" src="./static/img/o故障体系.png" fit="fill" />
+              <p class="imgTitle">故障体系</p>
+            </div>
+            <div class="imgItem1" @click="jumpUrl('/others/knowledge/knowledge7')">
+              <el-image class="img1" src="./static/img/o预警知识.png" fit="fill" />
+              <p class="imgTitle">预警知识</p>
+            </div>
+            <div class="imgItem1" @click="jumpUrl('/others/knowledge/knowledge5')">
+              <el-image class="img1" src="./static/img/o特征参数.png" fit="fill" />
+              <p class="imgTitle">特征参数</p>
+            </div>
+            <div class="imgItem1" @click="jumpUrl('/others/knowledge/knowledge6')">
+              <el-image class="img1" src="./static/img/o检修方案.png" fit="fill" />
+              <p class="imgTitle">排查、检修方案</p>
+            </div>
+            <div class="imgItem1" @click="jumpUrl('/health/gzzd/malfunctionDiagnose')">
+              <el-image class="img1" src="./static/img/o评价体系.png" fit="fill" />
+              <p class="imgTitle">评价体系</p>
+            </div>
+            <div class="imgItem1" @click="jumpUrl('/health/frist')">
+              <el-image class="img1" src="./static/img/o人工智能.png" fit="fill" />
+              <p class="imgTitle">人工智能</p>
+            </div>
+          </div>
+        </div>
       </el-carousel-item>
-      
     </el-carousel>
   </div>
 </template>
@@ -129,13 +159,29 @@ export default {
       },
       earlyAlarmData: {},
       earlyAlarmColumn: [
-        { name: "升压站告警", key: "syzgj", url: "/others/alarmCenter/boosterAlarm" },
-        { name: "升压站动作", key: "", url: "/others/alarmCenter/boosterAlarm" },
+        {
+          name: "升压站告警",
+          key: "syzgj",
+          url: "/others/alarmCenter/boosterAlarm",
+        },
+        {
+          name: "升压站动作",
+          key: "",
+          url: "/others/alarmCenter/boosterAlarm",
+        },
         { name: "限电事件", key: "xd", url: "/others/alarmCenter/xdgl" },
         { name: "停机事件", key: "tj", url: "/others/alarmCenter/tjsj" },
         { name: "状态转换记录", key: "", url: "" },
-        { name: "风机告警", key: "fjgj", url: "/others/alarmCenter/scadaAlarm" },
-        { name: "风机预警", key: "fjyj", url: "/others/alarmCenter/alarmcenter" },
+        {
+          name: "风机告警",
+          key: "fjgj",
+          url: "/others/alarmCenter/scadaAlarm",
+        },
+        {
+          name: "风机预警",
+          key: "fjyj",
+          url: "/others/alarmCenter/alarmcenter",
+        },
         { name: "操作记录", key: "", url: "" },
       ],
       tableData1: {
@@ -425,12 +471,11 @@ export default {
     },
     async getEarlyAlarmData() {
       const that = this;
-      const {data} = await that.API.requestData({
+      const { data } = await that.API.requestData({
         method: "GET",
         baseURL: "http://192.168.1.18:8075/",
         subUrl: "alarm/count/todaycount",
-        success(res) {
-          },
+        success(res) {},
       });
       this.earlyAlarmData = data.data;
     },