Browse Source

合并代码

fujunwen 4 years ago
parent
commit
d9e94155ca
3 changed files with 106 additions and 102 deletions
  1. 101 100
      src/views/analysis/CoreDeviceReport.vue
  2. 1 1
      src/views/homepage/index.vue
  3. 4 1
      src/views/statistics/index.vue

+ 101 - 100
src/views/analysis/CoreDeviceReport.vue

@@ -107,6 +107,7 @@
         </div>
       </el-dialog>
     </div>
+  </div>
 </template>
 
 <script>
@@ -152,12 +153,12 @@ export default {
     }
   },
 
-    components: {
-        Select,
-        Input
-    },
+  components: {
+    Select,
+    Input
+  },
 
-    computed: {},
+  computed: {},
 
   mounted() {
     this.getSystemList();
@@ -348,105 +349,105 @@ export default {
 </script>
 
 <style lang='less' scoped>
-.core-device-report {
-    display: flex;
-    width: 100%;
-    height: 100%;
-    .main-left {
-        padding-left: 16px;
-        padding-right: 14px;
-        padding-top: 12px;
-        padding-bottom: 12px;
-        width: 247px;
-        border-top: 1px solid #e4e6e7;
-        border-right: 1px solid #e4e6e7;
-        .system-select {
-            margin-bottom: 16px;
+.core-device-report{
+  display: flex;
+  width: 100%;
+  height: 100%;
+  .main-left{
+    padding-left: 16px;
+    padding-right: 14px;
+    padding-top: 12px;
+    padding-bottom: 12px;
+    width: 247px;
+    border-top: 1px solid #E4E6E7;
+    border-right: 1px solid #E4E6E7;
+    .system-select{
+      margin-bottom: 16px;
+    }
+    .item-content{
+      padding-left: 12px;
+      padding-right: 21px;
+      padding-top: 7px;
+      padding-bottom: 8px;
+      border-bottom: 1px solid #E4E6E7;
+      cursor: pointer;
+      >div{
+        display: flex;
+      }
+      .first-row{
+        margin-bottom: 6px;
+        display: flex;
+        justify-content: space-between;
+        >div:first-child{
+          font-size: 14px;
+          color: #1F2429;
+          line-height: 19px;
         }
-        .item-content {
-            padding-left: 12px;
-            padding-right: 21px;
-            padding-top: 7px;
-            padding-bottom: 8px;
-            border-bottom: 1px solid #e4e6e7;
-            cursor: pointer;
-            > div {
-                display: flex;
-            }
-            .first-row {
-                margin-bottom: 6px;
-                display: flex;
-                justify-content: space-between;
-                > div:first-child {
-                    font-size: 14px;
-                    color: #1f2429;
-                    line-height: 19px;
-                }
-                > div:nth-of-type(2) {
-                    margin-left: 8px;
-                    font-size: 12px;
-                    color: #cd981d;
-                    line-height: 20px;
-                }
-            }
-            .sec-row {
-                margin-bottom: 6px;
-                > div:first-child {
-                    font-size: 14px;
-                    color: #1f2429;
-                    line-height: 19px;
-                    > span {
-                        font-size: 12px;
-                        color: #646c73;
-                    }
-                }
-                // >div:nth-of-type(2){
-                //   padding-left: 8px;
-                //   padding-right: 8px;
-                //   font-size: 12px;
-                //   color: #0065B3;
-                //   line-height: 22px;
-                //   background: #E1F2FF;
-                // }
-                .abnormal {
-                    margin-left: 11px;
-                    padding-left: 3px;
-                    padding-right: 3px;
-                    font-size: 12px;
-                    color: #f54e45 !important;
-                    background: #fde3e2 !important;
-                    border-radius: 9px;
-                }
-            }
+        >div:nth-of-type(2){
+          margin-left: 8px;
+          font-size: 12px;
+          color: #CD981D;
+          line-height: 20px;
         }
-        .system-content {
-            .active {
-                background: #e5eef5;
-                border-radius: 2px;
-                .first-row > div:first-child,
-                .sec-row > div {
-                    color: #025baa;
-                    > span {
-                        color: #025baa;
-                    }
-                }
-            }
+        
+      }
+      .sec-row{
+        margin-bottom: 6px;
+        >div:first-child{
+          font-size: 14px;
+          color: #1F2429;
+          line-height: 19px;
+          >span{
+            font-size: 12px;
+            color: #646C73;
+          }
         }
-    }
-    .main-right {
-        flex: 1;
-        background: #fff;
-        padding-left: 15px;
-        padding-right: 13px;
-        padding-top: 13px;
-        padding-bottom: 25px;
-        .search-container {
-            margin-bottom: 12px;
+        // >div:nth-of-type(2){
+        //   padding-left: 8px;
+        //   padding-right: 8px;
+        //   font-size: 12px;
+        //   color: #0065B3;
+        //   line-height: 22px;
+        //   background: #E1F2FF;
+        // }
+        .abnormal{
+          margin-left: 11px;
+          padding-left: 3px;
+          padding-right: 3px;
+          font-size: 12px;
+          color: #F54E45!important;
+          background: #FDE3E2!important;
+          border-radius:9px;
         }
-        .page {
-            display: flex;
-            justify-content: flex-end;
+      }
+    }
+    .system-content{
+      .active{
+        background: #E5EEF5;
+        border-radius: 2px;
+        .first-row>div:first-child,
+        .sec-row>div{
+          color: #025BAA;
+          >span{
+            color: #025BAA;
+          }
         }
+      }
+    }
+  }
+  .main-right{
+    flex: 1;
+    background: #fff;
+    padding-left: 15px;
+    padding-right: 13px;
+    padding-top: 13px;
+    padding-bottom: 25px;
+    .search-container{
+      margin-bottom: 12px;
+    }
+    .page{
+      display: flex;
+      justify-content: flex-end;
     }
     .el-dialog{
       min-height: 600px;
@@ -460,6 +461,6 @@ export default {
       width: 180px;
     }
 
-  
+  }
 }
 </style>

+ 1 - 1
src/views/homepage/index.vue

@@ -129,7 +129,7 @@ export default {
             }
         },
         navToInnerPage (item, equip) {
-            this.$router.push({path:"/analysis", query:{smsxt:item.smsxt, equipId: equip.id}})
+            this.$router.push({path:"./analysis", query:{smsxt:item.smsxt, equipId: equip.id}})
         },
         //TODO plazaId目前是写死的 后期需要更换成用户对应的ID
         testAjax () {

+ 4 - 1
src/views/statistics/index.vue

@@ -43,7 +43,7 @@
                     <li @click="getInfoOfProject(item)" :class="['system-item', item.selected ? 'selected':'']" v-for="(item , index) in systemList" :key="index">
                         <div class="system-name">
                             <div :class="['img', item.selected ? 'selected':'']">
-                                <img :src="'../../assets/images/icons/' + item.smsxt + '.png'">
+                                <img :src="imgSrc(item.smsxt)">
                             </div>
                             <span>{{item.smsxtname}}</span>
                         </div>
@@ -398,6 +398,9 @@ export default {
         this.getEventStatusData()
     },
     methods: {
+        imgSrc(code) {
+            return require('../../assets/images/icons/' + code + '.png')
+        },
         /**
          * 通过导航进行导航
          *