bdzl2/bxztApp
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: bdzl2:cd9e049310e6a50db27989ef8a57487610ba5880
Branches Tags
bdzl2:main
bdzl2:dev
bdzl2:feat-zc
..
compare: bdzl2:a5bd1d3b1e7370b8fa92a9cff07c10f3952e3330
Branches Tags
bdzl2:dev
bdzl2:feat-zc
bdzl2:main

No commits in common. "cd9e049310e6a50db27989ef8a57487610ba5880" and "a5bd1d3b1e7370b8fa92a9cff07c10f3952e3330" have entirely different histories.
cd9e049310 ... a5bd1d3b1e

6 changed files with 73 additions and 128 deletions
Show Stats Expand all files Collapse all files

2
packages/screen/index.html
View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>渝路智管</title> <title>数据大屏</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

67
packages/screen/src/views/EquipmentManagement/index.js
View File

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

66
packages/screen/src/views/MaterialManagement/index.js
View File

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

4
packages/screen/src/views/ServiceStationManagePage/detailDrawer.vue
View File

@ -311,7 +311,7 @@ const getMaterialList = async () => {
const data = { const data = {
pageNum: pagination.current, pageNum: pagination.current,
pageSize: pagination.pageSize, pageSize: pagination.pageSize,
yhzid: props.basicData.id, yhzid: Number(props.basicData.id),
}; };
const res = await request({ const res = await request({
url: "/snow-ops-platform/yjwz/list", url: "/snow-ops-platform/yjwz/list",
@ -336,7 +336,7 @@ const getEquipmentList = async () => {
const data = { const data = {
pageNum: pagination.current, pageNum: pagination.current,
pageSize: pagination.pageSize, pageSize: pagination.pageSize,
yhzid: props.basicData.id, yhzid: Number(props.basicData.id),
}; };
const res = await request({ const res = await request({
url: "/snow-ops-platform/yjsb/list", url: "/snow-ops-platform/yjsb/list",

52
packages/screen/src/views/SnowEventManagement/index.js
View File

@ -81,10 +81,6 @@ const filterNode = (value, node) => {
const nodeData = node || {} const nodeData = node || {}
if (nodeData.type === 'root') {
return true;
}
// 处理区域节点匹配 // 处理区域节点匹配
if (nodeData.type === 'area') { if (nodeData.type === 'area') {
return (nodeData.rawName || '').toLowerCase().includes(keyword) return (nodeData.rawName || '').toLowerCase().includes(keyword)
@ -107,24 +103,19 @@ const getTreeData = async () => {
method: 'GET' method: 'GET'
}) })
if (res.code === '00000') { if (res.code === '00000') {
treeData.value = [{ treeData.value = res.data.map((qx, index) => (
id: -1, {
name: `全部(${res.data.totalBxsjsl})`, id: index,
type: 'root', name: `${qx.qxmc}(${qx.bxsjsl})`,
children: res.data.areaList.map((qx, index) => ( type: 'area',
{ children: qx.yhzList.map(site => ({
id: index, id: site.id,
name: `${qx.qxmc}(${qx.bxsjsl})`, name: `${site.mc}(${site.bxsjsl})`,
type: 'area', type: 'site'
children: qx.yhzList.map(site => ({ })),
id: site.id, rawName: qx.qxmc, // 原始名称
name: `${site.mc}(${site.bxsjsl})`, })
type: 'site' );
})),
rawName: qx.qxmc, // 原始名称
})
)
}]
console.log('treeData', toRaw(treeData.value)) console.log('treeData', toRaw(treeData.value))
} else { } else {
throw new Error(res.message); throw new Error(res.message);
@ -137,22 +128,17 @@ const getTreeData = async () => {
// 处理节点点击事件 // 处理节点点击事件
const handleNodeClick = (data, node) => { const handleNodeClick = (data, node) => {
if (!data || !data.type) return; if (!data || !data.type) return;
if (data.type === 'root'){ if (data.type === 'area' && node.expanded === false) {
console.log('你点击的是全部') console.log('树节点关闭', node.expanded)
yhzid.value = ''; // 重置养护站id yhzid.value = ''; // 重置养护站id
qxmc.value = ''; // 重置区县名称 qxmc.value = ''; // 重置区县名称
return; return;
} }
// if (data.type === 'area' && node.expanded === false) {
// console.log('树节点关闭', node.expanded)
// yhzid.value = ''; // 重置养护站id
// qxmc.value = ''; // 重置区县名称
// return;
// }
if (data.type === 'area') { if (data.type === 'area') {
console.log('你点击的是区县', data.rawName) console.log('你点击的是区县', data.id)
yhzid.value = ''; // 重置养护站id yhzid.value = ''; // 重置养护站id
qxmc.value = data.rawName; // 保存区县名称 qxmc.value = data.id; // 保存区县名称
} }
if (data.type === 'site') { if (data.type === 'site') {
console.log('你点击的是站点', data.name) console.log('你点击的是站点', data.name)
@ -175,7 +161,7 @@ const getyhzeventList = async (qxmc, yhzid, filterData) => {
try { try {
const data = { const data = {
qxmc: qxmc, qxmc: qxmc,
serviceStationId: yhzid, yhzid: yhzid,
routeNo: filterData?.routeNo || '', routeNo: filterData?.routeNo || '',
stakeNo: filterData?.stakeNo || '', stakeNo: filterData?.stakeNo || '',
reportTimeStart: filterData?.reportTime?.[0] ? formatDate(filterData.reportTime[0]) : '', reportTimeStart: filterData?.reportTime?.[0] ? formatDate(filterData.reportTime[0]) : '',

10
packages/screen/src/views/index.vue
View File

@ -3,9 +3,6 @@
<div class="header"> <div class="header">
<img class="logo" src="../assets/imgs/logo.png" alt="logo" /> <img class="logo" src="../assets/imgs/logo.png" alt="logo" />
<h2>政务·渝路智管</h2> <h2>政务·渝路智管</h2>
<div class="user">
<el-icon :size="24"><User /></el-icon>
</div>
</div> </div>
<div class="content"> <div class="content">
<div class="content-leftbar"> <div class="content-leftbar">
@ -20,7 +17,6 @@
<script setup> <script setup>
import MenuBar from "../component/MenuBar/index.vue"; import MenuBar from "../component/MenuBar/index.vue";
import {User} from '@element-plus/icons-vue'
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -37,18 +33,12 @@ import {User} from '@element-plus/icons-vue'
background-position: center; background-position: center;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;
.logo { .logo {
width: 42px; width: 42px;
height: 42px; height: 42px;
margin-left: 16px; margin-left: 16px;
margin-right: 16px; margin-right: 16px;
} }
.user {
margin-left: auto;
cursor: pointer;
margin-right: 16px;
}
} }
.content { .content {
height: calc(100% - 64px); height: calc(100% - 64px);