From d1bee635ead7618d42fd3aeea6a5e704224741c8 Mon Sep 17 00:00:00 2001 From: zhideyiman Date: Thu, 10 Aug 2023 18:07:14 +0800 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=20chore:=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- prettier.config.js | 2 +- src/components/SelectTree/index.vue | 3 +- src/components/VabProfile/index.vue | 8 +- src/components/VabUpload/index.vue | 19 +-- src/config/permission.js | 11 +- src/store/modules/tabsBar.js | 4 +- src/store/modules/user.js | 11 +- src/utils/index.js | 10 +- src/utils/request.js | 14 +- src/utils/vab.js | 3 +- src/views/index/components/Plan.vue | 4 +- .../index/components/VersionInformation.vue | 8 +- src/views/index/index.vue | 17 +-- src/views/login/index.vue | 19 +-- src/views/mall/goodsList/index.vue | 9 +- .../roleManagement/index.vue | 7 +- .../userManagement/index.vue | 7 +- src/views/register/index.vue | 26 +--- src/views/vab/backToTop/index.vue | 4 +- src/views/vab/element/index.vue | 10 +- src/views/vab/form/index.vue | 8 +- src/views/vab/icon/colorfulIcon.vue | 20 +-- src/views/vab/icon/index.vue | 16 +-- src/views/vab/lodash/index.vue | 4 +- src/views/vab/map/index.vue | 124 +++++++++--------- src/views/vab/more/index.vue | 12 +- src/views/vab/permissions/index.vue | 8 +- src/views/vab/smallComponents/index.vue | 10 +- src/views/vab/table/index.vue | 9 +- src/views/vab/tree/index.vue | 14 +- vue.config.js | 6 +- 31 files changed, 114 insertions(+), 313 deletions(-) diff --git a/prettier.config.js b/prettier.config.js index 1bc3ace..9e839e0 100644 --- a/prettier.config.js +++ b/prettier.config.js @@ -4,7 +4,7 @@ */ module.exports = { - printWidth: 100, + printWidth: 130, tabWidth: 2, useTabs: false, semi: false, diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue index 9f5e0cb..4679d93 100644 --- a/src/components/SelectTree/index.vue +++ b/src/components/SelectTree/index.vue @@ -85,8 +85,7 @@ }, defaultSelectedKeys: [], //初始选中值数组 currentNodeKey: this.selectedKey, - selectValue: - this.selectType == 'multiple' ? this.selectedValue.split(',') : this.selectedValue, //下拉框选中值label + selectValue: this.selectType == 'multiple' ? this.selectedValue.split(',') : this.selectedValue, //下拉框选中值label selectKey: this.selectType == 'multiple' ? this.selectedKey.split(',') : this.selectedKey, //下拉框选中值value } }, diff --git a/src/components/VabProfile/index.vue b/src/components/VabProfile/index.vue index 6e7ec33..3c7505e 100644 --- a/src/components/VabProfile/index.vue +++ b/src/components/VabProfile/index.vue @@ -12,13 +12,7 @@ {{ username }}
-
diff --git a/src/components/VabUpload/index.vue b/src/components/VabUpload/index.vue index b4a7e0c..872293e 100644 --- a/src/components/VabUpload/index.vue +++ b/src/components/VabUpload/index.vue @@ -43,22 +43,12 @@ -
+
正在上传中... 当前上传成功数:{{ imgSuccessNum }}张 当前上传失败数:{{ imgErrorNum }}张
关闭 - + 开始上传
@@ -153,10 +143,7 @@ this.imgNum = this.imgNum + 1 this.imgErrorNum = this.imgErrorNum + 1 this.$baseMessage( - `文件[${file.raw.name}]上传失败,文件大小为${this.$baseLodash.round( - file.raw.size / 1024, - 0 - )}KB`, + `文件[${file.raw.name}]上传失败,文件大小为${this.$baseLodash.round(file.raw.size / 1024, 0)}KB`, 'error' ) setTimeout(() => { diff --git a/src/config/permission.js b/src/config/permission.js index 771799d..095adf2 100644 --- a/src/config/permission.js +++ b/src/config/permission.js @@ -7,13 +7,7 @@ import store from '@/store' import VabProgress from 'nprogress' import 'nprogress/nprogress.css' import getPageTitle from '@/utils/pageTitle' -import { - authentication, - loginInterception, - progressBar, - recordRoute, - routesWhiteList, -} from '@/config' +import { authentication, loginInterception, progressBar, recordRoute, routesWhiteList } from '@/config' VabProgress.configure({ easing: 'ease', @@ -32,8 +26,7 @@ router.beforeResolve(async (to, from, next) => { next({ path: '/' }) if (progressBar) VabProgress.done() } else { - const hasPermissions = - store.getters['user/permissions'] && store.getters['user/permissions'].length > 0 + const hasPermissions = store.getters['user/permissions'] && store.getters['user/permissions'].length > 0 if (hasPermissions) { next() } else { diff --git a/src/store/modules/tabsBar.js b/src/store/modules/tabsBar.js index 2eb2ea6..874093e 100644 --- a/src/store/modules/tabsBar.js +++ b/src/store/modules/tabsBar.js @@ -24,9 +24,7 @@ const mutations = { }) }, delOthersVisitedRoute(state, route) { - state.visitedRoutes = state.visitedRoutes.filter( - (item) => item.meta.affix || item.path === route.path - ) + state.visitedRoutes = state.visitedRoutes.filter((item) => item.meta.affix || item.path === route.path) }, delLeftVisitedRoute(state, route) { let index = state.visitedRoutes.length diff --git a/src/store/modules/user.js b/src/store/modules/user.js index fdd7c77..cef23a5 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -46,16 +46,7 @@ const actions = { if (accessToken) { commit('setAccessToken', accessToken) const hour = new Date().getHours() - const thisTime = - hour < 8 - ? '早上好' - : hour <= 11 - ? '上午好' - : hour <= 13 - ? '中午好' - : hour < 18 - ? '下午好' - : '晚上好' + const thisTime = hour < 8 ? '早上好' : hour <= 11 ? '上午好' : hour <= 13 ? '中午好' : hour < 18 ? '下午好' : '晚上好' Vue.prototype.$baseNotify(`欢迎登录${title}`, `${thisTime}！`) } else { Vue.prototype.$baseMessage(`登录接口异常，未正确返回${tokenName}...`, 'error') diff --git a/src/utils/index.js b/src/utils/index.js index 53b48d6..0c97885 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -91,11 +91,7 @@ export function paramObj(url) { return {} } return JSON.parse( - `{"${decodeURIComponent(search) - .replace(/"/g, '\\"') - .replace(/&/g, '","') - .replace(/=/g, '":"') - .replace(/\+/g, ' ')}"}` + `{"${decodeURIComponent(search).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g, '":"').replace(/\+/g, ' ')}"}` ) } @@ -115,9 +111,7 @@ export function translateDataToTree(data) { const temp = JSON.parse(JSON.stringify(children)) temp.splice(index, 1) translator([current], temp) - typeof parent.children !== 'undefined' - ? parent.children.push(current) - : (parent.children = [current]) + typeof parent.children !== 'undefined' ? parent.children.push(current) : (parent.children = [current]) } }) }) diff --git a/src/utils/request.js b/src/utils/request.js index 54e9c2e..50d6295 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -56,18 +56,10 @@ instance.interceptors.request.use( config.headers[tokenName] = store.getters['user/accessToken'] } //这里会过滤所有为空、0、false的key，如果不需要请自行注释 - if (config.data) - config.data = Vue.prototype.$baseLodash.pickBy( - config.data, - Vue.prototype.$baseLodash.identity - ) - if ( - config.data && - config.headers['Content-Type'] === 'application/x-www-form-urlencoded;charset=UTF-8' - ) + if (config.data) config.data = Vue.prototype.$baseLodash.pickBy(config.data, Vue.prototype.$baseLodash.identity) + if (config.data && config.headers['Content-Type'] === 'application/x-www-form-urlencoded;charset=UTF-8') config.data = qs.stringify(config.data) - if (debounce.some((item) => config.url.includes(item))) - loadingInstance = Vue.prototype.$baseLoading() + if (debounce.some((item) => config.url.includes(item))) loadingInstance = Vue.prototype.$baseLoading() return config }, (error) => { diff --git a/src/utils/vab.js b/src/utils/vab.js index 9820daa..92d184f 100644 --- a/src/utils/vab.js +++ b/src/utils/vab.js @@ -158,8 +158,7 @@ const install = (Vue) => { }, baseLayer: new maptalks.TileLayer('base', { cssFilter: 'sepia(100%) invert(90%)', - urlTemplate: - 'http://online{s}.map.bdimg.com/onlinelabel/?qt=tile&x={x}&y={y}&z={z}&styles=pl&scaler=1&p=1', + urlTemplate: 'http://online{s}.map.bdimg.com/onlinelabel/?qt=tile&x={x}&y={y}&z={z}&styles=pl&scaler=1&p=1', subdomains: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], attribution: '© Baidu', }), diff --git a/src/views/index/components/Plan.vue b/src/views/index/components/Plan.vue index 8e0f8b2..628f73c 100644 --- a/src/views/index/components/Plan.vue +++ b/src/views/index/components/Plan.vue @@ -3,9 +3,7 @@ diff --git a/src/views/index/components/VersionInformation.vue b/src/views/index/components/VersionInformation.vue index b99edee..95bd7d9 100644 --- a/src/views/index/components/VersionInformation.vue +++ b/src/views/index/components/VersionInformation.vue @@ -27,14 +27,10 @@ 授权渠道 - - PRO付费版本 购买源码 ￥699 - + PRO付费版本 购买源码 ￥699 - - Plus付费版本 购买源码 ￥799 - + Plus付费版本 购买源码 ￥799 开源免费版 diff --git a/src/views/index/index.vue b/src/views/index/index.vue index 46c29c6..4ae9c1d 100644 --- a/src/views/index/index.vue +++ b/src/views/index/index.vue @@ -44,15 +44,7 @@ - + @@ -137,12 +129,7 @@

vue-admin-better

- +
diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 5da9f21..3ccedbc 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -18,13 +18,7 @@ - + @@ -46,9 +40,7 @@ - +
注册
 @@ -136,9 +128,7 @@ }, methods: { handlePassword() { - this.passwordType === 'password' - ? (this.passwordType = '') - : (this.passwordType = 'password') + this.passwordType === 'password' ? (this.passwordType = '') : (this.passwordType = 'password') this.$nextTick(() => { this.$refs.password.focus() }) @@ -150,8 +140,7 @@ this.$store .dispatch('user/login', this.form) .then(() => { - const routerPath = - this.redirect === '/404' || this.redirect === '/401' ? '/' : this.redirect + const routerPath = this.redirect === '/404' || this.redirect === '/401' ? '/' : this.redirect this.$router.push(routerPath).catch(() => {}) this.loading = false }) diff --git a/src/views/mall/goodsList/index.vue b/src/views/mall/goodsList/index.vue index 4f6cadc..c79fcd7 100644 --- a/src/views/mall/goodsList/index.vue +++ b/src/views/mall/goodsList/index.vue @@ -7,14 +7,7 @@ - - 查询 - + 查询 diff --git a/src/views/personnelManagement/roleManagement/index.vue b/src/views/personnelManagement/roleManagement/index.vue index 41520bb..e29a086 100644 --- a/src/views/personnelManagement/roleManagement/index.vue +++ b/src/views/personnelManagement/roleManagement/index.vue @@ -20,12 +20,7 @@ - + diff --git a/src/views/personnelManagement/userManagement/index.vue b/src/views/personnelManagement/userManagement/index.vue index 5f50f50..7ca7dc2 100644 --- a/src/views/personnelManagement/userManagement/index.vue +++ b/src/views/personnelManagement/userManagement/index.vue @@ -17,12 +17,7 @@ - + diff --git a/src/views/register/index.vue b/src/views/register/index.vue index 5a45791..6ef93e8 100644 --- a/src/views/register/index.vue +++ b/src/views/register/index.vue @@ -12,13 +12,7 @@
占位符
- + - + {{ phoneCode }} - + - - 注册 - + 注册
登录
 diff --git a/src/views/vab/backToTop/index.vue b/src/views/vab/backToTop/index.vue index 49c101a..dfd40ec 100644 --- a/src/views/vab/backToTop/index.vue +++ b/src/views/vab/backToTop/index.vue @@ -1,8 +1,6 @@ diff --git a/src/views/vab/element/index.vue b/src/views/vab/element/index.vue index 32a9955..e0862b8 100644 --- a/src/views/vab/element/index.vue +++ b/src/views/vab/element/index.vue @@ -2,15 +2,9 @@
- - element全部文档点这里 - + element全部文档点这里 - + Tag 标签 diff --git a/src/views/vab/form/index.vue b/src/views/vab/form/index.vue index dce070a..049d4f1 100644 --- a/src/views/vab/form/index.vue +++ b/src/views/vab/form/index.vue @@ -2,13 +2,7 @@
- + diff --git a/src/views/vab/icon/colorfulIcon.vue b/src/views/vab/icon/colorfulIcon.vue index 766cdd7..6d5db02 100644 --- a/src/views/vab/icon/colorfulIcon.vue +++ b/src/views/vab/icon/colorfulIcon.vue @@ -21,23 +21,9 @@ - - - + + +
{{ item }} diff --git a/src/views/vab/icon/index.vue b/src/views/vab/icon/index.vue index 18db9a3..e7f9dbd 100644 --- a/src/views/vab/icon/index.vue +++ b/src/views/vab/icon/index.vue @@ -15,20 +15,8 @@ - - + +
diff --git a/src/views/vab/lodash/index.vue b/src/views/vab/lodash/index.vue index 3b48733..05edd9c 100644 --- a/src/views/vab/lodash/index.vue +++ b/src/views/vab/lodash/index.vue @@ -3,9 +3,7 @@ - - lodashjs官网 - + lodashjs官网 diff --git a/src/views/vab/map/index.vue b/src/views/vab/map/index.vue index 1bd9e29..371f0e4 100644 --- a/src/views/vab/map/index.vue +++ b/src/views/vab/map/index.vue @@ -18,77 +18,75 @@ mounted() { this.$nextTick(() => { const map = this.$baseMap() - axios - .get('https://fastly.jsdelivr.net/npm/mapv@2.0.12/examples/data/od-xierqi.txt') - .then((rs) => { - let data = [] - let timeData = [] + axios.get('https://fastly.jsdelivr.net/npm/mapv@2.0.12/examples/data/od-xierqi.txt').then((rs) => { + let data = [] + let timeData = [] - rs = rs.data.split('\n') - let maxLength = 0 - for (let i = 0; i < rs.length; i++) { - let item = rs[i].split(',') - let coordinates = [] - if (item.length > maxLength) { - maxLength = item.length + rs = rs.data.split('\n') + let maxLength = 0 + for (let i = 0; i < rs.length; i++) { + let item = rs[i].split(',') + let coordinates = [] + if (item.length > maxLength) { + maxLength = item.length + } + for (let j = 0; j < item.length; j += 2) { + let x = (Number(item[j]) / 20037508.34) * 180 + let y = (Number(item[j + 1]) / 20037508.34) * 180 + y = (180 / Math.PI) * (2 * Math.atan(Math.exp((y * Math.PI) / 180)) - Math.PI / 2) + if (x == 0 || y == NaN) { + continue } - for (let j = 0; j < item.length; j += 2) { - let x = (Number(item[j]) / 20037508.34) * 180 - let y = (Number(item[j + 1]) / 20037508.34) * 180 - y = (180 / Math.PI) * (2 * Math.atan(Math.exp((y * Math.PI) / 180)) - Math.PI / 2) - if (x == 0 || y == NaN) { - continue - } - coordinates.push([x, y]) - timeData.push({ - geometry: { - type: 'Point', - coordinates: [x, y], - }, - count: 1, - time: j, - }) - } - data.push({ + coordinates.push([x, y]) + timeData.push({ geometry: { - type: 'LineString', - coordinates: coordinates, + type: 'Point', + coordinates: [x, y], }, + count: 1, + time: j, }) } - - let dataSet = new mapv.DataSet(data) - - let options = { - strokeStyle: 'rgba(53,57,255,0.5)', - // globalCompositeOperation: 'lighter', - shadowColor: 'rgba(53,57,255,0.2)', - shadowBlur: 3, - lineWidth: 3.0, - draw: 'simple', - } - - let mapvLayer = new mapv.MaptalksLayer('mapv1', dataSet, options).addTo(map) - - let dataSet2 = new mapv.DataSet(timeData) - - let options2 = { - fillStyle: 'rgba(255, 250, 250, 0.2)', - globalCompositeOperation: 'lighter', - size: 1.5, - animation: { - stepsRange: { - start: 0, - end: 100, - }, - trails: 3, - duration: 5, + data.push({ + geometry: { + type: 'LineString', + coordinates: coordinates, }, - draw: 'simple', - } + }) + } - let mapvLayer2 = new mapv.MaptalksLayer('mapv2', dataSet2, options2).addTo(map) - }) + let dataSet = new mapv.DataSet(data) + + let options = { + strokeStyle: 'rgba(53,57,255,0.5)', + // globalCompositeOperation: 'lighter', + shadowColor: 'rgba(53,57,255,0.2)', + shadowBlur: 3, + lineWidth: 3.0, + draw: 'simple', + } + + let mapvLayer = new mapv.MaptalksLayer('mapv1', dataSet, options).addTo(map) + + let dataSet2 = new mapv.DataSet(timeData) + + let options2 = { + fillStyle: 'rgba(255, 250, 250, 0.2)', + globalCompositeOperation: 'lighter', + size: 1.5, + animation: { + stepsRange: { + start: 0, + end: 100, + }, + trails: 3, + duration: 5, + }, + draw: 'simple', + } + + let mapvLayer2 = new mapv.MaptalksLayer('mapv2', dataSet2, options2).addTo(map) + }) }) }, methods: {}, diff --git a/src/views/vab/more/index.vue b/src/views/vab/more/index.vue index b1afb0e..fccc2c4 100644 --- a/src/views/vab/more/index.vue +++ b/src/views/vab/more/index.vue @@ -5,9 +5,7 @@
开源版本 - - 永久免费 个人/商业使用 - + 永久免费 个人/商业使用
@@ -30,9 +26,7 @@
VIP群 - - ￥100（2021年1月起不再提供此服务） - + ￥100（2021年1月起不再提供此服务）
    diff --git a/src/views/vab/permissions/index.vue b/src/views/vab/permissions/index.vue index a765dc2..4337596 100644 --- a/src/views/vab/permissions/index.vue +++ b/src/views/vab/permissions/index.vue @@ -1,8 +1,6 @@