fajiao
/
wvp-GB28181-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化级联选择通道页面目录Id在各个模块间的传递方式

pull/317/head
648540858 3 years ago
parent
fa346513db
commit
baef2dd13d
3 changed files with 20 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      web_src/src/components/dialog/chooseChannel.vue
  2. 23
      web_src/src/components/dialog/chooseChannelForGb.vue
  3. 21
      web_src/src/components/dialog/chooseChannelForStream.vue

4
web_src/src/components/dialog/chooseChannel.vue
View File

@ -20,14 +20,14 @@
<el-tab-pane label="国标通道" name="gbChannel">
<el-container>
<el-main style="background-color: #FFF;">
<chooseChannelForGb ref="chooseChannelForGb" :platformId=platformId :updateChoosedCallback="updateChooseChannelCallback"></chooseChannelForGb>
<chooseChannelForGb ref="chooseChannelForGb" :catalogId="catalogId" :platformId=platformId :updateChoosedCallback="updateChooseChannelCallback"></chooseChannelForGb>
</el-main>
</el-container>
</el-tab-pane>
<el-tab-pane label="直播流通道" name="streamchannel">
<el-container>
<el-main style="background-color: #FFF;">
<chooseChannelFoStream ref="chooseChannelFoStream" :platformId=platformId :updateChoosedCallback="updateChooseChannelCallback"></chooseChannelFoStream>
<chooseChannelFoStream ref="chooseChannelFoStream" :catalogId="catalogId" :platformId=platformId :updateChoosedCallback="updateChooseChannelCallback"></chooseChannelFoStream>
</el-main>
</el-container>
</el-tab-pane>

23
web_src/src/components/dialog/chooseChannelForGb.vue
View File

@ -24,11 +24,11 @@
<!-- <el-checkbox @change="shareAllCheckedChange">全部共享</el-checkbox>-->
</div>
<el-table ref="gbChannelsTable" :data="gbChannels" border style="width: 100%" :height="winHeight">
<el-table-column prop="channelId" label="通道编号" width="210">
<el-table-column prop="channelId" label="通道编号" width="180" align="center">
</el-table-column>
<el-table-column prop="name" label="通道名称" show-overflow-tooltip>
<el-table-column prop="name" label="通道名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="deviceId" label="设备编号" width="210" >
<el-table-column prop="deviceId" label="设备编号" width="180" align="center">
</el-table-column>
<el-table-column label="设备地址" width="180" align="center">
<template slot-scope="scope">
@ -65,7 +65,7 @@ export default {
// };
// }
},
props: ['platformId', 'updateChoosedCallback'],
props: ['platformId','catalogId', 'updateChoosedCallback'],
created() {
this.initData();
},
@ -77,7 +77,6 @@ export default {
channelType: "",
online: "",
choosed: "",
catalogId: null,
currentPage: 1,
count: 10,
total: 0,
@ -110,11 +109,6 @@ export default {
console.log(val)
console.log(row)
},
// selectDisable: function (){
// if (this.catalogId == null) {
// return false;
// }
// },
add: function (row) {
console.log(row)
row.catalogId = this.catalogId
@ -146,7 +140,6 @@ export default {
}
}).then((res)=>{
console.log("移除成功")
let nodeIds = new Array();
if(this.updateChoosedCallback)this.updateChoosedCallback(row.catalogId)
row.platformId = null;
row.catalogId = null
@ -283,10 +276,10 @@ export default {
handleGBSelectionChange: function() {
this.initData();
},
catalogIdChange: function(id) {
this.catalogId = id;
console.log("通道选择模块收到： " + id)
},
// catalogIdChange: function(id) {
// this.catalogId = id;
// console.log("通道选择模块收到： " + id)
// },
}
};
</script>

21
web_src/src/components/dialog/chooseChannelForStream.vue
View File

@ -1,13 +1,13 @@
<template>
<div id="chooseChannelFoStream" >
<el-table ref="gbStreamsTable" :data="gbStreams" border style="width: 100%" :height="winHeight">
<el-table-column prop="name" label="名称" show-overflow-tooltip>
<el-table-column prop="name" label="名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="app" label="应用名" show-overflow-tooltip>
<el-table-column prop="app" label="应用名" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="stream" label="流ID" show-overflow-tooltip>
<el-table-column prop="stream" label="流ID" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="gbId" label="国标编码" show-overflow-tooltip>
<el-table-column prop="gbId" label="国标编码" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column label="流来源" width="100" align="center">
<template slot-scope="scope">
@ -17,7 +17,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="操作" width="100" align="center" fixed="right">
<el-table-column label="操作" width="100" align="center" fixed="right" >
<template slot-scope="scope">
<el-button-group>
<el-button size="mini" icon="el-icon-plus" v-if="!scope.row.platformId" @click="add(scope.row)">添加</el-button>
@ -43,7 +43,7 @@ export default {
// };
// }
},
props: ['platformId', 'updateChoosedCallback'],
props: ['platformId', 'catalogId', 'updateChoosedCallback'],
created() {
this.initData();
},
@ -55,7 +55,6 @@ export default {
channelType: "",
online: "",
choosed: "",
catalogId: null,
currentPage: 1,
count: 10,
total: 0,
@ -254,10 +253,10 @@ export default {
handleGBSelectionChange: function() {
this.initData();
},
catalogIdChange: function(id) {
this.catalogId = id;
console.log("直播通道选择模块收到： " + id)
},
// catalogIdChange: function(id) {
// this.catalogId = id;
// console.log("直播通道选择模块收到： " + id)
// },
}
};
</script>

Write Preview
Loading…
Cancel
Save