From bb1dbe6d833722d450c01022eeb0f1814e560a89 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Sat, 1 Jul 2023 10:48:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E6=89=93?= =?UTF-8?q?=E5=8C=85history=E6=A8=A1=E5=BC=8F=E7=9A=84=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/.env.history | 2 +- data-room-ui/.env.production | 2 +- data-room-ui/.gitignore | 1 + data-room-ui/jest.config.js | 2 +- data-room-ui/package-lock.json | 82 +++++++++---------- .../Layout/BigScreenHomeLayout/NavTop.vue | 2 +- .../Layout/BigScreenHomeLayout/index.vue | 2 +- data-room-ui/vue.config.example.js | 6 +- 8 files changed, 49 insertions(+), 50 deletions(-) diff --git a/data-room-ui/.env.history b/data-room-ui/.env.history index c17ccc50..688ef765 100644 --- a/data-room-ui/.env.history +++ b/data-room-ui/.env.history @@ -4,7 +4,7 @@ NODE_ENV = production ENV = 'history' # VUE_APP_BASE为项目访问路径的前缀 -VUE_APP_BASE = '/gc-starter-lowcode-ui' +VUE_APP_BASE = '/bigScreen' # VUE_APP_HISTORY为是否开启history模式 VUE_APP_HISTORY = 'y' diff --git a/data-room-ui/.env.production b/data-room-ui/.env.production index c2cb22a6..496a9b34 100644 --- a/data-room-ui/.env.production +++ b/data-room-ui/.env.production @@ -2,6 +2,6 @@ ENV = 'production' # base api -VUE_APP_BASE_API = '/chuangDa' +VUE_APP_BASE_API = '/bigScreen' VUE_APP_BUILD_TYPE = 'example' \ No newline at end of file diff --git a/data-room-ui/.gitignore b/data-room-ui/.gitignore index 0f9712c9..abc67695 100644 --- a/data-room-ui/.gitignore +++ b/data-room-ui/.gitignore @@ -369,3 +369,4 @@ GitHub.sublime-settings lib data-room-ui bigScreen +bigScreen.zip diff --git a/data-room-ui/jest.config.js b/data-room-ui/jest.config.js index c563565e..f9b94fec 100644 --- a/data-room-ui/jest.config.js +++ b/data-room-ui/jest.config.js @@ -16,7 +16,7 @@ module.exports = { collectCoverageFrom: ['example/utils/**/*.{js,vue}', '!example/utils/axios.js', 'example/components/**/*.{js,vue}'], coverageDirectory: '/tests/unit/coverage', // 'collectCoverage': true, - 'coverageReporters': [ + coverageReporters: [ 'lcov', 'text-summary' ], diff --git a/data-room-ui/package-lock.json b/data-room-ui/package-lock.json index fa5c8059..6dcf0e76 100644 --- a/data-room-ui/package-lock.json +++ b/data-room-ui/package-lock.json @@ -3307,6 +3307,27 @@ "whatwg-fetch": "^3.6.2" }, "dependencies": { + "@vue/vue-loader-v15": { + "version": "npm:vue-loader@15.10.1", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz", + "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==", + "dev": true, + "requires": { + "@vue/component-compiler-utils": "^3.1.0", + "hash-sum": "^1.0.2", + "loader-utils": "^1.1.0", + "vue-hot-reload-api": "^2.3.0", + "vue-style-loader": "^4.1.0" + }, + "dependencies": { + "hash-sum": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", + "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", + "dev": true + } + } + }, "acorn-walk": { "version": "8.2.0", "resolved": "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-8.2.0.tgz", @@ -3378,6 +3399,26 @@ "tapable": "^2.0.0" } }, + "json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz", @@ -3595,47 +3636,6 @@ "lodash": "^4.17.4" } }, - "@vue/vue-loader-v15": { - "version": "npm:vue-loader@15.10.1", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz", - "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==", - "dev": true, - "requires": { - "@vue/component-compiler-utils": "^3.1.0", - "hash-sum": "^1.0.2", - "loader-utils": "^1.1.0", - "vue-hot-reload-api": "^2.3.0", - "vue-style-loader": "^4.1.0" - }, - "dependencies": { - "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", - "dev": true - }, - "json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", - "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - } - } - } - }, "@vue/vue2-jest": { "version": "27.0.0", "resolved": "https://registry.npmmirror.com/@vue/vue2-jest/-/vue2-jest-27.0.0.tgz", diff --git a/data-room-ui/packages/Layout/BigScreenHomeLayout/NavTop.vue b/data-room-ui/packages/Layout/BigScreenHomeLayout/NavTop.vue index 2ad937c8..a53d1e9b 100644 --- a/data-room-ui/packages/Layout/BigScreenHomeLayout/NavTop.vue +++ b/data-room-ui/packages/Layout/BigScreenHomeLayout/NavTop.vue @@ -110,7 +110,7 @@ export default { top: 0; left: 0; width: 100%; - height: 4px; + height: 2px; background-color: var(--bs-el-color-primary); } // background-image: url('./images/tab.png'); diff --git a/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue b/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue index 5e4cd45e..228588d1 100644 --- a/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue +++ b/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue @@ -112,7 +112,7 @@ export default { top: 0; width: 100%; height: 150px; - background-image: url('~packages/Layout/BigScreenHomeLayout/images/nav_img.png'); + background-image: url('./images/nav_img.png'); background-size: 100% 150px; background-color: #0D0F12; background-position: center right; diff --git a/data-room-ui/vue.config.example.js b/data-room-ui/vue.config.example.js index 34ccbcf4..be18efb2 100644 --- a/data-room-ui/vue.config.example.js +++ b/data-room-ui/vue.config.example.js @@ -9,8 +9,7 @@ const webpack = require('webpack') function resolve (dir) { return path.join(__dirname, dir) } -const publicPath = - process.env.VUE_APP_HISTORY === 'y' ? process.env.VUE_APP_BASE + '/' : '' +const publicPath = process.env.VUE_APP_HISTORY === 'y' ? process.env.VUE_APP_BASE + '/' : '' const JS_CDN = [ publicPath + 'static/libs/vuex/vuex.min.js', publicPath + 'static/libs/vue-router/vue-router.min.js' @@ -40,8 +39,7 @@ module.exports = { chunks: 'all' } }, - publicPath: - process.env.VUE_APP_HISTORY === 'y' ? process.env.VUE_APP_BASE : './', + publicPath: process.env.VUE_APP_HISTORY === 'y' ? process.env.VUE_APP_BASE : './', outputDir: 'bigScreen', assetsDir: 'static', lintOnSave: false,