From 4372760eb6352a34d36793afde90e56f54561343 Mon Sep 17 00:00:00 2001 From: huangchenhao <123673748@qq.com> Date: Thu, 13 Nov 2025 18:07:17 +0800 Subject: [PATCH 01/12] + --- packages/mobile/src/views/Material/MaterialManagement.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mobile/src/views/Material/MaterialManagement.vue b/packages/mobile/src/views/Material/MaterialManagement.vue index d8d4f87..1a71dc5 100644 --- a/packages/mobile/src/views/Material/MaterialManagement.vue +++ b/packages/mobile/src/views/Material/MaterialManagement.vue @@ -48,7 +48,7 @@ @close="onPopupClose" > -

设备信息

+

添加物资

Date: Thu, 13 Nov 2025 19:57:18 +0800 Subject: [PATCH 02/12] build(deps): update pnpm-lock.yaml --- pnpm-lock.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 524157a..45885ea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -113,8 +113,8 @@ importers: specifier: ^7.2.0 version: 7.2.2(@types/node@24.10.0)(less@4.4.2)(sass@1.93.3) vite-plugin-cesium: - specifier: ^1.2.23 - version: 1.2.23(cesium@1.135.0)(rollup@4.53.1)(vite@7.2.2(@types/node@24.10.0)(less@4.4.2)(sass@1.93.3)) + specifier: 1.2.22 + version: 1.2.22(cesium@1.135.0)(rollup@4.53.1)(vite@7.2.2(@types/node@24.10.0)(less@4.4.2)(sass@1.93.3)) vite-plugin-svg-icons: specifier: ^2.0.1 version: 2.0.1(vite@7.2.2(@types/node@24.10.0)(less@4.4.2)(sass@1.93.3)) @@ -2262,8 +2262,8 @@ packages: resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} engines: {node: '>= 0.8'} - vite-plugin-cesium@1.2.23: - resolution: {integrity: sha512-x9A8ZCEoegceXg/E+LnxKr0XBsI9CR4cgYWQ2Dd3cUEYwKcTnHQ3kBfpol7BUcGtgQnQos/mtVrRmuVQBXFjHw==} + vite-plugin-cesium@1.2.22: + resolution: {integrity: sha512-OnS+VKNGck4kUu4/67Fdfhz0/zF9mDVNUp9hUWtX19C38O0mJsJy2MH1ev2QcrVLf6VieJ7vCGxkLchdB1n1HQ==} peerDependencies: cesium: ^1.95.0 vite: '>=2.7.1' @@ -4691,7 +4691,7 @@ snapshots: vary@1.1.2: {} - vite-plugin-cesium@1.2.23(cesium@1.135.0)(rollup@4.53.1)(vite@7.2.2(@types/node@24.10.0)(less@4.4.2)(sass@1.93.3)): + vite-plugin-cesium@1.2.22(cesium@1.135.0)(rollup@4.53.1)(vite@7.2.2(@types/node@24.10.0)(less@4.4.2)(sass@1.93.3)): dependencies: cesium: 1.135.0 fs-extra: 9.1.0 From d6315f56be418a573fa1d24dde03535a8dafc638 Mon Sep 17 00:00:00 2001 From: Mz <1373857752@qq.com> Date: Thu, 13 Nov 2025 20:06:59 +0800 Subject: [PATCH 03/12] =?UTF-8?q?build(screen):=20=E4=BB=8E=20Vite=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E7=A7=BB=E9=99=A4=20Terser=20?= =?UTF-8?q?=E5=8E=8B=E7=BC=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/screen/vite.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/screen/vite.config.js b/packages/screen/vite.config.js index b23f56a..d7aca9a 100644 --- a/packages/screen/vite.config.js +++ b/packages/screen/vite.config.js @@ -101,7 +101,6 @@ export default defineConfig(({ command, mode }) => { outDir: 'dist', assetsDir: 'assets', sourcemap: false, - minify: 'terser', rollupOptions: { output: { chunkFileNames: 'js/[name]-[hash].js', From 14f0f9d752b52a05c7e7dded0c3e4ed4fc992963 Mon Sep 17 00:00:00 2001 From: huangchenhao <123673748@qq.com> Date: Fri, 14 Nov 2025 14:24:32 +0800 Subject: [PATCH 04/12] =?UTF-8?q?Pc=E7=AB=AF=E5=86=B0=E9=9B=AA=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E8=AF=A6=E6=83=85=20=E5=86=B0=E9=9B=AA=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/src/component/MyDialog/index.vue | 1 - .../screen/src/component/MyDrawer/index.vue | 1 - .../views/MaterialManagement/detailDialog.vue | 6 +- .../SnowEventManagement/detailDialog.vue | 216 ++++++++++++++---- .../src/views/SnowEventManagement/index.js | 73 +++--- .../src/views/SnowEventManagement/index.vue | 12 + 6 files changed, 232 insertions(+), 77 deletions(-) diff --git a/packages/screen/src/component/MyDialog/index.vue b/packages/screen/src/component/MyDialog/index.vue index 37bcd0a..7ce9f3b 100644 --- a/packages/screen/src/component/MyDialog/index.vue +++ b/packages/screen/src/component/MyDialog/index.vue @@ -10,7 +10,6 @@ :is="dynamicComponent" ref="dynamicComponentRef" v-bind="componentProps" - @vue:mounted="handleComponentMount" /> \ No newline at end of file From acdaabe2034dde21dcaeb3f414775a8aca4a8015 Mon Sep 17 00:00:00 2001 From: nightdays Date: Fri, 14 Nov 2025 16:43:44 +0800 Subject: [PATCH 10/12] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86=E4=B8=8B=E6=8B=89=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/component/InputSelect/InputSelect.vue | 172 ++++++++++++++++++ .../views/EquipmentManagement/addDialog.vue | 25 ++- 2 files changed, 188 insertions(+), 9 deletions(-) create mode 100644 packages/screen/src/component/InputSelect/InputSelect.vue diff --git a/packages/screen/src/component/InputSelect/InputSelect.vue b/packages/screen/src/component/InputSelect/InputSelect.vue new file mode 100644 index 0000000..9a84c93 --- /dev/null +++ b/packages/screen/src/component/InputSelect/InputSelect.vue @@ -0,0 +1,172 @@ + + + \ No newline at end of file diff --git a/packages/screen/src/views/EquipmentManagement/addDialog.vue b/packages/screen/src/views/EquipmentManagement/addDialog.vue index b6ad467..4b1c63e 100644 --- a/packages/screen/src/views/EquipmentManagement/addDialog.vue +++ b/packages/screen/src/views/EquipmentManagement/addDialog.vue @@ -13,18 +13,12 @@ - - - - + - - - - + @@ -57,7 +51,7 @@ - + @@ -98,6 +92,7 @@ + + \ No newline at end of file diff --git a/packages/screen/src/views/ServiceStationManagePage/index.js b/packages/screen/src/views/ServiceStationManagePage/index.js index 62b0adf..1142d98 100644 --- a/packages/screen/src/views/ServiceStationManagePage/index.js +++ b/packages/screen/src/views/ServiceStationManagePage/index.js @@ -1,6 +1,7 @@ import { h, ref, onMounted, reactive, watch, toRaw, nextTick } from "vue"; import { request } from "@/utils/request"; -import { useRoute } from 'vue-router' +import { useRoute, useRouter } from 'vue-router' +import DetailDrawer from "./detailDrawer.vue"; const tableData = ref([]); // 表格数据 const filterData = reactive({ @@ -77,129 +78,159 @@ const getTableData = async (filterData) => { } }; - -const columns = [ - { - prop: "mc", - label: "服务站名称", - }, - { - prop: "sbsl", - label: "设备数量", - render: (row) => () => - h( - ElButton, - { - link: true, - type: "primary", - onClick: () => handleClickSb(row), - }, - () => row.sbsl - ), - }, - { - prop: "wzsl", - label: "物资数量", - render: (row) => () => - h( - ElButton, - { - link: true, - type: "primary", - onClick: () => handleClickWz(row), - }, - () => row.wzsl - ), - }, - { - prop: "rysl", - label: "人员数量", - }, - { - prop: "qxmc", - label: "区县名称", - }, - { - label: "操作", - fixed: "right", - width: 150, - render: (row) => () => - h("div", { class: "action-btns" }, [ - h( - ElButton, - { - type: "primary", - link: true, - onClick: async () => { - - }, - }, - () => "详情" - ), - h( - ElButton, - { - type: "success", - link: true, - style: "margin-left: 10px;", - onClick: async () => { - - }, - }, - () => "编辑" - ), - h( - ElButton, - { - type: "danger", - link: true, - style: "margin-left: 10px;", - onClick: async () => { - try { - await ElMessageBox.confirm("确定要删除该站点吗？", "删除确认", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }); - const res = await request({ - url: `/snow-ops-platform/yhz/delete`, - method: "POST", - data: { - id: row.id, - }, - }); - if (res.code === "00000") { - ElMessage.success("删除成功"); - getTableData(); - } - } catch (error) { - if (error instanceof Error) { - ElMessage.error(error.message || "删除失败"); - } - } - }, - }, - () => "删除" - ), - ]), - }, -]; -const router = useRoute(); -const handleClickSb = (row) => { - router.push({ - path: `/yhzsb/${encodeURIComponent(JSON.stringify(row))}`, - }); +// 获取养护站详情 +const getYhzDetail = async (row) => { + try { + console.log('row',toRaw(row)); + const res = await request({ + url: `/snow-ops-platform/yhz/getById?id=${row.id}`, + method: "GET", + }); + if (res.code === "00000") { + if (drawerType.value === "detail"){ + drawer.title = '详情' + drawer.props = { + basicData: res.data, + }; + drawer.onCancel = () => { + drawerType.value = ''; + drawerVisible.value = false; + }; + drawer.onConfirm = () => { + drawerType.value = ''; + drawerVisible.value = false; + }; + drawer.content = DetailDrawer; + drawerVisible.value = true; + } + } + } catch (error) { + + } }; -const handleClickWz = (row) => { - router.push({ - path: `/yhzwz/${encodeURIComponent(JSON.stringify(row))}`, - }); -}; - - - export default () => { + const router = useRouter(); + const handleClickSb = (row) => { + router.push({ + path: `/yhzsb/${encodeURIComponent(JSON.stringify(row))}`, + }); + }; + const handleClickWz = (row) => { + router.push({ + path: `/yhzwz/${encodeURIComponent(JSON.stringify(row))}`, + }); + }; + + const columns = [ + { + prop: "mc", + label: "服务站名称", + }, + { + prop: "sbsl", + label: "设备数量", + render: (row) => () => + h( + ElButton, + { + link: true, + type: "primary", + onClick: () => handleClickSb(row), + }, + () => row.sbsl + ), + }, + { + prop: "wzsl", + label: "物资数量", + render: (row) => () => + h( + ElButton, + { + link: true, + type: "primary", + onClick: () => handleClickWz(row), + }, + () => row.wzsl + ), + }, + { + prop: "rysl", + label: "人员数量", + }, + { + prop: "qxmc", + label: "区县名称", + }, + { + label: "操作", + fixed: "right", + width: 150, + render: (row) => () => + h("div", { class: "action-btns" }, [ + h( + ElButton, + { + type: "primary", + link: true, + onClick: async () => { + drawerType.value = "detail"; + await getYhzDetail(row); + }, + }, + () => "详情" + ), + h( + ElButton, + { + type: "success", + link: true, + style: "margin-left: 10px;", + onClick: async () => { + + }, + }, + () => "编辑" + ), + h( + ElButton, + { + type: "danger", + link: true, + style: "margin-left: 10px;", + onClick: async () => { + try { + await ElMessageBox.confirm("确定要删除该站点吗？", "删除确认", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }); + const res = await request({ + url: `/snow-ops-platform/yhz/delete`, + method: "POST", + data: { + id: row.id, + }, + }); + if (res.code === "00000") { + ElMessage.success("删除成功"); + getTableData(); + } + } catch (error) { + if (error instanceof Error) { + ElMessage.error(error.message || "删除失败"); + } + } + }, + }, + () => "删除" + ), + ]), + }, + ]; + + // 监听过滤条件变化 watch( @@ -213,12 +244,15 @@ export default () => { onMounted(async () => { await getTableData() }); + return { tableData, filterData, zdlxOptions, pagination, columns, + handleClickSb, + handleClickWz, modelVisible, model,