From da82193ac955623a09e9a184ac95520824853b15 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Wed, 30 Aug 2023 14:14:15 +0800 Subject: [PATCH] =?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 --- .env.development | 4 +- .../components/detailsDialog.vue | 44 +++++++++---- .../acceptancePlan/index.scss | 8 +++ .../acceptancePlan/index.vue | 4 +- .../historyData/alarmData/index.vue | 2 +- .../equipManagement/index.vue | 57 +++++++++++++---- .../historyData/alarmData/index.vue | 2 +- .../historyData/realTimeData/index.vue | 20 +++--- .../operatingData/index.scss | 22 ++++++- .../operatingData/index.vue | 7 ++- .../components/detailsDialog.vue | 24 +------ .../acceptancePlan/index.vue | 2 +- .../operatingData/index.scss | 22 ++++++- .../operatingData/index.vue | 15 ++++- .../components/detailsDialog.vue | 44 +++++++++---- .../acceptancePlan/index.vue | 4 +- .../equipManagement/index.vue | 63 ++++++++++++++----- .../historyData/realTimeData/index.vue | 20 +++--- .../operatingData/index.scss | 22 ++++++- .../operatingData/index.vue | 20 +++++- 20 files changed, 303 insertions(+), 103 deletions(-) diff --git a/.env.development b/.env.development index bd41f8a..ffefc80 100644 --- a/.env.development +++ b/.env.development @@ -2,9 +2,9 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) -VITE_API_URL = 'http://192.168.34.155:6688' +# VITE_API_URL = 'http://192.168.34.155:6688' VITE_WPAPI_URL = "http://182.90.224.147:8081" -# VITE_API_URL = "http://182.90.224.147:6688" +VITE_API_URL = "http://182.90.224.147:6688" # 上传 # VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue index 72fda32..d5e6cc1 100644 --- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue +++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue @@ -11,20 +11,38 @@
验收阶段 - + 类型 - + 备注 - +
验收内容
- 新增 - {{ + 新增 + {{ allForm.state == 1 ? "审批中" : allForm.state == 2 @@ -107,7 +125,7 @@ {{ row.remark }} - + - + @@ -258,8 +276,8 @@
@@ -566,7 +584,8 @@ watch( stage: "", type: null, remark: "", - rejectReason: "" + rejectReason: "", + state: null }; recordData.value = []; documentData.value = []; @@ -682,5 +701,8 @@ onMounted(() => { margin-top: 20px; } } + .backStyle { + color: #f64d31 !important; + } } diff --git a/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.scss b/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.scss index 5d8bcf2..fc39e58 100644 --- a/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.scss +++ b/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.scss @@ -14,3 +14,11 @@ display: none; } } +:deep() { + .el-progress-bar { + display: none; + } + .el-progress__text { + display: none; + } +} diff --git a/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue b/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue index 9df8bcd..7b2efe9 100644 --- a/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue +++ b/src/views/enterprise/engineeringAcceptance/acceptancePlan/index.vue @@ -349,7 +349,6 @@ const getTableList = (params: any) => { // 修改数据按钮 const handleEditItem = async (index: number, row: any) => { - ruleFormRef.value?.resetFields(); if (index === 1) { newTitle.value = "新增验收计划"; planFormData.value = reactive({ @@ -376,6 +375,9 @@ const handleEditItem = async (index: number, row: any) => { fileList1.value = row.fileUrl ? [{ ...JSON.parse(row.fileUrl) }] : []; } planVisible.value = true; + setTimeout(function () { + ruleFormRef.value.clearValidate(); + }, 50); }; // 删除用户信息 diff --git a/src/views/enterprise/liftSupervision/historyData/alarmData/index.vue b/src/views/enterprise/liftSupervision/historyData/alarmData/index.vue index 01facb5..b8a6666 100644 --- a/src/views/enterprise/liftSupervision/historyData/alarmData/index.vue +++ b/src/views/enterprise/liftSupervision/historyData/alarmData/index.vue @@ -116,7 +116,7 @@

- 升降机报警时间: {{ row.createTime }} + 塔吊报警时间: {{ row.createTime }}
diff --git a/src/views/enterprise/towerCraneSupervision/equipManagement/index.vue b/src/views/enterprise/towerCraneSupervision/equipManagement/index.vue index a54a02d..df6e09c 100644 --- a/src/views/enterprise/towerCraneSupervision/equipManagement/index.vue +++ b/src/views/enterprise/towerCraneSupervision/equipManagement/index.vue @@ -102,7 +102,7 @@ - + 是 否 @@ -110,7 +110,7 @@ - + 是 否 @@ -137,19 +137,19 @@ - + - + - + @@ -233,7 +233,7 @@ - + 是 否 @@ -248,19 +248,19 @@ - + - + - + @@ -452,7 +452,7 @@ const rules = ref({ { required: true, message: "请输入", - trigger: "blur" + trigger: "change" } ], installImage: [ @@ -495,6 +495,11 @@ const rules = ref({ required: true, message: "请输入", trigger: "blur" + }, + { + pattern: /^\d+(\.\d2)?$/, + message: "请输入整数或小数点后两位小数", + trigger: "blur" } ], maxLiftingCapacity: [ @@ -502,6 +507,11 @@ const rules = ref({ required: true, message: "请输入", trigger: "blur" + }, + { + pattern: /^\d+(\.\d2)?$/, + message: "请输入整数或小数点后两位小数", + trigger: "blur" } ], independentLiftingHeight: [ @@ -509,6 +519,11 @@ const rules = ref({ required: true, message: "请输入", trigger: "blur" + }, + { + pattern: /^\d+(\.\d2)?$/, + message: "请输入整数或小数点后两位小数", + trigger: "blur" } ], acquisitionDate: [ @@ -537,6 +552,11 @@ const rules = ref({ required: true, message: "请输入", trigger: "blur" + }, + { + pattern: /^[0-9]+$/, + message: "请输入整数", + trigger: "blur" } ], @@ -590,6 +610,11 @@ const rules = ref({ required: true, message: "请输入", trigger: "blur" + }, + { + pattern: /^\d+(\.\d2)?$/, + message: "请输入整数或小数点后两位小数", + trigger: "blur" } ], posteriorArmLength: [ @@ -597,6 +622,11 @@ const rules = ref({ required: true, message: "请输入", trigger: "blur" + }, + { + pattern: /^\d+(\.\d2)?$/, + message: "请输入整数或小数点后两位小数", + trigger: "blur" } ], towerHeight: [ @@ -604,6 +634,11 @@ const rules = ref({ required: true, message: "请输入", trigger: "blur" + }, + { + pattern: /^\d+(\.\d2)?$/, + message: "请输入整数或小数点后两位小数", + trigger: "blur" } ], forearmFlag: [ @@ -655,7 +690,7 @@ const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => console.log(response.result.url); console.log(response, uploadFile); formData.value.installImage = response.result.url; - formRef.value?.validateField("image"); + formRef.value?.validateField("installImage"); }; // 删除设备 const handleDeleteItem = async (params: jxj_User.ResUserList) => { diff --git a/src/views/enterprise/towerCraneSupervision/historyData/alarmData/index.vue b/src/views/enterprise/towerCraneSupervision/historyData/alarmData/index.vue index a4611e8..85db868 100644 --- a/src/views/enterprise/towerCraneSupervision/historyData/alarmData/index.vue +++ b/src/views/enterprise/towerCraneSupervision/historyData/alarmData/index.vue @@ -101,7 +101,7 @@
- 升降机报警时间: {{ row.createTime }} + 塔吊报警时间: {{ row.createTime }}
diff --git a/src/views/enterprise/towerCraneSupervision/historyData/realTimeData/index.vue b/src/views/enterprise/towerCraneSupervision/historyData/realTimeData/index.vue index e081034..2f6d887 100644 --- a/src/views/enterprise/towerCraneSupervision/historyData/realTimeData/index.vue +++ b/src/views/enterprise/towerCraneSupervision/historyData/realTimeData/index.vue @@ -404,16 +404,16 @@ const columns: ColumnProps[] = [ isShow: false, search: { el: "input" } }, - { - prop: "type", - label: "报警类型", - isShow: false, - search: { el: "select" }, - enum: [ - { label: "报警", value: 1 }, - { label: "预警", value: 2 } - ] - }, + // { + // prop: "type", + // label: "报警类型", + // isShow: false, + // search: { el: "select" }, + // enum: [ + // { label: "报警", value: 1 }, + // { label: "预警", value: 2 } + // ] + // }, { prop: "createTime", label: "数据接受时间", diff --git a/src/views/enterprise/towerCraneSupervision/operatingData/index.scss b/src/views/enterprise/towerCraneSupervision/operatingData/index.scss index 7bb9f08..d9cb041 100644 --- a/src/views/enterprise/towerCraneSupervision/operatingData/index.scss +++ b/src/views/enterprise/towerCraneSupervision/operatingData/index.scss @@ -163,7 +163,7 @@ } } } - .no-data { + > .no-data { @include boxStyle; flex: 1; height: 100%; @@ -215,6 +215,16 @@ margin-bottom: 8px; } } + .no-data { + @include boxStyle; + flex: 1; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + color: #999; + } } .info-list { height: calc(100% - 50px); @@ -267,6 +277,16 @@ margin-top: 5px; } } + .no-data { + @include boxStyle; + flex: 1; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + color: #999; + } } } } diff --git a/src/views/enterprise/towerCraneSupervision/operatingData/index.vue b/src/views/enterprise/towerCraneSupervision/operatingData/index.vue index dd98372..5c53044 100644 --- a/src/views/enterprise/towerCraneSupervision/operatingData/index.vue +++ b/src/views/enterprise/towerCraneSupervision/operatingData/index.vue @@ -189,7 +189,7 @@ const aspectList = ref([ { name: "载重", value: 10, - unit: "T", + unit: "kg", img: new URL("@/assets/images/onlineSupervision/载重.png", import.meta.url).href, prop: "loading" }, @@ -347,6 +347,11 @@ const getengineering = async () => { searchSn.value = res.result[0].engineeringSn; } getEquipList(); + if (active.value === 0) { + getAlarmList(); + } else { + getMonitorList(); + } console.log(res); }; // 点击抽屉的工程名称更新页面 diff --git a/src/views/goverment/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/goverment/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue index 9cecb3a..c29c6c6 100644 --- a/src/views/goverment/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue +++ b/src/views/goverment/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue @@ -11,31 +11,13 @@
验收阶段 - + 类型 - + 备注 - +
diff --git a/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue b/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue index fd114fa..a89195e 100644 --- a/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue +++ b/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue @@ -145,7 +145,7 @@ const onCurChange = async (params: number) => { // 下载 const downloadTemp = (row: any) => { if (row.fileUrl) { - window.open(baseUrl + "/xmgl/file/preview?fileUrl=" + row.fileUrl); + window.open(baseUrl + "/xmgl/file/preview?fileUrl=" + JSON.parse(row.fileUrl).url); } else { ElMessage.error("暂无可下载文件"); } diff --git a/src/views/goverment/towerCraneSupervision/operatingData/index.scss b/src/views/goverment/towerCraneSupervision/operatingData/index.scss index f956fed..bca5e3e 100644 --- a/src/views/goverment/towerCraneSupervision/operatingData/index.scss +++ b/src/views/goverment/towerCraneSupervision/operatingData/index.scss @@ -223,7 +223,7 @@ } } } - .no-data { + > .no-data { @include boxStyle; flex: 1; height: 100%; @@ -274,6 +274,16 @@ margin-bottom: 8px; } } + .no-data { + @include boxStyle; + flex: 1; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + color: #999; + } } .info-list { height: calc(100% - 50px); @@ -326,6 +336,16 @@ margin-top: 5px; } } + .no-data { + @include boxStyle; + flex: 1; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + color: #999; + } } } } diff --git a/src/views/goverment/towerCraneSupervision/operatingData/index.vue b/src/views/goverment/towerCraneSupervision/operatingData/index.vue index d97c5c5..13f1035 100644 --- a/src/views/goverment/towerCraneSupervision/operatingData/index.vue +++ b/src/views/goverment/towerCraneSupervision/operatingData/index.vue @@ -103,7 +103,7 @@ :tabs="['历史报警', '历史监测信息']" :pageable="pages" class="LeftMenu" - @change-page="onCurChange" + @change-page="onActiveCurChange" >
验收阶段 - + 类型 - + 备注 - +
验收内容
- 新增 - {{ + 新增 + {{ allForm.state == 1 ? "审批中" : allForm.state == 2 @@ -107,7 +125,7 @@ {{ row.remark }} - + - + @@ -258,8 +276,8 @@
@@ -565,7 +583,8 @@ watch( stage: "", type: null, remark: "", - rejectReason: "" + rejectReason: "", + state: null }; recordData.value = []; documentData.value = []; @@ -682,5 +701,8 @@ onMounted(() => { margin-top: 20px; } } + .backStyle { + color: #f64d31 !important; + } } diff --git a/src/views/project/engineeringAcceptance/acceptancePlan/index.vue b/src/views/project/engineeringAcceptance/acceptancePlan/index.vue index 2ac33df..9f589cb 100644 --- a/src/views/project/engineeringAcceptance/acceptancePlan/index.vue +++ b/src/views/project/engineeringAcceptance/acceptancePlan/index.vue @@ -356,7 +356,6 @@ const getTableList = (params: any) => { // 修改数据按钮 const handleEditItem = async (index: number, row: any) => { - ruleFormRef.value?.resetFields(); if (index === 1) { newTitle.value = "新增验收计划"; planFormData.value = reactive({ @@ -383,6 +382,9 @@ const handleEditItem = async (index: number, row: any) => { fileList1.value = row.fileUrl ? [{ ...JSON.parse(row.fileUrl) }] : []; } planVisible.value = true; + setTimeout(function () { + ruleFormRef.value.clearValidate(); + }, 50); }; // 删除用户信息 diff --git a/src/views/project/towerCraneSupervision/equipManagement/index.vue b/src/views/project/towerCraneSupervision/equipManagement/index.vue index 9295ded..b5d34d0 100644 --- a/src/views/project/towerCraneSupervision/equipManagement/index.vue +++ b/src/views/project/towerCraneSupervision/equipManagement/index.vue @@ -102,7 +102,7 @@ - + 是 否 @@ -110,7 +110,7 @@ - + 是 否 @@ -137,19 +137,19 @@ - + - + - + @@ -233,7 +233,7 @@ - + 是 否 @@ -247,20 +247,20 @@ - - + + - - + + - - + + @@ -461,7 +461,7 @@ const rules = ref({ { required: true, message: "请输入", - trigger: "blur" + trigger: "change" } ], installImage: [ @@ -504,6 +504,11 @@ const rules = ref({ required: true, message: "请输入", trigger: "blur" + }, + { + pattern: /^\d+(\.\d2)?$/, + message: "请输入整数或小数点后两位小数", + trigger: "blur" } ], maxLiftingCapacity: [ @@ -511,6 +516,11 @@ const rules = ref({ required: true, message: "请输入", trigger: "blur" + }, + { + pattern: /^\d+(\.\d2)?$/, + message: "请输入整数或小数点后两位小数", + trigger: "blur" } ], independentLiftingHeight: [ @@ -518,6 +528,11 @@ const rules = ref({ required: true, message: "请输入", trigger: "blur" + }, + { + pattern: /^\d+(\.\d2)?$/, + message: "请输入整数或小数点后两位小数", + trigger: "blur" } ], acquisitionDate: [ @@ -546,6 +561,11 @@ const rules = ref({ required: true, message: "请输入", trigger: "blur" + }, + { + pattern: /^[0-9]+$/, + message: "请输入整数", + trigger: "blur" } ], @@ -599,6 +619,11 @@ const rules = ref({ required: true, message: "请输入", trigger: "blur" + }, + { + pattern: /^\d+(\.\d2)?$/, + message: "请输入整数或小数点后两位小数", + trigger: "blur" } ], posteriorArmLength: [ @@ -606,6 +631,11 @@ const rules = ref({ required: true, message: "请输入", trigger: "blur" + }, + { + pattern: /^\d+(\.\d2)?$/, + message: "请输入整数或小数点后两位小数", + trigger: "blur" } ], towerHeight: [ @@ -613,6 +643,11 @@ const rules = ref({ required: true, message: "请输入", trigger: "blur" + }, + { + pattern: /^\d+(\.\d2)?$/, + message: "请输入整数或小数点后两位小数", + trigger: "blur" } ], forearmFlag: [ @@ -664,7 +699,7 @@ const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => console.log(response.result.url); console.log(response, uploadFile); formData.value.installImage = response.result.url; - formRef.value?.validateField("image"); + formRef.value?.validateField("installImage"); }; // 删除设备 const handleDeleteItem = async (params: jxj_User.ResUserList) => { diff --git a/src/views/project/towerCraneSupervision/historyData/realTimeData/index.vue b/src/views/project/towerCraneSupervision/historyData/realTimeData/index.vue index 5d5555e..5698c83 100644 --- a/src/views/project/towerCraneSupervision/historyData/realTimeData/index.vue +++ b/src/views/project/towerCraneSupervision/historyData/realTimeData/index.vue @@ -407,16 +407,16 @@ const columns: ColumnProps[] = [ isShow: false, search: { el: "input" } }, - { - prop: "type", - label: "报警类型", - isShow: false, - search: { el: "select" }, - enum: [ - { label: "报警", value: 1 }, - { label: "预警", value: 2 } - ] - }, + // { + // prop: "type", + // label: "报警类型", + // isShow: false, + // search: { el: "select" }, + // enum: [ + // { label: "报警", value: 1 }, + // { label: "预警", value: 2 } + // ] + // }, { prop: "createTime", label: "数据接受时间", diff --git a/src/views/project/towerCraneSupervision/operatingData/index.scss b/src/views/project/towerCraneSupervision/operatingData/index.scss index ce16e54..aff3a38 100644 --- a/src/views/project/towerCraneSupervision/operatingData/index.scss +++ b/src/views/project/towerCraneSupervision/operatingData/index.scss @@ -162,7 +162,7 @@ } } } - .no-data { + > .no-data { @include boxStyle; flex: 1; height: 100%; @@ -214,6 +214,16 @@ margin-bottom: 8px; } } + .no-data { + @include boxStyle; + flex: 1; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + color: #999; + } } .info-list { height: calc(100% - 50px); @@ -266,6 +276,16 @@ margin-top: 5px; } } + .no-data { + @include boxStyle; + flex: 1; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + color: #999; + } } } } diff --git a/src/views/project/towerCraneSupervision/operatingData/index.vue b/src/views/project/towerCraneSupervision/operatingData/index.vue index b80b13b..732e9b1 100644 --- a/src/views/project/towerCraneSupervision/operatingData/index.vue +++ b/src/views/project/towerCraneSupervision/operatingData/index.vue @@ -96,6 +96,10 @@ {{ item.createTime }}
+
+ notData +
暂无数据
+
@@ -142,6 +146,10 @@
监测时间: {{ item.createTime ? item.createTime : "" }}
+
+ notData +
暂无数据
+
@@ -197,7 +205,7 @@ const aspectList = ref([ { name: "载重", value: 10, - unit: "T", + unit: "kg", img: new URL("@/assets/images/onlineSupervision/载重.png", import.meta.url).href, prop: "loading" }, @@ -382,6 +390,11 @@ const getProject = async () => { searchSn.value = res.result.projectSn; } getEquipList(); + if (active.value === 0) { + getAlarmList(); + } else { + getMonitorList(); + } console.log(res); }; const getengineering = async () => { @@ -392,6 +405,11 @@ const getengineering = async () => { searchSn.value = res.result[0].engineeringSn; } getEquipList(); + if (active.value === 0) { + getAlarmList(); + } else { + getMonitorList(); + } console.log(res); }; // 点击抽屉的工程名称更新页面