From 99fab7d22b2dda5b052bf19d3178430c0a7bc816 Mon Sep 17 00:00:00 2001
From: liuye
Date: Thu, 17 Nov 2022 11:46:54 +0800
Subject: [PATCH 2/9] css
---
.../AppWishfulThinking/components/Add.vue | 47 ++++++++++++++++++-
1 file changed, 46 insertions(+), 1 deletion(-)
diff --git a/project/pingchang/apps/AppWishfulThinking/components/Add.vue b/project/pingchang/apps/AppWishfulThinking/components/Add.vue
index 1e3cd257..11b233ba 100644
--- a/project/pingchang/apps/AppWishfulThinking/components/Add.vue
+++ b/project/pingchang/apps/AppWishfulThinking/components/Add.vue
@@ -39,7 +39,7 @@
v-model="form.content"
placeholder="请输入..."
clearabel
- :maxLength="60"
+ :maxLength="500"
>
@@ -268,5 +268,50 @@ export default {
::v-deep .el-date-editor {
width: 100%;
}
+ ::v-deep .mapDialog {
+ .el-dialog__body {
+ padding: 0;
+
+ .ai-dialog__content {
+ padding: 0;
+ }
+
+ .ai-dialog__content--wrapper {
+ padding: 0 !important;
+ position: relative;
+ }
+
+ #map {
+ width: 100%;
+ height: 420px;
+ }
+
+ .searchPlaceInput {
+ position: absolute;
+ width: 250px;
+ top: 30px;
+ left: 25px;
+ }
+
+ #searchPlaceOutput {
+ position: absolute;
+ width: 250px;
+ left: 25px;
+ height: initial;
+ top: 80px;
+ background: white;
+ z-index: 250;
+ max-height: 300px;
+ overflow-y: auto;
+
+ .auto-item {
+ text-align: left;
+ font-size: 14px;
+ padding: 8px;
+ box-sizing: border-box;
+ }
+ }
+ }
+ }
}
\ No newline at end of file
From df45607495a90dea2e2cf4fa09905d7a9049c362 Mon Sep 17 00:00:00 2001
From: liuye
Date: Thu, 17 Nov 2022 15:52:19 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
project/pingchang/apps/AppWishfulThinking/components/List.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/project/pingchang/apps/AppWishfulThinking/components/List.vue b/project/pingchang/apps/AppWishfulThinking/components/List.vue
index 80204796..7949e448 100644
--- a/project/pingchang/apps/AppWishfulThinking/components/List.vue
+++ b/project/pingchang/apps/AppWishfulThinking/components/List.vue
@@ -11,10 +11,10 @@
添加
-
导入
-
+ -->
Date: Thu, 17 Nov 2022 16:43:41 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E8=AF=84=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
project/pingchang/apps/AppWishfulThinking/components/Detail.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project/pingchang/apps/AppWishfulThinking/components/Detail.vue b/project/pingchang/apps/AppWishfulThinking/components/Detail.vue
index e1271841..07c9181a 100644
--- a/project/pingchang/apps/AppWishfulThinking/components/Detail.vue
+++ b/project/pingchang/apps/AppWishfulThinking/components/Detail.vue
@@ -32,7 +32,7 @@
-
+
From 6f8b6a01a171859136b49753e268c8c56d396ef5 Mon Sep 17 00:00:00 2001
From: yanran200730
Date: Fri, 18 Nov 2022 08:50:55 +0800
Subject: [PATCH 5/9] bug
---
components/AiDvRender.vue | 44 +++++++++++++++++++++++----------------
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue
index d1325095..ef430e75 100644
--- a/components/AiDvRender.vue
+++ b/components/AiDvRender.vue
@@ -2,27 +2,35 @@
+ style="height: 100%; width: 100%;"
+ v-if="data.type !== 'display'"
+ :title="data.title"
+ :border="data.border || ''">
+ v-if="data.type === 'table'"
+ :class="'dvScrollBoard' + theme"
+ :config="formatTable(values, data.isShowIndex, data.rowNum)"
+ :key="data.height"
+ :theme="theme"
+ :style="{height: data.height + 'px', width: '100%'}" />
-
+
+
@@ -80,7 +88,7 @@ export default {
immediate: true,
deep: true, handler() {
if (this.currentType == 'map') {
- this.renderMap()
+ // this.renderMap()
}
}
}
From 92b94b2289f44b6de9aae21319f135264a589855 Mon Sep 17 00:00:00 2001
From: yanran200730
Date: Fri, 18 Nov 2022 09:35:49 +0800
Subject: [PATCH 6/9] bug
---
components/AiDvRender.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue
index ef430e75..672a2dfa 100644
--- a/components/AiDvRender.vue
+++ b/components/AiDvRender.vue
@@ -30,7 +30,7 @@
:limitArea="data.limitArea === '1'"
:is3dAround="data.is3dAround === '1'">
-->
-
From e73c339a998708369895375c8af56e669fd2e218 Mon Sep 17 00:00:00 2001
From: yanran200730
Date: Fri, 18 Nov 2022 13:58:45 +0800
Subject: [PATCH 7/9] bug
---
.../apps/AppBayonetRegistration/components/Detail.vue | 1 +
.../apps/AppCommunityManagement/components/Detail.vue | 1 +
.../apps/AppCommunityManagement/components/List.vue | 5 ++---
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
index 0a69cd96..91b0abf9 100644
--- a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
@@ -106,6 +106,7 @@
+
+
this.dict.getLabel('EP_CM_status', v) },
{ prop: 'controllerUserName', label: '管控人', align: 'center' },
- { prop: 'nucleicAcidSamplingCount', label: '核酸状态', align: 'center', formart: v => v > 0 ? `核酸采集${v}次` : '待采' },
- // { prop: 'infoType', label: '对象来源', align: 'center', formart: v => this.dict.getLabel('EP_registerInfoType', v) },
+ { prop: 'nucleicAcidSamplingCount', label: '核酸状态', align: 'center', formart: v => v > 0 ? `核酸采集${v}次` : '待采' }
],
tableData: []
}
From a07cd5f295f3b8339faf819485d120736633a155 Mon Sep 17 00:00:00 2001
From: yanran200730
Date: Fri, 18 Nov 2022 14:12:46 +0800
Subject: [PATCH 8/9] bug
---
.../pingchang/apps/AppCommunityManagement/components/Detail.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project/pingchang/apps/AppCommunityManagement/components/Detail.vue b/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
index 28b95104..9aa6dc4b 100644
--- a/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
+++ b/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
@@ -24,7 +24,7 @@
-
+
Date: Fri, 18 Nov 2022 14:26:48 +0800
Subject: [PATCH 9/9] bug
---
.../apps/AppCommunityManagement/components/List.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/project/pingchang/apps/AppCommunityManagement/components/List.vue b/project/pingchang/apps/AppCommunityManagement/components/List.vue
index c29c5e95..e2262843 100644
--- a/project/pingchang/apps/AppCommunityManagement/components/List.vue
+++ b/project/pingchang/apps/AppCommunityManagement/components/List.vue
@@ -93,10 +93,11 @@
{ prop: 'idNumber', label: '身份证号', align: 'center' },
{ prop: 'createTime', label: '抵平时间', align: 'center' },
{ prop: 'areaName', label: '所属地区', align: 'center' },
- { prop: 'remarks', label: '备注', align: 'center' },
+ { prop: 'arriveAddress', label: '目的地详址', align: 'center' },
{ prop: 'status', label: '管理状态', align: 'center', formart: v => this.dict.getLabel('EP_CM_status', v) },
{ prop: 'controllerUserName', label: '管控人', align: 'center' },
- { prop: 'nucleicAcidSamplingCount', label: '核酸状态', align: 'center', formart: v => v > 0 ? `核酸采集${v}次` : '待采' }
+ { prop: 'nucleicAcidSamplingCount', label: '核酸状态', align: 'center', formart: v => v > 0 ? `核酸采集${v}次` : '待采' },
+ // { prop: 'infoType', label: '对象来源', align: 'center', formart: v => this.dict.getLabel('EP_registerInfoType', v) },
],
tableData: []
}