From 4f53fffacd761809484d723bdccc342e9b6f3abe Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 18 十月 2024 13:52:54 +0800 Subject: [PATCH] 数据中心时间条件改为某天日期 --- src/views/system/data-manage/data-detail/list.js | 51 ++++++++++++++++++++++--- src/views/system/data-manage/data-detail/index.vue | 38 +++++++------------ src/views/system/data-manage/index.vue | 6 +- 3 files changed, 62 insertions(+), 33 deletions(-) diff --git a/src/views/system/data-manage/data-detail/index.vue b/src/views/system/data-manage/data-detail/index.vue index f288951..706b14b 100644 --- a/src/views/system/data-manage/data-detail/index.vue +++ b/src/views/system/data-manage/data-detail/index.vue @@ -79,15 +79,13 @@ <el-form-item label="鍏抽敭璇�" prop="bayonetNumber"> <el-input v-model="queryParams.keyword" placeholder="鍏抽敭璇嶆悳绱�" clearable @input="handleQuery"/> </el-form-item> - <el-form-item label="鏃堕棿鑼冨洿" prop="timeRange"> - <el-date-picker - v-model="queryParams.timeRange" - type="daterange" - range-separator="鑷�" - value-format="yyyy-MM-dd" - start-placeholder="寮�濮嬫棩鏈�" - end-placeholder="缁撴潫鏃ユ湡"> - </el-date-picker> + <el-form-item label="鏃堕棿" prop="date"> + <el-date-picker + v-model="queryParams.date" + type="date" + placeholder="閫夋嫨鏃ユ湡" + value-format="yyyy-MM-dd"> + </el-date-picker> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button> @@ -172,7 +170,7 @@ <script> import {dataCenter} from "@/api/platform/data-center"; -import {videoData, carData, faceData, equipment} from "./list"; +import {carData, equipment, faceData, videoData} from "./list"; import {listSecurity, updateSecurity} from '@/api/platform/resource-security'; import {getToken} from "@/utils/auth"; @@ -229,7 +227,7 @@ pageNum: 1, pageSize: 10, keyword: '', - timeRange: [], + date: '', dataType: 0, }, // 琛ㄥ崟鍙傛暟 @@ -264,18 +262,13 @@ // 鑾峰彇褰撳墠鏃ユ湡 const today = new Date(); - // 灏嗘棩鏈熷噺鍘讳竴澶� - const yesterday = new Date(today.getTime() - 24 * 60 * 60 * 1000); - // 鑾峰彇骞淬�佹湀銆佹棩 - const year = yesterday.getFullYear(); - let month = (yesterday.getMonth() + 1).toString().padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑锛屾墍浠ュ姞1 - let day = yesterday.getDate().toString().padStart(2, '0'); + const year = today.getFullYear(); + let month = (today.getMonth() + 1).toString().padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑锛屾墍浠ュ姞1 + let day = today.getDate().toString().padStart(2, '0'); // 鎷兼帴鎴� yyyy-MM-dd 鏍煎紡 - let yesterday1 = `${year}-${month}-${day}`; - this.queryParams.timeRange = [yesterday1, yesterday1] - this.index = this.$route.query.index; + this.queryParams.date = `${year}-${month}-${day}`; if (this.$route.query.type === '1') { let data = videoData.table.filter(item => item.index === this.$route.query.index)[0] this.tableHead = data.columns; @@ -300,6 +293,7 @@ this.cardList = data.card; this.showList = data.showList; } + this.getDicts(this.$route.query.dict) this.getList(); }, methods: { @@ -356,10 +350,6 @@ this.loading = true; if (this.index === 'image_resource_security') { this.getSecurityCard() - } - if (this.queryParams.timeRange && this.queryParams.timeRange.length > 0) { - this.queryParams.startTime = this.queryParams.timeRange[0] - this.queryParams.endTime = this.queryParams.timeRange[1] } dataCenter(url, this.queryParams).then(response => { response.data.list = response.data.list && response.data.list.length > 0 ? response.data.list : [] diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js index 74f009e..cbfbebd 100644 --- a/src/views/system/data-manage/data-detail/list.js +++ b/src/views/system/data-manage/data-detail/list.js @@ -1055,9 +1055,15 @@ width: 200, }, { - label: '鏈�杩戠洃娴嬪湪绾跨姸鎬�', + label: '璁惧鐘舵��', align: 'center', prop: 'onlineStr', + width: 200, + }, + { + label: '鏈�杩慞ing鐩戞祴鐘舵��', + align: 'center', + prop: 'pingOnlineStr', width: 200, }, { @@ -1128,9 +1134,15 @@ width: 200, }, { - label: '鏈�杩戠洃娴嬪湪绾跨姸鎬�', + label: '璁惧鐘舵��', align: 'center', prop: 'onlineStr', + width: 200, + }, + { + label: '鏈�杩慞ing鐩戞祴鐘舵��', + align: 'center', + prop: 'pingOnlineStr', width: 200, }, { @@ -1177,6 +1189,9 @@ { key: 3, label: `鐪佸巺鏍囩`, visible: false }, { key: 3, label: `鐪佸巺鏍囩鍒楄〃`, visible: false }, ], + dict: [ + + ] }, { title: "褰曞儚鍙敤鐜�", @@ -1699,9 +1714,15 @@ width: 200, }, { - label: '鏈�杩戠洃娴嬪湪绾跨姸鎬�', + label: '璁惧鐘舵��', align: 'center', prop: 'onlineStr', + width: 200, + }, + { + label: '鏈�杩慞ing鐩戞祴鐘舵��', + align: 'center', + prop: 'pingOnlineStr', width: 200, }, { @@ -2068,9 +2089,15 @@ width: 200, }, { - label: '鏈�杩戠洃娴嬪湪绾跨姸鎬�', + label: '璁惧鐘舵��', align: 'center', prop: 'onlineStr', + width: 200, + }, + { + label: '鏈�杩慞ing鐩戞祴鐘舵��', + align: 'center', + prop: 'pingOnlineStr', width: 200, }, { @@ -2340,9 +2367,15 @@ width: 200, }, { - label: '鏈�杩戠洃娴嬪湪绾跨姸鎬�', + label: '璁惧鐘舵��', align: 'center', prop: 'onlineStr', + width: 200, + }, + { + label: '鏈�杩慞ing鐩戞祴鐘舵��', + align: 'center', + prop: 'pingOnlineStr', width: 200, }, { @@ -3682,12 +3715,18 @@ width: 200, }, { - label: '鏈�杩戠洃娴嬪湪绾跨姸鎬�', + label: '璁惧鐘舵��', align: 'center', prop: 'onlineStr', width: 200, }, { + label: '鏈�杩慞ing鐩戞祴鐘舵��', + align: 'center', + prop: 'pingOnlineStr', + width: 200, + }, + { label: '褰撴棩鐩戞祴娆℃暟', align: 'center', prop: 'checkCount', diff --git a/src/views/system/data-manage/index.vue b/src/views/system/data-manage/index.vue index a431499..165c0a2 100644 --- a/src/views/system/data-manage/index.vue +++ b/src/views/system/data-manage/index.vue @@ -26,7 +26,7 @@ :style="item.ruleName == '' ? 'display:none' : ''" class="col-margin" > - <el-link @click="handleDetail(item, item.ruleIndex, item.apiUrl, item.ruleName)" style="width: 100%"> + <el-link @click="handleDetail(item, item.ruleIndex, item.apiUrl, item.ruleName,item.dict)" style="width: 100%"> <el-card style="min-width: 150px;width:100%; height: 150px; text-align: center" > @@ -389,9 +389,9 @@ path: '/equipment' }); }, - handleDetail(item, index, url, ruleName) { + handleDetail(item, index, url, ruleName,dict) { this.$router.push({ - path: `/data-manage/data-detail/index/1/1?type=${item.ruleCategory}&index=${index}&url=${url}&ruleName=${ruleName}` + path: `/data-manage/data-detail/index/1/1?type=${item.ruleCategory}&index=${index}&url=${url}&ruleName=${ruleName}&dict=${dict}` }); }, }, -- Gitblit v1.8.0