diff --git a/riis-web/src/assets/login/bt.png b/riis-web/src/assets/login/bt.png index d4c6a98..1beb4dd 100644 Binary files a/riis-web/src/assets/login/bt.png and b/riis-web/src/assets/login/bt.png differ diff --git a/riis-web/src/assets/monitorsystem/top_gj1.png b/riis-web/src/assets/monitorsystem/top_gj1.png index 7e6a91f..10fc184 100644 Binary files a/riis-web/src/assets/monitorsystem/top_gj1.png and b/riis-web/src/assets/monitorsystem/top_gj1.png differ 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() +}