解决串流，解决编辑上级平台却新建了的问题

web_src/src/components/Login.vue

@@ -1,19 +1,35 @@
 <template>
 <div class="login" id="login">
-    <a href="javascript:;" class="log-close"><i class="icons close"></i></a>
-    <div class="log-bg">
-        <div class="log-cloud cloud1"></div>
-        <div class="log-cloud cloud2"></div>
-        <div class="log-cloud cloud3"></div>
-        <div class="log-cloud cloud4"></div>
+  <div class="limiter">
+    <div class="container-login100">
+      <div class="wrap-login100">
+					<span class="login100-form-title p-b-26">WVP视频平台</span>
+          <span class="login100-form-title p-b-48">
+						<i class="fa fa-video-camera"></i>
+					</span>
 
-        <div class="log-logo">Welcome!</div>
-        <div class="log-text"></div>
-    </div>
-    <div class="log-email" v-loading="isLoging" >
-        <input type="text" placeholder="用户名" :class="'log-input' + (username==''?' log-input-empty':'')" v-model="username"><input type="password" placeholder="密码" :class="'log-input' + (password==''?' log-input-empty':'')"  v-model="password">
-        <a href="javascript:;" class="log-btn" @click="login" >登录</a>
+          <div class="wrap-input100 validate-input" data-validate = "Valid email is: a@b.c">
+            <input :class="'input100 ' + (username==''?'':'has-val')" type="text" v-model="username" name="username">
+            <span class="focus-input100" data-placeholder="用户名"></span>
+          </div>
+
+          <div class="wrap-input100 validate-input" data-validate="Enter password">
+						<span class="btn-show-pass">
+							<i :class="'fa ' + (!showPassword?'fa-eye':'fa-eye-slash')" @click="showPassword = !showPassword"></i>
+						</span>
+            <input :class="'input100 ' + (password==''?'':'has-val')" :type="(!showPassword?'password':'text')" v-model="password" name="password">
+            <span class="focus-input100" data-placeholder="密码"></span>
+          </div>
+
+          <div class="container-login100-form-btn">
+            <div class="wrap-login100-form-btn">
+              <div class="login100-form-bgbtn"></div>
+              <button class="login100-form-btn" @click="login">登录</button>
+            </div>
+          </div>
+      </div>
     </div>
+  </div>
 </div>
 </template>
 
