From b5e07e6e6400619ba85dc429c4342846b0654afd Mon Sep 17 00:00:00 2001 From: andy <1042025947@qq.com> Date: Mon, 10 Aug 2026 15:59:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 12 ++++++------ src/views/biz/errorNotification/index.vue | 4 ++-- src/views/biz/qualityTesting/index.vue | 14 +++++++------- vite.config.ts | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index d11005d..76f2ba3 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -216,12 +216,12 @@ const routes: RouteRecordRaw[] = [ meta: { title: '设备状态监控', icon: 'PulseOutline' } }, // 入库管理 - { - path: 'biz/stockIn', - name: 'BizStockIn', - component: () => import('@/views/biz/stockIn/index.vue'), - meta: { title: '入库管理', icon: 'ArchiveOutline' } - }, + // { + // path: 'biz/stockIn', + // name: 'BizStockIn', + // component: () => import('@/views/biz/stockIn/index.vue'), + // meta: { title: '入库管理', icon: 'ArchiveOutline' } + // }, // 甘特图排产 { path: 'biz/orderProject/gantt', diff --git a/src/views/biz/errorNotification/index.vue b/src/views/biz/errorNotification/index.vue index 0e0e07e..4b86e4a 100644 --- a/src/views/biz/errorNotification/index.vue +++ b/src/views/biz/errorNotification/index.vue @@ -348,7 +348,7 @@ const columns: DataTableColumns = [ minWidth:150, render(row) { const vals = Array.isArray(row.subscriptionDeviceIds) ? row.subscriptionDeviceIds : (row.subscriptionDeviceIds ? String(row.subscriptionDeviceIds).split(',') : []) - return vals.map(v => deviclist.value.find(o => String(o.value) === String(v))?.label ?? v).filter(Boolean).join(', ') || '-' + return vals.map(v => deviclist.value.find((o:any) => String(o.value) === String(v))?.label ?? v).filter(Boolean).join(', ') || '-' }, }, @@ -386,7 +386,7 @@ const columns: DataTableColumns = [ minWidth:150, render(row) { const vals = Array.isArray(row.notifier) ? row.notifier : (row.notifier ? String(row.notifier).split(',') : []) - return vals.map(v => userlist.value.find(o => String(o.value) === String(v))?.label ?? v).filter(Boolean).join(', ') || '-' + return vals.map(v => userlist.value.find((o:any) => String(o.value) === String(v))?.label ?? v).filter(Boolean).join(', ') || '-' }, }, { diff --git a/src/views/biz/qualityTesting/index.vue b/src/views/biz/qualityTesting/index.vue index 958fe58..0c353d5 100644 --- a/src/views/biz/qualityTesting/index.vue +++ b/src/views/biz/qualityTesting/index.vue @@ -32,7 +32,7 @@ -
+ = [ - { type: 'selection' }, + // { type: 'selection' }, { title: '质检编号', key: 'qcNo',align: 'center' }, { title: '来源类型', key: 'sourceType',align: 'center', render(row) { @@ -525,9 +525,9 @@ const columns: DataTableColumns = [ h(NButton, { size: 'small', quaternary: true, onClick: () => handleEdit(row) }, { default: () => [h(NIcon, null, { default: () => h(CreateOutline) }), ' 编辑'] }), - h(NButton, { size: 'small', quaternary: true, type: 'error', onClick: () => handleDelete(row) }, { - default: () => [h(NIcon, null, { default: () => h(TrashOutline) }), ' 删除'] - }), + // h(NButton, { size: 'small', quaternary: true, type: 'error', onClick: () => handleDelete(row) }, { + // default: () => [h(NIcon, null, { default: () => h(TrashOutline) }), ' 删除'] + // }), h(NDropdown, { trigger: 'click', // 点击展开 options: [ @@ -917,7 +917,7 @@ function queryResultDetail(row:any) { onMounted(() => { loadData() loadDictOptions() - loadAssignWorkOrder() + //loadAssignWorkOrder() }) diff --git a/vite.config.ts b/vite.config.ts index 8fd5400..a03ccac 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -16,7 +16,7 @@ export default defineConfig({ emptyOutDir: true }, server: { - host:'192.168.12.4', //true, + //host:'192.168.12.4', //true, port: 3000, proxy: { '/api': { @@ -24,8 +24,8 @@ export default defineConfig({ // target:'http://192.168.12.4:8888/', //target:'http://192.168.12.230:8888', //target:'http://192.168.5.230:8888', - //target:'http://192.168.5.232:8888/', - target:'http://localhost:8888', + target:'http://192.168.5.232:8888/', + //target:'http://localhost:8888', changeOrigin: true }, '/druid': {