dedsudiyu 4 days ago
parent
commit
5dabb5df71
4 changed files with 14 additions and 31 deletions
  1. 9 24
      .env.development
  2. 1 1
      .env.production
  3. 3 6
      src/views/home.vue
  4. 1 0
      src/views/miniProgramVideoHls/index.vue

+ 9 - 24
.env.development

@@ -23,20 +23,14 @@ VUE_APP_VERSION_DIFFERENCE_FIELD = 'kuangYeDaXue_nanHu'
 
 # ####################外网接口配置####################
 
-# 现场
-VUE_APP_BASE_API = '172.16.0.65/api'
+# 西农
+# VUE_APP_BASE_API = 'labcontrol.nwafu.edu.cn/api'
 
-# 小飞
-# VUE_APP_BASE_API = '192.168.1.17:8080'
-
-# 韩
-# VUE_APP_BASE_API = '192.168.1.20:8080'
-
-# 柴
-# VUE_APP_BASE_API = '192.168.1.9:8080'
+# 山西农大
+VUE_APP_BASE_API = 'lasfl.sxau.edu.cn/api'
 
 # 1.8外网地址
-# VUE_APP_BASE_API = '192.168.1.8/api'
+# VUE_APP_BASE_API = 'lab.zjznai.com/labTest'
 
 # 43外网地址
 # VUE_APP_BASE_API = 'lab.zjznai.com/labapp'
@@ -46,20 +40,11 @@ VUE_APP_BASE_API = '172.16.0.65/api'
 
 # ####################内网接口配置####################
 
-# 现场
-VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
-
-# 小飞
-# VUE_APP_BASE_LOCAL_API = '192.168.1.17:8080'
-
-# 韩
-# VUE_APP_BASE_LOCAL_API = '192.168.1.20:8080'
-
-# 柴
-# VUE_APP_BASE_LOCAL_API = '192.168.1.9:8080'
+# 西农
+# VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
 
-# 高升
-# VUE_APP_BASE_LOCAL_API = '192.168.1.39:8080'
+# 山西农大
+VUE_APP_BASE_LOCAL_API = 'lasfl.sxau.edu.cn/api'
 
 # 1.8内网地址
 # VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'

+ 1 - 1
.env.production

@@ -44,7 +44,7 @@ VUE_APP_BASE_API = 'lasfl.sxau.edu.cn/api'
 # VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
 
 # 山西农大
-VUE_APP_BASE_API = 'lasfl.sxau.edu.cn/api'
+VUE_APP_BASE_LOCAL_API = 'lasfl.sxau.edu.cn/api'
 
 # 1.8内网地址
 # VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'

+ 3 - 6
src/views/home.vue

@@ -33,20 +33,17 @@
           let text = decodeURIComponent(window.location.href);
           text = text.split("?")[1]
           if(text.indexOf('touken') != -1){
-            // this.$router.push({
-            //   path: '/miniProgramVideo'+'?'+text,
-            // });
             if(text.indexOf('mpegts') != -1){
+              console.log('mpegts')
               this.$set(this,'pageType','miniProgramVideoMpegts');
             }else if(text.indexOf('hls') != -1){
+              console.log('hls')
               this.$set(this,'pageType','miniProgramVideoHls');
             }else{
+              console.log('haikang')
               this.$set(this,'pageType','miniProgramVideo');
             }
           }else if(text.indexOf('cameraIndexCode') != -1){
-            // this.$router.push({
-            //   path: '/miniProgramPlayback'+'?'+text,
-            // });
             this.$set(this,'pageType','miniProgramPlayback');
           }
         },

+ 1 - 0
src/views/miniProgramVideoHls/index.vue

@@ -24,6 +24,7 @@
 </template>
 <script>
   import mpegtsVideo from '@/components/mpegtsVideo/mpegtsVideo.vue'
+  import { iotCameraFindByCondition } from "@/api/index";
   export default {
     name: 'index',
     components: {