Skip to content

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

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

Dev yf'

See merge request !29
parents dc70a264 2d1c9c05
Show whitespace changes
Inline Side-by-side
Showing with 760 additions and 684 deletions
src/views/riskProject/add/addCurrent.vue
View file @ 089370e8
......@@ -96,9 +96,19 @@
@click="selectData('pointType', true)"
:rules="[{ required: true, message: '风险点类型不能为空' }]"
/>
<van-field required label="是否为特种设备" v-show="form.pointType=='设备设施类'">
<van-field
required
label="是否为特种设备"
v-show="form.pointType == '设备设施类'"
>
<template #input>
<van-switch v-model="form.specialEquipment" size="20" name="specialEquipment" />
<span style="margin-right: 10px;color: red;">否</span>
<van-switch
v-model="form.specialEquipment"
size="20"
name="specialEquipment"
/>
<span style="margin-left: 10px;color: green;">是</span>
</template>
</van-field>
<!-- 多选 -->
......@@ -256,7 +266,7 @@
</van-uploader>
</template>
</van-field>
<van-field label="管控措施">
<van-field label="管理措施">
<template #input>
<van-field
v-model="form.measuresAdministration"
......@@ -270,7 +280,7 @@
/>
</template>
</van-field>
<van-field name="measuresAdministrationFile[]" label="管控措施附件">
<van-field name="measuresAdministrationFile[]" label="管理措施附件">
<template #input>
<van-uploader
multiple
......@@ -399,7 +409,9 @@
<van-field name="majorHazardSource" label="是否为重大危险源">
<template #input>
<span style="margin-right: 10px;color: red;">否</span>
<van-switch v-model="form.majorHazardSource" size="20" />
<span style="margin-left: 10px;color: green;">是</span>
</template>
</van-field>
<van-field
......@@ -412,10 +424,18 @@
rows="1"
autosize
placeholder="请输入"
:key="form.majorHazardSource+'123'"
:rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]"
:key="form.majorHazardSource + '123'"
:rules="
form.majorHazardSource
? [{ required: true, message: '危险源名称不能为空' }]
: []
"
/>
<van-field label="重大危险源描述" :disabled="!form.majorHazardSource" :required="form.majorHazardSource">
<van-field
label="重大危险源描述"
:disabled="!form.majorHazardSource"
:required="form.majorHazardSource"
>
<template #input>
<van-field
:disabled="!form.majorHazardSource"
......@@ -425,10 +445,13 @@
rows="3"
autosize
placeholder="请输入"
:key="form.majorHazardSource+'456'"
:rules="form.majorHazardSource?[{ required: true, message: '重大危险源描述不能为空' }]:[]"
:key="form.majorHazardSource + '456'"
:rules="
form.majorHazardSource
? [{ required: true, message: '重大危险源描述不能为空' }]
: []
"
style="padding-left: 0;padding-top: 0;"
/>
</template>
</van-field>
......@@ -438,16 +461,22 @@
readonly
clickable
name="referenceBasis"
:value="form.referenceBasis=='null'?'':form.referenceBasis"
:value="form.referenceBasis == 'null' ? '' : form.referenceBasis"
label="判断依据"
placeholder="请选择"
:key="form.majorHazardSource+'789'"
:rules="form.majorHazardSource?[{ required: true, message: '判断依据不能为空' }]:[]"
@click="()=>{
if(form.majorHazardSource){
selectData('referenceBasis', false)
:key="form.majorHazardSource + '789'"
:rules="
form.majorHazardSource
? [{ required: true, message: '判断依据不能为空' }]
: []
"
@click="
() => {
if (form.majorHazardSource) {
selectData('referenceBasis', false);
}
}"
}
"
/>
<!-- <div
style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;"
......@@ -877,7 +906,7 @@ export default {
id: "",
isTimely: 1,
active: 0,
form: { },
form: {},
projectId: "", // 所属工程
projectName: "", // 所属工程
projectDirectorName: "", // 所属工程
......@@ -1302,7 +1331,7 @@ export default {
// console.log('%c [ values ]-592', 'font-size:13px; background:pink; color:#bf2c9f;', values)
var formDataJson = this.jsonToFormData(this.form);
let url = "/risk/plan/inherent";
(values.hdPicture1||[]).forEach(item => {
(values.hdPicture1 || []).forEach(item => {
if (item.file) {
formDataJson.append("pictureFile[]", item.file);
} else {
......@@ -1463,12 +1492,12 @@ export default {
}
},
watch: {
'form.pointType'(val,old){
if(old){
if(val=='设备设施类'){
this.form.specialEquipment = false
}else{
this.form.specialEquipment=''
"form.pointType"(val, old) {
if (old) {
if (val == "设备设施类") {
this.form.specialEquipment = false;
} else {
this.form.specialEquipment = "";
}
}
}
......
src/views/riskProject/add/addInherent.vue
View file @ 089370e8
......@@ -94,9 +94,19 @@
@click="selectData('pointType', true)"
:rules="[{ required: true, message: '风险点类型不能为空' }]"
/>
<van-field required label="是否为特种设备" v-show="form.pointType=='设备设施类'">
<van-field
required
label="是否为特种设备"
v-show="form.pointType == '设备设施类'"
>
<template #input>
<van-switch name="specialEquipment" v-model="form.specialEquipment" size="20" />
<span style="margin-right: 10px;color: red;">否</span>
<van-switch
name="specialEquipment"
v-model="form.specialEquipment"
size="20"
/>
<span style="margin-left: 10px;color: green;">是</span>
</template>
</van-field>
<!-- 多选 -->
......@@ -253,7 +263,7 @@
</van-uploader>
</template>
</van-field>
<van-field label="管控措施">
<van-field label="管理措施">
<template #input>
<van-field
v-model="form.measuresAdministration"
......@@ -267,7 +277,7 @@
/>
</template>
</van-field>
<van-field name="measuresAdministrationFile[]" label="管控措施附件">
<van-field name="measuresAdministrationFile[]" label="管理措施附件">
<template #input>
<van-uploader
multiple
......@@ -356,11 +366,15 @@
rows="1"
autosize
placeholder="请输入"
list="measure-deptname-input"
list="measure-deptname"
@input="measuresDeptNameChange"
/>
<datalist id="measure-deptname">
<option value="Chocolate" v-for="item in measureDeptList" :key="item.id"/>
<option
:value="item.measuresDeptName"
v-for="item in measureDeptList"
:key="item.measuresDeptName"
></option>
</datalist>
<van-field
v-model="form.measuresUserName"
......@@ -374,7 +388,11 @@
@input="measuresUserNameChange"
/>
<datalist id="measure-name">
<option value="Chocolate" v-for="item in measureNameList" :key="item.id"/>
<option
v-for="item in measureNameList"
:key="item.measuresUserName"
:value="item.measuresUserName"
/>
</datalist>
<van-field
v-model="form.measuresUserPhone"
......@@ -399,7 +417,9 @@
<van-field name="majorHazardSource" label="是否为重大危险源">
<template #input>
<span style="margin-right: 10px;color: red;">否</span>
<van-switch v-model="form.majorHazardSource" size="20" />
<span style="margin-left: 10px;color: green;">是</span>
</template>
</van-field>
<van-field
......@@ -412,11 +432,18 @@
rows="1"
autosize
placeholder="请输入"
:key="form.majorHazardSource+'456'"
:rules="form.majorHazardSource?[{ required: true, message: '危险源名称不能为空' }]:[]"
:key="form.majorHazardSource + '456'"
:rules="
form.majorHazardSource
? [{ required: true, message: '危险源名称不能为空' }]
: []
"
/>
<van-field label="重大危险源描述" :disabled="!form.majorHazardSource"
:required="form.majorHazardSource">
<van-field
label="重大危险源描述"
:disabled="!form.majorHazardSource"
:required="form.majorHazardSource"
>
<template #input>
<van-field
:disabled="!form.majorHazardSource"
......@@ -427,8 +454,12 @@
rows="3"
autosize
placeholder="请输入"
:key="form.majorHazardSource+'123'"
:rules="form.majorHazardSource?[{ required: true, message: '重大危险源描述不能为空' }]:[]"
:key="form.majorHazardSource + '123'"
:rules="
form.majorHazardSource
? [{ required: true, message: '重大危险源描述不能为空' }]
: []
"
style="padding-left: 0;padding-top: 0;"
/>
</template>
......@@ -440,16 +471,22 @@
readonly
clickable
name="referenceBasis"
:value="form.referenceBasis=='null'?'':form.referenceBasis"
:value="form.referenceBasis == 'null' ? '' : form.referenceBasis"
label="判断依据"
placeholder="请选择"
:key="form.majorHazardSource+'7'"
:rules="form.majorHazardSource?[{ required: true, message: '判断依据不能为空' }]:[]"
@click="()=>{
if(form.majorHazardSource){
selectData('referenceBasis', false)
:key="form.majorHazardSource + '7'"
:rules="
form.majorHazardSource
? [{ required: true, message: '判断依据不能为空' }]
: []
"
@click="
() => {
if (form.majorHazardSource) {
selectData('referenceBasis', false);
}
}"
}
"
/>
<van-dialog
v-model="showGradeDialog"
......@@ -682,8 +719,8 @@ export default {
},
data() {
return {
measureNameList:[],
measureDeptList:[],
measureNameList: [],
measureDeptList: [],
measuresDept: false,
ShowfloorList: false,
floorSource: [],
......@@ -708,7 +745,7 @@ export default {
isTimely: 1,
active: 0,
form: {
specialEquipment:''
specialEquipment: ""
},
projectId: "", // 所属工程
projectName: "", // 所属工程
......@@ -720,14 +757,7 @@ export default {
factor: "", //风险因素
showFactor: false,
columnsFactor: [],
messageList: [
{
title: "回显风险源名称",
time: "2022-12-12",
name: "Mr.周",
state: 1
}
],
messageList: [],
source: "", //风险源
userPrefix: "", //风险源
showSource: false,
......@@ -799,22 +829,26 @@ export default {
methods: {
/* swp add */
measuresUserNameChange(e){
this.getMeasureList(e)
},
measuresDeptNameChange(e){
this.getMeasureList(e)
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);
});
},
getMeasureList(search){
getFun('').then(res => {
if (isSinge) {
} else {
this.columnsCheckData = res.data;
this.showCheckSelect = true;
}
})
measuresDeptNameChange(e) {
getFun(
`/risk/plan/inherent/getResponsibilityUnits?unitName=${e}&projectId=${this.form.projectId}`
).then(res => {
this.measureDeptList = res.data;
});
},
getMeasureList(search) {},
/* swp add end */
// 项目负责人
onConTrouble(value) {
......@@ -1240,11 +1274,11 @@ export default {
}
},
watch: {
'form.pointType'(val,old){
if(val=='设备设施类'){
this.form.specialEquipment = false
}else{
this.form.specialEquipment = ''
"form.pointType"(val, old) {
if (val == "设备设施类") {
this.form.specialEquipment = false;
} else {
this.form.specialEquipment = "";
}
}
}
......
src/views/riskProject/add/addPresent.vue
View file @ 089370e8
......@@ -205,7 +205,7 @@
</van-uploader>
</template>
</van-field>
<van-field label="管控措施">
<van-field label="管理措施">
<template #input>
<van-field
v-model="form.measuresAdministration"
......@@ -219,7 +219,7 @@
/>
</template>
</van-field>
<van-field name="measuresAdministrationFile[]" label="管控措施附件">
<van-field name="measuresAdministrationFile[]" label="管理措施附件">
<template #input>
<van-uploader
multiple
......
src/views/riskProject/add/inherentRisks.vue
View file @ 089370e8
......@@ -256,6 +256,8 @@ export default {
return new Promise((resolve, reject) => {
getFun(`/risk/plan/floor/list/${id}`)
.then(res => {
console.log(res.data);
res.data = [{ name: "全部" }, ...res.data];
this.floorListData = res.data;
this.changeBuild(res.data[0].name);
this.option0 = this.changeData(res.data);
......@@ -271,6 +273,8 @@ export default {
return new Promise((resolve, reject) => {
getFun(`/risk/plan/room/list/${id}`)
.then(res => {
if (!res.data) res.data = [];
res.data = [{ id: "-1", name: "全部" }, ...res.data];
this.option2 = this.changeData(res.data);
this.value2 = res.data[0].id || 0;
resolve(res.data);
......@@ -291,8 +295,8 @@ export default {
var paramsJson = {};
if (floorId || roomId) {
paramsJson = {
floorId,
roomId
floorId: floorId == -1 ? null : floorId,
roomId: roomId == -1 ? null : roomId
};
} else {
paramsJson = {};
......@@ -331,7 +335,9 @@ export default {
if (this.value0) {
let arr = this.floorListData.filter(item => item.name == this.value0)[0]
.children;
console.log(arr);
if (!arr) arr = [];
arr = [{ id: "-1", name: "全部" }, ...arr];
this.option1 = this.changeData(arr);
this.value1 = arr[0].id;
this.roomList(this.value1);
......
src/views/riskProject/add/taskList.vue
View file @ 089370e8
......@@ -632,12 +632,12 @@ export default {
performTasks() {
sessionStorage.setItem(
"buildingId",
this.messageList.riskBuildingListDtos[0].buildingId
this.messageList.detailsDto.buildingIds
);
sessionStorage.setItem("planId", this.messageList.id);
sessionStorage.setItem(
"buildingName",
this.messageList.riskBuildingListDtos[0].buildingName
this.messageList.detailsDto.buildingNames
);
sessionStorage.setItem(
"projectId",
......@@ -652,8 +652,8 @@ export default {
name: "riskInherent",
params: {
id: this.messageList.id,
buildingId: this.messageList.riskBuildingListDtos[0].buildingId,
buildingName: this.messageList.riskBuildingListDtos[0].buildingName
buildingId: this.messageList.detailsDto.buildingIds,
buildingName: this.messageList.detailsDto.buildingNames
}
});
},
......
src/views/riskProject/taskLedger/presentDetail.vue
View file @ 089370e8
......@@ -210,7 +210,7 @@
</template>
</van-field>
<van-field label="管控措施">
<van-field label="管理措施">
<template #input>
<van-field
readonly
......@@ -225,7 +225,7 @@
/>
</template>
</van-field>
<van-field name="measuresAdministrationFile[]" label="管控措施附件">
<van-field name="measuresAdministrationFile[]" label="管理措施附件">
<template #input>
<van-uploader
multiple
......@@ -348,7 +348,6 @@
:value="form.referenceBasis"
label="判断依据"
placeholder="请选择"
/>
<van-field
readonly
......
src/views/riskProject/taskLedger/tabDetail.vue
View file @ 089370e8
......@@ -85,9 +85,16 @@
placeholder="请选择"
:rules="[{ required: true, message: '风险点类型不能为空' }]"
/>
<van-field required name="specialEquipment" label="是否为特种设备" v-show="form.pointType=='设备设施类'">
<van-field
required
name="specialEquipment"
label="是否为特种设备"
v-show="form.pointType == '设备设施类'"
>
<template #input>
<span style="margin-right: 10px;color: red;">否</span>
<van-switch disabled v-model="form.specialEquipment" size="20" />
<span style="margin-left: 10px;color: green;">是</span>
</template>
</van-field>
<!-- 多选 -->
......@@ -244,7 +251,7 @@
</template>
</van-field>
<van-field label="管控措施">
<van-field label="管理措施">
<template #input>
<van-field
readonly
......@@ -259,7 +266,7 @@
/>
</template>
</van-field>
<van-field name="measuresAdministrationFile[]" label="管控措施附件">
<van-field name="measuresAdministrationFile[]" label="管理措施附件">
<template #input>
<van-uploader
multiple
......@@ -388,7 +395,9 @@
</div>
<van-field name="majorHazardSource" label="是否为重大危险源">
<template #input>
<span style="margin-right: 10px;color: red;">否</span>
<van-switch disabled v-model="form.majorHazardSource" size="20" />
<span style="margin-left: 10px;color: green;">是</span>
</template>
</van-field>
<van-field
......@@ -402,7 +411,6 @@
placeholder="请输入"
/>
<van-field label="重大危险源描述" :required="form.majorHazardSource">
<template #input>
<van-field
......@@ -480,7 +488,7 @@ export default {
isTimely: 1,
active: 0,
form: {
specialEquipment:false
specialEquipment: false
},
projectId: "", // 所属工程
projectName: "", // 所属工程
......
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