From 0d609fac130a702b2f04721bb7ed933187d12a80 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 1 May 2024 19:16:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20js=E6=94=B9=E6=88=90ts=20=20=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/App.vue | 2 ++ src/api/{inLocation.js => inLocation.ts} | 0 src/api/{location.js => location.ts} | 0 src/api/{login.js => login.ts} | 0 src/api/{outLocation.js => outLocation.ts} | 0 src/api/{spareParts.js => spareParts.ts} | 0 src/api/{sparePartsReturn.js => sparePartsReturn.ts} | 0 src/api/{upload.js => upload.ts} | 0 src/api/{user.js => user.ts} | 0 src/main.ts | 2 ++ src/pages/inLocation/addForm.vue | 6 +++--- src/pages/inLocation/index.vue | 5 ++--- src/pages/outLocation/addForm.vue | 4 ++-- src/pages/outLocation/index.vue | 4 ++-- src/pages/scanCode/scanCode.vue | 2 +- src/pages/sparePartsReturn/addForm.vue | 8 ++++---- src/plugins/auth.js | 10 +++------- src/store/modules/countStore.ts | 5 +++++ 19 files changed, 27 insertions(+), 23 deletions(-) rename src/api/{inLocation.js => inLocation.ts} (100%) rename src/api/{location.js => location.ts} (100%) rename src/api/{login.js => login.ts} (100%) rename src/api/{outLocation.js => outLocation.ts} (100%) rename src/api/{spareParts.js => spareParts.ts} (100%) rename src/api/{sparePartsReturn.js => sparePartsReturn.ts} (100%) rename src/api/{upload.js => upload.ts} (100%) rename src/api/{user.js => user.ts} (100%) diff --git a/.env.development b/.env.development index e17ded4..dd2d32d 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -VITE_BASE_URL=http://192.168.0.106:12080/admin-api +VITE_BASE_URL=http://localhost:12080/admin-api #VITE_BASE_URL=http://dev.ccwin-in.com:25203/api/admin-api VITE_BASE_URL_IMAGE=http://192.168.0.106:12080/admin-api \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 31b5d75..6ec90eb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -81,6 +81,8 @@ // }); if (getAccessToken()) { await store.GetPermissionInfo().then(res => { + uni.setStorageSync('permissionInfo',res.permissions) + uni.setStorageSync('roles',res.roles) }).catch(() => { }) await store.GetInfo().then(res => { }).catch(() => { }) diff --git a/src/api/inLocation.js b/src/api/inLocation.ts similarity index 100% rename from src/api/inLocation.js rename to src/api/inLocation.ts diff --git a/src/api/location.js b/src/api/location.ts similarity index 100% rename from src/api/location.js rename to src/api/location.ts diff --git a/src/api/login.js b/src/api/login.ts similarity index 100% rename from src/api/login.js rename to src/api/login.ts diff --git a/src/api/outLocation.js b/src/api/outLocation.ts similarity index 100% rename from src/api/outLocation.js rename to src/api/outLocation.ts diff --git a/src/api/spareParts.js b/src/api/spareParts.ts similarity index 100% rename from src/api/spareParts.js rename to src/api/spareParts.ts diff --git a/src/api/sparePartsReturn.js b/src/api/sparePartsReturn.ts similarity index 100% rename from src/api/sparePartsReturn.js rename to src/api/sparePartsReturn.ts diff --git a/src/api/upload.js b/src/api/upload.ts similarity index 100% rename from src/api/upload.js rename to src/api/upload.ts diff --git a/src/api/user.js b/src/api/user.ts similarity index 100% rename from src/api/user.js rename to src/api/user.ts diff --git a/src/main.ts b/src/main.ts index c19c964..d5de468 100644 --- a/src/main.ts +++ b/src/main.ts @@ -9,6 +9,7 @@ import App from './App.vue' import tab from './plugins/tab' import modal from './plugins/modal' import time from './plugins/time' +import auth from './plugins/auth' // unocss @@ -30,6 +31,7 @@ export function createApp() { app.config.globalProperties.$modal = modal // 时间对象 app.config.globalProperties.$time = time + app.config.globalProperties.$auth = auth diff --git a/src/pages/inLocation/addForm.vue b/src/pages/inLocation/addForm.vue index 93c999a..946c6c5 100644 --- a/src/pages/inLocation/addForm.vue +++ b/src/pages/inLocation/addForm.vue @@ -133,9 +133,9 @@ ref, getCurrentInstance } from 'vue' - import * as inLocationApi from "@/api/inLocation.js" - import * as sparePartsApi from "@/api/spareParts.js" - import * as locationApi from "@/api/location.js" + import * as inLocationApi from "@/api/inLocation" + import * as sparePartsApi from "@/api/spareParts" + import * as locationApi from "@/api/location" const { proxy } = getCurrentInstance() const loading = ref(false) diff --git a/src/pages/inLocation/index.vue b/src/pages/inLocation/index.vue index 363a689..d6d50c7 100644 --- a/src/pages/inLocation/index.vue +++ b/src/pages/inLocation/index.vue @@ -46,8 +46,7 @@ ref, getCurrentInstance } from 'vue' - import * as inLocationApi from "@/api/inLocation.js" - import auth from '@/plugins/auth' + import * as inLocationApi from "@/api/inLocation" const { proxy } = getCurrentInstance() const params = ref({ @@ -57,7 +56,7 @@ const status = ref('loadmore') //是否显示没有更多了 const list = ref([]) function openDetail(item){ - if(!auth.hasPermiOr(['eam:item-order-main:inOperation']))return; + if(!proxy.$auth.hasPermiOr(['eam:item-order-main:inOperation']))return; proxy.$tab.navigateTo(`/pages/inLocation/addForm?data=${encodeURIComponent(JSON.stringify(item))}`) } async function getList() { diff --git a/src/pages/outLocation/addForm.vue b/src/pages/outLocation/addForm.vue index 87e128f..275c84d 100644 --- a/src/pages/outLocation/addForm.vue +++ b/src/pages/outLocation/addForm.vue @@ -151,8 +151,8 @@ ref, getCurrentInstance } from 'vue' - import * as outLocationApi from "@/api/outLocation.js" - import * as locationApi from "@/api/location.js" + import * as outLocationApi from "@/api/outLocation" + import * as locationApi from "@/api/location" const { proxy } = getCurrentInstance() const loading = ref(false) diff --git a/src/pages/outLocation/index.vue b/src/pages/outLocation/index.vue index ceab2ae..dc37c0c 100644 --- a/src/pages/outLocation/index.vue +++ b/src/pages/outLocation/index.vue @@ -63,7 +63,7 @@ ref, getCurrentInstance } from 'vue' - import * as outLocationApi from "@/api/outLocation.js" + import * as outLocationApi from "@/api/outLocation" import auth from '@/plugins/auth' const { proxy } = getCurrentInstance() const params = ref({ @@ -74,7 +74,7 @@ const list = ref([]) function openDetail(item){ - if(!auth.hasPermiOr(['eam:item-apply-record-main:outOperation']))return; + if(!proxy.$auth.hasPermiOr(['eam:item-apply-record-main:outOperation']))return; proxy.$tab.navigateTo(`/pages/outLocation/addForm?data=${encodeURIComponent(JSON.stringify(item))}`) } async function getList() { diff --git a/src/pages/scanCode/scanCode.vue b/src/pages/scanCode/scanCode.vue index ac5608b..161b672 100644 --- a/src/pages/scanCode/scanCode.vue +++ b/src/pages/scanCode/scanCode.vue @@ -70,7 +70,7 @@ ref, getCurrentInstance } from 'vue' - import * as locationApi from "@/api/location.js" + import * as locationApi from "@/api/location" const { proxy } = getCurrentInstance() const number = ref('LN0000000001') const list = ref([]) diff --git a/src/pages/sparePartsReturn/addForm.vue b/src/pages/sparePartsReturn/addForm.vue index d8cb531..efc4040 100644 --- a/src/pages/sparePartsReturn/addForm.vue +++ b/src/pages/sparePartsReturn/addForm.vue @@ -100,10 +100,10 @@ ref, getCurrentInstance } from 'vue' - import * as userApi from "@/api/user.js" - import * as sparePartsReturnApi from "@/api/sparePartsReturn.js" - import * as sparePartsApi from "@/api/spareParts.js" - import * as locationApi from "@/api/location.js" + import * as userApi from "@/api/user" + import * as sparePartsReturnApi from "@/api/sparePartsReturn" + import * as sparePartsApi from "@/api/spareParts" + import * as locationApi from "@/api/location" const { proxy } = getCurrentInstance() const loading = ref(false) diff --git a/src/plugins/auth.js b/src/plugins/auth.js index fb5665d..4f0663b 100644 --- a/src/plugins/auth.js +++ b/src/plugins/auth.js @@ -1,12 +1,8 @@ -// import store from '@/store' -import { - useCountStore -} from '@/store' -const store = useCountStore() + function authPermission(permission) { const all_permission = "*:*:*" - const permissions = store && store.permissions + const permissions =uni.getStorageSync('permissionInfo') if (permission && permission.length > 0) { return permissions.some(v => { return all_permission === v || v === permission @@ -18,7 +14,7 @@ function authPermission(permission) { function authRole(role) { const super_admin = "admin" - const roles = store && store.roles + const roles = uni.getStorageSync('roles') if (role && role.length > 0) { return roles.some(v => { return super_admin === v || v === role diff --git a/src/store/modules/countStore.ts b/src/store/modules/countStore.ts index 0d22a8f..c1b77b8 100644 --- a/src/store/modules/countStore.ts +++ b/src/store/modules/countStore.ts @@ -56,6 +56,9 @@ const useStore = defineStore('storeId', { this.roles = res.roles this.role = res.roles.filter(item => item == 'all_approve' || item == 'normal_approve')[0] this.permissions = res.permissions + + uni.setStorageSync('permissionInfo',res.permissions) + uni.setStorageSync('roles',res.roles) let menus = [] res.menus.forEach(item => { if (item.path == '/pda') { @@ -107,6 +110,8 @@ const useStore = defineStore('storeId', { this.post = '' this.dept = '' removeToken() + uni.removeStorageSync('permissionInfo') + uni.removeStorageSync('roles') resolve(res) }).catch(error => { reject(error)