Merge branch 'master' of http://git.umayle.com:2023/liulonglong/shuinichang_

src/components/tpt.vue

@@ -37,21 +37,29 @@ export default {
 </script>
 <style scoped lang="less">
 .tpt11 {
-  width: 30%;
+  width: 2593px;
-  height: 30%;
+  height: 1179px;
-  background-color: #a4f325;
+  background: url(../assets/img/弹窗.png);
   position: fixed;
+  background-size: cover;
   left: 50%;
   top: 30%;
   transform: translateX(-50%);
+  padding: 120px;
+  box-sizing: border-box;
   z-index: 200;
   .closeBtn {
     cursor: pointer;
     position: absolute;
-    right: 10px;
+    right: 60px;
+    top: 40px;
     width: 54px;
     height: 54px;
   }
+  img {
+    width: 100%;
+    height: 100%;
+  }
 }
 .outside-element {
   width: 100%;

src/views/lll/NYJCS.vue

@@ -410,8 +410,26 @@ export default {
           date3: "19.19",
           date4: "19.19",
         },
+        {
+          date1: "生料收尘",
+          date2: "19.19",
+          date3: "19.19",
+          date4: "19.19",
+        },
+        {
+          date1: "生料收尘",
+          date2: "19.19",
+          date3: "19.19",
+          date4: "19.19",
+        },
+        {
+          date1: "生料收尘",
+          date2: "19.19",
+          date3: "19.19",
+          date4: "19.19",
+        },
       ],
-      url: require("../../assets/tpt/一线生料电力室.png"),
+      url: require("../../assets/img/大的拓扑图.png"),
     };
   },
   methods: {
@@ -1019,6 +1037,16 @@ export default {
             color: #56f671;
           }
         }
+        //table组件纵向滚动
+        /deep/ .el-table__body-wrapper {
+          overflow-y: auto;
+          height: 300px;
+        }
+        //隐藏滚动条
+        /deep/ .el-table__body-wrapper::-webkit-scrollbar {
+          display: none;
+        }
+
         /deep/.el-table tr {
           background: #16253b;
           color: #fff;

src/views/lll/PDS.vue

@@ -377,7 +377,6 @@ export default {
       });
     },
     changeArr(name) {
-      // this.url = require("../../assets/tpt/总降电力室.png");
       // this.url = require(`../../assets/tpt/${name}.png`);
       if (name == "总降电力室") {
         this.url = require("../../assets/tpt/总降电力室.png");
@@ -567,6 +566,7 @@ export default {
 }
 .head {
   position: relative;
+
   img {
     position: absolute;
   }