From cb6aca0642ac8dd5de877ade168066d85acb589c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 17 十月 2025 15:54:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/index.vue | 380 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 329 insertions(+), 51 deletions(-)
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index c96cdaa..65464e5 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -1,9 +1,10 @@
<template>
<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="fs13">
- 浠婂ぉ鏄� {{ nowDate }} {{ nowWeek }}锛屾杩庡洖鍒版櫤鎱х墿娴佸洯鍖哄畨娑堜竴浣撳寲绯荤粺
+ 浠婂ぉ鏄� {{ nowDate }} {{ nowWeek }}锛屾杩庤闂櫤鎱х墿娴佸洯鍖哄畨娑堜竴浣撳寲绯荤粺
</div>
</div>
<div class="main">
@@ -31,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">
@@ -99,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">
@@ -133,7 +139,7 @@
<div class="task">
<div class="header df_sb">
<div class="home_title df">
- <span>寰呭姙浜嬮」</span>
+ <span >寰呭姙浜嬮」</span>
<span class="num" v-if="taskTotal">{{ taskTotal }}</span>
</div>
<div class="df_ac more" @click="jumpPage('/task/index')">
@@ -149,7 +155,7 @@
<div class="btn" v-permissions="['business:staging:query']" @click="handleDetail(item)">澶勭悊</div>
</div>
<div v-if="taskList.length == 0" class="empty">
- <img src="@/assets/images/default_nodata.png" alt="">
+ <img src="@/assets/images/default_homeimg.png" alt="">
</div>
</div>
</div>
@@ -167,9 +173,7 @@
<div class="item" v-for="item in warningList" :key="item.id">
<div class="name_wrap df_sb">
<div class="name">{{ item.name }}</div>
- <div class="identity" v-if="item.memberType == 0">鍔冲姟璁垮</div>
- <div class="identity" v-if="item.memberType == 1">鏅�氳瀹�</div>
- <div class="identity" v-if="item.memberType == 2">鍐呴儴浜哄憳</div>
+ <div class="identity">璁垮</div>
</div>
<div class="line">鑱旂郴鐢佃瘽锛歿{ item.phone }}</div>
<div class="line">璁垮鍏徃锛歿{ item.companyName }}</div>
@@ -180,7 +184,7 @@
</div>
</div>
<div v-if="warningList.length == 0" class="empty">
- <img src="@/assets/images/default_nodata.png" alt="">
+ <img src="@/assets/images/default_homeimg.png" alt="">
</div>
</div>
</div>
@@ -204,7 +208,7 @@
import { weeks } from '@/utils/config'
import {
getWorkbenchData,
- getAppHeaderNav
+ getAppHeaderNav, syncHkNotice
} from '@/api'
import { level } from '@/api/business/visits'
import TaskDetail from '@/views/task/visSubDetail.vue'
@@ -225,8 +229,9 @@
OperaHiddenDangerWindow,
OperaVisitsDesWindow
},
- data() {
+ data () {
return {
+ tabPosition: 'right',
colors,
nowDate: '',
nowWeek: '',
@@ -241,88 +246,181 @@
{ 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/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,
isShowDanger: false,
- isShowDriver: false,
+ isShowDriver: false
}
},
computed: {
- userInfo() {
+ userInfo () {
return this.$store.state.userInfo
}
},
- created() {
+ created () {
this.updateDate()
setInterval(() => {
this.updateDate()
}, 1000 * 60 * 60)
},
- mounted() {
+ mounted () {
this.initData()
},
methods: {
- SubSuccess(str) {
+ changeType (e) {
+ console.log(e)
+ this.initEchart2()
+ this.initEchart21()
+ },
+ getNoticeList () {
+ syncHkNotice().then(res => {
+
+ })
+ },
+ handleTest (row) {
+ getAppHeaderNav(5).then(res => {
+ if (res == undefined || res == null) {
+ return
+ }
+ console.log('鍗曠偣鐧诲綍鍦板潃------', res)
+
+ const myWindow = top.window.open(res)
+ console.log('myWindow---', myWindow)
+ setTimeout(() => {
+ const params = {
+ componentId: 'dfe',
+ componentMenuId: 'process_apply',
+ callback: {
+ method: 'dealTlncMsg',
+ argument: {
+ msgId: '98c256b9-aaff-11ef-8347-fa163ee2c57c',
+ moduleId: 'dfeFlowTodoModuleId',
+ msgTitle: '璇峰強鏃跺鐞�13856591439鍙戣捣鐨勮鍋囩敵璇�',
+ msgStatus: '0',
+ msgCreateTime: '浠婂ぉ 15:33',
+ msgCreateTimeIso: '2024-11-25T15:33:42.000+08:00',
+ serverTime: 1732531014591,
+ menuCode: 'process_apply',
+ msgStatusStr: '寰呭鐞�',
+ comId: 'dfe',
+ userId: '13856591439',
+ extendNoShow: '{"processInstanceId":"98a57fe0-aaff-11ef-8347-fa163ee2c57c","processId":"process_dabcfdd39f1b6f46d36a9f4ff6ce1080","param":{"sourceType":"todo","modelCode":"tb_leave_dfe_for_dfe_runtime","processNodeId":"UserTask_dde7d83377343a2d5fa1f60c23b023ef","taskId":"98c256b9-aaff-11ef-8347-fa163ee2c57c"},"process.param.appId":"32ca8770-6f85-11ec-b5a3-991864da52a6","appId":"32ca8770-6f85-11ec-b5a3-991864da52a6","name":"璇峰亣鐢宠","taskId":"98c256b9-aaff-11ef-8347-fa163ee2c57c","taskNodeId":"UserTask_dde7d83377343a2d5fa1f60c23b023ef","url":"/dfe-form/process/tlnc/apply"}',
+ targetComId: 'dfe',
+ moduleName: '娴佺▼寰呭姙',
+ tid: '99cad778-aaff-11ef-9dbf-ff08ba71965c',
+ msgEndTime: null,
+ msgEndTimeIso: '',
+ picUrl: '',
+ extendJson: '{"key1":"璇峰強鏃跺鐞嗛檲楦块鍙戣捣鐨勮鍋囩敵璇�"}',
+ extendParam: null,
+ extendCascade: null,
+ createUser: '13856591439',
+ webCascadeUrl: null,
+ h5CascadeUrl: null,
+ cascadeTodoOpenType: null,
+ cascadeSourceConfigId: null,
+ h5Url: '/h5/pages/form-page/form-page?returnPath=-1&appId=32ca8770-6f85-11ec-b5a3-991864da52a6&taskId=98c256b9-aaff-11ef-8347-fa163ee2c57c&processNodeId=UserTask_dde7d83377343a2d5fa1f60c23b023ef&modelCode=tb_leave_dfe_for_dfe_runtime&type=flowHandle&component=form-apply&_sn=true',
+ segmentId: 'dfe-form',
+ lastUsers: '闄堥缚椋�',
+ currentUsers: '闄堥缚椋�',
+ todoTypeCode: 'dfe@@tlnc_placeholder_tlnc@@dfeFlowTodoModuleId',
+ currentUserIds: '13856591439',
+ lastUserIds: '13856591439',
+ msgDesc: null,
+ widgetUrl: null,
+ detailType: null,
+ widgetWidth: null,
+ widgetHeight: null,
+ userIdList: null,
+ statusName: null,
+ arriveTime: null,
+ stayTime: null,
+ todoType: null,
+ cascadePort: null,
+ openMode: null
+ }
+ },
+ msgType: 'tlnc'
+ }
+ const argus = JSON.parse(row.param5)
+ console.log('row.param5 Obj---', argus)
+ // const argus = JSON.stringify(params)
+ myWindow.postMessage('{"method":"goToApp","argument":' + row.param5 + '}', '*')
+ }, 8000)
+ })
+ },
+ SubSuccess (str) {
this[str] = false
this.getTaskList()
},
- funcClick(item) {
+ funcClick (item) {
if (item.name == '鑰冨嫟宸ヤ綔鍙�') {
getAppHeaderNav(4).then(res => {
- window.open(res, "_blank")
- return
+ window.open(res, '_blank')
})
+ return
+ }
+ if (item.name == '椋熷爞娑堣垂') {
+ getAppHeaderNav(6).then(res => {
+ window.open(res, '_blank')
+ })
+ return
}
this.$router.push(item.path)
},
- updateDate() {
+ updateDate () {
this.nowDate = dayjs().format('YYYY骞碝鏈圖鏃�')
this.nowWeek = weeks[new Date().getDay()]
},
- initData() {
+ initData () {
this.getWorkHead()
this.getWorkBody()
this.getTaskList()
this.getWarningList()
},
- getWarningList() {
+ getWarningList () {
getWorkbenchData({ queryType: 4 }).then(res => {
this.warningList = res.timeOutVisitList || []
this.warningTotal = res.timeOutVisitNum || 0
})
},
- getTaskList() {
+ getTaskList () {
getWorkbenchData({ queryType: 3 }).then(res => {
this.taskList = res.noticesList || []
this.taskTotal = res.noticesNum || 0
})
},
- getWorkBody() {
+ getWorkBody () {
getWorkbenchData({ queryType: 2 }).then(res => {
+ console.log(res)
this.staticData = res || {}
this.initEchart2()
+ this.initEchart21()
this.initEchart3()
this.initEchart4()
})
},
- getWorkHead() {
+ getWorkHead () {
getWorkbenchData({ queryType: 1 }).then(res => {
this.headerData = res || {}
- let arr = []
+ 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()
})
},
- jumpPage(page) {
+ jumpPage (page) {
this.$router.push(page)
},
- departure(id) {
+ departure (id) {
this.$confirm('纭畾绂诲巶鍚�, 鏄惁缁х画?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -336,7 +434,11 @@
})
},
- handleDetail(row) {
+ handleDetail (row) {
+ if (row.type === 7) {
+ this.handleTest(row)
+ return
+ }
if (row.objType === 2) {
this.$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�', { ...row, id: row.objId })
return
@@ -377,9 +479,9 @@
})
}
},
- initEchart1() {
+ initEchart1 () {
const myChart = echarts.init(document.getElementById('echart1'))
- let that = this
+ const that = this
const option = {
tooltip: {
@@ -411,10 +513,50 @@
myChart.resize()
})
},
- initEchart2() {
+ initEchart2 () {
+ console.log('initEchart2')
+ if (!document.getElementById('echart2')) {
+ return
+ }
+ echarts.dispose(document.getElementById('echart2'))
const myChart = echarts.init(document.getElementById('echart2'))
- let that = this
+ 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%',
@@ -430,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: [
{
@@ -456,7 +718,7 @@
{ offset: 0, color: '#56abf8' },
{ offset: 1, color: '#407ff0' }
]
- ),
+ )
// barBorderRadius: [0, 10, 10, 0]
}
}
@@ -467,9 +729,9 @@
myChart.resize()
})
},
- initEchart3() {
+ initEchart3 () {
const myChart = echarts.init(document.getElementById('echart3'))
- let that = this
+ const that = this
myChart.setOption({
tooltip: {
trigger: 'axis',
@@ -479,7 +741,7 @@
formatter: function (params) {
return `
<div style="background-color: #15323f;margin: -12px;padding: 14px;border: 2px solid rgba(1,217,254,0.5);color: #fff;">
- <div>${params[0].name}鏃ュ娴�</div>
+ <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>
@@ -500,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: {
@@ -567,9 +837,9 @@
myChart.resize()
})
},
- initEchart4() {
+ initEchart4 () {
const myChart = echarts.init(document.getElementById('echart4'))
- let that = this
+ const that = this
myChart.setOption({
tooltip: {
trigger: 'axis',
@@ -579,11 +849,11 @@
formatter: function (params) {
return `
<div style="background-color: #15323f;margin: -12px;padding: 14px;border: 2px solid rgba(1,217,254,0.5);color: #fff;">
- <div>${params[0].name}鏃ュ娴�</div>
+ <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>
- <div>浜�</div>
+ <span style="margin-left: 6px;">${params[0].value || 0}</span>
+ <div>杈�</div>
</div>
</div>
`
@@ -606,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%',
@@ -1032,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