From 57f316dcac4c7635533fb7feeb6ce4afa07e09c0 Mon Sep 17 00:00:00 2001 From: cjb <646858191@qq.com> Date: Sat, 19 Apr 2025 14:25:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 1 + src/api/swapstation/vehicle.ts | 10 ++ src/router/index.ts | 8 +- src/stores/app.ts | 6 +- src/views/components/login.vue | 3 +- src/views/order/account/index.vue | 14 ++- src/views/order/replabatt/index.vue | 7 ++ .../swapstation/expestand/costdetails.vue | 4 +- src/views/swapstation/expestand/index.vue | 33 ++++--- src/views/swapstation/hdz/index.vue | 94 +++++++++++++++++-- src/views/system/user/index.vue | 15 ++- src/views/vehicle/car/index.vue | 21 ++++- 12 files changed, 174 insertions(+), 42 deletions(-) diff --git a/.env.development b/.env.development index dd4d3cb..96627d7 100644 --- a/.env.development +++ b/.env.development @@ -7,5 +7,6 @@ VITE_APP_ENV = 'development' # 开发环境 VITE_APP_BASE_API = 'http://192.168.5.213:9100/gateway' #VITE_APP_BASE_API = 'http://192.168.5.14:9100/gateway' +#VITE_APP_BASE_API = 'http://192.168.7.152:9100/gateway' #VITE_APP_BASE_API = '/dev-api' #VITE_APP_BASE_API = 'https://api.evo-techina.com' diff --git a/src/api/swapstation/vehicle.ts b/src/api/swapstation/vehicle.ts index 51c5db1..a349503 100644 --- a/src/api/swapstation/vehicle.ts +++ b/src/api/swapstation/vehicle.ts @@ -64,6 +64,16 @@ export function getjqrlist(params:Querydata) { }) } + +//删除车辆前查看是否有未结算订单 +export function hasorder(plateNum:string) { + return server.request({ + url: `cloud/order/swap/checkList?pageSize=20&pageNo=1&plateNum=${plateNum}`, + method: 'get' + }) +} + + //删除 export function delhdz(id:string) { return server.request({ diff --git a/src/router/index.ts b/src/router/index.ts index 856f8c1..c8ac9f8 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -60,15 +60,17 @@ router.beforeEach((to, from, next) => { } else { const uStore = userStore(); //setInfor - if(init){ + if(appStore().isInit){ isRelogin.show = true; const pStore = permissionStore(); pStore.GenerateRoutes().then(() => { isRelogin.show = false; - init = false + appStore().setInit(false) + //init = false next({ ...to, replace: true }); // hack方法 确保addRoutes已完成 }).catch(err => { - init = true + //init = true + appStore().setInit(true) if(err == 'S0405'){ removeToken() next({ path: "/login" }) diff --git a/src/stores/app.ts b/src/stores/app.ts index 667729e..bf733de 100644 --- a/src/stores/app.ts +++ b/src/stores/app.ts @@ -16,7 +16,8 @@ const store = defineStore({ device: "desktop", size: Cookies.get("size") || "medium", isEffecti:true, //登录状态是否有效 - loginPage:false //是否是登录页面 + loginPage:false, //是否是登录页面 + isInit:true //是否是初始登录 }; }, getters: { @@ -30,6 +31,9 @@ const store = defineStore({ setloginPage(v:boolean) { this.loginPage = v }, + setInit(v:boolean) { + this.isInit = v + }, toggleSideBar() { if (this.sidebar.hide) { return false; diff --git a/src/views/components/login.vue b/src/views/components/login.vue index 1c25f68..d535eca 100644 --- a/src/views/components/login.vue +++ b/src/views/components/login.vue @@ -67,7 +67,7 @@ import { useRoute, useRouter } from "vue-router"; import userStore from "@/stores/user"; - + import appStore from "@/stores/app"; const props = withDefaults(defineProps<{ type?:string|number @@ -181,6 +181,7 @@ .Login(Object.assign({},loginForm.value,{code:`${ipcode.value}:${loginForm.value.code}`})) .then(() => { loading.value = false; + appStore().setInit(true) if(props.type == 1){ router.push({ path: redirect.value || "/" }); }else{ diff --git a/src/views/order/account/index.vue b/src/views/order/account/index.vue index 91ada9d..d1e2bb7 100644 --- a/src/views/order/account/index.vue +++ b/src/views/order/account/index.vue @@ -19,6 +19,13 @@ maxlength="50" /> + + + @@ -53,12 +60,13 @@
{{scope.row.accName?scope.row.accName:'暂未设置'}}
+ - + @@ -453,8 +461,8 @@ ownerId:'', //户主ID code:'', //编码 stationCode:'', //引入站点 - accName:'' //户主名称 - + accName:'', //户主名称 + phone:'' //联系电话 }) //查询 diff --git a/src/views/order/replabatt/index.vue b/src/views/order/replabatt/index.vue index b4ca0d5..457bc85 100644 --- a/src/views/order/replabatt/index.vue +++ b/src/views/order/replabatt/index.vue @@ -100,6 +100,7 @@ + @@ -648,6 +649,12 @@ {{xqobj.changeLane == 1?'A车道':'B车道'}} + + + 换电站： + {{xqobj.stationName}} + + diff --git a/src/views/swapstation/expestand/costdetails.vue b/src/views/swapstation/expestand/costdetails.vue index 79d72fa..624a898 100644 --- a/src/views/swapstation/expestand/costdetails.vue +++ b/src/views/swapstation/expestand/costdetails.vue @@ -121,7 +121,7 @@ - +