dedsudiyu 8 달 전
부모
커밋
e9fc8cb53b
3개의 변경된 파일14개의 추가작업 그리고 11개의 파일을 삭제
  1. 4 4
      .env.production
  2. 1 0
      .gitignore
  3. 9 7
      src/App.vue

+ 4 - 4
.env.production

@@ -23,10 +23,10 @@ VUE_APP_VERSION_DIFFERENCE_FIELD = 'kuangYeDaXue_nanHu'
 # ####################外网接口配置####################
 
 # 现场
-VUE_APP_BASE_API = '172.16.0.65/api'
+# VUE_APP_BASE_API = '172.16.0.65/api'
 
 # 1.8外网地址
-# VUE_APP_BASE_API = 'lab.zjznai.com/labTest'
+VUE_APP_BASE_API = 'lab.zjznai.com/labTest'
 
 # 43外网地址
 # VUE_APP_BASE_API = 'lab.zjznai.com/labapp'
@@ -37,10 +37,10 @@ VUE_APP_BASE_API = '172.16.0.65/api'
 # ####################内网接口配置####################
 
 # 现场
-VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
+# VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
 
 # 1.8内网地址
-# VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
+VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
 
 # 43内网地址
 # VUE_APP_BASE_LOCAL_API = '192.168.1.43/api'

+ 1 - 0
.gitignore

@@ -1,2 +1,3 @@
 /node_modules
 /.idea
+/dist

+ 9 - 7
src/App.vue

@@ -46,22 +46,24 @@
                 urlList.forEach((item) => {
                     urlData[item.split("=")[0]] = item.split("=")[1];
                 });
-                console.log('urlData',urlData)
-                // type 1.楼栋 2.楼层 3.楼道 4.实验室
+                // type 1.楼栋 2.楼层 3.楼道 4.实验室 5.楼道+实验室
                 let obj = {
                     page:'1',
                     pageSize:'4',
                 };
                 if(urlData.type == 1){
-                    obj.buildId = urlData.id;
+                    obj.buildId = urlData.buildId;
                 }else  if(urlData.type == 2){
-                    obj.floorId = urlData.id;
+                    obj.floorId = urlData.floorId;
                 }else  if(urlData.type == 3){
-                    obj.passageway = urlData.id;
+                    obj.passageway = urlData.floorId;
                 }else  if(urlData.type == 4){
-                    obj.subIds = [urlData.id];
+                    obj.subIds = [urlData.subId];
+                }else if(urlData.type == 5){
+                    obj.passageway = urlData.floorId;
+                    obj.subIds = [urlData.subId];
                 }
-                if(urlData.type&&urlData.id){
+                if(urlData.type){
                     iotCameraFindByCondition(obj).then(response => {
                         if (!response.data.records[0]){
                             this.$set(this,'nullType','视频异常,请联系管理员');