调整

src/views/business/OM/MochaITOM/crew/index.vue

@@ -376,6 +376,18 @@ export default {
               }
             }
           }
+          for(let i =0;i<arr.length;i++){
+            if(i<arr.length-1){
+              if(arr[i].name == arr[i+1].name){
+                this.msgError("姓名不能重复");
+                return
+              }
+              if(arr[i].phone == arr[i+1].phone){
+                this.msgError("手机号不能重复");
+                return
+              }
+            }
+          }
           this.loading = true
           if (this.form.id != undefined) {
             updateDevopsTeam(this.form).then(response => {

src/views/business/OM/eventCenter/alarm/index.vue

@@ -19,7 +19,7 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="处理状态：">
+      <!-- <el-form-item label="处理状态：">
         <el-select
           v-model.trim="queryParams.status"
           size="small"
@@ -29,7 +29,7 @@
           <el-option value="0" label="未处理"></el-option>
           <el-option value="1" label="已处理"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           type="primary"

src/views/business/OM/eventCenter/hiddenDanger/index.vue

@@ -13,12 +13,12 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="处理状态：">
+      <!-- <el-form-item label="处理状态：">
         <el-select v-model.trim="queryParams.status"  size="small" style="width:160px" placeholder="请选择处理状态">
           <el-option value="0" label="未处理"></el-option>
           <el-option value="1" label="已处理"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

src/views/business/OM/workMange/index.vue

@@ -87,8 +87,8 @@
           {{scope.row.companyName || "东信智慧园区"}}
         </template>
       </el-table-column>
-      <el-table-column label="工单名称" align="center" prop="workOrderContent" show-overflow-tooltip />
-      <el-table-column label="工单内容" align="center" prop="workOrderName" show-overflow-tooltip />
+      <el-table-column label="工单名称" align="center" prop="workOrderName" show-overflow-tooltip />
+      <el-table-column label="工单内容" align="center" prop="workOrderContent" show-overflow-tooltip />
       <el-table-column label="工单类型" align="center" prop="workOrderType"  >
          <template slot-scope="scope">
           {{scope.row.workOrderType == "1" ?  "消防告警" : scope.row.workOrderType == "2" ?  "巡检计划"  : scope.row.workOrderType == "3" ?  "厕位故障" : ""}}
@@ -361,6 +361,7 @@ export default {
   },
   created() {
     this.init()//初始化
+    this.collectWorkOrder()
     if(JSON.stringify(this.$route.query) !="{}"){ //跳转至工单查询
       this.formData = this.$route.query
       this.workOrderOne(this.$route.query.id,this.$route.query.type)
@@ -437,8 +438,12 @@ export default {
             this.adminList = []
             this.loading = false;
           }else{
+            if(this.adminList.length>0){
+
+            }else{
+              this.adminList.push(res.data.records[0]);
+            }
             this.handleUpdate(res.data.records[0])
-            this.adminList.push(res.data.records[0]);
             this.loading = false;
           }
 
@@ -511,6 +516,7 @@ export default {
               updateWorkOrder(this.form).then(response => {
                 this.loading = false,
                 this.open2 = false;
+                this.collectWorkOrder()
                 this.getList();
               })
 
@@ -538,6 +544,7 @@ export default {
               this.loading = false,
               this.msgSuccess("新增成功");
               this.open1 = false;
+              this.collectWorkOrder()
               this.getList();
             }).catch(()=>{
               this.loading = false,
@@ -587,7 +594,9 @@ export default {
           })
         }
       });
-      /** 综合列表列表 */
+    },
+    /** 综合列表列表 */
+    collectWorkOrder(){
       collectWorkOrder({}).then(response => {
         this.collectList = response.data
         setTimeout(() => {
@@ -595,6 +604,7 @@ export default {
         }, 500);
       });
     }
+
   }
 };
 </script>

src/views/business/fireInternet/deviceMonitoring/SSMonitoring/index.vue

@@ -84,12 +84,12 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="处理状态：" >
+                <!-- <el-form-item label="处理状态：" >
                   <el-select v-model="queryParams.checkStatus" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
                     <el-option label="未处理" :value="0"/>
                     <el-option label="已处理" :value="1"/>
                   </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="时间:" label-width="50px">
                   <el-date-picker style="vertical-align: middle;width:340px"
                     v-model="dateRange"
@@ -472,12 +472,12 @@ export default {
           }
         }
         .contain{
-          margin-top:0.5vh;
+          margin-top:0vh;
           width:58%;
           display: inline-block;
           vertical-align: top;
           div{
-            height:7.8vh;
+            height:7vh;
             span{
               font-size: 1vw;
               vertical-align: middle;
@@ -523,25 +523,6 @@ export default {
     }
   }
 
- ::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>

src/views/business/fireInternet/deviceMonitoring/fireMonitoring/index.vue

@@ -84,12 +84,12 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="处理状态：" >
+                <!-- <el-form-item label="处理状态：" >
                   <el-select v-model="queryParams.checkStatus" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
                     <el-option label="未处理" :value="0"/>
                     <el-option label="已处理" :value="1"/>
                   </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="时间:" label-width="50px">
                   <el-date-picker style="vertical-align: middle;width:340px"
                     v-model="dateRange"
@@ -404,43 +404,7 @@ 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{
@@ -458,6 +422,7 @@ export default {
     .card_left{
       .card1{
         height:43vh;
+
         .title{
           width:100%;
           display: block;
@@ -475,12 +440,12 @@ export default {
           }
         }
         .contain{
-          margin-top:0.5vh;
+          margin-top:0vh;
           width:58%;
           display: inline-block;
           vertical-align: top;
           div{
-            height:7.8vh;
+            height:7vh;
             span{
               font-size: 1vw;
               vertical-align: middle;
@@ -526,22 +491,7 @@ export default {
     }
   }
 
- ::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>

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

@@ -278,154 +278,3 @@ 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:0.5vh;
-          width:58%;
-          display: inline-block;
-          vertical-align: top;
-          div{
-            height:7.8vh;
-            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:-3.5rem;
-          vertical-align: top;
-          width:42%;
-          display: inline-block;
-          p{
-            text-align: center;
-            font-size: 1.4rem;
-            margin:-4vh 0 0 0%;
-          }
-        }
-      }
-    }
-    .card_right{
-      .card2{
-        height:43vh;
-      }
-    }
-    .card_bottom{
-      padding-top:10px;
-      margin-bottom:-10px
-    }
-  }
-  @media screen and (min-width: 1000px) and (max-width: 1560px) {
-    .contain2{
-      p{
-        margin:-8vh 0 0 0% !important;
-      }
-    }
-  }
- ::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;//滚动条背景色
-    }
-    .el-table__body tr.current-row>td{
-      background-color: #0e70cb!important;
-      color: #fff;
-    }
-}
-</style>

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

@@ -84,12 +84,12 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="处理状态：">
+                <!-- <el-form-item label="处理状态：">
                   <el-select v-model="queryParams.checkStatus" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
                     <el-option label="未处理" :value="0"/>
                     <el-option label="已处理" :value="1"/>
                   </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="时间:" label-width="50px">
                   <el-date-picker style="vertical-align: middle;width:340px"
                     v-model="dateRange"
@@ -477,12 +477,12 @@ export default {
           }
         }
         .contain{
-          margin-top:0.5vh;
+          margin-top:0vh;
           width:58%;
           display: inline-block;
           vertical-align: top;
           div{
-            height:7.8vh;
+            height:7vh;
             span{
               font-size: 1vw;
               vertical-align: middle;

src/views/business/fireInternet/fireAlarm/fireMonitoring/index.vue

@@ -99,7 +99,7 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="处理状态：">
+              <!-- <el-form-item label="处理状态：">
                 <el-select
                   v-model="queryParams.status"
                   style="width: 160px"
@@ -110,7 +110,7 @@
                   <el-option label="未处理" :value="0" />
                   <el-option label="已处理" :value="1" />
                 </el-select>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item label="时间:" label-width="50px">
                 <el-date-picker
                   style="vertical-align: middle; width: 340px"
@@ -556,12 +556,12 @@ export default {
         }
       }
       .contain {
-        margin-top: 0.5vh;
+        margin-top: 0vh;
         width: 58%;
         display: inline-block;
         vertical-align: top;
         div {
-          height: 7.8vh;
+          height: 7vh;
           span {
             font-size: 1vw;
             vertical-align: middle;

src/views/business/fireInternet/fireAlarm/waterAlarm/index.vue

@@ -84,12 +84,12 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="处理状态：" >
+                <!-- <el-form-item label="处理状态：" >
                   <el-select v-model="queryParams.status" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
                     <el-option label="未处理" :value="0"/>
                     <el-option label="已处理" :value="1"/>
                   </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="时间:" label-width="50px">
                   <el-date-picker style="vertical-align: middle;width:340px"
                     v-model="dateRange"

src/views/business/fireInternet/hiddenDanger/index.vue

@@ -84,12 +84,12 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="处理状态：">
+                <!-- <el-form-item label="处理状态：">
                   <el-select v-model="queryParams.status" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
                     <el-option label="未处理" :value="0"/>
                     <el-option label="已处理" :value="1"/>
                   </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="时间:" label-width="50px">
                   <el-date-picker style="vertical-align: middle;width:340px"
                     v-model="dateRange"

src/views/index.vue

@@ -98,7 +98,7 @@
                         <el-table-column label="告警值" align="center" prop="property" show-overflow-tooltip />
                         <el-table-column label="当前状态" align="center" prop="alarmStatus" >
                           <template slot-scope="scope">
-                            <span :class="scope.row.alarmStatus == 1 ? 'unprocess' : 'processed'">{{ scope.row.alarmStatus == 1 ? '已处理': '未处理' }}</span>
+                            <span :class="scope.row.alarmStatus == 1 ? 'processed' : 'unprocess'">{{ scope.row.alarmStatus == 1 ? '已处理': '未处理' }}</span>
                           </template>
                         </el-table-column>
                         <el-table-column label="处理时间" align="center" prop="updateTime" show-overflow-tooltip />

vue.config.js

@@ -125,4 +125,4 @@ module.exports = {
                 }
             )
     }
-}
+}