guzijian / wvp-GB28181-pro · Commits

Commit 0020402685c0997c0a73bc7ac90535e50e8f972a

Authored by panlinlin
1 parent 397e0c4a

完成向上级联->选择通道-001

Inline Side-by-side
Showing 4 changed files with 17 additions and 30 deletions
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
  View file @0020402
... ... @@ -8,15 +8,15 @@ import org.springframework.context.annotation.Configuration;
8 8 public class SipConfig {
9 9  
10 10 @Value("${sip.ip}")
11   - String sipIp;
  11 + private String sipIp;
12 12 @Value("${sip.port}")
13   - Integer sipPort;
  13 + private Integer sipPort;
14 14 @Value("${sip.domain}")
15   - String sipDomain;
  15 + private String sipDomain;
16 16 @Value("${sip.id}")
17   - String sipId;
  17 + private String sipId;
18 18 @Value("${sip.password}")
19   - String sipPassword;
  19 + private String sipPassword;
20 20  
21 21 @Value("${sip.ptz.speed:50}")
22 22 Integer speed;
... ... @@ -25,47 +25,28 @@ public class SipConfig {
25 25 return sipIp;
26 26 }
27 27  
28   - public void setSipIp(String sipIp) {
29   - this.sipIp = sipIp;
30   - }
31 28  
32 29 public Integer getSipPort() {
33 30 return sipPort;
34 31 }
35 32  
36   - public void setSipPort(Integer sipPort) {
37   - this.sipPort = sipPort;
38   - }
39 33  
40 34 public String getSipDomain() {
41 35 return sipDomain;
42 36 }
43 37  
44   - public void setSipDomain(String sipDomain) {
45   - this.sipDomain = sipDomain;
46   - }
47 38  
48 39 public String getSipId() {
49 40 return sipId;
50 41 }
51 42  
52   - public void setSipId(String sipId) {
53   - this.sipId = sipId;
54   - }
55   -
56 43 public String getSipPassword() {
57 44 return sipPassword;
58 45 }
59 46  
60   - public void setSipPassword(String sipPassword) {
61   - this.sipPassword = sipPassword;
62   - }
63 47  
64 48 public Integer getSpeed() {
65 49 return speed;
66 50 }
67 51  
68   - public void setSpeed(Integer speed) {
69   - this.speed = speed;
70   - }
71 52 }
... ...
src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
  View file @0020402
... ... @@ -45,7 +45,6 @@ public interface ParentPlatformMapper {
45 45 @Delete("DELETE FROM parent_platform WHERE deviceGBId=#{deviceGBId}")
46 46 int delParentPlatform(ParentPlatform parentPlatform);
47 47  
48   -
49 48 @Select("SELECT * FROM parent_platform")
50 49 List<ParentPlatform> getParentPlatformList();
51 50  
... ...
web_src/src/components/ParentPlatformList.vue
  View file @0020402
... ... @@ -39,9 +39,9 @@
39 39 </template>
40 40 </el-table-column>
41 41 <el-table-column prop="deviceGBId" label="设备国标编号" width="240" align="center"></el-table-column>
42   - <el-table-column prop="transport" label="流传输模式" width="120" align="center"></el-table-column>
  42 + <el-table-column prop="transport" label="信令传输模式" width="120" align="center"></el-table-column>
43 43 <el-table-column prop="channelCount" label="通道数" align="center"></el-table-column>
44   -
  44 +
45 45 <el-table-column label="操作" width="300" align="center" fixed="right">
46 46 <template slot-scope="scope">
47 47 <el-button size="mini" icon="el-icon-edit" @click="editPlatform(scope.row)">编辑</el-button>
... ... @@ -61,6 +61,7 @@
61 61 :total="total">
62 62 </el-pagination>
63 63 <platformEdit ref="platformEdit" ></platformEdit>
  64 + <chooseChannelDialog ref="chooseChannelDialog" ></chooseChannelDialog>
64 65 </el-main>
65 66 </el-container>
66 67 </div>
... ... @@ -69,11 +70,13 @@
69 70 <script>
70 71 import platformEdit from './platformEdit.vue'
71 72 import uiHeader from './UiHeader.vue'
  73 +import chooseChannelDialog from './gb28181/chooseChannel.vue'
72 74 export default {
73 75 name: 'app',
74 76 components: {
75 77 platformEdit,
76   - uiHeader
  78 + uiHeader,
  79 + chooseChannelDialog
77 80 },
78 81 data() {
79 82 return {
... ... @@ -86,11 +89,13 @@ export default {
86 89 };
87 90 },
88 91 computed: {
  92 +
89 93 getcurrentDeviceChannels: function() {
90   -
  94 +
91 95 }
92 96 },
93 97 mounted() {
  98 + this.$refs.chooseChannelDialog.openDialog()
94 99 this.initData();
95 100 this.updateLooper = setInterval(this.initData, 10000);
96 101 },
... ... @@ -133,7 +138,7 @@ export default {
133 138 });
134 139 },
135 140 chooseChannel: function(platform) {
136   -
  141 + this.$refs.chooseChannelDialog.openDialog()
137 142 },
138 143 initData: function() {
139 144 this.getPlatformList();
... ...
web_src/src/components/channelList.vue
  View file @0020402
... ... @@ -31,6 +31,8 @@
31 31 <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" border style="width: 100%">
32 32 <el-table-column prop="channelId" label="通道编号" width="210">
33 33 </el-table-column>
  34 + <el-table-column prop="channelId" label="设备编号" width="210">
  35 + </el-table-column>
34 36 <el-table-column prop="name" label="通道名称">
35 37 </el-table-column>
36 38 <el-table-column prop="subCount" label="子节点数">
... ...