diff --git a/frontend/.env.development b/frontend/.env.development index 282bdb3..71db1d7 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.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/api/plan/plan.ts b/frontend/src/api/plan/plan.ts index 744b89b..70c7215 100644 --- a/frontend/src/api/plan/plan.ts +++ b/frontend/src/api/plan/plan.ts @@ -1,8 +1,5 @@ -import type { ResPage } from '@/api/interface' import type { Plan } from './interface' import http from '@/api' -import type { TestSource } from '../device/interface/testSource' -import type { TestScript } from '../device/interface/testScript' import type { ErrorSystem } from '../device/interface/error' import type { Device } from '../device/interface/device' diff --git a/frontend/src/layouts/components/Main/index.scss b/frontend/src/layouts/components/Main/index.scss index 06aeabe..34be28d 100644 --- a/frontend/src/layouts/components/Main/index.scss +++ b/frontend/src/layouts/components/Main/index.scss @@ -1,7 +1,7 @@ .el-main { box-sizing: border-box; - padding: 20px;//主体padding - overflow-x: hidden; + padding: 15px;//主体padding + overflow: hidden; background-color: var(--el-bg-color-page); } .el-footer { diff --git a/frontend/src/views/demo/proTable/doubleColumn.vue b/frontend/src/views/demo/proTable/doubleColumn.vue deleted file mode 100644 index 53eaeea..0000000 --- a/frontend/src/views/demo/proTable/doubleColumn.vue +++ /dev/null @@ -1,80 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/views/demo/proTable/index.vue b/frontend/src/views/demo/proTable/index.vue deleted file mode 100644 index 62baa9e..0000000 --- a/frontend/src/views/demo/proTable/index.vue +++ /dev/null @@ -1,200 +0,0 @@ - - \ No newline at end of file diff --git a/frontend/src/views/demo/proTable/open.vue b/frontend/src/views/demo/proTable/open.vue deleted file mode 100644 index f32e1d2..0000000 --- a/frontend/src/views/demo/proTable/open.vue +++ /dev/null @@ -1,177 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/views/demo/proTable/singleColumn.vue b/frontend/src/views/demo/proTable/singleColumn.vue deleted file mode 100644 index 1caf8eb..0000000 --- a/frontend/src/views/demo/proTable/singleColumn.vue +++ /dev/null @@ -1,169 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index 9f00552..def36ce 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -599,7 +599,7 @@ const sortTable = ({ //顶部功能切换时修改activeTabs const changeActiveTabs = (val: number,val2: number,tabledata:any[]) => { - + form.value.activeTabs = val; form.value.activeChildTabs= val2; deviceData.value = tabledata; @@ -989,4 +989,7 @@ defineExpose({ changeActiveTabs }); } } } +:deep(.card){ + border: 0 !important; +}