Skip to content

R
rongtong-pc
Commit cfd9119e authored by dlkong's avatar dlkong
Browse files
Options

项目配置人员角色；风险巡查添加岗位

parent 6d5fceb9
Show whitespace changes
Inline Side-by-side
Showing with 582 additions and 1 deletion
src/api/risk/currentProject.js 0 → 100644
View file @ cfd9119e
import request from '@/utils/request'
// 查询风险计划列表
export function listCurrentProject(query) {
return request({
url: '/risk/currentProject/list',
method: 'get',
params: query
})
}
\ No newline at end of file
src/api/system/currentRiskPost.js 0 → 100644
View file @ cfd9119e
import request from '@/utils/request'
// 查询现状风险岗位列表
export function listCurrentRiskPost(query) {
return request({
url: '/system/currentRiskPost/list',
method: 'get',
params: query
})
}
// 人员列表
export function userCurrentRiskPost(query) {
return request({
url: '/risk/currentProject/list',
method: 'get',
params: query
})
}
// 查询现状风险岗位详细
export function getCurrentRiskPost(id) {
return request({
url: '/system/currentRiskPost/' + id,
method: 'get'
})
}
// 新增现状风险岗位
export function addCurrentRiskPost(data) {
return request({
url: '/system/currentRiskPost',
method: 'post',
data: data
})
}
// 修改现状风险岗位
export function updateCurrentRiskPost(data) {
return request({
url: '/system/currentRiskPost',
method: 'put',
data: data
})
}
// 删除现状风险岗位
export function delCurrentRiskPost(id) {
return request({
url: '/system/currentRiskPost/' + id,
method: 'delete'
})
}
// 保存岗位
export function saveCurrentPost(data) {
return request({
url: '/system/currentRiskPost/save',
method: 'post',
data: data
})
}
src/api/system/post.js
View file @ cfd9119e
......@@ -46,7 +46,7 @@ export function delPost(postId) {
// 用户配置岗位保存
export function saveUserPost(data) {
return request({
url: '/system/currentProject/save',
url: '/risk/currentProject/save',
method: 'post',
data: data
})
......
src/assets/images/delete.svg 0 → 100644
View file @ cfd9119e
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1652765476275" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4184" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M928.16 144H736V64a32 32 0 0 0-32-32H320a32 32 0 0 0-32 32v80H95.84a32 32 0 0 0 0 64H129.6l77.92 698.656A96 96 0 0 0 302.912 992h418.144a96.032 96.032 0 0 0 95.424-85.344L894.4 208h33.728a32 32 0 0 0 0.032-64zM352 96h320v48H352V96z m400.896 803.552a32 32 0 0 1-31.808 28.448H302.912a32 32 0 0 1-31.808-28.448L193.984 208h636.032l-77.12 691.552z" p-id="4185" fill="#02a7f0"></path><path d="M608 820.928a32 32 0 0 0 32-32V319.104a32 32 0 0 0-64 0v469.824a32 32 0 0 0 32 32zM432 820.928a32 32 0 0 0 32-32V319.104a32 32 0 0 0-64 0v469.824a32 32 0 0 0 32 32z" p-id="4186" fill="#02a7f0"></path></svg>
\ No newline at end of file
src/assets/images/edit.svg 0 → 100644
View file @ cfd9119e
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1652765513402" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5003" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M775.84 392.768l-155.2-172.352L160.768 643.264l-38.368 187.936 190.56-12.832zM929.952 229.952l-131.2-150.944-0.288-0.32a16 16 0 0 0-22.592-0.96l-131.168 120.576 155.168 172.352 128.832-118.464a15.936 15.936 0 0 0 1.248-22.24zM96 896h832v64H96z" p-id="5004" fill="#02a7f0"></path></svg>
\ No newline at end of file
src/assets/images/work.svg 0 → 100644
View file @ cfd9119e
This source diff could not be displayed because it is too large. You can view the blob instead.
src/router/index.js
View file @ cfd9119e
......@@ -251,6 +251,20 @@ export const dynamicRoutes = [
},
],
},
{
path: "/risk/currentProject/projectPost",
component: Layout,
hidden: true,
permissions: ["system:dict:list"],
children: [
{
path: "index/:id(\\d+)",
component: () => import("@/views/risk/currentProject/projectPost"),
name: "projectPost",
meta: { title: "岗位详情", activeMenu: "/risk/currentProject/projectPost" },
},
],
},
];
// 防止连续点击多次路由报错
......
src/store/getters.js
View file @ cfd9119e
......@@ -8,6 +8,7 @@ const getters = {
token: state => state.user.token,
avatar: state => state.user.avatar,
name: state => state.user.name,
userId: state => state.user.userId,
introduction: state => state.user.introduction,
roles: state => state.user.roles,
permissions: state => state.user.permissions,
......
src/store/modules/user.js
View file @ cfd9119e
......@@ -5,6 +5,7 @@ const user = {
state: {
token: getToken(),
name: '',
userId: '',
avatar: '',
roles: [],
permissions: []
......@@ -17,6 +18,9 @@ const user = {
SET_NAME: (state, name) => {
state.name = name
},
SET_USERID: (state, userId) => {
state.userId = userId
},
SET_AVATAR: (state, avatar) => {
state.avatar = avatar
},
......@@ -60,6 +64,7 @@ const user = {
}
commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar)
commit('SET_USERID', user.userId)
resolve(res)
}).catch(error => {
reject(error)
......
src/views/risk/currentProject/index.vue 0 → 100644
View file @ cfd9119e
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="queryParams.projectName"
placeholder="请输入项目名称"
clearable
style="width: 240px"
@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>
<div v-for="(item, index) in projectList" :key="index" class="projectItem" @click="projectDetail(item)">
<div class="left">
<p>{{item.projectName}}</p>
<p>项目类型：{{item.projectType}} | 项目地址：{{item.projectAddress}}</p>
</div>
<img src="../../../assets/images/work.svg" alt="">
</div>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script type="text/ecmascript-6">
import { listCurrentProject } from '@/api/risk/currentProject'
export default {
name: 'currentProject',
data() {
return {
// 遮罩层
loading: true,
projectList:[],
// 总条数
total: 0,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
projectName: null,
},
}
},
created(){
this.getList();
},
mounted() {
},
methods: {
/** 查询基础数据-项目列表 */
getList() {
this.loading = true;
this.queryParams.userId = this.$store.getters.userId
listCurrentProject(this.queryParams).then((response) => {
this.projectList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
projectDetail(val){
this.$router.push("/risk/currentProject/projectPost/index/" + val.projectId)
}
},
}
</script>
<style scoped lang='scss'>
.projectItem{
width: 100%;
padding: 25px 120px 25px 30px;
margin-bottom: 25px;
border: 2px solid #e6e9f0;
border-radius: 20px;
box-shadow: 3px 3px 7px #e6e9f0;
cursor: pointer;
display: flex;
align-items: center;
justify-content: space-between;
.left{
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: space-between;
:first-child{
color: #3277f5 ;
font-size: 18px;
}
}
}
</style>
src/views/risk/currentProject/projectPost.vue 0 → 100644
View file @ cfd9119e
<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="riskPostName">
<el-input
v-model="queryParams.riskPostName"
placeholder="请输入岗位名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:currentRiskPost:add']"
>添加岗位</el-button>
</el-col>
</el-row>
<div id="xrdcard" v-if="currentRiskPostList.length">
<el-col :span="5" class="ssss" v-for="(item, index) in currentRiskPostList" :key="index" >
<!--内容-->
<div class="box-wrap">
<!-- 上部 -->
<div class="box-top">
<!-- 头像 -->
<div class="top-avator">
<img src="../../../assets/images/u8518.png">
</div>
<!-- 锁 -->
<div class="top-lock">
<!-- <img src="${ctx}img/patrol/lock.svg">-->
</div>
</div>
<!-- 下部 -->
<div class="box-bottom">
<div class="row">
<!-- 职位和数据 -->
<el-col :span="16">
<div class="con-role"><span class="span-title" :data-myTitle="item.riskPostName">{{item.riskPostName?(item.riskPostName.length>15?item.riskPostName.substring(0,15)+'...':item.riskPostName):'暂无数据'}}</span></div>
</el-col>
<el-col :span="8">
<!-- <div class="con-record">{{item.finalTypeCount}}类/{{item.finalCount}}条</div> -->
</el-col>
<!-- 说明 -->
<el-col :span="24" >
<div class="con-explain"><span class="span-title" :data-myTitle="item.riskPostDesc">{{item.riskPostDesc?(item.riskPostDesc.length>15?item.riskPostDesc.substring(0,15)+'...':item.riskPostDesc):'暂无数据'}}</span> </div>
</el-col>
<!-- 姓名 -->
<el-col :span="24" >
<div class="con-user"><span class="span-title" :data-myTitle="item.nickName">{{item.nickName?(item.nickName.length>15?item.nickName.substring(0,15)+'...':item.nickName):'暂无数据'}}</span></div>
</el-col>
<!-- 操作 -->
<el-col :span="24" >
<div class="con-operation">
<img class="edit-hover" src="../../../assets/images/edit.svg" @click="handleUpdate(item)">
<img class="delete-hover" src="../../../assets/images/delete.svg" @click="handleDelete(item)">
</div>
</el-col>
</div>
</div>
</div>
</el-col>
</div>
<div v-else class="noData">
<img src="../../../assets/images/u8460.png">
<p>暂无数据请通过添加方式创建巡查岗位</p>
</div>
<!-- 添加或修改现状风险岗位对话框 -->
<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
<el-tabs v-model="activeName">
<el-tab-pane label="基础信息" name="first">
<el-form ref="form" :model="form" :rules="rules" label-width="84px">
<el-form-item label="岗位名称" prop="riskPostName">
<el-input v-model="form.riskPostName" placeholder="请输入岗位名称" />
</el-form-item>
<el-form-item label="岗位类型" prop="patrolType">
<el-select v-model="form.patrolType" placeholder="请选择岗位类型" style="width:100%">
<el-option
v-for="dict in patrolTypeList"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="岗位描述" prop="riskPostDesc">
<el-input type="textarea" v-model="form.riskPostDesc" placeholder="请输入岗位描述" />
</el-form-item>
<el-form-item label="岗位成员" prop="userId">
<el-select v-model="form.userId" placeholder="请输入岗位成员" style="width:100%" multiple>
<el-option
v-for="dict in userList"
:key="dict.userId"
:label="dict.nickName"
:value="dict.userId"
></el-option>
</el-select>
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane label="清单匹配" name="second"></el-tab-pane>
</el-tabs>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listCurrentRiskPost, userCurrentRiskPost, saveCurrentPost, getCurrentRiskPost, delCurrentRiskPost, addCurrentRiskPost, updateCurrentRiskPost } from "@/api/system/currentRiskPost";
export default {
name: "projectPost",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 现状风险岗位表格数据
currentRiskPostList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 9999,
riskPostName: null,
},
form:{},
patrolTypeList:[],// 岗位类型
userList:[],
rules:{
riskPostName:[{ required: true, message: '请输入岗位名称', trigger: 'blur' }]
},
activeName:'first'
};
},
created() {
if (this.$route.params.id) {
this.queryParams.projectId = this.$route.params.id;
}
this.getList();
},
methods: {
/** 查询现状风险岗位列表 */
getList() {
this.loading = true;
listCurrentRiskPost(this.queryParams).then(response => {
this.currentRiskPostList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 查询人员列表 */
getUserList() {
this.loading = true;
userCurrentRiskPost(this.queryParams).then(response => {
this.userList = response.rows;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {}
this.activeName = 'first'
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.open = true;
this.reset();
this.getUserList()
this.title = "添加现状风险岗位";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
if (typeof row.userId == 'string') {
let arr = row.userId.split(',')
let arr2 = []
arr.forEach(i => {
i = Number(i)
arr2.push(i)
});
row.userId = arr2
}
this.form = row
this.getUserList()
this.open = true;
this.title = "修改现状风险岗位";
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
let params = {
"projectId":this.$route.params.id,
"riskPostCode":this.form.riskPostCode,
"riskPostName":this.form.riskPostName,
"patrolType":this.form.patrolType,
"riskPostDesc":this.form.riskPostDesc,
"userId":this.form.userId.join(),
}
if (this.form.id != null) {
params.id = this.form.id
saveCurrentPost(params).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
saveCurrentPost(params).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
this.$modal.confirm('是否确认删除？').then(function() {
return delCurrentRiskPost(row.id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
}
};
</script>
<style lang="scss" scoped>
#xrdcard{
width: 100%;
display: flex;
justify-content: flex-start;
flex-wrap: wrap;
}
.noData{
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
}
.ssss{
margin-right: 30px;
// display: flex;
// justify-content: space-between;
// padding-left: 0 !important;
// padding-right: 0 !important;
}
.top-avator img{
width: 90px;
height: 90px;
}
.box-wrap {
padding: 20px 0px 20px 0px;
}
.box-top{
height: 150px;
display: flex;
align-items: center;
justify-content: center;
position: relative;
background-color: #3f9f9f;
border: 1px solid #e1e1e1;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
}
.top-lock{
position: absolute;
top: 10px;
right: 10px;
}
.box-bottom{
padding: 15px 10px 10px;
background-color: #ffffff;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
border: 1px solid #e1e1e1;
border-top: none;
}
.row{
height: 100%;
overflow: hidden;
}
.con-role{
color: #8c8c8c;
font-size: 16px;
font-weight: bold;
line-height: 35px;
}
.con-record{
font-size: 12px;
color: #b3becd;
text-align: right;
}
.con-explain{
color: #b3becd;
font-size: 12px;
margin-top: 10px;
cursor:default;
}
.con-user{
margin-top: 25px;
color: #1d9bd5;
cursor:default;
}
.con-operation{
margin-top: 20px;
text-align: right;
}
.con-operation img{
width: 18px;
height: 19px;
margin-left: 10px;
cursor: pointer;
}
</style>
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