From 8acf6342a4e7cd4437485dab1b13b21478063df4 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Fri, 21 Jul 2023 17:24:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BD=BF=E7=94=A8vue=E5=8E=9F=E5=9E=8B?= =?UTF-8?q?=E9=93=BE=E4=B8=8A=E7=9A=84axios=E5=AE=9E=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/package-lock.json | 100 +++--- data-room-ui/package.json | 2 +- .../packages/BasicComponents/Map/index.vue | 16 +- .../packages/BasicComponents/Map/setting.vue | 5 +- .../BasicComponents/TimeCountDown/setting.vue | 1 + .../BigScreenDesign/ComponentDialog/index.vue | 340 +++++++++++++----- .../OverallSetting/BgImgDialog.vue | 1 - .../BigScreenDesign/SourceDialog/index.vue | 154 ++++++-- .../packages/BigScreenManagement/index.vue | 2 - data-room-ui/packages/BigScreenRun/index.vue | 1 - .../packages/assets/style/bsTheme.scss | 4 +- 11 files changed, 432 insertions(+), 194 deletions(-) diff --git a/data-room-ui/package-lock.json b/data-room-ui/package-lock.json index 2d72e0aa..2b38108a 100644 --- a/data-room-ui/package-lock.json +++ b/data-room-ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gcpaas/data-room-ui", - "version": "1.0.1-2023071901-Alpha", + "version": "1.0.1-2023072003-Alpha", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2445,11 +2445,6 @@ "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", "dev": true }, - "@popperjs/core": { - "version": "npm:@sxzz/popperjs-es@2.11.7", - "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz", - "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==" - }, "@sideway/address": { "version": "4.1.4", "resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.4.tgz", @@ -3351,27 +3346,6 @@ "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", @@ -3443,26 +3417,6 @@ "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", @@ -3779,6 +3733,47 @@ "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", @@ -3993,9 +3988,9 @@ } }, "@wjjj/utils": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@wjjj/utils/-/utils-0.1.2.tgz", - "integrity": "sha512-ha0TIHwBYvvfOxMdeKyr0odWB12Tdv+C2kGUepDh74Ktm6uR5vq25QmMYNt6nMN/bH3KuPH82ynlDvfK+slZfg==", + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@wjjj/utils/-/utils-0.1.5.tgz", + "integrity": "sha512-TW2m6BXUuP089GBB8BAHpeb+eJoRpMzhiGt1gUibvCQUwze7Coamlio1rHkTnBaRGs0JLhE6ToTMrjqJowfNgQ==", "requires": { "element-plus": "^2.3.8", "npm": "^9.8.0", @@ -7737,6 +7732,11 @@ "normalize-wheel-es": "^1.2.0" }, "dependencies": { + "@popperjs/core": { + "version": "npm:@sxzz/popperjs-es@2.11.7", + "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz", + "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==" + }, "async-validator": { "version": "4.2.5", "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz", diff --git a/data-room-ui/package.json b/data-room-ui/package.json index 1a0335fe..694c9788 100644 --- a/data-room-ui/package.json +++ b/data-room-ui/package.json @@ -53,7 +53,7 @@ "@amap/amap-jsapi-loader": "^1.0.1", "@antv/g2plot": "2.4.0", "@jiaminghi/data-view": "2.10.0", - "@wjjj/utils": "^0.1.2", + "@wjjj/utils": "^0.1.5", "axios": "0.18.1", "babel-polyfill": "6.26.0", "echarts": "^5.2.2", diff --git a/data-room-ui/packages/BasicComponents/Map/index.vue b/data-room-ui/packages/BasicComponents/Map/index.vue index 8132c2ec..dddb8911 100644 --- a/data-room-ui/packages/BasicComponents/Map/index.vue +++ b/data-room-ui/packages/BasicComponents/Map/index.vue @@ -15,7 +15,6 @@ import * as echarts from 'echarts' import commonMixins from 'data-room-ui/js/mixins/commonMixins.js' import paramsMixins from 'data-room-ui/js/mixins/paramsMixins' import linkageMixins from 'data-room-ui/js/mixins/linkageMixins' -import { get } from 'data-room-ui/js/utils/http' export default { name: 'MapCharts', mixins: [paramsMixins, commonMixins, linkageMixins], @@ -60,7 +59,7 @@ export default { }, methods: { chartInit () { - let config = this.config + const config = this.config // key和code相等，说明是一进来刷新，调用list接口 if (this.config.code === this.config.key || this.isPreview) { // 改变数据 @@ -255,20 +254,9 @@ export default { } } const mapUrl = `${window.BS_CONFIG?.httpConfigs?.baseURL}/static/chinaMap/${config.customize.level}/${config.customize.dataMap}` - const map = await get(decodeURI(mapUrl), {}, true) + const map = await this.$dataRoomAxios.get(decodeURI(mapUrl), {}, true) echarts.registerMap(config.customize.scope, map) this.charts.setOption(option) - // this.charts.on('click', (params) => { - // get( - // `${window.BS_CONFIG?.httpConfigs?.baseURL}/static/chinaMap/province/${params.name}.json`, - // {}, - // true - // ).then((res) => { - // option.geo.map = params.name - // echarts.registerMap(params.name, res) - // this.charts.setOption(option, true) - // }) - // }) } } } diff --git a/data-room-ui/packages/BasicComponents/Map/setting.vue b/data-room-ui/packages/BasicComponents/Map/setting.vue index 52e955f4..fee28050 100644 --- a/data-room-ui/packages/BasicComponents/Map/setting.vue +++ b/data-room-ui/packages/BasicComponents/Map/setting.vue @@ -227,7 +227,6 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue' import { chartSettingMixins } from 'data-room-ui/js/mixins/chartSettingMixins' import ColorSelect from 'data-room-ui/ColorMultipleSelect/index.vue' import ColorPicker from 'data-room-ui/ColorPicker/index.vue' -import { get } from 'data-room-ui/js/utils/http' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' export default { name: 'BarSetting', @@ -271,9 +270,7 @@ export default { }, methods: { getMapList () { - get( - `${window.BS_CONFIG?.httpConfigs?.baseURL}/bigScreen/design/map/list/${this.config.customize.level}` - ).then((res) => { + this.$dataRoomAxios.get(`${window.BS_CONFIG?.httpConfigs?.baseURL}/bigScreen/design/map/list/${this.config.customize.level}`).then((res) => { this.mapList = res }) }, diff --git a/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue b/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue index 2fef7e7b..8199efec 100644 --- a/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue +++ b/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue @@ -66,6 +66,7 @@ > - +
- +
- - - + + + - + 搜索
-
+ }" + > -
-
+
+
- -
+ +
加载中···
-
+
{{ screen.name }}
@@ -39,55 +98,122 @@
-
+
{{ screen.name }}
-
+
暂无数据
- +
- +
- - - + + + - + 搜索
-
+ }" + > -
-
+
+
- -
+ +
加载中···
-
+
{{ screen.name }}
@@ -95,68 +221,123 @@
-
+
{{ screen.name }}
-
+
暂无数据
- +
- +
-
-
-
+ }" + > +
+
- -
+ +
加载中···
-
+
{{ component.title }}
-
+
暂无数据
-
- +
+ 取消 - + 确定 组件管理 @@ -165,7 +346,6 @@