From f812a5d9c4a973930a79581e0c1de91a7054b547 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期二, 29 七月 2025 14:57:01 +0800 Subject: [PATCH] 中间数据产品 1. 新增报告生成提示; 2. 新增报告文件下载; 3. 修复报告页面展示时,相同名称的列数据无法正确展示的问题; --- src/views/fysp/support/JingAnSupport.vue | 81 +++++++--------------------------------- 1 files changed, 14 insertions(+), 67 deletions(-) diff --git a/src/views/fysp/support/JingAnSupport.vue b/src/views/fysp/support/JingAnSupport.vue index ad2c9a4..3f8a4fb 100644 --- a/src/views/fysp/support/JingAnSupport.vue +++ b/src/views/fysp/support/JingAnSupport.vue @@ -1,72 +1,19 @@ <template> - <FYOptionTime :initValue="true" type="date" v-model:value="updateTime"></FYOptionTime> - <el-button type="primary" @click="fetchNewDevice">鏌ヨ鏂拌澶�</el-button> - <el-button type="primary" @click="fetchNewConstruction">鏌ヨ鏂板伐鍦�</el-button> - <el-row> - <el-col :span="12"> - <el-text>鏂拌澶�</el-text> - <div v-for="item in deviceList" :key="item.id"> - <div>{{ item.id }}</div> - <div>{{ item.code }}</div> - <div>{{ item.name }}</div> - <div>{{ item.address }}</div> - <div>{{ item.status }}</div> - <span>{{ item.createTime }} |</span> - <span>{{ item.updateTime }} |</span> - <span>{{ item.remark }} |</span> - <span>{{ item.lon }} |</span> - <span>{{ item.lat }}</span> - </div> - </el-col> - <el-col :span="12"> - <el-text>鏂板伐鍦�</el-text> - <div v-for="item in constructionList" :key="item.id"> - <div>{{ item.id }}</div> - <div>{{ item.code }}</div> - <div>{{ item.name }}</div> - <div>{{ item.address }}</div> - <div>{{ item.street }}</div> - <div>{{ item.status }}</div> - <span>{{ item.lon }} |</span> - <span>{{ item.lat }}</span> - <span>{{ item.score }} |</span> - <span>{{ item.grade }}</span> - <span>{{ item.subTaskId }} |</span> - <span>{{ item.createTime }} |</span> - </div> - </el-col> - </el-row> + <el-tabs type="border-card"> + <el-tab-pane label="闈欏畨澶滈棿鏂藉伐绠$悊"> + <JingAnNightConstruction></JingAnNightConstruction> + </el-tab-pane> + <el-tab-pane label="闈欏畨宸ュ湴鎵皹璁惧淇℃伅鍖归厤"> + <NewDevice></NewDevice> + </el-tab-pane> + <!-- <el-tab-pane label="鏂板伐鍦�"> + <NewConstruction></NewConstruction> + </el-tab-pane> --> + </el-tabs> </template> <script setup> -import { ref } from 'vue'; -import dayjs from 'dayjs'; -import constructionApi from '@/api/additional-jingan/constructionApi'; -import { useFetchData } from '@/composables/fetchData'; - -const { loading, fetchData } = useFetchData(); - -const updateTime = ref(); -const deviceList = ref([]); -const constructionList = ref([]); - -// 鏌ヨ闇�纭鐨勮澶囨竻鍗� -function fetchNewDevice() { - const param = dayjs(updateTime.value).format('YYYY-MM-DD HH:mm:ss'); - fetchData(() => { - return constructionApi.queryDevice(param).then((res) => { - deviceList.value = res.data; - }); - }); -} - -// 鏌ヨ鏂板缓宸ュ湴 -function fetchNewConstruction() { - const param = dayjs(updateTime.value).format('YYYY-MM-DD HH:mm:ss'); - fetchData(() => { - return constructionApi.queryGdNew(param).then((res) => { - constructionList.value = res.data; - }); - }); -} +import NewDevice from './NewDevice.vue'; +import NewConstruction from './NewConstruction.vue'; +import JingAnNightConstruction from './JingAnNightConstruction.vue'; </script> <style scoped></style> -- Gitblit v1.9.3