From 0020402685c0997c0a73bc7ac90535e50e8f972a Mon Sep 17 00:00:00 2001 From: panlinlin <648540858@qq.com> Date: 星期五, 08 一月 2021 11:02:53 +0800 Subject: [PATCH] 完成向上级联->选择通道-001 --- web_src/src/components/channelList.vue | 2 ++ src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 29 +++++------------------------ web_src/src/components/ParentPlatformList.vue | 15 ++++++++++----- src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java | 1 - 4 files changed, 17 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java index 52d8089..b88778e 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java @@ -8,15 +8,15 @@ public class SipConfig { @Value("${sip.ip}") - String sipIp; + private String sipIp; @Value("${sip.port}") - Integer sipPort; + private Integer sipPort; @Value("${sip.domain}") - String sipDomain; + private String sipDomain; @Value("${sip.id}") - String sipId; + private String sipId; @Value("${sip.password}") - String sipPassword; + private String sipPassword; @Value("${sip.ptz.speed:50}") Integer speed; @@ -25,47 +25,28 @@ return sipIp; } - public void setSipIp(String sipIp) { - this.sipIp = sipIp; - } public Integer getSipPort() { return sipPort; } - public void setSipPort(Integer sipPort) { - this.sipPort = sipPort; - } public String getSipDomain() { return sipDomain; } - public void setSipDomain(String sipDomain) { - this.sipDomain = sipDomain; - } public String getSipId() { return sipId; - } - - public void setSipId(String sipId) { - this.sipId = sipId; } public String getSipPassword() { return sipPassword; } - public void setSipPassword(String sipPassword) { - this.sipPassword = sipPassword; - } public Integer getSpeed() { return speed; } - public void setSpeed(Integer speed) { - this.speed = speed; - } } diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java index efc7426..b0428cc 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java @@ -45,7 +45,6 @@ @Delete("DELETE FROM parent_platform WHERE deviceGBId=#{deviceGBId}") int delParentPlatform(ParentPlatform parentPlatform); - @Select("SELECT * FROM parent_platform") List<ParentPlatform> getParentPlatformList(); diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue index 0d3ce69..39aeb3c 100644 --- a/web_src/src/components/ParentPlatformList.vue +++ b/web_src/src/components/ParentPlatformList.vue @@ -39,9 +39,9 @@ </template> </el-table-column> <el-table-column prop="deviceGBId" label="璁惧鍥芥爣缂栧彿" width="240" align="center"></el-table-column> - <el-table-column prop="transport" label="娴佷紶杈撴ā寮�" width="120" align="center"></el-table-column> + <el-table-column prop="transport" label="淇′护浼犺緭妯″紡" width="120" align="center"></el-table-column> <el-table-column prop="channelCount" label="閫氶亾鏁�" align="center"></el-table-column> - + <el-table-column label="鎿嶄綔" width="300" align="center" fixed="right"> <template slot-scope="scope"> <el-button size="mini" icon="el-icon-edit" @click="editPlatform(scope.row)">缂栬緫</el-button> @@ -61,6 +61,7 @@ :total="total"> </el-pagination> <platformEdit ref="platformEdit" ></platformEdit> + <chooseChannelDialog ref="chooseChannelDialog" ></chooseChannelDialog> </el-main> </el-container> </div> @@ -69,11 +70,13 @@ <script> import platformEdit from './platformEdit.vue' import uiHeader from './UiHeader.vue' +import chooseChannelDialog from './gb28181/chooseChannel.vue' export default { name: 'app', components: { platformEdit, - uiHeader + uiHeader, + chooseChannelDialog }, data() { return { @@ -86,11 +89,13 @@ }; }, computed: { + getcurrentDeviceChannels: function() { - + } }, mounted() { + this.$refs.chooseChannelDialog.openDialog() this.initData(); this.updateLooper = setInterval(this.initData, 10000); }, @@ -133,7 +138,7 @@ }); }, chooseChannel: function(platform) { - + this.$refs.chooseChannelDialog.openDialog() }, initData: function() { this.getPlatformList(); diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue index e221974..fd52e04 100644 --- a/web_src/src/components/channelList.vue +++ b/web_src/src/components/channelList.vue @@ -31,6 +31,8 @@ <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" border style="width: 100%"> <el-table-column prop="channelId" label="閫氶亾缂栧彿" width="210"> </el-table-column> + <el-table-column prop="channelId" label="璁惧缂栧彿" width="210"> + </el-table-column> <el-table-column prop="name" label="閫氶亾鍚嶇О"> </el-table-column> <el-table-column prop="subCount" label="瀛愯妭鐐规暟"> -- Gitblit v1.8.0