Skip to content

R
rongtong-pc
Commit 70b3b902 authored by p-wanping.song's avatar p-wanping.song
Browse files
Options

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

parents 80804b89 540ebc85
Hide whitespace changes
Inline Side-by-side
Showing with 1211 additions and 510 deletions
.env.development
View file @ 70b3b902
# 页面标题 # 页面标题
VUE_APP_TITLE = 若依管理系统 VUE_APP_TITLE = 融通物管安全管理平台
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'
# 若依管理系统/开发环境 # 融通物管安全管理平台/开发环境
VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = '/dev-api'
# 路由懒加载 # 路由懒加载
......
.env.production
View file @ 70b3b902
# 页面标题 # 页面标题
VUE_APP_TITLE = 若依管理系统 VUE_APP_TITLE = 融通物管安全管理平台
# 生产环境配置 # 生产环境配置
ENV = 'production' ENV = 'production'
# 若依管理系统/生产环境 # 融通物管安全管理平台/生产环境
VUE_APP_BASE_API = '/prod-api' VUE_APP_BASE_API = '/prod-api'
.env.staging
View file @ 70b3b902
# 页面标题 # 页面标题
VUE_APP_TITLE = 若依管理系统 VUE_APP_TITLE = 融通物管安全管理平台
NODE_ENV = production NODE_ENV = production
# 测试环境配置 # 测试环境配置
ENV = 'staging' ENV = 'staging'
# 若依管理系统/测试环境 # 融通物管安全管理平台/测试环境
VUE_APP_BASE_API = '/stage-api' VUE_APP_BASE_API = '/stage-api'
package.json
View file @ 70b3b902
{ {
"name": "ruoyi", "name": "ruoyi",
"version": "3.8.5", "version": "3.8.5",
"description": "若依管理系统", "description": "融通物管管理平台",
"author": "若依", "author": "若依",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
......
src/api/ledger/room.js
View file @ 70b3b902
...@@ -3,7 +3,7 @@ import request from '@/utils/request' ...@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询基础数据-楼层列表 // 查询基础数据-楼层列表
export function listRoom(query) { export function listRoom(query) {
return request({ return request({
url: '/system/ledger/room/list', url: '/system/ledger/room/listPc',
method: 'get', method: 'get',
params: query params: query
}) })
...@@ -20,7 +20,7 @@ export function getRoom(id) { ...@@ -20,7 +20,7 @@ export function getRoom(id) {
// 新增基础数据-楼层 // 新增基础数据-楼层
export function addRoom(data) { export function addRoom(data) {
return request({ return request({
url: '/system/ledger/room', url: '/system/ledger/room/save',
method: 'post', method: 'post',
data: data data: data
}) })
......
src/api/risk/inherent.js
View file @ 70b3b902
import request from '@/utils/request' import request from '@/utils/request'
// 查询现有风险清单库列表 // 查询固有风险清单库列表
export function listList(query) { export function listInherent(query) {
return request({ return request({
url: '/system/risk/inherent/list/list', url: 'system/risk/inherent/list',
method: 'get', method: 'get',
params: query params: query
}) })
} }
// 查询现有风险清单库详细 // 查询固有风险清单库详细
export function getList(id) { export function getInherent(id) {
return request({ return request({
url: '/system/risk/inherent/list/' + id, url: 'system/risk/inherent/' + id,
method: 'get' method: 'get'
}) })
} }
// 新增现有风险清单库 // 新增固有风险清单库
export function addList(data) { export function addInherent(data) {
return request({ return request({
url: '/system/risk/inherent/list', url: 'system/risk/inherent',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 修改现有风险清单库 // 修改固有风险清单库
export function updateList(data) { export function updateInherent(data) {
return request({ return request({
url: '/system/risk/inherent/list', url: 'system/risk/inherent',
method: 'put', method: 'put',
data: data data: data
}) })
} }
// 删除现有风险清单库 // 删除固有风险清单库
export function delList(id) { export function delInherent(id) {
return request({ return request({
url: '/system/risk/inherent/list/' + id, url: 'system/risk/inherent/' + id,
method: 'delete' method: 'delete'
}) })
} }
src/api/risk/plan.js
View file @ 70b3b902
...@@ -42,3 +42,25 @@ export function delPlan(id) { ...@@ -42,3 +42,25 @@ export function delPlan(id) {
method: 'delete' 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/assets/logo/logo.png
View replaced file @ 80804b89 View file @ 70b3b902
src/assets/logo/logo.png

5.53 KB | W: | H:

src/assets/logo/logo.png

5.65 KB | W: | H:

src/assets/logo/logo.png
src/assets/logo/logo.png
src/assets/logo/logo.png
src/assets/logo/logo.png
  • 2-up
  • Swipe
  • Onion skin
src/router/index.js
View file @ 70b3b902
...@@ -134,6 +134,20 @@ export const dynamicRoutes = [ ...@@ -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', path: '/monitor/job-log',
component: Layout, component: Layout,
......
src/views/index.vue
View file @ 70b3b902
<template> <template>
<div class="app-container home"> <div class="app-container home">
<el-row :gutter="20"> <!-- <el-row :gutter="20">
<el-col :sm="24" :lg="24"> <el-col :sm="24" :lg="24">
<blockquote class="text-warning" style="font-size: 14px"> <blockquote class="text-warning" style="font-size: 14px">
领取阿里云通用云产品1888优惠券 领取阿里云通用云产品1888优惠券
...@@ -898,7 +898,7 @@ ...@@ -898,7 +898,7 @@
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row> -->
</div> </div>
</template> </template>
......
src/views/ledger/building/index.vue
View file @ 70b3b902
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="项目id" prop="projectId"> <el-form-item label="项目名称" prop="projectName">
<el-input <el-input
v-model="queryParams.projectId" v-model="queryParams.projectName"
placeholder="请输入项目id" placeholder="请输入项目"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -17,15 +17,15 @@ ...@@ -17,15 +17,15 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="组织机构id" prop="deptId"> <el-form-item label="组织机构" prop="deptName">
<el-input <el-input
v-model="queryParams.deptId" v-model="queryParams.deptName"
placeholder="请输入组织机构id" placeholder="请输入组织机构"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="楼层" prop="floor"> <el-form-item label="楼层数" prop="floor">
<el-input <el-input
v-model="queryParams.floor" v-model="queryParams.floor"
placeholder="请输入楼层" placeholder="请输入楼层"
...@@ -119,17 +119,25 @@ ...@@ -119,17 +119,25 @@
<el-table v-loading="loading" :data="buildingList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="buildingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" /> <el-table-column label="序号" align="center">
<el-table-column label="项目id" align="center" prop="projectId" /> <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="name" />
<el-table-column label="资产类型" align="center" prop="type" /> <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="floor" /> <el-table-column label="楼层数(层)" align="center" prop="floor" />
<el-table-column label="用途" align="center" prop="use" /> <el-table-column label="用途" align="center" prop="useto" />
<el-table-column label="所在城市" align="center" prop="city" /> <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="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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -149,7 +157,7 @@ ...@@ -149,7 +157,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -159,22 +167,22 @@ ...@@ -159,22 +167,22 @@
/> />
<!-- 添加或修改基础数据-楼宇对话框 --> <!-- 添加或修改基础数据-楼宇对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="项目id" prop="projectId"> <el-form-item label="项目名称" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目id" /> <el-input v-model="form.projectId" placeholder="请输入项目名称" />
</el-form-item> </el-form-item>
<el-form-item label="楼宇名称" prop="name"> <el-form-item label="楼宇名称" prop="name">
<el-input v-model="form.name" placeholder="请输入楼宇名称" /> <el-input v-model="form.name" placeholder="请输入楼宇名称" />
</el-form-item> </el-form-item>
<el-form-item label="组织机构id" prop="deptId"> <el-form-item label="组织机构名称" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入组织机构id" /> <el-input v-model="form.deptId" placeholder="请输入组织机构名称" />
</el-form-item> </el-form-item>
<el-form-item label="楼层" prop="floor"> <el-form-item label="楼层数(层)" prop="floor">
<el-input v-model="form.floor" placeholder="请输入楼层" /> <el-input v-model="form.floor" placeholder="请输入楼层" />
</el-form-item> </el-form-item>
<el-form-item label="用途" prop="use"> <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>
<el-form-item label="所在城市" prop="city"> <el-form-item label="所在城市" prop="city">
<el-input v-model="form.city" placeholder="请输入所在城市" /> <el-input v-model="form.city" placeholder="请输入所在城市" />
...@@ -185,9 +193,17 @@ ...@@ -185,9 +193,17 @@
<el-form-item label="详细地址" prop="address"> <el-form-item label="详细地址" prop="address">
<el-input v-model="form.address" placeholder="请输入详细地址" /> <el-input v-model="form.address" placeholder="请输入详细地址" />
</el-form-item> </el-form-item>
<el-form-item label="删除标志" prop="delFlag"> <el-form-item label="状态" prop="status">
<el-input v-model="form.delFlag" placeholder="请输入删除标志" /> <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-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
...@@ -202,6 +218,7 @@ import { listBuilding, getBuilding, delBuilding, addBuilding, updateBuilding } f ...@@ -202,6 +218,7 @@ import { listBuilding, getBuilding, delBuilding, addBuilding, updateBuilding } f
export default { export default {
name: "Building", name: "Building",
dicts: ['sys_normal_disable', 'data_source'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
......
src/views/ledger/floor/index.vue
View file @ 70b3b902
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="楼宇id" prop="buildingId"> <el-form-item label="楼宇名称" prop="buildingName">
<el-input <el-input
v-model="queryParams.buildingId" v-model="queryParams.buildingId"
placeholder="请输入楼宇id" placeholder="请输入楼宇名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -79,12 +79,16 @@ ...@@ -79,12 +79,16 @@
<el-table v-loading="loading" :data="floorList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="floorList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" /> <el-table-column label="序号" align="center" prop="id" />
<el-table-column label="楼宇id" align="center" prop="buildingId" /> <el-table-column label="楼宇名称" align="center" prop="buildingName" />
<el-table-column label="楼层名称" align="center" prop="name" /> <el-table-column label="楼层名称" align="center" prop="name" />
<el-table-column label="楼层属性" align="center" prop="type" /> <el-table-column label="楼层属性" align="center" prop="type" />
<el-table-column label="房间数量" align="center" prop="roomNumber" /> <el-table-column label="房间数量(间)" align="center" prop="roomNumber" />
<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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -104,7 +108,7 @@ ...@@ -104,7 +108,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -116,8 +120,8 @@ ...@@ -116,8 +120,8 @@
<!-- 添加或修改基础数据-楼层对话框 --> <!-- 添加或修改基础数据-楼层对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="楼宇id" prop="buildingId"> <el-form-item label="楼宇名称" prop="buildingName">
<el-input v-model="form.buildingId" placeholder="请输入楼宇id" /> <el-input v-model="form.buildingId" placeholder="请输入楼宇名称" />
</el-form-item> </el-form-item>
<el-form-item label="楼层名称" prop="name"> <el-form-item label="楼层名称" prop="name">
<el-input v-model="form.name" placeholder="请输入楼层名称" /> <el-input v-model="form.name" placeholder="请输入楼层名称" />
...@@ -125,9 +129,17 @@ ...@@ -125,9 +129,17 @@
<el-form-item label="房间数量" prop="roomNumber"> <el-form-item label="房间数量" prop="roomNumber">
<el-input v-model="form.roomNumber" placeholder="请输入房间数量" /> <el-input v-model="form.roomNumber" placeholder="请输入房间数量" />
</el-form-item> </el-form-item>
<el-form-item label="删除标志" prop="delFlag"> <el-form-item label="状态" prop="status">
<el-input v-model="form.delFlag" placeholder="请输入删除标志" /> <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-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
...@@ -142,6 +154,7 @@ import { listFloor, getFloor, delFloor, addFloor, updateFloor } from "@/api/ledg ...@@ -142,6 +154,7 @@ import { listFloor, getFloor, delFloor, addFloor, updateFloor } from "@/api/ledg
export default { export default {
name: "Floor", name: "Floor",
dicts: ['sys_normal_disable', 'data_source'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
......
src/views/ledger/project/index.vue
View file @ 70b3b902
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="组织机构id" prop="deptId"> <el-form-item label="组织机构" prop="deptId">
<el-input <el-input
v-model="queryParams.deptId" v-model="queryParams.deptId"
placeholder="请输入组织机构id" placeholder="请输入组织机构"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -33,13 +33,25 @@ ...@@ -33,13 +33,25 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="0-关联 1-自建" prop="source"> <el-form-item label="关联/自建" prop="source">
<el-input <el-select v-model="queryParams.source" placeholder="请选择关联/自建" clearable>
v-model="queryParams.source" <el-option
placeholder="请输入0-关联 1-自建" v-for="dict in dict.type.data_source"
clearable :key="dict.value"
@keyup.enter.native="handleQuery" :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-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
...@@ -55,7 +67,7 @@ ...@@ -55,7 +67,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:project:add']" v-hasPermi="['ledger/project:project:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -66,7 +78,7 @@ ...@@ -66,7 +78,7 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:project:edit']" v-hasPermi="['ledger/project:project:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -77,7 +89,7 @@ ...@@ -77,7 +89,7 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:project:remove']" v-hasPermi="['ledger/project:project:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -87,7 +99,7 @@ ...@@ -87,7 +99,7 @@
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:project:export']" v-hasPermi="['ledger/project:project:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -95,14 +107,26 @@ ...@@ -95,14 +107,26 @@
<el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <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="name" />
<el-table-column label="项目类型" align="center" prop="type" /> <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="city" />
<el-table-column label="详细地址" align="center" prop="address" /> <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="source">
<el-table-column label="状态" align="center" prop="status" /> <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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -110,19 +134,19 @@ ...@@ -110,19 +134,19 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:project:edit']" v-hasPermi="['ledger/project:project:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:project:remove']" v-hasPermi="['ledger/project:project:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -137,8 +161,8 @@ ...@@ -137,8 +161,8 @@
<el-form-item label="项目名称" prop="name"> <el-form-item label="项目名称" prop="name">
<el-input v-model="form.name" placeholder="请输入项目名称" /> <el-input v-model="form.name" placeholder="请输入项目名称" />
</el-form-item> </el-form-item>
<el-form-item label="组织机构id" prop="deptId"> <el-form-item label="归属部门" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入组织机构id" /> <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
</el-form-item> </el-form-item>
<el-form-item label="所在城市" prop="city"> <el-form-item label="所在城市" prop="city">
<el-input v-model="form.city" placeholder="请输入所在城市" /> <el-input v-model="form.city" placeholder="请输入所在城市" />
...@@ -146,12 +170,27 @@ ...@@ -146,12 +170,27 @@
<el-form-item label="详细地址" prop="address"> <el-form-item label="详细地址" prop="address">
<el-input v-model="form.address" placeholder="请输入详细地址" /> <el-input v-model="form.address" placeholder="请输入详细地址" />
</el-form-item> </el-form-item>
<el-form-item label="0-关联 1-自建" prop="source"> <el-form-item label="关联/自建" prop="source">
<el-input v-model="form.source" placeholder="请输入0-关联 1-自建" /> <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>
<el-form-item label="删除标志" prop="delFlag"> <el-form-item label="状态" prop="status">
<el-input v-model="form.delFlag" placeholder="请输入删除标志" /> <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-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
...@@ -162,10 +201,15 @@ ...@@ -162,10 +201,15 @@
</template> </template>
<script> <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 { export default {
name: "Project", name: "Project",
dicts: ['sys_normal_disable', 'data_source'],
components: { Treeselect },
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -182,6 +226,8 @@ export default { ...@@ -182,6 +226,8 @@ export default {
total: 0, total: 0,
// 基础数据-项目表格数据 // 基础数据-项目表格数据
projectList: [], projectList: [],
// 部门树选项
deptOptions: undefined,
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
...@@ -205,8 +251,15 @@ export default { ...@@ -205,8 +251,15 @@ export default {
} }
}; };
}, },
watch: {
// 根据名称筛选部门树
deptName(val) {
this.$refs.tree.filter(val);
}
},
created() { created() {
this.getList(); this.getList();
this.getDeptTree();
}, },
methods: { methods: {
/** 查询基础数据-项目列表 */ /** 查询基础数据-项目列表 */
...@@ -218,6 +271,22 @@ export default { ...@@ -218,6 +271,22 @@ export default {
this.loading = false; 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() { cancel() {
this.open = false; this.open = false;
...@@ -306,7 +375,7 @@ export default { ...@@ -306,7 +375,7 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('system/project/export', { this.download('ledger/project/project/export', {
...this.queryParams ...this.queryParams
}, `project_${new Date().getTime()}.xlsx`) }, `project_${new Date().getTime()}.xlsx`)
} }
......
src/views/ledger/room/index.vue
View file @ 70b3b902
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="楼层id" prop="floorId"> <el-form-item label="楼层id" prop="floorId">
<el-input <el-input
v-model="queryParams.floorId" v-model="queryParams.floorName"
placeholder="请输入楼层id" placeholder="请输入楼层"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -86,13 +86,23 @@ ...@@ -86,13 +86,23 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="roomList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="roomList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" /> <el-table-column type="index" label="序号" width="60">
<el-table-column label="楼层id" align="center" prop="floorId" /> <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="name" />
<el-table-column label="房间编号" align="center" prop="number" /> <el-table-column label="房间编号" align="center" prop="number" />
<el-table-column label="房间面积" align="center" prop="area" /> <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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -112,7 +122,7 @@ ...@@ -112,7 +122,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -124,8 +134,8 @@ ...@@ -124,8 +134,8 @@
<!-- 添加或修改基础数据-楼层对话框 --> <!-- 添加或修改基础数据-楼层对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="楼层id" prop="floorId"> <el-form-item label="楼层" prop="floorId">
<el-input v-model="form.floorId" placeholder="请输入楼层id" /> <el-input v-model="form.floorId" placeholder="请输入楼层" />
</el-form-item> </el-form-item>
<el-form-item label="房间名称" prop="name"> <el-form-item label="房间名称" prop="name">
<el-input v-model="form.name" placeholder="请输入房间名称" /> <el-input v-model="form.name" placeholder="请输入房间名称" />
...@@ -136,8 +146,15 @@ ...@@ -136,8 +146,15 @@
<el-form-item label="房间面积" prop="area"> <el-form-item label="房间面积" prop="area">
<el-input v-model="form.area" placeholder="请输入房间面积" /> <el-input v-model="form.area" placeholder="请输入房间面积" />
</el-form-item> </el-form-item>
<el-form-item label="删除标志" prop="delFlag"> <el-form-item label="状态" prop="status">
<el-input v-model="form.delFlag" placeholder="请输入删除标志" /> <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-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -151,8 +168,10 @@ ...@@ -151,8 +168,10 @@
<script> <script>
import { listRoom, getRoom, delRoom, addRoom, updateRoom } from "@/api/ledger/room"; import { listRoom, getRoom, delRoom, addRoom, updateRoom } from "@/api/ledger/room";
export default { export default {
name: "Room", name: "Room",
dicts: ['sys_normal_disable', 'data_source'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
......
src/views/login.vue
View file @ 70b3b902
<template> <template>
<div class="login"> <div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form"> <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-form-item prop="username">
<el-input <el-input
v-model="loginForm.username" v-model="loginForm.username"
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</el-form> </el-form>
<!-- 底部 --> <!-- 底部 -->
<div class="el-login-footer"> <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>
</div> </div>
</template> </template>
......
src/views/register.vue
View file @ 70b3b902
<template> <template>
<div class="register"> <div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form"> <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-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号"> <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" /> <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
......
src/views/risk/inherent/index.vue
View file @ 70b3b902
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
<el-form-item label="固有风险id" prop="inherentId"> <el-form-item label="评估人id" prop="userId">
<el-input <el-input
v-model="queryParams.inherentId" v-model="queryParams.userId"
placeholder="请输入固有风险id" placeholder="请输入评估人id"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="风险code" prop="code"> <el-form-item label="房间id" prop="roomId">
<el-input <el-input
v-model="queryParams.code" v-model="queryParams.roomId"
placeholder="请输入风险code" placeholder="请输入房间id"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="风险源名称" prop="name"> <el-form-item label="计划id" prop="planId">
<el-input
v-model="queryParams.name"
placeholder="请输入风险源名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="风险描述" prop="describe">
<el-input <el-input
v-model="queryParams.describe" v-model="queryParams.planId"
placeholder="请输入风险描述" placeholder="请输入计划id"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="评估模型" prop="evaluationModel"> <el-form-item label="风险源名称" prop="name">
<el-input <el-input
v-model="queryParams.evaluationModel" v-model="queryParams.name"
placeholder="请输入评估模型" placeholder="请输入风险源名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="评估范围" prop="evaluationRange"> <el-form-item label="风险点类型" prop="pointType">
<el-input <el-select v-model="queryParams.pointType" placeholder="请选择风险点类型" clearable>
v-model="queryParams.evaluationRange" <el-option
placeholder="请输入评估范围" v-for="dict in dict.type.risk_plan_pointtype"
clearable :key="dict.value"
@keyup.enter.native="handleQuery" :label="dict.label"
/> :value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="风险等级" prop="level"> <el-form-item label="是否为特种设备" prop="specialEquipment">
<el-input <el-select v-model="queryParams.specialEquipment" placeholder="请选择是否为特种设备" clearable>
v-model="queryParams.level" <el-option
placeholder="请输入风险等级" v-for="dict in dict.type.sys_yes_no"
clearable :key="dict.value"
@keyup.enter.native="handleQuery" :label="dict.label"
/> :value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="风险因素" prop="factor"> <el-form-item label="风险因素" prop="factor">
<el-input <el-input
...@@ -65,38 +61,60 @@ ...@@ -65,38 +61,60 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工程技术措施附件" prop="measuresProjectFileIds"> <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 <el-input
v-model="queryParams.measuresProjectFileIds" v-model="queryParams.presenceLocation"
placeholder="请输入工程技术措施附件" placeholder="请输入存在部位"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="管理措施附件" prop="measuresAdministrationFileIds"> <el-form-item label="管控责任单位" prop="measuresDeptName">
<el-input <el-input
v-model="queryParams.measuresAdministrationFileIds" v-model="queryParams.measuresDeptName"
placeholder="请输入管理措施附件" placeholder="请输入管控责任单位"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="应急处置措施附件" prop="measuresEmergencyFileIds"> <el-form-item label="管控责任人" prop="measuresUserName">
<el-input <el-input
v-model="queryParams.measuresEmergencyFileIds" v-model="queryParams.measuresUserName"
placeholder="请输入应急处置措施附件" placeholder="请输入管控责任人"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="参考依据" prop="referenceBasis">
<el-form-item label="危险源名称" prop="hazardSourceName">
<el-input <el-input
v-model="queryParams.referenceBasis" v-model="queryParams.hazardSourceName"
placeholder="请输入参考依据" placeholder="请输入危险源名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
...@@ -111,7 +129,7 @@ ...@@ -111,7 +129,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:riskInherent:add']" v-hasPermi="['risk:inherent:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -122,7 +140,7 @@ ...@@ -122,7 +140,7 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:riskInherent:edit']" v-hasPermi="['risk:inherent:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -133,7 +151,7 @@ ...@@ -133,7 +151,7 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:riskInherent:remove']" v-hasPermi="['risk:inherent:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -143,31 +161,53 @@ ...@@ -143,31 +161,53 @@
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:riskInherent:export']" v-hasPermi="['risk:inherent:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </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 type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="id" /> <el-table-column label="序号" align="center">
<el-table-column label="固有风险id" align="center" prop="inherentId" /> <template slot-scope="scope">
<el-table-column label="风险code" align="center" prop="code" /> <span>{{ scope.$index + 1 }}</span>
</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="name" />
<el-table-column label="风险类型" align="center" prop="type" /> <el-table-column label="风险点类型" align="center" prop="pointType">
<el-table-column label="风险描述" align="center" prop="describe" /> <template slot-scope="scope">
<el-table-column label="评估模型" align="center" prop="evaluationModel" /> <dict-tag :options="dict.type.risk_plan_pointtype" :value="scope.row.pointType"/>
<el-table-column label="评估范围" align="center" prop="evaluationRange" /> </template>
<el-table-column label="风险等级" align="center" prop="level" /> </el-table-column>
<el-table-column label="是否为特种设备" align="center" prop="specialEquipment">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.specialEquipment"/>
</template>
</el-table-column>
<el-table-column label="风险因素" align="center" prop="factor" /> <el-table-column label="风险因素" align="center" prop="factor" />
<el-table-column label="准事故类型 " align="center" prop="type">
<template slot-scope="scope">
<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="measuresProject" />
<el-table-column label="工程技术措施附件" align="center" prop="measuresProjectFileIds" /> <el-table-column label="应采取的管理措施" align="center" prop="measuresAdministration" />
<el-table-column label="管理措施" align="center" prop="measuresAdministration" /> <el-table-column label="管控责任单位" align="center" prop="measuresDeptName" />
<el-table-column label="管理措施附件" align="center" prop="measuresAdministrationFileIds" /> <el-table-column label="管控责任人" align="center" prop="measuresUserName" />
<el-table-column label="应急处置措施" align="center" prop="measuresEmergency" /> <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" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -175,19 +215,19 @@ ...@@ -175,19 +215,19 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:riskInherent:edit']" v-hasPermi="['risk:inherent:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:riskInherent:remove']" v-hasPermi="['risk:inherent:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -196,57 +236,111 @@ ...@@ -196,57 +236,111 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改现有风险清单库对话框 --> <!-- 添加或修改固有风险清单库对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="160px">
<el-form-item label="固有风险id" prop="inherentId"> <el-form-item label="评估人id" prop="userId">
<el-input v-model="form.inherentId" placeholder="请输入固有风险id" /> <el-input v-model="form.userId" placeholder="请输入评估人id" />
</el-form-item> </el-form-item>
<el-form-item label="风险code" prop="code"> <el-form-item label="房间id" prop="roomId">
<el-input v-model="form.code" placeholder="请输入风险code" /> <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>
<el-form-item label="风险源名称" prop="name"> <el-form-item label="风险源名称" prop="name">
<el-input v-model="form.name" placeholder="请输入风险源名称" /> <el-input v-model="form.name" placeholder="请输入风险源名称" />
</el-form-item> </el-form-item>
<el-form-item label="风险描述" prop="describe"> <el-form-item label="风险点类型" prop="pointType">
<el-input v-model="form.describe" placeholder="请输入风险描述" /> <el-select v-model="form.pointType" placeholder="请选择风险点类型">
</el-form-item> <el-option
<el-form-item label="评估模型" prop="evaluationModel"> v-for="dict in dict.type.risk_plan_pointtype"
<el-input v-model="form.evaluationModel" placeholder="请输入评估模型" /> :key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="评估范围" prop="evaluationRange"> <el-form-item label="是否为特种设备" prop="specialEquipment">
<el-input v-model="form.evaluationRange" placeholder="请输入评估范围" /> <el-radio-group v-model="form.specialEquipment">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="风险等级" prop="level"> <el-form-item label="安全警示标志" prop="safetyWarningSigns">
<el-input v-model="form.level" placeholder="请输入风险等级" /> <el-input v-model="form.safetyWarningSigns" placeholder="请输入安全警示标志" />
</el-form-item> </el-form-item>
<el-form-item label="风险因素" prop="factor"> <el-form-item label="风险因素" prop="factor">
<el-input v-model="form.factor" placeholder="请输入风险因素" /> <el-input v-model="form.factor" placeholder="请输入风险因素" />
</el-form-item> </el-form-item>
<el-form-item label="准事故类型 " prop="type">
<el-select v-model="form.type" placeholder="请选择准事故类型 ">
<el-option
v-for="dict in dict.type.risk_plan_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></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-form-item label="工程技术措施" prop="measuresProject">
<el-input v-model="form.measuresProject" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.measuresProject" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
<el-form-item label="工程技术措施附件" prop="measuresProjectFileIds"> <el-form-item label="工程技术措施附件" prop="measuresProjectFileIds">
<el-input v-model="form.measuresProjectFileIds" placeholder="请输入工程技术措施附件" /> <file-upload v-model="form.measuresProjectFileIds"/>
</el-form-item> </el-form-item>
<el-form-item label="管理措施" prop="measuresAdministration"> <el-form-item label="应采取的管理措施" prop="measuresAdministration">
<el-input v-model="form.measuresAdministration" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.measuresAdministration" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
<el-form-item label="管理措施附件" prop="measuresAdministrationFileIds"> <el-form-item label="管控责任单位" prop="measuresDeptName">
<el-input v-model="form.measuresAdministrationFileIds" placeholder="请输入管理措施附件" /> <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>
<el-form-item label="应采取的管理措施附件" prop="measuresAdministrationFileIds">
<el-input v-model="form.measuresAdministrationFileIds" 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>
<el-form-item label="应急处置措施" prop="measuresEmergency"> <el-form-item label="应急措施" prop="measuresEmergency">
<el-input v-model="form.measuresEmergency" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.measuresEmergency" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
<el-form-item label="应急处置措施附件" prop="measuresEmergencyFileIds"> <el-form-item label="应急措施附件" prop="measuresEmergencyFileIds">
<el-input v-model="form.measuresEmergencyFileIds" placeholder="请输入应急处置措施附件" /> <file-upload v-model="form.measuresEmergencyFileIds"/>
</el-form-item> </el-form-item>
<el-form-item label="参考依据" prop="referenceBasis"> <el-form-item label="参考依据" prop="referenceBasis">
<el-input v-model="form.referenceBasis" placeholder="请输入参考依据" /> <el-input v-model="form.referenceBasis" placeholder="请输入参考依据" />
</el-form-item> </el-form-item>
<el-form-item label="删除标志" prop="delFlag">
<el-input v-model="form.delFlag" placeholder="请输入删除标志" />
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
...@@ -257,10 +351,11 @@ ...@@ -257,10 +351,11 @@
</template> </template>
<script> <script>
import { listList, getList, delList, addList, updateList } from "@/api/risk/inherent"; import { listInherent, getInherent, delInherent, addInherent, updateInherent } from "@/api/risk/inherent";
export default { export default {
name: "List", name: "inherent",
dicts: ['risk_plan_level', 'risk_plan_type', 'sys_yes_no', 'risk_plan_pointtype'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -275,8 +370,8 @@ export default { ...@@ -275,8 +370,8 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 现有风险清单库表格数据 // 固有风险清单库表格数据
listList: [], inherentList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
...@@ -285,22 +380,25 @@ export default { ...@@ -285,22 +380,25 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
inherentId: null, userId: null,
code: null, roomId: null,
planId: null,
name: null, name: null,
pointType: null,
specialEquipment: null,
factor: null,
type: null, type: null,
describe: null,
evaluationModel: null,
evaluationRange: null,
level: null, level: null,
factor: null, presenceLocation: null,
measuresProject: null, measuresProject: null,
measuresProjectFileIds: null,
measuresAdministration: null, measuresAdministration: null,
measuresDeptName: null,
measuresUserName: null,
measuresAdministrationFileIds: null, measuresAdministrationFileIds: null,
hazardSourceName: null,
majorHazardSource: null,
majorHazardSourceDescription: null,
measuresEmergency: null, measuresEmergency: null,
measuresEmergencyFileIds: null,
referenceBasis: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -313,11 +411,11 @@ export default { ...@@ -313,11 +411,11 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询现有风险清单库列表 */ /** 查询固有风险清单库列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listList(this.queryParams).then(response => { listInherent(this.queryParams).then(response => {
this.listList = response.rows; this.inherentList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
...@@ -331,19 +429,30 @@ export default { ...@@ -331,19 +429,30 @@ export default {
reset() { reset() {
this.form = { this.form = {
id: null, id: null,
inherentId: null, userId: null,
code: null, roomId: null,
planId: null,
name: null, name: null,
pointType: null,
specialEquipment: null,
safetyWarningSigns: null,
factor: null,
type: null, type: null,
describe: null,
evaluationModel: null,
evaluationRange: null,
level: null, level: null,
factor: null, riskLikelihood: null,
riskSeverity: null,
presenceLocation: null,
pictureFileIds: null,
measuresProject: null, measuresProject: null,
measuresProjectFileIds: null, measuresProjectFileIds: null,
measuresAdministration: null, measuresAdministration: null,
measuresDeptName: null,
measuresUserName: null,
measuresUserPhone: null,
measuresAdministrationFileIds: null, measuresAdministrationFileIds: null,
hazardSourceName: null,
majorHazardSource: null,
majorHazardSourceDescription: null,
measuresEmergency: null, measuresEmergency: null,
measuresEmergencyFileIds: null, measuresEmergencyFileIds: null,
referenceBasis: null, referenceBasis: null,
...@@ -351,7 +460,8 @@ export default { ...@@ -351,7 +460,8 @@ export default {
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null updateTime: null,
remark: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -375,16 +485,16 @@ export default { ...@@ -375,16 +485,16 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加现有风险清单库"; this.title = "添加固有风险清单库";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids const id = row.id || this.ids
getList(id).then(response => { getInherent(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改现有风险清单库"; this.title = "修改固有风险清单库";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -392,13 +502,13 @@ export default { ...@@ -392,13 +502,13 @@ export default {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateList(this.form).then(response => { updateInherent(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addList(this.form).then(response => { addInherent(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
...@@ -410,8 +520,8 @@ export default { ...@@ -410,8 +520,8 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除现有风险清单库编号为"' + ids + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除固有风险清单库编号为"' + ids + '"的数据项？').then(function() {
return delList(ids); return delInherent(ids);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
...@@ -419,9 +529,9 @@ export default { ...@@ -419,9 +529,9 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('system/list/export', { this.download('risk/inherent/export', {
...this.queryParams ...this.queryParams
}, `list_${new Date().getTime()}.xlsx`) }, `inherent_${new Date().getTime()}.xlsx`)
} }
} }
}; };
......
src/views/risk/plan/index.vue
View file @ 70b3b902
...@@ -2,82 +2,41 @@ ...@@ -2,82 +2,41 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="任务名称" prop="name"> <el-form-item label="任务名称" prop="name">
<el-input <el-input v-model="queryParams.name" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.name"
placeholder="请输入任务名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="任务编号" prop="no"> <el-form-item label="任务编号" prop="no">
<el-input <el-input v-model="queryParams.no" placeholder="请输入任务编号" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.no"
placeholder="请输入任务编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="项目id" prop="projectId"> <el-form-item label="项目id" prop="projectId">
<el-input <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.projectId"
placeholder="请输入项目id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="楼栋ids" prop="buildingIds"> <el-form-item label="楼栋ids" prop="buildingIds">
<el-input <el-input v-model="queryParams.buildingIds" placeholder="请输入楼栋ids" clearable
v-model="queryParams.buildingIds" @keyup.enter.native="handleQuery" />
placeholder="请输入楼栋ids"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="创建人员id" prop="createUserId"> <el-form-item label="创建人员id" prop="createUserId">
<el-input <el-input v-model="queryParams.createUserId" placeholder="请输入创建人员id" clearable
v-model="queryParams.createUserId" @keyup.enter.native="handleQuery" />
placeholder="请输入创建人员id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="创建单位" prop="createDeptId"> <el-form-item label="创建单位" prop="createDeptId">
<el-input <el-input v-model="queryParams.createDeptId" placeholder="请输入创建单位" clearable
v-model="queryParams.createDeptId" @keyup.enter.native="handleQuery" />
placeholder="请输入创建单位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="负责人id" prop="leaderUserId"> <el-form-item label="负责人id" prop="leaderUserId">
<el-input <el-input v-model="queryParams.leaderUserId" placeholder="请输入负责人id" clearable
v-model="queryParams.leaderUserId" @keyup.enter.native="handleQuery" />
placeholder="请输入负责人id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="执行人员ids" prop="workUserIds"> <el-form-item label="执行人员ids" prop="workUserIds">
<el-input <el-input v-model="queryParams.workUserIds" placeholder="请输入执行人员ids" clearable
v-model="queryParams.workUserIds" @keyup.enter.native="handleQuery" />
placeholder="请输入执行人员ids"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="开始时间" prop="startTime"> <el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间"> placeholder="请选择开始时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="结束时间" prop="endTime"> <el-form-item label="结束时间" prop="endTime">
<el-date-picker clearable <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
v-model="queryParams.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间"> placeholder="请选择结束时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -89,61 +48,39 @@ ...@@ -89,61 +48,39 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
type="primary" v-hasPermi="['system:riskPlan:add']">新增</el-button>
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:riskPlan:add']"
>新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
type="success" v-hasPermi="['system:riskPlan:edit']">修改</el-button>
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:riskPlan:edit']"
>修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
type="danger" v-hasPermi="['system:riskPlan:remove']">删除</el-button>
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:riskPlan:remove']"
>删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
type="warning" v-hasPermi="['system:riskPlan:export']">导出</el-button>
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:riskPlan:export']"
>导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <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="name" />
<el-table-column label="任务编号" align="center" prop="no" /> <el-table-column label="任务编号" align="center" prop="no" />
<el-table-column label="项目id" align="center" prop="projectId" /> <el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="楼栋ids" align="center" prop="buildingIds" /> <el-table-column label="楼栋名称" align="center" prop="buildingNames" />
<el-table-column label="创建人员id" align="center" prop="createUserId" /> <el-table-column label="创建人员" align="center" prop="createUserName" />
<el-table-column label="创建单位" align="center" prop="createDeptId" /> <el-table-column label="创建单位" align="center" prop="createDeptName" />
<el-table-column label="负责人id" align="center" prop="leaderUserId" /> <el-table-column label="负责人" align="center" prop="leaderUserName" />
<el-table-column label="执行人员ids" align="center" prop="workUserIds" /> <el-table-column label="执行人员" align="center" prop="workUserNames" />
<el-table-column label="开始时间" align="center" prop="startTime" width="180"> <el-table-column label="开始时间" align="center" prop="startTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
...@@ -157,31 +94,16 @@ ...@@ -157,31 +94,16 @@
<el-table-column label="状态" align="center" prop="status" /> <el-table-column label="状态" align="center" prop="status" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
size="mini" v-hasPermi="['system:riskPlan:edit']">修改</el-button>
type="text" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
icon="el-icon-edit" v-hasPermi="['system:riskPlan:remove']">删除</el-button>
@click="handleUpdate(scope.row)"
v-hasPermi="['system:riskPlan:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:riskPlan:remove']"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
v-show="total>0" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改风险计划对话框 --> <!-- 添加或修改风险计划对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
...@@ -211,19 +133,12 @@ ...@@ -211,19 +133,12 @@
<el-input v-model="form.workUserIds" placeholder="请输入执行人员ids" /> <el-input v-model="form.workUserIds" placeholder="请输入执行人员ids" />
</el-form-item> </el-form-item>
<el-form-item label="开始时间" prop="startTime"> <el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable <el-date-picker clearable v-model="form.startTime" type="date" value-format="yyyy-MM-dd"
v-model="form.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间"> placeholder="请选择开始时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="结束时间" prop="endTime"> <el-form-item label="结束时间" prop="endTime">
<el-date-picker clearable <el-date-picker clearable v-model="form.endTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择结束时间">
v-model="form.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="删除标志" prop="delFlag"> <el-form-item label="删除标志" prop="delFlag">
...@@ -239,162 +154,167 @@ ...@@ -239,162 +154,167 @@
</template> </template>
<script> <script>
import { listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/risk/plan"; import {
listPlan,
getPlan,
delPlan,
addPlan,
updatePlan
} from "@/api/risk/plan";
export default { export default {
name: "Plan", name: "Plan",
data() { data() {
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
single: true, single: true,
// 非多个禁用 // 非多个禁用
multiple: true, multiple: true,
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 风险计划表格数据 // 风险计划表格数据
planList: [], planList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
name: null, name: null,
no: null, no: null,
projectId: null, projectId: null,
buildingIds: null, buildingIds: null,
createUserId: null, createUserId: null,
createDeptId: null, createDeptId: null,
leaderUserId: null, leaderUserId: null,
workUserIds: null, workUserIds: null,
startTime: null, startTime: null,
endTime: null, endTime: null,
status: null, status: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { 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");
}, },
/** 搜索按钮操作 */ created() {
handleQuery() {
this.queryParams.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ methods: {
resetQuery() { /** 查询风险计划列表 */
this.resetForm("queryForm"); getList() {
this.handleQuery(); this.loading = true;
}, listPlan(this.queryParams).then(response => {
// 多选框选中数据 this.planList = response.rows;
handleSelectionChange(selection) { this.total = response.total;
this.ids = selection.map(item => item.id) this.loading = false;
this.single = selection.length!==1 });
this.multiple = !selection.length },
}, // 取消按钮
/** 新增按钮操作 */ cancel() {
handleAdd() { this.open = false;
this.reset(); this.reset();
this.open = true; },
this.title = "添加风险计划"; // 表单重置
}, reset() {
/** 修改按钮操作 */ this.form = {
handleUpdate(row) { id: null,
this.reset(); name: null,
const id = row.id || this.ids no: null,
getPlan(id).then(response => { projectId: null,
this.form = response.data; 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
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true; this.open = true;
this.title = "修改风险计划"; this.title = "添加风险计划";
}); },
}, /** 修改按钮操作 */
/** 提交按钮 */ handleUpdate(row) {
submitForm() { this.reset();
this.$refs["form"].validate(valid => { const id = row.id || this.ids
if (valid) { getPlan(id).then(response => {
if (this.form.id != null) { this.form = response.data;
updatePlan(this.form).then(response => { this.open = true;
this.$modal.msgSuccess("修改成功"); this.title = "修改风险计划";
this.open = false; });
this.getList(); },
}); /** 提交按钮 */
} else { submitForm() {
addPlan(this.form).then(response => { this.$refs["form"].validate(valid => {
this.$modal.msgSuccess("新增成功"); if (valid) {
this.open = false; if (this.form.id != null) {
this.getList(); updatePlan(this.form).then(response => {
}); this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addPlan(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
} }
} });
}); },
}, /** 删除按钮操作 */
/** 删除按钮操作 */ handleDelete(row) {
handleDelete(row) { const ids = row.id || this.ids;
const ids = row.id || this.ids; this.$modal.confirm('是否确认删除风险计划编号为"' + ids + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除风险计划编号为"' + ids + '"的数据项？').then(function() { return delPlan(ids);
return delPlan(ids); }).then(() => {
}).then(() => { this.getList();
this.getList(); this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess("删除成功"); }).catch(() => {});
}).catch(() => {}); },
}, /** 导出按钮操作 */
/** 导出按钮操作 */ handleExport() {
handleExport() { this.download('system/plan/export', {
this.download('system/plan/export', { ...this.queryParams
...this.queryParams }, `plan_${new Date().getTime()}.xlsx`)
}, `plan_${new Date().getTime()}.xlsx`) }
} }
} };
};
</script> </script>
src/views/risk/plan/ledger.vue 0 → 100644
View file @ 70b3b902
<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
src/views/risk/plan/ledgerdata.vue 0 → 100644
View file @ 70b3b902
<template>
<div class="wrapper">
<el-descriptions title="集团安全咨询服务项目">
<el-descriptions-item label="创建人">{{ InfoList.createUserName }}</el-descriptions-item>
<el-descriptions-item label="创建单位">{{ InfoList.detailsDto.createDeptName }}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{ InfoList.detailsDto.createTime }}</el-descriptions-item>
<el-descriptions-item label="所属单位">{{ InfoList.createDeptId }}</el-descriptions-item>
<el-descriptions-item label="所属省市">苏州市</el-descriptions-item>
<el-descriptions-item label="项目坐标">{{ InfoList.workUserIds }}</el-descriptions-item>
<el-descriptions-item label="项目负责人">{{ InfoList.detailsDto.createUserName }}</el-descriptions-item>
<el-descriptions-item label="评估组成员">{{ InfoList.detailsDto.workUserNames }}</el-descriptions-item>
<el-descriptions-item label="开始时间">{{ InfoList.startTime }}</el-descriptions-item>
<el-descriptions-item label="联系地址">{{ InfoList.name }}</el-descriptions-item>
</el-descriptions>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="风险评估清单" name="first">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="82px">
<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="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="referenceBasis">
<el-input v-model="queryParams.referenceBasis" 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-table v-loading="loading" :data="listList" @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="风险名称" align="center" prop="name" />
<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="level" />
<el-table-column label="风险因素" align="center" prop="factor" />
<el-table-column label="准事故类型" align="center" prop="type" />
<el-table-column label="存在部位" align="center" prop="presenceLocation" />
<el-table-column label="操作" align="center" prop="describe">
<template slot-scope="scope">
<div>
<el-button size="mini" type="text" icon="el-icon-download"
@click="exportList(scope.row.id)">下载风险告知卡</el-button>
</div>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getRiskList" />
</el-tab-pane>
<el-tab-pane label="评估结果审核" name="second">
<div class="approveResult">
<div class="approveL">
<div class="titles">审批流程</div>
<el-steps direction="vertical" :active="1">
<el-step title="发起审批" icon="el-icon-success"></el-step>
<el-step title="评估负责人审批" icon="el-icon-success"></el-step>
<el-step title="项目负责人审批" icon="el-icon-success"></el-step>
</el-steps>
</div>
<div class="approveR">
<div class="titles">审批信息</div>
<el-steps direction="vertical" :active="1">
<el-step title="发起审批" icon="el-icon-success"></el-step>
<el-step title="评估负责人审批" icon="el-icon-success"></el-step>
<el-step title="项目负责人审批" icon="el-icon-success" description="这是一段很长很长很长的描述性文字"></el-step>
</el-steps>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="风险评估报告" name="third">
<div class="titles">评估报告生成</div>
<el-table :data="reportList">
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="生成时间" align="center" prop="inherentId" />
<el-table-column label="生成人员" 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">
<template slot-scope="scope">
<div>
<el-button size="mini" type="text" icon="el-icon-download">下载</el-button>
</div>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import { getPlan, riskListInfo, riskList, exportRiskList } from "@/api/risk/plan";
export default {
data() {
return {
activeName: 'first',
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 现有风险清单库表格数据
listList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
inherentId: null,
code: null,
name: null,
type: null,
describe: null,
evaluationModel: null,
evaluationRange: null,
level: null,
factor: null,
measuresProject: null,
measuresProjectFileIds: null,
measuresAdministration: null,
measuresAdministrationFileIds: null,
measuresEmergency: null,
measuresEmergencyFileIds: null,
referenceBasis: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
},
reportList: [],
InfoList: {},
}
},
mounted() {
// console.log(this.$route.params, 'lll')
this.getInfo(this.$route.params.id)
this.getRiskList(this.$route.params.id)
},
methods: {
getInfo(id) {
riskListInfo(id).then(res => {
this.InfoList = res.data
})
},
getRiskList(id) {
riskList({ planId: id }).then(res => {
this.loading = false
this.listList = res.rows
})
},
exportList(id) {
console.log(id,'kkkk')
this.download('system/risk/plan/exportWord/riskNotification/' + id, {}, `风险告知卡.docx`)
}
},
handleClick() {
},
// 表单重置
reset() {
this.form = {
id: null,
inherentId: null,
code: null,
name: null,
type: null,
describe: null,
evaluationModel: null,
evaluationRange: null,
level: null,
factor: null,
measuresProject: null,
measuresProjectFileIds: null,
measuresAdministration: null,
measuresAdministrationFileIds: null,
measuresEmergency: null,
measuresEmergencyFileIds: null,
referenceBasis: 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() {
}
}
</script>
<style lang="scss" scoped>
.wrapper {
height: 100%;
width: 100%;
padding: 10px;
box-sizing: border-box;
display: flex;
flex-direction: column;
}
::v-deep .el-tabs__content {
height: calc(100vh - 334px) !important;
}
.titles {
position: relative;
font-size: 18px;
font-weight: bold;
margin: 10px 0 10px 20px;
color: #666666;
}
.titles::before {
content: "";
width: 8px;
height: 20px;
background: #3f9eff;
position: absolute;
left: -14px;
top: 0;
}
.approveResult {
flex: 1;
width: 100%;
height: calc(100vh - 360px) !important;
overflow-y: auto;
display: flex;
justify-content: space-between;
.approveL {
flex: 3;
width: 100%;
}
.approveR {
flex: 7;
width: 100%;
padding: 0 0 0 30px;
border-left: 1px solid #d7d7d7d7;
}
}
</style>
\ No newline at end of file
vue.config.js
View file @ 70b3b902
...@@ -7,7 +7,7 @@ function resolve(dir) { ...@@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin') 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 // 端口 const port = process.env.port || process.env.npm_config_port || 80 // 端口
...@@ -35,7 +35,8 @@ module.exports = { ...@@ -35,7 +35,8 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [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, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + process.env.VUE_APP_BASE_API]: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment