From 61d03721e35e66214937df9fab548b09fa11170b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 14:00:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java | 19 +++---
admin/src/views/business/admissionStatistics.vue | 51 +++++++---------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 1
admin/src/views/business/carStatistics.vue | 71 ++++++++++++-----------
4 files changed, 68 insertions(+), 74 deletions(-)
diff --git a/admin/src/views/business/admissionStatistics.vue b/admin/src/views/business/admissionStatistics.vue
index adc3cbc..86ce112 100644
--- a/admin/src/views/business/admissionStatistics.vue
+++ b/admin/src/views/business/admissionStatistics.vue
@@ -50,13 +50,14 @@
v-model="value"
:type="dateType"
size="mini"
+ :clearable="false"
@change="getRataLists()"
:value-format="dateType === 'month' ? 'yyyy-MM' : 'yyyy'"
style="margin-left: 20px; width: 130px;"
placeholder="璇烽�夋嫨">
</el-date-picker>
</div>
- <div id="echart2" ref="deptRef" v-if="listZB.length > 0"></div>
+ <div class="echart2" ref="deptRef" v-if="listZB.length > 0"></div>
<div style="width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;" v-else>
<img style="width: 200px;" src="@/assets/images/default_homeimg.png" alt="">
</div>
@@ -74,6 +75,7 @@
<el-date-picker
v-model="date1"
:type="radio"
+ :clearable="false"
size="mini"
@change="getReportLists()"
:value-format="radio === 'month' ? 'yyyy-MM' : 'yyyy'"
@@ -88,16 +90,7 @@
</div>
<div class="table_box">
<div class="list_content" v-for="(item, index) in list" :key="index">
- <div class="list_head_item">鍌ㄨ繍绉�</div>
- <div class="list_head_item">鑱斿悎宸ユ埧</div>
- <div class="list_head_item">232</div>
- <div class="list_head_item">鍌ㄨ繍绉�</div>
- <div class="list_head_item">鑱斿悎宸ユ埧</div>
- <div class="list_head_item">232</div>
- <div class="list_head_item">鍌ㄨ繍绉�</div>
- <div class="list_head_item">鑱斿悎宸ユ埧</div>
- <div class="list_head_item">232</div>
- <div class="list_head_item">232</div>
+ <div class="list_head_item" v-for="(child, i) in item" :key="i">{{child}}</div>
</div>
</div>
</div>
@@ -106,8 +99,8 @@
<span>鏈勾浜哄憳绱鍏ュ洯缁熻</span>
</div>
<div class="list_head">
- <div class="list_head_item">杞﹁締鍒嗙被</div>
- <div class="list_head_item">鍏ュ眬娆℃暟</div>
+ <div class="list_head_item">浜哄憳鍒嗙被</div>
+ <div class="list_head_item">鍏ュ洯娆℃暟</div>
</div>
<div class="table_box">
<div class="list_content" v-for="(item, index) in info.yearSortList" :key="index">
@@ -155,7 +148,6 @@
daochu() {
reportExportExcel({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 1 }).then(res => {
this.download(res)
- console.log(res.data)
})
},
changeBB() {
@@ -175,19 +167,10 @@
getReportLists() {
getReportList({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 1 })
.then(res => {
- console.log(res)
+ if (res.length === 0) return
- this.column = res.data.map(item => item[0])
-
- const keys = res.data.map(row => row[0]); // 鑾峰彇閿悕
- const values = res.data.map(row => row.slice(1, row.length)); // 鑾峰彇鍊�
-
- this.list = values[0].map((_, index) => {
- return keys.reduce((obj, key, i) => {
- obj[key] = values[i][index];
- return obj;
- }, {});
- });
+ this.column = res[0]
+ this.list = res.slice(1, res.length);
})
},
changeDateType() {
@@ -207,7 +190,6 @@
getRataLists() {
getRataList({ dateStr: this.value, isGroupBy: this.isGroupBy, type: 1 })
.then(res => {
- console.log(res)
this.listZB = res
this.$nextTick(() => {
this.initDept()
@@ -240,6 +222,9 @@
top: '20%',
containLabel: true
},
+ tooltip: {
+ trigger: 'item'
+ },
xAxis: {
type: 'category',
data: names
@@ -263,7 +248,7 @@
initDept() {
if (!this.listZB) return
- const myChart = echarts.init(document.querySelector('#echart2'))
+ const myChart = echarts.init(document.querySelector('.echart2'))
let data = this.listZB.map(item => {
return {
@@ -273,6 +258,14 @@
})
let option = {
+ tooltip: {
+ trigger: 'item'
+ },
+ legend: {
+ show: false,
+ orient: 'vertical',
+ left: 'left'
+ },
series : [
{
name: '璁块棶鏉ユ簮',
@@ -527,7 +520,7 @@
height: calc(100% - 20px);
padding-left: 20px;
- #echart2 {
+ .echart2 {
width: 100%;
height: calc(100% - 60px);
}
diff --git a/admin/src/views/business/carStatistics.vue b/admin/src/views/business/carStatistics.vue
index 6efb20e..eab7479 100644
--- a/admin/src/views/business/carStatistics.vue
+++ b/admin/src/views/business/carStatistics.vue
@@ -50,13 +50,14 @@
v-model="value"
:type="dateType"
size="mini"
+ :clearable="false"
@change="getRataLists()"
:value-format="dateType === 'month' ? 'yyyy-MM' : 'yyyy'"
style="margin-left: 20px; width: 130px;"
placeholder="璇烽�夋嫨">
</el-date-picker>
</div>
- <div id="echart2" ref="deptRef" v-if="listZB.length > 0"></div>
+ <div class="echart_2" ref="deptRef" v-if="listZB.length > 0"></div>
<div style="width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;" v-else>
<img style="width: 200px;" src="@/assets/images/default_homeimg.png" alt="">
</div>
@@ -72,13 +73,14 @@
<el-radio-button label="year">骞�</el-radio-button>
</el-radio-group>
<el-date-picker
- v-model="date1"
- :type="radio"
- size="mini"
- @change="getReportLists()"
- :value-format="radio === 'month' ? 'yyyy-MM' : 'yyyy'"
- style="margin-left: 20px; width: 130px;"
- placeholder="璇烽�夋嫨">
+ v-model="date1"
+ :type="radio"
+ size="mini"
+ :clearable="false"
+ @change="getReportLists()"
+ :value-format="radio === 'month' ? 'yyyy-MM' : 'yyyy'"
+ style="margin-left: 20px; width: 130px;"
+ placeholder="璇烽�夋嫨">
</el-date-picker>
</div>
<el-button type="primary" size="mini" style="margin-left: 20px;" @click="daochu">瀵煎嚭</el-button>
@@ -88,16 +90,7 @@
</div>
<div class="table_box">
<div class="list_content" v-for="(item, index) in list" :key="index">
- <div class="list_head_item">鍌ㄨ繍绉�</div>
- <div class="list_head_item">鑱斿悎宸ユ埧</div>
- <div class="list_head_item">232</div>
- <div class="list_head_item">鍌ㄨ繍绉�</div>
- <div class="list_head_item">鑱斿悎宸ユ埧</div>
- <div class="list_head_item">232</div>
- <div class="list_head_item">鍌ㄨ繍绉�</div>
- <div class="list_head_item">鑱斿悎宸ユ埧</div>
- <div class="list_head_item">232</div>
- <div class="list_head_item">232</div>
+ <div class="list_head_item" v-for="(child, i) in item" :key="i">{{child}}</div>
</div>
</div>
</div>
@@ -107,7 +100,7 @@
</div>
<div class="list_head">
<div class="list_head_item">杞﹁締鍒嗙被</div>
- <div class="list_head_item">鍏ュ眬娆℃暟</div>
+ <div class="list_head_item">鍏ュ洯娆℃暟</div>
</div>
<div class="table_box">
<div class="list_content" v-for="(item, index) in info.yearSortList" :key="index">
@@ -175,19 +168,12 @@
getReportLists() {
getReportList({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 0 })
.then(res => {
+ if (res.length === 0) return
+
+ this.column = res[0]
+ this.list = res.slice(1, res.length);
+
console.log(res)
-
- this.column = res.data.map(item => item[0])
-
- const keys = res.data.map(row => row[0]); // 鑾峰彇閿悕
- const values = res.data.map(row => row.slice(1, row.length)); // 鑾峰彇鍊�
-
- this.list = values[0].map((_, index) => {
- return keys.reduce((obj, key, i) => {
- obj[key] = values[i][index];
- return obj;
- }, {});
- });
})
},
changeDateType() {
@@ -207,7 +193,6 @@
getRataLists() {
getRataList({ dateStr: this.value, isGroupBy: this.isGroupBy, type: 0 })
.then(res => {
- console.log(res)
this.listZB = res
this.$nextTick(() => {
this.initDept()
@@ -233,6 +218,14 @@
let datas = this.info.cumulativeDataList.map(item => item.total)
let option = {
+ tooltip: {
+ trigger: 'item'
+ },
+ legend: {
+ show: false,
+ orient: 'vertical',
+ left: 'left'
+ },
grid: {
left: '5%',
right: '10%',
@@ -261,9 +254,9 @@
},
// 杞﹁締鍒嗙被缁熻
initDept() {
- if (!this.listZB) return
+ if (this.listZB.length === 0) return
- const myChart = echarts.init(document.querySelector('#echart2'))
+ const myChart = echarts.init(document.querySelector('.echart_2'))
let data = this.listZB.map(item => {
return {
@@ -273,6 +266,14 @@
})
let option = {
+ tooltip: {
+ trigger: 'item'
+ },
+ legend: {
+ show: false,
+ orient: 'vertical',
+ left: 'left'
+ },
series : [
{
name: '璁块棶鏉ユ簮',
@@ -527,7 +528,7 @@
height: calc(100% - 20px);
padding-left: 20px;
- #echart2 {
+ .echart_2 {
width: 100%;
height: calc(100% - 60px);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
index 9791dcb..9a268c9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
@@ -351,7 +351,8 @@
rataList.add(generalDataVO);
}
}else{
- List<String> categoryNameList = yearList.stream().filter(i-> StringUtils.isNotBlank(i.getCategoryParentName())).map(i->i.getCategoryParentName()).collect(Collectors.toList());
+ List<String> categoryNameList = yearList.stream().filter(i-> StringUtils.isNotBlank(i.getCategoryParentName()))
+ .map(i->i.getCategoryParentName()).collect(Collectors.toList());
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categoryNameList)){
Set<String> setList = new HashSet<>(categoryNameList);
for (String categoryName:setList) {
@@ -402,7 +403,7 @@
if(Constants.equalsInteger(DateUtil.getNowYearNum(),Integer.valueOf(inParkDataDTO.getDateStr()))){
maxMonth = DateUtil.getNowMonthNum();
}
- for (int i = maxMonth; i >=0 ; i--) {
+ for (int i = maxMonth; i >0 ; i--) {
dateList.add(DateUtil.getNowYearNum()+"-"+ StringUtils.leftPad(i+"",2,"0"));
}
}else {
@@ -420,7 +421,7 @@
lastDay = today;
}
}
- for (int i = lastDay; i >= 0 ; i--) {
+ for (int i = lastDay; i > 0 ; i--) {
dateList.add(year + "-" + StringUtils.leftPad(month.toString(),2,"0") + "-" + StringUtils.leftPad(Integer.toString(i),2,"0"));
}
}
@@ -443,11 +444,11 @@
}
totalString.add("鍚堣");
resultList.add(totalString);
- Integer total = 0;
for (String str:dataList) {
+ Integer total = 0;
+ List<String> dataChildList = new ArrayList<>();
+ dataChildList.add(str);
for (String categoryName:setList) {
- List<String> dataChildList = new ArrayList<>();
- dataChildList.add(str);
if(Constants.equalsInteger(dateStr.length(),4)){
Integer childNum = allList.stream().filter(i->categoryName.equals(i.getCategoryName())
&& DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(str)).collect(Collectors.toList()).size();
@@ -463,9 +464,9 @@
);
total = total + childNum;
}
- dataChildList.add(Integer.toString(total));
- resultList.add(dataChildList);
}
+ dataChildList.add(Integer.toString(total));
+ resultList.add(dataChildList);
}
}else{
for (int j = 0; j < userTypeList.length; j++) {
@@ -526,7 +527,6 @@
person -> person,
(existing, replacement) -> existing
));
-
List<InoutRecord> uniqueList = new ArrayList<>(uniqueByMemberPhone.values());
return uniqueList;
}
@@ -538,7 +538,6 @@
person -> person,
(existing, replacement) -> existing
));
-
List<InoutRecord> uniqueList = new ArrayList<>(uniqueByCarCode.values());
return uniqueList;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 59b2fce..498d6c2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1907,6 +1907,7 @@
visitVO.setName(days);
InterestedListVO carVO = new InterestedListVO();
+ carVO.setNum(Constants.ZERO);
carVO.setName(days);
if(CollectionUtils.isNotEmpty(inoutRecordList)){
--
Gitblit v1.9.3