diff --git a/main/src/micro/app.js b/main/src/micro/app.js index 60c9d7d..fd33534 100644 --- a/main/src/micro/app.js +++ b/main/src/micro/app.js @@ -13,7 +13,7 @@ export const leftApps = [ { name: 'sub-operation-admin', entry: VITE_APP_SUB_OA, - activeRule: `${VITE_APP_VIST_URL}:82/login`, + activeRule: '/sub-operation-admin', title: '管理后台', icon: 'images/platform/icon-admin.png', }, @@ -44,7 +44,7 @@ export const rightApps = [ { name: 'sub-government-admin', entry: VITE_APP_SUB_GAS, - activeRule: `${VITE_APP_VIST_URL}:81/login`, + activeRule: '/sub-government-admin', title: '管理后台', icon: 'images/platform/icon-admin.png', }, diff --git a/new-digital-agriculture-screen/src/assets/fonts/DingTalk JinBuTi.ttf b/new-digital-agriculture-screen/src/assets/fonts/DingTalk JinBuTi.ttf deleted file mode 100644 index c4efa55..0000000 Binary files a/new-digital-agriculture-screen/src/assets/fonts/DingTalk JinBuTi.ttf and /dev/null differ diff --git a/new-digital-agriculture-screen/src/assets/fonts/font.css b/new-digital-agriculture-screen/src/assets/fonts/font.css index b4efc91..80881d3 100644 --- a/new-digital-agriculture-screen/src/assets/fonts/font.css +++ b/new-digital-agriculture-screen/src/assets/fonts/font.css @@ -1,10 +1,3 @@ -@font-face { - font-family: 'JinBuTi'; - /* 自定义字体名称 */ - src: url('./DingTalk JinBuTi.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} @font-face { font-family: 'Sans'; diff --git a/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue b/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue index 13376ff..d8da132 100644 --- a/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue +++ b/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue @@ -153,7 +153,6 @@ function handleTitleClick(val) { justify-content: center; font-size: 32px; color: #fff; - font-family: 'JinBuTi'; } .left_btn, .right_btn { diff --git a/new-digital-agriculture-screen/src/styles/style.scss b/new-digital-agriculture-screen/src/styles/style.scss index 69ee739..c79638f 100644 --- a/new-digital-agriculture-screen/src/styles/style.scss +++ b/new-digital-agriculture-screen/src/styles/style.scss @@ -1,11 +1,11 @@ @import 'common/base'; @import 'common/define'; -@import './assets/fonts/font.css'; +// @import './assets/fonts/font.css'; #app { position: relative; width: 100%; height: 100%; - font-family: JinBuTi, Sans, Avenir, sans-serif; + font-family: Sans, Avenir, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; background-color: #000; diff --git a/new-digital-agriculture-screen/src/views/business/components/businessFive.vue b/new-digital-agriculture-screen/src/views/business/components/businessFive.vue index e60a6d2..f9f65c5 100644 --- a/new-digital-agriculture-screen/src/views/business/components/businessFive.vue +++ b/new-digital-agriculture-screen/src/views/business/components/businessFive.vue @@ -61,7 +61,7 @@ watch( &:deep(.row-item) { .ranking-info { color: #35d0c0 !important; - font-family: 'DingTalk JinBuTi, DingTalk JinBuTi-Regular'; + font-family: ''; font-weight: 700; } diff --git a/new-digital-agriculture-screen/src/views/home/index.vue b/new-digital-agriculture-screen/src/views/home/index.vue index 0377017..20292bd 100644 --- a/new-digital-agriculture-screen/src/views/home/index.vue +++ b/new-digital-agriculture-screen/src/views/home/index.vue @@ -114,7 +114,6 @@ const itemClick = (index) => { } .name { color: #fff; - font-family: 'JinBuTi'; border: 2px solid #01fefd; border-radius: 8px; backdrop-filter: blur(8px); diff --git a/new-digital-agriculture-screen/src/views/land/components/landFour.vue b/new-digital-agriculture-screen/src/views/land/components/landFour.vue index 44dc231..1379135 100644 --- a/new-digital-agriculture-screen/src/views/land/components/landFour.vue +++ b/new-digital-agriculture-screen/src/views/land/components/landFour.vue @@ -140,7 +140,6 @@ onBeforeUnmount(() => { display: flex; justify-content: center; align-items: center; - font-family: 'JinBuTi'; width: 80%; aspect-ratio: 1/1; font-size: 18px; diff --git a/new-digital-agriculture-screen/src/views/land/components/warning.vue b/new-digital-agriculture-screen/src/views/land/components/warning.vue index e4d5a91..abcb229 100644 --- a/new-digital-agriculture-screen/src/views/land/components/warning.vue +++ b/new-digital-agriculture-screen/src/views/land/components/warning.vue @@ -47,7 +47,6 @@ const props = defineProps({ display: flex; justify-content: center; align-items: center; - font-family: 'JinBuTi'; width: 80%; aspect-ratio: 1/1; font-size: 18px; diff --git a/new-digital-agriculture-screen/src/views/land/index.vue b/new-digital-agriculture-screen/src/views/land/index.vue index 989fda4..bd79f07 100644 --- a/new-digital-agriculture-screen/src/views/land/index.vue +++ b/new-digital-agriculture-screen/src/views/land/index.vue @@ -382,7 +382,7 @@ const handleContrast = (data) => { .data-home-index { width: 100%; height: 100%; - font-family: 'DingTalk JinBuTi, DingTalk JinBuTi-Regular'; + font-family: ''; font-weight: 400; :deep(*) { font-family: inherit;