From c1131c0b5408fea0b3b731e47d7b0d4e468b1499 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 21 Jul 2022 18:19:41 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/main.js | 1 + project/dv/apps/AppPdDv.vue | 17 +- project/dv/apps/components/AiGrid.vue | 209 ++++++++++++++++++ .../dv/apps/{ => components}/DonutChart.vue | 0 4 files changed, 223 insertions(+), 4 deletions(-) create mode 100644 project/dv/apps/components/AiGrid.vue rename project/dv/apps/{ => components}/DonutChart.vue (100%) diff --git a/examples/main.js b/examples/main.js index 6539fb0f..0116a563 100644 --- a/examples/main.js +++ b/examples/main.js @@ -18,6 +18,7 @@ Vue.use(dvui) //富文本编辑器配置 Vue.config.productionTip = false; Vue.prototype.$axios = axios; +Vue.prototype.$request = axios Vue.prototype.formatContent = (val) => val.replace(/(\r\n)|(\n)/g, '
'); Object.keys(utils).map((e) => (Vue.prototype[e] = utils[e])); new Vue({ diff --git a/project/dv/apps/AppPdDv.vue b/project/dv/apps/AppPdDv.vue index de8a59fa..386b08f6 100644 --- a/project/dv/apps/AppPdDv.vue +++ b/project/dv/apps/AppPdDv.vue @@ -135,7 +135,9 @@
-
+
+ +
@@ -219,15 +221,22 @@ + + diff --git a/project/dv/apps/DonutChart.vue b/project/dv/apps/components/DonutChart.vue similarity index 100% rename from project/dv/apps/DonutChart.vue rename to project/dv/apps/components/DonutChart.vue From d7b7de09f7a7eade9df5752a5d6ef0c2501f6ac0 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 21 Jul 2022 18:22:54 +0800 Subject: [PATCH 2/7] bug --- project/dv/apps/AppPdDv.vue | 1 + project/dv/apps/components/AiGrid.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/project/dv/apps/AppPdDv.vue b/project/dv/apps/AppPdDv.vue index 386b08f6..81a0c6a0 100644 --- a/project/dv/apps/AppPdDv.vue +++ b/project/dv/apps/AppPdDv.vue @@ -445,6 +445,7 @@ .AppPdDv { display: flex; height: 100%; + padding-top: 24px; background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/bg.png); background-size: 100% 100%; diff --git a/project/dv/apps/components/AiGrid.vue b/project/dv/apps/components/AiGrid.vue index c7b9c93d..738a45ff 100644 --- a/project/dv/apps/components/AiGrid.vue +++ b/project/dv/apps/components/AiGrid.vue @@ -133,6 +133,7 @@ width: 100%; height: 100%; overflow: hidden; + box-sizing: border-box; .AiGrid-wrapper { display: flex; From f5abfa00848fe66abce5b12fe5857124c981f797 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 21 Jul 2022 18:28:51 +0800 Subject: [PATCH 3/7] bug --- project/dv/apps/AppPdDv.vue | 1 + project/dv/apps/components/AiGrid.vue | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/dv/apps/AppPdDv.vue b/project/dv/apps/AppPdDv.vue index 81a0c6a0..560f0ac5 100644 --- a/project/dv/apps/AppPdDv.vue +++ b/project/dv/apps/AppPdDv.vue @@ -831,6 +831,7 @@ .top { flex: 1; + padding: 80px 60px; } .bottom { diff --git a/project/dv/apps/components/AiGrid.vue b/project/dv/apps/components/AiGrid.vue index 738a45ff..d32d6c47 100644 --- a/project/dv/apps/components/AiGrid.vue +++ b/project/dv/apps/components/AiGrid.vue @@ -168,8 +168,7 @@ padding: 10px 4px; text-align: center; font-size: 18px; - color: #a2afba; - font-weight: bold; + color: rgba(255, 255, 255, 0.8); } } From 7a310007b10a4c9227d57616d6cc008b5adf2211 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 21 Jul 2022 18:33:18 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/dv/apps/AppPdDv.vue | 1 - project/dv/apps/components/AiGrid.vue | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/project/dv/apps/AppPdDv.vue b/project/dv/apps/AppPdDv.vue index 560f0ac5..81a0c6a0 100644 --- a/project/dv/apps/AppPdDv.vue +++ b/project/dv/apps/AppPdDv.vue @@ -831,7 +831,6 @@ .top { flex: 1; - padding: 80px 60px; } .bottom { diff --git a/project/dv/apps/components/AiGrid.vue b/project/dv/apps/components/AiGrid.vue index d32d6c47..5d65d0fb 100644 --- a/project/dv/apps/components/AiGrid.vue +++ b/project/dv/apps/components/AiGrid.vue @@ -118,7 +118,7 @@ autoScale () { const treeWidth = this.$refs.tree.offsetWidth - const containerWidth = this.$refs.container.offsetWidth + const containerWidth = this.$refs.container.offsetWidth - 100 this.scale = treeWidth < containerWidth ? 1 : containerWidth / treeWidth this.x = '50%' this.y = '50%' From fe09fa4983450d24e6cf9c9fad630d3624e64fb8 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 21 Jul 2022 19:04:52 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/dv/apps/components/AiGrid.vue | 33 ++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/project/dv/apps/components/AiGrid.vue b/project/dv/apps/components/AiGrid.vue index 5d65d0fb..d8488028 100644 --- a/project/dv/apps/components/AiGrid.vue +++ b/project/dv/apps/components/AiGrid.vue @@ -8,6 +8,9 @@ @@ -151,8 +154,36 @@ color: #FFFFFF; font-size: 16px; + .org-chart-node-btn { + border: 1px solid #23A0AC!important; + font-size: 16px; + font-weight: bold; + background: #071030; + color: #FF9A02; + + &:after, &::before { + display: none; + } + + &.expanded::before { + display: block; + position: absolute; + top: 50%; + left: 4px; + right: 4px; + height: 0; + border-top: 1px solid #FF9A02; + content: ""; + } + + .org-chart-node-btn-text { + background: transparent; + color: #FF9A02; + } + } + .org-chart-node { - overflow: hidden; + // overflow: hidden; .org-chart-node-label { width: 40px; From cf18beb6dc34d88197c87ffb20ee61f7d53eff5f Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 22 Jul 2022 08:36:02 +0800 Subject: [PATCH 6/7] bug --- project/dv/apps/AppPdDv.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/project/dv/apps/AppPdDv.vue b/project/dv/apps/AppPdDv.vue index 81a0c6a0..1e35a98c 100644 --- a/project/dv/apps/AppPdDv.vue +++ b/project/dv/apps/AppPdDv.vue @@ -33,7 +33,7 @@
-
+
居民群统计
@@ -67,7 +67,7 @@
-
+
标签人群
@@ -108,8 +108,8 @@

279

-
-
+
+
群聊统计
@@ -127,9 +127,9 @@

279

-
-
-
+
+
+
From d9e1f83d05eb6512319d3c3c15d4882e1131a524 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 22 Jul 2022 08:52:55 +0800 Subject: [PATCH 7/7] bug --- project/dv/apps/AppPdDv.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/project/dv/apps/AppPdDv.vue b/project/dv/apps/AppPdDv.vue index 1e35a98c..a6967086 100644 --- a/project/dv/apps/AppPdDv.vue +++ b/project/dv/apps/AppPdDv.vue @@ -274,6 +274,10 @@ {offset: 1, color: 'rgba(37, 143, 255, 0.2)'} ]) }, 500) + + if (document.querySelector('.AiDvWrapper .viewPanel')) { + document.querySelector('.AiDvWrapper .viewPanel').style.backgroundImage = 'url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/bg.png)' + } }) },