修改周期性任务，查看人员微型消防站

.env.dev

@@ -5,11 +5,7 @@ ENV = 'development'
 VUE_APP_TITLE = 消防安全公共服务平台
 
 # # 芋道管理系统/开发环境
-<<<<<<< HEAD
 #VUE_APP_BASE_API = 'http://localhost:48081'
-=======
-# VUE_APP_BASE_API = 'http://localhost:48081'
->>>>>>> liyangzheng
 VUE_APP_BASE_API = 'http://api-security.byants.com'
 # VUE_APP_BASE_API = 'http://192.168.1.16:48081'
 # 根据服务器或域名修改

src/views/backend/street/index.vue

@@ -40,7 +40,7 @@
       <el-table-column label="区域id" align="center" prop="quid" />
       <el-table-column label="上级区域id" align="center" prop="sjquid" />
       <el-table-column label="区域名称" align="center" prop="qumc" />
-      <el-table-column label="上级消防机构" align="center" prop="sjxfjgmc" />
+      <el-table-column label="联系消防机构" align="center" prop="sjxfjgmc" />
       <el-table-column label="街道负责人" align="center" prop="jdfzr" />
       <el-table-column label="街道负责人电话" align="center" prop="jdfzrdh" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -68,8 +68,8 @@
         <el-form-item label="区域名称" prop="qumc">
           <el-input v-model="form.qumc" placeholder="请输入区域名称" />
         </el-form-item>
-        <el-form-item label="上级消防机构" prop="sjxfjg">
-          <el-input v-model="form.sjxfjg" placeholder="请输入上级消防机构" />
+        <el-form-item label="联系消防机构" prop="sjxfjg">
+          <el-input v-model="form.sjxfjg" placeholder="请输入联系消防机构" />
         </el-form-item>
         <el-form-item label="街道负责人" prop="jdfzr">
           <el-input v-model="form.jdfzr" placeholder="请输入街道负责人" />

src/views/backend/taskInfo/index.vue

@@ -1008,7 +1008,6 @@ export default {
         // 执行查询
         this.queryParams.taskStatus = "9";
         this.queryParams.iscycle = "1";
-        console.log(this.queryParams, "query");
         getTaskInfoPage(this.queryParams).then((response) => {
           this.list = response.data != null ? response.data.list : [];
           this.total = response.data.total;
@@ -1312,6 +1311,7 @@ export default {
       if (row.id) {
         this.form.id = row.id;
       }
+      this.form.taskName=row.taskName
       // 打开弹窗
       this.openinsp = true;
     },
@@ -1332,6 +1332,7 @@ export default {
       alreadySelectedinspList.map((i) => {
         orgIds.push(i.id);
       });
+      this.form.taskStatus=parseInt(this.queryParams.taskStatus)
       this.form.inspectTypes = inspectIds;
       this.form.inspectIds = orgIds;
 

src/views/backend/taskInfos/index.vue

@@ -1008,7 +1008,6 @@ export default {
         // 执行查询
         this.queryParams.taskStatus = "9";
         this.queryParams.iscycle = "1";
-        console.log(this.queryParams, "query");
         getTaskInfoPage(this.queryParams).then((response) => {
           this.list = response.data != null ? response.data.list : [];
           this.total = response.data.total;
@@ -1312,6 +1311,7 @@ export default {
       if (row.id) {
         this.form.id = row.id;
       }
+      this.form.taskName=row.taskName
       // 打开弹窗
       this.openinsp = true;
     },
@@ -1332,6 +1332,7 @@ export default {
       alreadySelectedinspList.map((i) => {
         orgIds.push(i.id);
       });
+      this.form.taskStatus=parseInt(this.queryParams.taskStatus)
       this.form.inspectTypes = inspectIds;
       this.form.inspectIds = orgIds;
 

src/views/unitorg/microStation/index.vue

@@ -24,6 +24,9 @@
         <el-form-item label="报警电话" prop="alarmTel">
           <el-input v-model="queryParams.alarmTel" placeholder="请输入报警电话" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
+        <el-form-item label="详细地址" prop="addr">
+          <el-input v-model="queryParams.addr" placeholder="请输入详细地址" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
         <!-- <el-form-item label="状态" prop="status">
           <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
             <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.label"
@@ -197,8 +200,8 @@
         <el-table-column label="人员类型" width="120">
           <template slot-scope="scope">
             <!-- <span>{{ countType || scope.row.empType }}</span> -->
-            <el-tag>{{ countType || scope.row.empType }}</el-tag>
-            <!-- <dict-tag :type="DICT_TYPE.MICRO_EMP_TYPE" :value="scope.row.empType" /> -->
+            <!-- <el-tag>{{ countType || scope.row.empType }}</el-tag> -->
+            <dict-tag :type="DICT_TYPE.MICRO_EMP_TYPE" :value="scope.row.empType" />
           </template>
         </el-table-column>
         <el-table-column prop="idcardno" label="身份证" width="220">
@@ -218,7 +221,7 @@
       </span>
     </el-dialog>
     <!-- 内层修改模态框 -->
-    <el-dialog title="编辑人员" :visible.sync="insideModal" width="50%">
+    <el-dialog title="编辑人员" append-to-body  :visible.sync="insideModal" width="50%">
       <el-form ref="form" :model="insideForm" label-width="80px">
         <el-form-item label="姓名">
           <el-input v-model="insideForm.name" @blur="nameBlur"></el-input>