Merge branch 'master' of http://192.168.168.218/xiaminwei/xxx_phase2_web

src/view/dfzy/dfwxk.vue

@@ -1135,45 +1135,61 @@ export default {
       width: 100%;
       height: calc(100% - 50px);
       .el-table tr {
-        background-color: #1d2d46 !important;
+        background-color: transparent !important;
         color: #ffffffc7;
-        font-size: 14px;
       }
+
+      .el-table thead tr {
+        height: 40px;
+        background: url(../../assets/img/setting/tr1.png) no-repeat;
+        background-size: 100% 100%;
+      }
+
+      .el-table th{
+        background-color: transparent;
+      }
+
+      tbody tr {
+          border-bottom: 1px solid #252631;
+        }
+
       .el-table td {
-        border-bottom: 1px solid #127a89;
+        border-bottom: 1px solid #252631;
         border-right: unset;
       }
-      .el-table--enable-row-hover .el-table__body tr:hover > td {
+
+      .el-table--enable-row-hover .el-table__body tr:hover>td {
         background-color: #82848a78;
       }
+
       .el-table th {
         border: unset;
-        background-color: #263b5d !important;
+        // background-color: #263b5d !important;
       }
+
       .el-table--fit {
         background: none !important;
         border: unset;
       }
+
       .el-icon-delete-solid {
         color: red;
         cursor: pointer;
         font-size: 18px;
       }
-      .el-icon-download {
-        color: #1172d8;
-        cursor: pointer;
-        font-size: 20px;
-      }
+
       .el-icon-edit {
         color: #1172d8;
         cursor: pointer;
         font-size: 20px;
       }
+
       .el-icon-view {
         color: #00ffff;
         font-size: 20px;
         cursor: pointer;
       }
+
       .el-table--group::after,
       .el-table--border::after,
       .el-table::before {

src/view/dfzy/rw_info.vue

@@ -2187,54 +2187,62 @@ export default {
         font-size: 14px;
       }
       .el-table tr {
-        background-color: #233450 !important;
+      background-color: transparent !important;
       color: #ffffffc7;
     }
-      .el-table td {
-        border-bottom: 1px solid #5959599c;
-        border-right: unset;
+
+    .el-table thead tr {
+      background: url(../../assets/img/setting/tr1.png) no-repeat;
+      background-size: 100% 100%;
+    }
+
+    .el-table th {
       padding: 5px;
-        .cell {
-          font-size: 12px;
+      background-color: transparent;
+    }
+
+    tbody tr {
+      border-bottom: 1px solid #252631;
     }
+
+    .el-table td {
+      border-bottom: 1px solid #252631;
+      border-right: unset;
     }
-      .el-table--enable-row-hover .el-table__body tr:hover > td {
+
+    .el-table--enable-row-hover .el-table__body tr:hover>td {
       background-color: #82848a78;
     }
+
     .el-table th {
-        border: unset;
-        background-color: #293f63b0 !important;
       padding: 5px;
-        font-size: 13px;
-        letter-spacing: 2px;
+      border: unset;
+      // background-color: #263b5d !important;
     }
+
     .el-table--fit {
       background: none !important;
       border: unset;
-        .el-table__empty-block {
-          height: 100px !important;
-        }
     }
+
     .el-icon-delete-solid {
       color: red;
       cursor: pointer;
       font-size: 18px;
     }
-      .el-icon-download {
-        color: #1172d8;
-        cursor: pointer;
-        font-size: 20px;
-      }
+
     .el-icon-edit {
       color: #1172d8;
       cursor: pointer;
       font-size: 20px;
     }
+
     .el-icon-view {
       color: #00ffff;
       font-size: 20px;
       cursor: pointer;
     }
+
     .el-table--group::after,
     .el-table--border::after,
     .el-table::before {
@@ -2422,39 +2430,62 @@ export default {
       text-align: center;
     }
     .el-table tr {
-      background-color: #1d2d46 !important;
+      background-color: transparent !important;
       color: #ffffffc7;
     }
+
+    .el-table thead tr {
+      background: url(../../assets/img/setting/tr1.png) no-repeat;
+      background-size: 100% 100%;
+    }
+
+    .el-table th {
+      padding: 5px;
+      background-color: transparent;
+    }
+
+    tbody tr {
+      border-bottom: 1px solid #252631;
+    }
+
     .el-table td {
-      border-bottom: 1px solid #127a89;
+      border-bottom: 1px solid #252631;
       border-right: unset;
     }
-    .el-table__body tr:hover > td {
-      background-color: #00000000;
+
+    .el-table--enable-row-hover .el-table__body tr:hover>td {
+      background-color: #82848a78;
     }
+
     .el-table th {
+      padding: 5px;
       border: unset;
-      background-color: #263b5d !important;
+      // background-color: #263b5d !important;
     }
+
     .el-table--fit {
       background: none !important;
       border: unset;
     }
+
     .el-icon-delete-solid {
       color: red;
       cursor: pointer;
       font-size: 18px;
     }
+
     .el-icon-edit {
       color: #1172d8;
       cursor: pointer;
       font-size: 20px;
     }
-    .el-icon-delete {
-      color: red;
+
+    .el-icon-view {
+      color: #00ffff;
       font-size: 20px;
       cursor: pointer;
     }
+
     .el-table--group::after,
     .el-table--border::after,
     .el-table::before {

src/view/home.vue

@@ -273,14 +273,8 @@ export default {
         noteNum() {
             return this.$store.getters.noteNum;
         },
-        activeIndex: {
-            get() {
+        activeIndex() {
             return this.$store.getters.activeIndex;
-            },
-            set() {
-
-            }
-
         }
     },
     created() {

src/view/homepage.vue

@@ -66,7 +66,13 @@ export default {
                     { id: 5, title: '学习训练模块', eg: 'Learning And Training Module' },
                     { id: 6, title: '新技术实验模块', eg: 'New Technology Experiment Module' },
                 ]
-            }
+            },
+            line1:null,
+            line2:null,
+            line3:null,
+            line4:null,
+            line5:null,
+            line6:null
         }
     },
     methods: {
@@ -105,32 +111,32 @@ export default {
                 startSocket:'left',
                 endSocket:'right'
             }
-            new LeaderLine( {
+            this.line1 = new LeaderLine( {
                 ...styleOption1,
                 start:document.getElementById('left0'),
                 end:document.getElementById('left11'),
             });
-            new LeaderLine( {
+            this.line2 = new LeaderLine( {
                 ...styleOption1,
                 start:document.getElementById('left1'),
                 end:document.getElementById('left22'),
             });
-            new LeaderLine( {
+            this.line3 = new LeaderLine( {
                 ...styleOption1,
                 start:document.getElementById('left2'),
                 end:document.getElementById('left33'),
             });
-            new LeaderLine( {
+            this.line4 = new LeaderLine( {
                 ...styleOption2,
                 start:document.getElementById('right0'),
                 end:document.getElementById('right11'),
             });
-            new LeaderLine( {
+            this.line5 = new LeaderLine( {
                 ...styleOption2,
                 start:document.getElementById('right1'),
                 end:document.getElementById('right22'),
             });
-            new LeaderLine( {
+            this.line6 = new LeaderLine( {
                 ...styleOption2,
                 start:document.getElementById('right2'),
                 end:document.getElementById('right33'),