diff --git a/node_modules/.vue-global-types/vue_2.6_0.d.ts b/node_modules/.vue-global-types/vue_2.6_0.d.ts index e57e50d..56ad6ef 100644 --- a/node_modules/.vue-global-types/vue_2.6_0.d.ts +++ b/node_modules/.vue-global-types/vue_2.6_0.d.ts @@ -6,6 +6,8 @@ export {}; export interface GlobalDirectives { } } ; declare global { + var __VLS_PROPS_FALLBACK: Record; + const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any }; const __VLS_unref: typeof import('vue').unref; const __VLS_placeholder: any; @@ -39,7 +41,7 @@ export {}; attrs?: any; slots?: T extends { $slots: infer Slots } ? Slots : Record; emit?: T extends { $emit: infer Emit } ? Emit : {}; - props?: (T extends { $props: infer Props } ? Props : {}) & Record; + props?: typeof props; expose?: (exposed: T) => void; }; }; diff --git a/node_modules/.vue-global-types/vue_99_0.d.ts b/node_modules/.vue-global-types/vue_99_0.d.ts new file mode 100644 index 0000000..96b3bd3 --- /dev/null +++ b/node_modules/.vue-global-types/vue_99_0.d.ts @@ -0,0 +1,138 @@ +// @ts-nocheck +export {}; + +; declare global { + var __VLS_PROPS_FALLBACK: Record; + + const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any }; + const __VLS_unref: typeof import('vue').unref; + const __VLS_placeholder: any; + const __VLS_intrinsics: import('vue/jsx-runtime').JSX.IntrinsicElements; + + type __VLS_Elements = __VLS_SpreadMerge; + type __VLS_GlobalComponents = import('vue').GlobalComponents; + type __VLS_GlobalDirectives = import('vue').GlobalDirectives; + type __VLS_IsAny = 0 extends 1 & T ? true : false; + type __VLS_PickNotAny = __VLS_IsAny extends true ? B : A; + type __VLS_SpreadMerge = Omit & B; + type __VLS_WithComponent = + N1 extends keyof LocalComponents ? { [K in N0]: LocalComponents[N1] } : + N2 extends keyof LocalComponents ? { [K in N0]: LocalComponents[N2] } : + N3 extends keyof LocalComponents ? { [K in N0]: LocalComponents[N3] } : + Self extends object ? { [K in N0]: Self } : + N1 extends keyof __VLS_GlobalComponents ? { [K in N0]: __VLS_GlobalComponents[N1] } : + N2 extends keyof __VLS_GlobalComponents ? { [K in N0]: __VLS_GlobalComponents[N2] } : + N3 extends keyof __VLS_GlobalComponents ? { [K in N0]: __VLS_GlobalComponents[N3] } : + {}; + type __VLS_FunctionalComponentCtx = __VLS_PickNotAny<'__ctx' extends keyof __VLS_PickNotAny + ? K extends { __ctx?: infer Ctx } ? NonNullable : never : any + , T extends (props: any, ctx: infer Ctx) => any ? Ctx : any + >; + type __VLS_FunctionalComponentProps = '__ctx' extends keyof __VLS_PickNotAny + ? K extends { __ctx?: { props?: infer P } } ? NonNullable

