Skip to content

R
rongtong-app
Commit 6df45dfc authored by 杨帆's avatar 杨帆
Browse files
Options

Merge branch 'dev-yf'' into 'develop' 

Dev yf'

See merge request !22
parents d41ef60f 0fb8d724
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 262 additions and 128 deletions
src/views/riskProject/add/addCurrent.vue
View file @ 6df45dfc
......@@ -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 @ 6df45dfc
......@@ -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 @ 6df45dfc
......@@ -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/taskLedger/tabDetail.vue
View file @ 6df45dfc
......@@ -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 @ 6df45dfc
......@@ -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