duxingchen/ZDXX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复两个网站json展示问题

Browse Source
This commit is contained in:
YueL1331
2026-01-06 16:15:08 +08:00
parent e36b68da2e
commit 45c3d602c0
3 changed files with 157 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
zhandianxinxi/my-vue-app/src/App.vue
View File

@ -4,92 +4,74 @@
<template #header>
<div class="header-row">
<div class="left-panel">
<h2 class="sys-title">📡 终端数据监控大屏</h2>
<h2 class="sys-title">📡 数据同步大屏</h2>
<div class="sys-status">
<span v-if="isRunning" class="status-running">
<el-icon class="is-loading"><Loading /></el-icon> 正在与远程服务器同步数据...
<el-icon class="is-loading"><Loading /></el-icon> 正在清洗并同步最新数据...
</span>
<span v-else class="status-idle">
<el-icon><CircleCheck /></el-icon> 数据已更新 ({{ lastUpdateTime }})
<el-icon><CircleCheck /></el-icon> 状态: 待命 (更新于: {{ lastUpdateTime }})
</span>
</div>
</div>
<el-button type="primary" :loading="isRunning" @click="handleManualRefresh" round icon="Refresh">
立即同步
</el-button>
<el-button type="primary" :loading="isRunning" @click="handleManualRefresh" round icon="Refresh">全量同步</el-button>
</div>
</template>
<div class="toolbar">
<div class="filter-section">
<el-radio-group v-model="filters.site" size="default">
<el-radio-button label="all">全部</el-radio-button>
<el-radio-button label="106">106 代理</el-radio-button>
<el-radio-button label="82">82 气象站</el-radio-button>
<el-radio-group v-model="filters.site">
<el-radio-button value="all">全部</el-radio-button>
<el-radio-button value="106">106 代理</el-radio-button>
<el-radio-button value="82">82 气象站</el-radio-button>
</el-radio-group>
<el-input v-model="filters.keyword" placeholder="搜索设备..." prefix-icon="Search" style="width: 200px; margin-left: 15px;" clearable />
<el-input v-model="filters.keyword" placeholder="搜索..." style="width: 200px; margin-left: 15px;" clearable />
</div>
<div class="action-section">
<el-checkbox v-model="showHidden" label="显示屏蔽设备" border style="margin-right: 15px"/>
<el-button type="warning" plain icon="Hide" :disabled="selectedRows.length === 0" @click="hideSelected">
批量屏蔽 ({{ selectedRows.length }})
</el-button>
<el-checkbox v-model="showHidden" label="显示屏蔽" border style="margin-right: 10px"/>
<el-button type="warning" plain :disabled="selectedRows.length === 0" @click="hideSelected">屏蔽选中</el-button>
</div>
</div>
<el-table
:data="sortedData"
border
stripe
height="650"
style="width: 100%; margin-top: 15px;"
@selection-change="val => selectedRows = val"
v-loading="isRunning"
>
<el-table :data="sortedData" border height="600" v-loading="isRunning" @selection-change="val => selectedRows = val">
<el-table-column type="selection" width="50" align="center" />
<el-table-column prop="source" label="来源" width="100" />
<el-table-column label="设备名称" min-width="200">
<el-table-column label="名称" min-width="180">
<template #default="{ row }">
<el-link type="primary" :underline="false" @click="showDetails(row)" style="font-weight: bold;">
{{ row.name }}
</el-link>
<el-tag v-if="isHidden(row.name)" type="info" size="small" style="margin-left:8px">已屏蔽</el-tag>
<el-link type="primary" underline="hover" @click="showDetails(row)" style="font-weight: bold;">{{ row.name }}</el-link>
<el-tag v-if="isHidden(row.name)" type="info" size="small" style="margin-left:5px">隐藏</el-tag>
</template>
</el-table-column>
<el-table-column label="状态" width="120" align="center">
<el-table-column label="状态" width="100" align="center">
<template #default="{ row }">
<el-tag :type="getStatusType(row)" effect="dark">{{ getStatusLabel(row) }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="reason" label="详情信息">
<el-table-column prop="reason" label="详情">
<template #default="{ row }">
<span :style="{ color: getStatusColor(row) }">{{ row.reason }}</span>
</template>
</el-table-column>
<el-table-column prop="offset" label="数据时效" width="120" />
<el-table-column prop="latest_time" label="最后同步日期" width="170" />
<el-table-column label="管理" width="90" align="center" v-if="showHidden">
<el-table-column prop="offset" label="时效" width="100" />
<el-table-column prop="latest_time" label="同步日期" width="160" />
<el-table-column label="管理" width="80" v-if="showHidden">
<template #default="{ row }">
<el-button v-if="isHidden(row.name)" type="success" link @click="restoreDevice(row.name)">恢复</el-button>
<el-button type="primary" link @click="restoreDevice(row.name)">恢复</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-drawer v-model="drawerVisible" title="原始数据快照" size="45%" destroy-on-close>
<div v-if="activeDevice" style="padding: 10px">
<el-descriptions :title="'站点：' + activeDevice.name" :column="1" border>
<el-descriptions-item label="所属来源">{{ activeDevice.source }}</el-descriptions-item>
<el-descriptions-item label="最后更新">{{ activeDevice.latest_time }}</el-descriptions-item>
<el-descriptions-item label="时效状态">
<el-tag :type="getStatusType(activeDevice)">{{ activeDevice.offset }}</el-tag>
</el-descriptions-item>
<el-drawer v-model="drawerVisible" title="报文详情" size="45%">
<div v-if="activeDevice" style="padding: 15px">
<el-descriptions :column="1" border>
<el-descriptions-item label="名称">{{ activeDevice.name }}</el-descriptions-item>
<el-descriptions-item label="同步日期">{{ activeDevice.latest_time }}</el-descriptions-item>
</el-descriptions>
<h3 style="margin-top:20px">📦 JSON 数据报文</h3>
<h3 style="margin-top:20px">📦 原始数据</h3>
<div class="json-box">
<json-viewer v-if="parsedJson" :value="parsedJson" copyable boxed expand-depth="4" />
<el-empty v-else description="无 JSON 详情内容" />
<json-viewer v-if="parsedData" :value="parsedData" copyable boxed expand-depth="4" />
<el-empty v-else description="内容为空" />
</div>
</div>
</el-drawer>
@ -99,113 +81,65 @@
<script setup>
import { ref, reactive, computed, onMounted } from 'vue'
import axios from 'axios'
import { ElMessage } from 'element-plus'
const rawData = ref([])
const isRunning = ref(false)
const lastUpdateTime = ref('-')
const selectedRows = ref([])
const showHidden = ref(false)
const drawerVisible = ref(false)
const activeDevice = ref(null)
const rawData = ref([]); const isRunning = ref(false); const lastUpdateTime = ref('-')
const selectedRows = ref([]); const showHidden = ref(false); const drawerVisible = ref(false); const activeDevice = ref(null)
const filters = reactive({ site: 'all', keyword: '' })
const ignoredList = ref(JSON.parse(localStorage.getItem('hide_devices') || '[]'))
const ignoredList = ref(JSON.parse(localStorage.getItem('hide_list') || '[]'))
// --- 颜色与级别核心逻辑 ---
const getLevel = (row) => {
if (row.reason.includes('离线') || row.reason.includes('错误')) return 3 // Danger
if (!row.latest_time || row.latest_time === 'N/A') return 3
if (row.reason.includes('离线') || row.reason.includes('失败')) return 3
try {
const last = new Date(row.latest_time.split(' ')[0].replace(/_/g, '-'))
const diff = (new Date() - last) / (1000 * 3600 * 24)
if (diff > 3) return 3 // 红色
if (diff > 1) return 2 // 黄色
return 1 // 绿色
return diff > 3 ? 3 : (diff > 1 ? 2 : 1)
} catch { return 3 }
}
const getStatusType = (row) => {
const lv = getLevel(row)
return lv === 3 ? 'danger' : (lv === 2 ? 'warning' : 'success')
}
const getStatusLabel = (row) => {
const lv = getLevel(row)
return lv === 3 ? '严重异常' : (lv === 2 ? '数据滞后' : '运行同步')
}
const getStatusColor = (row) => {
const lv = getLevel(row)
return lv === 3 ? '#F56C6C' : (lv === 2 ? '#E6A23C' : '#67C23A')
}
// --- 排序与过滤 ---
const getStatusType = (row) => ['','success','warning','danger'][getLevel(row)]
const getStatusLabel = (row) => ['','正常','滞后','异常'][getLevel(row)]
const getStatusColor = (row) => ['','#67C23A','#E6A23C','#F56C6C'][getLevel(row)]
const isHidden = (name) => ignoredList.value.includes(name)
const sortedData = computed(() => {
let list = rawData.value.filter(item => {
const mSite = filters.site === 'all' || item.source.includes(filters.site)
const mKey = item.name.toLowerCase().includes(filters.keyword.toLowerCase())
const mHide = showHidden.value ? true : !isHidden(item.name)
return mSite && mKey && mHide
})
// 按照危险程度排序 (3级排最前)，同级按时间排序
return list.sort((a, b) => {
const lvA = getLevel(a), lvB = getLevel(b)
if (lvA !== lvB) return lvB - lvA
return b.latest_time.localeCompare(a.latest_time)
let list = rawData.value.filter(d => {
const sMatch = filters.site === 'all' || d.source.includes(filters.site)
const kMatch = d.name.toLowerCase().includes(filters.keyword.toLowerCase())
return sMatch && kMatch && (showHidden.value || !isHidden(d.name))
})
return list.sort((a, b) => getLevel(b) - getLevel(a))
})
// --- 交互 ---
const showDetails = (row) => { activeDevice.value = row; drawerVisible.value = true }
const parsedJson = computed(() => {
const parsedData = computed(() => {
if (!activeDevice.value?.content) return null
try { return JSON.parse(activeDevice.value.content) } catch { return activeDevice.value.content }
try { return JSON.parse(activeDevice.value.content) } catch { return { text: activeDevice.value.content } }
})
const hideSelected = () => {
const names = selectedRows.value.map(r => r.name)
ignoredList.value = [...new Set([...ignoredList.value, ...names])]
localStorage.setItem('hide_devices', JSON.stringify(ignoredList.value))
ElMessage.warning('设备已屏蔽')
ignoredList.value = [...new Set([...ignoredList.value, ...selectedRows.value.map(r => r.name)])]
localStorage.setItem('hide_list', JSON.stringify(ignoredList.value))
}
const restoreDevice = (name) => {
ignoredList.value = ignoredList.value.filter(n => n !== name)
localStorage.setItem('hide_devices', JSON.stringify(ignoredList.value))
localStorage.setItem('hide_list', JSON.stringify(ignoredList.value))
}
const fetchLogs = async () => {
const res = await axios.get('/api/logs')
rawData.value = res.data
if (res.data.length > 0) lastUpdateTime.value = res.data[0].check_time
rawData.value = res.data; if (res.data.length) lastUpdateTime.value = res.data[0].check_time
}
const checkStatus = async () => {
const res = await axios.get('/api/status')
isRunning.value = res.data.is_running
if (isRunning.value) setTimeout(checkStatus, 2000)
else fetchLogs()
if (isRunning.value) setTimeout(checkStatus, 2000); else fetchLogs()
}
const handleManualRefresh = async () => {
await axios.post('/api/run')
isRunning.value = true
checkStatus()
}
const handleManualRefresh = async () => { await axios.post('/api/run'); isRunning.value = true; checkStatus() }
onMounted(() => { checkStatus(); fetchLogs() })
</script>
<style scoped>
.container { padding: 20px; max-width: 1500px; margin: 0 auto; }
.container { padding: 20px; max-width: 1200px; margin: 0 auto; }
.header-row { display: flex; justify-content: space-between; align-items: center; }
.sys-title { margin:0; }
.sys-status { font-size:13px; color:#909399; margin-top:5px; }
.toolbar { background:#f9f9f9; padding:15px; border-radius:8px; display:flex; justify-content:space-between; margin-top:20px; border:1px solid #eee; }
.json-box { border:1px solid #eee; background:#fafafa; border-radius:4px; }
.toolbar { background: #f9f9f9; padding: 15px; border-radius: 8px; display: flex; justify-content: space-between; margin: 20px 0; border: 1px solid #eee; }
.json-box { border: 1px solid #eee; background: #fafafa; border-radius: 4px; }
</style>