diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 7ac0233..a3baef3 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -94,6 +94,18 @@ }, }, { + path: ':type/:id?', + name: 'StandardReminderDetail', + component: () => import('@/views/business/board/standardReminder/detail.vue'), + meta: { + title: '装置到期提醒详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/standard/list', + }, + }, + { path: 'jobAccount', name: 'JobAccountList', component: () => import('@/views/business/board/jobAccount/list.vue'), diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 7ac0233..a3baef3 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -94,6 +94,18 @@ }, }, { + path: ':type/:id?', + name: 'StandardReminderDetail', + component: () => import('@/views/business/board/standardReminder/detail.vue'), + meta: { + title: '装置到期提醒详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/standard/list', + }, + }, + { path: 'jobAccount', name: 'JobAccountList', component: () => import('@/views/business/board/jobAccount/list.vue'), diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue index f846c51..288e209 100644 --- a/src/views/business/bench/bench.vue +++ b/src/views/business/bench/bench.vue @@ -214,14 +214,19 @@ router.push(buttonTypes.value[index].url) } } - +const benchDivHeight = ref() function calcBlockSize() { // 计算工作台区域高度 - 顶部-面包屑-边距 const bodyHeight = document.body.clientHeight - 60 - 50 - 20 blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300 blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3 console.log(blockHeight.value, blockWidth.value - 20) + benchDivHeight.value = blockHeight.value - 60 } + +onMounted(() => { + calcBlockSize() +}) diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 7ac0233..a3baef3 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -94,6 +94,18 @@ }, }, { + path: ':type/:id?', + name: 'StandardReminderDetail', + component: () => import('@/views/business/board/standardReminder/detail.vue'), + meta: { + title: '装置到期提醒详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/standard/list', + }, + }, + { path: 'jobAccount', name: 'JobAccountList', component: () => import('@/views/business/board/jobAccount/list.vue'), diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue index f846c51..288e209 100644 --- a/src/views/business/bench/bench.vue +++ b/src/views/business/bench/bench.vue @@ -214,14 +214,19 @@ router.push(buttonTypes.value[index].url) } } - +const benchDivHeight = ref() function calcBlockSize() { // 计算工作台区域高度 - 顶部-面包屑-边距 const bodyHeight = document.body.clientHeight - 60 - 50 - 20 blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300 blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3 console.log(blockHeight.value, blockWidth.value - 20) + benchDivHeight.value = blockHeight.value - 60 } + +onMounted(() => { + calcBlockSize() +}) diff --git a/src/views/business/board/standardReminder/detail.vue b/src/views/business/board/standardReminder/detail.vue new file mode 100644 index 0000000..498b0da --- /dev/null +++ b/src/views/business/board/standardReminder/detail.vue @@ -0,0 +1,674 @@ + + + + + + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 7ac0233..a3baef3 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -94,6 +94,18 @@ }, }, { + path: ':type/:id?', + name: 'StandardReminderDetail', + component: () => import('@/views/business/board/standardReminder/detail.vue'), + meta: { + title: '装置到期提醒详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/standard/list', + }, + }, + { path: 'jobAccount', name: 'JobAccountList', component: () => import('@/views/business/board/jobAccount/list.vue'), diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue index f846c51..288e209 100644 --- a/src/views/business/bench/bench.vue +++ b/src/views/business/bench/bench.vue @@ -214,14 +214,19 @@ router.push(buttonTypes.value[index].url) } } - +const benchDivHeight = ref() function calcBlockSize() { // 计算工作台区域高度 - 顶部-面包屑-边距 const bodyHeight = document.body.clientHeight - 60 - 50 - 20 blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300 blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3 console.log(blockHeight.value, blockWidth.value - 20) + benchDivHeight.value = blockHeight.value - 60 } + +onMounted(() => { + calcBlockSize() +}) diff --git a/src/views/business/board/standardReminder/detail.vue b/src/views/business/board/standardReminder/detail.vue new file mode 100644 index 0000000..498b0da --- /dev/null +++ b/src/views/business/board/standardReminder/detail.vue @@ -0,0 +1,674 @@ + + + + + + diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue index 5a329bc..478b032 100644 --- a/src/views/business/board/standardReminder/list.vue +++ b/src/views/business/board/standardReminder/list.vue @@ -1,11 +1,378 @@ - - diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 7ac0233..a3baef3 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -94,6 +94,18 @@ }, }, { + path: ':type/:id?', + name: 'StandardReminderDetail', + component: () => import('@/views/business/board/standardReminder/detail.vue'), + meta: { + title: '装置到期提醒详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/standard/list', + }, + }, + { path: 'jobAccount', name: 'JobAccountList', component: () => import('@/views/business/board/jobAccount/list.vue'), diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue index f846c51..288e209 100644 --- a/src/views/business/bench/bench.vue +++ b/src/views/business/bench/bench.vue @@ -214,14 +214,19 @@ router.push(buttonTypes.value[index].url) } } - +const benchDivHeight = ref() function calcBlockSize() { // 计算工作台区域高度 - 顶部-面包屑-边距 const bodyHeight = document.body.clientHeight - 60 - 50 - 20 blockHeight.value = bodyHeight > 610 ? (bodyHeight - 10) / 2 : 300 blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3 console.log(blockHeight.value, blockWidth.value - 20) + benchDivHeight.value = blockHeight.value - 60 } + +onMounted(() => { + calcBlockSize() +}) diff --git a/src/views/business/board/standardReminder/detail.vue b/src/views/business/board/standardReminder/detail.vue new file mode 100644 index 0000000..498b0da --- /dev/null +++ b/src/views/business/board/standardReminder/detail.vue @@ -0,0 +1,674 @@ + + + + + + diff --git a/src/views/business/board/standardReminder/list.vue b/src/views/business/board/standardReminder/list.vue index 5a329bc..478b032 100644 --- a/src/views/business/board/standardReminder/list.vue +++ b/src/views/business/board/standardReminder/list.vue @@ -1,11 +1,378 @@ - - diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue index 4344521..a030dcf 100644 --- a/src/views/device/standardEquipment/expirationRemind.vue +++ b/src/views/device/standardEquipment/expirationRemind.vue @@ -146,7 +146,7 @@ meterMajor: '', organizeName: '', organizeNo: '', - organizeType: '2', + organizeType: '3', // 3科室 pdeptId: null, offset: 1, limit: 999999,