From 21aeeedb1c85563cc337f8f895487c44bb7cdf55 Mon Sep 17 00:00:00 2001 From: xzt <1113240624@qq.com> Date: Thu, 25 Jan 2024 17:04:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=89=B4=E5=AE=9A=E6=B8=85?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sluice/components/listBaseInfo.vue | 54 +++-- .../sluice/components/listSafetyDetection.vue | 215 +++++++++++++++--- .../safetyAppraisal/sluice/list.vue | 170 +++++--------- 3 files changed, 281 insertions(+), 158 deletions(-) diff --git a/src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo.vue b/src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo.vue index da074b1..198a161 100644 --- a/src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo.vue +++ b/src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo.vue @@ -2,11 +2,11 @@
- + -
+
保 存 取 消
@@ -258,6 +258,7 @@ import { getFileStream } from "@/api/system/upload"; export default { name: "Aqjdxx", + props: ["wagaName", "szrwId"], data() { return { // 遮罩层 @@ -288,7 +289,7 @@ export default { pageSize: 10, ids: null, data: { - sluiceId: null, + szrwId: null, identifyTime: null, nextIdentifyTime: null, safetyEvaluationUnit: null, @@ -344,11 +345,23 @@ export default { methods: { /** 查询水闸安全鉴定信息列表 */ getList() { - this.loading = true; + // this.loading = true; + this.queryParams.data.szrwId = this.szrwId; listAqjdxx(this.queryParams).then((response) => { - this.aqjdxxList = response.records; - this.total = response.total; - this.loading = false; + if (response.records[0]) { + this.form = response.records[0]; + if (this.form.safetyEvaluationReport) { + this.fileList1 = JSON.parse(this.form.safetyEvaluationReport); + } + if (this.form.safetyAppraisalReport) { + this.fileList2 = JSON.parse(this.form.safetyAppraisalReport); + } + if (this.form.safetyAppraisalOpinion) { + this.fileList3 = JSON.parse(this.form.safetyAppraisalOpinion); + } + } + // this.total = response.total; + // this.loading = false; }); }, // 审定部门级别字典翻译 @@ -367,14 +380,15 @@ export default { }, // 取消按钮 cancel() { - this.open = false; - this.reset(); + // this.open = false; + // this.reset(); + this.$emit("cancelParent"); }, // 表单重置 reset() { this.form = { id: null, - sluiceId: null, + szrwId: null, identifyTime: null, nextIdentifyTime: null, safetyEvaluationUnit: null, @@ -409,7 +423,7 @@ export default { pageSize: 10, data: { id: null, - sluiceId: null, + szrwId: null, identifyTime: null, nextIdentifyTime: null, safetyEvaluationUnit: null, @@ -480,6 +494,9 @@ export default { submitForm() { this.$refs["form"].validate((valid) => { if (valid) { + this.form.safetyEvaluationReport = JSON.stringify(this.fileList1); + this.form.safetyAppraisalReport = JSON.stringify(this.fileList2); + this.form.safetyAppraisalOpinion = JSON.stringify(this.fileList3); if (this.form.id != null) { updateAqjdxx(this.form).then((response) => { if (response.code === 200) { @@ -489,6 +506,7 @@ export default { } }); } else { + this.form.szrwId = this.szrwId; addAqjdxx(this.form).then((response) => { if (response.code === 200) { this.msgSuccess("新增成功"); @@ -581,4 +599,12 @@ export default { // } // } + +.btnList { + text-align: right; + // position: fixed; + // bottom: 20px; + // right: 20px; + // z-index: 1; +} diff --git a/src/views/safetyManage/safetyAppraisal/sluice/components/listSafetyDetection.vue b/src/views/safetyManage/safetyAppraisal/sluice/components/listSafetyDetection.vue index 6b9ce1e..73f1bdd 100644 --- a/src/views/safetyManage/safetyAppraisal/sluice/components/listSafetyDetection.vue +++ b/src/views/safetyManage/safetyAppraisal/sluice/components/listSafetyDetection.vue @@ -2,19 +2,9 @@
- - - - - - - - - - - - - + + + @@ -37,7 +27,12 @@ placeholder="请选择闸门型式" style="width: 100%" > - + @@ -48,37 +43,83 @@ placeholder="请选择启闭机型式" style="width: 100%" > - + - + - + /> --> + + + + 点击上传 + +
+ 支持jpg/png文件等，不超过100M +
+ - + /> --> + + + + 点击上传 + +
+ 支持jpg/png文件等，不超过100M +
+ -
+
保 存 取 消
@@ -94,9 +135,12 @@ import { updateAqjc, exportAqjc, } from "@/api/yg/aqjc"; +import { getToken } from "@/utils/auth"; +import { getFileStream } from "@/api/system/upload"; export default { name: "Aqjc", + props: ["wagaName", "szrwId"], data() { return { // 遮罩层 @@ -117,13 +161,17 @@ export default { title: "", // 是否显示弹出层 open: false, + // 闸门型式字典 + gateTypeOptions: [], + // 启闭机型式字典 + hoistTypeOptions: [], // 查询参数 queryParams: { pageNum: 1, pageSize: 10, ids: null, data: { - sluiceId: null, + szrwId: null, sluiceCode: null, sluiceName: null, holesNumber: null, @@ -149,32 +197,78 @@ export default { // 表单参数 form: {}, // 表单校验 - rules: {}, + rules: { + holesNumber: [ + { + pattern: /^[0-9]\d*$/, + message: "请输入正整数,包含0", + trigger: "blur", + }, + ], + hoistNumber: [ + { + pattern: /^[0-9]\d*$/, + message: "请输入正整数,包含0", + trigger: "blur", + }, + ], + }, + // 请求头 + headers: { + shuili: "water " + getToken(), + }, + fileList1: [], + fileList2: [], }; }, created() { this.getList(); + this.getDicts("gate_type").then((response) => { + this.gateTypeOptions = response.data; + }); + this.getDicts("machine_form").then((response) => { + this.hoistTypeOptions = response.data; + }); }, methods: { + // 闸门型式字典翻译 + gateTypeFormat(row, column) { + return this.selectDictLabel(this.gateTypeOptions, row.gateType); + }, + // 启闭机型式字典翻译 + hoistTypeFormat(row, column) { + return this.selectDictLabel(this.hoistTypeOptions, row.hoistType); + }, /** 查询水闸安全检测列表 */ getList() { - this.loading = true; + // this.loading = true; + this.queryParams.data.szrwId = this.szrwId; listAqjc(this.queryParams).then((response) => { - this.aqjcList = response.records; - this.total = response.total; - this.loading = false; + // this.aqjcList = response.records; + if (response.records[0]) { + this.form = response.records[0]; + if (this.form.testingResults) { + this.fileList1 = JSON.parse(this.form.testingResults); + } + if (this.form.calculationResults) { + this.fileList2 = JSON.parse(this.form.calculationResults); + } + } + // this.total = response.total; + // this.loading = false; }); }, // 取消按钮 cancel() { - this.open = false; - this.reset(); + // this.open = false; + // this.reset(); + this.$emit("cancelParent"); }, // 表单重置 reset() { this.form = { id: null, - sluiceId: null, + szrwId: null, sluiceCode: null, sluiceName: null, holesNumber: null, @@ -201,7 +295,7 @@ export default { pageSize: 10, data: { id: null, - sluiceId: null, + szrwId: null, sluiceCode: null, sluiceName: null, holesNumber: null, @@ -264,6 +358,8 @@ export default { submitForm() { this.$refs["form"].validate((valid) => { if (valid) { + this.form.testingResults = JSON.stringify(this.fileList1); + this.form.calculationResults = JSON.stringify(this.fileList2); if (this.form.id != null) { updateAqjc(this.form).then((response) => { if (response.code === 200) { @@ -273,6 +369,7 @@ export default { } }); } else { + this.form.szrwId = this.szrwId; addAqjc(this.form).then((response) => { if (response.code === 200) { this.msgSuccess("新增成功"); @@ -305,6 +402,55 @@ export default { this.$message.warning("请选择要删除的数据！！"); } }, + // 上传意见附件 + submitUpload(fileList, name) { + console.log(name, fileList); + this[name].push({ + name: fileList.name, + fileName: fileList.response.fileName, + url: fileList.response.url, + uid: fileList.uid, + }); + console.log(name, this[name]); + }, + handleRemove(file, name) { + // console.log(file, fileList1); + let index = this[name].findIndex((item) => item.uid === file.uid); + // 删除文件 + this[name].splice(index, 1); + }, + downloadFile2(info, index) { + console.log(info); + this.handlePreview(info); + }, + // 点击预览的文件进行下载 + handlePreview(file) { + // console.log(file); + getFileStream({ fileName: file.fileName }).then((res) => { + const blob = new Blob([res], { + // type类型后端返回来的数据中会有，根据自己实际进行修改 + // 表格下载为 application/xlsx，压缩包为 application/zip等， + type: "application/xlsx", + }); //excel,pdf等 + const href = URL.createObjectURL(blob); //创建新的URL表示指定的blob对象 + const a = document.createElement("a"); //创建a标签 + a.style.display = "none"; + a.href = href; // 指定下载链接 + a.download = file.name; //指定下载文件名 + a.click(); //触发下载 + URL.revokeObjectURL(a.href); //释放URL对象 + }); + }, + handleExceed(files, fileList) { + this.$message.warning( + `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${ + files.length + fileList.length + } 个文件` + ); + }, + beforeRemove(file, fileList) { + return this.$confirm(`确定移除 ${file.name}？`); + }, }, }; @@ -315,4 +461,11 @@ export default { // margin-top: 2vh !important; // } // } +.btnList { + text-align: right; + // position: fixed; + // bottom: 20px; + // right: 20px; + // z-index: 1; +} diff --git a/src/views/safetyManage/safetyAppraisal/sluice/list.vue b/src/views/safetyManage/safetyAppraisal/sluice/list.vue index 9765e73..142698d 100644 --- a/src/views/safetyManage/safetyAppraisal/sluice/list.vue +++ b/src/views/safetyManage/safetyAppraisal/sluice/list.vue @@ -9,21 +9,21 @@ label-width="68px" > - - - + + @@ -90,12 +91,7 @@ > - - + - + - + - +