Merge branch 'master' into master

Monibuca · Dec 16, 2020 · 8154d85 · 8154d85
2 parents 3ffb586 + c4a54d7
commit 8154d85
Show file tree

Hide file tree

Showing 10 changed files with 6,820 additions and 6,386 deletions.
diff --git a/ui/dist/plugin-gb28181.common.js b/ui/dist/plugin-gb28181.common.js
diff --git a/ui/dist/plugin-gb28181.common.js.map b/ui/dist/plugin-gb28181.common.js.map
diff --git a/ui/dist/plugin-gb28181.css b/ui/dist/plugin-gb28181.css
diff --git a/ui/dist/plugin-gb28181.umd.js b/ui/dist/plugin-gb28181.umd.js
diff --git a/ui/dist/plugin-gb28181.umd.js.map b/ui/dist/plugin-gb28181.umd.js.map
diff --git a/ui/dist/plugin-gb28181.umd.min.js b/ui/dist/plugin-gb28181.umd.min.js
diff --git a/ui/dist/plugin-gb28181.umd.min.js.map b/ui/dist/plugin-gb28181.umd.min.js.map
diff --git a/ui/src/App.vue b/ui/src/App.vue
@@ -52,22 +52,18 @@
         </div>
         <div class="tabpanel" v-if="$parent.titleTabActive === 1">
             <div class="search">
-                <i-select v-model="channelSelectedList" multiple>
-                    <Option
-                        v-for="(channel, index) in channelList"
-                        :value="channel"
-                        :label="channel.DeviceID + '(' + channel.Name + ')'"
-                        :key="index"
-                    >
-                    </Option>
-                </i-select>
+            <i-select v-model="channelSelectedList" multiple>
+              <i-option v-for="(channel,index) in channelList"
+                      :value="channel"
+                      :label="channel.DeviceID + '(' + channel.Name + ')'"
+                      :key="index">
+              </i-option>
+            </i-select>
             </div>
             <div class="flex-box">
-                <template v-for="(channel, index) in channelSelectedList">
-                    <div class="flex-item" :key="index" v-if="channel.ID">
-                        <webrtc-player2
-                            :stream-path="'gb28181/' + channel.ID"
-                        ></webrtc-player2>
+                <template v-for="(channel,index) in channelSelectedList">
+                    <div class="flex-item" :key="index" v-if="channel.DeviceID">
+                        <webrtc-player2 :stream-path="'gb28181/'+channel.DeviceID"></webrtc-player2>
                     </div>
                 </template>
             </div>