From ba4b6e289dfecb09d9a850f0d91dafdbb0921810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com> Date: Tue, 26 Mar 2024 10:27:57 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8Ferror=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Login.vue | 2 +- src/main.js | 4 ++-- src/views/administration/License.vue | 3 ++- src/views/entityExplorer/EntityExplorer.vue | 3 +-- .../entityExplorer/entityList/detailOverview/Subscriber.vue | 1 - 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Login.vue b/src/Login.vue index 98461363..e8e90440 100644 --- a/src/Login.vue +++ b/src/Login.vue @@ -176,7 +176,7 @@ export default { if (file.status !== 'ready') return if (!_.endsWith(file.name, '.xml')) { this.fileList = [] - this.$message.error('Only support '+ this.fileTypeLimit + ' files') + this.$message.error('Only support ' + this.fileTypeLimit + ' files') } else { this.fileList = fileList.slice(-1) this.$refs.licenseUpload.submit() diff --git a/src/main.js b/src/main.js index d1ecece2..56336bca 100644 --- a/src/main.js +++ b/src/main.js @@ -6,10 +6,10 @@ import store from '@/store' import App from '@/App.vue' import '@/utils/http.js' import commonMixin from '@/mixins/common' -import { cancelWithChange, noData, myHighLight,selectLoadMore } from '@/utils/tools' +import { cancelWithChange, noData, myHighLight, selectLoadMore } from '@/utils/tools' import { ClickOutside } from 'element-plus/lib/directives' import i18n from '@/i18n' -//import '@/mock/index.js' +// import '@/mock/index.js' import hljsVuePlugin from '@highlightjs/vue-plugin' import 'highlight.js/styles/color-brewer.css' import '@/assets/css/main.scss' // 样式入口 diff --git a/src/views/administration/License.vue b/src/views/administration/License.vue index 5ab92f82..aa8ca120 100644 --- a/src/views/administration/License.vue +++ b/src/views/administration/License.vue @@ -51,6 +51,7 @@ import { storageKey } from '@/utils/constants' import axios from 'axios' import { ref } from 'vue' import { dateFormat } from '@/utils/date-util' +import _ from 'lodash' export default { name: 'License', @@ -110,7 +111,7 @@ export default { downloadFile () { axios.get(this.downloadC2vUrl, { responseType: 'blob' }).then(res => { let fileName = '' - if(res.headers['content-disposition']) { + if (res.headers['content-disposition']) { fileName = res.headers['content-disposition'].split(';')[1].split('filename=')[1] } diff --git a/src/views/entityExplorer/EntityExplorer.vue b/src/views/entityExplorer/EntityExplorer.vue index a9691977..4cf9d35c 100644 --- a/src/views/entityExplorer/EntityExplorer.vue +++ b/src/views/entityExplorer/EntityExplorer.vue @@ -647,7 +647,6 @@ export default { }).finally(() => { this.newFilterData[index].loading = false this.newFilterData[index].firstLoad = false - console.log('查看loading', this.newFilterData) }) } }) @@ -675,7 +674,7 @@ export default { } else { this.$message.error(response.data.message) } - }).catch((e) => { + }).catch(() => { this.listData = [] }).finally(() => { this.listLoading = false diff --git a/src/views/entityExplorer/entityList/detailOverview/Subscriber.vue b/src/views/entityExplorer/entityList/detailOverview/Subscriber.vue index 481632ee..42574694 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Subscriber.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Subscriber.vue @@ -103,7 +103,6 @@ import entityDetailMixin from './entityDetailMixin' import { unitTypes } from '@/utils/constants' import { valueToRangeValue } from '@/utils/unit-convert' import _ from 'lodash' -import axios from 'axios' import relatedServer from '@/mixins/relatedServer' import { dateFormatByAppearance, getMillisecond, getSecond, getNowTime } from '@/utils/date-util' import Loading from '@/components/common/Loading' From 37265028544c542f39828ad4b26221f54c879ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com> Date: Tue, 26 Mar 2024 14:40:11 +0800 Subject: [PATCH 2/7] =?UTF-8?q?CN-1582=20fix:=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=9A=84=E7=BC=A9=E6=94=BE=E6=AF=94=E4=BE=8B?= =?UTF-8?q?=E5=92=8C=E5=9C=B0=E5=9B=BElogo=E7=9A=84=E9=80=8F=E6=98=8E?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/charts2/entityDetailSubscriberMap.scss | 9 +++++++++ .../entityList/detailOverview/SubscriberMap.vue | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/assets/css/components/views/charts2/entityDetailSubscriberMap.scss b/src/assets/css/components/views/charts2/entityDetailSubscriberMap.scss index 527c60a0..022ab7bb 100644 --- a/src/assets/css/components/views/charts2/entityDetailSubscriberMap.scss +++ b/src/assets/css/components/views/charts2/entityDetailSubscriberMap.scss @@ -120,6 +120,15 @@ } .entity-subscriber-map { width: 100%; + .maplibregl-ctrl-attrib-button { + opacity: 0.3; + } + .maplibregl-ctrl-attrib-button:focus, .maplibregl-ctrl-group button:focus { + box-shadow: 0 0 2px 2px #A9CAE1; + } + .maplibregl-ctrl-attrib a { + color: #ababab; + } } .panel-chart__no-data { height: calc(100% - 46px); diff --git a/src/views/entityExplorer/entityList/detailOverview/SubscriberMap.vue b/src/views/entityExplorer/entityList/detailOverview/SubscriberMap.vue index 46223dff..54f48892 100644 --- a/src/views/entityExplorer/entityList/detailOverview/SubscriberMap.vue +++ b/src/views/entityExplorer/entityList/detailOverview/SubscriberMap.vue @@ -690,8 +690,8 @@ export default { myChart, maxZoom: mapConfig.maxZoom, // 地图最小缩放比例 minZoom: mapConfig.minZoom, // 地图最大缩放比例 - mapLevel: 1, // 地图精度 1、2、3 - defaultZoom: mapConfig.defaultZoom, // 地图默认缩放比例 + mapLevel: mapConfig.mapLevel, // 地图精度 1、2、3 + defaultZoom: 11, // 地图默认缩放比例 center: mapConfig.center, // 地图默认中心点。北京：[116.38, 39.9] 纽约：[-73.94539, 40.841843] trackingSubscriber, trackingSubscriberList, From 8f4ca8f75e526addc2989e2ccac9092c5bc845ad Mon Sep 17 00:00:00 2001 From: hanyuxia Date: Wed, 27 Mar 2024 13:55:50 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feat:=20CN-1593=20=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=A1=B5=E4=BA=A4=E4=BA=92=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Login.vue | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/src/Login.vue b/src/Login.vue index e8e90440..fc921259 100644 --- a/src/Login.vue +++ b/src/Login.vue @@ -25,18 +25,28 @@ > - - +
{{licenseStatusErrMsg}}