diff --git a/.env.production b/.env.production index f700f7b..b46735d 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,4 @@ VITE_APP_ENV = 'production' VITE_APP_TITLE = 'vue-vite-project-admin' VITE_APP_PORT = 8089 -VITE_APP_BASE_API = 'http://10.10.10.56:9000/' +VITE_APP_BASE_API = 'http://localhost:8012/' diff --git a/package.json b/package.json index fcfc7e5..ea000d1 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "@vueuse/core": "^9.1.1", "@wangeditor/editor": "^5.0.0", "@wangeditor/editor-for-vue": "^5.1.10", + "animate.css": "^4.1.1", "axios": "^1.3.4", "echarts": "^5.2.2", "element-plus": "^2.2.32", @@ -25,6 +26,7 @@ "path-to-regexp": "^6.2.0", "pinia": "^2.0.12", "screenfull": "^6.0.2", + "swiper": "^10.2.0", "terser": "^5.17.6", "vue": "^3.2.45", "vue-i18n": "^9.1.9", diff --git a/src/api/table/list.ts b/src/api/table/list.ts index 0089ac0..5c82801 100644 --- a/src/api/table/list.ts +++ b/src/api/table/list.ts @@ -56,3 +56,13 @@ export function editConfig(data: any) { data: data }); } + +/** + * 获取底部面板信息 + */ +export function getTableFooter(): AxiosPromise<[]> { + return request({ + url: '/bi/opt/getTableFooter', + method: 'get' + }); +} diff --git a/src/api/table/types.ts b/src/api/table/types.ts index 47d28d8..970502d 100644 --- a/src/api/table/types.ts +++ b/src/api/table/types.ts @@ -56,3 +56,15 @@ export interface TableVo { C047: object; C048: object; } + +/** + * 底部面板信息 + */ +export interface PanelVo { + backImg: string; + ext: string; + id: number; + title: string; + type: string; + value?: number; +} diff --git a/src/api/user/index.ts b/src/api/user/index.ts index e6100a0..9f86b92 100644 --- a/src/api/user/index.ts +++ b/src/api/user/index.ts @@ -12,6 +12,16 @@ export function getUserInfo(): AxiosPromise { }); } +/** + * 获取天气预报 + */ +export function getWeather(): AxiosPromise<[]> { + return request({ + url: '/model/dcBusiRealWeatherHours/oneLast', + method: 'get' + }); +} + /** * 获取用户分页列表 * diff --git a/src/assets/fonts/AlibabaPuHuiTiBold.ttf b/src/assets/fonts/AlibabaPuHuiTiBold.ttf new file mode 100644 index 0000000..7edd4e5 Binary files /dev/null and b/src/assets/fonts/AlibabaPuHuiTiBold.ttf differ diff --git a/src/assets/fonts/AlibabaPuHuiTiRegular.ttf b/src/assets/fonts/AlibabaPuHuiTiRegular.ttf new file mode 100644 index 0000000..a6eaf36 Binary files /dev/null and b/src/assets/fonts/AlibabaPuHuiTiRegular.ttf differ diff --git a/src/assets/fonts/YouSheBiaoTiHei.ttf b/src/assets/fonts/YouSheBiaoTiHei.ttf new file mode 100644 index 0000000..3729151 Binary files /dev/null and b/src/assets/fonts/YouSheBiaoTiHei.ttf differ diff --git a/src/assets/fonts/font.css b/src/assets/fonts/font.css new file mode 100644 index 0000000..509d933 --- /dev/null +++ b/src/assets/fonts/font.css @@ -0,0 +1,12 @@ +@font-face { + font-family: 'YouSheBiaoTiHei'; + src: url('YouSheBiaoTiHei.ttf') format('truetype'); +} +@font-face { + font-family: 'AlibabaPuHuiTiRegular'; + src: url('AlibabaPuHuiTiRegular.ttf') format('truetype'); +} +@font-face { + font-family: 'AlibabaPuHuiTiBold'; + src: url('AlibabaPuHuiTiBold.ttf') format('truetype'); +} diff --git a/src/assets/iconfont/demo_index.html b/src/assets/iconfont/demo_index.html index 334dc62..93760d0 100644 --- a/src/assets/iconfont/demo_index.html +++ b/src/assets/iconfont/demo_index.html @@ -55,15 +55,27 @@