Merge branch 'master' of http://git.jiayuepowertech.com:9022/xiuwei/vpp

src/views/Articles/index.vue

@@ -180,6 +180,13 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.el-table__row > td {
+  border: none;
+}
+
+.el-table::before {
+  height: 0;
+}
 
 
 body {
@@ -284,6 +291,7 @@ body {
 
   /deep/ .el-table th.el-table__cell {
     background: none;
+    border: 0;
   }
 
   /deep/ .el-table__body {

src/views/fdjh/cn/index.vue

@@ -187,6 +187,14 @@ body {
   background-image: url(../../Articles/img/bgc.png)
 }
 
+.el-table__row > td {
+  border: none;
+}
+
+.el-table::before {
+  height: 0;
+}
+
 .table-wrapper {
   width: 97%;
   height: 100%;
@@ -284,6 +292,7 @@ body {
 
   /deep/ .el-table th.el-table__cell {
     background: none;
+    border: 0;
   }
 
   /deep/ .el-table__body {

src/views/fdjh/gf/index.vue

@@ -187,6 +187,14 @@ body {
   background-image: url(../../Articles/img/bgc.png)
 }
 
+.el-table__row > td {
+  border: none;
+}
+
+.el-table::before {
+  height: 0;
+}
+
 .table-wrapper {
   width: 97%;
   height: 100%;
@@ -284,6 +292,7 @@ body {
 
   /deep/ .el-table th.el-table__cell {
     background: none;
+    border: 0;
   }
 
   /deep/ .el-table__body {

src/views/fdjh/hd/index.vue

@@ -181,6 +181,13 @@ export default {
 
 <style lang="less" scoped>
 
+.el-table__row > td {
+  border: none;
+}
+
+.el-table::before {
+  height: 0;
+}
 
 body {
   border: 0;
@@ -284,6 +291,7 @@ body {
 
   /deep/ .el-table th.el-table__cell {
     background: none;
+    border: 0;
   }
 
   /deep/ .el-table__body {

src/views/sjcjjk/fdgf/index.vue

@@ -65,6 +65,13 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.el-table__row > td {
+  border: none;
+}
+
+.el-table::before {
+  height: 0;
+}
 
 
 body {
@@ -169,6 +176,7 @@ body {
 
   /deep/ .el-table th.el-table__cell {
     background: none;
+    border: 0;
   }
 
   /deep/ .el-table__body {

src/views/sjcjjk/gznfh/index.vue

@@ -66,6 +66,14 @@ export default {
 
 <style lang="less" scoped>
 
+.el-table__row > td {
+  border: none;
+}
+
+.el-table::before {
+  height: 0;
+}
+
 
 body {
   border: 0;
@@ -169,6 +177,7 @@ body {
 
   /deep/ .el-table th.el-table__cell {
     background: none;
+    border: 0;
   }
 
   /deep/ .el-table__body {

src/views/sjcjjk/hd/index.vue

@@ -65,6 +65,13 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.el-table__row > td {
+  border: none;
+}
+
+.el-table::before {
+  height: 0;
+}
 
 
 body {
@@ -169,6 +176,7 @@ body {
 
   /deep/ .el-table th.el-table__cell {
     background: none;
+    border: 0;
   }
 
   /deep/ .el-table__body {

src/views/sjcjjk/ptfh/index.vue

@@ -72,6 +72,14 @@ body {
   background-image: url(../../Articles/img/bgc.png)
 }
 
+.el-table__row > td {
+  border: none;
+}
+
+.el-table::before {
+  height: 0;
+}
+
 .table-wrapper {
   width: 97%;
   height: 100%;
@@ -169,6 +177,7 @@ body {
 
   /deep/ .el-table th.el-table__cell {
     background: none;
+    border: 0;
   }
 
   /deep/ .el-table__body {

src/views/xndc/modules/center-top.vue

@@ -37,6 +37,41 @@
          alt="">
     <img src="../../../assets/images/shape6.png" style="position:absolute;margin-top: 3%;margin-left: 3%" :width="195" :height="25" alt="">
     <div style="position:absolute;margin-top: 2%;margin-left: 20.8%;font-weight: bold">总用电量：<span style="color: gold">6000KW</span></div>
+    <!-- 告警弹框 -->
+    <div class="dialogInfoBg" v-if="dialogShow">
+      <!-- 弹框头 -->
+      <div class="rightTitleTextBg">
+        <div class="rightMainTitle">
+          <span>告 警 信 息</span>
+          <div @click="dialogShow = false"/>
+        </div>
+      </div>
+      <!-- 弹框主体 -->
+      <div style="height: 100px">
+        <el-table
+            :cell-style="{border:0,color:'#fff'}"
+            :data="warningData"
+            :header-cell-style="{color:'#fff'}"
+            :row-style="{backgroundColor:'transparent'}"
+            size="mini"
+            style="background: none;margin-top: -1%;"
+            :show-header="false"
+            @row-click="handleDialogClose"
+        >
+          <el-table-column label="信息" prop="info">
+            <template slot-scope="scope">
+              <div style="height: 25px">
+                <img src="../../../assets/images/warning.png" style="position:absolute;top: 8px" :width="20" :height="20"
+                     alt="">
+                <img src="../../../assets/images/bg/bg-table-row-warning.png" style="position:absolute;left: 35px" :width="535"
+                     :height="25" alt="">
+                <span style="position:absolute;top:8px;left: 43px">{{ scope.row.info }}</span>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -51,13 +86,17 @@ export default {
         current: 1,
         size: 10
       },
-      tableData: []
+      tableData: [],
+      dialogShow: false,
+      warningData:[]
     }
   },
   methods: {
     handleRowClick(row, event, column) {
-      // 在这里处理行点击事件
-      console.log('行点击事件：', row, event, column);
+      this.dialogShow = true
+    },
+    handleDialogClose(row, event, column) {
+      this.dialogShow = false
     }
   },
   mounted() {
@@ -75,6 +114,28 @@ export default {
         "state": 1
       },
     ]
+    this.warningData=[
+      {
+        "info": "严重警告：联络线（高德线）严重超越正限",
+        "state": 2
+      },
+      {
+        "info": "严重警告：联络线（高德线）严重超越正限",
+        "state": 2
+      },
+      {
+        "info": "严重警告：联络线（高德线）严重超越正限",
+        "state": 2
+      },
+      {
+        "info": "严重警告：联络线（高德线）严重超越正限",
+        "state": 2
+      },
+      {
+        "info": "严重警告：联络线（高德线）严重超越正限",
+        "state": 2
+      },
+    ]
   }
 }
 </script>
@@ -211,5 +272,36 @@ export default {
   .el-table__row > td {
     border: none;
   }
+
+  .dialogInfoBg {
+    background: url(../../../assets/images/dialog/bg-warning.png) 100% no-repeat;
+    background-size: 100% 100%;
+    padding: 1%;
+    width: 30%;
+    height: 260px;
+    position: absolute;
+    top: 35%;
+    left: 34%;
+    z-index: 1000;
+  }
+
+  .rightTitleTextBg {
+    height: 28%;
+    background-size: 100% 100%;
+    background: url(../../../assets/images/dialog/t-line-warning.png) no-repeat center;
+  }
+
+  .rightMainTitle {
+    color: rgb(255, 255, 255);
+    font-size: 18px;
+    font-weight: 550;
+    /*font-style: italic;*/
+    text-shadow: 0 0 5px #fff, 0 1px 2px rgba(0, 0, 0, 1);
+    margin-left: 42%;
+    position: relative;
+    top: 0;
+    display: flex;
+    justify-content: space-between;
+  }
 }
 </style>

src/views/xtpzyrz/xtpz/xtpz.vue

@@ -3,7 +3,7 @@
         <div class="table-box">
             <div class="title"
                  style="font-family: AliMaMa;font-size: 30px;font-weight: 1000;text-align: left;height: 40px">
-                <span style="position: absolute;top:-3px;left: 70px">风电</span>
+                <span style="position: absolute;top:-3px;left: 70px">配置表</span>
             </div>
             <el-row :gutter="10" style="width: 99%;padding-left: 22px">
                 <el-button
@@ -203,6 +203,14 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.el-table__row > td {
+  border: none;
+}
+
+.el-table::before {
+  height: 0;
+}
+
 
 @font-face {
   font-family: AliMaMa;//自定义字体名称
@@ -469,6 +477,7 @@ body {
 
   /deep/ .el-table th.el-table__cell {
     background: none;
+    border: 0;
   }
 
   /deep/ .el-table__body {

src/views/xtrz/jkcx/index.vue

@@ -72,6 +72,14 @@ body {
   background-image: url(../../Articles/img/bgc.png)
 }
 
+.el-table__row > td {
+  border: none;
+}
+
+.el-table::before {
+  height: 0;
+}
+
 .table-wrapper {
   width: 97%;
   height: 100%;
@@ -169,6 +177,7 @@ body {
 
   /deep/ .el-table th.el-table__cell {
     background: none;
+    border: 0;
   }
 
   /deep/ .el-table__body {

src/views/ydjhdjk/gznfh/index.vue

@@ -75,6 +75,14 @@ export default {
 </script>
 <style lang="less" scoped>
 
+.el-table__row > td {
+  border: none;
+}
+
+.el-table::before {
+  height: 0;
+}
+
 
 body {
   border: 0;
@@ -178,6 +186,7 @@ body {
 
   /deep/ .el-table th.el-table__cell {
     background: none;
+    border: 0;
   }
 
   /deep/ .el-table__body {

src/views/ystjjk/dm/index.vue

@@ -76,6 +76,13 @@ export default {
 
 <style lang="less" scoped>
 
+.el-table__row > td {
+  border: none;
+}
+
+.el-table::before {
+  height: 0;
+}
 
 body {
   border: 0;
@@ -179,6 +186,7 @@ body {
 
   /deep/ .el-table th.el-table__cell {
     background: none;
+    border: 0;
   }
 
   /deep/ .el-table__body {

src/views/ystjjk/llx/index.vue

@@ -76,6 +76,13 @@ export default {
 
 <style lang="less" scoped>
 
+.el-table__row > td {
+  border: none;
+}
+
+.el-table::before {
+  height: 0;
+}
 
 body {
   border: 0;
@@ -179,6 +186,7 @@ body {
 
   /deep/ .el-table th.el-table__cell {
     background: none;
+    border: 0;
   }
 
   /deep/ .el-table__body {