From 767e85a1a44889f5deadccc63e844cf733735eae Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Mon, 28 Aug 2023 16:31:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/detailsDialog.vue | 22 ++++++++++++---- .../components/transformInfo.vue | 11 +++++--- .../acceptanceApply/index.vue | 2 ++ .../acceptancePlan/index.vue | 5 ++++ .../components/transformInfo.vue | 2 ++ .../components/transformInfo.vue | 2 ++ .../components/transformInfo.vue | 10 ++++++-- .../acceptanceApply/index.vue | 4 ++- .../acceptancePlan/index.vue | 4 ++- .../GanttchartChart/index.vue | 4 ++- .../divisionsAndISubItems/index.vue | 4 ++- .../investmentPayment/index.vue | 4 ++- .../panoramicPlan/index.vue | 4 ++- .../planFinishSituation/index.vue | 4 ++- .../components/detailsDialog.vue | 25 ++++++++++++++----- .../components/transformInfo.vue | 4 ++- .../acceptanceApply/index.vue | 2 ++ .../acceptancePlan/index.vue | 7 +++++- .../components/transformInfo.vue | 2 ++ .../components/transformInfo.vue | 2 ++ .../ProjectSupervision/overview.vue | 9 ++++++- 21 files changed, 106 insertions(+), 27 deletions(-) diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue index c361d8b..72fda32 100644 --- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue +++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue @@ -300,7 +300,9 @@ const baseUrl = import.meta.env.VITE_API_URL; const props = defineProps({ dialogVisible: Boolean, relativeId: String, - title: String + title: String, + searchSn: String, + activeValue: String }); const emits = defineEmits(["update:dialogVisible", "confirm"]); const visible1 = ref(false); @@ -382,9 +384,13 @@ const confirm = async () => { let requestData = { ...allForm.value, detailList: recordData.value, - annexList: documentData.value, - engineeringSn: globalStore.engineeringSn + annexList: documentData.value }; + if (props.activeValue == "eng") { + requestData.engineeringSn = props.searchSn; + } else { + requestData.projectSn = props.searchSn; + } if (props.title == "重新发起") { requestData.id = props.relativeId; } @@ -467,7 +473,13 @@ const confirm = async () => { visible1.value = false; }; const getSingleEngineerData = async () => { - const res = await singleEngineer({ engineeringSn: globalStore.engineeringSn }); + let requestData = {}; + if (props.activeValue == "eng") { + requestData.engineeringSn = props.searchSn; + } else { + requestData.projectSn = props.searchSn; + } + const res = await singleEngineer(requestData); singleEngineerList.value = res.result; console.log(res); }; @@ -548,6 +560,7 @@ watch( (n, o) => { visible1.value = n; if (n) { + getSingleEngineerData(); if (props.title == "新增") { allForm.value = { stage: "", @@ -571,7 +584,6 @@ watch(visible1, (n, o) => { }); onMounted(() => { getDicMainList(); - getSingleEngineerData(); }); diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue index 1d42b74..e1ce118 100644 --- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue +++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/transformInfo.vue @@ -487,8 +487,8 @@ onMounted(() => {}); top: 0; right: -460px; width: 380px; - height: calc(100% - 31px); min-width: 420px; + height: calc(100% - 31px); background: #ffffff; box-shadow: 0px 4px 8px 0px rgba(48, 62, 100, 0.2); border-radius: 8px 8px 8px 8px; @@ -502,7 +502,8 @@ onMounted(() => {}); display: flex; margin-bottom: 12px; span:nth-child(1) { - width: 56px; + display: inline-block; + width: 60px; text-align: right; font-size: 12px; font-family: Source Han Sans CN-Medium, Source Han Sans CN; @@ -524,11 +525,13 @@ onMounted(() => {}); img { width: 95px; height: 53px; + margin-bottom: 10px; margin-right: 15px; } :deep(.el-image) { width: 95px; height: 53px; + margin-bottom: 10px; margin-right: 15px; } } @@ -574,10 +577,10 @@ onMounted(() => {}); .situation-step { margin-top: 20px; overflow-y: scroll; - height: 300px; + height: 210px; .row { span:nth-child(1) { - text-align: left; + text-align: right; } } :deep(.el-timeline-item) { diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue index 6de5bb1..13c3d96 100644 --- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue +++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue @@ -41,6 +41,8 @@ v-model:dialogVisible="dialogVisible" :title="newTitle" :relativeId="relativeId" + :searchSn="searchSn" + :activeValue="activeValue" @confirm="confirmReform" > diff --git a/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue b/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue index 2dab69c..5190c8f 100644 --- a/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue +++ b/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue @@ -284,6 +284,10 @@ const confirm = async (formEl: FormInstance | undefined) => { await formEl.validate(async (valid, fields) => { if (valid) { planFormData.value.engineeringSn = initParam.engineeringSn; + planFormData.value.fileUrl = planFormData.value.fileUrl ? JSON.stringify(planFormData.value.fileUrl) : ""; + if (planFormData.value.state == "0") { + planFormData.value.completeDate = null; + } if (planFormData.value.id) { const res = await acceptancePlanEdit({ ...planFormData.value }); ElMessage.success("编辑成功"); @@ -345,6 +349,7 @@ const getTableList = (params: any) => { // 修改数据按钮 const handleEditItem = async (index: number, row: any) => { + ruleFormRef.value?.resetFields(); if (index === 1) { newTitle.value = "新增验收计划"; planFormData.value = reactive({ diff --git a/src/views/enterprise/qualitySupervision/components/transformInfo.vue b/src/views/enterprise/qualitySupervision/components/transformInfo.vue index 625a840..91710b1 100644 --- a/src/views/enterprise/qualitySupervision/components/transformInfo.vue +++ b/src/views/enterprise/qualitySupervision/components/transformInfo.vue @@ -520,11 +520,13 @@ onMounted(() => {}); img { width: 95px; height: 53px; + margin-bottom: 10px; margin-right: 15px; } :deep(.el-image) { width: 95px; height: 53px; + margin-bottom: 10px; margin-right: 15px; } } diff --git a/src/views/enterprise/safetySupervision/components/transformInfo.vue b/src/views/enterprise/safetySupervision/components/transformInfo.vue index 9693b41..1ea1e26 100644 --- a/src/views/enterprise/safetySupervision/components/transformInfo.vue +++ b/src/views/enterprise/safetySupervision/components/transformInfo.vue @@ -521,11 +521,13 @@ onMounted(() => {}); img { width: 95px; height: 53px; + margin-bottom: 10px; margin-right: 15px; } :deep(.el-image) { width: 95px; height: 53px; + margin-bottom: 10px; margin-right: 15px; } } diff --git a/src/views/goverment/engineeringAcceptance/acceptanceApply/components/transformInfo.vue b/src/views/goverment/engineeringAcceptance/acceptanceApply/components/transformInfo.vue index fd92ae9..b353049 100644 --- a/src/views/goverment/engineeringAcceptance/acceptanceApply/components/transformInfo.vue +++ b/src/views/goverment/engineeringAcceptance/acceptanceApply/components/transformInfo.vue @@ -495,11 +495,17 @@ onMounted(() => {}); .imgList { display: flex; flex-wrap: wrap; + img { + width: 95px; + height: 53px; + margin-right: 15px; + margin-bottom: 10px; + } :deep(.el-image) { width: 95px; height: 53px; margin-right: 15px; - margin-bottom: 5px; + margin-bottom: 10px; } } .face-img { @@ -544,7 +550,7 @@ onMounted(() => {}); .situation-step { margin-top: 20px; overflow-y: scroll; - height: 300px; + height: 210px; .row { span:nth-child(1) { text-align: left; diff --git a/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue b/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue index d090f90..fbc1a24 100644 --- a/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue +++ b/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue @@ -16,7 +16,9 @@
- {{ data.projectAddress || data.address }} + + {{ data.projectAddress || data.address }} +
diff --git a/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue b/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue index 61c463d..5372da9 100644 --- a/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue +++ b/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue @@ -16,7 +16,9 @@
- {{ data.projectAddress || data.address }} + + {{ data.projectAddress || data.address }} +
diff --git a/src/views/goverment/progressManagement/GanttchartChart/index.vue b/src/views/goverment/progressManagement/GanttchartChart/index.vue index 0cc6a52..ddcd161 100644 --- a/src/views/goverment/progressManagement/GanttchartChart/index.vue +++ b/src/views/goverment/progressManagement/GanttchartChart/index.vue @@ -16,7 +16,9 @@
- {{ data.projectAddress || data.address }} + + {{ data.projectAddress || data.address }} +
@@ -209,6 +207,7 @@ import { towerCraneEquipAll, operationData } from "@/api/modules/goverment"; +const equipActive = ref(0); const monitorList = ref([]); const alarmList = ref([]); const equipList = ref([]); @@ -324,6 +323,7 @@ const getEquipList = async () => { }; // 获取设备信息 const getEquipInfo = async (obj: any) => { + equipActive.value = equipList.value.findIndex(item => item.id == obj.id); let requestData = { id: obj.id }; diff --git a/src/views/project/hoistingMachineryRecord/index.scss b/src/views/project/hoistingMachineryRecord/index.scss new file mode 100644 index 0000000..5030cce --- /dev/null +++ b/src/views/project/hoistingMachineryRecord/index.scss @@ -0,0 +1,35 @@ +.date-select { + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; +} +.basic-form { + .face-img { + width: 100%; + align-self: flex-start; + :deep(.face-uploader .el-upload) { + border: 1px dashed #d9d9d9 !important; + border-radius: 6px !important; + cursor: pointer !important; + position: relative !important; + overflow: hidden !important; + } + .face-uploader .el-upload:hover { + border-color: #409eff !important; + } + :deep(.el-icon) { + font-size: 28px; + color: #8c939d; + width: 53px; + height: 53px; + line-height: 53px; + text-align: center; + } + .face-avatar { + width: 53px; + height: 53px; + display: block; + } + } +} diff --git a/src/views/project/hoistingMachineryRecord/index.vue b/src/views/project/hoistingMachineryRecord/index.vue new file mode 100644 index 0000000..86eca01 --- /dev/null +++ b/src/views/project/hoistingMachineryRecord/index.vue @@ -0,0 +1,827 @@ + + + + diff --git a/src/views/project/towerCraneSupervision/operatingData/index.vue b/src/views/project/towerCraneSupervision/operatingData/index.vue index a72b96d..b80b13b 100644 --- a/src/views/project/towerCraneSupervision/operatingData/index.vue +++ b/src/views/project/towerCraneSupervision/operatingData/index.vue @@ -329,6 +329,7 @@ const getEquipList = async () => { }; // 获取设备信息 const getEquipInfo = async (obj: any) => { + equipActive.value = equipList.value.findIndex(item => item.id == obj.id); let requestData = { id: obj.id };