guoyuepeng
/
qa-regulatory-gwj-vue
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.显示一公司的门口门禁页面 

2.调整监管端的重点工程视频监控样式
pet-人员中台对接-xuyifeng-7.24
guoyuepeng 2024-06-29 12:45:05 +08:00
parent 5ce51685d6
commit ebb141a699
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/keyprojects/videomanager/components/video-list.vue
View File

@ -154,8 +154,8 @@
<el-dialog v-if="dialogVideoAll" :visible.sync="dialogVideoAll" :before-close="handleBack" :show-close="false" title="视频" width="1200px"> <el-dialog v-if="dialogVideoAll" :visible.sync="dialogVideoAll" :before-close="handleBack" :show-close="false" title="视频" width="1200px">
<!-- <iframe src="http://192.168.192.121:10800/?menu=no/#/screen" width="100%" height="500px" allowfullscreen allow="autoplay; fullscreen" style="position: relative;border:none"/>--> <!-- <iframe src="http://192.168.192.121:10800/?menu=no/#/screen" width="100%" height="500px" allowfullscreen allow="autoplay; fullscreen" style="position: relative;border:none"/>-->
<div style="display: flex;flex-wrap: wrap;justify-content: space-between"> <div style="display: flex;flex-wrap: wrap;justify-content: space-between">
<div v-for="(video,index) in videoList" :key="index" style="margin-bottom: 10px;width: 45%"> <div v-for="(video,index) in videoList" :key="index" style="margin-bottom: 10px;width: 30%">
<iframe v-if="video.GBSVIDEOURL" :src="video.GBSVIDEOURL" width="100%" height="380" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/> <iframe v-if="video.GBSVIDEOURL" :src="video.GBSVIDEOURL" width="100%" height="280" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/>
<div v-if="video.HLSVIDEOURL" :id="'aLiVideoPlayer'+index" class="prism-player"/> <div v-if="video.HLSVIDEOURL" :id="'aLiVideoPlayer'+index" class="prism-player"/>
</div> </div>
</div> </div>

2
src/views/map/components/menjin_old.vue
View File

@ -205,7 +205,7 @@ export default {
requestFN( requestFN(
'/map/getOnlineGateEquipment', { '/map/getOnlineGateEquipment', {
AREA: this.area, AREA: this.area,
CORP_INFO_ID: this.corpInfoId, CORPINFO_ID: this.corpInfoId,
GANGKOU: this.gangkou GANGKOU: this.gangkou
} }
).then((data) => { ).then((data) => {

8
src/views/map/dialog/mkGateMachine.vue
View File

@ -210,9 +210,11 @@ export default {
this.info.PERSON_OUT = 0 this.info.PERSON_OUT = 0
this.varList = data.pd.varList this.varList = data.pd.varList
for (let i = 0; i < data.pd.varList.length; i++) { for (let i = 0; i < data.pd.varList.length; i++) {
if (this.type == 'CAR') { if (data.pd.varList[i].TYPE == 'CAR_IN') {
this.info.CAR_IN = data.pd.varList[i].CAR_IN this.info.CAR_IN = data.pd.varList[i].COUNT
this.info.CAR_OUT = data.pd.varList[i].CAR_OUT }
if (data.pd.varList[i].TYPE == 'CAR_OUT') {
this.info.CAR_OUT = data.pd.varList[i].COUNT
} }
if (data.pd.varList[i].TYPE == 'PERSON_IN') { if (data.pd.varList[i].TYPE == 'PERSON_IN') {
this.info.PERSON_IN = data.pd.varList[i].COUNT this.info.PERSON_IN = data.pd.varList[i].COUNT

9
src/views/map/index.vue
View File

@ -43,8 +43,13 @@
v-if="gangkouActive && gangkouActive === '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID" v-if="gangkouActive && gangkouActive === '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID"
:corp-info-id="CORP_INFO_ID" :corp-info-id="CORP_INFO_ID"
:gangkou="gangkouActive"/> :gangkou="gangkouActive"/>
<menjinOld
v-if="CORP_INFO_ID =='035958e685cf4850bc40151c5e0617a6' && gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
:corp-info-id="CORP_INFO_ID"
:area="area"
:gangkou="gangkouActive"/>
<menjin <menjin
v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0" v-if="CORP_INFO_ID !='035958e685cf4850bc40151c5e0617a6' && gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
:corp-info-id="CORP_INFO_ID" :corp-info-id="CORP_INFO_ID"
:area="area" :area="area"
:gangkou="gangkouActive"/> :gangkou="gangkouActive"/>
@ -276,6 +281,7 @@ import menjinCzks from './components/menjinCzks.vue'
import renyuanCzks from './components/renyuanCzks.vue' import renyuanCzks from './components/renyuanCzks.vue'
import renyuanCmt from './components/renyuanCmt.vue' import renyuanCmt from './components/renyuanCmt.vue'
import menjin from './components/menjin.vue' import menjin from './components/menjin.vue'
import menjinOld from './components/menjin_old.vue'
import menjinCfd from './components/menjinCfd.vue' import menjinCfd from './components/menjinCfd.vue'
import menjinCmt from './components/menjinCmt.vue' import menjinCmt from './components/menjinCmt.vue'
import xiaofang from './components/xiaofang.vue' import xiaofang from './components/xiaofang.vue'
@ -332,6 +338,7 @@ export default {
fengongsiIndex, fengongsiIndex,
caofeidianIndex, caofeidianIndex,
layoutMenu, layoutMenu,
menjinOld,
menjin, menjin,
menjinCfd, menjinCfd,
menjinCmt, menjinCmt,