diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index b81a255..43171f4 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -561,7 +561,7 @@ children: [ { path: 'measureItemList', - name: 'businessMeasureItemList', + name: 'BusinessMeasureItemList', component: () => import('@/views/business/measure/item/list.vue'), meta: { title: '检定项管理', diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index b81a255..43171f4 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -561,7 +561,7 @@ children: [ { path: 'measureItemList', - name: 'businessMeasureItemList', + name: 'BusinessMeasureItemList', component: () => import('@/views/business/measure/item/list.vue'), meta: { title: '检定项管理', diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts new file mode 100644 index 0000000..7a93249 --- /dev/null +++ b/src/utils/keepQuery.ts @@ -0,0 +1,16 @@ +// 保存页面查询等参数 +import useKeepAliveStore from '@/store/modules/keepAlive' + +const keepAliveStore = useKeepAliveStore() +// 操作 +const needKeep = ['edit', 'detail', 'add'] +export function keepSearchParams(to: any, componentName: string) { + if (needKeep.some((item: string) => to.includes(item))) { + console.log('|||||||||||||', needKeep.some((item: string) => to.includes(item))) + keepAliveStore.add(componentName) + console.log(keepAliveStore.list) + } + else { + keepAliveStore.remove(componentName) + } +} diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index b81a255..43171f4 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -561,7 +561,7 @@ children: [ { path: 'measureItemList', - name: 'businessMeasureItemList', + name: 'BusinessMeasureItemList', component: () => import('@/views/business/measure/item/list.vue'), meta: { title: '检定项管理', diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts new file mode 100644 index 0000000..7a93249 --- /dev/null +++ b/src/utils/keepQuery.ts @@ -0,0 +1,16 @@ +// 保存页面查询等参数 +import useKeepAliveStore from '@/store/modules/keepAlive' + +const keepAliveStore = useKeepAliveStore() +// 操作 +const needKeep = ['edit', 'detail', 'add'] +export function keepSearchParams(to: any, componentName: string) { + if (needKeep.some((item: string) => to.includes(item))) { + console.log('|||||||||||||', needKeep.some((item: string) => to.includes(item))) + keepAliveStore.add(componentName) + console.log(keepAliveStore.list) + } + else { + keepAliveStore.remove(componentName) + } +} diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue index 53b93f7..99b445b 100644 --- a/src/views/business/measure/item/components/fourth/templateDetail.vue +++ b/src/views/business/measure/item/components/fourth/templateDetail.vue @@ -51,7 +51,7 @@ accuracyLevel: 0, // 准确度等级 cycleNumber: 1, // 循环次数 - deviationAndSwitching: 1, // 设定点偏差及切换差 + deviationAndSwitching: 0, // 设定点偏差及切换差 displayValueOne: '', // 设定标准器示值1 displayValueThree: '', // 设定标准器示值3 displayValueTwo: '', // 设定标准器示值2 @@ -183,7 +183,7 @@ // ---------------------------------------------校验--------------------------------------------------- // 校验表格(点击保存的时候用、生成标准器示值) const checkList = () => { - if (form.value.deviationAndSwitching) { + if (form.value.deviationAndSwitching && props.itemCategoryName === '电接点一般压力表') { if (`${form.value.displayValueOne}` === '') { ElMessage.warning('设定标准器示值1不能为空') return false diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index b81a255..43171f4 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -561,7 +561,7 @@ children: [ { path: 'measureItemList', - name: 'businessMeasureItemList', + name: 'BusinessMeasureItemList', component: () => import('@/views/business/measure/item/list.vue'), meta: { title: '检定项管理', diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts new file mode 100644 index 0000000..7a93249 --- /dev/null +++ b/src/utils/keepQuery.ts @@ -0,0 +1,16 @@ +// 保存页面查询等参数 +import useKeepAliveStore from '@/store/modules/keepAlive' + +const keepAliveStore = useKeepAliveStore() +// 操作 +const needKeep = ['edit', 'detail', 'add'] +export function keepSearchParams(to: any, componentName: string) { + if (needKeep.some((item: string) => to.includes(item))) { + console.log('|||||||||||||', needKeep.some((item: string) => to.includes(item))) + keepAliveStore.add(componentName) + console.log(keepAliveStore.list) + } + else { + keepAliveStore.remove(componentName) + } +} diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue index 53b93f7..99b445b 100644 --- a/src/views/business/measure/item/components/fourth/templateDetail.vue +++ b/src/views/business/measure/item/components/fourth/templateDetail.vue @@ -51,7 +51,7 @@ accuracyLevel: 0, // 准确度等级 cycleNumber: 1, // 循环次数 - deviationAndSwitching: 1, // 设定点偏差及切换差 + deviationAndSwitching: 0, // 设定点偏差及切换差 displayValueOne: '', // 设定标准器示值1 displayValueThree: '', // 设定标准器示值3 displayValueTwo: '', // 设定标准器示值2 @@ -183,7 +183,7 @@ // ---------------------------------------------校验--------------------------------------------------- // 校验表格(点击保存的时候用、生成标准器示值) const checkList = () => { - if (form.value.deviationAndSwitching) { + if (form.value.deviationAndSwitching && props.itemCategoryName === '电接点一般压力表') { if (`${form.value.displayValueOne}` === '') { ElMessage.warning('设定标准器示值1不能为空') return false diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index cd48850..531371e 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -1,5 +1,5 @@ -