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/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
     },