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

src/api/risk/existing.js

@@ -3,42 +3,8 @@ import request from '@/utils/request'
 // 查询现有风险清单库列表
 export function listList(query) {
   return request({
-    url: '/system/risk/existing/list/list',
+    url: '/system/risk/inherent/list',
     method: 'get',
     params: query
   })
 }
-
-// 查询现有风险清单库详细
-export function getList(id) {
-  return request({
-    url: '/system/risk/existing/list' + id,
-    method: 'get'
-  })
-}
-
-// 新增现有风险清单库
-export function addList(data) {
-  return request({
-    url: '/system/risk/existing/list',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改现有风险清单库
-export function updateList(data) {
-  return request({
-    url: '/system/risk/existing/list',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除现有风险清单库
-export function delList(id) {
-  return request({
-    url: '/system/risk/existing/list/' + id,
-    method: 'delete'
-  })
-}

src/api/risk/inherent.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询固有风险清单库列表
 export function listInherent(query) {
   return request({
-    url: 'system/risk/inherent/list',
+    url: 'system/risk/inherentDB/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listInherent(query) {
 // 查询固有风险清单库详细
 export function getInherent(id) {
   return request({
-    url: 'system/risk/inherent/' + id,
+    url: 'system/risk/inherentDB/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getInherent(id) {
 // 新增固有风险清单库
 export function addInherent(data) {
   return request({
-    url: 'system/risk/inherent',
+    url: 'system/risk/inherentDB',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addInherent(data) {
 // 修改固有风险清单库
 export function updateInherent(data) {
   return request({
-    url: 'system/risk/inherent',
+    url: 'system/risk/inherentDB',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateInherent(data) {
 // 删除固有风险清单库
 export function delInherent(id) {
   return request({
-    url: 'system/risk/inherent/' + id,
+    url: 'system/risk/inherentDB/' + id,
     method: 'delete'
   })
 }

src/views/home.vue

@@ -13,7 +13,7 @@
     export default {
         data(){
             return{
-                url:[require('@/assets/home/1.png'),require('../assets/home/2.png'),require('../assets/home/3.png'),require('@/assets/home/4.png')]
+                url:[require('@/assets/home/1.png'),require('../assets/home/2.png'),require('../assets/home/4.png'),require('@/assets/home/3.png')]
             }
         }
     }

src/views/ledger/building/index.vue

@@ -9,6 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      
       <el-form-item label="楼宇名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -17,25 +18,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="组织机构" prop="deptName">
+      <el-form-item label="所属区域" prop="deptId">
         <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入组织机构"
+          v-model="queryParams.deptId"
+          placeholder="请输入所属区域"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="楼层数" prop="floor">
+      <el-form-item label="用途" prop="useto">
         <el-input
-          v-model="queryParams.floor"
-          placeholder="请输入楼层"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用途" prop="use">
-        <el-input
-          v-model="queryParams.use"
+          v-model="queryParams.useto"
           placeholder="请输入用途"
           clearable
           @keyup.enter.native="handleQuery"
@@ -49,21 +42,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="资产面积" prop="area">
-        <el-input
-          v-model="queryParams.area"
-          placeholder="请输入资产面积"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="详细地址" prop="address">
-        <el-input
-          v-model="queryParams.address"
-          placeholder="请输入详细地址"
-          clearable
-          @keyup.enter.native="handleQuery"
+      <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>
@@ -127,11 +114,10 @@
       <el-table-column label="项目名称" align="center" prop="projectName" />
       <el-table-column label="楼宇名称" align="center" prop="name" />
       <el-table-column label="资产类型" align="center" prop="type" />
-      <el-table-column label="组织机构" align="center" prop="deptName" />
+      <el-table-column label="所属区域" align="center" prop="deptName" />
       <el-table-column label="楼层数(层)" align="center" prop="floor" />
       <el-table-column label="用途" align="center" prop="useto" />
       <el-table-column label="所在城市" align="center" prop="city" />
-      <el-table-column label="资产面积(㎡)" align="center" prop="area" />
       <el-table-column label="详细地址" align="center" prop="address" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -175,20 +161,17 @@
         <el-form-item label="楼宇名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入楼宇名称" />
         </el-form-item>
-        <el-form-item label="组织机构名称" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入组织机构名称" />
-        </el-form-item>
-        <el-form-item label="楼层数(层)" prop="floor">
-          <el-input v-model="form.floor" placeholder="请输入楼层" />
+        <el-form-item label="资产类型" prop="type">
+          <el-input v-model="form.type" placeholder="请输入资产类型" />
         </el-form-item>
-        <el-form-item label="用途" prop="use">
-          <el-input v-model="form.useto" placeholder="请输入用途" />
+        <el-form-item label="地上楼层数(层)" prop="groundFloor">
+          <el-input v-model="form.groundFloor" placeholder="请输入地上楼层数" />
         </el-form-item>
-        <el-form-item label="所在城市" prop="city">
-          <el-input v-model="form.city" placeholder="请输入所在城市" />
+        <el-form-item label="地下楼层数(层)" prop="undergroundFloor">
+          <el-input v-model="form.undergroundFloor" placeholder="请输入地下楼层数" />
         </el-form-item>
-        <el-form-item label="资产面积" prop="area">
-          <el-input v-model="form.area" placeholder="请输入资产面积" />
+        <el-form-item label="用途" prop="useto">
+          <el-input v-model="form.useto" placeholder="请输入用途" />
         </el-form-item>
         <el-form-item label="详细地址" prop="address">
           <el-input v-model="form.address" placeholder="请输入详细地址" />
@@ -248,7 +231,7 @@ export default {
         type: null,
         deptId: null,
         floor: null,
-        use: null,
+        useto: null,
         city: null,
         area: null,
         address: null,
@@ -288,7 +271,7 @@ export default {
         type: null,
         deptId: null,
         floor: null,
-        use: null,
+        useto: null,
         city: null,
         area: null,
         address: null,
@@ -365,7 +348,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/building/export', {
+      this.download('/system/ledger/building/export', {
         ...this.queryParams
       }, `building_${new Date().getTime()}.xlsx`)
     }

src/views/ledger/floor/index.vue

@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="楼宇名称" prop="buildingName">
         <el-input
-          v-model="queryParams.buildingId"
+          v-model="queryParams.buildingName"
           placeholder="请输入楼宇名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -17,13 +17,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="房间数量" prop="roomNumber">
-        <el-input
-          v-model="queryParams.roomNumber"
-          placeholder="请输入房间数量"
-          clearable
-          @keyup.enter.native="handleQuery"
+      <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>
@@ -79,11 +81,14 @@
 
     <el-table v-loading="loading" :data="floorList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="序号" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="楼宇名称" align="center" prop="buildingName" />
       <el-table-column label="楼层名称" align="center" prop="name" />
       <el-table-column label="楼层属性" align="center" prop="type" />
-      <el-table-column label="房间数量(间)" align="center" prop="roomNumber" />
      <el-table-column label="状态" align="center" prop="status">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
@@ -126,8 +131,8 @@
         <el-form-item label="楼层名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入楼层名称" />
         </el-form-item>
-        <el-form-item label="房间数量" prop="roomNumber">
-          <el-input v-model="form.roomNumber" placeholder="请输入房间数量" />
+        <el-form-item label="楼层属性" prop="type">
+          <el-input v-model="form.type" placeholder="请输入楼层属性" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态">
@@ -291,7 +296,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/floor/export', {
+      this.download('/system/ledger/floor/export', {
         ...this.queryParams
       }, `floor_${new Date().getTime()}.xlsx`)
     }

src/views/ledger/project/index.vue

@@ -9,10 +9,29 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="组织机构" prop="deptId">
+      <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="business">
+        <el-select v-model="queryParams.business" placeholder="请选择项目业态" clearable>
+          <el-option
+            v-for="dict in dict.type.risk_project_business"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="所属区域" prop="deptId">
         <el-input
           v-model="queryParams.deptId"
-          placeholder="请输入组织机构"
+          placeholder="请输入所属区域"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -33,16 +52,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="关联/自建" prop="source">
-        <el-select v-model="queryParams.source" placeholder="请选择关联/自建" clearable>
-          <el-option
-            v-for="dict in dict.type.data_source"
-            :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
@@ -114,14 +123,10 @@
      </el-table-column>
       <el-table-column label="项目名称" align="center" prop="name" />
       <el-table-column label="项目类型" align="center" prop="type" />
-      <el-table-column label="组织机构" align="center" prop="deptName" />
+      <el-table-column label="项目业态" align="center" prop="business" />
+      <el-table-column label="所属区域" align="center" prop="deptName" />
       <el-table-column label="所在城市" align="center" prop="city" />
       <el-table-column label="详细地址" align="center" prop="address" />
-      <el-table-column label="关联/自建" align="center" prop="source">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.data_source" :value="scope.row.source"/>
-        </template>
-      </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
@@ -161,25 +166,28 @@
         <el-form-item label="项目名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入项目名称" />
         </el-form-item>
-        <el-form-item label="归属部门" prop="deptId">
-          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
-        </el-form-item>
-        <el-form-item label="所在城市" prop="city">
-          <el-input v-model="form.city" placeholder="请输入所在城市" />
-        </el-form-item>
-        <el-form-item label="详细地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入详细地址" />
+        <el-form-item label="项目类型" prop="type">
+          <el-input v-model="form.type" placeholder="请输入项目类型" />
         </el-form-item>
-        <el-form-item label="关联/自建" prop="source">
-          <el-select v-model="form.source" placeholder="请选择关联/自建">
+        <el-form-item label="项目业态" prop="business">
+          <el-select v-model="form.business" placeholder="请选择项目业态">
             <el-option
-              v-for="dict in dict.type.data_source"
+              v-for="dict in dict.type.risk_project_business"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="所属区域" prop="deptId">
+          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择所属区域" />
+        </el-form-item>
+        <el-form-item label="所在城市" prop="city">
+          <el-input v-model="form.city" placeholder="请输入所在城市" />
+        </el-form-item>
+        <el-form-item label="详细地址" prop="address">
+          <el-input v-model="form.address" placeholder="请输入详细地址" />
+        </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态">
             <el-option
@@ -208,7 +216,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Project",
-  dicts: ['sys_normal_disable', 'data_source'],
+  dicts: ['sys_normal_disable', 'data_source', 'risk_project_business'],
   components: { Treeselect },
   data() {
     return {
@@ -375,7 +383,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('ledger/project/project/export', {
+      this.download('system/ledger/project/export', {
         ...this.queryParams
       }, `project_${new Date().getTime()}.xlsx`)
     }

src/views/risk/existing/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="inherentId">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
+      <el-form-item label="危险源名称" prop="hazardSourceName">
         <el-input
-          v-model="queryParams.inherentId"
-          placeholder="请输入固有风险id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="风险code" prop="code">
-        <el-input
-          v-model="queryParams.code"
-          placeholder="请输入风险code"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <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="describe">
-        <el-input
-          v-model="queryParams.describe"
-          placeholder="请输入风险描述"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="评估模型" prop="evaluationModel">
-        <el-input
-          v-model="queryParams.evaluationModel"
-          placeholder="请输入评估模型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="评估范围" prop="evaluationRange">
-        <el-input
-          v-model="queryParams.evaluationRange"
-          placeholder="请输入评估范围"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="风险等级" prop="level">
-        <el-input
-          v-model="queryParams.level"
-          placeholder="请输入风险等级"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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="measuresProjectFileIds">
-        <el-input
-          v-model="queryParams.measuresProjectFileIds"
-          placeholder="请输入工程技术措施附件"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="管理措施附件" prop="measuresAdministrationFileIds">
-        <el-input
-          v-model="queryParams.measuresAdministrationFileIds"
-          placeholder="请输入管理措施附件"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="应急处置措施附件" prop="measuresEmergencyFileIds">
-        <el-input
-          v-model="queryParams.measuresEmergencyFileIds"
-          placeholder="请输入应急处置措施附件"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="参考依据" prop="referenceBasis">
-        <el-input
-          v-model="queryParams.referenceBasis"
-          placeholder="请输入参考依据"
+          v-model="queryParams.hazardSourceName"
+          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>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:riskExisting:add']"
-        >新增</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:riskExisting: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:riskExisting:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:riskExisting:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
-    <el-table v-loading="loading" :data="listList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="inherentList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="固有风险id" align="center" prop="inherentId" />
-      <el-table-column label="风险code" align="center" prop="code" />
-      <el-table-column label="风险源名称" align="center" prop="name" />
-      <el-table-column label="风险类型" align="center" prop="type" />
-      <el-table-column label="风险描述" align="center" prop="describe" />
-      <el-table-column label="评估模型" align="center" prop="evaluationModel" />
-      <el-table-column label="评估范围" align="center" prop="evaluationRange" />
-      <el-table-column label="风险等级" align="center" prop="level" />
-      <el-table-column label="风险因素" align="center" prop="factor" />
-      <el-table-column label="工程技术措施" align="center" prop="measuresProject" />
-      <el-table-column label="工程技术措施附件" align="center" prop="measuresProjectFileIds" />
-      <el-table-column label="管理措施" align="center" prop="measuresAdministration" />
-      <el-table-column label="管理措施附件" align="center" prop="measuresAdministrationFileIds" />
-      <el-table-column label="应急处置措施" align="center" prop="measuresEmergency" />
-      <el-table-column label="应急处置措施附件" align="center" prop="measuresEmergencyFileIds" />
-      <el-table-column label="参考依据" align="center" prop="referenceBasis" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="序号" align="center">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:riskExisting:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:riskExisting:remove']"
-          >删除</el-button>
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="风险名称" align="center" prop="name" />
+              <el-table-column label="所属建筑" align="center" prop="buildingName" >
+                <template slot-scope="scope">
+                  <el-popover
+                    placement="top-start"
+                    title="所属建筑"
+                    width="200"
+                    trigger="hover"
+                    :content="scope.row.buildingName"
+                  >
+                    <span slot="reference">{{
+                      scope.row.buildingName.length > 10
+                        ? scope.row.buildingName.substring(0, 10) + "..."
+                        : scope.row.buildingName
+                    }}</span>
+                  </el-popover>
+                </template>
+              </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" >
+                <template slot-scope="scope">
+                  <el-popover
+                    placement="top-start"
+                    title="风险因素"
+                    width="200"
+                    trigger="hover"
+                    :content="scope.row.factor"
+                  >
+                    <span slot="reference">{{
+                      scope.row.factor.length > 10
+                        ? scope.row.factor.substring(0, 10) + "..."
+                        : scope.row.factor
+                    }}</span>
+                  </el-popover>
+                </template>
+              </el-table-column>
+              <el-table-column label="准事故类型" align="center" prop="type">
+                <template slot-scope="scope">
+                  <el-popover
+                    placement="top-start"
+                    title="准事故类型"
+                    width="200"
+                    trigger="hover"
+                    :content="scope.row.type"
+                  >
+                    <span slot="reference">{{
+                      scope.row.type.length > 10
+                        ? scope.row.type.substring(0, 10) + "..."
+                        : scope.row.type
+                    }}</span>
+                  </el-popover>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="存在部位"
+                align="center"
+                prop="presenceLocation"
+              > <template slot-scope="scope">
+                  <el-popover
+                    placement="top-start"
+                    title="存在部位"
+                    width="200"
+                    trigger="hover"
+                    :content="scope.row.presenceLocation"
+                  >
+                    <span slot="reference">{{
+                      scope.row.presenceLocation.length > 10
+                        ? scope.row.presenceLocation.substring(0, 10) + "..."
+                        : scope.row.presenceLocation
+                    }}</span>
+                  </el-popover>
+                </template>
+              </el-table-column>
+      
+              <el-table-column label="操作" align="center" prop="describe">
+                <template slot-scope="scope">
+                  <div>
+                    <router-link
+                      :to="'/risk/plan/inherentdata/index/' + scope.row.id"
+                      class="link-type"
+                    >
+                      <el-button size="mini" type="text" icon="el-icon-view"
+                        >详情</el-button
+                      >
+                    </router-link>
+                  </div>
                 </template>
               </el-table-column>
     </el-table>
@@ -196,71 +138,15 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改现有风险清单库对话框 -->
-    <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="固有风险id" prop="inherentId">
-          <el-input v-model="form.inherentId" placeholder="请输入固有风险id" />
-        </el-form-item>
-        <el-form-item label="风险code" prop="code">
-          <el-input v-model="form.code" placeholder="请输入风险code" />
-        </el-form-item>
-        <el-form-item label="风险源名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入风险源名称" />
-        </el-form-item>
-        <el-form-item label="风险描述" prop="describe">
-          <el-input v-model="form.describe" placeholder="请输入风险描述" />
-        </el-form-item>
-        <el-form-item label="评估模型" prop="evaluationModel">
-          <el-input v-model="form.evaluationModel" placeholder="请输入评估模型" />
-        </el-form-item>
-        <el-form-item label="评估范围" prop="evaluationRange">
-          <el-input v-model="form.evaluationRange" placeholder="请输入评估范围" />
-        </el-form-item>
-        <el-form-item label="风险等级" prop="level">
-          <el-input v-model="form.level" placeholder="请输入风险等级" />
-        </el-form-item>
-        <el-form-item label="风险因素" prop="factor">
-          <el-input v-model="form.factor" placeholder="请输入风险因素" />
-        </el-form-item>
-        <el-form-item label="工程技术措施" prop="measuresProject">
-          <el-input v-model="form.measuresProject" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="工程技术措施附件" prop="measuresProjectFileIds">
-          <el-input v-model="form.measuresProjectFileIds" placeholder="请输入工程技术措施附件" />
-        </el-form-item>
-        <el-form-item label="管理措施" prop="measuresAdministration">
-          <el-input v-model="form.measuresAdministration" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="管理措施附件" prop="measuresAdministrationFileIds">
-          <el-input v-model="form.measuresAdministrationFileIds" placeholder="请输入管理措施附件" />
-        </el-form-item>
-        <el-form-item label="应急处置措施" prop="measuresEmergency">
-          <el-input v-model="form.measuresEmergency" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="应急处置措施附件" prop="measuresEmergencyFileIds">
-          <el-input v-model="form.measuresEmergencyFileIds" placeholder="请输入应急处置措施附件" />
-        </el-form-item>
-        <el-form-item label="参考依据" prop="referenceBasis">
-          <el-input v-model="form.referenceBasis" placeholder="请输入参考依据" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </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>
+        
   </div>
 </template>
 
 <script>
-import { listList, getList, delList, addList, updateList } from "@/api/risk/existing";
+import { listList } from "@/api/risk/existing";
 
 export default {
-  name: "List",
+  name: "inherent",
   data() {
     return {
       // 遮罩层
@@ -275,8 +161,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 现有风险清单库表格数据
-      listList: [],
+      // 固有风险清单库表格数据
+      inherentList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -285,22 +171,25 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        inherentId: null,
-        code: null,
+        userId: null,
+        roomId: null,
+        planId: null,
         name: null,
+        pointType: null,
+        specialEquipment: null,
+        factor: null,
         type: null,
-        describe: null,
-        evaluationModel: null,
-        evaluationRange: null,
         level: null,
-        factor: null,
+        presenceLocation: null,
         measuresProject: null,
-        measuresProjectFileIds: null,
         measuresAdministration: null,
+        measuresDeptName: null,
+        measuresUserName: null,
         measuresAdministrationFileIds: null,
+        hazardSourceName: null,
+        majorHazardSource: null,
+        majorHazardSourceDescription: null,
         measuresEmergency: null,
-        measuresEmergencyFileIds: null,
-        referenceBasis: null,
       },
       // 表单参数
       form: {},
@@ -313,11 +202,11 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询现有风险清单库列表 */
+    /** 查询固有风险清单库列表 */
     getList() {
       this.loading = true;
       listList(this.queryParams).then(response => {
-        this.listList = response.rows;
+        this.inherentList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -331,19 +220,30 @@ export default {
     reset() {
       this.form = {
         id: null,
-        inherentId: null,
-        code: null,
+        userId: null,
+        roomId: null,
+        planId: null,
         name: null,
+        pointType: null,
+        specialEquipment: null,
+        safetyWarningSigns: null,
+        factor: null,
         type: null,
-        describe: null,
-        evaluationModel: null,
-        evaluationRange: null,
         level: null,
-        factor: null,
+        riskLikelihood: null,
+        riskSeverity: null,
+        presenceLocation: null,
+        pictureFileIds: null,
         measuresProject: null,
         measuresProjectFileIds: null,
         measuresAdministration: null,
+        measuresDeptName: null,
+        measuresUserName: null,
+        measuresUserPhone: null,
         measuresAdministrationFileIds: null,
+        hazardSourceName: null,
+        majorHazardSource: null,
+        majorHazardSourceDescription: null,
         measuresEmergency: null,
         measuresEmergencyFileIds: null,
         referenceBasis: null,
@@ -351,7 +251,8 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
+        remark: null
       };
       this.resetForm("form");
     },
@@ -371,58 +272,17 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加现有风险清单库";
+    exportList(id) {
+      this.download("system/risk/plan/exportWord/riskNotification/" + id, {});
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getList(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改现有风险清单库";
-      });
+    showDrawCanvas(floorId) {
+      this.$router.push({
+        name: "drawCanvas",
+        params: {
+          floorId: floorId,
         },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateList(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addList(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除现有风险清单库编号为"' + ids + '"的数据项？').then(function() {
-        return delList(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/list/export', {
-        ...this.queryParams
-      }, `list_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>

src/views/risk/inherent/index.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
-      <el-form-item label="评估人id" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入评估人id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="房间id" prop="roomId">
-        <el-input
-          v-model="queryParams.roomId"
-          placeholder="请输入房间id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="计划id" prop="planId">
-        <el-input
-          v-model="queryParams.planId"
-          placeholder="请输入计划id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <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="pointType">
-        <el-select v-model="queryParams.pointType" placeholder="请选择风险点类型" clearable>
-          <el-option
-            v-for="dict in dict.type.risk_plan_pointtype"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="是否为特种设备" prop="specialEquipment">
-        <el-select v-model="queryParams.specialEquipment" placeholder="请选择是否为特种设备" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_yes_no"
-            :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-select v-model="queryParams.type" placeholder="请选择准事故类型 " clearable>
-          <el-option
-            v-for="dict in dict.type.risk_plan_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </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="presenceLocation">
-        <el-input
-          v-model="queryParams.presenceLocation"
-          placeholder="请输入存在部位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="管控责任单位" prop="measuresDeptName">
-        <el-input
-          v-model="queryParams.measuresDeptName"
-          placeholder="请输入管控责任单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="管控责任人" prop="measuresUserName">
-        <el-input
-          v-model="queryParams.measuresUserName"
-          placeholder="请输入管控责任人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
       <el-form-item label="危险源名称" prop="hazardSourceName">
         <el-input
           v-model="queryParams.hazardSourceName"
@@ -154,16 +49,6 @@
           v-hasPermi="['system:riskInherent:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:riskInherent:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -175,11 +60,6 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="楼栋名称" align="center" prop="buildingName" />
-      <el-table-column label="楼层名称" align="center" prop="floorName" />
-      <el-table-column label="房间名称" align="center" prop="roomName" />
-      <el-table-column label="评估人" align="center" prop="userName" />
-      <!-- <el-table-column label="计划id" align="center" prop="planId" /> -->
       <el-table-column label="风险源名称" align="center" prop="name" />
       <el-table-column label="风险点类型" align="center" prop="pointType">
         <template slot-scope="scope">
@@ -197,16 +77,9 @@
           <dict-tag :options="dict.type.risk_plan_type" :value="scope.row.type"/>
         </template>
       </el-table-column>
-      <el-table-column label="风险等级" align="center" prop="level">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.risk_plan_level" :value="scope.row.level"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="存在部位" align="center" prop="presenceLocation" />
+      
       <!-- <el-table-column label="工程技术措施" align="center" prop="measuresProject" /> -->
       <!-- <el-table-column label="应采取的管理措施" align="center" prop="measuresAdministration" /> -->
-      <el-table-column label="管控责任单位" align="center" prop="measuresDeptName" />
-      <el-table-column label="管控责任人" align="center" prop="measuresUserName" />
       <el-table-column label="应急措施" align="center" prop="measuresEmergency" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -239,15 +112,6 @@
     <!-- 添加或修改固有风险清单库对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="160px">
-        <el-form-item label="评估人id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入评估人id" />
-        </el-form-item>
-        <el-form-item label="房间id" prop="roomId">
-          <el-input v-model="form.roomId" placeholder="请输入房间id" />
-        </el-form-item>
-        <el-form-item label="计划id" prop="planId">
-          <el-input v-model="form.planId" placeholder="请输入计划id" />
-        </el-form-item>
         <el-form-item label="风险源名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入风险源名称" />
         </el-form-item>
@@ -286,58 +150,24 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="风险等级" prop="level">
-          <el-select v-model="form.level" placeholder="请选择风险等级">
-            <el-option
-              v-for="dict in dict.type.risk_plan_level"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="存在部位" prop="presenceLocation">
-          <el-input v-model="form.presenceLocation" placeholder="请输入存在部位" />
-        </el-form-item>
-        <el-form-item label="风险源照片id" prop="pictureFileIds">
-          <image-upload v-model="form.pictureFileIds"/>
-        </el-form-item>
         <el-form-item label="工程技术措施" prop="measuresProject">
           <el-input v-model="form.measuresProject" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="工程技术措施附件" prop="measuresProjectFileIds">
-          <file-upload v-model="form.measuresProjectFileIds"/>
-        </el-form-item>
         <el-form-item label="应采取的管理措施" prop="measuresAdministration">
           <el-input v-model="form.measuresAdministration" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="管控责任单位" prop="measuresDeptName">
-          <el-input v-model="form.measuresDeptName" placeholder="请输入管控责任单位" />
-        </el-form-item>
-        <el-form-item label="管控责任人" prop="measuresUserName">
-          <el-input v-model="form.measuresUserName" placeholder="请输入管控责任人" />
-        </el-form-item>
-        <el-form-item label="管控责任人联系方式" prop="measuresUserPhone">
-          <el-input v-model="form.measuresUserPhone" placeholder="请输入管控责任人联系方式" />
+        <el-form-item label="应急措施" prop="measuresEmergency">
+          <el-input v-model="form.measuresEmergency" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="应采取的管理措施附件" prop="measuresAdministrationFileIds">
-          <el-input v-model="form.measuresAdministrationFileIds" placeholder="请输入应采取的管理措施附件" />
+        <el-form-item label="是否存在重大危险源" prop="majorHazardSource">
+          <el-input v-model="form.majorHazardSource" placeholder="请输入是否存在重大危险源" />
         </el-form-item>
         <el-form-item label="危险源名称" prop="hazardSourceName">
           <el-input v-model="form.hazardSourceName" placeholder="请输入危险源名称" />
         </el-form-item>
-        <el-form-item label="是否存在重大危险源" prop="majorHazardSource">
-          <el-input v-model="form.majorHazardSource" placeholder="请输入是否存在重大危险源" />
-        </el-form-item>
         <el-form-item label="重大危险源描述" prop="majorHazardSourceDescription">
           <el-input v-model="form.majorHazardSourceDescription" placeholder="请输入重大危险源描述" />
         </el-form-item>
-        <el-form-item label="应急措施" prop="measuresEmergency">
-          <el-input v-model="form.measuresEmergency" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="应急措施附件" prop="measuresEmergencyFileIds">
-          <file-upload v-model="form.measuresEmergencyFileIds"/>
-        </el-form-item>
         <el-form-item label="参考依据" prop="referenceBasis">
           <el-input v-model="form.referenceBasis" placeholder="请输入参考依据" />
         </el-form-item>

src/views/risk/plan/index.vue

@@ -158,7 +158,14 @@
           </el-select>
         </el-form-item>
         <el-form-item label="业态" prop="projectBusiness">
-          <el-input v-model="form.projectBusiness" placeholder="请输入业态" />
+          <el-select v-model="form.projectBusiness" placeholder="请选择风险点类型">
+            <el-option
+              v-for="dict in dict.type.risk_project_business"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="评估楼栋" prop="buildingIds">
           <el-select v-model="form.buildingIds" multiple medium placeholder="请选择评估楼栋">
@@ -234,6 +241,7 @@
 
   export default {
     name: "Plan",
+    dicts: ['risk_project_business'],
     components: {
       Treeselect
     },