From a983b7b476ab487ee3a1b5bd3e1aa00c222efb20 Mon Sep 17 00:00:00 2001 From: LHG <553198475@qq.com> Date: Fri, 25 Apr 2025 18:03:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ebike-operate/src/utils/authority.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ebike-operate/src/utils/authority.js b/ebike-operate/src/utils/authority.js index 06502d0..6cfa696 100644 --- a/ebike-operate/src/utils/authority.js +++ b/ebike-operate/src/utils/authority.js @@ -2,7 +2,8 @@ export function getCache(name) { if (name == undefined || name == "") { return ""; } - let result = localStorage.getItem(name); + //let result = localStorage.getItem(name); + let result = sessionStorage.getItem(name); if (result!= null) { if ((result.startsWith("{") && result.endsWith("}")) || (result.startsWith("[") && result.endsWith("]"))) { result = JSON.parse(result); @@ -18,9 +19,11 @@ export function getCache(name) { if(typeof value === 'object') { value = JSON.stringify(value); } - let result = localStorage.setItem(name, value); + //let result = localStorage.setItem(name, value); + let result = sessionStorage.setItem(name, value); return result; } export function clearStorage() { - localStorage.clear(); + sessionStorage.clear(); + //localStorage.clear(); } \ No newline at end of file From ab509c6bcb8f41c0f82582a2f62091af40774560 Mon Sep 17 00:00:00 2001 From: LHG <553198475@qq.com> Date: Sun, 27 Apr 2025 15:46:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=8F=8A=E5=9C=B0=E5=9B=BE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=AD=98=E6=94=BE=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ebike-operate/index.html | 4 +- ebike-operate/src/views/Layout/index.vue | 40 +- ebike-operate/src/views/Login/index.vue | 2 +- .../src/views/Urban/OperateRegion/index.vue | 2 +- .../Urban/OperateRegion/operateRegionMap.vue | 341 ------------- .../views/Urban/OperateRegionMap/index.vue | 342 +++++++++++++ .../src/views/Urban/SiteManage/index.vue | 480 ++++++++++++++++++ .../form/operateregion/OperateAddForm.vue | 2 +- 8 files changed, 856 insertions(+), 357 deletions(-) delete mode 100644 ebike-operate/src/views/Urban/OperateRegion/operateRegionMap.vue create mode 100644 ebike-operate/src/views/Urban/OperateRegionMap/index.vue create mode 100644 ebike-operate/src/views/Urban/SiteManage/index.vue diff --git a/ebike-operate/index.html b/ebike-operate/index.html index ddd2ef7..a8f5cc7 100644 --- a/ebike-operate/index.html +++ b/ebike-operate/index.html @@ -4,10 +4,10 @@ - 克能单车 + 景上出行 -
+
diff --git a/ebike-operate/src/views/Layout/index.vue b/ebike-operate/src/views/Layout/index.vue index f82cd1a..8a398f4 100644 --- a/ebike-operate/src/views/Layout/index.vue +++ b/ebike-operate/src/views/Layout/index.vue @@ -19,7 +19,7 @@ animation: fade 1s; " v-if="!collapsed" - >克能单车 + >景上出行
@@ -109,7 +116,7 @@ import { useRouter, useRoute } from 'vue-router' import { message } from 'ant-design-vue' import { getMenus } from '../../pages'; import { getLogoutAPI } from '@/apis/login.js' -import { getCache, clearStorage } from '@/utils/authority'; +import { getCache, setCache, clearStorage } from '@/utils/authority'; const selectedKeys = ref(['1']) const openKeys = ref(['1']) const collapsed = ref(false) @@ -122,6 +129,7 @@ const router = useRouter() // 登录状态 const isLogin = ref(false) const username = ref('') +const useroperation = ref([]) const userdfrname = ref('') onMounted(() => { @@ -137,10 +145,16 @@ onMounted(() => { console.log('userinfo', userinfo) username.value = userinfo.username ? userinfo.username : 'X' + //获取用户区域 + const cuseroperation = getCache('ebike-useroperation'); + if(cuseroperation){ + useroperation.value = cuseroperation; + } + //获取默认区域 - const userdefultoperation = getCache('ebike-userdefultoperation'); - if(userdefultoperation){ - userdfrname.value = userdefultoperation.regionName ? userdefultoperation.regionName : ''; + const cuserdefultoperation = getCache('ebike-userdefultoperation'); + if(cuserdefultoperation){ + userdfrname.value = cuserdefultoperation.regionName ? cuserdefultoperation.regionName : ''; } const menus = getMenus() @@ -191,12 +205,16 @@ const confirm = async (e) => { } const cancel = (e) => { console.log(e) - message.error('退出登录取消！！！') return } -const goBack = () => { - router.back() +const onOperationClick = (e) => { + if(e.item && e.item.data){ + const regionName = e.item.data.regionName; + userdfrname.value = regionName; + //存储默认区域 + setCache('ebike-userdefultoperation', e.item.data); + } } diff --git a/ebike-operate/src/views/Login/index.vue b/ebike-operate/src/views/Login/index.vue index 67a8a89..cbe3793 100644 --- a/ebike-operate/src/views/Login/index.vue +++ b/ebike-operate/src/views/Login/index.vue @@ -18,7 +18,7 @@ @finish="onFinish" @finishFailed="onFinishFailed" > - 克能单车 + 景上出行 -
- - -
- {{ buttonName }} - 完成 -
-
- - - -
- -
- - - - - \ No newline at end of file diff --git a/ebike-operate/src/views/Urban/OperateRegionMap/index.vue b/ebike-operate/src/views/Urban/OperateRegionMap/index.vue new file mode 100644 index 0000000..50b6fda --- /dev/null +++ b/ebike-operate/src/views/Urban/OperateRegionMap/index.vue @@ -0,0 +1,342 @@ + + + + + + \ No newline at end of file diff --git a/ebike-operate/src/views/Urban/SiteManage/index.vue b/ebike-operate/src/views/Urban/SiteManage/index.vue new file mode 100644 index 0000000..0229f2e --- /dev/null +++ b/ebike-operate/src/views/Urban/SiteManage/index.vue @@ -0,0 +1,480 @@ + + + diff --git a/ebike-operate/src/views/form/operateregion/OperateAddForm.vue b/ebike-operate/src/views/form/operateregion/OperateAddForm.vue index caf3d97..b1c206e 100644 --- a/ebike-operate/src/views/form/operateregion/OperateAddForm.vue +++ b/ebike-operate/src/views/form/operateregion/OperateAddForm.vue @@ -111,7 +111,7 @@