: never + : T extends (props: infer P, ...args: any) => any ? P + : {}; + type __VLS_FunctionalComponent = (props: (T extends { $props: infer Props } ? Props : {}) & Record, ctx?: any) => import('vue/jsx-runtime').JSX.Element & { + __ctx?: { + attrs?: any; + slots?: T extends { $slots: infer Slots } ? Slots : Record; + emit?: T extends { $emit: infer Emit } ? Emit : {}; + props?: typeof props; + expose?: (exposed: T) => void; + }; + }; + type __VLS_IsFunction = K extends keyof T + ? __VLS_IsAny extends false + ? unknown extends T[K] + ? false + : true + : false + : false; + type __VLS_NormalizeComponentEvent< + Props, + Emits, + onEvent extends keyof Props, + Event extends keyof Emits, + CamelizedEvent extends keyof Emits, + > = __VLS_IsFunction extends true + ? Props + : __VLS_IsFunction extends true + ? { [K in onEvent]?: Emits[Event] } + : __VLS_IsFunction extends true + ? { [K in onEvent]?: Emits[CamelizedEvent] } + : Props; + // fix https://github.com/vuejs/language-tools/issues/926 + type __VLS_UnionToIntersection = (U extends unknown ? (arg: U) => unknown : never) extends ((arg: infer P) => unknown) ? P : never; + type __VLS_OverloadUnionInner = U & T extends (...args: infer A) => infer R + ? U extends T + ? never + : __VLS_OverloadUnionInner & U & ((...args: A) => R)> | ((...args: A) => R) + : never; + type __VLS_OverloadUnion = Exclude< + __VLS_OverloadUnionInner<(() => never) & T>, + T extends () => never ? never : () => never + >; + type __VLS_ConstructorOverloads = __VLS_OverloadUnion extends infer F + ? F extends (event: infer E, ...args: infer A) => any + ? { [K in E & string]: (...args: A) => void; } + : never + : never; + type __VLS_NormalizeEmits = __VLS_PrettifyGlobal< + __VLS_UnionToIntersection< + __VLS_ConstructorOverloads & { + [K in keyof T]: T[K] extends any[] ? { (...args: T[K]): void } : never + } + > + >; + type __VLS_EmitsToProps = __VLS_PrettifyGlobal<{ + [K in string & keyof T as `on${Capitalize}`]?: + (...args: T[K] extends (...args: infer P) => any ? P : T[K] extends null ? any[] : never) => any; + }>; + type __VLS_ResolveEmits< + Comp, + Emits, + TypeEmits = Comp extends { __typeEmits?: infer T } ? unknown extends T ? {} : import('vue').ShortEmitsToObject : {}, + NormalizedEmits = __VLS_NormalizeEmits extends infer E ? string extends keyof E ? {} : E : never, + > = __VLS_SpreadMerge; + type __VLS_ResolveDirectives = { + [K in keyof T & string as `v${Capitalize}`]: T[K]; + }; + type __VLS_PrettifyGlobal = { [K in keyof T as K]: T[K]; } & {}; + type __VLS_WithDefaultsGlobal = { + [K in keyof P as K extends keyof D ? K : never]-?: P[K]; + } & { + [K in keyof P as K extends keyof D ? never : K]: P[K]; + }; + type __VLS_UseTemplateRef = Readonly>; + type __VLS_ProxyRefs = import('vue').ShallowUnwrapRef; + + function __VLS_getVForSourceType>(source: T): [ + item: T extends number ? number + : T extends string ? string + : T extends any[] ? T[number] + : T extends Iterable ? T1 + : any, + index: number, + ][]; + function __VLS_getVForSourceType(source: T): [ + item: T[keyof T], + key: keyof T, + index: number, + ][]; + function __VLS_getSlotParameters(slot: S, decl?: D): + D extends (...args: infer P) => any ? P : any[]; + function __VLS_asFunctionalDirective(dir: T): T extends import('vue').ObjectDirective + ? NonNullable + : T extends (...args: any) => any + ? T + : (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void; + function __VLS_asFunctionalComponent any ? InstanceType : unknown>(t: T, instance?: K): + T extends new (...args: any) => any ? __VLS_FunctionalComponent + : T extends () => any ? (props: {}, ctx?: any) => ReturnType + : T extends (...args: any) => any ? T + : __VLS_FunctionalComponent<{}>; + function __VLS_functionalComponentArgsRest any>(t: T): 2 extends Parameters['length'] ? [any] : []; + function __VLS_asFunctionalElement(tag: T, endTag?: T): (attrs: T & Record) => void; + function __VLS_asFunctionalSlot(slot: S): S extends () => infer R ? (props: {}) => R : NonNullable; + function __VLS_tryAsConstant(t: T): T; +} diff --git a/pages/analysis/index/index.vue b/pages/analysis/index/index.vue index b7847e6..8e6e9e4 100644 --- a/pages/analysis/index/index.vue +++ b/pages/analysis/index/index.vue @@ -33,17 +33,17 @@ const popupShow = ref(false) const menuItemList = ref([ { url: '/pages/analysis/sample/sample-work-list', - otherConf: { icon: '/static/images/menus/样品分析.png' }, + otherConf: { icon: '/static/images/menus/ypfx.png' }, name: '样品分析' }, { url: '/pages/analysis/sample/sample-report-search', - otherConf: { icon: '/static/images/menus/记录.png' }, + otherConf: { icon: '/static/images/menus/records.png' }, name: '分析记录' }, { url: '/pages/analysis/auncel/auncel-status', - otherConf: { icon: '/static/images/menus/天平查看.png' }, + otherConf: { icon: '/static/images/menus/tpck.png' }, name: '天平查看' } ]) diff --git a/pages/index/index.vue b/pages/index/index.vue index 7a18308..6fa3e54 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -14,8 +14,8 @@ import nx from '@/nx' import { useGridCol } from '@/nx/hooks/useGridCol' let list = reactive([ // { url: '/pages/lims/index/index', name: '设备管理', icon: '设备管理' }, - { url: '/pages/analysis/index/index', name: '分析管理', icon: '分析管理' }, - { url: '/pages/sampleWarehouse/index/index', name: '样品库管理', icon: '样品库管理' } + { url: '/pages/analysis/index/index', name: '分析管理', icon: 'fxgl' }, + { url: '/pages/sampleWarehouse/index/index', name: '样品库管理', icon: 'ypkgl' } ]) // const sysMenus = computed(() => nx.$store('user').sysMenus) diff --git a/pages/sampleWarehouse/index/index.vue b/pages/sampleWarehouse/index/index.vue index df4f8e9..c44fd8a 100644 --- a/pages/sampleWarehouse/index/index.vue +++ b/pages/sampleWarehouse/index/index.vue @@ -34,37 +34,37 @@ const popupShow = ref(false) const menuItemList = ref([ { url: '/pages/sampleWarehouse/sampleSearch/index', - otherConf: { icon: '/static/images/menus/记录.png' }, + otherConf: { icon: '/static/images/menus/records.png' }, name: '样品查询' }, { url: '/pages/sampleWarehouse/returnToStock/index', - otherConf: { icon: '/static/images/menus/样品归库.png' }, + otherConf: { icon: '/static/images/menus/ypgk.png' }, name: '样品归库' }, { url: '/pages/sampleWarehouse/execChangeLocation/index', - otherConf: { icon: '/static/images/menus/库位变更.png' }, + otherConf: { icon: '/static/images/menus/kwbg.png' }, name: '库位变更' }, { url: '/pages/sampleWarehouse/sampleDispatchInternal/index', - otherConf: { icon: '/static/images/menus/内部调拨.png' }, + otherConf: { icon: '/static/images/menus/nbdb.png' }, name: '内部调拨' }, { url: '/pages/sampleWarehouse/sampleDispatchExternal/index', - otherConf: { icon: '/static/images/menus/外部调拨.png' }, + otherConf: { icon: '/static/images/menus/wbdb.png' }, name: '外部调拨' }, { url: '/pages/sampleWarehouse/dispatchGiveBack/index', - otherConf: { icon: '/static/images/menus/调拨归还.png' }, + otherConf: { icon: '/static/images/menus/dbgh.png' }, name: '调拨归还' }, { url: '/pages/sampleWarehouse/sampleTakeOff/index', - otherConf: { icon: '/static/images/menus/样品下架.png' }, + otherConf: { icon: '/static/images/menus/ypxj.png' }, name: '样品下架' } ]) diff --git a/static/images/menus/调拨归还.png b/static/images/menus/dbgh.png similarity index 100% rename from static/images/menus/调拨归还.png rename to static/images/menus/dbgh.png diff --git a/static/images/menus/分析管理.png b/static/images/menus/fxgl.png similarity index 100% rename from static/images/menus/分析管理.png rename to static/images/menus/fxgl.png diff --git a/static/images/menus/库位变更.png b/static/images/menus/kwbg.png similarity index 100% rename from static/images/menus/库位变更.png rename to static/images/menus/kwbg.png diff --git a/static/images/menus/内部调拨.png b/static/images/menus/nbdb.png similarity index 100% rename from static/images/menus/内部调拨.png rename to static/images/menus/nbdb.png diff --git a/static/images/menus/记录.png b/static/images/menus/records.png similarity index 100% rename from static/images/menus/记录.png rename to static/images/menus/records.png diff --git a/static/images/menus/天平查看.png b/static/images/menus/tpck.png similarity index 100% rename from static/images/menus/天平查看.png rename to static/images/menus/tpck.png diff --git a/static/images/menus/设备管理.png b/static/images/menus/tpgl.png similarity index 100% rename from static/images/menus/设备管理.png rename to static/images/menus/tpgl.png diff --git a/static/images/menus/外部调拨.png b/static/images/menus/wbdb.png similarity index 100% rename from static/images/menus/外部调拨.png rename to static/images/menus/wbdb.png diff --git a/static/images/menus/样品分析.png b/static/images/menus/ypfx.png similarity index 100% rename from static/images/menus/样品分析.png rename to static/images/menus/ypfx.png diff --git a/static/images/menus/样品归库.png b/static/images/menus/ypgk.png similarity index 100% rename from static/images/menus/样品归库.png rename to static/images/menus/ypgk.png diff --git a/static/images/menus/样品库管理.png b/static/images/menus/ypkgl.png similarity index 100% rename from static/images/menus/样品库管理.png rename to static/images/menus/ypkgl.png diff --git a/static/images/menus/样品下架.png b/static/images/menus/ypxj.png similarity index 100% rename from static/images/menus/样品下架.png rename to static/images/menus/ypxj.png