Browse Source

局部优化

release/version1.0
zhangjiming 4 months ago
parent
commit
3471d9d230
  1. 2
      src/router/router.ts
  2. 26
      src/store/modules/consumables.ts
  3. 3
      src/websocket/socket.ts

2
src/router/router.ts

@ -98,7 +98,7 @@ function getCurrentUser() {
}
// 路由守卫,检查本地 Token 是否存在
// 在 router/index.ts 中添加全局路由守卫
// @ts-igmore
// @ts-ignore
router.beforeEach((to, from, next) => {
console.log('路由守卫--from--', to, from)
const token = sessionStorage.getItem('token')

26
src/store/modules/consumables.ts

@ -106,24 +106,14 @@ export const useConsumablesStore = defineStore(
}
const projectsAvailable = computed(() => {
const group = R.groupBy(
//@ts-ignore
R.prop('projName'),
consumableData.value.reactionPlateGroup,
)
const pNames = R.keys(group).filter((n) => n !== 'null')
const projArr = pNames.map((n) =>
R.reduce(
(acc, curr) => {
return { ...curr, num: acc.num + (curr.num || 0) }
},
{ num: 0 },
group[n] as ReactionPlateGroup[],
),
)
return projArr as ReactionPlateGroup[]
return R.pipe(
R.filter<ReactionPlateGroup>(g => !!g.projName && g.projName !== 'null'),
R.groupBy<ReactionPlateGroup>(g => g.projName!),
R.values,
(groupArr) => R.map(R.reduce<ReactionPlateGroup, ReactionPlateGroup>((acc, curr) => {
return { ...curr, num: (acc.num || 0) + (curr.num || 0) }
}, {}), groupArr as ReactionPlateGroup[][])
)(consumableData.value.reactionPlateGroup)
})
const tipCount = computed(() => {

3
src/websocket/socket.ts

@ -312,7 +312,7 @@ interface IncubationPlateStateMessage extends BaseMessage {
}
// ��材组信息基础接口
interface ConsumableGroupBase {
export interface ConsumableGroupBase {
projId: number
projName: string
projShortName: string
@ -526,7 +526,6 @@ export type {
ProjectInfo,
AppEventMessage,
ConsumablesStateMessage,
ConsumableGroupBase,
LittleBottleGroup,
LargeBottleGroup,
TipInfo,

Loading…
Cancel
Save