src/components/live-video/index.vue

@@ -1,9 +1,6 @@
 <template>
   <view class="h-full w-full">
-    <iframe class="w-full h-full" v-if="type=='iframe'" :src="url"></iframe>
+    <div ref="muiPlayer"></div>
-    <div ref="muiPlayer" v-else>
-      
-    </div>
   </view>
 </template>
 <script>
@@ -26,77 +23,73 @@ export default {
   },
   methods: {
     videoPlayer() {
-      if (this.type == 'iframe') {
+      let parse = {}
-        console.log("=====");
+      if (this.type == 'm3u8') {
-      } else {
+        parse = {
-        let parse = {}
+          type: 'hls',
-        if (this.type == 'm3u8') {
+          loader: Hls,
-          parse = {
+          config: {
-            type: 'hls',
+            debug: false,
-            loader: Hls,
+          },
-            config: {
-              debug: false,
-            },
-          }
-        } else {
-          parse = {
-            type: 'flv',
-            loader: Flv,
-            config: {
-              debug: false,
-            },
-          }
         }
-        this.mp = new MuiPlayer({
+      } else {
-          container: this.$refs.muiPlayer,
+        parse = {
-          live: true,
+          type: 'flv',
-          src: this.url,
+          loader: Flv,
-          autoplay: true,
+          config: {
-          muted: true,
+            debug: false,
-          parse: parse,
+          },
-          pageHead: false,
+        }
-          width: '100%',
+      }
-          height: '100%',
+      this.mp = new MuiPlayer({
-          autoFit: false,
+        container: this.$refs.muiPlayer,
-          objectFit: 'contain',
+        live: true,
-          videoAttribute: [
+        src: this.url,
+        autoplay: true,
+        muted: true,
+        parse: parse,
+        pageHead: false,
+        width: '100%',
+        height: '100%',
+        autoFit:false,
+        objectFit: 'contain',
+        videoAttribute: [
+          {
+            attrKey: 'webkit-playsinline',
+            attrValue: 'webkit-playsinline',
+          },
+          {
+            attrKey: 'playsinline',
+            attrValue: 'playsinline',
+          },
+          {
+            attrKey: 'x5-video-player-type',
+            attrValue: 'h5-page',
+          },
+        ],
+        custom: {
+          footerControls: [
             {
-              attrKey: 'webkit-playsinline',
+              style: {},
-              attrValue: 'webkit-playsinline',
-            },
-            {
-              attrKey: 'playsinline',
-              attrValue: 'playsinline',
-            },
-            {
-              attrKey: 'x5-video-player-type',
-              attrValue: 'h5-page',
             },
           ],
-          custom: {
+        },
-            footerControls: [
+      })
-              {
+      let _video = this.mp.video()
-                style: {},
-              },
-            ],
-          },
-        })
-        let _video = this.mp.video()
     
-        this.$nextTick(() => {
+      this.$nextTick(() => {
-          this.mp.on('ready', (event) => {
+        this.mp.on('ready', (event) => {
-            _video.play()
+          _video.play()
-            _video.addEventListener('play', (e) => {
+          _video.addEventListener('play', (e) => {
-              //播放事件
+            //播放事件
-              this.$emit('onPlayFn')
+            this.$emit('onPlayFn')
-            })
+          })
-            _video.addEventListener('ended', (e) => {
+          _video.addEventListener('ended', (e) => {
-              //播放完成事件
+            //播放完成事件
-              this.$emit('onEndedFn')
+            this.$emit('onEndedFn')
-            })
           })
         })
-      }
+      })
     },
   },
 }

src/components/live-video/index1.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="h-full w-full">
+  <view>
     <LiveVideo
       v-if="address"
       :key="address"

src/pages/basics/basics-base.vue

@@ -185,7 +185,7 @@ export default {
           },
         },
         {
-          field: 'industry',
+          field: 'type',
           label: '农业类型',
           component: 'ApiSelect',
           componentProps: ({ formActionType }) => {
@@ -197,7 +197,7 @@ export default {
                 return data.data
               },
               labelField: 'name',
-              valueField: 'key',
+              valueField: 'id',
             }
           },
         },

src/pages/basics/profile.vue

@@ -157,7 +157,7 @@ export default {
           },
         },
         {
-          field: 'industry',
+          field: 'type',
           label: '农业类型',
           component: 'ApiSelect',
           componentProps: ({ formActionType }) => {
@@ -169,7 +169,7 @@ export default {
                 return data.data
               },
               labelField: 'name',
-              valueField: 'key',
+              valueField: 'id',
             }
           },
         },
@@ -178,15 +178,15 @@ export default {
   },
   computed: {
     options() {
-      return [].filter((e) => checkPermission(e.permission))
+      return [
+        
+      ].filter((e) => checkPermission(e.permission))
     },
   },
   methods: {
     handleSubmit(e) {
       this.filterParmas = e
-      this.$nextTick(() => {
+      this.mescroll.resetUpScroll()
-        this.mescroll.resetUpScroll()
-      })
     },
     upCallback({ num, size }) {
       this.getData({

src/pages/index/monitor.vue

@@ -135,7 +135,7 @@
     </view>
     <view class="content-box">
       <view class="video_ul" v-show="current == 0">
-        <view class="video_li" v-for="(video, index) in videoList" :key="index+'s'">
+        <view class="video_li" v-for="(video, index) in videoList" :key="video.video_url+index">
           <view class="video_cd">
             <!-- #ifdef H5 -->
             <!-- {{ video.video_url }} -->
@@ -165,7 +165,7 @@
         <view
           class="video_li"
           v-for="(video, index) in videoList2"
-          :key="index+'s2'"
+          :key="video.video_url+index"
         >
           <view class="video_cd">
             <!-- #ifdef H5 -->