diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index 39248fe6..83c0dd37 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -3461,7 +3461,7 @@ export default {
handleBeforeUpload(file, type) {
if (type == 4) {
if (
- file.type != "image/jpeg" &&
+ // file.type != "image/jpeg" &&
file.type != "image/jpg"
// file.type != "image/png"
) {
diff --git a/src/views/projectFront/specialWork/blindPlugWork.vue b/src/views/projectFront/specialWork/blindPlugWork.vue
index e1d07b05..49479d25 100644
--- a/src/views/projectFront/specialWork/blindPlugWork.vue
+++ b/src/views/projectFront/specialWork/blindPlugWork.vue
@@ -2,7 +2,12 @@
-
+
-
+
-
+
-
+
{{ scope.row.jobApplicationUnitName }}
-
+ > -->
-
+
{{ workDetail.workTicketCode }}
-
+
+
-
+
-
+
{{ workDetail.assignmentPersonInChargeName }}
-
+
{{ workDetail.organizerDate }}
-
+
{{ workDetail.jobPersonName }}
-
+
@@ -376,7 +424,9 @@
@@ -384,7 +434,10 @@
-
+
{{ workDetail.blindPlateNo }}
-
+
{{ workDetail.guardianName }}
-
+
{{ workDetail.organizer }}
-
+
{{ workDetail.riskIdentificationResult }}
{{ workDetail.safetyWorkTicketCode }}
-->
-
@@ -425,8 +487,28 @@
:disabled="isDisabledDetail"
>
+ -->
+
+
+
+
+
-
+
-
+
{
prev.push({
...item,
@@ -819,8 +908,10 @@ export default {
people: val[index].personLiable,
unit: val[index].responsibilityCompany,
};
- this.safeStatus = val[index].securityConstructionSchemeType == 2 ? true : false;
- this.safeStatus2 = val[index].specialConstructionSchemeType == 2 ? true : false;
+ this.safeStatus =
+ val[index].securityConstructionSchemeType == 2 ? true : false;
+ this.safeStatus2 =
+ val[index].specialConstructionSchemeType == 2 ? true : false;
this.safeStatus3 = val[index].technicalDisclosureType == 2 ? true : false;
this.file1 = val[index].securityConstructionSchemeFile;
this.file2 = val[index].specialConstructionSchemeFile;
@@ -885,7 +976,9 @@ export default {
getCooperatorListApi(data).then((res) => {
if (res.code == 200) {
if (res.result.records.length > 0) {
- this.cooperatorList = JSON.parse(JSON.stringify(res.result.records));
+ this.cooperatorList = JSON.parse(
+ JSON.stringify(res.result.records)
+ );
this.cooperatorList.forEach((item) => {
item.value = item.enterpriseLegalPerson;
item.label = item.enterpriseName;
@@ -899,7 +992,8 @@ export default {
// 获取类别
getType() {
selectDangerousEngineeringTypeApi({
- sn: JSON.parse(window.sessionStorage.getItem("vuex")).userInfo.headquartersSn,
+ sn: JSON.parse(window.sessionStorage.getItem("vuex")).userInfo
+ .headquartersSn,
}).then((res) => {
if (res.result) {
// console.log(res.result)
@@ -914,15 +1008,21 @@ export default {
addData() {
if (this.addForm.name == "") {
// 请输入危大工程名称
- this.$message.error(this.$t("message.dangerousBigProject.verifyMessage1"));
+ this.$message.error(
+ this.$t("message.dangerousBigProject.verifyMessage1")
+ );
return;
} else if (this.addForm.category == "") {
// 请选择危大工程类别
- this.$message.error(this.$t("message.dangerousBigProject.verifyMessage2"));
+ this.$message.error(
+ this.$t("message.dangerousBigProject.verifyMessage2")
+ );
return;
} else if (this.addForm.describe == "") {
// 请选择类别描述
- this.$message.error(this.$t("message.dangerousBigProject.verifyMessage3"));
+ this.$message.error(
+ this.$t("message.dangerousBigProject.verifyMessage3")
+ );
return;
}
// console.log(this.addForm)
@@ -937,9 +1037,11 @@ export default {
planEndTime: this.addForm.date[1],
planStartTime: this.addForm.date[0],
projectSn: this.projectSn,
- securityConstructionSchemeFile: this.fileList.length > 0 ? this.file1 : "", //安全专项施工方案附件
+ securityConstructionSchemeFile:
+ this.fileList.length > 0 ? this.file1 : "", //安全专项施工方案附件
securityConstructionSchemeType: this.safeStatus ? 2 : 1, //是否完成安全专项施工方案交底，1未完成，2完成
- specialConstructionSchemeFile: this.fileList2.length > 0 ? this.file2 : "", //专项施工方案附件
+ specialConstructionSchemeFile:
+ this.fileList2.length > 0 ? this.file2 : "", //专项施工方案附件
specialConstructionSchemeType: this.safeStatus2 ? 2 : 1, //是否完成专项施工方案交底，1未完成，2完成
technicalDisclosureFile: this.fileList3.length > 0 ? this.file3 : "", //技术交底文件
technicalDisclosureType: this.safeStatus3 ? 2 : 1, //是否完成安全技术交底，1未完成，2完成
@@ -949,7 +1051,9 @@ export default {
// "新增"
if (this.dialogTitle == this.$t("message.dangerousBigProject.add")) {
console.log(data);
- data.responsibilityCompany = this.addForm.unit ? this.addForm.unit.join(",") : "";
+ data.responsibilityCompany = this.addForm.unit
+ ? this.addForm.unit.join(",")
+ : "";
addDangerousEngineeringRecordApi(data).then((res) => {
if ((res.code = 200)) {
this.$message.success(
@@ -961,7 +1065,9 @@ export default {
}
console.log(res);
});
- } else if (this.dialogTitle == this.$t("message.dangerousBigProject.edit")) {
+ } else if (
+ this.dialogTitle == this.$t("message.dangerousBigProject.edit")
+ ) {
// "编辑"
data.id = this.editParms.id;
data.typeDescribeId = this.editParms.typeDescribeId;
@@ -973,7 +1079,9 @@ export default {
editDangerousEngineeringRecordApi(data).then((res) => {
if ((res.code = 200)) {
// "修改成功！"
- this.$message.success(this.$t("message.dangerousBigProject.editSuccess"));
+ this.$message.success(
+ this.$t("message.dangerousBigProject.editSuccess")
+ );
this.initData();
}
console.log(res);
@@ -1026,7 +1134,8 @@ export default {
console.log("fileList");
console.log(fileList);
this.fileList = fileList;
- this.file1 = this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl;
+ this.file1 =
+ this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl;
},
uploadError(err, file, fileList) {
// 上传失败！
@@ -1049,7 +1158,8 @@ export default {
console.log("fileList");
console.log(fileList);
this.fileList2 = fileList;
- this.file2 = this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl;
+ this.file2 =
+ this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl;
},
uploadError2(err, file, fileList) {
// 上传失败！
@@ -1072,7 +1182,8 @@ export default {
console.log("fileList");
console.log(fileList);
this.fileList3 = fileList;
- this.file3 = this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl;
+ this.file3 =
+ this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl;
},
uploadError3(err, file, fileList) {
// 上传失败！
@@ -1098,8 +1209,8 @@ export default {
...res.result,
// xzGasAnalyzeList: res.result.xzGasAnalyzeList,
hotWorkExecutionTime: [
- res.result.hotWorkExecutionBeginTime,
- res.result.hotWorkExecutionEndTime,
+ res.result.workExecutionBeginTime ? res.result.workExecutionBeginTime : "",
+ res.result.workExecutionEndTime ? res.result.workExecutionEndTime: "",
],
};
if (this.workDetail.fieldWorkingEnvironment) {
diff --git a/src/views/resetPassword/index.vue b/src/views/resetPassword/index.vue
index ca6a11b8..2b71add6 100644
--- a/src/views/resetPassword/index.vue
+++ b/src/views/resetPassword/index.vue
@@ -59,8 +59,9 @@
![]()
+
指挥部大屏
-->
+