Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-ui into develop

src/views/ledger/room/index.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="楼层id" prop="floorId">
+      <el-form-item label="所属区域" prop="deptId">
+        <treeselect
+          v-model="queryParams.deptId"
+          :options="deptOptions"
+          :show-count="true"
+          placeholder="请选择所属区域"
+          style="width: 250px"
+        />
+      </el-form-item>
+      <el-form-item label="项目名称" prop="projectName">
         <el-input
-          v-model="queryParams.floorName"
-          placeholder="请输入楼层"
+          v-model="queryParams.projectName"
+          placeholder="请输入项目名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="房间名称" prop="name">
+      <el-form-item label="楼宇名称" prop="buildingName">
         <el-input
-          v-model="queryParams.name"
-          placeholder="请输入房间名称"
+          v-model="queryParams.buildingName"
+          placeholder="请输入楼宇名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="房间编号" prop="number">
+      <el-form-item label="楼层名称" prop="floorName">
         <el-input
-          v-model="queryParams.number"
-          placeholder="请输入房间编号"
+          v-model="queryParams.floorName"
+          placeholder="请输入楼层名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="房间面积" prop="area">
+      <el-form-item label="房间名称" prop="name">
         <el-input
-          v-model="queryParams.area"
-          placeholder="请输入房间面积"
+          v-model="queryParams.name"
+          placeholder="请输入房间名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="房屋类型" prop="roomType">
+        <el-select
+          v-model="queryParams.roomType"
+          placeholder="请选择房屋类型"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.risk_plan_room_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </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>
@@ -93,11 +130,12 @@
              {{ (queryParams.pageNum - 1) * queryParams.pageSize + $index + 1 }}
           </template>
       </el-table-column>
-      </el-table-column>
-      <el-table-column label="楼层" align="center" prop="floorName" />
+      <el-table-column label="所属区域" align="center" prop="deptName" />
+      <el-table-column label="项目名称" align="center" prop="projectName" />
+      <el-table-column label="楼宇名称" align="center" prop="buildingName" />
+      <el-table-column label="楼层名称" align="center" prop="floorName" />
       <el-table-column label="房间名称" align="center" prop="name" />
-      <el-table-column label="房间编号" align="center" prop="number" />
-      <el-table-column label="房间面积" align="center" prop="area" />
+      <el-table-column label="房间类型" align="center" prop="roomType" />
      <el-table-column label="状态" align="center" prop="status">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
@@ -140,12 +178,6 @@
         <el-form-item label="房间名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入房间名称" />
         </el-form-item>
-        <el-form-item label="房间编号" prop="number">
-          <el-input v-model="form.number" placeholder="请输入房间编号" />
-        </el-form-item>
-        <el-form-item label="房间面积" prop="area">
-          <el-input v-model="form.area" placeholder="请输入房间面积" />
-        </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态">
             <el-option