@@ -24,6 +40,7 @@ export default {
   data(){
   	return {
       isLoging: false,
+      showPassword: false,
   		username: '',
   		password: ''
   	}
@@ -105,84 +122,3 @@ export default {
 }
 </script>
 
-<style scoped>
-.login{position: fixed; overflow: hidden;left: 50%; margin-left: -250px; top:50%; margin-top: -350px; width: 500px; min-height: 555px; z-index: 10; right: 140px; background: #fff;-webkit-border-radius: 5px;
--moz-border-radius: 5px;
--ms-border-radius: 5px;
--o-border-radius: 5px;
-border-radius: 5px; -webkit-box-shadow:  0px 3px 16px -5px #070707; box-shadow:  0px 3px 16px -5px #070707}
-.log-close{display: block; position: absolute; top:12px; right: 12px; opacity: 1;}
-.log-close:hover .icons{transform: rotate(180deg);}
-.log-close .icons{opacity: 1; transition: all .3s}
-.log-cloud{background-image: url(../assets/login-cloud.png); width: 63px ;height: 40px; position: absolute; z-index: 1}
-.login .cloud1{top:21px; left: -30px; transform: scale(.6); animation: cloud1 20s linear infinite;}
-.login .cloud2{top:87px; right: 20px; animation: cloud2 19s linear infinite;}
-.login .cloud3{top:160px; left: 5px;transform: scale(.8);animation: cloud3 21s linear infinite;}
-.login .cloud4{top:150px; left: -40px;transform: scale(.4);animation: cloud4 19s linear infinite;}
-.log-bg{background: url(../assets/login-bg.jpg); width: 100%; height: 312px; overflow: hidden;}
-.log-logo{height: 80px; margin: 120px auto 25px; text-align: center; color: #1fcab3; font-weight: bold; font-size: 40px;}
-.log-text{color: #57d4c3; font-size: 13px; text-align: center; margin: 0 auto;}
-.log-logo,.log-text{z-index: 2}
-.icons{background:url(../assets/icons.png) no-repeat; display: inline-block;}
-.close{height:16px;width:16px;background-position:-13px 0;}
-.login-email{height:17px;width:29px;background-position:-117px 0;}
-
-.log-btns{padding: 15px 0; margin: 0 auto;}
-.log-btn{width:402px; display: block; text-align: left; line-height: 50px;margin:0 auto 15px; height:50px; color:#fff; font-size:13px;-webkit-border-radius: 5px; background-color: #3B5999;
--moz-border-radius: 5px;
--ms-border-radius: 5px;
--o-border-radius: 5px;
-border-radius: 5px;
-position: relative;}
-.log-btn.tw{background-color: #13B4E9}
-.log-btn.email{background-color: #50E3CE}
-.log-btn:hover,.log-btn:focus{color: #fff; opacity: .8;}
-
-.log-email{text-align: center; margin-top: 20px;}
-.log-email .log-btn{background-color: #50E3CE;text-align: center;}
-.log-input-empty{border: 1px solid #f37474 !important;}
-.isloading{background: #d6d6d6}
-.log-btn .icons{margin-left: 30px; vertical-align: middle;}
-.log-btn .text{left: 95px; line-height: 50px; text-align: left; position: absolute;}
-.log-input{width: 370px;overflow: hidden; padding: 0 15px;font-size: 13px; border: 1px solid #EBEBEB; margin:0 auto 15px; height: 48px; line-height: 48px; -webkit-border-radius: 5px;
--moz-border-radius: 5px;
--ms-border-radius: 5px;
--o-border-radius: 5px;
-border-radius: 5px;}
-.log-input.warn{border: 1px solid #f88787}
-
- @-webkit-keyframes cloud1 {
-    0%{left: 200px}
-    100%{left:-130px;}
-}
-@keyframes cloud1{
-    0%{left: 200px}
-    100%{left:-130px;}
-}
-
- @-webkit-keyframes cloud2 {
-    0%{left:500px;}
-    100%{left:-90px;}
-}
-@keyframes cloud2{
-    0%{left:500px;}
-    100%{left:-90px;}
-}
-
-@-webkit-keyframes cloud3 {
-    0%{left:620px;}
-    100%{left:-70px;}
-}
-@keyframes cloud3{
-    0%{left:620px;}
-    100%{left:-70px;}
-}@-webkit-keyframes cloud4 {
-    0%{left:100px;}
-    100%{left:-70px;}
-}
-@keyframes cloud4{
-    0%{left:100px;}
-    100%{left:-70px;}
-}
-
-</style>

web_src/src/components/dialog/devicePlayer.vue

@@ -138,6 +138,7 @@
 
 <script>
 // import player from '../dialog/rtcPlayer.vue'
+// import LivePlayer from '@liveqing/liveplayer'
 import player from '../dialog/easyPlayer.vue'
 export default {
     name: 'devicePlayer',

web_src/src/components/dialog/platformEdit.vue

@@ -122,19 +122,20 @@ export default {
       onSubmit_text: "立即创建",
 
       platform: {
+        id: null,
         enable: true,
         ptz: true,
         rtcp: false,
-        name: "测试001",
-        serverGBId: "34020000002000000001",
-        serverGBDomain: "3402000000",
-        serverIP: "192.168.1.141",
-        serverPort: "5060",
-        deviceGBId: "34020000001320001101",
-        deviceIp: "192.168.1.20",
-        devicePort: "5060",
-        username: "34020000001320001101",
-        password: "12345678",
+        name: null,
+        serverGBId: null,
+        serverGBDomain: null,
+        serverIP: null,
+        serverPort: null,
+        deviceGBId: null,
+        deviceIp: null,
+        devicePort: null,
+        username: null,
+        password: null,
         expires: 300,
         keepTimeout: 60,
         transport: "UDP",
@@ -163,27 +164,27 @@ export default {
   methods: {
     openDialog: function (platform, callback) {
       var that = this;
-      this.$axios({
-                method: 'get',
-                url:`/api/platform/server_config`
-      }).then(function (res) {
+      if (platform == null) {
+        this.onSubmit_text = "立即创建";
+        this.$axios({
+          method: 'get',
+          url:`/api/platform/server_config`
+        }).then(function (res) {
           console.log(res);
           that.platform.deviceGBId = res.data.username;
           that.platform.deviceIp = res.data.deviceIp;
           that.platform.devicePort = res.data.devicePort;
           that.platform.username = res.data.username;
           that.platform.password = res.data.password;
-      }).catch(function (error) {
+        }).catch(function (error) {
           console.log(error);
         });
-      this.showDialog = true;
-      this.listChangeCallback = callback;
-      if (platform != null) {
+      }else {
         this.platform = platform;
         this.onSubmit_text = "保存";
-      } else {
-        this.onSubmit_text = "立即创建";
       }
+      this.showDialog = true;
+      this.listChangeCallback = callback;
     },
     onSubmit: function () {
       console.log("onSubmit");