From ee78546e7aab113e7bdd4be903d64e915772917f Mon Sep 17 00:00:00 2001 From: aixianling Date: Mon, 15 Jan 2024 19:11:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?Ai=E5=8A=A9=E6=89=8B=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/AiAssist.vue | 245 ++++++++++++++++++--- components/layout/AiDvSvg/AiDvSvg.vue | 143 ++++++++++++ components/layout/AiDvSvg/assets/close.png | Bin 0 -> 521 bytes 3 files changed, 361 insertions(+), 27 deletions(-) create mode 100644 components/layout/AiDvSvg/AiDvSvg.vue create mode 100644 components/layout/AiDvSvg/assets/close.png diff --git a/components/AiAssist.vue b/components/AiAssist.vue index 27561f46..be830a34 100644 --- a/components/AiAssist.vue +++ b/components/AiAssist.vue @@ -1,40 +1,123 @@ + + + + diff --git a/components/layout/AiDvSvg/assets/close.png b/components/layout/AiDvSvg/assets/close.png new file mode 100644 index 0000000000000000000000000000000000000000..70e6a898ee461b07fc77c05180be850bb99b1e45 GIT binary patch literal 521 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAv7|ftIx;Y9?C1WI$O_~$76-XI zF|0c$^AgC(5AX?b{aYAa<3dPiEo&U>1;6hW!7{JqR^$^|y{937Y(W z_xS&_>tJ($CIHO=qY9J%XE*(Se&heDy8n+Z{eOP*)v`Tc z945Gx{)qhOR-m?ibMA$M?=Ls7Y+Y|^F#TH2v1^C8dA9-G&F<;q7@~2$bkfU7%?bi7 z?aDmvEcwZ1?VjKM&M$0lT=FS-sn^ASCA%aUydNjLy?b6u)%3UZ{wVH}zc=bay63md z__OHPJQg-~?OEPamR;RtY7{3m@jv6PxwHMUToyF0NWDJCv*k~%$(m`6YR~Eqd|Rpf z*ZIZ8l9kJYt_Mz%a&qmPA+ugAPb=%d23c7_o*fsLEZ)@^zsb>Jp3%ibS*LB0HfQXZ zOJ*{>?ECwdCoAjbJHR(@6jG`XBU`9!{<(YKmGlvWa_!;rz#)z4*}Q$iB}9=Y}h literal 0 HcmV?d00001 From 194c9e59dfecd8c50c00790f657798aa63dba97c Mon Sep 17 00:00:00 2001 From: aixianling Date: Mon, 15 Jan 2024 19:56:05 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/layout/AiDvSummary/AiDvSummary.vue | 2 + .../AiDvSummary/components/Summary19.vue | 75 +++++++++++++++++++ .../designer/components/componentConfig.vue | 2 +- 3 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 components/layout/AiDvSummary/components/Summary19.vue diff --git a/components/layout/AiDvSummary/AiDvSummary.vue b/components/layout/AiDvSummary/AiDvSummary.vue index eb4c8026..63de4002 100644 --- a/components/layout/AiDvSummary/AiDvSummary.vue +++ b/components/layout/AiDvSummary/AiDvSummary.vue @@ -25,11 +25,13 @@ import Summary15 from './components/Summary15' import Summary16 from './components/Summary16' import Summary17 from './components/Summary17' import Summary18 from './components/Summary18' +import Summary19 from "./components/Summary19"; export default { name: 'AiDvSummary', components: { + Summary19, Summary0, Summary1, Summary2, diff --git a/components/layout/AiDvSummary/components/Summary19.vue b/components/layout/AiDvSummary/components/Summary19.vue new file mode 100644 index 00000000..a43efc5f --- /dev/null +++ b/components/layout/AiDvSummary/components/Summary19.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/packages/bigscreen/designer/components/componentConfig.vue b/packages/bigscreen/designer/components/componentConfig.vue index 73619a5b..304d5fe5 100644 --- a/packages/bigscreen/designer/components/componentConfig.vue +++ b/packages/bigscreen/designer/components/componentConfig.vue @@ -226,7 +226,7 @@ export default { 'border11', 'border12', 'border13'],//边框待选项 summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary6', 'summary5', 'summary7', 'summary8', 'summary9', 'summary10', 'summary11', 'summary12', 'summary13', 'summary14', - 'summary15', 'summary16', 'summary17', 'summary18'],//汇总待选项 + 'summary15', 'summary16', 'summary17', 'summary18','summary19'],//汇总待选项 //是否显示排名 tableStatus: [ {label: '是', value: '1'}, From b6f7aac2cd1465b48c8aaa7be48a5e8d5065644a Mon Sep 17 00:00:00 2001 From: Kubbo <390378816@qq.com> Date: Tue, 16 Jan 2024 02:53:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/AiDvDialog.vue | 56 ++ components/AiDvRender.vue | 2 +- components/dv.scss | 62 +++ components/layout/AiDvSvg/AiDvSvg.vue | 7 +- components/layout/AiDvTable/AiDvTable.vue | 489 +++++++++--------- .../designer/components/componentConfig.vue | 24 +- packages/bigscreen/designer/config.js | 138 ++--- 7 files changed, 474 insertions(+), 304 deletions(-) create mode 100644 components/AiDvDialog.vue create mode 100644 components/dv.scss diff --git a/components/AiDvDialog.vue b/components/AiDvDialog.vue new file mode 100644 index 00000000..f0c94226 --- /dev/null +++ b/components/AiDvDialog.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue index e0fd4265..12e3cfd3 100644 --- a/components/AiDvRender.vue +++ b/components/AiDvRender.vue @@ -32,7 +32,7 @@ :theme="theme" :isShowIndex="data.isShowIndex" :config="dvTableConfig" - :data="values"> + :data="values" :simple="data.simple==1"> td.el-table__cell { + background-color: rgba(33, 180, 253, 0.1) !important; + } + + td.el-table__cell, th.el-table__cell.is-leaf { + border-bottom: none !important; + } + + th.el-table__cell { + background-color: transparent !important; + } + + tr { + background-color: transparent !important; + } + + .el-table__cell { + padding: 7px 0; + color: #d0e1e8; + } + + .el-table__header tr .cell { + color: #02FEFF !important; + } +} diff --git a/components/layout/AiDvSvg/AiDvSvg.vue b/components/layout/AiDvSvg/AiDvSvg.vue index e19de9f0..58474001 100644 --- a/components/layout/AiDvSvg/AiDvSvg.vue +++ b/components/layout/AiDvSvg/AiDvSvg.vue @@ -2,6 +2,9 @@ const w = 12, h = 10, r = 200 export default { name: "AiDvSvg", + props: { + title: {default: "慧智会言"}, + }, data() { return { border: "", @@ -18,7 +21,7 @@ export default { this.width = width this.height = height this.getBorder(width, height) - const vv = width - w, hh = height - h + const vv = width - w this.box = { top: `m${vv - r + 33},${13 + h}l7,0l-2.5,-3l-7,0l2.5,3zm-1.5,0l-4.5,-5.5l-7,0l4.5,5.5l7,0zm-21,-7l6,7l7,0l-6,-7l-7,0z`, leftBottom: `m46.5,${height + 10}l7,0l-2.5,-3l-7,0l2.5,3zm-1.5,0l-4.5,-5.5l-7,0l4.5,5.5l7,0zm-21,-7l6,7l7,0l-6,-7l-7,0z`, @@ -96,7 +99,7 @@ export default {
-
慧智会言
+
diff --git a/components/layout/AiDvTable/AiDvTable.vue b/components/layout/AiDvTable/AiDvTable.vue index 42d9853f..4fb6cea7 100644 --- a/components/layout/AiDvTable/AiDvTable.vue +++ b/components/layout/AiDvTable/AiDvTable.vue @@ -1,163 +1,300 @@ - data () { - return { - header: [], - body: [] + diff --git a/packages/bigscreen/designer/components/componentConfig.vue b/packages/bigscreen/designer/components/componentConfig.vue index 304d5fe5..ca76b719 100644 --- a/packages/bigscreen/designer/components/componentConfig.vue +++ b/packages/bigscreen/designer/components/componentConfig.vue @@ -103,6 +103,15 @@
+
+ +
+ + + + +
+
@@ -207,12 +216,25 @@
+
+
+

进阶设置

+ + + + + +
+
@@ -56,7 +50,6 @@ $theme-color: #23ECFD; align-items: baseline; gap: 4px; font-size: 12px; - color: white; span { font-family: D-DIN;