From 8f01e046e07e699d2b6850871880d2be3c667933 Mon Sep 17 00:00:00 2001 From: aixianling Date: Mon, 18 Apr 2022 09:30:36 +0800 Subject: [PATCH 01/10] BUG 29148 --- .../components/approvalDetail.vue | 28 ++++++------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue index 12b306bb..2ed6e026 100644 --- a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue +++ b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue @@ -56,12 +56,13 @@
- + - - + + {{ val.dictName }} @@ -237,28 +238,15 @@ - - - - - + @@ -404,7 +392,7 @@ export default { return e.dictionaryCode && this.dict.getLabel(e.dictionaryCode, val) }, getFieldValue(e) { - return e.dictionaryCode ? this.dict.getLabel(e.dictionaryCode, e.fieldValue) : e.fieldValue + return !!e.dictionaryCode ? this.dict.getLabel(e.dictionaryCode, e.fieldValue) : e.fieldValue }, getAreaName(e) { return e.areaValue From 178d254bf87355fa7a1a6fcb71433154c8481640 Mon Sep 17 00:00:00 2001 From: aixianling Date: Mon, 18 Apr 2022 09:50:11 +0800 Subject: [PATCH 02/10] BUG 29156 --- .../approvalManage/components/approvalDetail.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue index 2ed6e026..12c806a2 100644 --- a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue +++ b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue @@ -149,11 +149,9 @@
  • -
    {{ m.fieldName }}{{ m.fieldNameSuffix }}:{{ - m.dictionaryCode - ? dict.getLabel(m.dictionaryCode, m.fieldValue) : m.fieldValue - }} +
    {{ m.fieldName }} + + :{{m.dictionaryCode ? dict.getLabel(m.dictionaryCode, m.fieldValue) : m.fieldValue }}
    • @@ -937,6 +935,8 @@ export default { .desc_div { flex: 1; + min-width: 0; + margin-bottom: 8px; display: flex; flex-wrap: wrap; From 6ede9e8871149e8b68a1dc0bd9cd61bfc59337eb Mon Sep 17 00:00:00 2001 From: aixianling Date: Mon, 18 Apr 2022 09:53:11 +0800 Subject: [PATCH 03/10] BUG 29142 --- project/xiushan/components/personCreditReport.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/xiushan/components/personCreditReport.vue b/project/xiushan/components/personCreditReport.vue index 3f0782a6..fe8f397e 100644 --- a/project/xiushan/components/personCreditReport.vue +++ b/project/xiushan/components/personCreditReport.vue @@ -116,7 +116,7 @@ export default { }) }, handleShow() { - this.getPCR().then(() => this.dialog = true) + this.getPCR().then(() => this.dialog = true).catch(() => this.dialog = true) } }, props: { From 222789a4384b0a66d5ccc206cd75feb9507cf781 Mon Sep 17 00:00:00 2001 From: aixianling Date: Mon, 18 Apr 2022 09:54:31 +0800 Subject: [PATCH 04/10] BUG 29118 --- project/xiushan/components/personCreditReport.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/xiushan/components/personCreditReport.vue b/project/xiushan/components/personCreditReport.vue index fe8f397e..ffeffa59 100644 --- a/project/xiushan/components/personCreditReport.vue +++ b/project/xiushan/components/personCreditReport.vue @@ -92,13 +92,13 @@ export default { {prop: 'landOutflowName', label: '土地流出方'}, {prop: 'landArea', align: 'center', label: '土地面积/㎡'}, {prop: 'landUndertakeName', align: 'center', label: '土地承接方'}, - {prop: 'circulateType', align: 'center', label: '流转形式'}, + {prop: 'circulateType', align: 'center', label: '流转形式', dict: "landCirculateType"}, {prop: 'startDate', align: 'center', label: '开始日期'}, ], } }, created() { - this.dict.load("enterpriseType") + this.dict.load("enterpriseType", "landCirculateType") }, methods: { getPCR() { From 8002d58294da42e354be492cdec65d7bbb15432a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=BB=95=E4=BC=9F?= <499672082@qq.com> Date: Mon, 18 Apr 2022 03:08:02 +0000 Subject: [PATCH 05/10] Update AiSlwVideo.vue --- packages/IntelligentSecurity/components/AiSlwVideo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/IntelligentSecurity/components/AiSlwVideo.vue b/packages/IntelligentSecurity/components/AiSlwVideo.vue index f7f5ea6d..b58aa079 100644 --- a/packages/IntelligentSecurity/components/AiSlwVideo.vue +++ b/packages/IntelligentSecurity/components/AiSlwVideo.vue @@ -12,7 +12,7 @@ :id="id" allow="autoplay *; microphone *; fullscreen *" allowfullscreen allowtransparency key="" allowusermedia frameBorder="no" style="width: 100%; height: 100%;" - :src="`https://cdn.cunwuyun.cn/slw2.0/index.html?url=${src}`"> + :src="`http://cdn.cunwuyun.cn/slw/index.html?url=${src}`">
    From f4f23b4814ca8c4f336239b01d39f0e9d063da70 Mon Sep 17 00:00:00 2001 From: aixianling Date: Mon, 18 Apr 2022 15:20:35 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=9B=9B=E9=82=BB=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/party/partyMember/AppPartyMember.vue | 4 + .../party/partyMember/components/List.vue | 6 +- .../components/neighbourSetting.vue | 219 ++++++++++++++++++ 3 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 packages/party/partyMember/components/neighbourSetting.vue diff --git a/packages/party/partyMember/AppPartyMember.vue b/packages/party/partyMember/AppPartyMember.vue index d241cc7a..b3c7ee17 100644 --- a/packages/party/partyMember/AppPartyMember.vue +++ b/packages/party/partyMember/AppPartyMember.vue @@ -9,11 +9,13 @@ import List from './components/List' import Add from './components/Add' import Detail from './components/Detail' import {mapState} from "vuex"; +import NeighbourSetting from "./components/neighbourSetting"; export default { name: 'AppPartyMember', label: '党员管理', components: { + NeighbourSetting, Add, List, Detail @@ -32,6 +34,8 @@ export default { component() { if (this.$route.hash == "#add") { return Add + } else if (this.$route.hash == "#ns") { + return NeighbourSetting } else if (this.$route.query.id) { return Detail } else return List diff --git a/packages/party/partyMember/components/List.vue b/packages/party/partyMember/components/List.vue index 1a8e6c42..41867c96 100644 --- a/packages/party/partyMember/components/List.vue +++ b/packages/party/partyMember/components/List.vue @@ -114,12 +114,13 @@ :size.sync="search.size" @handleSelectionChange="handleSelectionChange" @getList="getList"> - + @@ -204,6 +205,9 @@ export default { this.getList() }, methods: { + showNeighbourSetting(id) { + this.$router.push({query: {id}, hash: "#ns"}) + }, onTreeChange(e) { this.$emit("update:selected", e) this.getList(e.id) diff --git a/packages/party/partyMember/components/neighbourSetting.vue b/packages/party/partyMember/components/neighbourSetting.vue new file mode 100644 index 00000000..8054a96d --- /dev/null +++ b/packages/party/partyMember/components/neighbourSetting.vue @@ -0,0 +1,219 @@ + + + + + From ec93e7cc0de16da5ebcbc7da61dd289ad1e116ae Mon Sep 17 00:00:00 2001 From: aixianling Date: Mon, 18 Apr 2022 15:29:42 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=9A=E5=91=98?= =?UTF-8?q?=E7=AE=80=E4=BB=8B=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/party/partyMember/components/Add.vue | 16 +++++++++------- packages/party/partyMember/components/Detail.vue | 7 ++++++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/packages/party/partyMember/components/Add.vue b/packages/party/partyMember/components/Add.vue index 40bfad70..f5e145e3 100644 --- a/packages/party/partyMember/components/Add.vue +++ b/packages/party/partyMember/components/Add.vue @@ -2,12 +2,7 @@