Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev

Pc端区县节点关闭时不再筛选全部内容仍然筛选区县新增“全部”节点
2025-11-21 14:27:26 +08:00 · 2025-11-21 14:27:25 +08:00
6 changed files with 128 additions and 73 deletions
--- a/packages/screen/index.html
+++ b/packages/screen/index.html
@ -3,7 +3,7 @@
  <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>数据大屏</title>
+    <title>渝路智管</title>
  </head>
  <body>
    <div id="app"></div>
--- a/packages/screen/src/views/EquipmentManagement/index.js
+++ b/packages/screen/src/views/EquipmentManagement/index.js
@ -82,6 +82,10 @@ const filterNode = (value, node) => {

    const nodeData = node || {}

+    if (nodeData.type === 'root') {
+        return true;
+    }
+
    // 处理区域节点匹配
    if (nodeData.type === 'area') {
        return (nodeData.rawName || '').toLowerCase().includes(keyword)
@ -104,7 +108,11 @@ const getTreeData = async () => {
            method: 'GET'
        })
        if (res.code === '00000') {
-            treeData.value = res.data.map((qx, index) => (
+            treeData.value = [{
+                id: -1,
+                name: `全部(${res.data.totalSbsl})`,
+                type: "root",
+                children: res.data.areaList.map((qx, index) => (
                    {
                        id: index,
                        name: `${qx.qxmc}(${qx.sbsl})`,
@ -121,8 +129,9 @@ const getTreeData = async () => {
                        })),
                        rawName: qx.qxmc, // 原始名称
                    })
-            );
-            console.log('treeData', toRaw(treeData.value))
+                )
+            }]
+            // console.log('treeData', toRaw(treeData.value))
        } else {
            throw new Error(res.message);
        }
