diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 43171f4..5a4393d 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -182,6 +182,18 @@ }, }, { + path: 'measureData/batchEdit', + name: 'MeasureDataBatchEdit', + component: () => import('@/views/business/taskMeasure/measureData/batchEdit.vue'), + meta: { + title: '检定数据管理', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/taskMeasure/measureDataList', + }, + }, + { path: 'certificateList', name: 'CertificateList', component: () => import('@/views/business/taskMeasure/certificate/list.vue'), diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 43171f4..5a4393d 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -182,6 +182,18 @@ }, }, { + path: 'measureData/batchEdit', + name: 'MeasureDataBatchEdit', + component: () => import('@/views/business/taskMeasure/measureData/batchEdit.vue'), + meta: { + title: '检定数据管理', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/taskMeasure/measureDataList', + }, + }, + { path: 'certificateList', name: 'CertificateList', component: () => import('@/views/business/taskMeasure/certificate/list.vue'), diff --git a/src/utils/String.ts b/src/utils/String.ts index 3421359..4505c82 100644 --- a/src/utils/String.ts +++ b/src/utils/String.ts @@ -4,7 +4,7 @@ export const clearSymbol = (str: any) => { let string = '' // 替换字符串中的所有特殊字符(包含空格) - const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g + const Exp = /[\-\_\,\!\/\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g string = (!isNaN(str) && typeof str === 'number' ? String(str) : str ? String(str) : '').replace(Exp, '') return string } diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 43171f4..5a4393d 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -182,6 +182,18 @@ }, }, { + path: 'measureData/batchEdit', + name: 'MeasureDataBatchEdit', + component: () => import('@/views/business/taskMeasure/measureData/batchEdit.vue'), + meta: { + title: '检定数据管理', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/taskMeasure/measureDataList', + }, + }, + { path: 'certificateList', name: 'CertificateList', component: () => import('@/views/business/taskMeasure/certificate/list.vue'), diff --git a/src/utils/String.ts b/src/utils/String.ts index 3421359..4505c82 100644 --- a/src/utils/String.ts +++ b/src/utils/String.ts @@ -4,7 +4,7 @@ export const clearSymbol = (str: any) => { let string = '' // 替换字符串中的所有特殊字符(包含空格) - const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g + const Exp = /[\-\_\,\!\/\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g string = (!isNaN(str) && typeof str === 'number' ? String(str) : str ? String(str) : '').replace(Exp, '') return string } diff --git a/src/views/business/taskMeasure/measureData/batchEdit.vue b/src/views/business/taskMeasure/measureData/batchEdit.vue new file mode 100644 index 0000000..8dc7ee0 --- /dev/null +++ b/src/views/business/taskMeasure/measureData/batchEdit.vue @@ -0,0 +1,93 @@ + + + + + + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 43171f4..5a4393d 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -182,6 +182,18 @@ }, }, { + path: 'measureData/batchEdit', + name: 'MeasureDataBatchEdit', + component: () => import('@/views/business/taskMeasure/measureData/batchEdit.vue'), + meta: { + title: '检定数据管理', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/taskMeasure/measureDataList', + }, + }, + { path: 'certificateList', name: 'CertificateList', component: () => import('@/views/business/taskMeasure/certificate/list.vue'), diff --git a/src/utils/String.ts b/src/utils/String.ts index 3421359..4505c82 100644 --- a/src/utils/String.ts +++ b/src/utils/String.ts @@ -4,7 +4,7 @@ export const clearSymbol = (str: any) => { let string = '' // 替换字符串中的所有特殊字符(包含空格) - const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g + const Exp = /[\-\_\,\!\/\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g string = (!isNaN(str) && typeof str === 'number' ? String(str) : str ? String(str) : '').replace(Exp, '') return string } diff --git a/src/views/business/taskMeasure/measureData/batchEdit.vue b/src/views/business/taskMeasure/measureData/batchEdit.vue new file mode 100644 index 0000000..8dc7ee0 --- /dev/null +++ b/src/views/business/taskMeasure/measureData/batchEdit.vue @@ -0,0 +1,93 @@ + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue index 4797f2b..afff6a9 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue @@ -1,5 +1,4 @@ - + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue index 4797f2b..afff6a9 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue @@ -1,5 +1,4 @@ - + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue index 4797f2b..afff6a9 100644 --- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue @@ -1,5 +1,4 @@ -