From 0e45548c06fc5e9d632a656c8878b01ef25bd641 Mon Sep 17 00:00:00 2001 From: lyt-Top <1105290566@qq.com> Date: Sun, 25 Jul 2021 01:28:32 +0800 Subject: [PATCH] =?UTF-8?q?'admin-21.07.25:=E6=96=B0=E5=A2=9E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8F=AF=E8=A7=86=E5=8C=96=E6=BC=94=E7=A4=BA2?= =?UTF-8?q?=E3=80=81=E7=99=BB=E5=BD=95=E9=A1=B5=E6=96=B0=E5=A2=9E=E6=89=AB?= =?UTF-8?q?=E7=A0=81'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 8 + package.json | 23 +- src/router/route.ts | 4 +- src/utils/setIconfont.ts | 2 +- src/views/login/component/scan.vue | 46 + src/views/login/index.vue | 74 +- src/views/visualizing/demo1.vue | 1267 ++++++++++++++++- src/views/visualizing/demo2.vue | 1342 ++++++++++++++++++- src/views/visualizing/images/bathymetry.jpg | Bin 0 -> 621596 bytes src/views/visualizing/images/world.jpg | Bin 0 -> 801762 bytes src/views/visualizing/mock/demo1.ts | 51 + src/views/visualizing/mock/demo2.ts | 131 ++ 12 files changed, 2916 insertions(+), 32 deletions(-) create mode 100644 src/views/login/component/scan.vue create mode 100644 src/views/visualizing/images/bathymetry.jpg create mode 100644 src/views/visualizing/images/world.jpg create mode 100644 src/views/visualizing/mock/demo1.ts create mode 100644 src/views/visualizing/mock/demo2.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index ec74804c..c3bcfe4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ 🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等,适配手机、平板、pc 的后台开源免费模板库(vue2.x 请切换 vue-prev-admin 分支) +## 1.0.13 + +`2021.07.25` + +- 🌟 更新 依赖更新最新版本 +- 🎉 新增 数据可视化演示界面(/visualizingDemo1、/visualizingDemo2) +- 🎉 新增 登录页扫码登录 + ## 1.0.12 `2021.07.16` diff --git a/package.json b/package.json index 0e3ddeb2..29f401d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-next-admin", - "version": "1.0.12", + "version": "1.0.13", "scripts": { "dev": "vite", "build": "vite build", @@ -11,8 +11,9 @@ "countup.js": "^2.0.7", "cropperjs": "^1.5.12", "echarts": "^5.1.2", + "echarts-gl": "^2.0.6", "echarts-wordcloud": "^2.0.0", - "element-plus": "^1.0.2-beta.55", + "element-plus": "^1.0.2-beta.57", "mitt": "^3.0.0", "nprogress": "^0.2.0", "print-js": "^1.6.0", @@ -32,22 +33,22 @@ "devDependencies": { "@types/axios": "^0.14.0", "@types/clipboard": "^2.0.1", - "@types/node": "^16.3.2", + "@types/node": "^16.4.1", "@types/nprogress": "^0.2.0", "@types/sortablejs": "^1.10.7", - "@typescript-eslint/eslint-plugin": "^4.28.3", - "@typescript-eslint/parser": "^4.28.3", + "@typescript-eslint/eslint-plugin": "^4.28.4", + "@typescript-eslint/parser": "^4.28.4", "@vitejs/plugin-vue": "^1.2.5", - "@vue/compiler-sfc": "^3.1.4", + "@vue/compiler-sfc": "^3.1.5", "dotenv": "^10.0.0", - "eslint": "^7.30.0", - "eslint-plugin-vue": "^7.13.0", + "eslint": "^7.31.0", + "eslint-plugin-vue": "^7.14.0", "prettier": "^2.3.2", - "sass": "^1.35.2", + "sass": "^1.36.0", "sass-loader": "^12.1.0", "typescript": "^4.3.5", - "vite": "^2.4.2", - "vue-eslint-parser": "^7.8.0" + "vite": "^2.4.3", + "vue-eslint-parser": "^7.9.0" }, "browserslist": [ "> 1%", diff --git a/src/router/route.ts b/src/router/route.ts index 41b0a256..a95fda38 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -917,7 +917,7 @@ export const dynamicRoutes: Array = [ component: () => import('/@/layout/routerView/link.vue'), meta: { title: 'message.router.visualizingLinkDemo1', - isLink: `${import.meta.env.VITE_API_URL}/#/visualizingDemo1`, + isLink: `${import.meta.env.VITE_API_URL}#/visualizingDemo1`, isHide: false, isKeepAlive: false, isAffix: false, @@ -932,7 +932,7 @@ export const dynamicRoutes: Array = [ component: () => import('/@/layout/routerView/link.vue'), meta: { title: 'message.router.visualizingLinkDemo2', - isLink: `${import.meta.env.VITE_API_URL}/#/visualizingDemo2`, + isLink: `${import.meta.env.VITE_API_URL}#/visualizingDemo2`, isHide: false, isKeepAlive: false, isAffix: false, diff --git a/src/utils/setIconfont.ts b/src/utils/setIconfont.ts index 6b090ebb..a6acf68b 100644 --- a/src/utils/setIconfont.ts +++ b/src/utils/setIconfont.ts @@ -1,6 +1,6 @@ // 字体图标 url const cssCdnUrlList: Array = [ - '//at.alicdn.com/t/font_2298093_h8g6cpatww5.css', + '//at.alicdn.com/t/font_2298093_y6u00apwst.css', '//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', ]; // 第三方 js url diff --git a/src/views/login/component/scan.vue b/src/views/login/component/scan.vue new file mode 100644 index 00000000..b50038cd --- /dev/null +++ b/src/views/login/component/scan.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 458b7521..58a2c802 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -6,21 +6,27 @@