From 54e81529b5644b10ebe9aa56c811c27e27bba59e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 19 十二月 2025 13:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/index.vue | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index a1c4508..455ce35 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: {},
@@ -244,10 +245,11 @@
warningTotal: 0,
funcList: [
{ 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_func4.png') },
- { name: '椋熷爞娑堣垂', path: '', url: require('@/assets/icons/8.png') }
+ // { 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_func4.png') },
+ // { name: '椋熷爞娑堣垂', path: '', url: require('@/assets/icons/8.png') }
],
isShowDetail: false,
isShowReport: false,
@@ -374,6 +376,7 @@
updateDate () {
this.nowDate = dayjs().format('YYYY骞碝鏈圖鏃�')
this.nowWeek = weeks[new Date().getDay()]
+ this.timeInfo = new Date().getHours() < 12 ? '涓婂崍' : '涓嬪崍'
},
initData () {
this.getWorkHead()
@@ -395,6 +398,7 @@
},
getWorkBody () {
getWorkbenchData({ queryType: 2 }).then(res => {
+ console.log(res)
this.staticData = res || {}
this.initEchart2()
this.initEchart21()
@@ -409,7 +413,7 @@
arr.push({ name: '璁垮', value: this.headerData.inParkVisitUserNum })
arr.push({ name: '鍐呴儴鍛樺伐', value: this.headerData.todayInParkUserNum - this.headerData.inParkLwUserNum - this.headerData.inParkVisitUserNum - this.headerData.inParkDriverUserNum })
arr.push({ name: '闀挎湡鐩稿叧鏂�', value: this.headerData.inParkLwUserNum })
- arr.push({ name: '璐ц繍鍙告満', value: this.headerData.inParkDriverUserNum })
+ // arr.push({ name: '璐ц繍鍙告満', value: this.headerData.inParkDriverUserNum })
arr.sort((a, b) => b.value - a.value)
this.manningRatio = arr
this.initEchart1()
@@ -516,6 +520,7 @@
if (!document.getElementById('echart2')) {
return
}
+ echarts.dispose(document.getElementById('echart2'))
const myChart = echarts.init(document.getElementById('echart2'))
const that = this
var ydata = that.staticData.internalList.map(i => i.num)
@@ -620,16 +625,16 @@
})
},
initEchart21 () {
- console.log('initEchart21')
+ console.log('initEchart21', this.staticData.lwList)
if (!document.getElementById('echart21')) {
return
}
-
+ echarts.dispose(document.getElementById('echart21'))
const myChart = echarts.init(document.getElementById('echart21'))
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: [
{
@@ -697,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
}
--
Gitblit v1.9.3