Skip to content

R
rongtong-app
Commit e827fe45 authored by p-wanping.song's avatar p-wanping.song
Browse files
Options

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

parents cefec28f 6df45dfc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 285 additions and 145 deletions
src/views/riskProject/add/addCurrent.vue
View file @ e827fe45
......@@ -163,7 +163,7 @@
<van-field name="hdPicture1" label="风险源图片">
<template #input>
<van-uploader
@delete="deleteFile(...arguments, 'uploaderImg')"
@delete="deleteFile(...arguments, 'pictureFile')"
multiple
:max-count="5"
upload-text="最多上传五个"
......@@ -212,7 +212,7 @@
autosize
placeholder="请输入"
/>
<van-field name="measuresProjectFile[]" label="上传附件">
<van-field name="measuresProjectFile[]" label="上传附件1">
<template #input>
<van-uploader
multiple
......@@ -220,7 +220,6 @@
upload-text="最多上传五个"
v-model="measuresProjectFile"
accept="file"
result-type="file"
@delete="deleteFile(...arguments, 'measuresProjectFile')"
>
<template slot="default">
......@@ -268,7 +267,6 @@
/>
<van-field
required
v-model="form.measuresDeptName"
name="measuresDeptName"
label="管控责任单位 "
......@@ -283,7 +281,6 @@
placeholder="请选择"
/>
<van-field
required
v-model="form.measuresUserName"
name="measuresUserName"
label="管控责任人 "
......@@ -302,7 +299,6 @@
upload-text="最多上传五个"
v-model="measuresAdministrationFile"
accept="file"
result-type="file"
@delete="deleteFile(...arguments, 'measuresAdministrationFile')"
>
<template slot="default">
......@@ -399,7 +395,6 @@
upload-text="最多上传五个"
v-model="measuresEmergencyFile"
accept="file"
result-type="file"
@delete="deleteFile(...arguments, 'measuresEmergencyFile')"
>
<template slot="default">
......@@ -439,7 +434,6 @@
</div>
<van-field
readonly
required
clickable
name="referenceBasis"
:value="form.referenceBasis"
......@@ -932,6 +926,9 @@ export default {
}
},
methods: {
afterRead(file) {
console.log(file);
},
timestampToTimes(time) {
return timestampToTime(new Date(time), "DT2", true);
},
......@@ -1205,19 +1202,19 @@ export default {
async deleteFile(val, detail, key) {
// console.log(val,detail)
if (val.fileId) {
console.log(detail, "ccc");
let formdata = new FormData();
formdata.append("key", val["fileId"]);
let res = await postFun("/mobile/remove", formdata);
if (res) {
console.log(res);
this.$toast({
title: "提示",
message: "删除成功!"
});
} else {
console.log("删除失败");
this[key].splice(detail.index, 0, val);
}
var ids = this.form[key + "Ids"].split(",");
const ind = ids.findIndex(x => x == val.fileId);
ids.splice(ind, 1);
this.form[key + "Ids"] = ids.join(",");
this.form[key].splice(detail.index, 1);
console.log(ids, this.form[key], "ddd");
this.$toast({
title: "提示",
message: "删除成功!"
});
}
},
jsonToFormData(config) {
......
src/views/riskProject/add/addInherent.vue
View file @ e827fe45
......@@ -161,7 +161,7 @@
<van-field name="hdPicture1" label="风险源图片">
<template #input>
<van-uploader
@delete="deleteFile(...arguments, 'uploaderImg')"
@delete="deleteFile(...arguments, 'pictureFile')"
multiple
:max-count="5"
upload-text="最多上传五个"
......@@ -218,7 +218,6 @@
upload-text="最多上传五个"
v-model="measuresProjectFile"
accept="file"
result-type="file"
@delete="deleteFile(...arguments, 'measuresProjectFile')"
>
<template slot="default">
......@@ -266,7 +265,6 @@
/>
<van-field
required
v-model="form.measuresDeptName"
name="measuresDeptName"
label="管控责任单位 "
......@@ -281,7 +279,6 @@
placeholder="请选择"
/>
<van-field
required
v-model="form.measuresUserName"
name="measuresUserName"
label="管控责任人 "
......@@ -300,7 +297,6 @@
upload-text="最多上传五个"
v-model="measuresAdministrationFile"
accept="file"
result-type="file"
@delete="deleteFile(...arguments, 'measuresAdministrationFile')"
>
<template slot="default">
......@@ -397,7 +393,6 @@
upload-text="最多上传五个"
v-model="measuresEmergencyFile"
accept="file"
result-type="file"
@delete="deleteFile(...arguments, 'measuresEmergencyFile')"
>
<template slot="default">
......@@ -436,8 +431,6 @@
参考依据
</div>
<van-field
readonly
required
clickable
name="referenceBasis"
:value="form.referenceBasis"
......@@ -608,7 +601,7 @@
@cancel="showTrouble = false"
/>
</van-popup>
<div style="margin: 16px 16px 0">
<van-button round block type="info" native-type="submit"
>提交</van-button
......@@ -942,9 +935,7 @@ export default {
});
},
//风险点
clickRiskDot(){
},
clickRiskDot() {},
// //后果严重程度
// getConsequence(){
// getFun(`/risk/plan/matrix/${type}/list`).then(res=>{
......@@ -991,18 +982,12 @@ export default {
// console.log(val,detail)
if (val.fileId) {
let formdata = new FormData();
this.form[key].splice(detail.index, 1);
formdata.append("key", val["fileId"]);
let res = await postFun("/mobile/remove", formdata);
if (res) {
console.log(res);
this.$toast({
title: "提示",
message: "删除成功!"
});
} else {
console.log("删除失败");
this[key].splice(detail.index, 0, val);
}
this.$toast({
title: "提示",
message: "删除成功!"
});
}
},
jsonToFormData(config) {
......
src/views/riskProject/add/addPresent.vue
View file @ e827fe45
......@@ -135,7 +135,7 @@
<van-field name="hdPicture1" label="风险源图片">
<template #input>
<van-uploader
@delete="deleteFile(...arguments, 'uploaderImg')"
@delete="deleteFile(...arguments, 'pictureFile')"
multiple
:max-count="5"
upload-text="最多上传五个"
......@@ -191,7 +191,6 @@
upload-text="最多上传五个"
v-model="measuresProjectFile"
accept="file"
result-type="file"
@delete="deleteFile(...arguments, 'measuresProjectFile')"
>
<template slot="default">
......@@ -272,7 +271,6 @@
upload-text="最多上传五个"
v-model="measuresAdministrationFile"
accept="file"
result-type="file"
@delete="deleteFile(...arguments, 'measuresAdministrationFile')"
>
<template slot="default">
......@@ -325,7 +323,6 @@
upload-text="最多上传五个"
v-model="measuresEmergencyFile"
accept="file"
result-type="file"
@delete="deleteFile(...arguments, 'measuresEmergencyFile')"
>
<template slot="default">
......
src/views/riskProject/add/index.vue
View file @ e827fe45
......@@ -94,6 +94,7 @@
<van-field
required
readonly
name="leaderUserName"
:value="form.leaderUserName"
label="评估小组组长"
......@@ -104,6 +105,7 @@
<van-field
required
readonly
name="workUserNames"
:value="form.workUserNames"
label="评估小组成员"
......@@ -357,8 +359,9 @@ export default {
var userInfo = getUserInfo();
this.form.userId = userInfo.userId;
this.form.userName = userInfo.nickName;
this.form.deptName = userInfo.dept.deptName;
this.form.deptId = userInfo.dept.deptId;
this.form.deptName = userInfo.dept.deptName;
getFun(`/risk/plan/project/list`).then(res => {
this.columnsSource = res.data;
});
......@@ -396,6 +399,7 @@ export default {
loadingType: "spinner",
duration: 0
});
console.log(this.form.deptId,'00000')
getFun(`/risk/plan/user/list/${this.form.deptId}`).then(res => {
if (res.code == 200) {
this.columnsTrouble = res.data;
......@@ -423,7 +427,6 @@ export default {
this.projectDept = true;
},
changeDept(id, name) {
console.log(id);
this.form.deptId = id;
this.form.deptName = name;
},
......
src/views/riskProject/add/taskList.vue
View file @ e827fe45
......@@ -181,29 +181,29 @@
<van-image
width="58"
height="58"
:src="(item.level == '较大风险' ?
require('@/assets/imgs/redInherent.png'):item.level == '较小风险'?
require('@/assets/imgs/blueInherent.png'):require('@/assets/imgs/inherentOrange.png')
:src="(item.level == '重大风险' ?
require('@/assets/imgs/redInherent.png'):item.level == '较大风险'?
require('@/assets/imgs/inherentOrange.png'): item.level === '一般风险'?require('@/assets/imgs/yellowInherent.png') :require('@/assets/imgs/blueInherent.png')
)"
/>
<!-- <van-image width="46" height="46" :src="item.avatar" /> -->
</van-col>
<van-col span="17">
<van-row gutter="">
<van-col span="9" style="font-weight: bold;color:#000;">风险名称：</van-col>
<van-col span="15" style="color: #606266;">{{ item.name }}</van-col>
<van-row gutter="0">
<van-col span="10" style="font-weight: bold;color:#000;font-size: 16px;">风险名称：</van-col>
<van-col span="14" style="color: #000;font-size: 16px;">{{ item.name }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="9" style="font-weight: bold;color:#000;">风险等级：</van-col>
<van-col span="15" style="color: #606266;">{{ item.level }}</van-col>
<van-row gutter="0">
<van-col span="9" style="font-weight: bold;color:#666666;font-size: 12px;">风险等级：</van-col>
<van-col span="15" style="color: #9d9d9d;font-size: 12px;">{{ item.level }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="9" style="font-weight: bold;color:#000;">上报时间：</van-col>
<van-col span="15" style="color: #606266;">{{ timestampToTimes(item.createTime, "DT2") }}</van-col>
<van-row gutter="0">
<van-col span="9" style="font-weight: bold;color:#666666;font-size: 12px;">上报时间：</van-col>
<van-col span="15" style="color: #9d9d9d;font-size: 12px;">{{ timestampToTimes(item.createTime, "DT2") }}</van-col>
</van-row>
<van-row gutter="">
<van-col span="9" style="font-weight: bold;color:#000;">所属房间：</van-col>
<van-col span="15" style="color: #606266;">{{ item.buildingName + item.floorName + item.roomName }}</van-col>
<van-row gutter="0">
<van-col span="9" style="font-weight: bold;color:#666666;font-size: 12px;">所属房间：</van-col>
<van-col span="15" style="color: #9d9d9d;font-size: 12px;">{{ item.buildingName + item.floorName + item.roomName }}</van-col>
</van-row>
</van-col>
</van-col>
......@@ -799,6 +799,9 @@ export default {
.cell-wrap {
position: relative;
}
.van-cell-group--inset .van-row{
line-height: 1.5 !important;
}
p {
font-size: 0.4rem;
......
src/views/riskProject/taskLedger/tabDetail.vue
View file @ e827fe45
......@@ -148,7 +148,7 @@
<van-field name="hdPicture1" label="风险源图片">
<template #input>
<van-uploader
@delete="deleteFile(...arguments, 'uploaderImg')"
@delete="deleteFile(...arguments, 'pictureFile')"
multiple
disabled
:max-count="5"
......@@ -208,7 +208,6 @@
upload-text="最多上传五个"
v-model="measuresProjectFile"
accept="file"
result-type="file"
@delete="deleteFile(...arguments, 'measuresProjectFile')"
>
<template slot="default">
......@@ -257,7 +256,6 @@
/>
<van-field
required
readonly
v-model="form.measuresDeptName"
name="measuresDeptName"
......@@ -268,7 +266,6 @@
placeholder="请选择"
/>
<van-field
required
readonly
v-model="form.measuresUserName"
name="measuresUserName"
......@@ -288,7 +285,6 @@
upload-text="最多上传五个"
v-model="measuresAdministrationFile"
accept="file"
result-type="file"
@delete="deleteFile(...arguments, 'measuresAdministrationFile')"
>
<template slot="default">
......@@ -389,7 +385,6 @@
upload-text="最多上传五个"
v-model="measuresEmergencyFile"
accept="file"
result-type="file"
@delete="deleteFile(...arguments, 'measuresEmergencyFile')"
>
<template slot="default">
......@@ -429,7 +424,6 @@
</div>
<van-field
readonly
required
clickable
name="referenceBasis"
:value="form.referenceBasis"
......@@ -838,17 +832,6 @@ export default {
if (val.fileId) {
let formdata = new FormData();
formdata.append("key", val["fileId"]);
let res = await postFun("/mobile/remove", formdata);
if (res) {
console.log(res);
this.$toast({
title: "提示",
message: "删除成功!"
});
} else {
console.log("删除失败");
this[key].splice(detail.index, 0, val);
}
}
},
jsonToFormData(config) {
......
vue.config.js
View file @ e827fe45
......@@ -8,11 +8,11 @@ module.exports = {
//以上的ip和端口是我们本机的;下面为需要跨域的
proxy: { //配置跨域
'/app-api': {
target: 'http://192.168.4.232:8080/', //这里是后台的地址
// target: 'http://192.168.4.232: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', // 显示代理调试信息
......
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