Skip to content

R
rongtong-app
Commit d4f53fd9 authored by yf's avatar yf
Browse files
Options

合并冲突

parents 24568544 ea53da41
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 13727 additions and 355 deletions
src/components/header.vue
View file @ d4f53fd9
......@@ -26,6 +26,9 @@ export default {
text:{
default:"未知",
type:String
},
customBack:{
type:Function,
}
},
data() {
......@@ -39,7 +42,11 @@ export default {
methods: {
/* 左侧图标跳转方法 */
to(){
history.go(-1)
if(this.customBack){
this.customBack()
}else{
history.go(-1)
}
}
}
}
......
src/router/index.js
View file @ d4f53fd9
This diff is collapsed.
src/service/table.js
View file @ d4f53fd9
import request from '@/utils/axios'
import request from "@/utils/axios";
/*get请求*/
export function getFun(url,params) {
return request({
url: url,
method: 'get',
params
})
export function getFun(url, params) {
return request({
url: url,
method: "get",
params
});
}
/* post请求 */
export function postFun(url,data) {
return request({
url: url,
method: 'post',
data
})
export function postFun(url, data) {
return request({
url: url,
method: "post",
data
});
}
/* delete请求 */
export function deleteFun(url, params, data) {
return request({
url: url,
method: "delete",
params,
data
});
}
export function putFun(url, data) {
return request({
url: url,
method: "put",
data
});
}
/*文件下载get请求*/
export function fileDownFun(url,params) {
return request({
url:url,
method: 'GET',
params,
responseType: 'blob'/*下载文件必填项*/
})
export function fileDownFun(url, params) {
return request({
url: url,
method: "GET",
params,
responseType: "blob" /*下载文件必填项*/
});
}
/*文件下载post请求*/
export function fileDownFuns(url,data) {
return request({
url: url,
method: 'POST',
data,
responseType: 'blob'/*下载文件必填项*/
})
}
\ No newline at end of file
export function fileDownFuns(url, data) {
return request({
url: url,
method: "POST",
data,
responseType: "blob" /*下载文件必填项*/
});
}
src/views/riskProject/add/addPresent.vue
View file @ d4f53fd9
......@@ -158,19 +158,15 @@
/>
已采取的管控措施
</div>
<van-field label="技术措施">
<template #input>
<van-field
v-model="form.measuresProject"
name="measuresProject"
label=""
type="textarea"
rows="3"
autosize
placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/>
</template>
<van-field
label="技术措施"
v-model="form.measuresProject"
name="measuresProject"
type="textarea"
rows="3"
autosize
placeholder="请输入"
>
</van-field>
<van-field name="measuresProjectFile[]" label="技术措施附件">
<template #input>
......@@ -205,19 +201,15 @@
</van-uploader>
</template>
</van-field>
<van-field label="管理措施">
<template #input>
<van-field
v-model="form.measuresAdministration"
name="measuresAdministration"
label=""
type="textarea"
rows="3"
autosize
placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/>
</template>
<van-field
label="管理措施"
v-model="form.measuresAdministration"
name="measuresAdministration"
type="textarea"
rows="3"
autosize
placeholder="请输入"
>
</van-field>
<van-field name="measuresAdministrationFile[]" label="管理措施附件">
<template #input>
......@@ -252,19 +244,15 @@
</van-uploader>
</template>
</van-field>
<van-field label="应急措施">
<template #input>
<van-field
v-model="form.measuresEmergency"
name="measuresEmergency"
label=""
type="textarea"
rows="3"
autosize
placeholder="请输入"
style="padding-left: 0;padding-top: 0;"
/>
</template>
<van-field
label="应急措施"
v-model="form.measuresEmergency"
name="measuresEmergency"
type="textarea"
rows="3"
autosize
placeholder="请输入"
>
</van-field>
<van-field name="measuresEmergencyFile[]" label="应急措施附件">
<template #input>
......@@ -580,19 +568,6 @@ export default {
SelectList,
selectFloor
},
beforeRouteEnter(to, from, next) {
if (from.name == "addCurrent") {
sessionStorage.setItem("presentForm", "");
sessionStorage.setItem("level", "");
}
next();
},
beforeRouteLeave(to, from, next) {
if (to.name != "riskInherent") {
sessionStorage.setItem("presentForm", JSON.stringify(this.form));
}
next();
},
data() {
return {
loadingStatus: false,
......@@ -685,13 +660,14 @@ export default {
this.existingId = this.$route.params.existingId;
this.inherentId = this.form.inherentId =
this.$route.params.inherentId || sessionStorage.getItem("inherentId");
this.postReturnEcho();
},
mounted() {
if (sessionStorage.getItem("presentForm") != "") {
if (sessionStorage.getItem("presentForm")) {
this.form = JSON.parse(sessionStorage.getItem("presentForm"));
this.form.level = sessionStorage.getItem("level");
sessionStorage.removeItem("presentForm");
} else {
this.postReturnEcho();
}
},
methods: {
......@@ -704,7 +680,6 @@ export default {
if (item.measuresUserName == e)
this.form.measuresUserPhone = item.measuresUserPhone;
});
console.log(e, 1111);
});
},
measuresDeptNameChange(e) {
......@@ -778,12 +753,30 @@ export default {
this.form.factor = res.data.factor;
this.form.type = res.data.type;
this.form.planId = res.data.planId;
this.form.measuresProject = res.data.measuresProject;
this.form.measuresAdministration = res.data.measuresAdministration;
this.form.measuresDeptName = res.data.measuresDeptName;
this.form.measuresUserName = res.data.measuresUserName;
this.form.measuresUserPhone = res.data.measuresUserPhone;
this.$forceUpdate();
/* 下面这些值还要可以输入，用上面的方法赋值后没有办法输入新的值！还不知道为啥 */
const {
measuresProject,
measuresEmergency,
measuresAdministration,
measuresDeptName,
measuresUserName,
measuresUserPhone,
presenceLocation
} = res.data;
const formValue = {
measuresProject,
measuresEmergency,
measuresAdministration,
measuresDeptName,
measuresUserName,
measuresUserPhone,
presenceLocation
};
this.form = {
...this.form,
...formValue
};
})
.catch(() => {
this.$toast.clear();
......@@ -950,6 +943,7 @@ export default {
},
//开始测评
goResultPage() {
sessionStorage.setItem("presentForm", JSON.stringify(this.form));
this.$router.push({
name: "resultPage",
params: {
......
src/views/riskProject/add/addProject.vue 0 → 100644
View file @ d4f53fd9
This diff is collapsed.
src/views/riskProject/add/index.vue
View file @ d4f53fd9
......@@ -29,8 +29,8 @@
<van-field
readonly
required
name="deptName"
:value="form.deptName"
name="createDeptName"
:value="form.createDeptName"
label="创建单位"
placeholder="请输入"
:rules="[{ required: true, message: '创建单位不能为空' }]"
......@@ -44,15 +44,25 @@
:rules="[{ required: true, message: '任务名称不能为空' }]"
/>
<van-field
required
name="projectName"
:value="form.projectName"
label="关联项目"
placeholder="请选择"
@click="show = true"
:rules="[{ required: true, message: '关联项目不能为空' }]"
/>
<div style="display: flex;">
<van-field
required
readonly
name="projectName"
:value="form.projectName"
label="关联项目"
placeholder="请选择"
@click="show = true"
:rules="[{ required: true, message: '关联项目不能为空' }]"
/>
<van-button
style="color: #cccc;background-color: #f0f1f5;"
icon="plus"
type="info"
native-type="button"
@click="createProject"
/>
</div>
<!-- <van-popup v-model="showSource" position="bottom">
<van-picker
show-toolbar
......@@ -62,16 +72,25 @@
@cancel="showSource = false"
/>
</van-popup> -->
<van-field
required
name="buildingNames"
:value="form.buildingNames"
label="评估楼栋"
placeholder="请输入"
@click="getRiskList()"
:rules="[{ required: true, message: '评估楼栋不能为空' }]"
/>
<div style="display: flex;">
<van-field
required
readonly
name="buildingNames"
:value="form.buildingNames"
label="评估楼栋"
placeholder="请输入"
@click="getRiskList()"
:rules="[{ required: true, message: '评估楼栋不能为空' }]"
/>
<van-button
style="color: #cccc;background-color: #f0f1f5;"
icon="plus"
type="info"
native-type="button"
@click="createBuilding"
/>
</div>
<div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
>
......@@ -84,6 +103,7 @@
</div>
<van-field
required
readonly
name="deptName"
:value="form.deptName"
label="评估小组选择"
......@@ -116,6 +136,7 @@
<van-field
:value="form.startTime"
readonly
required
name="startTime"
label="任务开始时间"
......@@ -126,6 +147,7 @@
<van-field
:value="form.endTime"
readonly
required
name="endTime"
label="任务结束时间"
......@@ -274,11 +296,19 @@
>取消</van-button
>
</div>
<CreateComponent
v-if="createComponentData.visible"
@close="createComponentData.close"
@confirm="createComponentData.confirm"
:type="createComponentData.type"
:projectId="createComponentData.projectId"
/>
</div>
</template>
<script>
import LHeader from "@/components/header.vue";
import CreateComponent from "./addProject.vue";
import selectDept from "@/components/selectDept/index.vue";
import selectPeople from "@/views/riskProject/add/projectList.vue";
import { timestampToTime, generateId } from "@/utils/format";
......@@ -287,14 +317,15 @@ import {
getLocalUserInfo,
setLocalUserInfo
} from "@/utils/userInfo";
import { getFun, postFun } from "@/service/table.js";
import { getFun, postFun, putFun } from "@/service/table.js";
export default {
name: "risk-add",
components: {
LHeader,
selectPeople,
selectDept
selectDept,
CreateComponent
},
beforeRouteLeave(to, from, next) {
if (to.name != "matrix-grad") {
......@@ -303,6 +334,12 @@ export default {
},
data() {
return {
createComponentData: {
visible: false,
type: "",
close: this.projectComponentClose,
confirm: this.projectComponentConfirm
},
loadingStatus: false,
loadingText: "提交...",
taskId: "",
......@@ -364,18 +401,66 @@ export default {
};
},
created() {
var userInfo = getUserInfo();
this.form.userId = userInfo.userId;
this.form.userName = userInfo.nickName;
this.form.deptId = userInfo.dept.deptId;
this.form.deptName = userInfo.dept.deptName;
if (this.$route.query.id) {
this.text = "编辑";
this.getDetail(this.$route.query.id);
} else {
var userInfo = getUserInfo();
this.form.userId = userInfo.userId;
this.form.userName = userInfo.nickName;
this.form.deptId = userInfo.dept.deptId;
this.form.deptName = userInfo.dept.deptName;
this.form.createDeptName = userInfo.dept.deptName;
}
getFun(`/risk/plan/project/list`).then(res => {
this.columnsSource = res.data;
});
// this.getList();
},
methods: {
/* 创建项目 */
createProject() {
this.createComponentData.visible = true;
this.createComponentData.type = "project";
},
/* 创建 */
createBuilding() {
if (!this.form.projectId) {
this.$toast({
title: "提示",
message: "请选择关联项目!"
});
return false;
}
this.createComponentData.visible = true;
this.createComponentData.type = "building";
this.createComponentData.projectId = this.form.projectId;
},
projectComponentClose() {
this.createComponentData.visible = false;
this.createComponentData.type = "";
},
projectComponentConfirm(data) {
// this.createComponentData.visible = false;
// this.createComponentData.type = '';
},
getDetail(id) {
this.$toast.loading({
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0
});
getFun(`/risk/plan/details/${id}`)
.then(res => {
this.$toast.clear();
this.form = res.data.detailsDto;
this.form.userName = this.form.createUserName;
})
.catch(() => {
this.$toast.clear();
this.$toast.fail("加载失败,请稍后再试");
});
},
checkAll() {
this.$refs.checkboxGroup.toggleAll(true);
},
......@@ -520,7 +605,15 @@ export default {
// });
this.loadingStatus = true;
let url = "/risk/plan";
postFun(url, this.form)
const fetch = () => {
if (this.$route.query.id) {
return putFun(url, this.form);
} else {
delete this.form.createDeptName;
return postFun(url, this.form);
}
};
fetch()
.then(res => {
this.$toast.clear();
this.$toast.success({
......@@ -535,6 +628,7 @@ export default {
this.$toast.fail("提交失败,请稍后再试");
this.loadingStatus = false;
});
this.$toast.clear();
},
......
src/views/riskProject/add/taskList.vue
View file @ d4f53fd9
......@@ -158,9 +158,10 @@
<van-tab title="风险清单">
<van-sticky>
<van-dropdown-menu>
<van-dropdown-item v-model="value1" :options="option1" />
<van-dropdown-item v-model="value2" :options="option2" />
<van-dropdown-item v-model="value3" :options="option3" />
<van-dropdown-item v-model="buildingFValue" :options="buildingFList" get-container="body" @change="changeNextList('GroundList','buildingF')"/> <!-- 楼栋 -->
<van-dropdown-item v-model="groundValue" :options="groundList" get-container="body" @change="changeNextList('FloorList','ground')"/> <!-- 地上地下 -->
<van-dropdown-item v-model="floorValue" :options="floorList" get-container="body" @change="changeNextList('RoomList','floor')"/> <!-- 楼层 -->
<van-dropdown-item v-model="roomValue" :options="roomList" get-container="body" @change="changeNextList('','room')"/> <!-- 房间 -->
</van-dropdown-menu>
</van-sticky>
<div style="overflow-y: auto;padding: 10px;">
......@@ -381,7 +382,7 @@
<div>任务完成</div>
</div> -->
</div>
<div
<!-- <div
v-show="pathAuth == 'riskManage' && status == 0"
style="display: flex;
justify-content: space-around;
......@@ -409,7 +410,7 @@
<div style="font-size: 22px;"><van-icon name="cross" /></div>
<div>删除任务</div>
</div>
</div>
</div> -->
<div
v-show="pathAuth == 'riskApprove0' && status == 2"
style="display: flex;
......@@ -599,21 +600,22 @@ export default {
form: {},
tabs: [],
riskList: [],
value1: 0,
value2: "a",
value3: "1",
option1: [
{ text: "楼栋", value: 0 },
{ text: "全部", value: 1 }
floorValue: 0,
groundValue:0,
roomValue: 0,
buildingFValue:0,
buildingFList: [
{ text: "全部", value: 0 }
],
groundList: [
{ text: "全部", value: 0,children:[]}
],
option2: [
{ text: "楼层", value: "a" },
{ text: "全部", value: "b" }
floorList: [
{ text: "全部", value: 0 }
],
roomList: [
{ text: "全部", value: 0 }
],
option3: [
{ text: "房间", value: "1" },
{ text: "全部", value: "2" }
]
};
},
created() {
......@@ -623,11 +625,71 @@ export default {
this.pathAuth = sessionStorage.getItem("pathAuth");
this.postList(this.planId, buildingId);
this.getRiskTaskList(this.planId, buildingId);
this.getBuildingFList()
},
methods: {
timestampToTimes(time, type) {
return timestampToTime(new Date(time), type, true);
},
/* swp add 风险清单筛选 */
changeData(arr) {
if(Array.isArray(arr)){
return arr.map(item=>({ text: item.name,value: item.id || item.name,...item}))
}
},
getBuildingFList(){
getFun(`/risk/plan/plan/building/list/${this.planId}`).then(res=>{
const data = res.data;
this.buildingFList = [{ text: "全部", value: 0 },...this.changeData(data)]
})
},
getGroundList(){
getFun(`/risk/plan/floor/list/${this.buildingFValue}`)
.then(res => {
const data = res.data;
this.groundList = [{ text: "全部", value: 0,children:[] },...this.changeData(data)]
})
.catch(() => {
this.$toast.fail("加载失败,请稍后再试");
});
},
getFloorList() {
const getfloors = this.groundList.find(x=>x.value===this.groundValue)
if(getfloors){
this.floorList = [{ text: "全部", value: 0 },...this.changeData(getfloors.children)]
}
},
getRoomList() {
getFun(`/risk/plan/room/list/${this.floorValue}`)
.then(res => {
const data = res.data;
this.roomList = [{ text: "全部", value: 0 },...this.changeData(data)]
}) .catch(() => {
this.$toast.fail("加载失败,请稍后再试");
});
},
/* 切换楼栋，楼层 */
changeNextList(needChange,from){
this.getRiskTaskList(this.planId,this.buildingFValue||'',{
floorId:this.floorValue||'',
roomId:this.roomValue||'',
})
/* 清空后面子项 start*/
const list = ['buildingF','ground','floor','room'];
const i = list.indexOf(from);
if(i>-1){
list.slice(i+1).forEach(val=>{
this[val+'Value'] = 0;
this[val+'List'] = [{ text: "全部", value: 0}];
})
}
/* 清空后面子项 end*/
needChange&&this['get'+needChange]()
},
/* swp end 风险清单筛选 */
//执行任务
performTasks() {
sessionStorage.setItem(
......@@ -713,9 +775,9 @@ export default {
});
},
//风险清单列表
getRiskTaskList(planId, buildingId) {
getRiskTaskList(planId, buildingId,data) {
if (buildingId) {
getFun(`/risk/plan/inherent/list/${planId}/${buildingId}`).then(res => {
getFun(`/risk/plan/inherent/list/${planId}/${buildingId}`,data).then(res => {
this.riskList = res.data;
});
} else {
......
src/views/riskProject/manage/index.vue
View file @ d4f53fd9
......@@ -73,6 +73,12 @@
<van-button round type="primary" @click="goDetail(item)"
>详情</van-button
>
<van-button v-if="active==0" round type="info" @click="toEdit(item)"
>编辑</van-button
>
<van-button v-if="active==0" round type="danger" @click="toDelete(item)"
>删除</van-button
>
<!-- <van-button round type="info" @click="goConfirm(item)" v-show="active==0"
>确认</van-button
> -->
......@@ -108,7 +114,8 @@
<script>
import LHeader from "@/components/header.vue";
import { timestampToTime, generateId } from "@/utils/format";
import { getFun, postFun } from "@/service/table.js";
import { getFun, postFun,deleteFun } from "@/service/table.js";
import { Toast ,Dialog} from 'vant';
// import { postriskConList } from "@/service/risk";
export default {
name: "risk-confirme",
......@@ -203,6 +210,31 @@ export default {
sessionStorage.setItem("buildingId", "");
this.showIndex = null;
},
/* 编辑 */
toEdit(data){
this.$router.push({
name:'riskAdd',
query:{
id:data.id
}
})
},
/* 删除 */
toDelete(data){
Dialog.confirm({
title: '提示',
message: '是否确认删除？'
}).then(() => {
// on confirm
deleteFun('/risk/plan/'+data.id).then(res=>{
Toast.success('删除成功')
this.postList();
})
}).catch(() => {
// on cancel
Toast.fail('删除失败')
});
},
// 确认
goConfirm(data) {
this.$router.push({
......
vue.config.js
View file @ d4f53fd9
......@@ -9,11 +9,12 @@ module.exports = {
proxy: {
//配置跨域
"/app-api": {
// target: "http://192.168.4.232:8080/", //这里是后台的地址
target: "http://192.168.4.232:8080/", //这里是后台的地址
// target: "http://192.168.10.137:8080/", //这里是后台的地址
// target: 'http://192.168.15.124:8080/', //这里是杨帆的地址
// target: 'http://192.168.10.137:8080/', //这里是昊哥的地址
// target: 'http://192.168.10.36:8080/', //这里是昊哥的地址
target: 'http://localhost:8081/', //这里是后台的地址
// target: 'http://localhost:8081/', //这里是后台的地址
ws: true,
changOrigin: true //允许跨域
// logLevel: 'debug', // 显示代理调试信息
......
yarn.lock 0 → 100644
View file @ d4f53fd9
This diff is collapsed.
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