From e7e6928fb5a15618a2ad40d457a3f78e7b6061ca Mon Sep 17 00:00:00 2001 From: yangyi Date: Wed, 14 Aug 2024 15:19:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E7=81=AF=E6=80=81=E5=86=8D=E6=89=93?= =?UTF-8?q?=E5=BC=80=E5=85=B3=E9=97=AD=E5=90=8E=EF=BC=8C=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=B2=A1=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OpenATC-Admin-web/src/components/TerminalLock/index.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenATC-Admin-ui/OpenATC-Admin-web/src/components/TerminalLock/index.vue b/OpenATC-Admin-ui/OpenATC-Admin-web/src/components/TerminalLock/index.vue index 19fccf96..ebc10d82 100644 --- a/OpenATC-Admin-ui/OpenATC-Admin-web/src/components/TerminalLock/index.vue +++ b/OpenATC-Admin-ui/OpenATC-Admin-web/src/components/TerminalLock/index.vue @@ -211,7 +211,11 @@ export default { await this.getCurrentPatternStatus(id) } else if (this.zoomBiz === 'play') { if (!this.curDevice || !this.curDevice.videos || this.curDevice.videos.length === 0) { - this.switchBiz = 'terminal' + if (this.switchBiz === 'terminal') { + this.initData() + } else { + this.switchBiz = 'terminal' + } } else { this.switchBiz = 'video' } -- Gitee From 7b599868437a52492f3598c5add95038074dd997 Mon Sep 17 00:00:00 2001 From: yangyi Date: Wed, 14 Aug 2024 17:50:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refc:=20=E6=97=A0=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=92=AD=E6=94=BE=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OpenATC-Admin-web/src/components/TerminalLock/index.vue | 4 ++-- .../src/views/GisManager/components/dutyRoute/dutyRoute.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenATC-Admin-ui/OpenATC-Admin-web/src/components/TerminalLock/index.vue b/OpenATC-Admin-ui/OpenATC-Admin-web/src/components/TerminalLock/index.vue index ebc10d82..db1f39f6 100644 --- a/OpenATC-Admin-ui/OpenATC-Admin-web/src/components/TerminalLock/index.vue +++ b/OpenATC-Admin-ui/OpenATC-Admin-web/src/components/TerminalLock/index.vue @@ -20,7 +20,7 @@ PURPOSE. * See the Mulan PSL v2 for more details.
{{$t('openatc.viproute.lampstate')}} - {{$t('openatc.faultrecord.video')}} + {{$t('openatc.faultrecord.video')}}
@@ -242,7 +242,7 @@ export default { lockPhaseBtnName: this.$t('openatccomponents.overview.implement'), realTimeChannelTimer: null, realTimeChannelData: {}, - switchBiz: 'video', + switchBiz: 'terminal', manualInfo: {}, isShow: true, // isConfigShow: false, diff --git a/OpenATC-Admin-ui/OpenATC-Admin-web/src/views/GisManager/components/dutyRoute/dutyRoute.vue b/OpenATC-Admin-ui/OpenATC-Admin-web/src/views/GisManager/components/dutyRoute/dutyRoute.vue index 6a39ebb7..515c6dda 100644 --- a/OpenATC-Admin-ui/OpenATC-Admin-web/src/views/GisManager/components/dutyRoute/dutyRoute.vue +++ b/OpenATC-Admin-ui/OpenATC-Admin-web/src/views/GisManager/components/dutyRoute/dutyRoute.vue @@ -149,12 +149,12 @@ export default { { id: 1, name: '视频1', - url: 'ws://192.168.13.104:38080/live/video4.flv?st=1619332780604' + url: 'ws://10.165.32.135:38080/rtp/31011500001000100151.live.flv?st=1619332780604' }, { id: 2, name: '视频2', - url: 'ws://192.168.13.104:38080/live/TESTID.flv?st=1619332798860' + url: 'http://192.168.15.193:6658/kdcam/live.flv?st=1619332798860' }, { id: 3, -- Gitee From c6d1d1978eb1e7a165b149ad53aeaf14edacb1f4 Mon Sep 17 00:00:00 2001 From: yangyi Date: Thu, 15 Aug 2024 09:28:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?style:=20=E8=A7=86=E9=A2=91=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E5=92=8C=E5=88=B7=E6=96=B0=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenATC-Admin-ui/OpenATC-Admin-web/src/styles/video.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenATC-Admin-ui/OpenATC-Admin-web/src/styles/video.scss b/OpenATC-Admin-ui/OpenATC-Admin-web/src/styles/video.scss index 64d77292..f06c1eac 100644 --- a/OpenATC-Admin-ui/OpenATC-Admin-web/src/styles/video.scss +++ b/OpenATC-Admin-ui/OpenATC-Admin-web/src/styles/video.scss @@ -70,7 +70,6 @@ } .icon-shipinshuaxin { position: relative; - top: -3px; } } } -- Gitee From 617ed15e0bfbf1511335bd304b28d852ed551a00 Mon Sep 17 00:00:00 2001 From: fengfajiang Date: Thu, 15 Aug 2024 13:15:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=20=E7=89=B9=E5=8B=A4=E8=B7=AF=E7=BA=BF?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/components/leftVipContent.vue | 54 +++++++++++++---- .../views/Service/components/timeVipLine.vue | 60 ++++++++++++++++--- 2 files changed, 96 insertions(+), 18 deletions(-) diff --git a/OpenATC-Admin-ui/OpenATC-Admin-web/src/views/Service/components/leftVipContent.vue b/OpenATC-Admin-ui/OpenATC-Admin-web/src/views/Service/components/leftVipContent.vue index ab3679db..cd6d29c8 100644 --- a/OpenATC-Admin-ui/OpenATC-Admin-web/src/views/Service/components/leftVipContent.vue +++ b/OpenATC-Admin-ui/OpenATC-Admin-web/src/views/Service/components/leftVipContent.vue @@ -378,17 +378,37 @@ export default { }) }, mounted () { + // let color = getTheme() === 'light' ? '#1E1E1E' : '#F1F3F4' if (this.editRoute && this.editRoute.devs && this.editRoute.devs.length > 0) { this.route = this.editRoute for (let item of this.route.devs) { - // if (item.data.data) { - item.duration = item.data.data.duration - item.iconList = item.data.data.iconList - item.direction = item.data.data.direction - item.peddirection = item.data.data.peddirection + if (item.data.data) { + item.duration = item.data.data.duration + // item.iconList = item.data.data.iconList + // console.log(item.data.data.peddirection, 'item.data.data.peddirection') + // if (item.data.data.direction.length === 0) { + // item.iconList = [ + // { + // id: 0, + // color: color, + // peddirection: this.getPed(item.data.data.peddirection) + // } + // ] + // } else { + // item.iconList = item.data.data.direction.map(item => { + // return { + // id: item, + // color: color, + // peddirection: this.getPed(item.data.data.peddirection) + // } + // }) + // } + // console.log(item.iconList, 'item.iconList') + item.direction = item.data.data.direction + item.peddirection = item.data.data.peddirection // this.choosedDirection = item.data.data.direction // this.choosedPedDirection = item.data.data.peddirection - // } + } } } this.$refs.ORGIntersectionTree.getDeviceRanges(this.devsfilter).then(res => { @@ -484,13 +504,25 @@ export default { this.agentid = val.agentid this.roadname = val.name this.getIntersectionInfo(val.agentid) - this.manualInfo.iconList = [] + // this.manualInfo.iconList = [] + // let color = getTheme() === 'light' ? '#1E1E1E' : '#F1F3F4' this.route.devs.forEach(item => { if (this.agentid === item.agentid) { - if (!item.data) return - this.manualInfo.iconList = item.data.data.iconList - this.choosedDirection = item.data.data.direction - this.choosedPedDirection = item.data.data.peddirection + if (!item.data) { + this.choosedDirection = [] + this.choosedPedDirection = [] + } else { + this.choosedDirection = item.data.data.direction + this.choosedPedDirection = item.data.data.peddirection + } + // this.manualInfo.iconList = item.data.data.iconList + // this.manualInfo.iconList = item.data.data.direction.map(item => { + // return { + // id: item, + // color: color, + // peddirection: this.getPed(item.data.data.peddirection) + // } + // }) } }) }, diff --git a/OpenATC-Admin-ui/OpenATC-Admin-web/src/views/Service/components/timeVipLine.vue b/OpenATC-Admin-ui/OpenATC-Admin-web/src/views/Service/components/timeVipLine.vue index 8764f9d8..fbf88a1c 100644 --- a/OpenATC-Admin-ui/OpenATC-Admin-web/src/views/Service/components/timeVipLine.vue +++ b/OpenATC-Admin-ui/OpenATC-Admin-web/src/views/Service/components/timeVipLine.vue @@ -34,7 +34,7 @@
{{ $t('openatc.viproute.lasttime') }} : {{ - item.data && item.data.data && item.data.data.duration + (item.data && item.data.data && item.data.data.duration) ? item.data.data.duration : '' }} @@ -47,7 +47,7 @@ :Datas="styles" :Data="showStyle" :showlist=" - item.data && item.data.data && item.data.data.iconList + (item.data && item.data.data && item.data.data.iconList) ? item.data.data.iconList : [] " @@ -65,6 +65,7 @@ // import { computedRelation } from '../../../utils/conflict' import XRDDirSelector from '../../../components/XRDDirSelector' import draggable from 'vuedraggable' +import PhaseDataModel from 'openatc-components/package/kisscomps/components/IntersectionMap/crossDirection/utils' import { getTheme } from '../../../utils/auth' import RouteCard from '../../../views/Service/components/routeCard' export default { @@ -78,6 +79,7 @@ export default { left: '260PX', top: '46PX' }, + sidewalkPhaseData: [], styles: { left: '260PX', top: '46PX' @@ -154,18 +156,62 @@ export default { } }, created () { + this.PhaseDataModel = new PhaseDataModel() this.$nextTick(() => { this.initDraggableTimeline() this.collapsedItems = this.route && this.route.devs ? this.route.devs.map(item => item.agentid) : [] - let colors = getTheme() === 'light' ? '#1E1E1E' : '#F1F3F4' - this.route.devs.forEach(item => { - item.iconList.forEach(icon => { - icon.color = colors - }) + let color = getTheme() === 'light' ? '#1E1E1E' : '#F1F3F4' + this.route.devs.forEach(items => { + if (items.data.data.direction.length === 0) { + items.data.data.iconList = [ + { + id: 0, + color: color, + peddirection: items.data.data.peddirection.length === 0 ? [] : this.getPed(items.data.data.peddirection) + } + ] + } else { + items.data.data.iconList = items.data.data.direction.map(item => { + return { + id: item, + color: color, + peddirection: items.data.data.peddirection.length === 0 ? [] : this.getPed(items.data.data.peddirection) + } + }) + } }) }) }, methods: { + getPed (peddirection) { + return peddirection.map(item => { + if (this.sidewalkPhaseData.find(ele => ele.id === item)) { + return { + id: item, + name: this.sidewalkPhaseData.find(ele => ele.id === item).name + } + } + }) + }, + getPedPhasePos (phaseList) { + // 行人相位信息 + this.sidewalkPhaseData = [] + phaseList.forEach((ele, i) => { + if (ele.peddirection) { + ele.peddirection.forEach((dir, index) => { + // 行人相位 + if (this.PhaseDataModel.getSidePos(dir)) { + this.sidewalkPhaseData.push({ + // key: this.CrossDiagramMgr.getUniqueKey('pedphase'), + phaseid: ele.id, // 相位id，用于对应相位状态 + id: dir, + name: this.PhaseDataModel.getSidePos(dir).name + }) + } + }) + } + }) + }, dropItem () { this.sortList = this.route.devs }, -- Gitee