diff --git a/sub-government-screen-service/components.d.ts b/sub-government-screen-service/components.d.ts index ce9cfc8..ea50d1a 100644 --- a/sub-government-screen-service/components.d.ts +++ b/sub-government-screen-service/components.d.ts @@ -8,8 +8,10 @@ export {} declare module 'vue' { export interface GlobalComponents { BaseBg: typeof import('./src/components/baseBg.vue')['default'] + 'BaseBg copy': typeof import('./src/components/baseBg copy.vue')['default'] CenterMap: typeof import('./src/components/centerMap.vue')['default'] CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default'] + copy: typeof import('./src/components/baseBg copy.vue')['default'] CurrentTime: typeof import('./src/components/currentTime.vue')['default'] CustomBack: typeof import('./src/components/customBack.vue')['default'] CustomProgress: typeof import('./src/components/customProgress.vue')['default'] diff --git a/sub-government-screen-service/src/components/baseBg copy.vue b/sub-government-screen-service/src/components/baseBg copy.vue new file mode 100644 index 0000000..ea58702 --- /dev/null +++ b/sub-government-screen-service/src/components/baseBg copy.vue @@ -0,0 +1,170 @@ + + + diff --git a/sub-government-screen-service/src/components/baseBg.vue b/sub-government-screen-service/src/components/baseBg.vue index ea58702..5dcc201 100644 --- a/sub-government-screen-service/src/components/baseBg.vue +++ b/sub-government-screen-service/src/components/baseBg.vue @@ -4,10 +4,50 @@
-
+ +
- {{ topTitle }} +
+
+ +
+ +
{{ topTitle }}
+
+ +
+
@@ -105,16 +145,72 @@ div { } .top-content { width: calc(100% - 400px); - line-height: 42px; - text-align: center; - font-size: 18px; - font-weight: bold; - transform: skewX(-8deg); - background: linear-gradient(to bottom, '#ff7e5f', '#548fff'); - -webkit-background-clip: text; - color: #fff; - letter-spacing: 8px; - text-shadow: -6px 0 0 1px #add8f1; + height: 100%; + display: inline-flex; + justify-content: center; + flex-direction: column; + .top-content-p { + width: 100%; + } + .title, + .b-nav-l, + .b-nav-r { + display: inline-block; + vertical-align: middle; + } + .b-nav-l, + .b-nav-r { + width: calc((100% - 300px) / 2); + } + .b-nav-r { + text-align: right; + } + .title { + width: 300px; + line-height: 38px; + text-align: center; + font-size: 18px; + font-weight: bold; + transform: skewX(-8deg); + background: linear-gradient(to bottom, '#ff7e5f', '#548fff'); + -webkit-background-clip: text; + color: #fff; + letter-spacing: 8px; + text-shadow: -6px 0 0 1px #add8f1; + max-height: unset !important; + } + } + .b-nav-l, + .b-nav-r { + margin: auto; + display: inline-flex; + gap: 20px; + .b-nav-item { + display: inline-block; + cursor: pointer; + min-width: 132px; + height: 38px; + text-align: center; + line-height: 38px; + span { + font-size: 14px; + font-weight: bold; + display: inline-flex; + transform: skewX(-8deg); + background: linear-gradient(to bottom, '#ff7e5f', '#548fff'); + -webkit-background-clip: text; + + letter-spacing: 4px; + text-shadow: -2px 0 0 1px #add8f1; + } + + &.nav-act { + color: rgba(255, 255, 255, 1); + } + &.nav-normal { + color: rgba(255, 255, 255, 0.6); + } + } } .top-left { width: 200px; @@ -163,7 +259,7 @@ div { } } .content { - height: calc(100% - 138px); + height: calc(100% - 60px); } } } diff --git a/sub-government-screen-service/src/layouts/index.vue b/sub-government-screen-service/src/layouts/index.vue index 853954d..b59a745 100644 --- a/sub-government-screen-service/src/layouts/index.vue +++ b/sub-government-screen-service/src/layouts/index.vue @@ -9,7 +9,7 @@
- +
diff --git a/sub-government-screen-service/src/styles/style.scss b/sub-government-screen-service/src/styles/style.scss index 5ee6df3..609757d 100644 --- a/sub-government-screen-service/src/styles/style.scss +++ b/sub-government-screen-service/src/styles/style.scss @@ -15,3 +15,24 @@ height: auto; max-height: calc(100vh - 130px); } +.txt-ellipsis { + display: -webkit-inline-box; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + word-break: break-all; + white-space: normal; +} +.clamp1 { + line-clamp: 1; + -webkit-line-clamp: 1; + line-height: 1.5; + max-height: calc(1.5em * 1); +} + +.clamp2 { + line-clamp: 2; + -webkit-line-clamp: 2; + line-height: 1.5; + max-height: calc(1.5em * 2); +} diff --git a/sub-government-screen-service/src/views/home/index.vue b/sub-government-screen-service/src/views/home/index.vue index 91ff902..61ec0ae 100644 --- a/sub-government-screen-service/src/views/home/index.vue +++ b/sub-government-screen-service/src/views/home/index.vue @@ -1,7 +1,7 @@