RISE/school-developer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'developer' into 'master'

Browse Source 
1

See merge request scj/zhxy/v3/cloud-ui!7
This commit is contained in:
Administrator
2026-03-10 03:53:40 +00:00
parent 4a76ec3e26 f53c65224b
commit 26eef99007
2 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
auto-imports.d.ts vendored
View File

@@ -1,73 +1,73 @@
// Generated by 'unplugin-auto-import' // Generated by 'unplugin-auto-import'
export {}; export {}
declare global { declare global {
const EffectScope: typeof import('vue')['EffectScope']; const EffectScope: typeof import('vue')['EffectScope']
const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']; const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
const computed: typeof import('vue')['computed']; const computed: typeof import('vue')['computed']
const createApp: typeof import('vue')['createApp']; const createApp: typeof import('vue')['createApp']
const createPinia: typeof import('pinia')['createPinia']; const createPinia: typeof import('pinia')['createPinia']
const customRef: typeof import('vue')['customRef']; const customRef: typeof import('vue')['customRef']
const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']; const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
const defineComponent: typeof import('vue')['defineComponent']; const defineComponent: typeof import('vue')['defineComponent']
const defineStore: typeof import('pinia')['defineStore']; const defineStore: typeof import('pinia')['defineStore']
const effectScope: typeof import('vue')['effectScope']; const effectScope: typeof import('vue')['effectScope']
const getActivePinia: typeof import('pinia')['getActivePinia']; const getActivePinia: typeof import('pinia')['getActivePinia']
const getCurrentInstance: typeof import('vue')['getCurrentInstance']; const getCurrentInstance: typeof import('vue')['getCurrentInstance']
const getCurrentScope: typeof import('vue')['getCurrentScope']; const getCurrentScope: typeof import('vue')['getCurrentScope']
const h: typeof import('vue')['h']; const h: typeof import('vue')['h']
const inject: typeof import('vue')['inject']; const inject: typeof import('vue')['inject']
const isProxy: typeof import('vue')['isProxy']; const isProxy: typeof import('vue')['isProxy']
const isReactive: typeof import('vue')['isReactive']; const isReactive: typeof import('vue')['isReactive']
const isReadonly: typeof import('vue')['isReadonly']; const isReadonly: typeof import('vue')['isReadonly']
const isRef: typeof import('vue')['isRef']; const isRef: typeof import('vue')['isRef']
const mapActions: typeof import('pinia')['mapActions']; const mapActions: typeof import('pinia')['mapActions']
const mapGetters: typeof import('pinia')['mapGetters']; const mapGetters: typeof import('pinia')['mapGetters']
const mapState: typeof import('pinia')['mapState']; const mapState: typeof import('pinia')['mapState']
const mapStores: typeof import('pinia')['mapStores']; const mapStores: typeof import('pinia')['mapStores']
const mapWritableState: typeof import('pinia')['mapWritableState']; const mapWritableState: typeof import('pinia')['mapWritableState']
const markRaw: typeof import('vue')['markRaw']; const markRaw: typeof import('vue')['markRaw']
const nextTick: typeof import('vue')['nextTick']; const nextTick: typeof import('vue')['nextTick']
const onActivated: typeof import('vue')['onActivated']; const onActivated: typeof import('vue')['onActivated']
const onBeforeMount: typeof import('vue')['onBeforeMount']; const onBeforeMount: typeof import('vue')['onBeforeMount']
const onBeforeRouteLeave: typeof import('vue-router')['onBeforeRouteLeave']; const onBeforeRouteLeave: typeof import('vue-router')['onBeforeRouteLeave']
const onBeforeRouteUpdate: typeof import('vue-router')['onBeforeRouteUpdate']; const onBeforeRouteUpdate: typeof import('vue-router')['onBeforeRouteUpdate']
const onBeforeUnmount: typeof import('vue')['onBeforeUnmount']; const onBeforeUnmount: typeof import('vue')['onBeforeUnmount']
const onBeforeUpdate: typeof import('vue')['onBeforeUpdate']; const onBeforeUpdate: typeof import('vue')['onBeforeUpdate']
const onDeactivated: typeof import('vue')['onDeactivated']; const onDeactivated: typeof import('vue')['onDeactivated']
const onErrorCaptured: typeof import('vue')['onErrorCaptured']; const onErrorCaptured: typeof import('vue')['onErrorCaptured']
const onMounted: typeof import('vue')['onMounted']; const onMounted: typeof import('vue')['onMounted']
const onRenderTracked: typeof import('vue')['onRenderTracked']; const onRenderTracked: typeof import('vue')['onRenderTracked']
const onRenderTriggered: typeof import('vue')['onRenderTriggered']; const onRenderTriggered: typeof import('vue')['onRenderTriggered']
const onScopeDispose: typeof import('vue')['onScopeDispose']; const onScopeDispose: typeof import('vue')['onScopeDispose']
const onServerPrefetch: typeof import('vue')['onServerPrefetch']; const onServerPrefetch: typeof import('vue')['onServerPrefetch']
const onUnmounted: typeof import('vue')['onUnmounted']; const onUnmounted: typeof import('vue')['onUnmounted']
const onUpdated: typeof import('vue')['onUpdated']; const onUpdated: typeof import('vue')['onUpdated']
const provide: typeof import('vue')['provide']; const provide: typeof import('vue')['provide']
const reactive: typeof import('vue')['reactive']; const reactive: typeof import('vue')['reactive']
const readonly: typeof import('vue')['readonly']; const readonly: typeof import('vue')['readonly']
const ref: typeof import('vue')['ref']; const ref: typeof import('vue')['ref']
const resolveComponent: typeof import('vue')['resolveComponent']; const resolveComponent: typeof import('vue')['resolveComponent']
const resolveDirective: typeof import('vue')['resolveDirective']; const resolveDirective: typeof import('vue')['resolveDirective']
const setActivePinia: typeof import('pinia')['setActivePinia']; const setActivePinia: typeof import('pinia')['setActivePinia']
const setMapStoreSuffix: typeof import('pinia')['setMapStoreSuffix']; const setMapStoreSuffix: typeof import('pinia')['setMapStoreSuffix']
const shallowReactive: typeof import('vue')['shallowReactive']; const shallowReactive: typeof import('vue')['shallowReactive']
const shallowReadonly: typeof import('vue')['shallowReadonly']; const shallowReadonly: typeof import('vue')['shallowReadonly']
const shallowRef: typeof import('vue')['shallowRef']; const shallowRef: typeof import('vue')['shallowRef']
const storeToRefs: typeof import('pinia')['storeToRefs']; const storeToRefs: typeof import('pinia')['storeToRefs']
const toRaw: typeof import('vue')['toRaw']; const toRaw: typeof import('vue')['toRaw']
const toRef: typeof import('vue')['toRef']; const toRef: typeof import('vue')['toRef']
const toRefs: typeof import('vue')['toRefs']; const toRefs: typeof import('vue')['toRefs']
const triggerRef: typeof import('vue')['triggerRef']; const triggerRef: typeof import('vue')['triggerRef']
const unref: typeof import('vue')['unref']; const unref: typeof import('vue')['unref']
const useAttrs: typeof import('vue')['useAttrs']; const useAttrs: typeof import('vue')['useAttrs']
const useCssModule: typeof import('vue')['useCssModule']; const useCssModule: typeof import('vue')['useCssModule']
const useCssVars: typeof import('vue')['useCssVars']; const useCssVars: typeof import('vue')['useCssVars']
const useLink: typeof import('vue-router')['useLink']; const useLink: typeof import('vue-router')['useLink']
const useRoute: typeof import('vue-router')['useRoute']; const useRoute: typeof import('vue-router')['useRoute']
const useRouter: typeof import('vue-router')['useRouter']; const useRouter: typeof import('vue-router')['useRouter']
const useSlots: typeof import('vue')['useSlots']; const useSlots: typeof import('vue')['useSlots']
const watch: typeof import('vue')['watch']; const watch: typeof import('vue')['watch']
const watchEffect: typeof import('vue')['watchEffect']; const watchEffect: typeof import('vue')['watchEffect']
const watchPostEffect: typeof import('vue')['watchPostEffect']; const watchPostEffect: typeof import('vue')['watchPostEffect']
const watchSyncEffect: typeof import('vue')['watchSyncEffect']; const watchSyncEffect: typeof import('vue')['watchSyncEffect']
} }

4
src/utils/request.ts
View File

@@ -14,7 +14,7 @@ export enum CommonHeaderEnum {
'ENC_FLAG' = 'Enc-Flag', 'ENC_FLAG' = 'Enc-Flag',
'AUTHORIZATION' = 'Authorization', 'AUTHORIZATION' = 'Authorization',
'VERSION' = 'VERSION', 'VERSION' = 'VERSION',
'ROLE_CODE' = 'ROLE_CODE', 'RCODE' = 'RCODE',
'RRID' = 'RRID', 'RRID' = 'RRID',
} }
@@ -56,7 +56,7 @@ service.interceptors.request.use(
//统一增加 当前角色CODE //统一增加 当前角色CODE
const roleCode = Session.getRoleCode(); const roleCode = Session.getRoleCode();
if (roleCode && !(config as any).skipRoleHeader) { if (roleCode && !(config as any).skipRoleHeader) {
config.headers![CommonHeaderEnum.ROLE_CODE] = roleCode; config.headers![CommonHeaderEnum.RCODE] = roleCode;
} }
const roleId = Session.getRoleId(); const roleId = Session.getRoleId();
if (roleId && !(config as any).skipRoleHeader) { if (roleId && !(config as any).skipRoleHeader) {