From 69de6dd7a3fba9c83970df0c80099a336f1c6fa8 Mon Sep 17 00:00:00 2001 From: sjl <1716605279@qq.com> Date: Tue, 14 Jan 2025 10:03:44 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/.env.development | 2 +- frontend/src/views/machine/device/index.vue | 9 +++++---- frontend/src/views/machine/testScript/index.vue | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/frontend/.env.development b/frontend/.env.development index f2c6db3..8f13788 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -19,6 +19,6 @@ VITE_API_URL=/api # 开发环境跨域代理，支持配置多个 -VITE_PROXY=[["/api","http://192.168.1.125:18092/"]] +VITE_PROXY=[["/api","http://192.168.1.124:18092/"]] #VITE_PROXY=[["/api","http://192.168.1.125:18092/"]] # VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文 diff --git a/frontend/src/views/machine/device/index.vue b/frontend/src/views/machine/device/index.vue index d24281e..688756e 100644 --- a/frontend/src/views/machine/device/index.vue +++ b/frontend/src/views/machine/device/index.vue @@ -73,10 +73,11 @@ const columns = reactive[]>([ { prop: 'name', label: '名称', - isShow: appSceneStore.currentScene != '1', - ...(appSceneStore.currentScene != '1' ? { - search: { el: 'input' }, - } : {}), + search: { el: 'input' }, + // isShow: appSceneStore.currentScene != '1', + // ...(appSceneStore.currentScene != '1' ? { + // search: { el: 'input' }, + // } : {}), minWidth: 200, }, { diff --git a/frontend/src/views/machine/testScript/index.vue b/frontend/src/views/machine/testScript/index.vue index a75d8f4..55d35dc 100644 --- a/frontend/src/views/machine/testScript/index.vue +++ b/frontend/src/views/machine/testScript/index.vue @@ -44,6 +44,9 @@ import ValueTypePopup from './components/valueTypePopup.vue' } from '@/api/device/testScript/index' import { computed, reactive, ref } from 'vue' import { useModeStore } from '@/stores/modules/mode'; // 引入模式 store +// defineOptions({ +// name: 'machine/testScript' +// }) const comparisonPopup = ref() const testScriptPopup = ref() const valueTypePopup = ref() From 171533cef0aa227139ec43ec9af593b6f6488b2c Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 14 Jan 2025 10:36:42 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=98=E5=85=88?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataCheckSingleChannelSingleTestPopup.vue | 2 +- frontend/src/views/home/components/test.vue | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue index 0f4b154..89429e2 100644 --- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue +++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue @@ -206,8 +206,8 @@ watch(() => formContent.chnNum, async (newVal, oldVal) => { scriptType, code: parseInt(checkStore.planCode) }) - updateTreeFly(resTreeDataTemp, 2) updateTreeFly(resTreeDataTemp, 4) + updateTreeFly(resTreeDataTemp, 2) Object.assign(treeDataAll, resTreeDataTemp) diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index 6b7d3bb..94f30f4 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -247,12 +247,12 @@ const checkResultView: ComputedRef = computed(() } } else { let tempChnResult: CheckData.ChnCheckResultEnum = device.chnResult[0] - if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.FAIL)) { - tempChnResult = CheckData.ChnCheckResultEnum.FAIL - } if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.ERRORDATA)) { tempChnResult = CheckData.ChnCheckResultEnum.ERRORDATA } + if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.FAIL)) { + tempChnResult = CheckData.ChnCheckResultEnum.FAIL + } if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.TIMEOUT)) { tempChnResult = CheckData.ChnCheckResultEnum.TIMEOUT } @@ -832,6 +832,9 @@ const setErrorCheckItem = (scriptType: string, devices: CheckData.DeviceCheckRes tempChnResult.push(...devices[i].chnResult) } + if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) { + type = CheckData.ChnCheckResultEnum.ERRORDATA + } if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.FAIL)) { type = CheckData.ChnCheckResultEnum.FAIL } @@ -846,9 +849,6 @@ const setErrorCheckItem = (scriptType: string, devices: CheckData.DeviceCheckRes } } } - if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) { - type = CheckData.ChnCheckResultEnum.ERRORDATA - } errorCheckItem.push({scriptType, type: type}) } From 26cda335c597146d0933315cac67d8a0fb6fd601 Mon Sep 17 00:00:00 2001 From: sjl <1716605279@qq.com> Date: Tue, 14 Jan 2025 11:43:35 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/.env.development | 2 +- frontend/src/routers/index.ts | 2 +- frontend/src/routers/modules/dynamicRouter.ts | 1 + .../views/home/components/channelsTest.vue | 20 +++++++---- .../home/components/channelsTestTable.vue | 36 +++++++++---------- frontend/src/views/home/components/table.vue | 2 +- frontend/src/views/home/tabs/dashboard.vue | 2 +- .../machine/device/components/devicePopup.vue | 8 +++-- .../src/views/machine/testScript/index.vue | 8 +++-- 9 files changed, 46 insertions(+), 35 deletions(-) diff --git a/frontend/.env.development b/frontend/.env.development index 8f13788..01e3f04 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -19,6 +19,6 @@ VITE_API_URL=/api # 开发环境跨域代理，支持配置多个 -VITE_PROXY=[["/api","http://192.168.1.124:18092/"]] +VITE_PROXY=[["/api","http://192.168.1.121:18092/"]] #VITE_PROXY=[["/api","http://192.168.1.125:18092/"]] # VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文 diff --git a/frontend/src/routers/index.ts b/frontend/src/routers/index.ts index 3d11a40..fbd5f6e 100644 --- a/frontend/src/routers/index.ts +++ b/frontend/src/routers/index.ts @@ -46,7 +46,7 @@ router.beforeEach(async (to, from, next) => { const authStore = useAuthStore() // 1.NProgress 开始 NProgress.start() - + console.log('11111111111111'); // 2.动态设置标题 const title = import.meta.env.VITE_GLOB_APP_TITLE document.title = to.meta.title ? `${to.meta.title} - ${title}` : title diff --git a/frontend/src/routers/modules/dynamicRouter.ts b/frontend/src/routers/modules/dynamicRouter.ts index eaf517e..b0025de 100644 --- a/frontend/src/routers/modules/dynamicRouter.ts +++ b/frontend/src/routers/modules/dynamicRouter.ts @@ -36,6 +36,7 @@ export const initDynamicRouter = async () => { // 3.添加动态路由 authStore.flatMenuListGet.forEach(item => { item.children && delete item.children; + if (item.component && typeof item.component == "string") { item.component = modules["/src/views" + item.component + ".vue"]; } diff --git a/frontend/src/views/home/components/channelsTest.vue b/frontend/src/views/home/components/channelsTest.vue index 802a4fa..f3e6c73 100644 --- a/frontend/src/views/home/components/channelsTest.vue +++ b/frontend/src/views/home/components/channelsTest.vue @@ -1,5 +1,5 @@