diff --git a/src/views/companyAdmin/qualityAndSafety/hiddenDangerSet.vue b/src/views/companyAdmin/qualityAndSafety/hiddenDangerSet.vue
index 66b0051b..a7040131 100644
--- a/src/views/companyAdmin/qualityAndSafety/hiddenDangerSet.vue
+++ b/src/views/companyAdmin/qualityAndSafety/hiddenDangerSet.vue
@@ -157,7 +157,7 @@ export default {
getSecurityDangerFieldPageApi({
pageNo: 1,
pageSize: -1,
- projectSn: this.projectSn,
+ sn: this.projectSn,
companyProjectType: 1,
recordType: this.recordType,
}).then((res) => {
diff --git a/src/views/projectFront/environmentalMonitor/alarmValueSet.vue b/src/views/projectFront/environmentalMonitor/alarmValueSet.vue
index e36c00b4..17546108 100644
--- a/src/views/projectFront/environmentalMonitor/alarmValueSet.vue
+++ b/src/views/projectFront/environmentalMonitor/alarmValueSet.vue
@@ -173,6 +173,15 @@
>
+
+
+
+
diff --git a/src/views/projectFront/environmentalMonitor/relaTimeData.vue b/src/views/projectFront/environmentalMonitor/relaTimeData.vue
index a1a0cabd..974508ca 100644
--- a/src/views/projectFront/environmentalMonitor/relaTimeData.vue
+++ b/src/views/projectFront/environmentalMonitor/relaTimeData.vue
@@ -156,6 +156,12 @@
prop="windspeed"
>
+
+
@@ -78,11 +77,7 @@
-
+
-
+
-
+
-
+
@@ -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);
},
});
}
diff --git a/src/views/projectFront/safeManage/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue b/src/views/projectFront/safeManage/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
index bd72136c..407867d8 100644
--- a/src/views/projectFront/safeManage/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
+++ b/src/views/projectFront/safeManage/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
@@ -504,7 +504,12 @@
:prop="item.fieldName"
v-else-if="item.originalFieldName == '问题分类'"
>
-
+
item != pathLabels[0].label
+ );
+ console.log("整改时限", pathLabels, pathLabelList);
+ this.addForm1.problemDescription = pathLabels[0].label;
+ this.addForm1.dangerItemContent = pathLabelList
.map((item) => {
return item;
})
diff --git a/src/views/projectFront/safeManage/v2/safetyRiskListSet.vue b/src/views/projectFront/safeManage/v2/safetyRiskListSet.vue
index cafa6d84..411f996f 100644
--- a/src/views/projectFront/safeManage/v2/safetyRiskListSet.vue
+++ b/src/views/projectFront/safeManage/v2/safetyRiskListSet.vue
@@ -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;
diff --git a/src/views/projectFront/safeSame/hiddenDangerModule/myToDoList.vue b/src/views/projectFront/safeSame/hiddenDangerModule/myToDoList.vue
index c4a29dbc..6f651ec1 100644
--- a/src/views/projectFront/safeSame/hiddenDangerModule/myToDoList.vue
+++ b/src/views/projectFront/safeSame/hiddenDangerModule/myToDoList.vue
@@ -39,7 +39,10 @@
class="demo-form-inline"
style="display: flex"
>
-
+
-
+
-
+
+
-
+ > -->
{
// 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("/");
diff --git a/src/views/projectFront/safeSame/hiddenDangerModule/pendingReview.vue b/src/views/projectFront/safeSame/hiddenDangerModule/pendingReview.vue
index b34d1541..48e52705 100644
--- a/src/views/projectFront/safeSame/hiddenDangerModule/pendingReview.vue
+++ b/src/views/projectFront/safeSame/hiddenDangerModule/pendingReview.vue
@@ -7,7 +7,10 @@
class="demo-form-inline"
style="display: flex"
>
-
+
-
+
-
+
+
-
+ > -->
{
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("/");
diff --git a/src/views/projectFront/safeSame/rectificationRecord.vue b/src/views/projectFront/safeSame/rectificationRecord.vue
index 3347b5be..3e5898ba 100644
--- a/src/views/projectFront/safeSame/rectificationRecord.vue
+++ b/src/views/projectFront/safeSame/rectificationRecord.vue
@@ -589,7 +589,12 @@
:prop="item.fieldName"
v-else-if="item.originalFieldName == '问题分类'"
>
-
+
{
// 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);