heyang 2 年之前
父节点
当前提交
cf4fe6f7f7

+ 3 - 25
api/index.js

@@ -1204,36 +1204,14 @@ export const classifiedListAll = (data) => {
         data: data
     })
 };
-
-//获取实验室视频地址(校区区分-文昌)
-export const wenchangGetStartList  = (data) => {
-    return apiResquestFormVideo({
-        url: `/wenchang/api/play/startList/`,
-        method: 'GET',
-        data: data,
-    })
-};
-
-
-//获取实验室视频地址(校区区分-南湖)
-export const nanhuGetStartList  = (data) => {
-    return apiResquestFormVideo({
-        url: `/nanhu/api/play/startList/`,
-        method: 'GET',
-        data: data,
-    })
-};
-
-//获取实验室视频地址(暨南大学)
-export const jinanGetStartList  = (data) => {
+//获取实验室视频地址
+export const GetStartList  = (data) => {
     return apiResquestFormVideo({
-        url: `/jinandaxue/api/play/startList/`,
+        url: `/algorithm/api/play/startList/`,
         method: 'GET',
         data: data,
     })
 };
-
-
 //扫码兑换调用
 export const exchangePoints  = (data) => {
     return apiResquest({

+ 4 - 4
pages/alarmInfo/alarmInfoMonitor.vue

@@ -25,7 +25,7 @@
 
 <script>
 	import { config,} from '@/api/request/config.js'
-    import {jinanGetStartList} from '@/api/index.js'
+    import {GetStartList} from '@/api/index.js'
     export default {
         data() {
             return {
@@ -59,7 +59,7 @@
             }
         },
         onLoad(option) {
-			this.jinanGetStartList();
+			this.GetStartList();
         },
         onShow(){
 
@@ -81,14 +81,14 @@
 
 			},
 			//查询摄像头地址(交大)
-			async jinanGetStartList(deviceIds){
+			async GetStartList(deviceIds){
 			  let obj = {
 				page:'1',
 				count:'1',
 				//deviceIds:deviceIds
 				deviceIds:'4401020049200000000100209'
 			  };
-			  const {data} = await jinanGetStartList(obj);
+			  const {data} = await GetStartList(obj);
 			  if(data.code == 200){
 				let list = [];
 				for(let i=0;i<data.data.length;i++){

+ 4 - 4
pages/emergencyEvacuationBig.vue

@@ -185,7 +185,7 @@
 <script>
     import { config } from '@/api/request/config.js'
     import { lablayout,evacuate,closure,lineEvacuate,getRedis,getDeviceList,textParseUrlIps,
-	getCameraByFloor,jinanGetStartList,nanhuGetStartList,wenchangGetStartList,lineEvacuateTow,treeselectByUser,getBuilding} from '@/api/index.js'
+	getCameraByFloor,GetStartList,lineEvacuateTow,treeselectByUser,getBuilding} from '@/api/index.js'
     export default {
         data() {
             return {
@@ -427,12 +427,12 @@
 				if(data.code == 200){
 					if(data.data[0]){
 						this.itemData.hardwareNUM=data.data.join(',')
-						this.wenchangGetStartList(data.data);
+						this.GetStartList(data.data);
 						// this.startUrl(response.data);
 					}
 				}
 			},
-			async wenchangGetStartList(rows){
+			async GetStartList(rows){
 				let self = this;
 				let list = "";
 				for(let i=0;i<rows.length;i++){
@@ -444,7 +444,7 @@
 				  deviceIds:list,
 				  // deviceIds:'440102004920000000011111,2C440102004920000000011112',
 				};
-				const {data} = await jinanGetStartList(obj)
+				const {data} = await GetStartList(obj)
 				if(data.code == 200){
                     let list = [];
                     for(let i=0;i<data.data.length;i++){

+ 4 - 4
pages/emergencyEvacuationBig/emergencyEvacuationBig.vue

@@ -178,7 +178,7 @@
 
 <script>
     import { config } from '@/api/request/config.js'
-    import { lablayout,evacuate,closure,lineEvacuate,getRedis,getDeviceList,textParseUrlIps,getCameraByFloor,jinanGetStartList,nanhuGetStartList,lineEvacuateTow,laboratoryInfo} from '@/api/index.js'
+    import { lablayout,evacuate,closure,lineEvacuate,getRedis,getDeviceList,textParseUrlIps,getCameraByFloor,GetStartList,lineEvacuateTow,laboratoryInfo} from '@/api/index.js'
     export default {
         data() {
             return {
@@ -340,11 +340,11 @@
 						console.log(list)
 
 
-						this.nanhuGetStartList(list);
+						this.GetStartList(list);
 					}
 				}
 			},
-			async nanhuGetStartList(rows){
+			async GetStartList(rows){
 				let self = this;
 				let list = "";
 				for(let i=0;i<rows.length;i++){
@@ -356,7 +356,7 @@
 				  deviceIds:list,
 				  // deviceIds:'440102004920000000011111,2C440102004920000000011112',
 				};
-				const {data} = await jinanGetStartList(obj)
+				const {data} = await GetStartList(obj)
 				if(data.code == 200){
                     let list = [];
                     for(let i=0;i<data.data.length;i++){

+ 4 - 4
pages/emergencyEvacuationBig/emergencyEvacuationBigOne.vue

@@ -185,7 +185,7 @@
 <script>
     import { config } from '@/api/request/config.js'
     import { lablayout,evacuate,closure,lineEvacuate,getRedis,getDeviceList,textParseUrlIps,
-	getCameraByFloor,jinanGetStartList,nanhuGetStartList,wenchangGetStartList,lineEvacuateTow,treeselectByUser,getBuilding} from '@/api/index.js'
+	getCameraByFloor,GetStartList,GetStartList,lineEvacuateTow,treeselectByUser,getBuilding} from '@/api/index.js'
     export default {
         data() {
             return {
@@ -427,12 +427,12 @@
 				if(data.code == 200){
 					if(data.data[0]){
 						this.itemData.hardwareNUM=data.data.join(',')
-						this.wenchangGetStartList(data.data);
+						this.GetStartList(data.data);
 						// this.startUrl(response.data);
 					}
 				}
 			},
-			async wenchangGetStartList(rows){
+			async GetStartList(rows){
 				let self = this;
 				let list = "";
 				for(let i=0;i<rows.length;i++){
@@ -444,7 +444,7 @@
 				  deviceIds:list,
 				  // deviceIds:'440102004920000000011111,2C440102004920000000011112',
 				};
-				const {data} = await jinanGetStartList(obj)
+				const {data} = await GetStartList(obj)
 				if(data.code == 200){
                     let list = [];
                     for(let i=0;i<data.data.length;i++){

+ 4 - 8
pages_manage/workbench/laboratory/monitor.vue

@@ -61,7 +61,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import { getChannels,wenchangGetStartList,jinanGetStartList,nanhuGetStartList ,getDeviceListBySub ,textParseUrlIps ,voice } from '@/api/index.js'
+import { getChannels,GetStartList,getDeviceListBySub ,textParseUrlIps ,voice } from '@/api/index.js'
 export default {
   data() {
     return {
@@ -98,11 +98,7 @@ export default {
     console.log(this.itemData)
     console.log(this.deptId)
 
-    // if(this.deptId == 102){
-    //   this.wenchangGetStartList();
-    // }else if(this.deptId == 113){
-    //   this.nanhuGetStartList();
-    // }
+
 	this.GetVideoList();
     this.getDeviceListBySub();
     // this.getChannels();
@@ -352,14 +348,14 @@ export default {
         // console.log(data);
       }
     },
-    //查询摄像头地址(矿大文昌大学)
+    //查询摄像头地址
     async GetVideoList(){
       let obj = {
         page:'1',
         count:'10',
         deviceIds:this.itemData.hardwareNUM
       };
-      const {data} = await wenchangGetStartList(obj);
+      const {data} = await GetStartList(obj);
       if(data.code == 200){
         let list = [];
         for(let i=0;i<data.data.length;i++){