styleFix

src/assets/common/element.less

@@ -177,7 +177,7 @@
 
 ::v-deep .el-step__icon.is-text {
     border-width: 4px !important;
-    border-color: #22c2ec;
+    border-color: #c0c4cc;
 }
 
 ::v-deep .el-step__head.is-success {

src/components/Index.vue

@@ -126,6 +126,7 @@ export default {
       leftNav: [],
       rightNav: [],
       childRouteName: "",
+      totalMenu: [],
     };
   },
   methods: {
@@ -205,16 +206,11 @@ export default {
     setRoute(router, child) {
       router.isActive = true;
       console.log(router, child);
-      localStorage.setItem("activeParentId", router.id);
-      localStorage.setItem("activeChildId", child.id);
-
       this.childRouteName = child.right_name;
       this.$forceUpdate();
     },
     clearRoute() {
       this.childRouteName = "";
-      localStorage.setItem("activeParentId", "");
-      localStorage.setItem("activeChildId", "");
       this.leftNav = this.leftNav.map((item) => {
         return {
           ...item,
@@ -243,15 +239,21 @@ export default {
         return {
           ...item,
           isActive:
-            localStorage.getItem("activeParentId") == item.id ? true : false,
+            item.child.filter((item) => {
+              return this.$route.path == item.menu_url;
+            }).length > 0,
         };
       });
-      let selectedMenu = res.data.menu.filter((item) => {
-        return item.id == localStorage.getItem("activeParentId");
+      let selectedMenu = menu.filter((item) => {
+        return item.isActive;
       });
       if (selectedMenu.length > 0) {
-        this.childRouteName = selectedMenu[0].child.filter((item) => {
-          return item.id == localStorage.getItem("activeChildId");
+        this.childRouteName =
+          selectedMenu[0].child.filter((item) => {
+            return this.$route.path == item.menu_url;
+          })[0] &&
+          selectedMenu[0].child.filter((item) => {
+            return this.$route.path == item.menu_url;
           })[0].right_name;
       }
       if (res.data.menu.length >= 3) {

src/components/construction/Index.vue

@@ -221,6 +221,10 @@
                   <el-step
                     v-for="(progress, index) in progressDetail.progress_data"
                     :key="index"
+                    :class="[
+                      progress.type ? progress.type : '',
+                      index <= progressDetail.step - 1 ? 'success' : '',
+                    ]"
                   >
                     <template #title>
                       <div class="step-title">
@@ -438,6 +442,7 @@ export default {
             let insertIndex = timeArray.findIndex((item) => {
               return item > todayTs;
             });
+
             if (insertIndex > this.progressDetail.step) {
               this.progressDetail.progress_data.splice(
                 this.progressDetail.step,
@@ -458,6 +463,17 @@ export default {
                 name: "当时日期",
               });
             }
+            this.$nextTick(() => {
+              let wait_step = document
+                .getElementById("step-scroll")
+                .getElementsByClassName("el-step");
+              let wait_line = wait_step[insertIndex - 1].getElementsByClassName(
+                "el-step__line-inner"
+              )[0];
+              wait_line.style.cssText =
+                "transition-delay: 150ms; width: 100%!important;";
+              console.log(wait_line);
+            });
           }
 
           this.$nextTick(() => {
@@ -737,19 +753,19 @@ table {
 }
 .step-title {
   position: relative;
-  color: #22c3ed;
+  color: #c0c4cc;
   font-size: 12px;
 
   .step-status {
     position: absolute;
     top: -130%;
-    color: #18d7b9;
+    color: #c0c4cc;
     font-size: 12px;
   }
 }
 .step-description {
   font-size: 14px;
-  color: #fff;
+  color: #c0c4cc;
 }
 
 .progress-contains {
@@ -832,6 +848,7 @@ table {
   .status-count {
     width: calc(100% / 3);
     padding: 30px 0px;
+    text-align: center;
     .status-img {
       width: 50px;
     }
@@ -842,13 +859,13 @@ table {
         font-size: 14px;
         font-weight: 400;
         color: #ffffff;
-        padding-top: 12px;
       }
       .status-number {
         font-weight: 400;
         color: #25d2ff;
         opacity: 0.7;
         font-size: 22px;
+        text-align: left;
         span {
           font-size: 12px;
         }
@@ -957,4 +974,25 @@ table {
   width: 100%;
   overflow-x: auto;
 }
+#scroll-container::-webkit-scrollbar {
+  display: inline !important;
+}
+
+::v-deep .el-step.wait {
+  .el-step__icon {
+    border-color: #ffb81e !important;
+  }
+  .step-status,
+  .step-description,
+  .step-title {
+    color: #ffb81e !important;
+  }
+}
+::v-deep .el-step.success {
+  .step-status,
+  .step-description,
+  .step-title {
+    color: #67c23a !important;
+  }
+}
 </style>
\ No newline at end of file

src/components/fallprotection/Index.vue

@@ -224,7 +224,6 @@ export default {
           });
           this.$nextTick(() => {
             var scale = window.innerHeight / 1080;
-            console.log(document.getElementById("amap-container").style);
             document.getElementById("amap-container").style.zoom = 1 / scale;
           });
           this.map.on("click", () => {

src/components/projectcheck/Index.vue

@@ -944,7 +944,7 @@ export default {
   align-items: center;
   flex-direction: column;
   justify-content: center;
-  width: calc(100% - 300px);
+  width: calc(100% - 250px);
   & > div {
     padding: 0 20px;
     font-size: 14px;
@@ -963,8 +963,8 @@ export default {
 
 .chart-container {
   position: relative;
-  width: 300px;
-  height: 300px;
+  width: 250px;
+  height: 250px;
   .title {
     position: absolute;
     top: 50%;

src/components/supervisory/Index.vue

@@ -167,9 +167,18 @@ export default {
         };
       });
     },
-    filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
+    filterNode(value, data, node) {
+      console.log(node);
+      let names = this.getParents(node, node.data.label, "label");
+      let isName = names.indexOf(value) !== -1;
+      return !value || isName ? true : false;
+    },
+    getParents(node, name, key) {
+      if (node.parent && node.parent.data[key]) {
+        name += node.parent.data[key];
+        return this.getParents(node.parent, name, key);
+      }
+      return name;
     },
     renderContent(h, { node, data }) {
       return (
@@ -293,6 +302,7 @@ export default {
         item.id = "";
         item.live_address_url = "";
       });
+      this.cameraList = [];
 
       const allVideoIdArray = this.treeData
         .map((item) => {

src/components/tower/Index.vue

@@ -965,16 +965,21 @@ export default {
     }
   }
   .warning-table-run-time {
-    width: 40%;
+    width: 25%;
     white-space: pre-wrap;
   }
-  .warning-table-device,
-  .warning-table-info {
+  .warning-table-device {
     width: 20%;
     text-overflow: ellipsis;
     overflow: hidden;
     white-space: nowrap;
   }
+  .warning-table-info {
+    width: 35%;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  }
   .warning-table-status {
     width: 20%;
   }