@ -134,25 +143,33 @@ const getTreeData = async () => {
 // 处理节点点击事件
 const handleNodeClick = (data, node) => {
    if (!data || !data.type) return;
-    if (data.type === 'area' && node.expanded === false) {
-        console.log('树节点关闭', node.expanded)
+    if (data.type === 'root') {
+        console.log('你点击的是全部')
        yhzid.value = ''; // 重置养护站id
        qxmc.value = ''; // 重置区县名称
        selectedYHZData.value = null;
        return;
-    }
+    };
+    // if (data.type === 'area' && node.expanded === false) {
+    //     console.log('树节点关闭', node.expanded)
+    //     yhzid.value = ''; // 重置养护站id
+    //     qxmc.value = ''; // 重置区县名称
+    //     selectedYHZData.value = null;
+    //     return;
+    // }
    if (data.type === 'area') {
-        console.log('你点击的是区县', data.id)
+        console.log('你点击的是区县', data.rawName)
        yhzid.value = ''; // 重置养护站id
-        qxmc.value = data.id; // 保存区县名称
+        qxmc.value = data.rawName; // 保存区县名称
        selectedYHZData.value = null
-
+        return;
    }
    if (data.type === 'site') {
        console.log('你点击的是站点', data.name)
        yhzid.value = data.id; // 保存养护站id
        qxmc.value = ''; // 重置区县名称
        selectedYHZData.value = data
+        return;
    }
 };

--- a/packages/screen/src/views/MaterialManagement/index.js
+++ b/packages/screen/src/views/MaterialManagement/index.js
@ -98,6 +98,10 @@ const filterNode = (value, node) => {

    const nodeData = node || {}

+    if (nodeData.type === 'root') {
+        return true;
+    }
+
    // 处理区域节点匹配
    if (nodeData.type === 'area') {
        return (nodeData.rawName || '').toLowerCase().includes(keyword)
@ -120,7 +124,11 @@ const getTreeData = async () => {
            method: 'GET'
        })
        if (res.code === '00000') {
-            treeData.value = res.data.map((qx, index) => (
+            treeData.value = [{
+                id: -1,
+                name: `全部(${res.data.totalWzsl})`,
+                type: "root",
+                children: res.data.areaList.map((qx, index) => (
                    {
                        id: index,
                        name: `${qx.qxmc}(${qx.wzsl})`,
@ -129,14 +137,16 @@ const getTreeData = async () => {
                            id: site.id,
                            name: `${site.mc}(${site.wzsl})`,
                            type: 'site',
-                        rawName: site.mc, // 原始名称
+                            qxmc: qx.qxmc,
+                            rawName: site.mc,
                            jd: site.jd,
                            wd: site.wd,
                        })),
                        rawName: qx.qxmc, // 原始名称
                    })
-            );
-            console.log('treeData', toRaw(treeData.value))
+                )
+            }]
+            // console.log('treeData', toRaw(treeData.value))
        } else {
            throw new Error(res.message);
        }
@ -148,25 +158,29 @@ const getTreeData = async () => {
 // 处理节点点击事件
 const handleNodeClick = (data, node) => {
    if (!data || !data.type) return;
-    if (data.type === 'area' && node.expanded === false) {
-        console.log('树节点关闭', node.expanded)
+    if (data.type === 'root') {
+        console.log('你点击的是全部')
        yhzid.value = ''; // 重置养护站id
-        yhzData.value = null; // 重置养护站信息
        qxmc.value = ''; // 重置区县名称
        return;
-    }
+    };
+    // if (data.type === 'area' && node.expanded === false) {
+    //     console.log('树节点关闭', node.expanded)
+    //     yhzid.value = ''; // 重置养护站id
+    //     qxmc.value = ''; // 重置区县名称
+    //     return;
+    // }
    if (data.type === 'area') {
-        console.log('你点击的是区县', data.id)
+        console.log('你点击的是区县', data.rawName)
        yhzid.value = ''; // 重置养护站id
-        yhzData.value = null; // 重置养护站信息
-        qxmc.value = data.id; // 保存区县名称
-
+        qxmc.value = data.rawName; // 保存区县名称
+        return;
    }
    if (data.type === 'site') {
        console.log('你点击的是站点', data.name)
        yhzid.value = data.id; // 保存养护站id
-        yhzData.value = data; // 保存养护站信息
        qxmc.value = ''; // 重置区县名称
+        return;
    }
 };

--- a/packages/screen/src/views/ServiceStationManagePage/detailDrawer.vue
+++ b/packages/screen/src/views/ServiceStationManagePage/detailDrawer.vue
@ -311,7 +311,7 @@ const getMaterialList = async () => {
    const data = {
      pageNum: pagination.current,
      pageSize: pagination.pageSize,
-      yhzid: Number(props.basicData.id),
+      yhzid: props.basicData.id,
    };
    const res = await request({
      url: "/snow-ops-platform/yjwz/list",
@ -336,7 +336,7 @@ const getEquipmentList = async () => {
    const data = {
      pageNum: pagination.current,
      pageSize: pagination.pageSize,
-      yhzid: Number(props.basicData.id),
+      yhzid: props.basicData.id,
    };
    const res = await request({
      url: "/snow-ops-platform/yjsb/list",
--- a/packages/screen/src/views/SnowEventManagement/index.js
+++ b/packages/screen/src/views/SnowEventManagement/index.js
@ -81,6 +81,10 @@ const filterNode = (value, node) => {

    const nodeData = node || {}

+    if (nodeData.type === 'root') {
+        return true;
+    }
+
    // 处理区域节点匹配
    if (nodeData.type === 'area') {
        return (nodeData.rawName || '').toLowerCase().includes(keyword)
@ -103,7 +107,11 @@ const getTreeData = async () => {
            method: 'GET'
        })
        if (res.code === '00000') {
-            treeData.value = res.data.map((qx, index) => (
+            treeData.value = [{
+                id: -1,
+                name: `全部(${res.data.totalBxsjsl})`,
+                type: 'root',
+                children: res.data.areaList.map((qx, index) => (
                    {
                        id: index,
                        name: `${qx.qxmc}(${qx.bxsjsl})`,
@ -115,7 +123,8 @@ const getTreeData = async () => {
                        })),
                        rawName: qx.qxmc, // 原始名称
                    })
-            );
+                )
+            }]
            console.log('treeData', toRaw(treeData.value))
        } else {
            throw new Error(res.message);
@ -128,17 +137,22 @@ const getTreeData = async () => {
 // 处理节点点击事件
 const handleNodeClick = (data, node) => {
    if (!data || !data.type) return;
-    if (data.type === 'area' && node.expanded === false) {
-        console.log('树节点关闭', node.expanded)
+    if (data.type === 'root'){
+        console.log('你点击的是全部')
        yhzid.value = ''; // 重置养护站id
        qxmc.value = ''; // 重置区县名称
        return;
    }
+    // if (data.type === 'area' && node.expanded === false) {
+    //     console.log('树节点关闭', node.expanded)
+    //     yhzid.value = ''; // 重置养护站id
+    //     qxmc.value = ''; // 重置区县名称
+    //     return;
+    // }
    if (data.type === 'area') {
-        console.log('你点击的是区县', data.id)
+        console.log('你点击的是区县', data.rawName)
        yhzid.value = ''; // 重置养护站id
-        qxmc.value = data.id; // 保存区县名称
-
+        qxmc.value = data.rawName; // 保存区县名称
    }
    if (data.type === 'site') {
        console.log('你点击的是站点', data.name)
@ -161,7 +175,7 @@ const getyhzeventList = async (qxmc, yhzid, filterData) => {
    try {
        const data = {
            qxmc: qxmc,
-            yhzid: yhzid,
+            serviceStationId: yhzid,
            routeNo: filterData?.routeNo || '',
            stakeNo: filterData?.stakeNo || '',
            reportTimeStart: filterData?.reportTime?.[0] ? formatDate(filterData.reportTime[0]) : '',
--- a/packages/screen/src/views/index.vue
+++ b/packages/screen/src/views/index.vue
@ -3,6 +3,9 @@
    <div class="header">
      <img class="logo" src="../assets/imgs/logo.png" alt="logo" />
      <h2>政务·渝路智管</h2>
+      <div class="user">
+        <el-icon :size="24"><User /></el-icon>
+      </div>
    </div>
    <div class="content">
      <div class="content-leftbar">
@ -17,6 +20,7 @@

 <script setup>
 import MenuBar from "../component/MenuBar/index.vue";
+import {User} from '@element-plus/icons-vue'
 </script>

 <style lang="scss" scoped>
@ -33,12 +37,18 @@ import MenuBar from "../component/MenuBar/index.vue";
  background-position: center;
  display: flex;
  align-items: center;
+  justify-content: space-between;
  .logo {
    width: 42px;
    height: 42px;
    margin-left: 16px;
    margin-right: 16px;
  }
+  .user {
+    margin-left: auto;
+    cursor: pointer;
+    margin-right: 16px;
+  }
 }
 .content {
  height: calc(100% - 64px);
Author	SHA1	Message	Date
huangchenhao	cd9e049310	Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev	2025-11-21 14:27:26 +08:00
huangchenhao	7c0895c66e	Pc端区县节点关闭时不再筛选全部内容仍然筛选区县新增“全部”节点	2025-11-21 14:27:25 +08:00