From 3a59b177f9edd75112e8fe084fabf57860e4f3c8 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 28 Mar 2023 10:47:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=BF=E7=AD=96=E6=89=BE=E4=BA=BA?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E,=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7,=E6=9C=8D=E5=8A=A1?=
=?UTF-8?q?=E6=89=BE=E4=BA=BA=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/base/community/community.vue | 2009 ++++++++---------
src/views/modules/base/resi.vue | 8 +-
.../modules/communityService/gxxq/index.vue | 2 +-
.../communityService/measure/index.vue | 29 +-
.../communityService/policy/addPolicy.vue | 16 +-
.../communityService/policy/policyList.vue | 4 +-
src/views/modules/cpts/base2/index.vue | 4 +-
.../tuceng/anquan/anquanxuncha/index.vue | 2 +-
.../tuceng/anquan/yinhuan/index.vue | 2 +-
9 files changed, 1039 insertions(+), 1037 deletions(-)
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 19b8419d9..403e435fb 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -1,339 +1,331 @@
-
-
-
-
-
-
-
-
-
-
- {{ data.label + "(" }}
- {{ data.showNum }}
- {{ ")" }}
-
- {{ data.showName }}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+ {{ boxHeight ? "展开" : "收起"
+ }}
- -->
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -957,108 +936,108 @@ export default {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index f7d92d72b..ff0ba434f 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -639,7 +639,6 @@ export default {
currentPage: 1,
pageSize: 20,
total: null,
- searchH: 241,
resideathAddObj1: {}, // 死亡登记子组件
conditions: [],
activeName: "",
@@ -714,10 +713,9 @@ export default {
computed: {
...mapGetters(["clientHeight", "iframeHeight"]),
tableHeight() {
- const h =
- this.clientHeight - this.searchH - 241 + this.iframeHeight;
- const _h = this.clientHeight - 241 - this.searchH;
- return this.$store.state.inIframe ? h : _h;
+ return this.$store.state.inIframe
+ ? this.clientHeight - 450 + this.iframeHeigh
+ : this.clientHeight - 450;
},
},
diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue
index 40cd26388..07a674837 100644
--- a/src/views/modules/communityService/gxxq/index.vue
+++ b/src/views/modules/communityService/gxxq/index.vue
@@ -304,7 +304,7 @@ export default {
pageSize: 20,
tableLoading: true,
total: 0,
- searchH: 115,
+ searchH: 170,
formShow: false,
formTitle: "",
rowObj: {},
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index c1f202d0d..e78cd493a 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -1,7 +1,8 @@
-
-
+
重置
+ {{ boxHeight ? "展开" : "收起"
+ }}
@@ -266,8 +279,7 @@
-
-
+
{
+ this.formData.attachmentList.push({
+ name:item.attachmentName,
+ type:item.attachmentType,
+ url:item.attachmentUrl,
+ format:item.attachmentFormat,
+ duration:0,
+ })
+ })
this.formData.assignInfo = this.newFormData;
let url = "/governance/policy/addPolicy";
if (this.formType === "add" || this.formType === "copy") {
url = "/governance/policy/addPolicy";
- this.formData.policyId = "";
+ // this.formData.policyId = "";
} else {
url = "/heart/policy/update";
- this.formData.policyId = this.policyId;
+ // this.formData.policyId = this.policyId;
}
// const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
index 195ae7647..10dc87899 100644
--- a/src/views/modules/communityService/policy/policyList.vue
+++ b/src/views/modules/communityService/policy/policyList.vue
@@ -330,8 +330,8 @@ export default {
computed: {
maxTableHeight() {
return this.$store.state.inIframe
- ? this.clientHeight - 400 + this.iframeHeigh
- : this.clientHeight - 400;
+ ? this.clientHeight - 450 + this.iframeHeigh
+ : this.clientHeight - 450;
},
...mapGetters(["clientHeight", "iframeHeight"]),
},
diff --git a/src/views/modules/cpts/base2/index.vue b/src/views/modules/cpts/base2/index.vue
index e5ad2d769..182bbca8e 100644
--- a/src/views/modules/cpts/base2/index.vue
+++ b/src/views/modules/cpts/base2/index.vue
@@ -526,9 +526,9 @@ export default {
return this.$store.state.inIframe
? this.clientHeight -
ref_search_height -
- 265 +
+ 280 +
this.iframeHeight
- : this.clientHeight - ref_search_height - 265;
+ : this.clientHeight - ref_search_height - 280;
},
...mapGetters(["clientHeight", "iframeHeight"]),
},
diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
index 5a8508ec6..4327f9b9b 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
@@ -172,7 +172,7 @@ export default {
created() {},
computed: {
maxTableHeight() {
- return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeigh : this.clientHeight - 410;
+ return this.$store.state.inIframe ? this.clientHeight - 450 + this.iframeHeigh : this.clientHeight - 450;
},
...mapGetters(['clientHeight', 'iframeHeight'])
},
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
index 059207b81..1551ada59 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
@@ -155,7 +155,7 @@ export default {
created() {},
computed: {
maxTableHeight() {
- return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeigh : this.clientHeight - 410;
+ return this.$store.state.inIframe ? this.clientHeight - 450 + this.iframeHeigh : this.clientHeight - 450;
},
...mapGetters(['clientHeight', 'iframeHeight'])
},
From 2cb7161ea599441b2cdd50fd907aab3bac0ea21b Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 28 Mar 2023 10:55:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=90=9C=E7=B4=A2?=
=?UTF-8?q?=E9=AB=98=E5=BA=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/cpts/base2/index.vue | 27 +++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/views/modules/cpts/base2/index.vue b/src/views/modules/cpts/base2/index.vue
index 182bbca8e..4927984ec 100644
--- a/src/views/modules/cpts/base2/index.vue
+++ b/src/views/modules/cpts/base2/index.vue
@@ -101,21 +101,26 @@
-
+
+
+
+
+
+ 查询
重置查询
-
-
-
+
+