Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/api/core/weather.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询列表监控调阅任务
+export function findWeatherList(query) {
+  return request({
+    url: '/core/weatherWarning/pageList',
+    method: 'get',
+    params: query
+  })
+}
+export function findAreaList() {
+  return request({
+    url: '/core/weatherWarning/cityCodeList',
+    method: 'get',
+    params: null
+  })
+}
+

src/api/question/list.js

@@ -0,0 +1,71 @@
+import request from "@/utils/request";
+
+// 查询列表隐患问题清单
+export function listQuestion(query) {
+  return request({
+    url: "/core/question/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询详细隐患问题清单
+export function getQuestion(id) {
+  return request({
+    url: "/core/question/" + id,
+    method: "get",
+  });
+}
+
+// 新增隐患问题清单
+export function addQuestion(data) {
+  return request({
+    url: "/core/question",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改隐患问题清单
+export function updateQuestion(data) {
+  return request({
+    url: "/core/question",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除隐患问题清单
+export function delQuestion(id) {
+  return request({
+    url: "/core/question/" + id,
+    method: "delete",
+  });
+}
+
+// 问题确认
+export function confirm(data) {
+  return request({
+    url: "/core/question/confirm/" + data.id,
+    method: "put",
+    data,
+  });
+}
+
+// 异议审批
+export function confirmDissent(data) {
+  return request({
+    url: "/core/question/confirmDissent/" + data.id,
+    method: "put",
+    data,
+  });
+}
+
+// 整改
+export function reform(id) {
+  return request({
+    url: "/core/question/reform/" + data.id,
+    method: "put",
+    data,
+  });
+}

src/api/safetycheck/plan.js

@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 查询【请填写功能名称】列表
+export function list(query) {
+  return request({
+    url: '/core/checkplan/list',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询【请填写功能名称】详细
+export function itemfind(id) {
+  return request({
+    url: '/core/api/plan/item/find' + id,
+    method: 'get'
+  })
+}
+// 查询【请填写功能名称】详细
+export function distribute(query) {
+  return request({
+    url: '/core/api/plan/distribute' ,
+    method: 'post',
+    data: query
+  })
+}
+export function getPointIds(id) {
+  return request({
+    url: '/core/api/plan/getPointIds/' + id,
+    method: 'get'
+  })
+}
+// 查询【请填写功能名称】详细
+export function get(id) {
+  return request({
+    url: '/core/checkplan/' + id,
+    method: 'get'
+  })
+}
+// 修改【请填写功能名称】
+export function update(data) {
+  return request({
+    url: '/core/checkplan',
+    method: 'put',
+    data: data
+  })
+}
+// 新增【请填写功能名称】
+export function add(data) {
+  return request({
+    url: '/core/checkplan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除【请填写功能名称】
+export function delelte(id) {
+  return request({
+    url: '/core/checkplan/' + id,
+    method: 'delete'
+  })
+}

src/api/system/role.js

@@ -8,7 +8,13 @@ export function listRole(query) {
     params: query
   })
 }
-
+export function allRole() {
+  return request({
+    url: '/system/role/allRole',
+    method: 'get',
+   // params: query
+  })
+}
 // 查询角色详细
 export function getRole(roleId) {
   return request({

src/plugins/download.js

@@ -1,29 +1,30 @@
-import axios from 'axios'
-import { Message } from 'element-ui'
-import { saveAs } from 'file-saver'
-import { getToken } from '@/utils/auth'
-import errorCode from '@/utils/errorCode'
+import axios from "axios";
+import { Message } from "element-ui";
+import { saveAs } from "file-saver";
+import { getToken } from "@/utils/auth";
+import errorCode from "@/utils/errorCode";
 import { blobValidate } from "@/utils/ruoyi";
 
-const baseURL = process.env.VUE_APP_BASE_API
+const baseURL = process.env.VUE_APP_BASE_API;
 
 export default {
   zip(url, name) {
-    var url = baseURL + url
+    var seperator = !baseURL.endsWith("/") && !url.startsWith("/") ? "/" : "";
+    var url = baseURL + seperator + url;
     axios({
-      method: 'get',
+      method: "get",
       url: url,
-      responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
+      responseType: "blob",
+      headers: { Authorization: "Bearer " + getToken() },
     }).then((res) => {
       const isBlob = blobValidate(res.data);
       if (isBlob) {
-        const blob = new Blob([res.data], { type: 'application/zip' })
-        this.saveAs(blob, name)
+        const blob = new Blob([res.data], { type: "application/zip" });
+        this.saveAs(blob, name);
       } else {
         this.printErrMsg(res.data);
       }
-    })
+    });
   },
   saveAs(text, name, opts) {
     saveAs(text, name, opts);
@@ -31,8 +32,7 @@ export default {
   async printErrMsg(data) {
     const resText = await data.text();
     const rspObj = JSON.parse(resText);
-    const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+    const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode["default"];
     Message.error(errMsg);
-  }
-}
-
+  },
+};

src/views/check/dialog.edit.vue

@@ -28,15 +28,15 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item prop="planType" label="检查类型:">
+              <el-form-item prop="checkType" label="检查类型:">
                 <el-select
                   label="检查类型"
-                  v-model="formData.planType"
+                  v-model="formData.checkType"
                   placeholder="请选择检查类型"
                   clearable
                 >
                   <el-option
-                    v-for="dict in dict.type.resumption_plan_type"
+                    v-for="dict in dict.type.check_type"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -55,7 +55,7 @@
                   clearable
                 >
                   <el-option
-                    v-for="item in dict.type.resumption_plan_cycle"
+                    v-for="item in dict.type.check_cycle"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -65,16 +65,16 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item prop="planStatus" label="检查机构类型:">
+              <el-form-item prop="execOrgType" label="检查机构类型:">
                 <el-select
-                  prop="planStatus"
+                  prop="execOrgType"
                   label="检查机构类型"
-                  v-model="formData.planStatus"
+                  v-model="formData.execOrgType"
                   placeholder="请选择检查机构类型"
                   clearable
                 >
                   <el-option
-                    v-for="item in dict.type.resumption_plan_status"
+                    v-for="item in dict.type.sys_org_type"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -86,37 +86,18 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item prop="execOrgType" label="检查角色:">
+              <el-form-item prop="roleIds" label="检查角色:">
                 <el-select
+                  @visible-change="getRolesByOrg"
                   label="检查角色"
-                  v-model="formData.execOrgType"
+                  v-model="formData.roleIds"
                   placeholder="请选择检查角色"
-                  @change="onOrgTypeChanged"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in dict.type.sys_org_type"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item prop="roleList" label="受检机构类型:">
-                <el-select
-                  
-                  label="受检机构类型"
-                  v-model="formData.roleList"
-                  placeholder="请选择受检机构类型"
                   multiple
                   filterable
                   @change="handleRolesChange"
                 >
                   <el-option
-                    v-for="item in resumptionRoles"
+                    v-for="item in planRoles"
                     :key="item.id"
                     :label="item.name"
                     :value="item.id"
@@ -126,15 +107,16 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item prop="planExec" label="检查次数:">
+              <el-form-item prop="checkOrgType" label="受检机构类型:">
                 <el-select
-                  label="检查次数"
-                  v-model="formData.planExec"
-                  placeholder="请选择检查次数"
+                  prop="checkOrgType"
+                  label="受检机构类型"
+                  v-model="formData.checkOrgType"
+                  placeholder="请选择受检机构类型"
                   clearable
                 >
                   <el-option
-                    v-for="item in dict.type.resumption_plan_exec"
+                    v-for="item in dict.type.sys_org_type"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -144,7 +126,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item prop="count" label="立即生效:">
+              <el-form-item prop="count" label="检查次数:">
                 <el-input-number
                   style="margin-left: 10px"
                   v-model="formData.count"
@@ -155,104 +137,94 @@
                 ></el-input-number>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item prop="buildTaskNow" label="立即生效:">
+                <el-checkbox
+                  v-model="formData.buildTaskNow"
+                  size="medium"
+                  @change="handleCheckboxChange"
+                  >勾选后当前周期开始生效</el-checkbox
+                >
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
-          <el-form-item  prop="note" label="计划状态">
-            <el-select
+              <el-form-item prop="planStatus" label="计划状态">
+                <el-select
                   label="计划状态"
-                  v-model="formData.execOrgType"
+                  v-model="formData.planStatus"
                   placeholder="请选择计划状态"
-                  @change="onOrgTypeChanged"
                   clearable
                 >
                   <el-option
-                    v-for="item in dict.type.sys_org_type"
+                    v-for="item in dict.type.check_status"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
                   >
                   </el-option>
                 </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item :span="6" prop="note" label="检查机构">
-            <el-select
-                  label="检查机构"
-                  v-model="formData.execOrgType"
-                  placeholder="请选择检查机构"
-                  @change="onOrgTypeChanged"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in dict.type.sys_org_type"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item :span="6" prop="note" label="受检机构">
-            <el-select
-                  label="受检机构"
-                  v-model="formData.execOrgType"
-                  placeholder="请选择受检机构"
-                  @change="onOrgTypeChanged"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in dict.type.sys_org_type"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-          </el-form-item>
-        </el-col>
-          
-        </el-row>
-        <el-form-item :span="6" prop="note" label="备注">
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :span="6" prop="execOrg" label="检查机构">
+                <orgDropDown
+                  v-model="formData.execOrg"
+                  placeholder="选择检查机构"
+                  @select="onexecOrgSelect"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :span="6" prop="checkOrg" label="受检机构">
+                <orgDropDown
+                  v-model="formData.checkOrg"
+                  placeholder="选择受检机构"
+                  @select="oncheckOrgSelect"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item :span="6" prop="description" label="备注">
             <el-input
-              v-model="formData.note"
+              v-model="formData.description"
               :maxlength="255"
               clearable
             />
           </el-form-item>
         </el-form>
         <el-button @click="openSelect">新增检查内容</el-button>
-       
+
         <el-table :data="tableData" style="width: 100%" height="400px">
-          <el-table-column  label="是否扫描" >
-            <template v-slot="{ row }"> 
+          <el-table-column label="是否扫描">
+            <template v-slot="{ row }">
               <el-switch
                 v-model="row.pointScan"
                 active-text="是"
-                inactive-text="否">
+                inactive-text="否"
+              >
               </el-switch>
             </template>
           </el-table-column>
 
-          <el-table-column label="是否必检" >
-            <template v-slot="{ row }"> 
+          <el-table-column label="是否必检">
+            <template v-slot="{ row }">
               <el-switch
                 v-model="row.required"
                 active-text="是"
-                inactive-text="否">
+                inactive-text="否"
+              >
               </el-switch>
             </template>
           </el-table-column>
-          <el-table-column prop="ruleName" label="检查手册" > </el-table-column>
-          <el-table-column prop="itemName" label="检查项" > </el-table-column>
-          <el-table-column prop="pointName" label="检查内容" > </el-table-column>
-          <el-table-column prop="areaName" label="检查区域" > </el-table-column>
-          <el-table-column prop="areaName" label="数据来源" > </el-table-column>
-          <el-table-column prop="areaName" label="操作" >
-            <template v-slot="{ row }"> 
+          <el-table-column prop="ruleName" label="检查手册"> </el-table-column>
+          <el-table-column prop="itemName" label="检查项"> </el-table-column>
+          <el-table-column prop="pointName" label="检查内容"> </el-table-column>
+          <el-table-column prop="areaName" label="检查区域"> </el-table-column>
+          <el-table-column prop="areaName" label="数据来源"> </el-table-column>
+          <el-table-column prop="areaName" label="操作">
+            <template v-slot="{ row }">
               <el-button type="text" @click="removeRow(row)">删除</el-button>
             </template>
           </el-table-column>
@@ -265,29 +237,23 @@
       </div>
     </el-dialog>
     <DialogSelect
-          ref="DialogSelect"
-          :defaultSelect=defaultSelect
-          :orgType="formData.execOrgType"
-          @select="onSelect"
-        ></DialogSelect>
+      ref="DialogSelect"
+      :defaultSelect="defaultSelect"
+      :orgType="formData.execOrgType"
+      @select="onSelect"
+    ></DialogSelect>
   </div>
 </template>
 
 <script>
 import { mapGetters } from "vuex";
-import * as api from "@/api/resumption/plan";
+import orgDropDown from "@/components/orgTree/orgDropDown.vue";
+import * as api from "@/api/safetycheck/plan";
 import { statusOptions } from "@/views/commonOption";
 import { findAllRole } from "@/api/system/role";
 import DialogSelect from "@/views/safetycheck/ruleManager/dialog.select.point.vue";
 export default {
-  dicts: [
-    "resumption_plan_type",
-    "resumption_plan_cycle",
-    "resumption_org_type",
-    "resumption_plan_status",
-    "sys_org_type",
-    "resumption_plan_exec",
-  ],
+  dicts: ["sys_org_type", "check_type", "check_cycle", "check_status"],
   data() {
     // const params = this.$route.params;
     // let o1=options;
@@ -296,7 +262,7 @@ export default {
     return {
       defaultSelect: [],
       selectedValues: [],
-      resumptionRoles: [],
+      planRoles: [],
       planName: null,
       planType: null,
       planCycle: null,
@@ -373,6 +339,17 @@ export default {
     ...mapGetters(["orgId", "orgName"]),
   },
   methods: {
+    handleCheckboxChange() {
+      this.formData.buildTaskNow = !this.formData.buildTaskNow;
+    },
+    onexecOrgSelect(node) {
+      this.formData.execOrg = node.id;
+      console.log(node, "onexecOrgSelect");
+    },
+    oncheckOrgSelect(node) {
+      this.formData.checkOrg = node.id;
+      console.log(node, "oncheckOrgSelect");
+    },
     reset() {
       return {
         planName: null,
@@ -391,78 +368,81 @@ export default {
         planCreateOrgId: null,
         planCreateOrgName: null,
         roleList: null,
+        roleIds: null,
+        execOrg: null,
+        checkOrg: null,
+        buildTaskNow: false,
       };
     },
     getRolesByOrg() {
+      // console.log("开始获取角色")
       let params = {
-        orgType: this.formData.execOrgType,
+        orgType: null,
       };
       findAllRole(params).then((res) => {
         // console.info(res);
-        this.resumptionRoles = res.data;
+        this.planRoles = res.data;
       });
     },
     handleChange(value) {
-      console.log(value);
+      // console.log(value);
       this.count = value;
     },
     async refresh(id, other) {
       this.formData = id ? (await api.get(id)).data : this.reset(other);
-      if(this.formData.execOrgType){
+      if (this.formData.execOrgType) {
+        this.formData.roleIds=this.formData.roleList.map(role => role.id);
         this.getRolesByOrg();
-      } 
+      }
     },
-    onSelect(selectList){
+    onSelect(selectList) {
       console.log(selectList);
-      for(let i=0;i<selectList.length;i++){
-        let tem={
-          pointScan:!selectList[i].pointScan,
-          required:!selectList[i].required,
-          ruleName:selectList[i].ruleName,
-          itemName:selectList[i].itemName,
-          pointName:selectList[i].pointName,
-          areaName:selectList[i].areaName,
-          itemId:selectList[i].itemId,
-          id:selectList[i].id,
-        }
-        if(this.tableData==null){
-          this.tableData=[];
+      for (let i = 0; i < selectList.length; i++) {
+        let tem = {
+          pointScan: !selectList[i].pointScan,
+          required: !selectList[i].required,
+          ruleName: selectList[i].ruleName,
+          itemName: selectList[i].itemName,
+          pointName: selectList[i].pointName,
+          areaName: selectList[i].areaName,
+          itemId: selectList[i].itemId,
+          id: selectList[i].id,
+        };
+        if (this.tableData == null) {
+          this.tableData = [];
         }
         this.tableData.push(tem);
       }
-     
-      
-      
     },
-    onOrgTypeChanged(){
+    onOrgTypeChanged() {
       this.getRolesByOrg();
     },
     async show(id, other = {}) {
       this.id = id;
       this.tableData = null;
-      this.formData.itemList = null;
+      this.formData.itemList = {};
       await this.refresh(id, other);
       console.log(id);
       if (id !== undefined) {
         await api.get(id).then((res) => {
-          console.log(res);
+          // console.log(res);
           this.tableData = res.data.itemList;
         });
       }
-
+      this.getRolesByOrg();
       this.isShow = true;
     },
     removeRow(row) {
-      this.tableData = this.tableData.filter(item => item !== row)
+      this.tableData = this.tableData.filter((item) => item !== row);
       // this.tableData.splice(index, 1);
     },
     // 事件
     onHide() {
       this.isShow = false;
     },
-    getIteamF(){
-      if(this.id==null){
-        this.defaultSelect=[];
+    getIteamF() {
+      if (this.id == null) {
+        this.defaultSelect = [];
         return;
       }
       api.getPointIds(this.id).then((res) => {
@@ -470,7 +450,6 @@ export default {
       });
     },
     openSelect() {
-      
       this.getIteamF();
       this.$refs.DialogSelect.show();
     },
@@ -481,8 +460,17 @@ export default {
         this.formData.planCreateOrgName = this.orgName;
         if (!isValidate) return;
         this.formData.itemList = this.tableData == null ? [] : this.tableData;
-        this.formData.roleList = this.selectedValues.length==0?null:this.selectedValues;
-        await api.update(this.formData);
+        this.formData.roleList = null;
+        // console.log(this.selectedValues,"selectedValues");
+        this.formData.roleIds =
+          this.selectedValues.length == 0 ? null : this.selectedValues;
+        this.formData.buildTaskNow = this.formData.buildTaskNow ? 1 : 0;
+        if (this.id == undefined) {
+          await api.add(this.formData);
+        } else {
+          await api.update(this.formData);
+        }
+
         this.$emit("success");
         this.onHide();
       });
@@ -494,7 +482,7 @@ export default {
     //apimark//
   },
   mounted() {},
-  components: {DialogSelect},
+  components: { DialogSelect, orgDropDown },
 };
 </script>
 

src/views/check/index.vue

@@ -22,67 +22,67 @@
           v-show="showSearch"
           label-width="100px"
         >
-          <el-form-item prop="planType" label="检查机构类型">
+          <el-form-item prop="execOrgType" label="检查机构类型">
             <el-select
-              prop="planType"
+              prop="execOrgType"
               label="检查机构类型"
-              v-model="queryParams.planType"
+              v-model="queryParams.execOrgType"
               placeholder="请选择检查机构类型"
               clearable
             >
               <el-option
-                v-for="dict in dict.type.resumption_plan_type"
+                v-for="dict in dict.type.sys_org_type"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
               />
             </el-select>
           </el-form-item>
-          <el-form-item prop="resumptionRole" label="受检机构类型">
+          <el-form-item prop="checkOrgType" label="受检机构类型">
             <el-select
-              @visible-change="getRolesByOrg"
-              prop="resumptionRole"
+              prop="checkOrgType"
               label="受检机构类型"
-              v-model="queryParams.resumptionRole"
+              v-model="queryParams.checkOrgType"
               placeholder="请选择受检机构类型"
               clearable
             >
               <el-option
-                v-for="dict in resumptionRoles"
-                :key="dict.index"
-                :label="dict.roleName"
-                :value="dict.id"
+                v-for="dict in dict.type.sys_org_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
               />
             </el-select>
+            
           </el-form-item>
 
-          <el-form-item prop="planCycle" label="检查角色">
+          <el-form-item prop="checkRole" label="检查角色">
             <el-select
-              prop="planCycle"
+              @visible-change="getRolesByOrg"
+              prop="checkRole"
               label="检查角色"
-              v-model="queryParams.planCycle"
+              v-model="queryParams.checkRole"
               placeholder="请选择检查角色"
               clearable
             >
               <el-option
-                v-for="item in dict.type.resumption_plan_cycle"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
+                v-for="dict in resumptionRoles"
+                :key="dict.index"
+                :label="dict.roleName"
+                :value="dict.id"
+              />
             </el-select>
           </el-form-item>
-          <el-form-item prop="planStatus" label="检查周期">
+          <el-form-item prop="planCycle" label="检查周期">
             <el-select
-              prop="planStatus"
+              prop="planCycle"
               label="检查周期"
-              v-model="queryParams.planStatus"
+              v-model="queryParams.planCycle"
               placeholder="请选择检查周期"
               clearable
             >
               <el-option
-                v-for="item in dict.type.resumption_plan_status"
+                v-for="item in dict.type.check_cycle"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -99,7 +99,7 @@
               clearable
             />
           </el-form-item>
-          <el-form-item prop="planName" label="计划状态">
+          <el-form-item prop="planStatus" label="计划状态">
             <el-select
               prop="planStatus"
               label="计划状态"
@@ -108,7 +108,7 @@
               clearable
             >
               <el-option
-                v-for="item in dict.type.resumption_plan_status"
+                v-for="item in dict.type.check_status"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -143,31 +143,6 @@
               >新增计划</el-button
             >
           </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-              >删除</el-button
-            > 
-          </el-col>-->
-
           <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"
@@ -197,7 +172,9 @@
             prop="planOfOrgName"
             label="计划所属机构"
             v-if="columns[4].visible"
-          ></el-table-column>
+          >
+        
+        </el-table-column>
         
           <el-table-column
             prop="planCreateOrgName"
@@ -207,44 +184,50 @@
           
           </el-table-column>
           <el-table-column
-            prop="planType"
+            prop="checkType"
             label="检查类型"
             v-if="columns[2].visible"
           >
             <template slot-scope="r"
               >{{
-                getLabel(dict.type.resumption_plan_type, `${r.row.planType}`)
+                getLabel(dict.type.check_type, `${r.row.checkType}`)
               }}
             </template>
           </el-table-column>
           <el-table-column
-            prop="planType"
+            prop="execOrgType"
             label="检查机构类型"
             v-if="columns[2].visible"
           >
             <template slot-scope="r"
               >{{
-                getLabel(dict.type.resumption_plan_type, `${r.row.planType}`)
+                getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`)
               }}
             </template>
           </el-table-column>
 
           <el-table-column
-            prop="execOrgType"
+            prop="checkOrgType"
             label="受检机构类型"
             width="120px"
             v-if="columns[6].visible"
           >
             <template slot-scope="r"
-              >{{ getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`) }}
+              >{{ getLabel(dict.type.sys_org_type, `${r.row.checkOrgType}`) }}
             </template>
           </el-table-column>
 
           <el-table-column
-            prop="roleNames"
+            prop="roleList"
             label="检查角色"
             v-if="columns[6].visible"
-          ></el-table-column>
+          >
+          <template slot-scope="scope">
+              <template v-for="item in scope.row.roleList">
+                {{ item.roleName }}
+                <br />
+              </template>
+            </template></el-table-column>
           <el-table-column
             prop="planCycle"
             label="检查周期"
@@ -253,7 +236,7 @@
           >
             <template slot-scope="r"
               >{{
-                getLabel(dict.type.resumption_plan_cycle, `${r.row.planCycle}`)
+                getLabel(dict.type.check_cycle, `${r.row.planCycle}`)
               }}
             </template>
           </el-table-column>
@@ -265,14 +248,14 @@
           ></el-table-column>
 
           <el-table-column
-            prop="planExec"
+            prop="planStatus"
             label="状态"
             width="80px"
             v-if="columns[6].visible"
           >
             <template slot-scope="r"
               >{{
-                getLabel(dict.type.resumption_plan_exec, `${r.row.planExec}`)
+                getLabel(dict.type.check_status, `${r.row.planStatus}`)
               }}
             </template>
           </el-table-column>
@@ -284,19 +267,16 @@
           ></el-table-column>
 
           <el-table-column
-            prop="planStatus"
+            prop="modifiedTime"
             label="修改时间"
             width="80px"
             v-if="columns[6].visible"
           >
-            <template slot-scope="r"
-              >{{
-                getLabel(
-                  dict.type.resumption_plan_status,
-                  `${r.row.planStatus}`
-                )
-              }}
+
+          <template slot-scope="scope">
+              <span>{{ formatTime(scope.row.modifiedTime,"YYYY-MM-DD") }}</span>
             </template>
+           
           </el-table-column>
 
           <el-table-column label="操作">
@@ -353,7 +333,7 @@ import DialogDistribute from "@/views/resumption/plan/distribute.vue";
 import OrgTree from "@/components/orgTree";
 import { mapState, mapMutations } from "vuex";
 import DialogEdit from "./dialog.edit";
-import * as api from "@/api/resumption/plan";
+import * as api from "@/api/safetycheck/plan";
 import { statusOptions, getLabel } from "@/views/commonOption";
 import { listRole } from "@/api/system/role";
 export default {
@@ -361,10 +341,7 @@ export default {
   dicts: [
     "sys_org_type",
     "rule_type",
-    "resumption_plan_type",
-    "resumption_plan_cycle",
-    "resumption_plan_status",
-    "resumption_plan_exec",
+    "check_cycle","check_status","check_type"
   ],
   components: {
     DialogEdit,
@@ -386,15 +363,20 @@ export default {
       resumptionRoles: [],
       total: 0,
       queryParams: {
-        orgId: null,
-        planType: null,
-        resumptionRole: null,
-        planCycle: null,
-        planStatus: null,
+        id: null,
         planName: null,
-        pageNum: 1,
-        pageSize: 10,
+        checkRole: null,
+        planCycle: null,
+        planCreateOrgId: null,
+        checkType: null,
+        planOfOrgId: null,
+        execOrgType: null,
+        checkOrgType:null,
+        planStatus:null,
+        pageSize:10,
+        pageNum:1,
         checkSub:false,
+        orgId:null,
         ...query,
       },
       pageData: [],
@@ -494,9 +476,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm("search");
       this.queryParams.orgId = undefined;
-      this.$refs.tree.setCurrentKey(null);
+      // this.$refs.tree.setCurrentKey(null);
       this.getList();
     },
     //单选框状态改变

src/views/core/accessPlan/index.vue

@@ -40,7 +40,7 @@
           </el-form-item>
 
           <el-form-item label="计划名称" prop="planName">
-            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable @keyup.enter.native="handleQuery" />
+            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" maxlength="50" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
 
           <el-form-item>
@@ -57,9 +57,9 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange" row-key="id"
+        <el-table v-loading="loading" :data="planList"  row-key="id"
           :tree-props="{ children: 'children' }">
-          <el-table-column type="selection" width="55" align="center" />
+       
           <el-table-column label="计划所属机构" align="center" prop="orgName" />
           <el-table-column label="计划名称" align="center" prop="planName" />
 
@@ -107,7 +107,7 @@
     <DialogCom :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="planName">
-          <el-input v-model="form.planName" placeholder="请输入计划名称" />
+          <el-input v-model="form.planName" placeholder="请输入计划名称" maxlength="50" />
         </el-form-item>
 
         <el-form-item label="调阅机构类型" prop="orgType">
@@ -172,7 +172,7 @@
 
 <script>
 import { listPlan, getPlan, delPlan, addPlan, updatePlan, distribute } from "@/api/core/accessPlan";
-import { listRole, findRoleByType, getRole } from "@/api/system/role";
+import { listRole, findRoleByType, getRole,allRole } from "@/api/system/role";
 import tableList from "@/mixins/tableList";
 import orgTree from "@/components/orgTree";
 import { deptTreeSelect } from "@/api/system/public";
@@ -228,15 +228,32 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        planName: [
+          { required: true, message: '请输入计划名称', trigger: 'change' },
+        ],
+        orgType: [
+          { required: true, message: '请选择机构类型', trigger: 'change' },
+        ],
+        planCycle: [
+          { required: true, message: '请选择调阅周期', trigger: 'change' },
+        ],
+        roleId: [
+          { required: true, message: '请选择调阅角色', trigger: 'change' },
+        ],
+        planFrequency: [
+          { required: true, message: '请选择调阅频次', trigger: 'change' },
+        ],
       }
     };
   },
   created() {
     this.getList();
-    listRole().then(response => {
-      this.roleList = response.rows;
+    // listRole().then(response => {
+    //   this.roleList = response.rows;
+    // });
+    allRole().then(response => {
+      this.roleList = response.data;
     });
-
   },
   methods: {
     /** 查询监控调阅计划列表 */

src/views/core/task/index.vue

@@ -12,7 +12,7 @@
       <el-form-item label="调阅周期" prop="cycle">
         <el-select v-model="queryParams.cycle" placeholder="请选择周期" clearable>
           <el-option
-            v-for="dict in dict.type.plan_cycle"
+            v-for="dict in dict.type.sys_access_cycle"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -64,7 +64,7 @@
 
     <el-row :gutter="10" class="mb8">
 
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -73,18 +73,23 @@
           @click="handleExport"
           v-hasPermi="['core:task:export']"
         >导出</el-button>
-      </el-col>
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="taskList" >
+
       <el-table-column label="序号" type="index" align="center">
         <template slot-scope="scope">
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
       <el-table-column label="任务名称" align="center" prop="taskName" />
+      <el-table-column label="调阅周期" align="center" prop="cycle" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_access_cycle" :value="scope.row.cycle" />
+        </template>
+      </el-table-column>>
       <el-table-column label="开始时间" align="center" prop="planStartTime" width="180">
 <!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d}') }}</span>
@@ -101,6 +106,7 @@
         </template>
       </el-table-column>
       <el-table-column label="调阅机构" align="center" prop="orgName" />
+
       <el-table-column label="调阅角色" align="center" prop="roleName" />
 
       <el-table-column label="调阅开始时间" align="center" prop="startTime" width="180">
@@ -149,7 +155,7 @@ import {listPlanRole} from "@/api/core/edu/plan";
 export default {
   components: {OrgTree,DialogInfo},
   name: "Task",
-  dicts: ['plan_cycle', 'retrieval_task_status'],
+  dicts: ['sys_access_cycle', 'retrieval_task_status'],
   data() {
     return {
       // 遮罩层
@@ -263,12 +269,13 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      this.queryParams.dateRange = [];
+      //this.queryParams.dateRange = [];
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.dateRange = [];
       this.handleQuery();
     },
     // 多选框选中数据

src/views/core/weather/index.vue

@@ -0,0 +1,151 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--机构数据-->
+      <el-col :span="20" :xs="24">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
+
+      <el-form-item label="预警标题" prop="taskName">
+        <el-input
+          v-model="queryParams.alarmTitle"
+          placeholder="请输入预警标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="预警时间" prop="planStartTime">
+        <el-date-picker
+          v-model="queryParams.alarmDates"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        ></el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="预警区域" prop="roleId">
+        <el-select v-model="queryParams.code" placeholder="请选择">
+          <el-option v-for="item in areaList" :key="item.key" :label="item.value" :value="item.key"></el-option>
+        </el-select>
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="weatherList">
+
+      <el-table-column label="预警标题" align="center" prop="alarmTitle" />
+      <el-table-column label="预警城市" align="center" prop="city" />
+      <el-table-column label="预警区域" align="center" prop="area"/>
+      <el-table-column label="预警等级" align="center"  prop="alarmLevel"></el-table-column>
+      <el-table-column label="预警类型" align="center"  prop="alarmType"></el-table-column>
+      <el-table-column label="预警内容" align="center"  prop="alarmContent"></el-table-column>
+      <el-table-column label="预警发布时间" align="center"  prop="alarmTime">
+        <template slot-scope="r">{{ $moment(r.row.alarmTime).format(
+          "YYYY-MM-DD HH:mm:ss"
+        ) }}</template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { findWeatherList,findAreaList} from "@/api/core/weather";
+
+export default {
+  components: {},
+  name: "Weather",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 监控调阅任务表格数据
+      weatherList: [],
+      areaList:[],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        alarmTitle: null,
+        alarmDates:[],
+        code:null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getAreaList();
+  },
+  methods: {
+    /** 查询监控调阅任务列表 */
+    getList() {
+      this.loading = true;
+      findWeatherList(this.queryParams).then(response => {
+        this.weatherList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getAreaList() {
+      findAreaList({}).then(response => {
+        this.areaList = response.data;
+      });
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.alarmDates = [];
+      this.handleQuery();
+    },
+
+  }
+};
+</script>

src/views/information/configuration/index.vue

@@ -0,0 +1,237 @@
+<template>
+  <div class="container" style="min-height: 100%; padding-bottom: 100px;">
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-border">
+      <div style="display:inline-block;width:100%;">
+        <el-row>
+          <div style="background: grey">
+            每日履职
+          </div>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="营业前提醒分钟数" prop="workType">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="营业中提醒分钟数" prop="educationType">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="营业后提醒分钟数" prop="professionalQualifications">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="全天提醒分钟数" prop="professionalQualifications">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </div>
+      <div style="display:inline-block;width:100%;">
+        <el-row>
+          <div style="background: grey">
+            每周履职
+          </div>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="提前提醒天数" prop="educationType">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </div>
+      <div style="display:inline-block;width:100%;">
+        <el-row>
+          <div style="background: grey">
+            每月履职
+          </div>
+
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="提前提醒天数" prop="educationType">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+      <div style="display:inline-block;width:100%;">
+        <el-row>
+          <div style="background: grey">
+            每季履职
+          </div>
+
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="提前提醒天数" prop="educationType">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+      <div style="display:inline-block;width:100%;">
+        <el-row>
+          <div style="background: grey">
+            半年履职
+          </div>
+
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="提前提醒天数" prop="educationType">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+      <div style="display:inline-block;width:100%;">
+        <el-row>
+          <div style="background: grey">
+            每年履职
+          </div>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="提前提醒天数" prop="educationType">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+    </el-form>
+    <div style="margin-top: 50px; margin-left: 42%">
+      <el-button type="primary" @click="saveExtend" size="small">提交</el-button>
+      <el-button type="primary" @click="nosaveExtend" size="small">取消</el-button>
+    </div>
+  </div>
+  
+</template>
+
+<script>
+export default {
+  props: [],
+  components: {},
+  data() {
+    return {
+      num: 1,
+
+      formData:{
+        deptId: null,
+        duties: null,
+        workType: null,
+        isFullTime: "1",
+        highestEducation: null,
+        educationType: null,
+        certificateWork: "1",
+        professionalQualifications: null,
+        certificateFailReason: null,
+        workTime: null,
+        entryTime: null,
+        bornTime: null,
+        responsibilitiesLeaderName: null,
+        responsibilitiesLeaderDuties: null,
+        qualificationCertificateUrl: null,
+        userId: null,
+      },
+      rules: {
+        name: [
+          {
+            required: true,
+            message: "请输入活动名称",
+            trigger: "blur",
+          },
+          {
+            min: 3,
+            max: 5,
+            message: "长度在 3 到 5 个字符",
+            trigger: "blur",
+          },
+        ],
+        region: [
+          {
+            required: true,
+            message: "请选择活动区域",
+            trigger: "change",
+          },
+        ],
+        date1: [
+          {
+            type: "date",
+            required: true,
+            message: "请选择日期",
+            trigger: "change",
+          },
+        ],
+        date2: [
+          {
+            type: "date",
+            required: true,
+            message: "请选择时间",
+            trigger: "change",
+          },
+        ],
+        type: [
+          {
+            type: "array",
+            required: true,
+            message: "请至少选择一个活动性质",
+            trigger: "change",
+          },
+        ],
+        resource: [
+          {
+            required: true,
+            message: "请选择活动资源",
+            trigger: "change",
+          },
+        ],
+        desc: [
+          {
+            required: true,
+            message: "请填写活动形式",
+            trigger: "blur",
+          },
+        ],
+      },
+    }
+  },
+  watch: {},
+  computed: {},
+  beforeCreate() { },
+  created() { },
+  beforeMount() { },
+  mounted() { },
+  beforeUpdate() { },
+  updated() { },
+  destroyed() { },
+  methods: {
+    request() { },
+    handleChange(value) { },
+    hello() {
+      alert("来自预设逻辑代码的问候")
+    },
+    saveExtend(){
+     // this.formData.userId = this.$route.params.userId;
+     
+      this.$refs['form'].validate((valid) => {
+          if (valid) {
+            extendUserInformation(this.formData).then(res=>{
+                this.$message.success('保存成功！')
+                this.$router.go(-1)
+            })
+          }
+        });
+
+    },
+
+
+  },
+  fillter: {},
+}
+</script>
+
+<style scoped>
+.container {}
+
+.demo-border {
+  border: 1px grey dashed;
+  min-height: 1rem;
+  border-radius: 5px;
+}
+</style>

src/views/question/list/dialog.vue

@@ -0,0 +1,130 @@
+<template>
+  <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="orgId">
+        <el-input v-model="form.orgId" placeholder="请输入隐患所属机构" />
+      </el-form-item>
+      <el-form-item label="隐患所属机构名称" prop="orgName">
+        <el-input v-model="form.orgName" placeholder="请输入隐患所属机构名称" />
+      </el-form-item>
+      <el-form-item label="隐患所属机构path" prop="orgPath">
+        <el-input v-model="form.orgPath" placeholder="请输入隐患所属机构path" />
+      </el-form-item>
+      <el-form-item label="来源任务id" prop="srcTaskId">
+        <el-input v-model="form.srcTaskId" placeholder="请输入来源任务id" />
+      </el-form-item>
+      <el-form-item label="来源任务名称" prop="srcTaskName">
+        <el-input v-model="form.srcTaskName" placeholder="请输入来源任务名称" />
+      </el-form-item>
+      <el-form-item label="检查内容">
+        <editor v-model="form.checkContent" :min-height="192" />
+      </el-form-item>
+      <el-form-item label="隐患描述" prop="questionDesc">
+        <el-input v-model="form.questionDesc" placeholder="请输入隐患描述" />
+      </el-form-item>
+      <el-form-item label="提出人id" prop="submitorId">
+        <el-input v-model="form.submitorId" placeholder="请输入提出人id" />
+      </el-form-item>
+      <el-form-item label="提出人名称" prop="submitorName">
+        <el-input v-model="form.submitorName" placeholder="请输入提出人名称" />
+      </el-form-item>
+      <el-form-item label="发现时间" prop="submitTime">
+        <el-date-picker
+          clearable
+          v-model="form.submitTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择发现时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  methods:{
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        orgId: null,
+        orgName: null,
+        orgPath: null,
+        srcType: null,
+        srcTaskId: null,
+        srcTaskName: null,
+        checkContent: null,
+        questionDesc: null,
+        submitorId: null,
+        submitorName: null,
+        submitTime: null,
+        confirmStatus: null,
+        reformStatus: null,
+        createTime: null,
+        updateTime: null,
+        createBy: null,
+        updateBy: null
+      };
+      this.resetForm("form");
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateQuestion(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addQuestion(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加隐患问题清单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getQuestion(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改隐患问题清单";
+      });
+    },
+  }
+};
+</script>

src/views/question/list/index.vue

@@ -0,0 +1,256 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="4" :xs="24">
+        <org-tree
+          v-model="queryParams.orgId"
+          @defaultKey="getDefaultKey"
+          @checkChange="checkChange"
+          @click="clickTreeNode"
+        ></org-tree>
+      </el-col>
+      <el-col :span="20" :xs="24">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
+          <el-form-item label="隐患所属机构" prop="orgId">
+            <el-input
+              v-model="queryParams.orgId"
+              placeholder="请输入隐患所属机构"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="发现时间" prop="submitTime">
+            <el-date-picker
+              clearable
+              v-model="queryParams.submitTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择发现时间"
+            >
+            </el-date-picker>
+          </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
+            >
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['system:question:export']"
+              >导出</el-button
+            >
+          </el-col>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
+        </el-row>
+
+        <el-table
+          v-loading="loading"
+          :data="questionList"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="${comment}" align="center" prop="id" />
+          <el-table-column
+            label="隐患所属机构名称"
+            align="center"
+            prop="orgName"
+          />
+          <el-table-column
+            label="来源任务名称"
+            align="center"
+            prop="srcTaskName"
+          />
+          <el-table-column
+            label="检查内容"
+            align="center"
+            prop="checkContent"
+          />
+          <el-table-column
+            label="隐患描述"
+            align="center"
+            prop="questionDesc"
+          />
+          <el-table-column
+            label="提出人名称"
+            align="center"
+            prop="submitorName"
+          />
+          <el-table-column
+            label="发现时间"
+            align="center"
+            prop="submitTime"
+            width="180"
+          >
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.submitTime, "{y}-{m}-{d}") }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="确认状态。0未确认，1提出异议，2已确认，3已关闭"
+            align="center"
+            prop="confirmStatus"
+          />
+          <el-table-column
+            label="整改状态。5未整改，6已整改"
+            align="center"
+            prop="reformStatus"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:question:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:question:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import {
+  listQuestion,
+  getQuestion,
+  delQuestion,
+  addQuestion,
+  updateQuestion,
+} from "@/api/question/list.js";
+
+export default {
+  name: "Question",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 隐患问题清单表格数据
+      questionList: [],
+
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orgId: null,
+        submitTime: null,
+        confirmStatus: null,
+        reformStatus: null,
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询隐患问题清单列表 */
+    getList() {
+      this.loading = true;
+      listQuestion(this.queryParams).then((response) => {
+        this.questionList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除隐患问题清单编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delQuestion(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "system/question/export",
+        {
+          ...this.queryParams,
+        },
+        `question_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

src/views/resumption/plan/distribute.vue

@@ -1,6 +1,6 @@
 <template>
   <DialogCom
-    title="选择下发机构状态"
+    title="选择下发机构的计划状态"
     :visible.sync="isShow"
     class="g-dialog-select-safe-check"
     :close-on-click-modal="false"

src/views/resumption/plan/index.vue

@@ -467,9 +467,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm("search");
       this.queryParams.orgId = undefined;
-      this.$refs.tree.setCurrentKey(null);
+      // this.$refs.tree.setCurrentKey(null);
       this.getList();
     },
     //单选框状态改变

src/views/tool/gen/index.vue

@@ -262,6 +262,7 @@ export default {
         this.$modal.msgError("请选择要生成的数据");
         return;
       }
+      
       if(row.genType === "1") {
         genCode(row.tableName).then(response => {
           this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath);