Skip to content

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

Dev yf'

parent 089370e8
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 56 deletions
src/views/riskProject/add/addCurrent.vue
View file @ 19329335
...@@ -366,30 +366,43 @@ ...@@ -366,30 +366,43 @@
v-model="form.measuresDeptName" v-model="form.measuresDeptName"
name="measuresDeptName" name="measuresDeptName"
label="管控责任单位 " label="管控责任单位 "
type="textarea" type="input"
rows="1" rows="1"
autosize autosize
placeholder="请输入" placeholder="请输入"
list="measure-deptname"
@input="measuresDeptNameChange"
/> />
<select> <datalist id="measure-deptname">
<option>JAVA</option> <option
<option>C++</option> :value="item.measuresDeptName"
<option>C+</option> v-for="item in measureDeptList"
</select> :key="item.measuresDeptName"
></option>
</datalist>
<van-field <van-field
v-model="form.measuresUserName" v-model="form.measuresUserName"
name="measuresUserName" name="measuresUserName"
label="管控责任人 " label="管控责任人 "
type="textarea" type="input"
rows="1" rows="1"
autosize autosize
placeholder="请输入" placeholder="请输入"
list="measure-name"
@input="measuresUserNameChange"
/> />
<datalist id="measure-name">
<option
v-for="item in measureNameList"
:key="item.measuresUserName"
:value="item.measuresUserName"
></option>
</datalist>
<van-field <van-field
v-model="form.measuresUserPhone" v-model="form.measuresUserPhone"
name="measuresUserPhone" name="measuresUserPhone"
label="管控责任人联系方式" label="管控责任人联系方式"
type="textarea" type="input"
rows="1" rows="1"
autosize autosize
placeholder="请输入" placeholder="请输入"
...@@ -656,7 +669,13 @@ ...@@ -656,7 +669,13 @@
/> />
</van-popup> </van-popup>
<div style="margin: 16px 16px 0"> <div style="margin: 16px 16px 0">
<van-button round block type="info" native-type="submit" <van-button
:loading="loadingStatus"
:loading-text="loadingText"
round
block
type="info"
native-type="submit"
>提交</van-button >提交</van-button
> >
</div> </div>
...@@ -882,6 +901,10 @@ export default { ...@@ -882,6 +901,10 @@ export default {
}, },
data() { data() {
return { return {
loadingStatus: false,
loadingText: "提交...",
measureNameList: [],
measureDeptList: [],
showIndex: null, showIndex: null,
measuresDept: false, measuresDept: false,
ShowfloorList: false, ShowfloorList: false,
...@@ -983,6 +1006,25 @@ export default { ...@@ -983,6 +1006,25 @@ export default {
} }
}, },
methods: { methods: {
measuresUserNameChange(e) {
getFun(
`/risk/plan/inherent/getResponsibilityPersons?personName=${e}&projectId=${this.form.projectId}`
).then(res => {
this.measureNameList = res.data;
this.measureNameList.forEach(item => {
if (item.measuresUserName == e)
this.form.measuresUserPhone = item.measuresUserPhone;
});
console.log(e, 1111);
});
},
measuresDeptNameChange(e) {
getFun(
`/risk/plan/inherent/getResponsibilityUnits?unitName=${e}&projectId=${this.form.projectId}`
).then(res => {
this.measureDeptList = res.data;
});
},
// 详情 // 详情
goDetail(data) { goDetail(data) {
sessionStorage.setItem("inherentId", this.inherentId); sessionStorage.setItem("inherentId", this.inherentId);
...@@ -1331,6 +1373,7 @@ export default { ...@@ -1331,6 +1373,7 @@ export default {
// console.log('%c [ values ]-592', 'font-size:13px; background:pink; color:#bf2c9f;', values) // console.log('%c [ values ]-592', 'font-size:13px; background:pink; color:#bf2c9f;', values)
var formDataJson = this.jsonToFormData(this.form); var formDataJson = this.jsonToFormData(this.form);
let url = "/risk/plan/inherent"; let url = "/risk/plan/inherent";
this.loadingStatus = true;
(values.hdPicture1 || []).forEach(item => { (values.hdPicture1 || []).forEach(item => {
if (item.file) { if (item.file) {
formDataJson.append("pictureFile[]", item.file); formDataJson.append("pictureFile[]", item.file);
...@@ -1366,11 +1409,13 @@ export default { ...@@ -1366,11 +1409,13 @@ export default {
message: "提交成功", message: "提交成功",
duration: 2000 duration: 2000
}); });
this.loadingStatus = false;
history.go(-1); history.go(-1);
}) })
.catch(() => { .catch(() => {
this.$toast.clear(); this.$toast.clear();
this.$toast.fail("提交失败,请稍后再试"); this.$toast.fail("提交失败,请稍后再试");
this.loadingStatus = false;
}); });
this.$toast.clear(); this.$toast.clear();
}, },
......
src/views/riskProject/add/addInherent.vue
View file @ 19329335
...@@ -392,7 +392,7 @@ ...@@ -392,7 +392,7 @@
v-for="item in measureNameList" v-for="item in measureNameList"
:key="item.measuresUserName" :key="item.measuresUserName"
:value="item.measuresUserName" :value="item.measuresUserName"
/> ></option>
</datalist> </datalist>
<van-field <van-field
v-model="form.measuresUserPhone" v-model="form.measuresUserPhone"
...@@ -652,7 +652,13 @@ ...@@ -652,7 +652,13 @@
</van-popup> </van-popup>
<div style="margin: 16px 16px 0"> <div style="margin: 16px 16px 0">
<van-button round block type="info" native-type="submit" <van-button
:loading="loadingStatus"
:loading-text="loadingText"
round
block
type="info"
native-type="submit"
>提交</van-button >提交</van-button
> >
</div> </div>
...@@ -719,6 +725,8 @@ export default { ...@@ -719,6 +725,8 @@ export default {
}, },
data() { data() {
return { return {
loadingStatus: false,
loadingText: "提交...",
measureNameList: [], measureNameList: [],
measureDeptList: [], measureDeptList: [],
measuresDept: false, measuresDept: false,
...@@ -848,7 +856,6 @@ export default { ...@@ -848,7 +856,6 @@ export default {
this.measureDeptList = res.data; this.measureDeptList = res.data;
}); });
}, },
getMeasureList(search) {},
/* swp add end */ /* swp add end */
// 项目负责人 // 项目负责人
onConTrouble(value) { onConTrouble(value) {
...@@ -1071,6 +1078,7 @@ export default { ...@@ -1071,6 +1078,7 @@ export default {
// console.log('%c [ values ]-592', 'font-size:13px; background:pink; color:#bf2c9f;', values) // console.log('%c [ values ]-592', 'font-size:13px; background:pink; color:#bf2c9f;', values)
var formDataJson = this.jsonToFormData(this.form); var formDataJson = this.jsonToFormData(this.form);
let url = "/risk/plan/inherent"; let url = "/risk/plan/inherent";
this.loadingStatus = true;
values.hdPicture1.forEach(item => { values.hdPicture1.forEach(item => {
if (item.file) { if (item.file) {
formDataJson.append("pictureFile[]", item.file); formDataJson.append("pictureFile[]", item.file);
...@@ -1099,6 +1107,7 @@ export default { ...@@ -1099,6 +1107,7 @@ export default {
formDataJson.append("measuresAdministrationFile[]", item.fileId); formDataJson.append("measuresAdministrationFile[]", item.fileId);
} }
}); });
postFun(url, formDataJson) postFun(url, formDataJson)
.then(res => { .then(res => {
this.$toast.clear(); this.$toast.clear();
...@@ -1106,11 +1115,13 @@ export default { ...@@ -1106,11 +1115,13 @@ export default {
message: "提交成功", message: "提交成功",
duration: 2000 duration: 2000
}); });
this.loadingStatus = false;
history.go(-1); history.go(-1);
}) })
.catch(() => { .catch(() => {
this.$toast.clear(); this.$toast.clear();
this.$toast.fail("提交失败,请稍后再试"); this.$toast.fail("提交失败,请稍后再试");
this.loadingStatus = false;
}); });
this.$toast.clear(); this.$toast.clear();
}, },
......
src/views/riskProject/add/addPresent.vue
View file @ 19329335
...@@ -305,25 +305,43 @@ ...@@ -305,25 +305,43 @@
v-model="form.measuresDeptName" v-model="form.measuresDeptName"
name="measuresDeptName" name="measuresDeptName"
label="管控责任单位 " label="管控责任单位 "
type="textarea" type="input"
rows="1" rows="1"
autosize autosize
placeholder="请输入" placeholder="请输入"
list="measure-deptname"
@input="measuresDeptNameChange"
/> />
<datalist id="measure-deptname">
<option
:value="item.measuresDeptName"
v-for="item in measureDeptList"
:key="item.measuresDeptName"
></option>
</datalist>
<van-field <van-field
v-model="form.measuresUserName" v-model="form.measuresUserName"
name="measuresUserName" name="measuresUserName"
label="管控责任人 " label="管控责任人 "
type="textarea" type="input"
rows="1" rows="1"
autosize autosize
placeholder="请输入" placeholder="请输入"
list="measure-name"
@input="measuresUserNameChange"
/> />
<datalist id="measure-name">
<option
v-for="item in measureNameList"
:key="item.measuresUserName"
:value="item.measuresUserName"
></option>
</datalist>
<van-field <van-field
v-model="form.measuresUserPhone" v-model="form.measuresUserPhone"
name="measuresUserPhone" name="measuresUserPhone"
label="管控责任人联系方式" label="管控责任人联系方式"
type="textarea" type="input"
rows="1" rows="1"
autosize autosize
placeholder="请输入" placeholder="请输入"
...@@ -525,7 +543,13 @@ ...@@ -525,7 +543,13 @@
</van-popup> </van-popup>
<div style="margin: 16px 16px 0"> <div style="margin: 16px 16px 0">
<van-button round block type="info" native-type="submit" <van-button
:loading="loadingStatus"
:loading-text="loadingText"
round
block
type="info"
native-type="submit"
>提交</van-button >提交</van-button
> >
</div> </div>
...@@ -571,6 +595,10 @@ export default { ...@@ -571,6 +595,10 @@ export default {
}, },
data() { data() {
return { return {
loadingStatus: false,
loadingText: "提交...",
measureNameList: [],
measureDeptList: [],
isEdit: false, isEdit: false,
existingId: 0, existingId: 0,
measuresDept: false, measuresDept: false,
...@@ -667,6 +695,25 @@ export default { ...@@ -667,6 +695,25 @@ export default {
} }
}, },
methods: { methods: {
measuresUserNameChange(e) {
getFun(
`/risk/plan/inherent/getResponsibilityPersons?personName=${e}&projectId=${this.form.projectId}`
).then(res => {
this.measureNameList = res.data;
this.measureNameList.forEach(item => {
if (item.measuresUserName == e)
this.form.measuresUserPhone = item.measuresUserPhone;
});
console.log(e, 1111);
});
},
measuresDeptNameChange(e) {
getFun(
`/risk/plan/inherent/getResponsibilityUnits?unitName=${e}&projectId=${this.form.projectId}`
).then(res => {
this.measureDeptList = res.data;
});
},
// 请求详情数据 // 请求详情数据
postReturnEcho() { postReturnEcho() {
this.$toast.loading({ this.$toast.loading({
...@@ -731,37 +778,11 @@ export default { ...@@ -731,37 +778,11 @@ export default {
this.form.factor = res.data.factor; this.form.factor = res.data.factor;
this.form.type = res.data.type; this.form.type = res.data.type;
this.form.planId = res.data.planId; this.form.planId = res.data.planId;
this.form.measuresProject = res.data.measuresProject;
this.uploaderImg = (res.data.pictureFile || []).map(item => { this.form.measuresAdministration = res.data.measuresAdministration;
return { this.form.measuresDeptName = res.data.measuresDeptName;
...item, this.form.measuresUserName = res.data.measuresUserName;
url: item.filePath this.form.measuresUserPhone = res.data.measuresUserPhone;
};
});
this.measuresProjectFile = (res.data.measuresProjectFile || []).map(
item => {
return {
...item,
url: item.filePath
};
}
);
this.measuresAdministrationFile = (
res.data.measuresAdministrationFile || []
).map(item => {
return {
...item,
url: item.filePath
};
});
this.measuresEmergencyFile = (
res.data.measuresEmergencyFile || []
).map(item => {
return {
...item,
url: item.filePath
};
});
this.$forceUpdate(); this.$forceUpdate();
}) })
.catch(() => { .catch(() => {
...@@ -975,6 +996,7 @@ export default { ...@@ -975,6 +996,7 @@ export default {
// console.log('%c [ values ]-592', 'font-size:13px; background:pink; color:#bf2c9f;', values) // console.log('%c [ values ]-592', 'font-size:13px; background:pink; color:#bf2c9f;', values)
var formDataJson = this.jsonToFormData(this.form); var formDataJson = this.jsonToFormData(this.form);
// let url = "/risk/plan/inherent"; // let url = "/risk/plan/inherent";
this.loadingStatus = true;
let url = "/risk/plan/existing"; let url = "/risk/plan/existing";
values.hdPicture1.forEach(item => { values.hdPicture1.forEach(item => {
if (item.file) { if (item.file) {
...@@ -1011,11 +1033,13 @@ export default { ...@@ -1011,11 +1033,13 @@ export default {
message: "提交成功", message: "提交成功",
duration: 2000 duration: 2000
}); });
this.loadingStatus = false;
history.go(-1); history.go(-1);
}) })
.catch(() => { .catch(() => {
this.$toast.clear(); this.$toast.clear();
this.$toast.fail("提交失败,请稍后再试"); this.$toast.fail("提交失败,请稍后再试");
this.loadingStatus = false;
}); });
this.$toast.clear(); this.$toast.clear();
}, },
......
src/views/riskProject/add/index.vue
View file @ 19329335
...@@ -258,7 +258,13 @@ ...@@ -258,7 +258,13 @@
</van-popup> </van-popup>
<div style="margin: 16px 16px 0"> <div style="margin: 16px 16px 0">
<van-button round block type="info" native-type="submit" <van-button
:loading="loadingStatus"
:loading-text="loadingText"
round
block
type="info"
native-type="submit"
>提交</van-button >提交</van-button
> >
</div> </div>
...@@ -297,6 +303,8 @@ export default { ...@@ -297,6 +303,8 @@ export default {
}, },
data() { data() {
return { return {
loadingStatus: false,
loadingText: "提交...",
taskId: "", taskId: "",
text: "创建任务", text: "创建任务",
id: "", id: "",
...@@ -504,12 +512,13 @@ export default { ...@@ -504,12 +512,13 @@ export default {
} }
}, },
onSubmit(values) { onSubmit(values) {
this.$toast.loading({ // this.$toast.loading({
message: "加载中...", // message: "加载中...",
forbidClick: true, // forbidClick: true,
loadingType: "spinner", // loadingType: "spinner",
duration: 0 // duration: 0
}); // });
this.loadingStatus = true;
let url = "/risk/plan"; let url = "/risk/plan";
postFun(url, this.form) postFun(url, this.form)
.then(res => { .then(res => {
...@@ -518,11 +527,13 @@ export default { ...@@ -518,11 +527,13 @@ export default {
message: "提交成功", message: "提交成功",
duration: 2000 duration: 2000
}); });
this.loadingStatus = false;
history.go(-1); history.go(-1);
}) })
.catch(() => { .catch(() => {
this.$toast.clear(); this.$toast.clear();
this.$toast.fail("提交失败,请稍后再试"); this.$toast.fail("提交失败,请稍后再试");
this.loadingStatus = false;
}); });
this.$toast.clear(); this.$toast.clear();
}, },
......
vue.config.js
View file @ 19329335
...@@ -9,11 +9,11 @@ module.exports = { ...@@ -9,11 +9,11 @@ module.exports = {
proxy: { proxy: {
//配置跨域 //配置跨域
"/app-api": { "/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.15.124:8080/', //这里是杨帆的地址
// target: 'http://192.168.10.137:8080/', //这里是昊哥的地址 // target: 'http://192.168.10.137:8080/', //这里是昊哥的地址
// target: 'http://192.168.10.36:8080/', //这里是昊哥的地址 // target: 'http://192.168.10.36:8080/', //这里是昊哥的地址
// target: 'http://localhost:8081/', //这里是后台的地址 target: 'http://localhost:8081/', //这里是后台的地址
ws: true, ws: true,
changOrigin: true //允许跨域 changOrigin: true //允许跨域
// logLevel: 'debug', // 显示代理调试信息 // 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