From 8615e4cb3433197aba11902ea7fea80c04c5b454 Mon Sep 17 00:00:00 2001 From: aixianling Date: Thu, 9 Mar 2023 16:47:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E5=A4=A7=E5=B1=8F=E9=A1=B6?= =?UTF-8?q?=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/layout/AiDvWrapper/AiDvWrapper.vue | 11 +- .../AiDvWrapper/assets/fullscreenIcon.png | Bin 0 -> 592 bytes .../AiDvWrapper/assets/headerPrimaryBG_lb.png | Bin 0 -> 334 bytes .../AiDvWrapper/assets/headerPrimaryBg_rb.png | Bin 0 -> 288 bytes .../layout/AiDvWrapper/assets/settingIcon.png | Bin 0 -> 666 bytes .../layout/AiDvWrapper/assets/timeIcon.png | Bin 0 -> 1316 bytes .../layout/AiDvWrapper/assets/weatherIcon.png | Bin 0 -> 1038 bytes .../layout/AiDvWrapper/layout/classic.vue | 2 +- .../layout/AiDvWrapper/layout/primary.vue | 163 ++++++++++++++++++ ui/lib/styles/common.scss | 2 +- 10 files changed, 172 insertions(+), 6 deletions(-) create mode 100644 components/layout/AiDvWrapper/assets/fullscreenIcon.png create mode 100644 components/layout/AiDvWrapper/assets/headerPrimaryBG_lb.png create mode 100644 components/layout/AiDvWrapper/assets/headerPrimaryBg_rb.png create mode 100644 components/layout/AiDvWrapper/assets/settingIcon.png create mode 100644 components/layout/AiDvWrapper/assets/timeIcon.png create mode 100644 components/layout/AiDvWrapper/assets/weatherIcon.png create mode 100644 components/layout/AiDvWrapper/layout/primary.vue diff --git a/components/layout/AiDvWrapper/AiDvWrapper.vue b/components/layout/AiDvWrapper/AiDvWrapper.vue index 0c24ece9..4499557f 100644 --- a/components/layout/AiDvWrapper/AiDvWrapper.vue +++ b/components/layout/AiDvWrapper/AiDvWrapper.vue @@ -2,7 +2,8 @@
- +
@@ -23,10 +24,11 @@ import {fullScreenContainer} from '@jiaminghi/data-view' import AiSprite from "../../AiSprite"; import Classic from "./layout/classic"; import Vue from "vue" +import Primary from "./layout/primary"; export default { name: "AiDvWrapper", - components: {Classic, AiSprite}, + components: {Primary, Classic, AiSprite}, model: { prop: 'value', event: 'change' @@ -44,7 +46,7 @@ export default { /** * 布局方案:black,classic */ - type: {default: "classic"} + type: {default: "black"} }, computed: { active: { @@ -56,7 +58,8 @@ export default { } }, headerComponent: v => ({ - classic: Classic + classic: Classic, + black: Primary }[v.type]) }, watch: { diff --git a/components/layout/AiDvWrapper/assets/fullscreenIcon.png b/components/layout/AiDvWrapper/assets/fullscreenIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..c53081d46234019e2890cd8e60a6278fdab77ece GIT binary patch literal 592 zcmV-W0Px%3Q0skR7gv`mOG17K@dhy`NlV*po?NAnuvknA_@lP{sVuQ|G->9P>c=4L@^UZ z1x0q&RebHXoU!`S%-lOOyMuOe2m0PR{Z&_eH33jc37-*Bd@j4%c;mnc*#{f~HkSnK z2EInb&+(xf1^0pLzz@KeI(P$A;VhL~z<%H{aLbHTz%k%8;BzAb{_at-C&9BIhk+4r zJ|adHa1?k8>;f(T>%b|Xh4}6o;3);Q5chroCx93E&e@1qZvpS?25?u2!1sh2)cbjo z(zm?GS`_tnDa8zUP~)yl0zPE^uK-Vhlfbu3lYoN>xET?fr4-dx6~crb2j0vBTn3&2 z2Y`#fXJBuFHX>r`ZnmpHz;nQ|RpzJ((50mkXlm`AY5NFh`>*=!x^Lk0Rj4*>;GtpUH@ySL58IJhb2|hX8mG?l>5=)r ehWPx$2uVaiRA@u(+A&T8F%*R1ncZwnL{B7I3eJ!NBnL=CN{&QBM+;}-1W}ea1q~Ur zkRa+P#mf5K*^({4&z7Z;>?A8mPm(%G54PWuw6?#LSay_5o9JEAR8k~aGz1VppdNwK zyVf79TiN~J`&UnmRDu8k2q1s}0!INS*+{xR_J^QzXZtgWf07O%h|7Wi0`&|0hM?r* z>iOmV=5f8*&F5WH$}mnt009ILKmdWt1PDQu9Vq1>fWR37iPBhY*=M#`lyjd{mOT^(VrU|L;!(H3YpF literal 0 HcmV?d00001 diff --git a/components/layout/AiDvWrapper/assets/headerPrimaryBg_rb.png b/components/layout/AiDvWrapper/assets/headerPrimaryBg_rb.png new file mode 100644 index 0000000000000000000000000000000000000000..45c4b278c82bce49c1ad9a7eb71e79a4698739cc GIT binary patch literal 288 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 IM6N<$g7Yo)zW@LL literal 0 HcmV?d00001 diff --git a/components/layout/AiDvWrapper/layout/classic.vue b/components/layout/AiDvWrapper/layout/classic.vue index 83da08d5..6939b28c 100644 --- a/components/layout/AiDvWrapper/layout/classic.vue +++ b/components/layout/AiDvWrapper/layout/classic.vue @@ -220,7 +220,7 @@ export default { width: 760px; height: 124px; background-repeat: no-repeat; - background-image: url("./../assets/headerCenterBorderLight.svg"), url("./../assets/headerCenterBorder.svg"), url("./../assets/headerCenterBg2.png"); + background-image: url("../assets/headerCenterBorderLight.svg"), url("../assets/headerCenterBorder.svg"), url("../assets/headerCenterBg2.png"); background-position: center bottom, center 0, center -20px; overflow: visible; diff --git a/components/layout/AiDvWrapper/layout/primary.vue b/components/layout/AiDvWrapper/layout/primary.vue new file mode 100644 index 00000000..8cedd77c --- /dev/null +++ b/components/layout/AiDvWrapper/layout/primary.vue @@ -0,0 +1,163 @@ + + + + + diff --git a/ui/lib/styles/common.scss b/ui/lib/styles/common.scss index b6b38e81..ea635075 100644 --- a/ui/lib/styles/common.scss +++ b/ui/lib/styles/common.scss @@ -23,7 +23,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; } } -@each $v in (8, 10, 12, 14, 16, 20, 32, 48, 56, 64, 80) { +@each $v in (8, 10, 12, 14, 16, 20, 24, 32, 48, 56, 64, 80) { //gap .gap-#{$v} { gap: #{$v}px