From 9e8d1bd0b6fb495920921214775b84d490e032a3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 16:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/data-manage/data-detail/index.vue | 178 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 130 insertions(+), 48 deletions(-)
diff --git a/src/views/system/data-manage/data-detail/index.vue b/src/views/system/data-manage/data-detail/index.vue
index 63842fe..f5cb7d6 100644
--- a/src/views/system/data-manage/data-detail/index.vue
+++ b/src/views/system/data-manage/data-detail/index.vue
@@ -1,17 +1,25 @@
<template>
<div class="app-container">
+ <div style="display: flex;flex-direction: row;min-width: 158px;max-width: 158px;margin-bottom: 5px;border-radius: 1px; user-select: none">
+ <div @click="clickTab(0)" class="tab" :class="{tabActive: 0 === queryParams.dataType, tabInactive: 0 !== queryParams.dataType}">鍏ㄩ儴</div>
+ <div @click="clickTab(1)" class="tab" :class="{tabActive: 1 === queryParams.dataType, tabInactive: 1 !== queryParams.dataType}">鐪佸巺鑰冩牳</div>
+ </div>
<el-card class="box-card" v-show="index !== 'image_resource_security'">
<el-row style="display: flex; flex-direction: row; align-items: center" justify="space-between">
- <div v-for="card in cardList" style="display: flex;flex-direction: row; margin-right: 50px" :key="card.label">
+ <div style="font-size: 18px;min-width: 200px;height: 80px;display: flex;align-items: center">{{ruleName}}</div>
+ <div v-if="cardList && cardList.length > 0" v-for="card in cardList" style="display: flex;flex-direction: row; margin-right: 50px;margin-left: 20px;align-items: center" :key="card.label">
<div>
<div class="icon-container">
<i :class="card.icon"></i>
</div>
</div>
- <div v-for="data, index in card.dataList" class="dashboard-item" :key="data.label">
- <div style="color: #5C9BF8;margin-bottom: 20px;font-size: 20px">{{ platformList.count[index] }}</div>
- <div>{{ data.label }}</div>
+ <div v-if="card.dataList && card.dataList.length > 0" style="display: flex; flex-direction: row">
+ <div v-if="data" v-for="(data, index) in card.dataList" class="dashboard-item" :key="data.label">
+ <div style="color: #5C9BF8;margin-bottom: 20px;font-size: 20px">{{ tableData.count[index] }}</div>
+ <div>{{ data.label }}</div>
+ </div>
</div>
+
</div>
<!-- <el-col :span="1">-->
<!-- <div class="dashboard-item">-->
@@ -22,26 +30,35 @@
</el-row>
</el-card>
- <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
- <!-- <el-form-item label="鍗″彛缂栧彿" prop="bayonetNumber">-->
- <!-- <el-input v-model="queryParams.bayonetNumber" placeholder="璇疯緭鍏ュ崱鍙ｇ紪鍙�" clearable-->
- <!-- @keyup.enter.native="handleQuery" />-->
- <!-- </el-form-item>-->
- <!-- <el-form-item label="鍗″彛鍚嶇О" prop="bayonetName">-->
- <!-- <el-input v-model="queryParams.bayonetName" placeholder="璇疯緭鍏ュ崱鍙ｅ悕绉�" clearable @keyup.enter.native="handleQuery" />-->
- <!-- </el-form-item>-->
- <!-- <el-form-item>-->
- <!-- <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>-->
- <!-- <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>-->
- <!-- </el-form-item>-->
- <!-- </el-form>-->
+ <div style="display: flex;position: relative">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+ <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="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ <right-toolbar style="position: absolute;right: 0px" v-show="index !== 'image_resource_security'" :showSearch.sync="showSearch" @queryTable="handleQuery" :columns="showList"></right-toolbar>
+ </div>
+
<el-row :gutter="10" class="mb8" v-show="index === 'image_resource_security'">
<el-container>
<el-main>
<h2>瑙嗛鍥惧儚璧勬簮瀹夊叏绠＄悊</h2>
<el-row :gutter="20">
- <el-col :xl="3" :lg="3" :md="6" :sm="6" :xs="12" v-for="(item, index) in imageResourceSecurity" :key="index"
+ <el-col :xl="3" :lg="3" :md="6" :sm="6" :xs="12" v-if="imageResourceSecurity && imageResourceSecurity.length > 0" v-for="(item, index) in imageResourceSecurity" :key="index"
class="col-margin">
<el-card style="
min-width: 150px;
@@ -55,7 +72,7 @@
</el-button>
</div>
<div style="font-size: 14px;height: 50px; font-weight: bold;">{{ item.deptName }}</div>
- <div style="font-size: 14px;">璧勬簮锛歿{ item.imageResourceSecurity }}</div>
+ <div style="font-size: 14px;">寰楀垎锛歿{ item.imageResourceSecurity }}</div>
<!-- <div style="font-size: 14px;">瑙嗛浼犺緭缃戣祫浜у噯纭巼锛歿{ item.propertyAccuracy }}</div>
<div style="font-size: 14px;">寮卞彛浠ゅ緱鍒嗭細{{ item.weakPassword }}</div>
<div style="font-size: 14px;">瑙嗛浼犺緭缃戝嵄闄╄祫浜ф瘮渚嬶細{{ item.riskProperty }}</div>
@@ -70,12 +87,14 @@
v-hasPermi="['platform:platform:export']">瀵煎叆
</el-button>
</el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="platformList.list">
- <el-table-column :prop="item.prop" :label="item.label" v-for="(item, index) in tableHead" :key="index" />
- </el-table>
+ <div>
+ <el-table v-loading="loading" :data="tableData.list">
+ <el-table-column :prop="item.prop" :label="item.label" :width="item.width" v-for="(item, index) in tableHead" :key="index" v-if="showListPD(item)"/>
+ </el-table>
+ </div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
@@ -87,23 +106,26 @@
<el-input v-model="resourceForm.deptName" disabled />
</el-form-item>
<el-form-item label="骞冲彴杩愯鐜�" prop="platformOnline">
- <el-input-number v-model="resourceForm.platformOnline" />
+ <el-input-number v-model="resourceForm.platformOnline" :precision="2" :step="0.1" :min="0" :max="1"/>
</el-form-item>
<el-form-item label="瑙嗛浼犺緭缃戣祫浜у噯纭巼" prop="propertyAccuracy">
- <el-input-number v-model="resourceForm.propertyAccuracy" />
+ <el-input-number v-model="resourceForm.propertyAccuracy" :precision="2" :step="0.1" :min="0" :max="1"/>
</el-form-item>
<el-form-item label="寮卞彛浠ゅ緱鍒�" prop="weakPassword">
- <el-input-number v-model="resourceForm.weakPassword" />
+ <el-input-number v-model="resourceForm.weakPassword" :precision="2" :step="0.1" :min="0" :max="1"/>
</el-form-item>
<el-form-item label="瑙嗛浼犺緭缃戝嵄闄╄祫浜ф瘮渚�" prop="riskProperty">
- <el-input-number v-model="resourceForm.riskProperty" />
+ <el-input-number v-model="resourceForm.riskProperty" :precision="2" :step="0.1" :min="0" :max="1"/>
</el-form-item>
- <el-form-item label="瑙嗛浼犺緭缃戣竟鐣屽畬鏁存�ф娴嬫墸鍒嗛」" prop="boundaryIntegrity">
- <el-input-number v-model="resourceForm.boundaryIntegrity" />
- </el-form-item>
+ <el-tooltip class="item" effect="dark" content="杩濊杩炴帴浜掕仈缃戞墸鍑�20涓櫨鍒嗙偣/娆★紝杩濊鏃犵嚎AP鎺ュ叆銆侀殢韬玾ifi鎺ュ叆銆佸叡浜綉缁滃悇鎵ｅ噺5涓櫨鍒嗙偣/娆★紝鐩磋嚦姝ら」鎸囨爣鎵ｅ畬涓烘銆�" placement="top-start">
+ <el-form-item label="瑙嗛浼犺緭缃戣竟鐣屽畬鏁存�ф娴嬫墸鍒嗛」" prop="boundaryIntegrity">
+ <el-input-number v-model="resourceForm.boundaryIntegrity" :precision="2" :step="0.1" :min="0" :max="1"/>
+ </el-form-item>
+ </el-tooltip>
+
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button @click="cancel">鍙� 娑�</el-button>
+ <el-button @click="cancelR">鍙� 娑�</el-button>
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
</div>
</el-dialog>
@@ -137,6 +159,11 @@
import { getToken } from "@/utils/auth";
export default {
name: "Platform",
+ computed: {
+ ruleName() {
+ return this.$route.query.ruleName
+ }
+ },
data() {
return {
// 瀵煎叆鍙傛暟
@@ -171,8 +198,9 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
- // 鍗″彛杩囪溅鏁版嵁涓�鑷存�ц〃鏍兼暟鎹�
- platformList: [],
+ tableData: {
+ list: []
+ },
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -181,9 +209,9 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- regionCode: null,
- bayonetName: null,
- bayonetNumber: null,
+ keyword: '',
+ timeRange: [],
+ dataType: 0,
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -205,45 +233,73 @@
{ required: true, message: "璇疯緭鍏ヨ棰戜紶杈撶綉鍗遍櫓璧勪骇姣斾緥", trigger: "blur" },
{ type: "number", message: "瑙嗛浼犺緭缃戝嵄闄╄祫浜ф瘮渚嬪繀椤讳负鏁板瓧", trigger: "blur" }
],
- boundaryIntegrity: [
- { required: true, message: "璇疯緭鍏ヨ棰戜紶杈撶綉杈圭晫瀹屾暣鎬ф娴嬫墸鍒嗛」", trigger: "blur" },
- { type: "number", message: "瑙嗛浼犺緭缃戣竟鐣屽畬鏁存�ф娴嬫墸鍒嗛」蹇呴』涓烘暟瀛�", trigger: "blur" }
- ]
+
},
+ showList: [],
tableHead: [],
cardList: [],
index: null
};
},
- beforeRouteEnter(to, from, next) {
- console.log(to);
- next();
- },
- created() {
+ mounted() {
+ // 鑾峰彇褰撳墠鏃ユ湡
+ 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');
+
+ // 鎷兼帴鎴� yyyy-MM-dd 鏍煎紡
+ let yesterday1 = `${year}-${month}-${day}`;
+ this.queryParams.timeRange = [yesterday1, yesterday1]
this.index = this.$route.query.index;
if (this.$route.query.type === '1') {
let data = videoData.table.filter(item => item.index === this.$route.query.index)[0]
this.tableHead = data.columns;
this.cardList = data.card;
+ this.showList = data.showList;
}
if (this.$route.query.type === '2') {
let data = carData.table.filter(item => item.index === this.$route.query.index)[0]
this.tableHead = data.columns;
this.cardList = data.card;
+ this.showList = data.showList;
}
if (this.$route.query.type === '3') {
let data = faceData.table.filter(item => item.index === this.$route.query.index)[0]
this.tableHead = data.columns;
this.cardList = data.card;
+ this.showList = data.showList;
}
if (this.$route.query.type === '4') {
let data = equipment.table.filter(item => item.index === this.$route.query.index)[0]
this.tableHead = data.columns;
this.cardList = data.card;
+ this.showList = data.showList;
}
this.getList();
},
methods: {
+ clickTab(active) {
+ this.queryParams.dataType = active
+ this.getList()
+ },
+ showListPD(item) {
+ if (!this.showList) {
+ return true
+ }
+ let arr = this.showList.filter(d => d.label === item.label)
+ if (item && (!arr || arr.length <1)) {
+ return true;
+ } else {
+ return item && arr && arr.length > 0 && arr[0].visible
+ }
+
+ },
/** 淇敼鎸夐挳鎿嶄綔 */
handleResourceUpdate(row) {
this.reset("resourceForm");
@@ -265,7 +321,7 @@
});
},
// 鍙栨秷鎸夐挳
- cancel() {
+ cancelR() {
this.resourceOpen = false;
this.reset("resourceForm");
},
@@ -282,14 +338,19 @@
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 => {
- this.platformList = response.data;
+ response.data.list = response.data.list && response.data.list.length >0 ? response.data.list : []
+ this.tableData = response.data;
this.total = response.total;
this.loading = false;
});
},
// 鍙栨秷鎸夐挳
- cancel() {
+ cancelImport() {
this.open = false;
this.reset();
},
@@ -349,6 +410,26 @@
};
</script>
<style scoped>
+.tab {
+ padding: 5px 15px;
+}
+.tab:hover {
+ cursor: pointer;
+ user-select: none;
+}
+.tabActive {
+ color: white;
+ background-color: #409eff;
+ border: none;
+ border-radius: 1px;
+}
+.tabInactive {
+ background-color: #edf2f6;
+ color: #409eff;
+}
+.tabInactive:hover {
+ background-color: #edf2f6;
+}
.box-card {
background-color: #F5F9FE;
width: 100%;
@@ -382,5 +463,6 @@
justify-content: center;
align-items: center;
width: 150px;
+ margin: 0 30px;
}
</style>
--
Gitblit v1.8.0