From 5841a771d4455d25adb185b8a0637c9ba498aab2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 21 十月 2025 15:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/index.vue | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 208 insertions(+), 15 deletions(-)
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index 623c258..65464e5 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -32,8 +32,8 @@
<img src="@/assets/icons/home_icon2.png" alt="" />
</div>
<div class="content">
- <div>璁垮浜烘(浜�)锛歿{ headerData.visitUserNum }}</div>
- <div>绛剧浜烘(浜�)锛歿{ headerData.signLevelNum }}</div>
+ <div>鍏ュ洯浜烘(浜�)锛歿{ headerData.visitUserNum }}</div>
+ <div>鍑哄洯浜烘(浜�)锛歿{ headerData.signLevelNum }}</div>
</div>
</div>
<div class="card">
@@ -100,12 +100,17 @@
</div>
<div class="wrap static2">
<div class="header">
- <div class="home_title">闀挎湡鐩稿叧鏂瑰垎甯�</div>
+<!-- <div class="home_title">闀挎湡鐩稿叧鏂瑰垎甯�</div>-->
+ <el-radio-group v-model="tabPosition" @change="changeType">
+ <el-radio-button label="right">鍐呴儴浜哄憳鍒嗗竷</el-radio-button>
+ <el-radio-button label="top">闀挎湡鐩稿叧鏂瑰垎甯�</el-radio-button>
+ </el-radio-group>
<!-- <div class="df_ac more">
鏇村<i class="el-icon-arrow-right"></i>
</div> -->
</div>
- <div class="echart" id="echart2"></div>
+ <template v-if="tabPosition==='right'" > <div class="echart" id="echart2"></div></template>
+ <template v-if="tabPosition==='top'" > <div class="echart" id="echart21"></div></template>
</div>
</div>
<div class="df">
@@ -226,6 +231,7 @@
},
data () {
return {
+ tabPosition: 'right',
colors,
nowDate: '',
nowWeek: '',
@@ -240,8 +246,9 @@
{ 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_func4.png') },
- { name: '椋熷爞娑堣垂鍏ュ彛', path: '', url: require('@/assets/icons/8.png') }
+ { name: '椋熷爞娑堣垂', path: '', url: require('@/assets/icons/8.png') }
],
isShowDetail: false,
isShowReport: false,
@@ -264,7 +271,12 @@
this.initData()
},
methods: {
- getNoticeList(){
+ changeType (e) {
+ console.log(e)
+ this.initEchart2()
+ this.initEchart21()
+ },
+ getNoticeList () {
syncHkNotice().then(res => {
})
@@ -350,11 +362,13 @@
getAppHeaderNav(4).then(res => {
window.open(res, '_blank')
})
+ return
}
- if (item.name == '椋熷爞娑堣垂鍏ュ彛') {
+ if (item.name == '椋熷爞娑堣垂') {
getAppHeaderNav(6).then(res => {
window.open(res, '_blank')
})
+ return
}
this.$router.push(item.path)
},
@@ -382,8 +396,10 @@
},
getWorkBody () {
getWorkbenchData({ queryType: 2 }).then(res => {
+ console.log(res)
this.staticData = res || {}
this.initEchart2()
+ this.initEchart21()
this.initEchart3()
this.initEchart4()
})
@@ -393,8 +409,9 @@
this.headerData = res || {}
const arr = []
arr.push({ name: '璁垮', value: this.headerData.inParkVisitUserNum })
- arr.push({ name: '鍐呴儴鍛樺伐', value: this.headerData.todayInParkUserNum - this.headerData.inParkLwUserNum - 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.sort((a, b) => b.value - a.value)
this.manningRatio = arr
this.initEchart1()
@@ -419,7 +436,7 @@
},
handleDetail (row) {
if (row.type === 7) {
- this.handleTest(row);
+ this.handleTest(row)
return
}
if (row.objType === 2) {
@@ -497,9 +514,49 @@
})
},
initEchart2 () {
+ console.log('initEchart2')
+ 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)
+ let maxNum = 1
+ ydata.forEach((item, index) => {
+ maxNum = item > maxNum ? item : maxNum
+ })
myChart.setOption({
+ dataZoom: [
+ {
+ type: 'slider', // 婊戝姩鏉＄被鍨�
+ orient: 'vertical',
+ left: 'left',
+ showDetail: false,
+ start: 0, // 璧峰浣嶇疆锛堢櫨鍒嗘瘮锛�
+ end: 40, // 缁撴潫浣嶇疆锛堢櫨鍒嗘瘮锛夛紝鎺у埗鍒濆鏄剧ず鑼冨洿
+ width: 4,
+ dataBackground: {
+ areaStyle: { opacity: 0 }, // 璁剧疆鑳屾櫙閫忔槑
+ lineStyle: { opacity: 0 } // 璁剧疆鑳屾櫙閫忔槑
+ }
+ // moveOnMouseWheel: true,
+ },
+ {
+ type: 'inside', // 鐢ㄤ簬鐩戝惉婊氳疆浜嬩欢
+ orient: 'vertical',
+ start: 0,
+ end: 40,
+ showDetail: false,
+ minSpan: 40,
+ dataBackground: {
+ areaStyle: { opacity: 0 } // 璁剧疆鑳屾櫙閫忔槑
+ },
+ maxSpan: 40,
+ zoomLock: true // 閿佸畾缂╂斁锛堜粎鍏佽骞崇Щ锛�
+ // moveOnMouseWheel: true, // 鍚敤婊氳疆骞崇Щ
+ }
+ ],
grid: {
top: '4%',
left: '2%',
@@ -515,18 +572,138 @@
},
xAxis: {
type: 'value',
- position: 'bottom',
+ position: 'top',
splitLine: {
show: true,
lineStyle: {
// 杩欓噷杈撳叆绾挎潯鐨勬牱寮�
color: 'rgba(255,255,255,0.14)'
}
- }
+ },
+ axisLabel: {
+ formatter: function (value) {
+ const intValue = Math.round(value)
+ return intValue > 0 ? intValue : ''
+ }
+ },
+ minInterval: 1,
+ min: 1
+ // max: maxNum
},
yAxis: {
type: 'category',
- data: that.staticData.lwList.map(i => i.name)
+ inverse: true,
+ data: that.staticData.internalList.map(i => i.name),
+ axisLabel: {
+ interval: 0
+ }
+ },
+ series: [
+ {
+ data: ydata,
+ type: 'bar',
+ barWidth: 10,
+ itemStyle: {
+ normal: {
+ color: new echarts.graphic.LinearGradient(
+ 1, 0, 0, 0,
+ [
+ { offset: 0, color: '#56abf8' },
+ { offset: 1, color: '#407ff0' }
+ ]
+ )
+ // barBorderRadius: [0, 10, 10, 0]
+ }
+ }
+ }
+ ]
+ })
+ window.addEventListener('resize', function () { // 鎵ц
+ myChart.resize()
+ })
+ },
+ 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
+ myChart.setOption({
+ dataZoom: [
+ {
+ type: 'slider', // 婊戝姩鏉＄被鍨�
+ orient: 'vertical',
+ left: 'left',
+ showDetail: false,
+ start: 0, // 璧峰浣嶇疆锛堢櫨鍒嗘瘮锛�
+ end: end, // 缁撴潫浣嶇疆锛堢櫨鍒嗘瘮锛夛紝鎺у埗鍒濆鏄剧ず鑼冨洿
+ width: 4,
+ dataBackground: {
+ areaStyle: { opacity: 0 }, // 璁剧疆鑳屾櫙閫忔槑
+ lineStyle: { opacity: 0 } // 璁剧疆鑳屾櫙閫忔槑
+ },
+ zoomLock: true, // 閿佸畾缂╂斁锛堜粎鍏佽骞崇Щ锛�
+ moveOnMouseWheel: true
+ },
+ {
+ type: 'inside', // 鐢ㄤ簬鐩戝惉婊氳疆浜嬩欢
+ orient: 'vertical',
+ start: 0,
+ end: end,
+ showDetail: false,
+ minSpan: end,
+ dataBackground: {
+ areaStyle: { opacity: 0 } // 璁剧疆鑳屾櫙閫忔槑
+ },
+ maxSpan: end,
+ zoomLock: true, // 閿佸畾缂╂斁锛堜粎鍏佽骞崇Щ锛�
+ moveOnMouseWheel: true // 鍚敤婊氳疆骞崇Щ
+ }
+ ],
+ grid: {
+ top: '4%',
+ left: '2%',
+ right: '6%',
+ bottom: '2%',
+ containLabel: true
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'line'
+ }
+ },
+ xAxis: {
+ type: 'value',
+ position: 'top',
+ splitLine: {
+ show: true,
+ lineStyle: {
+ // 杩欓噷杈撳叆绾挎潯鐨勬牱寮�
+ color: 'rgba(255,255,255,0.14)'
+ }
+ },
+ axisLabel: {
+ formatter: function (value) {
+ const intValue = Math.round(value)
+ return intValue > 0 ? intValue : ''
+ }
+ },
+ minInterval: 1,
+ min: 1
+ },
+ yAxis: {
+ type: 'category',
+ inverse: true,
+ data: that.staticData.lwList.map(i => i.name),
+ axisLabel: {
+ interval: 0
+ }
},
series: [
{
@@ -585,6 +762,14 @@
nameTextStyle: {
padding: [0, 0, 4, -30] // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
},
+ axisLabel: {
+ formatter: function (value) {
+ const intValue = Math.round(value)
+ return intValue > 0 ? intValue : ''
+ }
+ },
+ minInterval: 1,
+ min: 1,
splitLine: {
show: true,
lineStyle: {
@@ -667,7 +852,7 @@
<div>${params[0].name}</div>
<div style="display: flex;align-items: center;">
<div style="width: 10px;height: 10px;border-radius: 50%;background-color: #6feef0;"></div>
- <span style="margin-left: 6px;">${params[0].value}</span>
+ <span style="margin-left: 6px;">${params[0].value || 0}</span>
<div>杈�</div>
</div>
</div>
@@ -691,7 +876,15 @@
// 杩欓噷杈撳叆绾挎潯鐨勬牱寮�
color: 'rgba(255,255,255,0.14)'
}
- }
+ },
+ axisLabel: {
+ formatter: function (value) {
+ const intValue = Math.round(value)
+ return intValue > 0 ? intValue : ''
+ }
+ },
+ minInterval: 1,
+ min: 1
},
grid: {
top: '16%',
@@ -1117,7 +1310,7 @@
width: 100%;
height: 100%;
overflow: auto;
- padding: 20px;
+ padding: 20px 20px 40px 20px;
padding-top: 92px;
.home_header {
--
Gitblit v1.9.3