@@ -167,11 +199,17 @@
 
 <script>
 import { listRoom, getRoom, delRoom, addRoom, updateRoom } from "@/api/ledger/room";
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 
 export default {
   name: "Room",
-  dicts: ['sys_normal_disable', 'data_source'],
+  dicts: ['sys_normal_disable', 'data_source','risk_plan_room_type'],
+  components: {
+    Treeselect,
+  },
   data() {
     return {
       // 遮罩层
@@ -196,23 +234,33 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        floorId: null,
-        name: null,
-        number: null,
-        area: null,
+        deptId: null,
+        projectName:null,
+        buildingName:null,
+        floorName:null,
+        name:null,
+        roomType:null,
         status: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      deptOptions: []
     };
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then((response) => {
+        this.deptOptions = response.data;
+      });
+    },
     /** 查询基础数据-楼层列表 */
     getList() {
       this.loading = true;
@@ -231,16 +279,13 @@ export default {
     reset() {
       this.form = {
         id: null,
-        floorId: null,
-        name: null,
-        number: null,
-        area: null,
+        deptId: null,
+        projectName:null,
+        buildingName:null,
+        floorName:null,
+        name:null,
+        roomType:null,
         status: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null
       };
       this.resetForm("form");
     },
@@ -308,7 +353,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/room/export', {
+      this.download('system/ledger/room/export', {
         ...this.queryParams
       }, `room_${new Date().getTime()}.xlsx`)
     }

src/views/risk/existing/index.vue

@@ -6,12 +6,74 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="110px"
+      label-width="90px"
     >
-      <el-form-item label="危险源名称" prop="hazardSourceName">
+      <el-form-item label="风险名称" prop="name">
         <el-input
-          v-model="queryParams.hazardSourceName"
-          placeholder="请输入危险源名称"
+          v-model="queryParams.name"
+          placeholder="请输入风险名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="楼宇名称" prop="buildingName">
+        <el-input
+          v-model="queryParams.buildingName"
+          placeholder="请输入楼宇名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="楼层名称" prop="floorName">
+        <el-input
+          v-model="queryParams.floorName"
+          placeholder="请输入楼层名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="房间名称" prop="roomName">
+        <el-input
+          v-model="queryParams.roomName"
+          placeholder="请输入房间名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="风险等级" prop="level">
+        <el-select
+          v-model="queryParams.level"
+          placeholder="请选择风险等级"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.risk_plan_level"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="风险因素" prop="factor">
+        <el-input
+          v-model="queryParams.factor"
+          placeholder="请输入风险因素"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="准事故类型" prop="type">
+        <el-input
+          v-model="queryParams.type"
+          placeholder="请输入准事故类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="存在部位" prop="presenceLocation">
+        <el-input
+          v-model="queryParams.presenceLocation"
+          placeholder="请输入存在部位"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -73,7 +135,6 @@
       </el-table-column>
 
       <el-table-column label="所属楼层" align="center" prop="floorName" />
-
       <el-table-column label="所属房间" align="center" prop="roomName" />
       <el-table-column label="风险等级（系数）" align="center" prop="level" />
       <el-table-column label="风险因素" align="center" prop="factor">
@@ -159,6 +220,7 @@ import { listList } from "@/api/risk/existing";
 
 export default {
   name: "inherent",
+  dicts: ["risk_plan_level"],
   data() {
     return {
       // 遮罩层
@@ -183,25 +245,14 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userId: null,
-        roomId: null,
-        planId: null,
         name: null,
-        pointType: null,
-        specialEquipment: null,
+        buildingName: null,
+        floorName: null,
+        roomName: null,
+        level: null,
         factor: null,
         type: null,
-        level: null,
         presenceLocation: null,
-        measuresProject: null,
-        measuresAdministration: null,
-        measuresDeptName: null,
-        measuresUserName: null,
-        measuresAdministrationFileIds: null,
-        hazardSourceName: null,
-        majorHazardSource: null,
-        majorHazardSourceDescription: null,
-        measuresEmergency: null,
       },
       // 表单参数
       form: {},
@@ -230,14 +281,11 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: null,
-        userId: null,
-        roomId: null,
-        planId: null,
         name: null,
-        pointType: null,
-        specialEquipment: null,
-        safetyWarningSigns: null,
+        buildingName: null,
+        floorName: null,
+        roomName: null,
+        level: null,
         factor: null,
         type: null,
         level: null,

src/views/risk/plan/index.vue

@@ -4,42 +4,26 @@
       <el-form-item label="任务名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="任务编号" prop="no">
-        <el-input v-model="queryParams.no" placeholder="请输入任务编号" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="所属区域" prop="createDeptId">
+        <treeselect
+          v-model="queryParams.createDeptId"
+          :options="deptOptions"
+          :show-count="true"
+          placeholder="请选择所属区域"
+          style="width: 250px"
+        />
       </el-form-item>
-      <el-form-item label="项目名称" prop="projectId">
-        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="楼栋名称" prop="buildingIds">
-        <el-input v-model="queryParams.buildingIds" placeholder="请输入楼栋ids" clearable
+      <el-form-item label="创建人名称" prop="createUserName">
+        <el-input v-model="queryParams.createUserName" placeholder="请输入创建人员名称" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="创建人员" prop="createUserId">
-        <el-input v-model="queryParams.createUserId" placeholder="请输入创建人员id" clearable
+      <el-form-item label="负责人名称" prop="leaderUserName">
+        <el-input v-model="queryParams.leaderUserName" placeholder="请输入负责人名称" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="创建单位" prop="createDeptId">
-        <el-input v-model="queryParams.createDeptId" placeholder="请输入创建单位" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="负责人" prop="leaderUserId">
-        <el-input v-model="queryParams.leaderUserId" placeholder="请输入负责人id" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="执行人员" prop="workUserIds">
-        <el-input v-model="queryParams.workUserIds" placeholder="请输入执行人员ids" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
-        <el-date-picker clearable v-model="queryParams.endTime" 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>
@@ -236,6 +220,7 @@
   import {
     getUserProfile
   } from "@/api/system/user";
+  
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -281,16 +266,11 @@
           pageNum: 1,
           pageSize: 10,
           name: null,
-          no: null,
-          projectId: null,
-          buildingIds: null,
-          createUserId: null,
           createDeptId: null,
-          leaderUserId: null,
-          workUserIds: null,
-          startTime: null,
-          endTime: null,
-          status: null,
+          projectName: null,
+          createUserName: null,
+          leaderUserName: null,
+          workUserName: null,
         },
         // 表单参数
         form: {
@@ -488,21 +468,11 @@
         this.form = {
           id: null,
           name: null,
-          no: null,
-          projectId: null,
-          buildingIds: [],
-          createUserId: null,
           createDeptId: null,
-          leaderUserId: null,
-          workUserIds: [],
-          startTime: null,
-          endTime: null,
-          status: null,
-          delFlag: null,
-          createBy: null,
-          createTime: null,
-          updateBy: null,
-          updateTime: null
+          projectName: null,
+          createUserName: null,
+          leaderUserName: null,
+          workUserName: null,
         };
         this.resetForm("form");
       },

src/views/risk/plan/ledger.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="任务名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="所属区域" prop="createDeptId">
+        <treeselect
+          v-model="queryParams.createDeptId"
+          :options="deptOptions"
+          :show-count="true"
+          placeholder="请选择所属区域"
+          style="width: 250px"
+        />
+      </el-form-item>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="创建人名称" prop="createUserName">
+        <el-input v-model="queryParams.createUserName" placeholder="请输入创建人员名称" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="负责人名称" prop="leaderUserName">
+        <el-input v-model="queryParams.leaderUserName" placeholder="请输入负责人名称" clearable
+          @keyup.enter.native="handleQuery" />
+      </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>
@@ -17,7 +37,6 @@
         </template>
       </el-table-column>
       <el-table-column label="任务名称" align="left" prop="name"  width="220px"/>
-      <!-- <el-table-column label="任务编号" align="center" prop="no" /> -->
       <el-table-column label="项目名称" align="left" prop="projectName" width="220px"/>
       <el-table-column label="楼栋名称" align="left" prop="buildingNames" width="220px">
       <template slot-scope="scope">
@@ -80,8 +99,15 @@
     updatePlan
   } from "@/api/risk/plan";
 
+  import Treeselect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+  import { deptTreeSelect } from "@/api/system/user";
   export default {
     name: "Plan",
+  components: {
+    Treeselect,
+  },
     data() {
       return {
         // 遮罩层
@@ -106,29 +132,33 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10,
-          name: null,
-          no: null,
           isLedger:"ledger",
-          projectId: null,
-          buildingIds: null,
-          createUserId: null,
+          name: null,
+          createDeptId: null,
+          projectName: null,
+          createUserName: null,
+          leaderUserName: null,
+          workUserName: null,
           createDeptId: null,
-          leaderUserId: null,
-          workUserIds: null,
-          startTime: null,
-          endTime: null,
-          status: null,
         },
         // 表单参数
         form: {},
         // 表单校验
         rules: {},
+        deptOptions: []
       };
     },
     created() {
       this.getList();
+      this.getDeptTree();
     },
     methods: {
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then((response) => {
+        this.deptOptions = response.data;
+      });
+    },
       /** 查询风险计划列表 */
       getList() {
         this.loading = true;
@@ -147,22 +177,14 @@
       reset() {
         this.form = {
           id: null,
+          isLedger:"ledger",
           name: null,
-          no: null,
-          projectId: null,
-          buildingIds: null,
-          createUserId: null,
           createDeptId: null,
-          leaderUserId: null,
-          workUserIds: null,
-          startTime: null,
-          endTime: null,
-          status: null,
-          delFlag: null,
-          createBy: null,
-          createTime: null,
-          updateBy: null,
-          updateTime: null,
+          projectName: null,
+          createUserName: null,
+          leaderUserName: null,
+          workUserName: null,
+          createDeptId: null,
         };
         this.resetForm("form");
       },