From 59e70e07bd9cb986069b2e4dc2ee881701e601d9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 01 八月 2024 16:38:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/monitor/recovery/index.vue | 4 --
src/views/system/check/result/detail/detail.vue | 5 +-
src/views/system/monitor/video/index.vue | 27 -------------
src/views/system/check/result/index.vue | 31 +++++++++++----
src/views/system/monitor/face/index.vue | 23 -----------
src/views/system/monitor/car/index.vue | 23 -----------
6 files changed, 24 insertions(+), 89 deletions(-)
diff --git a/src/views/system/check/result/detail/detail.vue b/src/views/system/check/result/detail/detail.vue
index c3cf1d4..bc41357 100644
--- a/src/views/system/check/result/detail/detail.vue
+++ b/src/views/system/check/result/detail/detail.vue
@@ -91,7 +91,7 @@
:inline="true"
v-show="showSearch"
>
- <el-form-item label="鑰冩牳鏃ユ湡" prop="name">
+ <el-form-item label="鑰冩牳鏈堝害" prop="name">
<el-date-picker
v-model="queryParams.date"
format="yyyy-MM"
@@ -102,8 +102,7 @@
>
</el-date-picker>
</el-form-item>
- <!-- 瀛ｅ害閫夋嫨 -->
- <el-form-item>
+ <el-form-item label="鑰冩牳瀛ｅ害">
<el-date-picker
:clearable="false"
v-model="queryParams.quarter"
diff --git a/src/views/system/check/result/index.vue b/src/views/system/check/result/index.vue
index 7825ca2..3b5dfac 100644
--- a/src/views/system/check/result/index.vue
+++ b/src/views/system/check/result/index.vue
@@ -35,7 +35,7 @@
<div class="score-item">
<div style="font-size: 15px; margin-bottom: 15px">{{ formatCreateDate(city[0]) }}</div>
</div>
- <div v-for="(score, scoreIndex) in city" :key="scoreIndex">
+ <div v-for="(score, scoreIndex) in filterRepeat(city)" :key="scoreIndex">
<div class="score-item">
<div v-if="score.examineCategory == 2">杞﹁締锛�</div>
<div v-else-if="score.examineCategory == 3">浜鸿劯锛�</div>
@@ -269,14 +269,27 @@
return city.some(score => score.publish === 'UNPUBLISHED');
},
formatCreateDate(item) {
- let date = new Date(item.startDate);
- let year = date.getFullYear();
- let startMonth = date.getMonth() + 1;
- date = new Date(item.endDate);
- let endMonth = date.getMonth() + 1;
- let str = `${year}骞�${startMonth}鏈坄;
- if (startMonth !== endMonth) str += `-${endMonth}鏈坄;
- return str;
+ const date = new Date(item.createTime);
+ const year = date.getFullYear();
+ const month = date.getMonth() + 1; // getMonth() 杩斿洖鐨勬湀浠芥槸浠� 0 寮�濮嬬殑锛屾墍浠ヨ鍔� 1
+ const day = date.getDate();
+
+ // 浣跨敤 padStart 鏂规硶纭繚鏈堜唤鍜屾棩鏈熷缁堟槸涓や綅鏁�
+ const formattedMonth = month.toString().padStart(2, '0');
+ const formattedDay = day.toString().padStart(2, '0');
+
+ return `${year}骞�${formattedMonth}鏈�${formattedDay}鍙穈;
+ },
+ filterRepeat(city) {
+ let list = [];
+ let examineCategorys = [];
+ city.forEach(item => {
+ if (examineCategorys.indexOf(item.examineCategory) === -1) {
+ examineCategorys.push(item.examineCategory);
+ list.push(item);
+ }
+ });
+ return list;
},
/** 瀵艰埅鍒囨崲 */
handleSelect(key) {
diff --git a/src/views/system/monitor/car/index.vue b/src/views/system/monitor/car/index.vue
index 523009d..62d07cf 100644
--- a/src/views/system/monitor/car/index.vue
+++ b/src/views/system/monitor/car/index.vue
@@ -22,14 +22,6 @@
<p>寮傚父鏁�</p >
</div>
<div class="dashboard-item">
- <h3>{{ count.totalViews }}</h3>
- <p>鐢熸垚寮傚父宸ュ崟鏁�</p >
- </div>
- <div class="dashboard-item">
- <h3>{{ count.totalCar }}</h3>
- <p>杩囪溅鏁版嵁鎬婚噺</p >
- </div>
- <div class="dashboard-item">
<h3>{{ count.viewsPercentage }}%</h3>
<p>璁惧杩愯鐜�</p >
</div>
@@ -79,21 +71,6 @@
</el-select>
</el-form-item>
- <el-form-item label="鏄惁鐢熸垚寮傚父宸ュ崟" prop="defaultOrder" label-width="130px">
- <el-select
- v-model="queryParams.defaultOrder"
- placeholder="鏄惁鐢熸垚寮傚父宸ュ崟"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_yes_no"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </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>
diff --git a/src/views/system/monitor/face/index.vue b/src/views/system/monitor/face/index.vue
index d11e4a0..106ac8b 100644
--- a/src/views/system/monitor/face/index.vue
+++ b/src/views/system/monitor/face/index.vue
@@ -22,14 +22,6 @@
<p>寮傚父鏁�</p >
</div>
<div class="dashboard-item">
- <h3>{{ count.totalViews }}</h3>
- <p>鐢熸垚寮傚父宸ュ崟鏁�</p >
- </div>
- <div class="dashboard-item">
- <h3>{{ count.totalFace }}</h3>
- <p>鎶撴媿鏁版嵁鎬婚噺</p >
- </div>
- <div class="dashboard-item">
<h3>{{ count.viewsPercentage }}%</h3>
<p>璁惧杩愯鐜�</p >
</div>
@@ -78,21 +70,6 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鏄惁鐢熸垚寮傚父宸ュ崟" prop="defaultOrder" label-width="130px">
- <el-select
- v-model="queryParams.defaultOrder"
- placeholder="鏄惁鐢熸垚寮傚父宸ュ崟"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_yes_no"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </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>
diff --git a/src/views/system/monitor/recovery/index.vue b/src/views/system/monitor/recovery/index.vue
index 0b47968..a641361 100644
--- a/src/views/system/monitor/recovery/index.vue
+++ b/src/views/system/monitor/recovery/index.vue
@@ -22,10 +22,6 @@
<p>寮傚父鏁�</p >
</div>
<div class="dashboard-item">
- <h3>{{ count.totalViews }}</h3>
- <p>鐢熸垚寮傚父宸ュ崟鏁�</p >
- </div>
- <div class="dashboard-item">
<h3>{{ count.viewsPercentage }}%</h3>
<p>璁惧杩愯鐜�</p >
</div>
diff --git a/src/views/system/monitor/video/index.vue b/src/views/system/monitor/video/index.vue
index 85db04d..87296d4 100644
--- a/src/views/system/monitor/video/index.vue
+++ b/src/views/system/monitor/video/index.vue
@@ -24,18 +24,6 @@
<p>寮傚父鏁�</p >
</div>
<div class="dashboard-item">
- <h3>{{ count.totalViews }}</h3>
- <p>鐢熸垚寮傚父宸ュ崟鏁�</p >
- </div>
- <div class="dashboard-item">
- <h3>{{ count.noStore }}</h3>
- <p>鏃犲瓨鍌�</p >
- </div>
- <div class="dashboard-item">
- <h3>{{ count.partStore }}</h3>
- <p>閮ㄥ垎瀛樺偍</p >
- </div>
- <div class="dashboard-item">
<h3>{{ count.viewsPercentage }}%</h3>
<p>璁惧杩愯鐜�</p >
</div>
@@ -84,21 +72,6 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鏄惁鐢熸垚寮傚父宸ュ崟" prop="defaultOrder" label-width="130px">
- <el-select
- v-model="queryParams.defaultOrder"
- placeholder="鏄惁鐢熸垚寮傚父宸ュ崟"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_yes_no"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
--
Gitblit v1.8.0