From 172404f84de9979dcd881c6508b2484d17730165 Mon Sep 17 00:00:00 2001 From: wangxk Date: Wed, 14 May 2025 09:48:50 +0800 Subject: [PATCH] =?UTF-8?q?2025-5-12=E8=AE=A8=E8=AE=BAbug=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- riis-web/src/assets/login/bt.png | Bin 12582 -> 7556 bytes riis-web/src/assets/monitorsystem/top_gj1.png | Bin 592 -> 416 bytes riis-web/src/components/jessibuca/index1.vue | 36 +- riis-web/src/components/wavEcharts/index.vue | 19 + riis-web/src/layout/components/Navbar.vue | 79 +- riis-web/src/layout/index.vue | 2 +- .../src/views/basedata/3DModelSet/index.vue | 2 +- riis-web/src/views/basedata/device/index.vue | 52 +- .../views/collectmonitor/datasurvey/index.vue | 88 +- .../environmentalMonitoring/index.vue | 283 ++++-- .../collectmonitor/videomonitor/index.vue | 883 +++++++++--------- .../voiceprintDetection/index.vue | 3 +- riis-web/src/views/dashboard/index.vue | 22 +- riis-web/src/views/login/index.vue | 2 +- .../views/monitorsystem/alarminformation.vue | 4 +- .../src/views/monitorsystem/giveanalarm.vue | 4 +- .../monitorsystem/stationboard/3DModelSet.vue | 2 +- .../src/views/question/question/index.vue | 475 ++++++++++ riis-web/src/views/task/alarmInfo/index.vue | 28 +- riis-web/src/views/task/makeTask/index.vue | 10 + .../threevisitation/3DModelSet/index.vue | 2 +- .../threevisitation/3Dbrowsing/index.vue | 2 +- 22 files changed, 1373 insertions(+), 625 deletions(-) create mode 100644 riis-web/src/views/question/question/index.vue diff --git a/riis-web/src/assets/login/bt.png b/riis-web/src/assets/login/bt.png index d4c6a982fa2f8e9e485f4209b761a865a5d80d9d..1beb4ddb4dfb33033a591f45e85d3d432b15804c 100644 GIT binary patch literal 7556 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

