From cc55517bc85ea7e9c2b821ea1cf5d72e269aee9b Mon Sep 17 00:00:00 2001 From: jiang Date: Tue, 8 Oct 2024 14:53:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E8=84=B8=E8=AF=86=E5=88=AB=E4=B8=8E?= =?UTF-8?q?=E5=A4=A7=E6=A8=A1=E5=9E=8B=E9=97=AE=E7=AD=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 5 +- package.json | 4 +- src/router/index.js | 4 +- src/utils/request.js | 1 - src/views/components/boxHeader.vue | 4 +- src/views/home.vue | 422 +++++++++++++++++++- src/views/largeScreen/introVideo.vue | 106 ++--- src/views/largeScreen/onlineCount.vue | 14 - src/views/largeScreen/routeIcon.vue | 14 - src/views/login.vue | 1 - src/views/updateFace/midPic.vue | 1 - src/views/updateIDCard/pieIDResultCount.vue | 4 - 12 files changed, 474 insertions(+), 106 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0c1007c..baa2c97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "clipboard": "2.0.8", "core-js": "3.25.3", "crypto-js": "^4.2.0", - "echarts": "5.4.0", + "echarts": "^5.4.0", "echarts-gl": "^2.0.9", "element-ui": "2.15.14", "file-saver": "2.0.5", @@ -6992,8 +6992,9 @@ }, "node_modules/echarts": { "version": "5.4.0", - "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.0.tgz", + "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.0.tgz", "integrity": "sha512-uPsO9VRUIKAdFOoH3B0aNg7NRVdN7aM39/OjovjO9MwmWsAkfGyeXJhK+dbRi51iDrQWliXV60/XwLA7kg3z0w==", + "license": "Apache-2.0", "dependencies": { "tslib": "2.3.0", "zrender": "5.4.0" diff --git a/package.json b/package.json index bdb18ed..7b46929 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "clipboard": "2.0.8", "core-js": "3.25.3", "crypto-js": "^4.2.0", - "echarts": "5.4.0", + "echarts": "^5.4.0", "echarts-gl": "^2.0.9", "element-ui": "2.15.14", "file-saver": "2.0.5", @@ -49,7 +49,6 @@ "force": "^0.0.3", "fuse.js": "6.4.3", "highlight.js": "9.18.5", - "vue-grid-layout": "^2.4.0", "js-beautify": "1.13.0", "js-cookie": "3.0.1", "jsencrypt": "3.0.0-rc.1", @@ -61,6 +60,7 @@ "vue": "2.6.12", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", + "vue-grid-layout": "^2.4.0", "vue-meta": "2.4.0", "vue-router": "3.4.9", "vuedraggable": "2.24.3", diff --git a/src/router/index.js b/src/router/index.js index c7923e7..96ef974 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -37,12 +37,12 @@ export const constantRoutes = [ }, { path: '/', - component: () => import('@/views/largeScreen/largeScreen'), + component: () => import('@/views/home'), hidden: true }, { path: '/index', - component: () => import('@/views/largeScreen/largeScreen'), + component: () => import('@/views/home'), hidden: true }, { diff --git a/src/utils/request.js b/src/utils/request.js index 9080ba9..db7a70f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -115,7 +115,6 @@ service.interceptors.request.use(config => { // 响应拦截器 service.interceptors.response.use(res => { - console.log(res) if (res.headers.encryptresponse && !res.data.hasOwnProperty('code')) { res.data = JSON.parse(decryptCBC(res.data)) console.log(res.data) diff --git a/src/views/components/boxHeader.vue b/src/views/components/boxHeader.vue index 4553877..6595029 100644 --- a/src/views/components/boxHeader.vue +++ b/src/views/components/boxHeader.vue @@ -26,9 +26,9 @@ export default { .boxHeaderText { height: 100%; - align-content: center; + padding-top: 1.5%; margin-left: 6%; color: #FFFFFF; - letter-spacing: 0.1rem; + letter-spacing: 0.3rem; } diff --git a/src/views/home.vue b/src/views/home.vue index ada4ee5..8cd418c 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -1,31 +1,421 @@ + diff --git a/src/views/largeScreen/introVideo.vue b/src/views/largeScreen/introVideo.vue index 452b05e..ff89df8 100644 --- a/src/views/largeScreen/introVideo.vue +++ b/src/views/largeScreen/introVideo.vue @@ -1,20 +1,22 @@