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] =?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()