#ZUFz>cK8QBeSSh$%#W@_DK)mLo` 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 IM6N<$g8S#$UjP6A diff --git a/riis-web/src/assets/monitorsystem/top_gj1.png b/riis-web/src/assets/monitorsystem/top_gj1.png index 7e6a91f9a963ca57a5605a2d88f842d6d7410a79..10fc184be458cd957e52ac9ffdc73cf97c78fdc0 100644 GIT binary patch delta 374 zcmV-+0g3+51fT;UiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyF)& zK~y+TosuC>13?glcgYC^qN1V#fk5EEk{}QWL=z06q5_Gi1c$3Y@FNg_0*Anov?t0-%-p%aWz1h9J38esALFCE=?7CYMpvf2CsaxuWn$T;go3)T>DWb|_dOV9&f#L@s>se}HkrUG)#CCz}I~+?_+exoQDWu*g02$$ZV-8AQ%) zmnwjkZ6b2)PFV7&=#hshEg{A?78o(xOh#Uy!3AHQSMftFr!+6{FY*)Ar{&QRIrGbD zyHk$HrLR3n2C%}xH`PnV0<s!NS6{z3GZqiqZ5DGsO)?sP*v+FV8mzimsc UwO4>`WB>pF07*qoM6N<$g41=O3jhEB delta 551 zcmV+?0@(ea1JDE^iBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9SCJt#f8|L; zK~y+Tos_XlTTv9ozw=&d5_O1M7Db^$OBV+V4&CY>AhdKd!NDyc1=m75OQ&`bg_o$M z*!}@J6k1T|*zQ^obZ`({Lh|y+d#B&K_dWaIpz^QBVT#zy#466aYW&0_h z+*wYjz5SRql3wS98Q+Jht!|M`Qxe1qdDvu*LTGFY@IFSXM{Juqtuh|@pHi1VgAyYD z3Yxs*O1r7^L3loorTeA_ee+Wjf>z@NJN(d14@Xxfxg)kh>vRrYj@R$-@QOvU$a?v} zLD%}^8F#RTBw1m_l~Vg=cQOC~002ovPDHLkV1l@X{;>c6 diff --git a/riis-web/src/components/jessibuca/index1.vue b/riis-web/src/components/jessibuca/index1.vue index 7221c45..2df4a71 100644 --- a/riis-web/src/components/jessibuca/index1.vue +++ b/riis-web/src/components/jessibuca/index1.vue @@ -540,9 +540,39 @@ export default { eventcallbacK: function (type, message) { }, fullscreenSwich: function () { - let isFull = this.isFullscreen() - jessibucaPlayer[this._uid].setFullscreen(!isFull) - this.fullscreen = !isFull; + const userStore = useUserStore() + if (this.devicechannelInfo) { + if(this.zhu){ + let isFull = this.isFullscreen() + jessibucaPlayer[this._uid].setFullscreen(!isFull) + this.fullscreen = !isFull; + return + } + if (this.fullscreen) { + axios.get(userStore.webApiMonitorUrl + '/api/play/stop/' + this.devicechannelInfo.deviceId + '/' + this.devicechannelInfo.channelId, {}).then((res) => { }) + axios.get(userStore.webApiMonitorUrl + '/api/play/start/' + this.devicechannelInfo.deviceId + '/' + this.devicechannelInfo.channelId + '_sub', {}).then((res) => { + this.play(res.data.data.ws_flv) + let isFull = this.isFullscreen() + jessibucaPlayer[this._uid].setFullscreen(!isFull) + this.fullscreen = !isFull; + }) + } else { + axios.get(userStore.webApiMonitorUrl + '/api/play/stop/' + this.devicechannelInfo.deviceId + '/' + this.devicechannelInfo.channelId + '_sub', {}).then((res) => { }) + axios.get(userStore.webApiMonitorUrl + '/api/play/start/' + this.devicechannelInfo.deviceId + '/' + this.devicechannelInfo.channelId, {}).then((res) => { + this.play(res.data.data.ws_flv) + let isFull = this.isFullscreen() + jessibucaPlayer[this._uid].setFullscreen(!isFull) + this.fullscreen = !isFull; + + }) + } + } else { + let isFull = this.isFullscreen() + jessibucaPlayer[this._uid].setFullscreen(!isFull) + this.fullscreen = !isFull; + } + + // if(this.fullscreen }, isFullscreen: function () { return document.fullscreenElement || diff --git a/riis-web/src/components/wavEcharts/index.vue b/riis-web/src/components/wavEcharts/index.vue index 0142fd6..4dd1bc9 100644 --- a/riis-web/src/components/wavEcharts/index.vue +++ b/riis-web/src/components/wavEcharts/index.vue @@ -480,7 +480,26 @@ audio::-webkit-media-controls-current-time-display, audio::-webkit-media-controls-time-remaining-display { color: #fff; } +/* 轨道 */ +audio::-webkit-media-controls-timeline::before { + content: ''; + display: block; + height: 6px; + background-color: #ff0000; /* 已播放部分颜色 */ +} +/* 滑块 */ +audio::-webkit-media-controls-timeline::after { + content: ''; + display: block; + width: 12px; + height: 12px; + background-color: #ff0000; + border-radius: 50%; + position: relative; + top: -6px; + left: 0; +} /* Firefox兼容样式 */ @-moz-document url-prefix() { audio { diff --git a/riis-web/src/layout/components/Navbar.vue b/riis-web/src/layout/components/Navbar.vue index 5eca799..8da862e 100644 --- a/riis-web/src/layout/components/Navbar.vue +++ b/riis-web/src/layout/components/Navbar.vue @@ -9,13 +9,22 @@ :class="{ 'nav-active': activeIndex == index }" @click.stop="navClick(item, index)">

