滚动条BUG修复

src/components/control/areaCard.vue

@@ -36,8 +36,8 @@
       </div>
     </div>
     <div style="margin-top: 50px; height: 85%" @contextmenu="contextmenu">
-      <el-scrollbar>
-        <div class="scoll">
+      <div class="scoll currentScroll">
+        <div class="currentScroll" style="height: 100%; overflow-y: scroll">
           <div class="matrix" v-if="startList.length > 0">
             <div class="problemTitle">启动</div>
             <MatrixBlock
@@ -75,7 +75,7 @@
             </MatrixBlock>
           </div>
         </div>
-      </el-scrollbar>
+      </div>
     </div>
     <div v-if="current == 1" class="send" @click="handleSend">发送</div>
     <!-- <div class="success" v-if="showFlag&&current===0">指令发送成功</div> -->
@@ -112,7 +112,7 @@ export default {
   created: function () {
     this.initData();
     this.suggestion();
-    // this.getControlType();
+    this.getControlType();
   },
   emits: ["parentRun"],
   props: {
@@ -145,7 +145,7 @@ export default {
       stationName: "",
       // 定时器
       timer: "",
-      // controlTypeList: [],
+      controlTypeList: [],
       controlErorCodes: [
         "控制成功",
         "控制命令发送失败",
@@ -172,13 +172,13 @@ export default {
     },
   },
   methods: {
-    // getControlType() {
-    //   api.getControlType().then((res) => {
-    //     if (res) {
-    //       this.controlTypeList = res.data;
-    //     }
-    //   });
-    // },
+    getControlType() {
+      api.getControlType().then((res) => {
+        if (res) {
+          this.controlTypeList = res.data;
+        }
+      });
+    },
     control(current) {
       this.current = current === 0 ? current : current === 1 ? current : 1;
       this.suggestion();
@@ -769,7 +769,7 @@ export default {
     "$store.getters.current": {
       handler: function (json) {
         this.current = json;
-        // this.getControlType();
+        this.getControlType();
         if (json === 0) {
           let dateList = [];
           this.titleList.forEach((item) => {
@@ -828,6 +828,7 @@ export default {
 
 .body .scoll {
   height: 91%;
+  overflow-y: scroll;
 }
 
 .title {

src/components/control/controlAllArea.vue

@@ -39,17 +39,23 @@
     </div>
     <WindturbineDetailPages
       v-model="dialogVisible"
-      :showSvg="showSvg"
       @close="handleClose"
       :svgWeb="svgWeb"
       :windturbine="currentWindturbine"
     ></WindturbineDetailPages>
+    <StationSvgDetailPages
+    v-model="showSvg"
+    :stationName="stationName"
+    :svgWeb="svgWeb"
+    @close="close"
+  ></StationSvgDetailPages>
   </div>
 </template>
 
 <script>
 import WindturbineDetailPages from "../WindturbineDetailPages.vue";
 import MatrixBlock from "../matrixBlock.vue";
+import StationSvgDetailPages from "../stationSvgDetailPages.vue";
 import BackgroundData from "utils/BackgroundData";
 import MessageBridge from "utils/MessageBridge";
 import api from "api/index";
@@ -58,6 +64,7 @@ export default {
   components: {
     WindturbineDetailPages,
     MatrixBlock,
+    StationSvgDetailPages,
   },
   props: {
     current: {
@@ -253,8 +260,9 @@ export default {
         } else if (arr[0] === "CLOSE") {
           this.dialogVisible = false;
         } else if (arr[0] === "OPEN_SYZ") {
+          this.currentWindturbine = this.windturbinelist[arr[1]];
           this.showSvg = true;
-          this.dialogVisible = true;
+          this.svgVisible = true;
           this.svgWeb = arr[1];
         } else if (
           arr[0] === "CONTROL_START" ||

src/components/matrixBlock.vue

@@ -15,7 +15,7 @@
       :key="index"
       @click="onSelectHandler(item)"
       @dblclick="sendMsg(item)"
-      style="margin-right: 15px"
+      style="margin-right: 8px"
     >
       <div
         :class="item.active ? 'left-' + item.status : 'unleft-' + item.status"

src/components/problem/areaCard.vue

@@ -4,8 +4,8 @@
     <img class="logo" src="../../assets/img/logo.png" alt="" />
     <div class="title">{{ title }}</div>
     <div style="margin-top: 50px; height: 94%" @contextmenu="contextmenu">
-      <el-scrollbar>
-        <div class="scoll">
+      <div class="scoll currentScroll">
+        <div class="currentScroll" style="height: 100%; overflow-y: scroll">
           <div class="matrix" v-if="faultList.length > 0">
             <div class="problemTitle">故障</div>
             <MatrixBlock
@@ -43,7 +43,7 @@
             ></MatrixBlock>
           </div>
         </div>
-      </el-scrollbar>
+      </div>
     </div>
   </div>
   <WindturbineDetailPages
@@ -462,6 +462,7 @@ export default {
 
 .body .scoll {
   height: 91%;
+  overflow-y: scroll;
 }
 
 .title {