From 178badf4f530e35d8b5d793124dd2b2a8a8b4393 Mon Sep 17 00:00:00 2001 From: huangchenhao <123673748@qq.com> Date: Fri, 31 Oct 2025 16:16:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=85=BB=E6=8A=A4=E7=AB=99=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + .../screen/src/component/MyDialog/index.js | 3 + .../screen/src/component/MyDialog/index.vue | 39 ++ packages/screen/src/utils/request.js | 17 +- .../views/ServiceStationManagePage/index.vue | 609 ++++++++++++++---- packages/screen/vite.config.js | 2 +- pnpm-lock.yaml | 3 + 7 files changed, 528 insertions(+), 146 deletions(-) create mode 100644 packages/screen/src/component/MyDialog/index.js create mode 100644 packages/screen/src/component/MyDialog/index.vue diff --git a/package.json b/package.json index 5b483e5..49bb6b1 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "pnpm": ">=8.0.0" }, "dependencies": { + "@element-plus/icons-vue": "^2.3.2", "@vueuse/core": "^14.0.0", "dayjs": "^1.11.18", "element-plus": "^2.11.5", diff --git a/packages/screen/src/component/MyDialog/index.js b/packages/screen/src/component/MyDialog/index.js new file mode 100644 index 0000000..21b7066 --- /dev/null +++ b/packages/screen/src/component/MyDialog/index.js @@ -0,0 +1,3 @@ +import MyDialog from './index.vue' + +export default MyDialog \ No newline at end of file diff --git a/packages/screen/src/component/MyDialog/index.vue b/packages/screen/src/component/MyDialog/index.vue new file mode 100644 index 0000000..19d1694 --- /dev/null +++ b/packages/screen/src/component/MyDialog/index.vue @@ -0,0 +1,39 @@ + + + + + \ No newline at end of file diff --git a/packages/screen/src/utils/request.js b/packages/screen/src/utils/request.js index 752dd6b..e86157d 100644 --- a/packages/screen/src/utils/request.js +++ b/packages/screen/src/utils/request.js @@ -6,11 +6,16 @@ const service = axios.create({ }) export async function request(config) { - const res = await service(config) - if (res === null || res === undefined) { - return res - } - if (Object.prototype.hasOwnProperty.call(res, 'data')) { - return res.data + try { + const res = await service(config) + if (res === null || res === undefined) { + return res + } + if (Object.prototype.hasOwnProperty.call(res, 'data')) { + return res.data + } + } catch (error) { + console.log(error) + return null } } \ No newline at end of file diff --git a/packages/screen/src/views/ServiceStationManagePage/index.vue b/packages/screen/src/views/ServiceStationManagePage/index.vue index 905cac9..4b42748 100644 --- a/packages/screen/src/views/ServiceStationManagePage/index.vue +++ b/packages/screen/src/views/ServiceStationManagePage/index.vue @@ -1,187 +1,511 @@ \ No newline at end of file diff --git a/packages/screen/vite.config.js b/packages/screen/vite.config.js index 7d9ec29..9a941cd 100644 --- a/packages/screen/vite.config.js +++ b/packages/screen/vite.config.js @@ -27,7 +27,7 @@ export default defineConfig({ cors: true, proxy: { '/api': { - target: '', + target: 'http://8.137.54.85:8661/', changeOrigin: true, }, } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 982685d..52f1797 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,9 @@ importers: .: dependencies: + '@element-plus/icons-vue': + specifier: ^2.3.2 + version: 2.3.2(vue@3.5.22) '@vueuse/core': specifier: ^14.0.0 version: 14.0.0(vue@3.5.22) From 3b001972e56743379bcaadbb4de1c5c77eae852f Mon Sep 17 00:00:00 2001 From: huangchenhao <123673748@qq.com> Date: Fri, 31 Oct 2025 16:19:05 +0800 Subject: [PATCH 2/4] + --- package.json | 1 + pnpm-lock.yaml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/package.json b/package.json index 49bb6b1..82b43b0 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ }, "devDependencies": { "@vant/auto-import-resolver": "^1.3.0", + "less": "^4.4.2", "unplugin-auto-import": "^0.17.0", "unplugin-vue-components": "^0.26.0" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9ed5a35..7d73edb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,6 +27,9 @@ importers: '@vant/auto-import-resolver': specifier: ^1.3.0 version: 1.3.0 + less: + specifier: ^4.4.2 + version: 4.4.2 unplugin-auto-import: specifier: ^0.17.0 version: 0.17.8(@vueuse/core@14.0.0(vue@3.5.22))(rollup@4.52.4) From a1698ed6435b9b78b19b8de11db468313af292e0 Mon Sep 17 00:00:00 2001 From: huangchenhao <123673748@qq.com> Date: Fri, 31 Oct 2025 16:26:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/src/views/ServiceStationManagePage/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/screen/src/views/ServiceStationManagePage/index.vue b/packages/screen/src/views/ServiceStationManagePage/index.vue index 4b42748..a1708a3 100644 --- a/packages/screen/src/views/ServiceStationManagePage/index.vue +++ b/packages/screen/src/views/ServiceStationManagePage/index.vue @@ -2,10 +2,10 @@
@@ -330,7 +330,7 @@ const handleAddConfirm = async () => { // 搜索条件 const params = reactive({ - qxmc: "", + mc: "", zdlx: "", }); From b52dabbf4070929cd34ca2b5f8417a38dd9952ae Mon Sep 17 00:00:00 2001 From: huangchenhao <123673748@qq.com> Date: Fri, 31 Oct 2025 16:27:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=BAyhz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/screen/src/router/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/screen/src/router/index.js b/packages/screen/src/router/index.js index 91459f3..315585e 100644 --- a/packages/screen/src/router/index.js +++ b/packages/screen/src/router/index.js @@ -13,8 +13,8 @@ const routes = [ component: () => import('../views/cockpit/index.vue') }, { - path: '/test', - name: 'test', + path: '/yhz', + name: 'yhz', component: () => import('../views/ServiceStationManagePage/index.vue') } ]