heyang преди 2 години
родител
ревизия
2e50dc7f09
променени са 4 файла, в които са добавени 1695 реда и са изтрити 1552 реда
  1. 15 0
      api/index.js
  2. 2 2
      api/request/config.js
  3. 71 0
      api/request/request.js
  4. 1607 1550
      pages/emergencyEvacuationBig.vue

+ 15 - 0
api/index.js

@@ -2,6 +2,7 @@ import { apiResquest } from './request/request.js'
 import { apiResquestForm } from './request/request.js'
 import { apiResquestJsonList } from './request/request.js'
 import { apiResquestFormVideo } from './request/request.js'
+import { apiResquestTimer } from './request/request.js'
 //管理端--------------------------------
 //获取openid
 export const getOpenId  = (data) => {
@@ -1693,3 +1694,17 @@ export const getBuilding  = (id) => {
         method: 'GET',
     })
 };
+//一键灭火-查询设备状态
+export const firedeviceStatus  = (data) => {
+    return apiResquest({
+        url: `/algorithm/firedevice/getStatus?subjectId=`+data,
+        method: 'GET',
+    })
+};
+//一键灭火-定时器查询设备状态
+export const firedeviceStatusTiming  = (data) => {
+    return apiResquestTimer({
+        url: `/algorithm/firedevice/getStatusDetails?deviceCode=`+data,
+        method: 'GET',
+    })
+};

+ 2 - 2
api/request/config.js

@@ -1,14 +1,14 @@
 const config = {
 	//base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.7:8080',//刘波
-	// base_url: 'http://192.168.1.17:8080',//周攀
+	 base_url: 'http://192.168.1.17:8080',//周攀
     // base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
      //base_url: 'http://192.168.1.43:9800',//43服务器
 	// base_url: 'https://demo.sxitdlc.com/xzgd/',
 
 	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
-	 base_url: 'https://lab.sxitdlc.com/labAppTest',//43服务器线上
+	// base_url: 'https://lab.sxitdlc.com/labAppTest',//43服务器线上
     //base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
 	//base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址

+ 71 - 0
api/request/request.js

@@ -294,3 +294,74 @@ export const apiResquestFormVideo = (prams) => {
         });
     })
 }
+export const apiResquestTimer = (prams) => {
+	return new Promise((resolve, reject) => {
+		let url = config.base_url + prams.url;
+        // get请求映射params参数
+        if (prams.method === 'GET' && prams.data) {
+            url = url + '?' + tansParams(prams.data);
+            url = url.slice(0, -1);
+            prams.data = {};
+        }
+
+		return uni.request({
+			url: url,
+			data: {
+				...prams.data
+			},
+			method: prams.method,
+			header: {
+			  	// 'content-type': 'application/x-www-form-urlencoded',
+			  	'content-type': 'application/json;charset=utf-8',
+				'Authorization':uni.getStorageSync('token')
+			},
+			success: (res) => {
+				// 成功
+				uni.hideLoading()
+				if(res.data.code == 200){
+					resolve(res);
+				}else if(res.data.code == 401){
+					uni.showToast({
+						mask:true,
+						icon:"none",
+						position:"center",
+						title: "登录超时,请重新登录~",
+						duration: 2000
+					});
+                    uni.removeStorageSync('token');
+                    uni.removeStorageSync('userId');
+                    uni.removeStorageSync('userType');
+					setTimeout(function(){
+						uni.redirectTo({
+							url: '/pages/login',
+						});
+					},2000);
+				}else{
+					uni.showToast({
+						mask:true,
+						icon:"none",
+						position:"center",
+						title: res.data.msg,
+						duration: 2000
+					});
+					resolve(res);
+				}
+			},
+			fail: (err) => {
+				// 失败
+				uni.hideLoading()
+				uni.showToast({
+					mask:true,
+					icon:"none",
+					position:"center",
+					title: '出错啦~请联系管理员!',
+					duration: 2000
+				});
+				console.log("失败",err)
+			},
+			complete: () => {
+				// 完成
+			}
+		});
+	})
+}

Файловите разлики са ограничени, защото са твърде много
+ 1607 - 1550
pages/emergencyEvacuationBig.vue