设备列表新增状态字符

src/views/business/deviceMange/deviceList/index.vue

@@ -50,6 +50,14 @@
       <el-table-column label="所属建筑" align="center" prop="louyu"  show-overflow-tooltip />
       <el-table-column label="安装位置" align="center" prop="posistion"  show-overflow-tooltip />
       <el-table-column label="详细地址" align="center" prop="address"  show-overflow-tooltip />
+      <el-table-column label="设备状态" align="center" prop="deviceStatus"  show-overflow-tooltip >
+        <template slot-scope="scope">
+          <span :class="scope.row.deviceStatus == '0' ? 'color4' : scope.row.deviceStatus == '300' ? 'color3' : 'color2'">{{scope.row.deviceStatus == '0' ? "正常" : scope.row.deviceStatus == '300' ? "故障" : "离线"}}</span>
+        </template>
+      </el-table-column>
+
+      <!-- 设备状态(75:离 300:故 0:正) -->
+
       <!-- <el-table-column label="创建人" align="center" prop="addMan" />
       <el-table-column label="创建时间" align="center" prop="addTime" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >

src/views/business/fireInternet/deviceMonitoring/waterMonitoring/device/index.vue

@@ -278,3 +278,147 @@ export default {
   }
 }
 </script>
+<style scoped lang="scss">
+  ::-webkit-scrollbar-track
+  {
+    background: #fff;
+    border-radius: 0;
+  }
+
+  ::-webkit-scrollbar
+  {
+    -webkit-appearance: none;
+    width: 4px;
+    height: 4px;
+  }
+
+  ::-webkit-scrollbar-thumb
+  {
+      cursor: pointer;
+      border-radius: 5px;
+      background: rgba(0,0,0,.25);
+      transition: color .2s ease;
+  }
+  .text {
+    font-size: 14px;
+  }
+  .item {
+    margin-bottom: 18px;
+  }
+  .clearfix:before,
+  .clearfix:after {
+    display: table;
+    content: "";
+  }
+  .clearfix:after {
+    clear: both
+  }
+  .box-card {
+    margin-top:20px;
+  }
+  #main{
+    margin-top:-20px;
+    .box-card{
+      .h2{
+        text-align: center;
+        margin:0 auto;
+        display: block;
+        font-size: 1.2em;
+        background-image: -webkit-linear-gradient(bottom, #00adce, #000);
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+
+      }
+    }
+    .card_left{
+      .card1{
+        height:43vh;
+        .title{
+          width:100%;
+          display: block;
+          text-align: left !important;
+          .imgTitle{
+            width:5%;
+            display: inline-block;
+            vertical-align: middle;
+          }
+          p{
+            display: inline-block;
+            vertical-align: middle;
+            margin-left:2%;
+            font-size:1.4vw;
+          }
+        }
+        .contain{
+          margin-top:0vh;
+          width:58%;
+          display: inline-block;
+          vertical-align: top;
+          div{
+            height:7vh;
+            span{
+              font-size: 1vw;
+              vertical-align: middle;
+              width:4vw;
+              text-align: left;
+              display: inline-block;
+            }
+            div{
+              width:212px;
+              height:6vh;
+              vertical-align: middle;
+              background:url("../../../../../../assets/images/operation_item.png") no-repeat right center;
+              display: inline-block;
+              p{
+                font-size: 1.4vw;
+                vertical-align: top;
+                margin:1vh 0 0 3vh;
+              }
+            }
+          }
+        }
+        .contain2{
+          margin-top:-2.5rem;
+          vertical-align: top;
+          width:42%;
+          display: inline-block;
+          p{
+            text-align: center;
+            font-size: 1.4rem;
+            margin:-2vh 0 0 0%;
+          }
+        }
+      }
+    }
+    .card_right{
+      .card2{
+        height:43vh;
+      }
+    }
+    .card_bottom{
+      padding-top:10px;
+      margin-bottom:-10px
+    }
+  }
+ ::v-deep {
+    .el-table__body-wrapper::-webkit-scrollbar {
+      /*width: 0;宽度为0隐藏*/
+      width: 4px;
+    }
+    .el-table__body-wrapper::-webkit-scrollbar-thumb {
+      border-radius: 6px;
+      height: 50px;
+      background: rgba(40, 190, 252, .6);//滚动条颜色
+    }
+    .el-table__body-wrapper::-webkit-scrollbar-track {
+      box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+      border-radius: 6px;
+      background: #eee;//滚动条背景色
+    }
+  }
+
+</style>
+<style>
+
+
+</style>

vue.config.js

@@ -33,8 +33,8 @@ module.exports = {
         proxy: {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
-                //target: `http://172.16.120.213:8084/`, //本地
-                target: 'https://smartpark.caih.com/dmapi/', //东信
+                target: `http://172.16.120.213:8084/`, //本地
+                //target: 'https://smartpark.caih.com/dmapi/', //东信
                 changeOrigin: true,
                 pathRewrite: {
                     ['^' + process.env.VUE_APP_BASE_API]: ''