From 4661b3c7335a1188486326b563474fc659eddf4b Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 16 Sep 2023 17:03:58 +0800 Subject: [PATCH] update code --- src/pages/projectQuality.vue | 5 ++- src/pages/quality/measuredDlg.vue | 60 +++++++++++++++---------------- vue.config.js | 4 +-- 3 files changed, 32 insertions(+), 37 deletions(-) diff --git a/src/pages/projectQuality.vue b/src/pages/projectQuality.vue index 3c1338c..da700c4 100644 --- a/src/pages/projectQuality.vue +++ b/src/pages/projectQuality.vue @@ -368,13 +368,12 @@ export default { checkType:this.samplingNav }); }, - doShowMeasuredDlg(){ - /* + doShowMeasuredDlg(){ this.$refs.measuredDlg.showDialog({ deptId:this.dept?.id||0, projectId:this.projectInfo.id, measureType:this.measuredNav - });*/ + }); }, showMaterialSeal(it){ this.$refs.msDlg.showDialog(it); diff --git a/src/pages/quality/measuredDlg.vue b/src/pages/quality/measuredDlg.vue index 3c5db8f..d8ba4f1 100644 --- a/src/pages/quality/measuredDlg.vue +++ b/src/pages/quality/measuredDlg.vue @@ -38,8 +38,8 @@
- +
@@ -57,47 +57,40 @@
{{ it.deptName }}
- 送检类型: -
{{ it.checkTypeName }}
+ 测量类型: +
{{ it.measureTypeName }}
 - 材料名称: -
{{ it.materialName }}
+ 测量内容: +
{{ it.measureInfo }}
 - 使用部位: -
{{ it.usePosition }}
+ 测量部位: +
{{ it.measurePosition }}
 - 取样数量: -
{{ it.sampleNum }}
+ 测量时间: +
{{ it.measureTime|dateFormat }}
 - 合格证: + 测量点位: +
{{ it.measurePointPosition }}
+ + + 测量结果:
- 已提供 - 未提供 -
- - - 见证人: -
{{ it.witnessUser }}
- - - 实验室名称: -
{{ it.laboratoryName }}
- - - 送检时间: -
{{ it.checkTime|dateFormat }}
- - - 检测结果: -
- 合格 + 合格 不合格
+ + 质量专员: +
{{ it.qualityUserName }}{{ it.qualityUser }}
+ + + 监理专员: +
{{ it.superviseUserName }}{{ it.superviseUser}}
+ 提交用户:
{{it.createByName}}({{ it.createBy }})
@@ -151,7 +144,10 @@ export default { this.show = true this.$api.measure.getList(opt).then(d=>{ - this.dataTable=d.data||[]; + this.dataTable=(d.data||[]).map(it=>{ + it.images=(it.imageUrls||"").split(",").filter(it=>it); + return it; + }); this.title="实测实量-"+['汇总','混泥土工程','二次构建','房间尺寸','抹灰工程','其它'][opt.checkType||0]+`[${this.dataTable.length}]`; }); } diff --git a/vue.config.js b/vue.config.js index 36c12fa..92e3c57 100644 --- a/vue.config.js +++ b/vue.config.js @@ -23,8 +23,8 @@ module.exports = defineConfig({ } }, '/jhapi':{ - //target: `http://62.234.3.186/jhapi/`, - target: `http://127.0.0.1:8090/jhapi/`, + target: `http://62.234.3.186/jhapi/`, + //target: `http://127.0.0.1:8090/jhapi/`, changeOrigin: true, pathRewrite: { '^/jhapi':'/'