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

Merge branch 'dev' into niedongsheng

Browse Source
This commit is contained in:
nightdays 2025-11-14 15:10:41 +08:00
commit 0e400727ec
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ const yhzid = ref(''); // 养护站id
const filterData = reactive({ const filterData = reactive({
routeNo: '', // 线路编号 routeNo: '', // 线路编号
stakeNo: '', // 桩号 stakeNo: '', // 桩号
reportTime: '', // 填报时间 reportTime: null, // 填报时间
}); // 表格过滤条件 }); // 表格过滤条件
const pagination = reactive({ const pagination = reactive({
current: 1, current: 1,
@ -147,6 +147,15 @@ const handleNodeClick = (data, node) => {
} }
}; };
// 处理日期格式
const formatDate = (date) => {
if (!date) return '';
const pad = n => n.toString().padStart(2, '0');
const d = new Date(date);
return `${d.getFullYear()}-${pad(d.getMonth()+1)}-${pad(d.getDate())} ` +
`${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
};
// 获取冰雪事件列表 // 获取冰雪事件列表
const getyhzeventList = async (qxmc, yhzid, filterData) => { const getyhzeventList = async (qxmc, yhzid, filterData) => {
try { try {
@ -155,8 +164,8 @@ const getyhzeventList = async (qxmc, yhzid, filterData) => {
yhzid: yhzid, yhzid: yhzid,
routeNo: filterData?.routeNo || '', routeNo: filterData?.routeNo || '',
stakeNo: filterData?.stakeNo || '', stakeNo: filterData?.stakeNo || '',
reportTimeStart: filterData?.reportTime[0] || '', reportTimeStart: filterData?.reportTime?.[0] ? formatDate(filterData.reportTime[0]) : '',
reportTimeEnd: filterData?.reportTime[1] || '', reportTimeEnd: filterData?.reportTime?.[1] ? formatDate(filterData.reportTime[1]) : '',
pageNum: pagination.current, pageNum: pagination.current,
pageSize: pagination.pageSize, pageSize: pagination.pageSize,
} }
@ -425,8 +434,8 @@ export default () => {
await getTreeData(); await getTreeData();
await getyhzeventList(); await getyhzeventList();
const rowData = (decodeURIComponent(route.params.data)); const rowData = (decodeURIComponent(route.params.data));
if (rowData !== 'undefined' && rowData!== 'null' && rowData !== '' ) { if (rowData !== 'undefined' && rowData !== 'null' && rowData !== '') {
console.log('rowData@@@',rowData) console.log('rowData@@@', rowData)
const JSONData = JSON.parse(rowData); const JSONData = JSON.parse(rowData);
filterText.value = JSONData.mc; filterText.value = JSONData.mc;
}; };

8
packages/screen/src/views/SnowEventManagement/index.vue
View File

@ -31,7 +31,13 @@
</div> </div>
<div class="inline-flex"> <div class="inline-flex">
<label>填报时间:</label> <label>填报时间:</label>
<el-input v-model="script.filterData.reportTime"></el-input> <el-date-picker
v-model="script.filterData.reportTime"
type="datetimerange"
range-separator="到"
start-placeholder="起始时间"
end-placeholder="结束时间"
/>
</div> </div>
</div> </div>
<div class="form-box"> <div class="form-box">