From bcd69d38e256129077d6dfc71f2b1781bcce71e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 18 Mar 2024 17:51:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
subPackage/house/roomControl/myHouse.vue | 4 ++++
subPackage/house/houseNumber/index.vue | 10 +++++++++-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/subPackage/house/houseNumber/index.vue b/subPackage/house/houseNumber/index.vue
index 24d7c92..46000c8 100644
--- a/subPackage/house/houseNumber/index.vue
+++ b/subPackage/house/houseNumber/index.vue
@@ -188,7 +188,11 @@
name: 'frontType',
value: '未完善'
},
-
+ {
+ title: '三级消防单位',
+ name: 'threeFireProtection',
+ value: '未完善'
+ },
{
title: '场所负责人',
name: 'principal',
@@ -476,6 +480,10 @@
item.value = data.isFront == 1 ? "是" : "否"
}
+ if (item.name == 'threeFireProtection') {
+ item.value = data.threeFireProtection == 1 ? "是" : "否"
+
+ }
if (data.isFront == 1 && item.name == "frontType") {
this.getBizDict('frontType', (list) => {
item.value = this.$getIndex(list, data.frontType, 'dictKey',
diff --git a/subPackage/house/roomControl/myHouse.vue b/subPackage/house/roomControl/myHouse.vue
index 1331297..4010945 100644
--- a/subPackage/house/roomControl/myHouse.vue
+++ b/subPackage/house/roomControl/myHouse.vue
@@ -333,6 +333,8 @@
urls.push(e.name)
})
this.form.imageUrls = urls.join(",")
+ }else{
+ this.form.imageUrls = '';
}
if (this.form.propertyCertificateImg.length) {
@@ -341,6 +343,8 @@
urls.push(e.name)
})
this.form.propertyCertificateImg = urls.join(",")
+ }else{
+ this.form.propertyCertificateImg = '';
}
--
Gitblit v1.9.3