feat: merge

src/views/schedule/video/compoent/detail.vue

@@ -8,7 +8,6 @@
       muted
       autoplay
       :poster="require('@/assets//video-post.png')"
-      controls
     />
     <div class="detail-buttom">
       <el-row :gutter="16">
@@ -135,7 +134,8 @@ export default {
       player: null,
       availableParam: {},
       infoData: {},
-      videoLoading: false
+      videoLoading: false,
+      settingDatacopy: []
     }
   },
   created () {
@@ -188,7 +188,7 @@ export default {
         hight: this.infoData.withHight.split('*')[1],
         bitRate: this.infoData.bitRate.slice(0, -4),
         frameRate: this.infoData.frameRate.slice(0, -3)
-      }).then(({ data }) => {
+      }).then(() => {
         this.destroyPlayer()
         this.getflv()
       })
@@ -203,6 +203,7 @@ export default {
         })
         for (let i = 1; i < 26; i++) {
           this.settingData[1].push({ value: i + 'fps', active: false })
+          this.settingDatacopy.push({ value: i + 'fps', active: false })
         }
         data.streamRateTypeList.forEach((item) => {
           this.settingData[2].push({ value: item + 'kb/s', active: false })
@@ -227,13 +228,12 @@ export default {
           this.settingData[0][i].active = true
         }
       }
-      this.settingData[1].splice(0, this.settingData[1].length)
-      for (let i = 1; i < 26; i++) {
-        this.settingData[1].push({ value: i + 'fps', active: false })
-      }
+      this.settingData[1] = this.settingDatacopy
       for (let i = 0; i < this.settingData[1].length; i++) {
         if (this.settingData[1][i].value === data.frameRate) {
           this.settingData[1][i].active = true
+        } else {
+          this.settingData[1][i].active = false
         }
       }
       for (let i = 0; i < this.settingData[2].length; i++) {
@@ -253,6 +253,12 @@ export default {
         return item.active === true
       })
       this.infoData.frameRate = findData ? this.infoData.frameRate : (this.settingData[1].length + 'fps')
+      if (!findData) {
+        this.infoData.frameRate = this.settingData[1].length + 'fps'
+        this.settingData[1][this.settingData[1].length].active = true
+      }
+      // this.settingData[1][this.settingData[1].length].value = this.infoData.frameRate
+
       this.settingData[2] = this.settingData[2].filter((item) => {
         var splceitem = item.value.slice(0, -4)
         return (
@@ -288,10 +294,9 @@ export default {
       this.settingData[this.settingActive].forEach((element) => {
         element.active = false
       })
-
       this.settingData[this.settingActive][index].active = !this.settingData[this.settingActive][index].active
       var arr = JSON.stringify(this.infoData)
-      console.log(this.settingData[this.settingActive])
+      // console.log(this.settingData)
       if (this.settingActive === 0) {
         if (
           this.infoData.withHight !==
@@ -420,6 +425,7 @@ export default {
         },
         yAxis: {
           type: 'value',
+          minInterval: 1,
           splitLine: {
             lineStyle: {
               color: '#4779BC',

src/views/schedule/video/index.vue

@@ -60,7 +60,7 @@
                   class="video"
                   muted
                   autoplay
-                  controls
+
                   :poster="require('@/assets//video-post.png')"
                 />
                 <div
@@ -353,11 +353,14 @@ export default {
       }
     },
     handleClick () {},
-    search () {},
+    search () {
+      this.getCamera()
+    },
     getCamera () {
       const options = this.videoOption
       options.error = false
       options.loading = true
+      options.params.name = this.searchname
       getCamera(options.params)
         .then(
           ({ data, totalCount }) => {