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

.env.development

 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 融通物管安全管理平台
 
 # 开发环境配置
 ENV = 'development'
 
-# 若依管理系统/开发环境
+# 融通物管安全管理平台/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

.env.production

 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 融通物管安全管理平台
 
 # 生产环境配置
 ENV = 'production'
 
-# 若依管理系统/生产环境
+# 融通物管安全管理平台/生产环境
 VUE_APP_BASE_API = '/prod-api'

.env.staging

 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 融通物管安全管理平台
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-# 若依管理系统/测试环境
+# 融通物管安全管理平台/测试环境
 VUE_APP_BASE_API = '/stage-api'

package.json

 {
   "name": "ruoyi",
   "version": "3.8.5",
-  "description": "若依管理系统",
+  "description": "融通物管管理平台",
   "author": "若依",
   "license": "MIT",
   "scripts": {

src/api/ledger/room.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询基础数据-楼层列表
 export function listRoom(query) {
   return request({
-    url: '/system/ledger/room/list',
+    url: '/system/ledger/room/listPc',
     method: 'get',
     params: query
   })
@@ -20,7 +20,7 @@ export function getRoom(id) {
 // 新增基础数据-楼层
 export function addRoom(data) {
   return request({
-    url: '/system/ledger/room',
+    url: '/system/ledger/room/save',
     method: 'post',
     data: data
   })

src/api/risk/inherent.js

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

src/api/risk/plan.js

@@ -42,3 +42,25 @@ export function delPlan(id) {
     method: 'delete'
   })
 }
+//风险评估信息详情
+export function riskListInfo(id) {
+  return request({
+    url: '/app-api/risk/plan/details/' + id,
+    method: 'get'
+  })
+}
+//风险评估清单
+export function riskList(query) {
+  return request({
+    url: '/system/risk/inherent/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function exportRiskList(inherentId) {
+  return request({
+    url: '/system/risk/plan/exportWord/riskNotification/'+inherentId,
+    method: 'get',
+  })
+}
\ No newline at end of file

src/router/index.js

@@ -134,6 +134,20 @@ export const dynamicRoutes = [
       }
     ]
   },
+  {
+    path: '/risk/plan/ledgerdata',
+    component: Layout,
+    hidden: true,
+    permissions: ['system:dict:list'],
+    children: [
+      {
+        path: 'index/:id(\\d+)',
+        component: () => import('@/views/risk/plan/ledgerdata'),
+        name: 'ledgerdata',
+        meta: { title: '台账数据', activeMenu: '/risk/plan/ledgerdata' }
+      }
+    ]
+  },
   {
     path: '/monitor/job-log',
     component: Layout,

src/views/index.vue

 <template>
   <div class="app-container home">
-    <el-row :gutter="20">
+    <!-- <el-row :gutter="20">
       <el-col :sm="24" :lg="24">
         <blockquote class="text-warning" style="font-size: 14px">
           领取阿里云通用云产品1888优惠券
@@ -898,7 +898,7 @@
           </div>
         </el-card>
       </el-col>
-    </el-row>
+    </el-row> -->
   </div>
 </template>
 

src/views/ledger/building/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="projectId">
+      <el-form-item label="项目名称" prop="projectName">
         <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
+          v-model="queryParams.projectName"
+          placeholder="请输入项目"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -17,15 +17,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="组织机构id" prop="deptId">
+      <el-form-item label="组织机构" prop="deptName">
         <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入组织机构id"
+          v-model="queryParams.deptName"
+          placeholder="请输入组织机构"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="楼层" prop="floor">
+      <el-form-item label="楼层数" prop="floor">
         <el-input
           v-model="queryParams.floor"
           placeholder="请输入楼层"
@@ -119,17 +119,25 @@
 
     <el-table v-loading="loading" :data="buildingList" @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="项目id" align="center" prop="projectId" />
+      <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="projectName" />
       <el-table-column label="楼宇名称" align="center" prop="name" />
       <el-table-column label="资产类型" align="center" prop="type" />
-      <el-table-column label="组织机构id" align="center" prop="deptId" />
-      <el-table-column label="楼层" align="center" prop="floor" />
-      <el-table-column label="用途" align="center" prop="use" />
+      <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="area" />
       <el-table-column label="详细地址" align="center" prop="address" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -149,7 +157,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -159,22 +167,22 @@
     />
 
     <!-- 添加或修改基础数据-楼宇对话框 -->
-    <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="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="项目名称" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入项目名称" />
         </el-form-item>
         <el-form-item label="楼宇名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入楼宇名称" />
         </el-form-item>
-        <el-form-item label="组织机构id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入组织机构id" />
+        <el-form-item label="组织机构名称" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入组织机构名称" />
         </el-form-item>
-        <el-form-item label="楼层" prop="floor">
+        <el-form-item label="楼层数(层)" prop="floor">
           <el-input v-model="form.floor" placeholder="请输入楼层" />
         </el-form-item>
         <el-form-item label="用途" prop="use">
-          <el-input v-model="form.use" placeholder="请输入用途" />
+          <el-input v-model="form.useto" placeholder="请输入用途" />
         </el-form-item>
         <el-form-item label="所在城市" prop="city">
           <el-input v-model="form.city" placeholder="请输入所在城市" />
@@ -185,9 +193,17 @@
         <el-form-item label="详细地址" prop="address">
           <el-input v-model="form.address" placeholder="请输入详细地址" />
         </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择状态">
+            <el-option
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -202,6 +218,7 @@ import { listBuilding, getBuilding, delBuilding, addBuilding, updateBuilding } f
 
 export default {
   name: "Building",
+  dicts: ['sys_normal_disable', 'data_source'],
   data() {
     return {
       // 遮罩层

src/views/ledger/floor/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="buildingId">
+      <el-form-item label="楼宇名称" prop="buildingName">
         <el-input
           v-model="queryParams.buildingId"
-          placeholder="请输入楼宇id"
+          placeholder="请输入楼宇名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -79,12 +79,16 @@
 
     <el-table v-loading="loading" :data="floorList" @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="楼宇id" align="center" prop="buildingId" />
+      <el-table-column label="序号" align="center" prop="id" />
+      <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" />
+      <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"/>
+       </template>
+     </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -104,7 +108,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -116,8 +120,8 @@
     <!-- 添加或修改基础数据-楼层对话框 -->
     <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="buildingId">
-          <el-input v-model="form.buildingId" placeholder="请输入楼宇id" />
+        <el-form-item label="楼宇名称" prop="buildingName">
+          <el-input v-model="form.buildingId" placeholder="请输入楼宇名称" />
         </el-form-item>
         <el-form-item label="楼层名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入楼层名称" />
@@ -125,9 +129,17 @@
         <el-form-item label="房间数量" prop="roomNumber">
           <el-input v-model="form.roomNumber" placeholder="请输入房间数量" />
         </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择状态">
+            <el-option
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -142,6 +154,7 @@ import { listFloor, getFloor, delFloor, addFloor, updateFloor } from "@/api/ledg
 
 export default {
   name: "Floor",
+  dicts: ['sys_normal_disable', 'data_source'],
   data() {
     return {
       // 遮罩层

src/views/ledger/project/index.vue

@@ -9,10 +9,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="组织机构id" prop="deptId">
+      <el-form-item label="组织机构" prop="deptId">
         <el-input
           v-model="queryParams.deptId"
-          placeholder="请输入组织机构id"
+          placeholder="请输入组织机构"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -33,13 +33,25 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="0-关联 1-自建" prop="source">
-        <el-input
-          v-model="queryParams.source"
-          placeholder="请输入0-关联 1-自建"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <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
+            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>
@@ -55,7 +67,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:project:add']"
+          v-hasPermi="['ledger/project:project:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -66,7 +78,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['system:project:edit']"
+          v-hasPermi="['ledger/project:project:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -77,7 +89,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:project:remove']"
+          v-hasPermi="['ledger/project:project:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -87,7 +99,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['system:project:export']"
+          v-hasPermi="['ledger/project:project:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -95,14 +107,26 @@
 
     <el-table v-loading="loading" :data="projectList" @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">
+       <template slot-scope="scope">
+         <span>{{ scope.$index + 1 }}</span>
+       </template>
+     </el-table-column>
       <el-table-column label="项目名称" align="center" prop="name" />
       <el-table-column label="项目类型" align="center" prop="type" />
-      <el-table-column label="组织机构id" align="center" prop="deptId" />
+      <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="0-关联 1-自建" align="center" prop="source" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <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"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -110,19 +134,19 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:project:edit']"
+            v-hasPermi="['ledger/project:project:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:project:remove']"
+            v-hasPermi="['ledger/project:project:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -137,8 +161,8 @@
         <el-form-item label="项目名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入项目名称" />
         </el-form-item>
-        <el-form-item label="组织机构id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入组织机构id" />
+        <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="请输入所在城市" />
@@ -146,12 +170,27 @@
         <el-form-item label="详细地址" prop="address">
           <el-input v-model="form.address" placeholder="请输入详细地址" />
         </el-form-item>
-        <el-form-item label="0-关联 1-自建" prop="source">
-          <el-input v-model="form.source" placeholder="请输入0-关联 1-自建" />
+        <el-form-item label="关联/自建" prop="source">
+          <el-select v-model="form.source" placeholder="请选择关联/自建">
+            <el-option
+              v-for="dict in dict.type.data_source"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择状态">
+            <el-option
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -162,10 +201,15 @@
 </template>
 
 <script>
-import { listProject, getProject, delProject, addProject, updateProject } from "@/api/ledger/project";
+  import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { listProject, getProject, delProject, addProject, updateProject } from "@/api/ledger/project/";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Project",
+  dicts: ['sys_normal_disable', 'data_source'],
+  components: { Treeselect },
   data() {
     return {
       // 遮罩层
@@ -182,6 +226,8 @@ export default {
       total: 0,
       // 基础数据-项目表格数据
       projectList: [],
+      // 部门树选项
+      deptOptions: undefined,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -205,8 +251,15 @@ export default {
       }
     };
   },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
     /** 查询基础数据-项目列表 */
@@ -218,6 +271,22 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.handleQuery();
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -306,7 +375,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/project/export', {
+      this.download('ledger/project/project/export', {
         ...this.queryParams
       }, `project_${new Date().getTime()}.xlsx`)
     }

src/views/ledger/room/index.vue

@@ -3,8 +3,8 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="楼层id" prop="floorId">
         <el-input
-          v-model="queryParams.floorId"
-          placeholder="请输入楼层id"
+          v-model="queryParams.floorName"
+          placeholder="请输入楼层"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -86,13 +86,23 @@
     </el-row>
 
     <el-table v-loading="loading" :data="roomList" @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="楼层id" align="center" prop="floorId" />
+      <el-table-column type="index" label="序号" width="60">
+          <template #default="{ $index }">
+             {{ (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="name" />
       <el-table-column label="房间编号" align="center" prop="number" />
       <el-table-column label="房间面积" align="center" prop="area" />
-      <el-table-column label="状态" align="center" prop="status" />
+     <el-table-column label="状态" align="center" prop="status">
+       <template slot-scope="scope">
+         <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+       </template>
+     </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -112,7 +122,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -124,8 +134,8 @@
     <!-- 添加或修改基础数据-楼层对话框 -->
     <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="floorId">
-          <el-input v-model="form.floorId" placeholder="请输入楼层id" />
+        <el-form-item label="楼层" prop="floorId">
+          <el-input v-model="form.floorId" placeholder="请输入楼层" />
         </el-form-item>
         <el-form-item label="房间名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入房间名称" />
@@ -136,8 +146,15 @@
         <el-form-item label="房间面积" prop="area">
           <el-input v-model="form.area" placeholder="请输入房间面积" />
         </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择状态">
+            <el-option
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -151,8 +168,10 @@
 <script>
 import { listRoom, getRoom, delRoom, addRoom, updateRoom } from "@/api/ledger/room";
 
+
 export default {
   name: "Room",
+  dicts: ['sys_normal_disable', 'data_source'],
   data() {
     return {
       // 遮罩层

src/views/login.vue

 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">融通物管安全管理平台</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -56,7 +56,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2023 censoft All Rights Reserved.</span>
     </div>
   </div>
 </template>

src/views/register.vue

 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">融通物管安全管理平台</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

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-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>
+        <el-form-item label="项目id" prop="projectId">
+          <el-input
+            v-model="queryParams.projectId"
+            placeholder="请输入项目id"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="楼栋ids" prop="buildingIds">
+          <el-input
+            v-model="queryParams.buildingIds"
+            placeholder="请输入楼栋ids"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="创建人员id" prop="createUserId">
+          <el-input
+            v-model="queryParams.createUserId"
+            placeholder="请输入创建人员id"
+            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="负责人id" prop="leaderUserId">
+          <el-input
+            v-model="queryParams.leaderUserId"
+            placeholder="请输入负责人id"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="执行人员ids" 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>
+            </el-form-item>
+        </el-form>
+
+        <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
+            <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="name" />
+            <el-table-column label="任务编号" align="center" prop="no" />
+            <el-table-column label="项目名称" align="center" prop="projectName" />
+            <el-table-column label="楼栋名称" align="center" prop="buildingNames" />
+            <el-table-column label="创建人员" align="center" prop="createUserName" />
+            <el-table-column label="创建单位" align="center" prop="createDeptName" />
+            <el-table-column label="负责人" align="center" prop="leaderUserName" />
+            <el-table-column label="执行人员" align="center" prop="workUserNames" />
+            <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" align="center" prop="status" />
+            <el-table-column label="操作" align="center" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <router-link :to="'/risk/plan/ledgerdata/index/' + scope.row.id" class="link-type">
+                        <el-button size="mini" type="text" icon="el-icon-view">详情</el-button>
+                    </router-link>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+            @pagination="getList" />
+
+    </div>
+</template>
+  
+<script>
+import { listPlan, addPlan, updatePlan } from "@/api/risk/plan";
+
+export default {
+    name: "Plan",
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 风险计划表格数据
+            planList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                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,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+            }
+        };
+    },
+    created() {
+        this.getList();
+    },
+    methods: {
+        /** 查询风险计划列表 */
+        getList() {
+            this.loading = true;
+            listPlan(this.queryParams).then(response => {
+                this.planList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                id: null,
+                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
+            };
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        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
+        },
+    }
+};
+</script>
+  
\ No newline at end of file

vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '融通物管安全管理平台' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -35,7 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        // target: `http://192.168.4.232:8080`,//服务器地址
+        target: `http://192.168.15.230:8081`,//晓晋本地地址
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''