3个优化

src/layout/components/Navbar.vue

@@ -21,13 +21,15 @@
       </template>
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
-        <div class="avatar-wrapper">
-          {{$store.state.user.nickName}}
-          <!-- <img :src="avatar" class="user-avatar"> -->
-        </div>
-        <div class="logout"  @click="logout">
-          <span>安全退出</span>
-        </div>
+        <el-dropdown-menu>
+              <div class="avatar-wrapper">
+                {{$store.state.user.nickName}}
+                <!-- <img :src="avatar" class="user-avatar"> -->
+              </div>
+              <div class="logout"  @click="logout">
+                <span>安全退出</span>
+              </div>
+            </el-dropdown-menu>
       </el-dropdown>
     </div>
   </div>

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

@@ -203,21 +203,9 @@
               <el-input v-model="form.addTime" :disabled="true" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="执行班组" prop="teamId">
-              <el-select
-                v-model="form.teamId"
-                placeholder="请选择执行班组"
-                size="small"
-                :disabled="true"
-              >
-                <el-option
-                  v-for="dict in teamList"
-                  :key="dict.id"
-                  :label="dict.teamName"
-                  :value="dict.id"
-                />
-              </el-select>
+           <el-col :span="12" >
+           <el-form-item label="执行班组" prop="teamId" >
+              <el-input v-model="form.teamId" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formRow.clzt =='1' || formRow.clzt =='2'">
@@ -472,6 +460,7 @@ export default {
       this.form = JSON.parse(JSON.stringify(row))
       this.formRow = JSON.parse(JSON.stringify(row))
       //this.form.clzt = 1 //默认处置通过
+      console.log(this.form,this.formData)
 
       if(this.formData.type == "1"){
         this.form.workOrderName = "消防隐患"
@@ -508,33 +497,34 @@ export default {
           this.loading = true
           if (this.form.id != undefined) {
             let type = this.formData.type
-            if(type=="1"){
-              this.form.clzt = 1
-              updateWorkOrder(this.form).then(response => {
-                this.loading = false,
-                this.open2 = false;
-                this.collectWorkOrder()
-                this.getList();
-              })
+            console.log(this.formData)
+            // if(type=="1"){
+            //   this.form.clzt = 1
+            //   updateWorkOrder(this.form).then(response => {
+            //     this.loading = false,
+            //     this.open2 = false;
+            //     this.collectWorkOrder()
+            //     this.getList();
+            //   })
 
-            }
-            if(type=="2"){
-              this.form.workOrderContent = this.form.clnr
-              maintianLogUpdate(this.form).then(response => {
-                 this.loading = false,
-                this.msgSuccess("修改成功");
-                this.open2 = false;
-                this.getList();
-              })
-            }
-            if(type=="3"){
-              baCwInfoUpdate(this.form).then(response => {
-                 this.loading = false,
-                this.msgSuccess("修改成功");
-                this.open2 = false;
-                this.getList();
-              })
-            }
+            // }
+            // if(type=="2"){
+            //   this.form.workOrderContent = this.form.clnr
+            //   maintianLogUpdate(this.form).then(response => {
+            //      this.loading = false,
+            //     this.msgSuccess("处置成功");
+            //     this.open2 = false;
+            //     this.getList();
+            //   })
+            // }
+            // if(type=="3"){
+            //   baCwInfoUpdate(this.form).then(response => {
+            //      this.loading = false,
+            //     this.msgSuccess("处置成功");
+            //     this.open2 = false;
+            //     this.getList();
+            //   })
+            // }
           }else{
             this.form.clzt = 0
             addWorkOrder(this.form).then(response => {

src/views/business/ba/lateralPosition/index.vue

@@ -51,6 +51,7 @@
       <el-table-column label="序号" align="left" prop="id"  show-overflow-tooltip />
       <el-table-column label="采集时间" align="left" prop="createTime"  show-overflow-tooltip />
       <el-table-column label="设备名称" align="left" prop="deviceName"  show-overflow-tooltip />
+      <el-table-column label="楼层" align="left" prop="floor"  show-overflow-tooltip />
       <el-table-column label="厕位类型" align="left" prop="wcType"  show-overflow-tooltip >
         <template slot-scope="scope">
           {{scope.row.wcType == 'female' ? '女厕' : "男厕"}}

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

@@ -114,22 +114,22 @@
           <el-col :span="12">
             <el-form-item label="通道类型" prop="passagewayType">
               <el-select v-model="form.passagewayType"  placeholder="请选择系统类型" @change="selectPassagewayType">
-                  <el-option v-if="form.dwtype == '1'" value="1" label="待定" />
-                  <el-option v-if="form.dwtype == '2'" value="1" label="设备状态" />
-                  <el-option v-if="form.dwtype == '2'" value="2" label="剩余电量" />
-                  <el-option v-if="form.dwtype == '2'" value="3" label="无线信号" />
-                  <el-option v-if="form.dwtype == '2'" value="4" label="压力值" />
+                  <el-option v-if="form.dwtype == 1"  value="1" label="待定" />
+                  <el-option v-if="form.dwtype == 2"  value="1" label="设备状态" />
+                  <el-option v-if="form.dwtype == 2"  value="2" label="剩余电量" />
+                  <el-option v-if="form.dwtype == 2"  value="3" label="无线信号" />
+                  <el-option v-if="form.dwtype == 2"  value="4" label="压力值" />
 
-                  <el-option v-if="form.dwtype == '5'" value="1" label="设备状态" />
-                  <el-option v-if="form.dwtype == '5'" value="2" label="剩余电量" />
-                  <el-option v-if="form.dwtype == '5'" value="3" label="无线信号" />
-                  <el-option v-if="form.dwtype == '5'" value="4" label="液位值" />
+                  <el-option v-if="form.dwtype == 5"  value="1" label="设备状态" />
+                  <el-option v-if="form.dwtype == 5"  value="2" label="剩余电量" />
+                  <el-option v-if="form.dwtype == 5"  value="3" label="无线信号" />
+                  <el-option v-if="form.dwtype == 5"  value="4" label="液位值" />
 
-                  <el-option v-if="form.dwtype == '6'" value="1" label="1~16待定" />
-                  <el-option v-if="form.dwtype == '6'" value="2" label="65~72待定" />
+                  <el-option v-if="form.dwtype == 6"  value="1" label="1~16待定" />
+                  <el-option v-if="form.dwtype == 6"  value="2" label="65~72待定" />
 
-                  <el-option v-if="form.dwtype == '16'" value="1" label="占到检测告警" />
-                  <el-option v-if="form.dwtype == '16'" value="2" label="火点检测告警" />
+                  <el-option v-if="form.dwtype == 16"  value="1" label="占到检测告警" />
+                  <el-option v-if="form.dwtype == 16"  value="2" label="火点检测告警" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -293,6 +293,7 @@ export default {
     getList() {
       getDeviceChannel(this.queryParams).then(response => {
         this.adminList = response.data.records;
+        console.log(response.data.records)
         for(let i = 0;i<this.adminList.length;i++){
           this.adminList[i].dwtype = String(this.adminList[i].dwtype)
           this.adminList[i].passagewayType = String(this.adminList[i].passagewayType)
@@ -397,8 +398,11 @@ export default {
       //类型与系统联动
       this.form.passagewayType = undefined
     },
-    selectPassagewayType(){
-      this.form.passagewayType = this.form.passagewayType
+    selectPassagewayType(val){
+      // console.log(val)
+      // this.form.passagewayType = val
+      this.form.passagewayType = "2"
+      // console.log(this.form.dwtype )
     }
   }
 };