admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flx：修改安全检查

Browse Source
This commit is contained in:
Rain_ 2025-08-28 18:15:44 +08:00
parent 2fa33ad379
commit 52f715f6ce
9 changed files with 206 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/companyAdmin/qualityAndSafety/hiddenDangerSet.vue
View File

@ -157,7 +157,7 @@ export default {
getSecurityDangerFieldPageApi({
pageNo: 1,
pageSize: -1,
projectSn: this.projectSn,
sn: this.projectSn,
companyProjectType: 1,
recordType: this.recordType,
}).then((res) => {

9
src/views/projectFront/environmentalMonitor/alarmValueSet.vue
View File

@ -173,6 +173,15 @@
>
</el-input>
</el-form-item>
<el-form-item label="蒸发量阈值(mm)" prop="evaporationRate">
<el-input
v-model="warningInfo.evaporationRate"
:placeholder="$t('message.alarmValueSet.placeholder')"
type="number"
oninput="if(value.length>20)value=value.slice(0,20)"
>
</el-input>
</el-form-item>
<!-- pm2.5预警是否推送 pm2.5报警是否推送-->
<el-form-item :label="type == 2 ? $t('message.projectInfo.PM25warning') : $t('message.projectInfo.PM25alarm')">
<el-radio-group v-model="warningInfo.isNotPush">

6
src/views/projectFront/environmentalMonitor/relaTimeData.vue
View File

@ -156,6 +156,12 @@
prop="windspeed"
>
</el-table-column>
<el-table-column
align="center"
label="蒸发量"
prop="evaporationRate"
>
</el-table-column>
<!-- 上传时间 -->
<el-table-column
align="center"

56
src/views/projectFront/safeManage/v2/components/hiddenDangerSet.vue
View File

@ -70,7 +70,6 @@
>
<template slot-scope="scope">
<el-input
v-model="scope.row.displayFieldName"
placeholder="请输入"
></el-input>
@ -78,11 +77,7 @@
</el-table-column>
<el-table-column prop="defaultDataType" align="center" label="默认数据">
<template slot-scope="scope">
<el-select
v-model="scope.row.defaultDataType"
placeholder="请选择"
>
<el-select v-model="scope.row.defaultDataType" placeholder="请选择">
<el-option
:label="item.title"
:value="item.id"
@ -94,26 +89,17 @@
</el-table-column>
<el-table-column prop="isRequired" align="center" label="是否必填">
<template slot-scope="scope">
<el-switch
v-model="scope.row.isRequired"
></el-switch>
<el-switch v-model="scope.row.isRequired"></el-switch>
</template>
</el-table-column>
<el-table-column prop="isEnabled" align="center" label="是否显示">
<template slot-scope="scope">
<el-switch
v-model="scope.row.isEnabled"
></el-switch>
<el-switch v-model="scope.row.isEnabled"></el-switch>
</template>
</el-table-column>
<el-table-column prop="isPinned" align="center" label="是否固定到列表">
<template slot-scope="scope">
<el-switch
v-model="scope.row.isPinned"
></el-switch>
<el-switch v-model="scope.row.isPinned"></el-switch>
</template>
</el-table-column>
<el-table-column label="操作" align="center">
@ -169,16 +155,26 @@ export default {
},
methods: {
syncCompanyClick() {
let params = {
projectSn: this.projectSn,
};
syncCompanyConfigSecurityDangerFieldApi(params).then((res) => {
console.log(res);
if (res.code && res.success) {
// '保存成功！'
this.$message.success("同步成功");
this.getSecurityDangerFieldPage();
this.$confirm(
"此操作将会同步企业配置覆盖到项目，此操作不可恢复，请谨慎操作!",
"提示",
{
confirmButtonText: this.$t("message.safeMangeCheck.dialog.confirm"),
cancelButtonText: this.$t("message.safeMangeCheck.dialog.cancel"),
type: "warning",
}
).then(() => {
let params = {
projectSn: this.projectSn,
};
syncCompanyConfigSecurityDangerFieldApi(params).then((res) => {
console.log(res);
if (res.code && res.success) {
// '保存成功！'
this.$message.success("同步成功");
this.getSecurityDangerFieldPage();
}
});
});
},
saveConfigClick() {
@ -526,7 +522,7 @@ export default {
animation: 150, // 动画时长
handle: ".icon-movement", // 拖拽触发元素
onEnd: (evt) => {
const data = this.tableData[evt.oldIndex];
const data = this.tableData[evt.oldIndex];
// const dataList = this.tableData.map((item, index) => {
// if (index > evt.oldIndex && index <= evt.newIndex) {
// item.sort = item.sort - 1;
@ -537,8 +533,8 @@ export default {
// });
// // .sort((a, b) => a.sort - b.sort)
// this.tableData = dataList;
this.tableData.splice(evt.oldIndex, 1);
this.tableData.splice(evt.newIndex, 0, data);
this.tableData.splice(evt.oldIndex, 1);
this.tableData.splice(evt.newIndex, 0, data);
},
});
}

24
src/views/projectFront/safeManage/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
View File

@ -504,7 +504,12 @@
:prop="item.fieldName"
v-else-if="item.originalFieldName == '问题分类'"
>
<el-cascader
<el-input
style="width: 400px"
v-model="addForm1.dangerItemContent"
disabled
></el-input>
<!-- <el-cascader
disabled
v-model="addForm1[item.fieldName]"
style="width: 400px"
@ -516,7 +521,7 @@
:props="checkClassifyProps"
@clear="addForm1[item.fieldName] = []"
:options="classifyList"
></el-cascader>
></el-cascader> -->
</el-form-item>
<el-form-item
:label="
@ -1910,14 +1915,18 @@ export default {
const resultList = this.getAlls(this.checkPointList);
console.log(resultList);
if (this.recordType == 1) {
this.addForm1.notifyPerson = resultList.map(item => item.intendanceIds);
this.addForm1.notifyPerson = resultList.map(
(item) => item.intendanceIds
);
this.unitRegionId = this.addForm1.regionIds;
this.getReviewPeopleList(this.addForm1.regionIds);
} else if (this.recordType == 2) {
this.unitRegionId = this.addForm2.regionIds;
this.getReviewPeopleList(this.addForm2.regionIds);
}
const securityEnterpriseIds = resultList.map(item => item.securityEnterpriseIds).join(',');
const securityEnterpriseIds = resultList
.map((item) => item.securityEnterpriseIds)
.join(",");
if (securityEnterpriseIds) {
this.getDivisionUnitFn(securityEnterpriseIds);
} else {
@ -2047,7 +2056,12 @@ export default {
console.log("整改时限", cascaderAddr.getCheckedNodes()[0].data);
// changeLimitTime
this.addForm1.dangerItemContent = pathLabels[0].pathLabels
const pathLabelList = pathLabels[0].pathLabels.filter(
(item) => item != pathLabels[0].label
);
console.log("整改时限", pathLabels, pathLabelList);
this.addForm1.problemDescription = pathLabels[0].label;
this.addForm1.dangerItemContent = pathLabelList
.map((item) => {
return item;
})

34
src/views/projectFront/safeManage/v2/safetyRiskListSet.vue
View File

@ -231,17 +231,27 @@ export default {
mounted() {},
methods: {
syncCompanyClick(type) {
let params = {
projectSn: this.projectSn,
modType: type,
};
syncCompanyConfigSecurityDangerReviewVerifyApi(params).then((res) => {
console.log(res);
if (res.code && res.success) {
// '保存成功！'
this.$message.success("同步成功");
this.getXzSecurityDangerReviewVerifyList();
this.$confirm(
"此操作将会同步企业配置覆盖到项目，此操作不可恢复，请谨慎操作!",
"提示",
{
confirmButtonText: this.$t("message.safeMangeCheck.dialog.confirm"),
cancelButtonText: this.$t("message.safeMangeCheck.dialog.cancel"),
type: "warning",
}
).then(() => {
let params = {
projectSn: this.projectSn,
modType: type,
};
syncCompanyConfigSecurityDangerReviewVerifyApi(params).then((res) => {
console.log(res);
if (res.code && res.success) {
// '保存成功！'
this.$message.success("同步成功");
this.getXzSecurityDangerReviewVerifyList();
}
});
});
},
getXzSecurityDangerReviewVerifyList() {
@ -383,7 +393,7 @@ export default {
font-size: 16px;
height: initial;
line-height: initial;
background-color: #FBFBFB;
background-color: #fbfbfb;
border: none;
}
.el-collapse-item__wrap {
@ -396,7 +406,7 @@ export default {
}
.tables-box {
.table_box:nth-child(odd) {
background-color: #FBFBFB;
background-color: #fbfbfb;
}
.table_box {
display: flex;

68
src/views/projectFront/safeSame/hiddenDangerModule/myToDoList.vue
View File

@ -39,7 +39,10 @@
class="demo-form-inline"
style="display: flex"
>
<el-form-item v-if="securityDangerListUp('检查时间')" :label="securityDangerListUp('检查时间')">
<el-form-item
v-if="securityDangerListUp('检查时间')"
:label="securityDangerListUp('检查时间')"
>
<el-date-picker
style="width: 335px"
v-model="time"
@ -52,7 +55,10 @@
>
</el-date-picker>
</el-form-item>
<el-form-item v-if="securityDangerListUp('问题等级')" :label="securityDangerListUp('问题等级')">
<el-form-item
v-if="securityDangerListUp('问题等级')"
:label="securityDangerListUp('问题等级')"
>
<el-select
style="width: 150px"
v-model="formInline.level"
@ -88,7 +94,10 @@
<el-option label="合格" :value="5"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="securityDangerListUp('紧急程度')" :label="securityDangerListUp('紧急程度')">
<el-form-item
v-if="securityDangerListUp('紧急程度')"
:label="securityDangerListUp('紧急程度')"
>
<el-select
style="width: 150px"
v-model="formInline.urgentLevel"
@ -534,8 +543,13 @@
<el-form-item
:label="$t('message.quality.questionClassification')"
>
<el-input
style="width: 400px"
v-model="addForm1.dangerItemContent"
disabled
></el-input>
<!-- prop="dangerItemId" -->
<el-cascader
<!-- <el-cascader
disabled
v-model="addForm1.dangerItemId"
style="width: 400px"
@ -547,7 +561,7 @@
:props="checkClassifyProps"
@clear="addForm1.dangerItemId = []"
:options="classifyList"
></el-cascader>
></el-cascader> -->
</el-form-item>
<el-form-item
:label="$t('message.quality.moreInfo')"
@ -2284,7 +2298,10 @@ import {
addXZSecurityPostponeRectifyApplyApi,
updateChangeIdXzSecurityQualityInspectionRecordApi,
} from "@/assets/js/api/quality.js";
import { getEffectiveConfigSecurityDangerFieldApi, getEffectiveConfigSecurityDangerReviewVerifyApi } from "@/assets/js/api/safeManage";
import {
getEffectiveConfigSecurityDangerFieldApi,
getEffectiveConfigSecurityDangerReviewVerifyApi,
} from "@/assets/js/api/safeManage";
import { getDictionaryItemApi } from "@/assets/js/api/companyDiagram";
import {
getProjectChilderSystemUserListApi,
@ -2606,7 +2623,7 @@ export default {
if (res.code == 200) {
const data = res.result;
this.dangerReviewInfo = {
...data
...data,
};
}
});
@ -3019,9 +3036,14 @@ export default {
arr.forEach((element, index) => {
// console.log(22222, element)
// arr[index] = element.includes("http://") ? element : this.$store.state.FILEURL + element;
let result = arr[index].substring(arr[index].indexOf("*") + 1, arr[index].length);
let result = arr[index].substring(
arr[index].indexOf("*") + 1,
arr[index].length
);
// console.log(3333, result)
arr[index] = result.includes("http://") ? result : this.$store.state.FILEURL + result;
arr[index] = result.includes("http://")
? result
: this.$store.state.FILEURL + result;
});
return arr;
},
@ -3802,10 +3824,16 @@ export default {
enterpriseId: this.unitEnterpriseId.join(","),
safeQualityRegionIdForDuty: this.unitRegionId.join(","),
};
if (this.dangerReviewInfo.enableVerify == 1 && this.dealForm.status == 4) {
if (
this.dangerReviewInfo.enableVerify == 1 &&
this.dealForm.status == 4
) {
data.roleName = this.dangerReviewInfo.verifyRoleName;
}
if (this.dangerReviewInfo.enableReview == 1 && this.dealForm.status == 3) {
if (
this.dangerReviewInfo.enableReview == 1 &&
this.dealForm.status == 3
) {
data.roleName = this.dangerReviewInfo.reviewRoleName;
}
getProjectChilderSystemUserListApi(data).then((res) => {
@ -3851,10 +3879,13 @@ export default {
this.dealForm.remark =
this.$refs["cascaderAddr"].getCheckedNodes()[0].data.remark;
this.dealForm.dangerItemContent = pathLabels[0].pathLabels
const pathLabelList = pathLabels[0].pathLabels.filter(
(item) => item != pathLabels[0].label
);
console.log("整改时限", pathLabels, pathLabelList);
this.dealForm.problemDescription = pathLabels[0].label;
this.dealForm.dangerItemContent = pathLabelList
.map((item) => {
console.log(pathLabels);
console.log(item, 1632);
return item;
})
.join("/");
@ -3910,10 +3941,13 @@ export default {
this.addForm1.remark =
this.$refs["cascaderAddr"].getCheckedNodes()[0].data.remark;
this.addForm1.dangerItemContent = pathLabels[0].pathLabels
const pathLabelList = pathLabels[0].pathLabels.filter(
(item) => item != pathLabels[0].label
);
console.log("整改时限", pathLabels, pathLabelList);
this.addForm1.problemDescription = pathLabels[0].label;
this.addForm1.dangerItemContent = pathLabelList
.map((item) => {
console.log(pathLabels);
console.log(item, 1632);
return item;
})
.join("/");

59
src/views/projectFront/safeSame/hiddenDangerModule/pendingReview.vue
View File

@ -7,7 +7,10 @@
class="demo-form-inline"
style="display: flex"
>
<el-form-item v-if="securityDangerListUp('检查时间')" :label="securityDangerListUp('检查时间')">
<el-form-item
v-if="securityDangerListUp('检查时间')"
:label="securityDangerListUp('检查时间')"
>
<el-date-picker
style="width: 335px"
v-model="time"
@ -20,7 +23,10 @@
>
</el-date-picker>
</el-form-item>
<el-form-item v-if="securityDangerListUp('问题等级')" :label="securityDangerListUp('问题等级')">
<el-form-item
v-if="securityDangerListUp('问题等级')"
:label="securityDangerListUp('问题等级')"
>
<el-select
style="width: 150px"
v-model="formInline.level"
@ -56,7 +62,10 @@
<el-option label="合格" :value="5"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="securityDangerListUp('紧急程度')" :label="securityDangerListUp('紧急程度')">
<el-form-item
v-if="securityDangerListUp('紧急程度')"
:label="securityDangerListUp('紧急程度')"
>
<el-select
style="width: 150px"
v-model="formInline.urgentLevel"
@ -481,8 +490,13 @@
<el-form-item
:label="$t('message.quality.questionClassification')"
>
<el-input
style="width: 400px"
v-model="addForm1.dangerItemContent"
disabled
></el-input>
<!-- prop="dangerItemId" -->
<el-cascader
<!-- <el-cascader
disabled
v-model="addForm1.dangerItemId"
style="width: 400px"
@ -494,7 +508,7 @@
:props="checkClassifyProps"
@clear="addForm1.dangerItemId = []"
:options="classifyList"
></el-cascader>
></el-cascader> -->
</el-form-item>
<el-form-item
:label="$t('message.quality.moreInfo')"
@ -2565,11 +2579,13 @@ export default {
recordType: recordType ? recordType : this.recordType,
}).then((res) => {
if (res.code === 200) {
this.securityDangerList = res.result
.filter((item) => item.isEnabled == 1);
this.securityDangerList = res.result.filter(
(item) => item.isEnabled == 1
);
if (this.securityDangerPinnedList.length == 0) {
this.securityDangerPinnedList = res.result
.filter((item) => item.isPinned == 1).filter((item) => item.recordType == 1);
.filter((item) => item.isPinned == 1)
.filter((item) => item.recordType == 1);
this.$nextTick(() => {
this.$refs.multipleTable.doLayout();
});
@ -2917,9 +2933,14 @@ export default {
arr.forEach((element, index) => {
// console.log(22222, element)
// arr[index] = element.includes("http://") ? element : this.$store.state.FILEURL + element;
let result = arr[index].substring(arr[index].indexOf("*") + 1, arr[index].length);
let result = arr[index].substring(
arr[index].indexOf("*") + 1,
arr[index].length
);
// console.log(3333, result)
arr[index] = result.includes("http://") ? result : this.$store.state.FILEURL + result;
arr[index] = result.includes("http://")
? result
: this.$store.state.FILEURL + result;
});
return arr;
},
@ -3745,10 +3766,13 @@ export default {
this.dealForm.remark =
this.$refs["cascaderAddr"].getCheckedNodes()[0].data.remark;
this.dealForm.dangerItemContent = pathLabels[0].pathLabels
const pathLabelList = pathLabels[0].pathLabels.filter(
(item) => item != pathLabels[0].label
);
console.log("整改时限", pathLabels, pathLabelList);
this.dealForm.problemDescription = pathLabels[0].label;
this.dealForm.dangerItemContent = pathLabelList
.map((item) => {
console.log(pathLabels);
console.log(item, 1632);
return item;
})
.join("/");
@ -3804,10 +3828,13 @@ export default {
this.addForm1.remark =
this.$refs["cascaderAddr"].getCheckedNodes()[0].data.remark;
this.addForm1.dangerItemContent = pathLabels[0].pathLabels
const pathLabelList = pathLabels[0].pathLabels.filter(
(item) => item != pathLabels[0].label
);
console.log("整改时限", pathLabels, pathLabelList);
this.addForm1.problemDescription = pathLabels[0].label;
this.addForm1.dangerItemContent = pathLabelList
.map((item) => {
console.log(pathLabels);
console.log(item, 1632);
return item;
})
.join("/");

40
src/views/projectFront/safeSame/rectificationRecord.vue
View File

@ -589,7 +589,12 @@
:prop="item.fieldName"
v-else-if="item.originalFieldName == '问题分类'"
>
<el-cascader
<el-input
style="width: 400px"
v-model="addForm1.dangerItemContent"
disabled
></el-input>
<!-- <el-cascader
disabled
v-model="addForm1[item.fieldName]"
style="width: 400px"
@ -601,7 +606,7 @@
:props="checkClassifyProps"
@clear="addForm1[item.fieldName] = []"
:options="classifyList"
></el-cascader>
></el-cascader> -->
</el-form-item>
<el-form-item
:label="
@ -3192,7 +3197,7 @@ export default {
// this.getPeopleUpdateList();
this.getRoutineInspect();
this.dealTitle = "新增";
this.dealTitle = "补录";
this.dealShow = true;
},
submitDealForm() {
@ -3573,7 +3578,7 @@ export default {
});
},
parseImage2(urls) {
console.log(112233, urls)
console.log(112233, urls);
let arr = [];
if (urls) {
arr = urls.split(",");
@ -3581,9 +3586,14 @@ export default {
arr.forEach((element, index) => {
// console.log(22222, element)
// arr[index] = element.includes("http://") ? element : this.$store.state.FILEURL + element;
let result = arr[index].substring(arr[index].indexOf("*") + 1, arr[index].length);
let result = arr[index].substring(
arr[index].indexOf("*") + 1,
arr[index].length
);
// console.log(3333, result)
arr[index] = result.includes("http://") ? result : this.$store.state.FILEURL + result;
arr[index] = result.includes("http://")
? result
: this.$store.state.FILEURL + result;
});
console.log(11222444, arr);
return arr;
@ -4514,7 +4524,12 @@ export default {
console.log("整改时限", cascaderAddr.getCheckedNodes()[0].data);
// changeLimitTime
this.dealForm.dangerItemContent = pathLabels[0].pathLabels
const pathLabelList = pathLabels[0].pathLabels.filter(
(item) => item != pathLabels[0].label
);
console.log("整改时限", pathLabels, pathLabelList);
this.dealForm.problemDescription = pathLabels[0].label;
this.dealForm.dangerItemContent = pathLabelList
.map((item) => {
return item;
})
@ -4562,10 +4577,13 @@ export default {
.add(data.changeLimit, "day")
.format("YYYY-MM-DD HH:mm:ss");
}
console.log("整改时限", cascaderAddr.getCheckedNodes()[0].data);
// changeLimitTime
this.addForm1.dangerItemContent = pathLabels[0].pathLabels
const pathLabelList = pathLabels[0].pathLabels.filter(
(item) => item != pathLabels[0].label
);
console.log("整改时限", pathLabels, pathLabelList);
this.addForm1.problemDescription = pathLabels[0].label;
this.addForm1.dangerItemContent = pathLabelList
.map((item) => {
return item;
})
@ -4577,7 +4595,7 @@ export default {
// this.$refs['cascaderAddr2'].getCheckedNodes()[0].data.level
this.addForm2.remark =
cascaderAddr2.getCheckedNodes()[0].data.remark;
this.addForm2.dangerItemContent = pathLabels2[0].pathLabels
.map((item) => {
console.log(item, 1640);