{{ item.name }}
-
{{ items.name }} +
+
+ {{ items.name }} +
+
+
+ +
+ +
+
用户名：{{ userStore.username }}
@@ -99,12 +108,12 @@ function dateFormat(row: any) { } function alarmInfoClick() { router.push(`/task/alarmInfo/index`) - let item = { - name: "告警核认", - opturl: "/task/alarmInfo/index" - } - activeSonIndex.value = 2 - navSonClick(navlist.value[2], 2, item) + // let item = { + // name: "告警核认", + // opturl: "/task/alarmInfo/index" + // } + // activeSonIndex.value = 2 + // navSonClick(navlist.value[2], 2, item) } function navSonClick(row: any, index: any, item: any) { isElicon.value = true @@ -397,7 +406,7 @@ watch(() => props.CloseNav, (newValue, oldValue) => { background-size: 100% 100%; width: 100%; height: 62px; - z-index:99999 !important; + z-index: 99999 !important; .times { font-family: '微软雅黑'; @@ -470,7 +479,7 @@ watch(() => props.CloseNav, (newValue, oldValue) => { margin-left: -12px; position: absolute; top: 40px; - z-index:9999; + z-index: 9999; .nav-son-list { width: 100%; @@ -506,7 +515,7 @@ watch(() => props.CloseNav, (newValue, oldValue) => { .nav-active .nav-imgtitle { // background: rgba(21, 69, 119, 0.8);\ - + } @@ -608,8 +617,8 @@ watch(() => props.CloseNav, (newValue, oldValue) => { background: url(@/assets/monitorsystem/top_gj.png); .header-informationImg { - width: 18px; - height: 18px; + width: 16px; + height: 16px; background: url(@/assets/monitorsystem/top_gj1.png); } @@ -918,12 +927,12 @@ watch(() => props.CloseNav, (newValue, oldValue) => { margin-right: 20px; cursor: pointer; font-family: "Arial Normal", "Arial"; - font-weight: 400; - font-style: normal; - font-size: 14px; - text-align: center; - line-height: 31px; - color: #fff; + font-weight: 400; + font-style: normal; + font-size: 14px; + text-align: center; + line-height: 31px; + color: #fff; } .homeImgActive { @@ -936,7 +945,37 @@ watch(() => props.CloseNav, (newValue, oldValue) => { align-items: center; margin-right: 10px; margin-bottom: 10px; - color:#ffffff; + color: #ffffff; + + .header-information { + cursor: pointer; + position: relative; + display: flex; + align-items: center; + justify-content: center; + margin-right: 25px; + width: 30px; + height: 30px; + // background: url(@/assets/monitorsystem/top_gj.png); + + .header-informationImg { + width: 16px; + height: 16px; + background: url(@/assets/monitorsystem/top_gj1.png); + background-size: 100% 100%; + } + + .header-informationDian { + position: absolute; + top: 5px; + left: 15px; + width: 6px; + height: 6px; + border-radius: 50%; + background: red; + + } + } } .iscursorinitial { diff --git a/riis-web/src/layout/index.vue b/riis-web/src/layout/index.vue index 46bb9be..5d7665b 100644 --- a/riis-web/src/layout/index.vue +++ b/riis-web/src/layout/index.vue @@ -123,7 +123,7 @@ function closeClick() { position: fixed; top: 0; left: 0; - z-index: 98; + z-index: 2000; width: 100%; transition: width 0.28s; // background: #ffffff; diff --git a/riis-web/src/views/basedata/3DModelSet/index.vue b/riis-web/src/views/basedata/3DModelSet/index.vue index 887c364..d4a7419 100644 --- a/riis-web/src/views/basedata/3DModelSet/index.vue +++ b/riis-web/src/views/basedata/3DModelSet/index.vue @@ -5282,7 +5282,7 @@ ws1.onclose = () => { left: 0; right: 0; bottom: 0; - background: #131a25; + background: #001b4a; display: flex; align-items: center; justify-content: center; diff --git a/riis-web/src/views/basedata/device/index.vue b/riis-web/src/views/basedata/device/index.vue index 6b50d9d..aa73406 100644 --- a/riis-web/src/views/basedata/device/index.vue +++ b/riis-web/src/views/basedata/device/index.vue @@ -443,6 +443,7 @@ const getacaType: any = ref() const Metertype = ref() const auxitype = ref() function addClick() { + activeName.value = 'first' threshold.value = '' beforName.value = '' info.value = { @@ -525,6 +526,8 @@ const getacaTypeBayId = ref() const PictureAnalysisType = ref() //图像缺陷分析类型 const PictureDefectAnalysisType = ref() +//声纹分析类型 +const voiceAnalysisTypeList = ref() //图像判别分析类型 const PictureDiscriminateAnalysisType = ref() //数据来源 @@ -565,7 +568,10 @@ function notification() { getDeviceByType(paramsect).then((res: any) => { PictureDefectAnalysisType.value = res.data }) - + //获取声纹分析类型 + getDeviceByType({ dictcode: 'VoiceAnalysisType' }).then((res: any) => { + voiceAnalysisTypeList.value = res.data + }) //获取图像分析类型 const paramsscr = { dictcode: 'PictureDiscriminateAnalysisType' @@ -660,6 +666,7 @@ function mainChange(row: any) { const deviceIdText = ref() const miannDeviceId = ref() function handleEdit(row: any) { + activeName.value = 'first' duration.value = row.duration threshold.value = '' beforName.value = '' @@ -740,7 +747,7 @@ function handleEdit(row: any) { droPoint.value = JSON.parse(infoall.outsideAngle) } else if (infoall.recognitionTypeList == "5") { infoall.decibel = JSON.parse(infoall.outsideAngle).decibel - infoall.frequency = JSON.parse(infoall.outsideAngle).frequency + infoall.frequency = JSON.parse(infoall.outsideAngle).frequency } else { arrdata.value = JSON.parse(infoall.outsideAngle) } @@ -1344,10 +1351,10 @@ const vMove = { } const activeName = ref('first') const handleClick1 = (tab: TabsPaneContext, event: Event) => { - console.log(tab.props.name, event); - if(tab.props.name == 'three'){ - getData1() - } + console.log(tab.props.name, event); + if (tab.props.name == 'three') { + getData1() + } } const isGaoliang: any = ref("") @@ -1392,11 +1399,10 @@ function getData1() { } const multipleTableRef = ref() function handleSelectionChange(val: any) { - if (val.length > 1) { + if (val.length == 2) { val.pop() multipleTableRef.value!.toggleRowSelection(val[0], undefined) - } - if (val[0]) { + }else{ vicode.value[0].patroldevice_name = val[0].patroldeviceName vicode.value[0].patroldevice_code = val[0].patroldeviceCode } @@ -1413,7 +1419,7 @@ function handleSelectionChange(val: any) { + style="display: flex; flex-wrap: wrap; margin: 5px;" :rules="rules"> @@ -1519,6 +1525,20 @@ function handleSelectionChange(val: any) { :label="item.dictname" :value="item.itemcode" /> + + + + + + + + + + @@ -1569,12 +1589,9 @@ function handleSelectionChange(val: any) {
- - - + style="width: 100%;margin: auto; display: flex;display: -webkit-flex; justify-content: center;-webkit-justify-content: center;">
取消
确定
@@ -1693,10 +1710,9 @@ function handleSelectionChange(val: any) { - 取 消 - 保存 + style="width: 100%;margin: auto; display: flex;display: -webkit-flex; justify-content:center;-webkit-justify-content:center;margin-top: 20px;"> +
取消
+
确定
 diff --git a/riis-web/src/views/collectmonitor/datasurvey/index.vue b/riis-web/src/views/collectmonitor/datasurvey/index.vue index 6fdd703..f8a4256 100644 --- a/riis-web/src/views/collectmonitor/datasurvey/index.vue +++ b/riis-web/src/views/collectmonitor/datasurvey/index.vue @@ -11,6 +11,7 @@ import { getDeviceSignalTree, querySignalDataById, workpage, getHistoricalCurve import { useUserStore } from '@/store/modules/user'; import Page from '@/components/Pagination/page.vue' import * as echarts from 'echarts' +import dayjs from 'dayjs' const userStore = useUserStore(); //左侧树形控件 interface Tree { @@ -174,8 +175,17 @@ function drawEchart() { }) } onMounted(() => { - getTreeData() + gettoday() }) +function gettoday() { + // 获取今天0点 + let startTime = dayjs().startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 获取当前时间 + let endTime = dayjs().format('YYYY-MM-DD HH:mm:ss') + detaall.value[0] = startTime + detaall.value[1] = endTime + getTreeData() +}