diff --git a/.env.development b/.env.development index 3903075..f46e82e 100644 --- a/.env.development +++ b/.env.development @@ -5,8 +5,8 @@ VITE_APP_TITLE = 智慧换电管理系统 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.5.213:9100/gateway' +#VITE_APP_BASE_API = 'http://192.168.5.230:9100/gateway' #VITE_APP_BASE_API = '/dev-api' #VITE_APP_BASE_API = 'https://api.evo-techina.com' diff --git a/src/App.vue b/src/App.vue index b9a0887..f360cbd 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,17 +7,22 @@ import appStore from "@/stores/app"; import { ElMessage } from 'element-plus' import Login from './views/components/login.vue' +import { storeToRefs } from 'pinia' + const TIEM = 1000*60*10 let openpop = ref(false) - watch(() => appStore().isEffecti,(v) => { + + let { isEffecti,loginPage } = storeToRefs(appStore()) + + watch(isEffecti,(v) => { openpop.value = false - if(!v && getToken() && !appStore().loginPage){ + if(!v && getToken() && !loginPage){ openpop.value = true } }) - watch(() => appStore().loginPage,(v) => { + watch(() => loginPage,(v) => { if(v){ openpop.value = false } @@ -34,6 +39,13 @@ import Login from './views/components/login.vue' }) openpop.value = true } + }).catch(() => { + removeToken() + ElMessage({ + type: 'warning', + message: '登录失效请重新登录' + }) + openpop.value = true }) } }, TIEM) diff --git a/src/api/order/replabatt.ts b/src/api/order/replabatt.ts index 11bd3bb..ed9a5ea 100644 --- a/src/api/order/replabatt.ts +++ b/src/api/order/replabatt.ts @@ -163,3 +163,8 @@ export function dzdzd(params:any) { export function downdzdz(params:any) { return server.download('/cloud/order/swap/bill/download',params,'电子对账单.xlsx') } + +//导出订单 +export function orderept(params:any) { + return server.download('/cloud/order/swap/export',params,'订单.xlsx') +} diff --git a/src/api/swapstation/battery.ts b/src/api/swapstation/battery.ts index c8a36c5..0e93db4 100644 --- a/src/api/swapstation/battery.ts +++ b/src/api/swapstation/battery.ts @@ -11,9 +11,13 @@ interface Addobj{ productionDate?:String //生产日期 registrationDate?:String //注册时间 sourceCode?:String //站码或车牌照 - stationCode?:String //换电站编码 - stationName:String //换电站名称 + // stationCode?:String //换电站编码 + // stationName:String //换电站名称 soc?:String|Number //当前电量 + dccNo?:String //电池仓序号 + pointType:String|Number //轨迹点类型 1-站，2-车 + pointCode:String //轨迹点编码 + pointName:String //轨迹点名称 } export function addhdz(data:Addobj) { @@ -89,3 +93,20 @@ export function addzhuis(data:Addzs) { } +//电池数据/ +// type:1 近一周 2近半个月 3近一个月 4近半年 5 近一年 +// batCode: 电池编码 +export function getdcsj(batCode:any,beginTime:any,endTime:any) { + return server.request({ + headers:{ + 'content-type':'application/json;charset=utf-8' + }, + url: '/cloud/battery/station/dc/dynamic/detail', + method: 'post', + data:{ + batCode, + beginTime, + endTime + } + }) +} \ No newline at end of file diff --git a/src/api/swapstation/costdetails.ts b/src/api/swapstation/costdetails.ts index 78e05d5..9231b53 100644 --- a/src/api/swapstation/costdetails.ts +++ b/src/api/swapstation/costdetails.ts @@ -10,7 +10,7 @@ interface Addobj{ eachKmFee?:String|Number //每公里收费 eachSocFee?:String|Number //每SOC收费 eachKwhFee?:String|Number //每度电收费 - timeServiceFee?:String|Number //谷段服务费 + serviceFee?:String|Number //谷段服务费 } export function addhdz(data:Addobj) { diff --git a/src/api/swapstation/mqtt.ts b/src/api/swapstation/mqtt.ts index 7ce0589..9b4da12 100644 --- a/src/api/swapstation/mqtt.ts +++ b/src/api/swapstation/mqtt.ts @@ -16,4 +16,13 @@ export function mqttlist(params:Querydata) { method: 'get', params }) +} + +//在线记录 +export function onlinelist(params:any) { + return server.request({ + url: '/cloud/mqtt/client/list', + method: 'get', + params + }) } \ No newline at end of file diff --git a/src/api/systemSet/abnormal.ts b/src/api/systemSet/abnormal.ts new file mode 100644 index 0000000..c9ff4f9 --- /dev/null +++ b/src/api/systemSet/abnormal.ts @@ -0,0 +1,51 @@ +import server from '@/utils/request' + + +//查询 +interface Query{ + pageSize:string|number //每页条数 + pageNo:string|number //页数 + path:string //路径 +} + +export function getadlist(params:Query) { + return server.request({ + url: '/cloud/alarm/list', + method: 'get', + params + }) +} + +//新增 +interface Addata{ + id?:string + recipientIds:string //通知人员 + path:string //路径 +} +export function addyctz(data:Addata) { + return server.request({ + url: '/cloud/alarm/add', + method: 'post', + data + }) +} + +//修改 +export function updateab(data:Addata) { + return server.request({ + url: '/cloud/alarm/update', + method: 'post', + data + }) +} + +//删除 +export function delab(id:String) { + return server.request({ + url: '/cloud/alarm/del', + method: 'post', + data:{ + id + } + }) +} \ No newline at end of file diff --git a/src/api/systemSet/operator.ts b/src/api/systemSet/operator.ts index 1d009cd..39909db 100644 --- a/src/api/systemSet/operator.ts +++ b/src/api/systemSet/operator.ts @@ -19,6 +19,15 @@ export function getyyslist(params:Query) { }) } + +//下拉菜单查询 +export function optionyyslist() { + return server.request({ + url: '/resource/proxyoperater/option/list', + method: 'get' + }) +} + //新增 interface Addata{ division:String //区划名称 diff --git a/src/api/systemSet/user.ts b/src/api/systemSet/user.ts index 808a341..92ca242 100644 --- a/src/api/systemSet/user.ts +++ b/src/api/systemSet/user.ts @@ -54,7 +54,7 @@ export function updateuser(data:User) { } //删除 -export function deleteuser(data:String) { +export function deleteuser(data:any) { return server.request({ url: '/resource/user/del', method: 'post', diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index ca41006..e766848 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -2,14 +2,15 @@
+