提交代码

src/views/gas/area/index.vue

@@ -89,10 +89,10 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键id" align="center" prop="id" v-if="true"/>
       <el-table-column label="小区名" align="center" prop="name"/>
-      <el-table-column label="负责工长" align="center" prop="userId">
-        <template slot-scope="scope">
-          {{ getUserName(scope.row.userId) }}
-        </template>
+      <el-table-column label="负责工长" align="center" prop="userName">
+<!--        <template slot-scope="scope">-->
+<!--          {{ getUserName(scope.row.userId) }}-->
+<!--        </template>-->
       </el-table-column>
       <el-table-column label="是否释放" align="center" prop="releaseIs">
         <template slot-scope="scope">
@@ -288,6 +288,7 @@ export default {
       if (this.queryParams.userId != undefined)
         this.queryParams.userId = this.queryParams.userId + ""
       listArea(this.queryParams).then(response => {
+        this.areaList = []
         this.areaList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/gas/courtyardNetworkManagement/index.vue

@@ -71,7 +71,7 @@
       <el-table-column label="主键id" align="center" prop="id" v-if="false"/>
       <el-table-column label="所属小区" align="center" prop="areaName"/>
       <el-table-column label="所属楼宇" align="center" prop="buildingName"/>
-      <el-table-column label="所属单元" align="center" prop="unitName"/>
+<!--      <el-table-column label="所属单元" align="center" prop="unitName"/>-->
       <el-table-column label="发现问题" align="center" prop="findProblem">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.find_problem" :value="scope.row.findProblem"/>
@@ -172,15 +172,15 @@
                        :value="item.id"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="所属单元" prop="unitId">
-          <el-select v-model="form.unitId" filterable placeholder="请输入所属单元" clearable size="small"
-                     style="width: 100%">
-            <el-option v-for="item in unitList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id"/>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="所属单元" prop="unitId">-->
+<!--          <el-select v-model="form.unitId" filterable placeholder="请输入所属单元" clearable size="small"-->
+<!--                     style="width: 100%">-->
+<!--            <el-option v-for="item in unitList"-->
+<!--                       :key="item.id"-->
+<!--                       :label="item.name"-->
+<!--                       :value="item.id"/>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="发现问题" prop="findProblem">
           <el-select v-model="form.findProblem" placeholder="请选择发现问题">
             <el-option

src/views/gas/regulatorBox/index.vue

@@ -130,13 +130,14 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="所属小区" prop="areaId">
-              <el-select v-model="form.areaId" filterable placeholder="请选择所属小区" clearable size="small"
-                         @change="getBuildingList" style="width: 100%">
-                <el-option v-for="item in areaList"
-                           :key="item.id"
-                           :label="item.name"
-                           :value="item.id"/>
-              </el-select>
+              <el-input v-model="form.areaName" placeholder="请输入所属小区"/>
+              <!--              <el-select v-model="form.areaId" filterable placeholder="请选择所属小区" clearable size="small"-->
+<!--                         @change="getBuildingList" style="width: 100%">-->
+<!--                <el-option v-for="item in areaList"-->
+<!--                           :key="item.id"-->
+<!--                           :label="item.name"-->
+<!--                           :value="item.id"/>-->
+<!--              </el-select>-->
             </el-form-item>
           </el-col>
           <!--          <el-col :span="8">-->

src/views/gas/user/index.vue

@@ -35,7 +35,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['gas:user:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -46,28 +47,29 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['gas:user:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          :loading="exportLoading"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['gas:user:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="warning"-->
+      <!--          plain-->
+      <!--          icon="el-icon-download"-->
+      <!--          size="mini"-->
+      <!--          :loading="exportLoading"-->
+      <!--          @click="handleExport"-->
+      <!--          v-hasPermi="['gas:user:export']"-->
+      <!--        >导出</el-button>-->
+      <!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键id" align="center" prop="id" v-if="false"/>
-      <el-table-column label="姓名" align="center" prop="name" />
-      <el-table-column label="工号" align="center" prop="jobNum" />
-      <el-table-column label="手机号" align="center" prop="phone" />
+      <el-table-column label="姓名" align="center" prop="name"/>
+      <el-table-column label="工号" align="center" prop="jobNum"/>
+      <el-table-column label="手机号" align="center" prop="phone"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -76,14 +78,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['gas:user:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['gas:user:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -100,21 +104,21 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="姓名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入姓名" />
+          <el-input v-model="form.name" placeholder="请输入姓名"/>
         </el-form-item>
         <el-form-item label="工号" prop="jobNum">
-          <el-input v-model="form.jobNum" placeholder="请输入工号" />
+          <el-input v-model="form.jobNum" placeholder="请输入工号"/>
         </el-form-item>
         <el-form-item label="手机号" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入手机号" />
+          <el-input v-model="form.phone" placeholder="请输入手机号"/>
         </el-form-item>
         <el-form-item label="密码" prop="password">
-          <el-input type="password" v-model="form.password" placeholder="请输入密码" />
+          <el-input type="password" v-model="form.password" placeholder="请输入密码"/>
         </el-form-item>
         <el-form-item label="工程权限" prop="power">
           <el-select
             v-model="form.power"
-            placeholder="工程权限"
+            placeholder="请选择工程权限"
             clearable
             multiple
             size="small"
@@ -128,6 +132,23 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="管理所" prop="power">
+          <el-select
+            v-model="form.administrativeOffice"
+            placeholder="请选择管理所"
+            clearable
+            multiple
+            size="small"
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.administrative_office"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -138,11 +159,11 @@
 </template>
 
 <script>
-import { listUser, getForPhone,getForJobnum,getUser, delUser, addUser,updateUser } from "@/api/gas/user";
+import {listUser, getForPhone, getForJobnum, getUser, delUser, addUser, updateUser} from "@/api/gas/user";
 
 export default {
   name: "User",
-  dicts: ['user_type','engine_type'],
+  dicts: ['user_type', 'engine_type', 'administrative_office'],
   data() {
     // 手机号唯一性验证
     let validateAnotherPhone = (rule, value, callback) => {
@@ -155,15 +176,15 @@ export default {
           callback(new Error('请输入有效的手机号'));
           return;
         }
-        getForPhone(value,this.form.id).then(res => {
-              if (res.data===false) {
-                callback('该手机号已存在');
-              } else {
-                callback();
-              }
-            }).catch(err => {
-              callback(new Error(err.data.msg));
-            });
+        getForPhone(value, this.form.id).then(res => {
+          if (res.data === false) {
+            callback('该手机号已存在');
+          } else {
+            callback();
+          }
+        }).catch(err => {
+          callback(new Error(err.data.msg));
+        });
       } else {
         callback();
       }
@@ -171,15 +192,15 @@ export default {
     // 工号唯一性验证
     let validateAnother = (rule, value, callback) => {
       if (value) {
-        getForJobnum(value,this.form.id).then(res => {
-              if (res.data===false) {
-                callback('该工号已存在');
-              } else {
-                callback();
-              }
-            }).catch(err => {
-              callback(new Error(err.data.msg));
-            });
+        getForJobnum(value, this.form.id).then(res => {
+          if (res.data === false) {
+            callback('该工号已存在');
+          } else {
+            callback();
+          }
+        }).catch(err => {
+          callback(new Error(err.data.msg));
+        });
       } else {
         callback();
       }
@@ -214,19 +235,25 @@ export default {
         name: undefined,
         jobNum: undefined,
       },
-      foremanList:[],
+      foremanList: [],
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "姓名不能为空", trigger: "blur" }
+          {required: true, message: "姓名不能为空", trigger: "blur"}
         ],
         jobNum: [
-          { required: true, message: "工号不能为空", trigger: "blur" },
-          { required: true, trigger: 'blur', validator: validateAnother }
+          {required: true, message: "工号不能为空", trigger: "blur"},
+          {required: true, trigger: 'blur', validator: validateAnother}
         ],
-
+        phone: [
+          {
+            validator: validateAnotherPhone,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
       }
     };
   },
@@ -244,11 +271,11 @@ export default {
         this.loading = false;
       });
     },
-    foreman(role){
-      if (role === "002"){
-        this.foremanForm=true;
-      }else {
-        this.foremanForm=false;
+    foreman(role) {
+      if (role === "002") {
+        this.foremanForm = true;
+      } else {
+        this.foremanForm = false;
         this.form.parentId = undefined;
       }
     },
@@ -286,7 +313,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -305,7 +332,8 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改用户";
-        this.form.power = response.data.power.split(",");
+        this.form.power = response.data.power == null || response.data.power == '' ? [] : response.data.power.split(",");
+        this.form.administrativeOffice = response.data.administrativeOffice == null || response.data.administrativeOffice == '' ? [] : response.data.administrativeOffice.split(",");
       });
     },
     /** 提交按钮 */
@@ -315,21 +343,23 @@ export default {
           this.form.power = this.form.power.toString();
           this.buttonLoading = true;
           if (this.form.id != null) {
+            this.form.administrativeOffice = this.form.administrativeOffice == null ? "" : this.form.administrativeOffice.join()
             updateUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             }).finally(() => {
               this.buttonLoading = false;
-            });
+            }).catch(() => this.buttonLoading = false);
           } else {
+            this.form.administrativeOffice = this.form.administrativeOffice == null ? "" : this.form.administrativeOffice.join()
             addUser(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             }).finally(() => {
               this.buttonLoading = false;
-            });
+            }).catch(() => this.buttonLoading = false);
           }
         }
       });
@@ -350,7 +380,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-        this.$download.excel('/gas/user/export', this.queryParams);
+      this.$download.excel('/gas/user/export', this.queryParams);
     },
   }
 };

src/views/gas/warningPile/index.vue

@@ -79,10 +79,10 @@
     <el-table v-loading="loading" :data="warningPileList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键id" align="center" prop="id" v-if="false"/>
-      <el-table-column label="巡查人员" align="center" prop="userId">
-        <template slot-scope="scope">
-          {{ getUserName(scope.row.userId) }}
-        </template>
+      <el-table-column label="巡查人员" align="center" prop="userName">
+<!--        <template slot-scope="scope">-->
+<!--          {{ getUserName(scope.row.userId) }}-->
+<!--        </template>-->
       </el-table-column>
       <el-table-column label="警示桩名称" align="center" prop="name"/>
       <el-table-column label="警示桩信信息" align="center" prop="warningPileInfo"/>