Merge branch 'web-v2' into web-v2-pro

src/views/mine/index.vue

@@ -470,6 +470,12 @@
       //页面按钮点击
       buttonTypeClick(type){
         if(this.buttonType != type){
+          if(this.$refs.userform){
+            this.$refs.userform.clearValidate()
+          }
+          if(this.$refs.form){
+            this.$refs.form.clearValidate()
+          }
           this.buttonType = type;
         }
       },

src/views/newEvacuationBigDataHome.vue

@@ -85,8 +85,8 @@
             <i :class="index == monitorType?'el-icon-arrow-up':'el-icon-arrow-down'" @click="getMonitorUrl(index)"></i>
           </div>
           <div class="video-mx-big-box" v-show="index == monitorType"
-               v-for="(videoItem,videoIndex) in videoList" :key="videoIndex">
-            <video class="video-box" :id="videoItem.divId" ref="videoRef" :poster="videoCover"
+               v-for="(videoItem,videoIndex) in item.hardwareList" :key="videoIndex">
+            <video class="video-box" :id="videoItem" ref="videoRef" :poster="videoCover"
                    autoplay controls  muted width="366px" height="210px"></video>
           </div>
         </div>
@@ -762,7 +762,7 @@
             if(urlText.indexOf(localStorage.getItem('ipIdentify')) != -1){
               for(let i=0;i<newData.length;i++){
                 let obj = {
-                  divId:'divId'+i,
+                  divId:newData[i].deviceID,
                   hasAudio:false,
                   height:false,
                   videoUrl:newData[i].ws_flv,
@@ -776,7 +776,7 @@
                 url = url.split("rtp/");
                 let newUrl = text+'rtp/'+url[1];
                 let obj = {
-                  divId:'divId'+i,
+                  divId:newData[i].deviceID,
                   hasAudio:false,
                   height:false,
                   videoUrl:newUrl,