From 19d580bb401fc9fe7ddea245d52d79d29f4248ab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 19 十二月 2025 09:11:34 +0800
Subject: [PATCH] 最新版本541200007最新版本541200007
---
admin/src/views/index.vue | 12 +++++++-----
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.java | 1 -
admin/src/views/business/carStatistics.vue | 2 +-
admin/src/views/business/regionDevice.vue | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/business/carStatistics.vue b/admin/src/views/business/carStatistics.vue
index 6d31df8..2f250fb 100644
--- a/admin/src/views/business/carStatistics.vue
+++ b/admin/src/views/business/carStatistics.vue
@@ -285,7 +285,7 @@
},
xAxis: {
type: 'category',
- data: names
+ data: names ||[]
},
yAxis: {
type: 'value',
diff --git a/admin/src/views/business/regionDevice.vue b/admin/src/views/business/regionDevice.vue
index 4cc8669..1aa5bfe 100644
--- a/admin/src/views/business/regionDevice.vue
+++ b/admin/src/views/business/regionDevice.vue
@@ -111,7 +111,7 @@
}) .catch(e => {
})
.finally(() => {
- this.isWorking.loading = false
+ this.isWorking.loading = falsex
})
},
getDepartmentTree (tree) {
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index 781ee02..6409edf 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -2,7 +2,7 @@
<div class="main_home">
<!-- <div style="position: fixed;z-index: 99999"><video style="height: 100px;width: 500px" src="rtsp://10.50.250.253:554/openUrl/K2y2vE4" controls></video></div> -->
<div class="home_header">
- <div class="mb10 fs17">涓嬪崍濂斤紝{{ userInfo.realname }}</div>
+ <div class="mb10 fs17">{{timeInfo}}濂斤紝{{ userInfo.realname }}</div>
<div class="fs13">
浠婂ぉ鏄� {{ nowDate }} {{ nowWeek }}锛屾杩庤闂櫤鎱х墿娴佸洯鍖哄畨娑堜竴浣撳寲绯荤粺
</div>
@@ -233,6 +233,7 @@
return {
tabPosition: 'right',
colors,
+ timeInfo: '涓婂崍',
nowDate: '',
nowWeek: '',
headerData: {},
@@ -246,7 +247,7 @@
{ name: '璁垮鎶ュ', path: '', url: require('@/assets/icons/home_func1.png'), path: '/business/reportRecord' },
// { name: '闅愭偅闅忔墜鎷�', path: '', url: require('@/assets/icons/home_func2.png'), path: '/operation/danger/record' },
// { name: '棰勭害浼氳瀹�', path: '', url: require('@/assets/icons/home_func3.png'), path: '/meeting/bookings' },
- { name: '鍏姟杞﹂绾�', path: '', url: require('@/assets/icons/home_func5.png'), path: '/operation/serviceCar/apprRecord' },
+ { name: '鍏姟杞﹂绾�', path: '', url: require('@/assets/icons/home_func5.png'), path: '/operation/serviceCar/apprRecord' }
// { name: '鑰冨嫟宸ヤ綔鍙�', path: '', url: require('@/assets/icons/home_func4.png') },
// { name: '椋熷爞娑堣垂', path: '', url: require('@/assets/icons/8.png') }
],
@@ -375,6 +376,7 @@
updateDate () {
this.nowDate = dayjs().format('YYYY骞碝鏈圖鏃�')
this.nowWeek = weeks[new Date().getDay()]
+ this.timeInfo = new Date().getHours() < 12 ? '涓婂崍' : '涓嬪崍'
},
initData () {
this.getWorkHead()
@@ -623,7 +625,7 @@
})
},
initEchart21 () {
- console.log('initEchart21',this.staticData.lwList)
+ console.log('initEchart21', this.staticData.lwList)
if (!document.getElementById('echart21')) {
return
}
@@ -632,7 +634,7 @@
const that = this
var le1 = that.staticData.internalList.length
var le2 = that.staticData.lwList.length
- const end = Math.round(40 * ((le1>0&& le2>0?le1:1) / (le1>0&& le2>0?le2:1)))+10
+ const end = Math.round(40 * ((le1 > 0 && le2 > 0 ? le1 : 1) / (le1 > 0 && le2 > 0 ? le2 : 1))) + 10
myChart.setOption({
dataZoom: [
{
@@ -700,7 +702,7 @@
yAxis: {
type: 'category',
inverse: true,
- data: that.staticData.lwList.map(i => i.name),
+ data: that.staticData.lwList.map(i => i.name),
axisLabel: {
interval: 0
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.java
index 80a4a5f..05eb1cc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutRecord.java
@@ -20,7 +20,6 @@
@ApiModel("鍑哄叆鍦轰汉娆¤溅娆℃瘡鏃ョ粺璁¤〃")
@TableName("`inout_record`")
public class InoutRecord {
-
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
private Integer id;
--
Gitblit v1.9.3