diff --git a/api/check.js b/api/check.js
index 719e90d..e234954 100644
--- a/api/check.js
+++ b/api/check.js
@@ -8,9 +8,39 @@
 const JobInfo =  'https://smartwell.gd.smartlog.work/job/info'
 const DeviceDetail =  'https://smartwell.gd.smartlog.work/overview/deviceDetail'
 const WellInfo =  'https://smartwell.gd.smartlog.work/well/info'
+const Welldata =  'https://smartwell.gd.smartlog.work/welldata/list-page'
+const Liquiddata =  'https://smartwell.gd.smartlog.work/liquiddata/list-page'
+const Gasdata =  'https://smartwell.gd.smartlog.work/gasdata/list-page'
 
 
 /**
+ * 获取燃气数据
+ * @param {*}  
+ */
+export function getGasdata(params) {
+	useNetWork();
+  return fetch.get(Gasdata,params).then(res => res);
+}
+
+/**
+ * 获取液位数据
+ * @param {*}  
+ */
+export function getLiquiddata(params) {
+	useNetWork();
+  return fetch.get(Liquiddata,params).then(res => res);
+}
+
+/**
+ * 获取井盖数据
+ * @param {*}  
+ */
+export function getWelldata(params) {
+	useNetWork();
+  return fetch.get(Welldata,params).then(res => res);
+}
+
+/**
  * 获取井口详情
  * @param {*}  
  */

diff --git a/api/check.js b/api/check.js
index 719e90d..e234954 100644
--- a/api/check.js
+++ b/api/check.js
@@ -8,9 +8,39 @@
 const JobInfo =  'https://smartwell.gd.smartlog.work/job/info'
 const DeviceDetail =  'https://smartwell.gd.smartlog.work/overview/deviceDetail'
 const WellInfo =  'https://smartwell.gd.smartlog.work/well/info'
+const Welldata =  'https://smartwell.gd.smartlog.work/welldata/list-page'
+const Liquiddata =  'https://smartwell.gd.smartlog.work/liquiddata/list-page'
+const Gasdata =  'https://smartwell.gd.smartlog.work/gasdata/list-page'
 
 
 /**
+ * 获取燃气数据
+ * @param {*}  
+ */
+export function getGasdata(params) {
+	useNetWork();
+  return fetch.get(Gasdata,params).then(res => res);
+}
+
+/**
+ * 获取液位数据
+ * @param {*}  
+ */
+export function getLiquiddata(params) {
+	useNetWork();
+  return fetch.get(Liquiddata,params).then(res => res);
+}
+
+/**
+ * 获取井盖数据
+ * @param {*}  
+ */
+export function getWelldata(params) {
+	useNetWork();
+  return fetch.get(Welldata,params).then(res => res);
+}
+
+/**
  * 获取井口详情
  * @param {*}  
  */
diff --git a/api/user.js b/api/user.js
index 5172366..f7690f0 100644
--- a/api/user.js
+++ b/api/user.js
@@ -5,6 +5,7 @@
 const UserType = BASE_URL + "/user/getUserType";
 const UserRegister = BASE_URL + "/user/userRegister";
 const UpdateUserImg = BASE_URL + "/user/updateUserImg";
+const UserJurisdiction = BASE_URL + "/user/getUserJurisdiction";
 
 export function login(code) {
   useNetWork();
@@ -13,6 +14,15 @@
 }
 
 /**
+ * 获取到用户权限
+ * @param {*}
+ */
+export function getUserJurisdiction(data) {
+  useNetWork();
+  return fetch.post(UserJurisdiction,data).then((res) => res);
+}
+
+/**
  * 获取到用户类型
  * @param {*}
  */

diff --git a/api/check.js b/api/check.js
index 719e90d..e234954 100644
--- a/api/check.js
+++ b/api/check.js
@@ -8,9 +8,39 @@
 const JobInfo =  'https://smartwell.gd.smartlog.work/job/info'
 const DeviceDetail =  'https://smartwell.gd.smartlog.work/overview/deviceDetail'
 const WellInfo =  'https://smartwell.gd.smartlog.work/well/info'
+const Welldata =  'https://smartwell.gd.smartlog.work/welldata/list-page'
+const Liquiddata =  'https://smartwell.gd.smartlog.work/liquiddata/list-page'
+const Gasdata =  'https://smartwell.gd.smartlog.work/gasdata/list-page'
 
 
 /**
+ * 获取燃气数据
+ * @param {*}  
+ */
+export function getGasdata(params) {
+	useNetWork();
+  return fetch.get(Gasdata,params).then(res => res);
+}
+
+/**
+ * 获取液位数据
+ * @param {*}  
+ */
+export function getLiquiddata(params) {
+	useNetWork();
+  return fetch.get(Liquiddata,params).then(res => res);
+}
+
+/**
+ * 获取井盖数据
+ * @param {*}  
+ */
+export function getWelldata(params) {
+	useNetWork();
+  return fetch.get(Welldata,params).then(res => res);
+}
+
+/**
  * 获取井口详情
  * @param {*}  
  */
diff --git a/api/user.js b/api/user.js
index 5172366..f7690f0 100644
--- a/api/user.js
+++ b/api/user.js
@@ -5,6 +5,7 @@
 const UserType = BASE_URL + "/user/getUserType";
 const UserRegister = BASE_URL + "/user/userRegister";
 const UpdateUserImg = BASE_URL + "/user/updateUserImg";
+const UserJurisdiction = BASE_URL + "/user/getUserJurisdiction";
 
 export function login(code) {
   useNetWork();
@@ -13,6 +14,15 @@
 }
 
 /**
+ * 获取到用户权限
+ * @param {*}
+ */
+export function getUserJurisdiction(data) {
+  useNetWork();
+  return fetch.post(UserJurisdiction,data).then((res) => res);
+}
+
+/**
  * 获取到用户类型
  * @param {*}
  */
diff --git a/pages.json b/pages.json
index ca9a023..e2b2d71 100644
--- a/pages.json
+++ b/pages.json
@@ -84,7 +84,7 @@
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}		
 		},
 		{
@@ -145,11 +145,5 @@
 	]
 	}
 	],
-	"preloadRule": {
-		"pagesA/checkInfo/checkInfo": {
-		"network": "all",
-		"packages": ["pagesA"]
-		}
-	},
 	"uniIdRouter": {}
 }

diff --git a/api/check.js b/api/check.js
index 719e90d..e234954 100644
--- a/api/check.js
+++ b/api/check.js
@@ -8,9 +8,39 @@
 const JobInfo =  'https://smartwell.gd.smartlog.work/job/info'
 const DeviceDetail =  'https://smartwell.gd.smartlog.work/overview/deviceDetail'
 const WellInfo =  'https://smartwell.gd.smartlog.work/well/info'
+const Welldata =  'https://smartwell.gd.smartlog.work/welldata/list-page'
+const Liquiddata =  'https://smartwell.gd.smartlog.work/liquiddata/list-page'
+const Gasdata =  'https://smartwell.gd.smartlog.work/gasdata/list-page'
 
 
 /**
+ * 获取燃气数据
+ * @param {*}  
+ */
+export function getGasdata(params) {
+	useNetWork();
+  return fetch.get(Gasdata,params).then(res => res);
+}
+
+/**
+ * 获取液位数据
+ * @param {*}  
+ */
+export function getLiquiddata(params) {
+	useNetWork();
+  return fetch.get(Liquiddata,params).then(res => res);
+}
+
+/**
+ * 获取井盖数据
+ * @param {*}  
+ */
+export function getWelldata(params) {
+	useNetWork();
+  return fetch.get(Welldata,params).then(res => res);
+}
+
+/**
  * 获取井口详情
  * @param {*}  
  */
diff --git a/api/user.js b/api/user.js
index 5172366..f7690f0 100644
--- a/api/user.js
+++ b/api/user.js
@@ -5,6 +5,7 @@
 const UserType = BASE_URL + "/user/getUserType";
 const UserRegister = BASE_URL + "/user/userRegister";
 const UpdateUserImg = BASE_URL + "/user/updateUserImg";
+const UserJurisdiction = BASE_URL + "/user/getUserJurisdiction";
 
 export function login(code) {
   useNetWork();
@@ -13,6 +14,15 @@
 }
 
 /**
+ * 获取到用户权限
+ * @param {*}
+ */
+export function getUserJurisdiction(data) {
+  useNetWork();
+  return fetch.post(UserJurisdiction,data).then((res) => res);
+}
+
+/**
  * 获取到用户类型
  * @param {*}
  */
diff --git a/pages.json b/pages.json
index ca9a023..e2b2d71 100644
--- a/pages.json
+++ b/pages.json
@@ -84,7 +84,7 @@
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}		
 		},
 		{
@@ -145,11 +145,5 @@
 	]
 	}
 	],
-	"preloadRule": {
-		"pagesA/checkInfo/checkInfo": {
-		"network": "all",
-		"packages": ["pagesA"]
-		}
-	},
 	"uniIdRouter": {}
 }
diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue
index 242bb23..0596f82 100644
--- a/pages/checkTable/checkTable.vue
+++ b/pages/checkTable/checkTable.vue
@@ -15,16 +15,16 @@
 			<view class="table-content-center">
 				<view class="content-center-info" v-for="(item, index) in list" :key="index">
 					<view class="center-info" style="width: 160rpx;">
-						{{item.name}}
+						{{item.deviceTypeName}}
 					</view>
 					<view class="center-info" style="width: 140rpx;text-align: center;">
-						{{item.longdu}}
+						{{item.strength}}
 					</view>
 					<view class="center-info" style="width: 160rpx;text-align: center;">
-						{{item.dianliang}}
+						{{item.cell}}
 					</view>
 					<view class="center-info" style="width: 160rpx;">
-						{{item.time}}
+						{{item.logtime}}
 					</view>
 				</view>
 			</view>
@@ -38,13 +38,13 @@
 			<view class="table-content-center">
 				<view class="content-center-info" v-for="(item, index) in list" :key="index">
 					<view class="center-info" style="width: 160rpx;">
-						{{item.name}}
+						{{item.deviceTypeName}}
 					</view>
 					<view class="center-info" style="width: 160rpx;text-align: center;">
-						{{item.dianliang}}
+						{{item.descn}}
 					</view>
 					<view class="center-info" style="width: 160rpx;">
-						{{item.time}}
+						{{item.logtime}}
 					</view>
 				</view>
 			</view>
@@ -58,16 +58,16 @@
 			<view class="table-content-center">
 				<view class="content-center-info" v-for="(item, index) in list" :key="index">
 					<view class="center-info" style="width: 160rpx;">
-						{{item.name}}
+						{{item.deviceTypeName}}
 					</view>
 					<view class="center-info" style="width: 140rpx;text-align: center;">
-						{{item.longdu}}
+						{{item.descn}}
 					</view>
 					<view class="center-info" style="width: 160rpx;text-align: center;">
-						{{item.dianliang}}
+						{{item.cell}}
 					</view>
 					<view class="center-info" style="width: 160rpx;">
-						{{item.time}}
+						{{item.logtime}}
 					</view>
 				</view>
 			</view>
@@ -115,6 +115,7 @@
 </template>
 
 <script>
+	import { getWelldata, getLiquiddata, getGasdata } from '@/api/check.js'
 	export default {
 		data() {
 			return {
@@ -125,10 +126,20 @@
 				isTimeZ: "",
 				isTimeQ: "",
 				isExportShow: false, // 控制导出弹窗
+				queryList:{ // 查询条件
+					keywords:'',
+					deptid: '',
+					beginTime: '',
+					endTime: '',
+					offset: 1,
+					limit:9999,
+					sort:'',
+					order:''
+				},
 				coumsGas:[
 					{name: '设备信息', width:'160rpx'},
 					{name: '燃气浓度(%LEL)', width:'140rpx'},
-					{name: '电量(%)', width:'160rpx'},
+					{name: '电量', width:'160rpx'},
 					{name: '上传时间', width:'160rpx'},
 				],
 				coumsManhole:[
@@ -142,23 +153,30 @@
 					{name: '电量(%)', width:'160rpx'},
 					{name: '上传时间', width:'160rpx'},
 				],
-				list: [
-					{name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-					{name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-					{name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-					{name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-				],
+				list: [],
 				type: '' // 控制表格展示
 			}
 		},
-	    onLoad(option){
+	    async onLoad(option){
 		   this.type = option.type
-		   
+		   this.getList()
 		},
 		methods: {
+		   async getList() { // 获取到数据
+				if(this.type === '1'){
+			   let res =  await getWelldata(this.queryList)
+				this.list = res.rows
+				}else if (this.type === '2'){
+			   let res =  await getLiquiddata(this.queryList)
+				this.list = res.rows
+				}else {
+			   let res = await getGasdata(this.queryList)
+				this.list = res.rows
+				}
+			},
 			// 确认导出
 			exportQr() {
-			  // this.exportClick();
+			  this.exportClick();
 			  this.isExportShow = false;
 			},
 			// 导出的取消按钮
@@ -167,14 +185,15 @@
 			} ,
 			//确定选择结束时间
 			async confirmEndTime(e) {
-			  // this.queryList.endTime = await this.shijianc(e.value);
+			  this.queryList.endTime = await this.shijianc(e.value);
 			  this.isTimeZ = await this.yueFen(e.value);
 			  this.time = `${this.isTimeQ}${this.isTimeZ}`;
+			  this.getList()
 			  this.endTimeShow = false;
 			},
 			//确定选择开始时间
 			async confirmTime(e) {
-			  // this.queryList.startTime = await this.shijianc(e.value);
+			  this.queryList.beginTime = await this.shijianc(e.value);
 			  this.isTimeQ = await this.yueFen(e.value);
 			  this.startTimeShow = false;
 			  this.endTimeShow = true;
@@ -182,18 +201,23 @@
 			//取消选择时间
 			closeTime() {
 			  this.time = "筛选时间";
+			  this.startTimeShow = false;
 			},
 			//确定导出
 			async exportClick() {
-			  const sessionId = uni.getStorageSync("sessionId");
+			  const sessionId = uni.getStorageSync("token");
 			  let filePath = `${wx.env.USER_DATA_PATH}/${+new Date()}.xlsx`;
-			  let ids = "";
-			  ids =
-			    this.checkboxList.length === 0
-			      ? this.list.map((item) => item.id).join()
-			      : this.checkboxList.map((item) => item.id).join();
+			  let url = ''
+			  if(this.type === '1') {
+				  url = 'welldata'
+			  }else if(this.type === '2') {
+				  url = 'liquiddata'
+			  }else {
+				  url = 'gasdata'
+			  }
 			  uni.request({
-			    url: `https://visitor.gd.smartlog.work/visitor/exportMessage?ids=${ids}`,
+			    url: `https://smartwell.gd.smartlog.work/${url}/export`,
+				params:this.queryList,
 			    responseType: "arraybuffer",
 			    header: {
 			      token: sessionId, //自定义请求头信息
@@ -262,6 +286,9 @@
 </script>
 
 <style scoped lang="scss">
+	.list-content-info {
+		text-align: center;
+	}
 	.check-table-top {
 		display: flex;
 		align-items: center;
@@ -302,7 +329,7 @@
 				justify-content: space-around;
 				margin-bottom: 16rpx;
 				.center-info {
-					font-size: 26rpx;
+					font-size: 24rpx;
 				}
 			}
 		}

diff --git a/api/check.js b/api/check.js
index 719e90d..e234954 100644
--- a/api/check.js
+++ b/api/check.js
@@ -8,9 +8,39 @@
 const JobInfo =  'https://smartwell.gd.smartlog.work/job/info'
 const DeviceDetail =  'https://smartwell.gd.smartlog.work/overview/deviceDetail'
 const WellInfo =  'https://smartwell.gd.smartlog.work/well/info'
+const Welldata =  'https://smartwell.gd.smartlog.work/welldata/list-page'
+const Liquiddata =  'https://smartwell.gd.smartlog.work/liquiddata/list-page'
+const Gasdata =  'https://smartwell.gd.smartlog.work/gasdata/list-page'
 
 
 /**
+ * 获取燃气数据
+ * @param {*}  
+ */
+export function getGasdata(params) {
+	useNetWork();
+  return fetch.get(Gasdata,params).then(res => res);
+}
+
+/**
+ * 获取液位数据
+ * @param {*}  
+ */
+export function getLiquiddata(params) {
+	useNetWork();
+  return fetch.get(Liquiddata,params).then(res => res);
+}
+
+/**
+ * 获取井盖数据
+ * @param {*}  
+ */
+export function getWelldata(params) {
+	useNetWork();
+  return fetch.get(Welldata,params).then(res => res);
+}
+
+/**
  * 获取井口详情
  * @param {*}  
  */
diff --git a/api/user.js b/api/user.js
index 5172366..f7690f0 100644
--- a/api/user.js
+++ b/api/user.js
@@ -5,6 +5,7 @@
 const UserType = BASE_URL + "/user/getUserType";
 const UserRegister = BASE_URL + "/user/userRegister";
 const UpdateUserImg = BASE_URL + "/user/updateUserImg";
+const UserJurisdiction = BASE_URL + "/user/getUserJurisdiction";
 
 export function login(code) {
   useNetWork();
@@ -13,6 +14,15 @@
 }
 
 /**
+ * 获取到用户权限
+ * @param {*}
+ */
+export function getUserJurisdiction(data) {
+  useNetWork();
+  return fetch.post(UserJurisdiction,data).then((res) => res);
+}
+
+/**
  * 获取到用户类型
  * @param {*}
  */
diff --git a/pages.json b/pages.json
index ca9a023..e2b2d71 100644
--- a/pages.json
+++ b/pages.json
@@ -84,7 +84,7 @@
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}		
 		},
 		{
@@ -145,11 +145,5 @@
 	]
 	}
 	],
-	"preloadRule": {
-		"pagesA/checkInfo/checkInfo": {
-		"network": "all",
-		"packages": ["pagesA"]
-		}
-	},
 	"uniIdRouter": {}
 }
diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue
index 242bb23..0596f82 100644
--- a/pages/checkTable/checkTable.vue
+++ b/pages/checkTable/checkTable.vue
@@ -15,16 +15,16 @@
 			<view class="table-content-center">
 				<view class="content-center-info" v-for="(item, index) in list" :key="index">
 					<view class="center-info" style="width: 160rpx;">
-						{{item.name}}
+						{{item.deviceTypeName}}
 					</view>
 					<view class="center-info" style="width: 140rpx;text-align: center;">
-						{{item.longdu}}
+						{{item.strength}}
 					</view>
 					<view class="center-info" style="width: 160rpx;text-align: center;">
-						{{item.dianliang}}
+						{{item.cell}}
 					</view>
 					<view class="center-info" style="width: 160rpx;">
-						{{item.time}}
+						{{item.logtime}}
 					</view>
 				</view>
 			</view>
@@ -38,13 +38,13 @@
 			<view class="table-content-center">
 				<view class="content-center-info" v-for="(item, index) in list" :key="index">
 					<view class="center-info" style="width: 160rpx;">
-						{{item.name}}
+						{{item.deviceTypeName}}
 					</view>
 					<view class="center-info" style="width: 160rpx;text-align: center;">
-						{{item.dianliang}}
+						{{item.descn}}
 					</view>
 					<view class="center-info" style="width: 160rpx;">
-						{{item.time}}
+						{{item.logtime}}
 					</view>
 				</view>
 			</view>
@@ -58,16 +58,16 @@
 			<view class="table-content-center">
 				<view class="content-center-info" v-for="(item, index) in list" :key="index">
 					<view class="center-info" style="width: 160rpx;">
-						{{item.name}}
+						{{item.deviceTypeName}}
 					</view>
 					<view class="center-info" style="width: 140rpx;text-align: center;">
-						{{item.longdu}}
+						{{item.descn}}
 					</view>
 					<view class="center-info" style="width: 160rpx;text-align: center;">
-						{{item.dianliang}}
+						{{item.cell}}
 					</view>
 					<view class="center-info" style="width: 160rpx;">
-						{{item.time}}
+						{{item.logtime}}
 					</view>
 				</view>
 			</view>
@@ -115,6 +115,7 @@
 </template>
 
 <script>
+	import { getWelldata, getLiquiddata, getGasdata } from '@/api/check.js'
 	export default {
 		data() {
 			return {
@@ -125,10 +126,20 @@
 				isTimeZ: "",
 				isTimeQ: "",
 				isExportShow: false, // 控制导出弹窗
+				queryList:{ // 查询条件
+					keywords:'',
+					deptid: '',
+					beginTime: '',
+					endTime: '',
+					offset: 1,
+					limit:9999,
+					sort:'',
+					order:''
+				},
 				coumsGas:[
 					{name: '设备信息', width:'160rpx'},
 					{name: '燃气浓度(%LEL)', width:'140rpx'},
-					{name: '电量(%)', width:'160rpx'},
+					{name: '电量', width:'160rpx'},
 					{name: '上传时间', width:'160rpx'},
 				],
 				coumsManhole:[
@@ -142,23 +153,30 @@
 					{name: '电量(%)', width:'160rpx'},
 					{name: '上传时间', width:'160rpx'},
 				],
-				list: [
-					{name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-					{name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-					{name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-					{name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-				],
+				list: [],
 				type: '' // 控制表格展示
 			}
 		},
-	    onLoad(option){
+	    async onLoad(option){
 		   this.type = option.type
-		   
+		   this.getList()
 		},
 		methods: {
+		   async getList() { // 获取到数据
+				if(this.type === '1'){
+			   let res =  await getWelldata(this.queryList)
+				this.list = res.rows
+				}else if (this.type === '2'){
+			   let res =  await getLiquiddata(this.queryList)
+				this.list = res.rows
+				}else {
+			   let res = await getGasdata(this.queryList)
+				this.list = res.rows
+				}
+			},
 			// 确认导出
 			exportQr() {
-			  // this.exportClick();
+			  this.exportClick();
 			  this.isExportShow = false;
 			},
 			// 导出的取消按钮
@@ -167,14 +185,15 @@
 			} ,
 			//确定选择结束时间
 			async confirmEndTime(e) {
-			  // this.queryList.endTime = await this.shijianc(e.value);
+			  this.queryList.endTime = await this.shijianc(e.value);
 			  this.isTimeZ = await this.yueFen(e.value);
 			  this.time = `${this.isTimeQ}${this.isTimeZ}`;
+			  this.getList()
 			  this.endTimeShow = false;
 			},
 			//确定选择开始时间
 			async confirmTime(e) {
-			  // this.queryList.startTime = await this.shijianc(e.value);
+			  this.queryList.beginTime = await this.shijianc(e.value);
 			  this.isTimeQ = await this.yueFen(e.value);
 			  this.startTimeShow = false;
 			  this.endTimeShow = true;
@@ -182,18 +201,23 @@
 			//取消选择时间
 			closeTime() {
 			  this.time = "筛选时间";
+			  this.startTimeShow = false;
 			},
 			//确定导出
 			async exportClick() {
-			  const sessionId = uni.getStorageSync("sessionId");
+			  const sessionId = uni.getStorageSync("token");
 			  let filePath = `${wx.env.USER_DATA_PATH}/${+new Date()}.xlsx`;
-			  let ids = "";
-			  ids =
-			    this.checkboxList.length === 0
-			      ? this.list.map((item) => item.id).join()
-			      : this.checkboxList.map((item) => item.id).join();
+			  let url = ''
+			  if(this.type === '1') {
+				  url = 'welldata'
+			  }else if(this.type === '2') {
+				  url = 'liquiddata'
+			  }else {
+				  url = 'gasdata'
+			  }
 			  uni.request({
-			    url: `https://visitor.gd.smartlog.work/visitor/exportMessage?ids=${ids}`,
+			    url: `https://smartwell.gd.smartlog.work/${url}/export`,
+				params:this.queryList,
 			    responseType: "arraybuffer",
 			    header: {
 			      token: sessionId, //自定义请求头信息
@@ -262,6 +286,9 @@
 </script>
 
 <style scoped lang="scss">
+	.list-content-info {
+		text-align: center;
+	}
 	.check-table-top {
 		display: flex;
 		align-items: center;
@@ -302,7 +329,7 @@
 				justify-content: space-around;
 				margin-bottom: 16rpx;
 				.center-info {
-					font-size: 26rpx;
+					font-size: 24rpx;
 				}
 			}
 		}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4f904b1..d113f84 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -21,6 +21,7 @@
 import TabBar from "@/components/tabBar/tabBar.vue";
 import { getLogin, getUserProfile } from "@/utils/auth.js";
 import { verifyPhone } from "@/api/index.js";
+import {getUserJurisdiction} from '@/api/user.js'
 import { getLocationParams } from "@/common/utils.js";
 import GetPhonePopup from "@/components/base/getphonePopup.vue";
 import { subscription } from "@/utils/common.js"
@@ -43,6 +44,7 @@
         },
       ],
       phone: "",
+	  uid:'',
       popShow: false, //控制授权手机号弹出框
       active: "", //点击的是哪个按钮
     };
@@ -85,7 +87,7 @@
       if (!sessionId) {
         await getLogin();
       }
-			if(id === 'submit') {
+			// if(id === 'submit') {
 				this.phone = uni.getStorageSync("registerPhone");
 				if (this.phone) {
 				  this.checkphone();
@@ -93,15 +95,12 @@
 					//弹获取手机号
 				  this.popShow = true;
 				}
-			} else {
-				// uni.showToast({
-				// 	title: '敬请期待',
-				// 	icon: 'none'
-				// });
-				wx.navigateTo({
-				  url: '/pages/check/check',
-				});
-			}
+			// } else {
+			// 	// uni.showToast({
+			// 	// 	title: '敬请期待',
+			// 	// 	icon: 'none'
+			// 	// });
+			// }
     },
 		//通过手机号检查是否存在这个用户
     async checkphone() {
@@ -114,18 +113,35 @@
 				uni.setStorageSync("registerPhone", this.phone);
         await getUserProfile(); //获取人员信息
 				
-				if (uni.getStorageSync("userInfo")) {
-				  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
-				  if (userInfo.salt === "物业人员") {
-				    subscription();
-				  } 
+			if (uni.getStorageSync("userInfo")) {
+			  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+			  this.uid = userInfo.id
+			  if (userInfo.salt === "物业人员") {
+				if(this.active === "submit") {
+					subscription();
 				}
+			  } 
+			}
 				
         if (this.active === "submit") {
           wx.navigateTo({
             url: `/pages/information/information?id=${this.active}`,
           });
-        }
+        }else {
+			// 判断是否有这个路径
+			const res = await getUserJurisdiction({uid:this.uid})
+			if(res.indexOf('/pages/check/check') !== -1) {
+				wx.navigateTo({
+				  url: '/pages/check/check',
+				});
+			}else {
+				uni.showToast({
+					title: '非业务管理员无权访问',
+					icon: 'none'
+				});
+			}
+			
+		}
       }
     },
 		

diff --git a/api/check.js b/api/check.js
index 719e90d..e234954 100644
--- a/api/check.js
+++ b/api/check.js
@@ -8,9 +8,39 @@
 const JobInfo =  'https://smartwell.gd.smartlog.work/job/info'
 const DeviceDetail =  'https://smartwell.gd.smartlog.work/overview/deviceDetail'
 const WellInfo =  'https://smartwell.gd.smartlog.work/well/info'
+const Welldata =  'https://smartwell.gd.smartlog.work/welldata/list-page'
+const Liquiddata =  'https://smartwell.gd.smartlog.work/liquiddata/list-page'
+const Gasdata =  'https://smartwell.gd.smartlog.work/gasdata/list-page'
 
 
 /**
+ * 获取燃气数据
+ * @param {*}  
+ */
+export function getGasdata(params) {
+	useNetWork();
+  return fetch.get(Gasdata,params).then(res => res);
+}
+
+/**
+ * 获取液位数据
+ * @param {*}  
+ */
+export function getLiquiddata(params) {
+	useNetWork();
+  return fetch.get(Liquiddata,params).then(res => res);
+}
+
+/**
+ * 获取井盖数据
+ * @param {*}  
+ */
+export function getWelldata(params) {
+	useNetWork();
+  return fetch.get(Welldata,params).then(res => res);
+}
+
+/**
  * 获取井口详情
  * @param {*}  
  */
diff --git a/api/user.js b/api/user.js
index 5172366..f7690f0 100644
--- a/api/user.js
+++ b/api/user.js
@@ -5,6 +5,7 @@
 const UserType = BASE_URL + "/user/getUserType";
 const UserRegister = BASE_URL + "/user/userRegister";
 const UpdateUserImg = BASE_URL + "/user/updateUserImg";
+const UserJurisdiction = BASE_URL + "/user/getUserJurisdiction";
 
 export function login(code) {
   useNetWork();
@@ -13,6 +14,15 @@
 }
 
 /**
+ * 获取到用户权限
+ * @param {*}
+ */
+export function getUserJurisdiction(data) {
+  useNetWork();
+  return fetch.post(UserJurisdiction,data).then((res) => res);
+}
+
+/**
  * 获取到用户类型
  * @param {*}
  */
diff --git a/pages.json b/pages.json
index ca9a023..e2b2d71 100644
--- a/pages.json
+++ b/pages.json
@@ -84,7 +84,7 @@
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}		
 		},
 		{
@@ -145,11 +145,5 @@
 	]
 	}
 	],
-	"preloadRule": {
-		"pagesA/checkInfo/checkInfo": {
-		"network": "all",
-		"packages": ["pagesA"]
-		}
-	},
 	"uniIdRouter": {}
 }
diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue
index 242bb23..0596f82 100644
--- a/pages/checkTable/checkTable.vue
+++ b/pages/checkTable/checkTable.vue
@@ -15,16 +15,16 @@
 			<view class="table-content-center">
 				<view class="content-center-info" v-for="(item, index) in list" :key="index">
 					<view class="center-info" style="width: 160rpx;">
-						{{item.name}}
+						{{item.deviceTypeName}}
 					</view>
 					<view class="center-info" style="width: 140rpx;text-align: center;">
-						{{item.longdu}}
+						{{item.strength}}
 					</view>
 					<view class="center-info" style="width: 160rpx;text-align: center;">
-						{{item.dianliang}}
+						{{item.cell}}
 					</view>
 					<view class="center-info" style="width: 160rpx;">
-						{{item.time}}
+						{{item.logtime}}
 					</view>
 				</view>
 			</view>
@@ -38,13 +38,13 @@
 			<view class="table-content-center">
 				<view class="content-center-info" v-for="(item, index) in list" :key="index">
 					<view class="center-info" style="width: 160rpx;">
-						{{item.name}}
+						{{item.deviceTypeName}}
 					</view>
 					<view class="center-info" style="width: 160rpx;text-align: center;">
-						{{item.dianliang}}
+						{{item.descn}}
 					</view>
 					<view class="center-info" style="width: 160rpx;">
-						{{item.time}}
+						{{item.logtime}}
 					</view>
 				</view>
 			</view>
@@ -58,16 +58,16 @@
 			<view class="table-content-center">
 				<view class="content-center-info" v-for="(item, index) in list" :key="index">
 					<view class="center-info" style="width: 160rpx;">
-						{{item.name}}
+						{{item.deviceTypeName}}
 					</view>
 					<view class="center-info" style="width: 140rpx;text-align: center;">
-						{{item.longdu}}
+						{{item.descn}}
 					</view>
 					<view class="center-info" style="width: 160rpx;text-align: center;">
-						{{item.dianliang}}
+						{{item.cell}}
 					</view>
 					<view class="center-info" style="width: 160rpx;">
-						{{item.time}}
+						{{item.logtime}}
 					</view>
 				</view>
 			</view>
@@ -115,6 +115,7 @@
 </template>
 
 <script>
+	import { getWelldata, getLiquiddata, getGasdata } from '@/api/check.js'
 	export default {
 		data() {
 			return {
@@ -125,10 +126,20 @@
 				isTimeZ: "",
 				isTimeQ: "",
 				isExportShow: false, // 控制导出弹窗
+				queryList:{ // 查询条件
+					keywords:'',
+					deptid: '',
+					beginTime: '',
+					endTime: '',
+					offset: 1,
+					limit:9999,
+					sort:'',
+					order:''
+				},
 				coumsGas:[
 					{name: '设备信息', width:'160rpx'},
 					{name: '燃气浓度(%LEL)', width:'140rpx'},
-					{name: '电量(%)', width:'160rpx'},
+					{name: '电量', width:'160rpx'},
 					{name: '上传时间', width:'160rpx'},
 				],
 				coumsManhole:[
@@ -142,23 +153,30 @@
 					{name: '电量(%)', width:'160rpx'},
 					{name: '上传时间', width:'160rpx'},
 				],
-				list: [
-					{name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-					{name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-					{name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-					{name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-				],
+				list: [],
 				type: '' // 控制表格展示
 			}
 		},
-	    onLoad(option){
+	    async onLoad(option){
 		   this.type = option.type
-		   
+		   this.getList()
 		},
 		methods: {
+		   async getList() { // 获取到数据
+				if(this.type === '1'){
+			   let res =  await getWelldata(this.queryList)
+				this.list = res.rows
+				}else if (this.type === '2'){
+			   let res =  await getLiquiddata(this.queryList)
+				this.list = res.rows
+				}else {
+			   let res = await getGasdata(this.queryList)
+				this.list = res.rows
+				}
+			},
 			// 确认导出
 			exportQr() {
-			  // this.exportClick();
+			  this.exportClick();
 			  this.isExportShow = false;
 			},
 			// 导出的取消按钮
@@ -167,14 +185,15 @@
 			} ,
 			//确定选择结束时间
 			async confirmEndTime(e) {
-			  // this.queryList.endTime = await this.shijianc(e.value);
+			  this.queryList.endTime = await this.shijianc(e.value);
 			  this.isTimeZ = await this.yueFen(e.value);
 			  this.time = `${this.isTimeQ}${this.isTimeZ}`;
+			  this.getList()
 			  this.endTimeShow = false;
 			},
 			//确定选择开始时间
 			async confirmTime(e) {
-			  // this.queryList.startTime = await this.shijianc(e.value);
+			  this.queryList.beginTime = await this.shijianc(e.value);
 			  this.isTimeQ = await this.yueFen(e.value);
 			  this.startTimeShow = false;
 			  this.endTimeShow = true;
@@ -182,18 +201,23 @@
 			//取消选择时间
 			closeTime() {
 			  this.time = "筛选时间";
+			  this.startTimeShow = false;
 			},
 			//确定导出
 			async exportClick() {
-			  const sessionId = uni.getStorageSync("sessionId");
+			  const sessionId = uni.getStorageSync("token");
 			  let filePath = `${wx.env.USER_DATA_PATH}/${+new Date()}.xlsx`;
-			  let ids = "";
-			  ids =
-			    this.checkboxList.length === 0
-			      ? this.list.map((item) => item.id).join()
-			      : this.checkboxList.map((item) => item.id).join();
+			  let url = ''
+			  if(this.type === '1') {
+				  url = 'welldata'
+			  }else if(this.type === '2') {
+				  url = 'liquiddata'
+			  }else {
+				  url = 'gasdata'
+			  }
 			  uni.request({
-			    url: `https://visitor.gd.smartlog.work/visitor/exportMessage?ids=${ids}`,
+			    url: `https://smartwell.gd.smartlog.work/${url}/export`,
+				params:this.queryList,
 			    responseType: "arraybuffer",
 			    header: {
 			      token: sessionId, //自定义请求头信息
@@ -262,6 +286,9 @@
 </script>
 
 <style scoped lang="scss">
+	.list-content-info {
+		text-align: center;
+	}
 	.check-table-top {
 		display: flex;
 		align-items: center;
@@ -302,7 +329,7 @@
 				justify-content: space-around;
 				margin-bottom: 16rpx;
 				.center-info {
-					font-size: 26rpx;
+					font-size: 24rpx;
 				}
 			}
 		}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4f904b1..d113f84 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -21,6 +21,7 @@
 import TabBar from "@/components/tabBar/tabBar.vue";
 import { getLogin, getUserProfile } from "@/utils/auth.js";
 import { verifyPhone } from "@/api/index.js";
+import {getUserJurisdiction} from '@/api/user.js'
 import { getLocationParams } from "@/common/utils.js";
 import GetPhonePopup from "@/components/base/getphonePopup.vue";
 import { subscription } from "@/utils/common.js"
@@ -43,6 +44,7 @@
         },
       ],
       phone: "",
+	  uid:'',
       popShow: false, //控制授权手机号弹出框
       active: "", //点击的是哪个按钮
     };
@@ -85,7 +87,7 @@
       if (!sessionId) {
         await getLogin();
       }
-			if(id === 'submit') {
+			// if(id === 'submit') {
 				this.phone = uni.getStorageSync("registerPhone");
 				if (this.phone) {
 				  this.checkphone();
@@ -93,15 +95,12 @@
 					//弹获取手机号
 				  this.popShow = true;
 				}
-			} else {
-				// uni.showToast({
-				// 	title: '敬请期待',
-				// 	icon: 'none'
-				// });
-				wx.navigateTo({
-				  url: '/pages/check/check',
-				});
-			}
+			// } else {
+			// 	// uni.showToast({
+			// 	// 	title: '敬请期待',
+			// 	// 	icon: 'none'
+			// 	// });
+			// }
     },
 		//通过手机号检查是否存在这个用户
     async checkphone() {
@@ -114,18 +113,35 @@
 				uni.setStorageSync("registerPhone", this.phone);
         await getUserProfile(); //获取人员信息
 				
-				if (uni.getStorageSync("userInfo")) {
-				  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
-				  if (userInfo.salt === "物业人员") {
-				    subscription();
-				  } 
+			if (uni.getStorageSync("userInfo")) {
+			  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+			  this.uid = userInfo.id
+			  if (userInfo.salt === "物业人员") {
+				if(this.active === "submit") {
+					subscription();
 				}
+			  } 
+			}
 				
         if (this.active === "submit") {
           wx.navigateTo({
             url: `/pages/information/information?id=${this.active}`,
           });
-        }
+        }else {
+			// 判断是否有这个路径
+			const res = await getUserJurisdiction({uid:this.uid})
+			if(res.indexOf('/pages/check/check') !== -1) {
+				wx.navigateTo({
+				  url: '/pages/check/check',
+				});
+			}else {
+				uni.showToast({
+					title: '非业务管理员无权访问',
+					icon: 'none'
+				});
+			}
+			
+		}
       }
     },
 		
diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue
index a6d3bab..feff1df 100644
--- a/pages/reportList/reportList.vue
+++ b/pages/reportList/reportList.vue
@@ -1,14 +1,14 @@
 <template>
   <view class="list">
     <view class="list-top">
-      <u-input
+     <!-- <u-input
         placeholder="关键字搜索"
         prefixIcon="search"
         border="none"
         v-model="queryList.keywords"
         @change="change"
         prefixIconStyle="font-size: 52rpx;color: #000"
-      ></u-input>
+      ></u-input> -->
       <view class="tab-th">
         <text class="dressingTime" @click="startTimeShow = true">{{
           time
@@ -31,7 +31,7 @@
 		<view class="list-content-center">
 			<view class="list-content-center-info" v-for="(item, index) in list" :key="index">
 				<view class="" style="width: 130rpx;font-size: 22rpx;text-align: center;" @click="eyeLoock(item, item.status === '1' ? '1' : '2')">
-					<text>{{item.alarmContentName}}</text>
+					<text>{{item.keywords}}</text>
 					<text>({{item.devcode}})</text>
 				</view>
 				<view class="" style="width: 140rpx;font-size: 22rpx;text-align: center;" @click="eyeLoock(item, item.status === '1' ? '1' : '2')">
@@ -175,7 +175,7 @@
       @select="statusSelect"
     >
     </u-action-sheet>
-
+     <!-- 底部提示 -->
 	<LoadingList :loading="loading" :nothingMore="nothingMore" />
   </view>
 </template>
@@ -317,7 +317,25 @@
 	  },
 	  async getAlarmList() { // 获取到报警列表
 	   const res = await getAlarm(this.queryList)
-	   this.list = res.rows
+	    if(res.rows && res.rows.length) {
+			const resData = res.rows.map(item=> {
+				if( item.devcode === '412022060001' || item.devcode === '412022060002' || item.devcode === '412022060003'){
+					item.keywords = '井盖状态监测仪'
+				}else if (item.devcode === '312022040441'){
+					item.keywords = '燃气智能监测终端'
+				}else {
+					item.keywords = '液位监测仪'
+				}
+				return item
+			})
+			this.nothingMore = false
+			this.list = this.list.concat(resData); 
+		}else {
+			if(res.total === 0) {
+				this.list = []
+			}
+			this.nothingMore = true
+		}
 	   },
 	  sexSelect(e) {  // 选择状态
 	    this.userInfo.name = e.name
@@ -325,18 +343,18 @@
 		this.$refs.form1.validateField('name')
 	 },
     //搜索框发生改变
-    async change(e) {
-      this.getAlarmList()
-    },
+   //  async change(e) {
+	  
+   //    // this.getAlarmList()
+   //  },
     //确定导出
     async exportClick() {
       const sessionId = uni.getStorageSync("token");
       let filePath = `${wx.env.USER_DATA_PATH}/${+new Date()}.xlsx`;
-      
       uni.request({
-        url: `https://smartwell.gd.smartlog.work/alarm/export?keywords=${this.queryList.keywords}&alarmType=${this.queryList.alarmType}
-		&beginTime=${this.queryList.beginTime}&endTime=${this.queryList.endTime}&status=${this.queryList.status}`,
+        url: `https://smartwell.gd.smartlog.work/alarm/export`,
         responseType: "arraybuffer",
+		params:this.queryList,
         header: {
           token: sessionId, //自定义请求头信息
         },
@@ -355,7 +373,6 @@
           });
         },
       });
-      this.checkboxList = [];
     },
     //根据条件搜索
     async searchList(is) {
@@ -364,6 +381,7 @@
     statusSelect(e) {
 	this.statusInfo = e.name	
 	this.queryList.status = e.id
+	this.queryList.offset = 1
 	this.getAlarmList()
     },
 	// 点击取消告警弹窗中的确认按钮
@@ -428,6 +446,7 @@
 	};
 	this.statusInfo = "筛选状态";
 	this.time = "筛选时间";
+	this.startTimeShow = false;
     },
     //确定选择结束时间
     async confirmEndTime(e) {
@@ -510,7 +529,7 @@
 		//上拉加载
 		async getLoadingList() {
 		  if (this.nothingMore) return;
-		  this.queryList += 1;
+		  this.queryList.offset += 1;
 		  this.loading = true;
 		  await this.getAlarmList();
 		  this.loading = false;

diff --git a/api/check.js b/api/check.js
index 719e90d..e234954 100644
--- a/api/check.js
+++ b/api/check.js
@@ -8,9 +8,39 @@
 const JobInfo =  'https://smartwell.gd.smartlog.work/job/info'
 const DeviceDetail =  'https://smartwell.gd.smartlog.work/overview/deviceDetail'
 const WellInfo =  'https://smartwell.gd.smartlog.work/well/info'
+const Welldata =  'https://smartwell.gd.smartlog.work/welldata/list-page'
+const Liquiddata =  'https://smartwell.gd.smartlog.work/liquiddata/list-page'
+const Gasdata =  'https://smartwell.gd.smartlog.work/gasdata/list-page'
 
 
 /**
+ * 获取燃气数据
+ * @param {*}  
+ */
+export function getGasdata(params) {
+	useNetWork();
+  return fetch.get(Gasdata,params).then(res => res);
+}
+
+/**
+ * 获取液位数据
+ * @param {*}  
+ */
+export function getLiquiddata(params) {
+	useNetWork();
+  return fetch.get(Liquiddata,params).then(res => res);
+}
+
+/**
+ * 获取井盖数据
+ * @param {*}  
+ */
+export function getWelldata(params) {
+	useNetWork();
+  return fetch.get(Welldata,params).then(res => res);
+}
+
+/**
  * 获取井口详情
  * @param {*}  
  */
diff --git a/api/user.js b/api/user.js
index 5172366..f7690f0 100644
--- a/api/user.js
+++ b/api/user.js
@@ -5,6 +5,7 @@
 const UserType = BASE_URL + "/user/getUserType";
 const UserRegister = BASE_URL + "/user/userRegister";
 const UpdateUserImg = BASE_URL + "/user/updateUserImg";
+const UserJurisdiction = BASE_URL + "/user/getUserJurisdiction";
 
 export function login(code) {
   useNetWork();
@@ -13,6 +14,15 @@
 }
 
 /**
+ * 获取到用户权限
+ * @param {*}
+ */
+export function getUserJurisdiction(data) {
+  useNetWork();
+  return fetch.post(UserJurisdiction,data).then((res) => res);
+}
+
+/**
  * 获取到用户类型
  * @param {*}
  */
diff --git a/pages.json b/pages.json
index ca9a023..e2b2d71 100644
--- a/pages.json
+++ b/pages.json
@@ -84,7 +84,7 @@
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}		
 		},
 		{
@@ -145,11 +145,5 @@
 	]
 	}
 	],
-	"preloadRule": {
-		"pagesA/checkInfo/checkInfo": {
-		"network": "all",
-		"packages": ["pagesA"]
-		}
-	},
 	"uniIdRouter": {}
 }
diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue
index 242bb23..0596f82 100644
--- a/pages/checkTable/checkTable.vue
+++ b/pages/checkTable/checkTable.vue
@@ -15,16 +15,16 @@
 			<view class="table-content-center">
 				<view class="content-center-info" v-for="(item, index) in list" :key="index">
 					<view class="center-info" style="width: 160rpx;">
-						{{item.name}}
+						{{item.deviceTypeName}}
 					</view>
 					<view class="center-info" style="width: 140rpx;text-align: center;">
-						{{item.longdu}}
+						{{item.strength}}
 					</view>
 					<view class="center-info" style="width: 160rpx;text-align: center;">
-						{{item.dianliang}}
+						{{item.cell}}
 					</view>
 					<view class="center-info" style="width: 160rpx;">
-						{{item.time}}
+						{{item.logtime}}
 					</view>
 				</view>
 			</view>
@@ -38,13 +38,13 @@
 			<view class="table-content-center">
 				<view class="content-center-info" v-for="(item, index) in list" :key="index">
 					<view class="center-info" style="width: 160rpx;">
-						{{item.name}}
+						{{item.deviceTypeName}}
 					</view>
 					<view class="center-info" style="width: 160rpx;text-align: center;">
-						{{item.dianliang}}
+						{{item.descn}}
 					</view>
 					<view class="center-info" style="width: 160rpx;">
-						{{item.time}}
+						{{item.logtime}}
 					</view>
 				</view>
 			</view>
@@ -58,16 +58,16 @@
 			<view class="table-content-center">
 				<view class="content-center-info" v-for="(item, index) in list" :key="index">
 					<view class="center-info" style="width: 160rpx;">
-						{{item.name}}
+						{{item.deviceTypeName}}
 					</view>
 					<view class="center-info" style="width: 140rpx;text-align: center;">
-						{{item.longdu}}
+						{{item.descn}}
 					</view>
 					<view class="center-info" style="width: 160rpx;text-align: center;">
-						{{item.dianliang}}
+						{{item.cell}}
 					</view>
 					<view class="center-info" style="width: 160rpx;">
-						{{item.time}}
+						{{item.logtime}}
 					</view>
 				</view>
 			</view>
@@ -115,6 +115,7 @@
 </template>
 
 <script>
+	import { getWelldata, getLiquiddata, getGasdata } from '@/api/check.js'
 	export default {
 		data() {
 			return {
@@ -125,10 +126,20 @@
 				isTimeZ: "",
 				isTimeQ: "",
 				isExportShow: false, // 控制导出弹窗
+				queryList:{ // 查询条件
+					keywords:'',
+					deptid: '',
+					beginTime: '',
+					endTime: '',
+					offset: 1,
+					limit:9999,
+					sort:'',
+					order:''
+				},
 				coumsGas:[
 					{name: '设备信息', width:'160rpx'},
 					{name: '燃气浓度(%LEL)', width:'140rpx'},
-					{name: '电量(%)', width:'160rpx'},
+					{name: '电量', width:'160rpx'},
 					{name: '上传时间', width:'160rpx'},
 				],
 				coumsManhole:[
@@ -142,23 +153,30 @@
 					{name: '电量(%)', width:'160rpx'},
 					{name: '上传时间', width:'160rpx'},
 				],
-				list: [
-					{name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-					{name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-					{name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-					{name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'},
-				],
+				list: [],
 				type: '' // 控制表格展示
 			}
 		},
-	    onLoad(option){
+	    async onLoad(option){
 		   this.type = option.type
-		   
+		   this.getList()
 		},
 		methods: {
+		   async getList() { // 获取到数据
+				if(this.type === '1'){
+			   let res =  await getWelldata(this.queryList)
+				this.list = res.rows
+				}else if (this.type === '2'){
+			   let res =  await getLiquiddata(this.queryList)
+				this.list = res.rows
+				}else {
+			   let res = await getGasdata(this.queryList)
+				this.list = res.rows
+				}
+			},
 			// 确认导出
 			exportQr() {
-			  // this.exportClick();
+			  this.exportClick();
 			  this.isExportShow = false;
 			},
 			// 导出的取消按钮
@@ -167,14 +185,15 @@
 			} ,
 			//确定选择结束时间
 			async confirmEndTime(e) {
-			  // this.queryList.endTime = await this.shijianc(e.value);
+			  this.queryList.endTime = await this.shijianc(e.value);
 			  this.isTimeZ = await this.yueFen(e.value);
 			  this.time = `${this.isTimeQ}${this.isTimeZ}`;
+			  this.getList()
 			  this.endTimeShow = false;
 			},
 			//确定选择开始时间
 			async confirmTime(e) {
-			  // this.queryList.startTime = await this.shijianc(e.value);
+			  this.queryList.beginTime = await this.shijianc(e.value);
 			  this.isTimeQ = await this.yueFen(e.value);
 			  this.startTimeShow = false;
 			  this.endTimeShow = true;
@@ -182,18 +201,23 @@
 			//取消选择时间
 			closeTime() {
 			  this.time = "筛选时间";
+			  this.startTimeShow = false;
 			},
 			//确定导出
 			async exportClick() {
-			  const sessionId = uni.getStorageSync("sessionId");
+			  const sessionId = uni.getStorageSync("token");
 			  let filePath = `${wx.env.USER_DATA_PATH}/${+new Date()}.xlsx`;
-			  let ids = "";
-			  ids =
-			    this.checkboxList.length === 0
-			      ? this.list.map((item) => item.id).join()
-			      : this.checkboxList.map((item) => item.id).join();
+			  let url = ''
+			  if(this.type === '1') {
+				  url = 'welldata'
+			  }else if(this.type === '2') {
+				  url = 'liquiddata'
+			  }else {
+				  url = 'gasdata'
+			  }
 			  uni.request({
-			    url: `https://visitor.gd.smartlog.work/visitor/exportMessage?ids=${ids}`,
+			    url: `https://smartwell.gd.smartlog.work/${url}/export`,
+				params:this.queryList,
 			    responseType: "arraybuffer",
 			    header: {
 			      token: sessionId, //自定义请求头信息
@@ -262,6 +286,9 @@
 </script>
 
 <style scoped lang="scss">
+	.list-content-info {
+		text-align: center;
+	}
 	.check-table-top {
 		display: flex;
 		align-items: center;
@@ -302,7 +329,7 @@
 				justify-content: space-around;
 				margin-bottom: 16rpx;
 				.center-info {
-					font-size: 26rpx;
+					font-size: 24rpx;
 				}
 			}
 		}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4f904b1..d113f84 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -21,6 +21,7 @@
 import TabBar from "@/components/tabBar/tabBar.vue";
 import { getLogin, getUserProfile } from "@/utils/auth.js";
 import { verifyPhone } from "@/api/index.js";
+import {getUserJurisdiction} from '@/api/user.js'
 import { getLocationParams } from "@/common/utils.js";
 import GetPhonePopup from "@/components/base/getphonePopup.vue";
 import { subscription } from "@/utils/common.js"
@@ -43,6 +44,7 @@
         },
       ],
       phone: "",
+	  uid:'',
       popShow: false, //控制授权手机号弹出框
       active: "", //点击的是哪个按钮
     };
@@ -85,7 +87,7 @@
       if (!sessionId) {
         await getLogin();
       }
-			if(id === 'submit') {
+			// if(id === 'submit') {
 				this.phone = uni.getStorageSync("registerPhone");
 				if (this.phone) {
 				  this.checkphone();
@@ -93,15 +95,12 @@
 					//弹获取手机号
 				  this.popShow = true;
 				}
-			} else {
-				// uni.showToast({
-				// 	title: '敬请期待',
-				// 	icon: 'none'
-				// });
-				wx.navigateTo({
-				  url: '/pages/check/check',
-				});
-			}
+			// } else {
+			// 	// uni.showToast({
+			// 	// 	title: '敬请期待',
+			// 	// 	icon: 'none'
+			// 	// });
+			// }
     },
 		//通过手机号检查是否存在这个用户
     async checkphone() {
@@ -114,18 +113,35 @@
 				uni.setStorageSync("registerPhone", this.phone);
         await getUserProfile(); //获取人员信息
 				
-				if (uni.getStorageSync("userInfo")) {
-				  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
-				  if (userInfo.salt === "物业人员") {
-				    subscription();
-				  } 
+			if (uni.getStorageSync("userInfo")) {
+			  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+			  this.uid = userInfo.id
+			  if (userInfo.salt === "物业人员") {
+				if(this.active === "submit") {
+					subscription();
 				}
+			  } 
+			}
 				
         if (this.active === "submit") {
           wx.navigateTo({
             url: `/pages/information/information?id=${this.active}`,
           });
-        }
+        }else {
+			// 判断是否有这个路径
+			const res = await getUserJurisdiction({uid:this.uid})
+			if(res.indexOf('/pages/check/check') !== -1) {
+				wx.navigateTo({
+				  url: '/pages/check/check',
+				});
+			}else {
+				uni.showToast({
+					title: '非业务管理员无权访问',
+					icon: 'none'
+				});
+			}
+			
+		}
       }
     },
 		
diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue
index a6d3bab..feff1df 100644
--- a/pages/reportList/reportList.vue
+++ b/pages/reportList/reportList.vue
@@ -1,14 +1,14 @@
 <template>
   <view class="list">
     <view class="list-top">
-      <u-input
+     <!-- <u-input
         placeholder="关键字搜索"
         prefixIcon="search"
         border="none"
         v-model="queryList.keywords"
         @change="change"
         prefixIconStyle="font-size: 52rpx;color: #000"
-      ></u-input>
+      ></u-input> -->
       <view class="tab-th">
         <text class="dressingTime" @click="startTimeShow = true">{{
           time
@@ -31,7 +31,7 @@
 		<view class="list-content-center">
 			<view class="list-content-center-info" v-for="(item, index) in list" :key="index">
 				<view class="" style="width: 130rpx;font-size: 22rpx;text-align: center;" @click="eyeLoock(item, item.status === '1' ? '1' : '2')">
-					<text>{{item.alarmContentName}}</text>
+					<text>{{item.keywords}}</text>
 					<text>({{item.devcode}})</text>
 				</view>
 				<view class="" style="width: 140rpx;font-size: 22rpx;text-align: center;" @click="eyeLoock(item, item.status === '1' ? '1' : '2')">
@@ -175,7 +175,7 @@
       @select="statusSelect"
     >
     </u-action-sheet>
-
+     <!-- 底部提示 -->
 	<LoadingList :loading="loading" :nothingMore="nothingMore" />
   </view>
 </template>
@@ -317,7 +317,25 @@
 	  },
 	  async getAlarmList() { // 获取到报警列表
 	   const res = await getAlarm(this.queryList)
-	   this.list = res.rows
+	    if(res.rows && res.rows.length) {
+			const resData = res.rows.map(item=> {
+				if( item.devcode === '412022060001' || item.devcode === '412022060002' || item.devcode === '412022060003'){
+					item.keywords = '井盖状态监测仪'
+				}else if (item.devcode === '312022040441'){
+					item.keywords = '燃气智能监测终端'
+				}else {
+					item.keywords = '液位监测仪'
+				}
+				return item
+			})
+			this.nothingMore = false
+			this.list = this.list.concat(resData); 
+		}else {
+			if(res.total === 0) {
+				this.list = []
+			}
+			this.nothingMore = true
+		}
 	   },
 	  sexSelect(e) {  // 选择状态
 	    this.userInfo.name = e.name
@@ -325,18 +343,18 @@
 		this.$refs.form1.validateField('name')
 	 },
     //搜索框发生改变
-    async change(e) {
-      this.getAlarmList()
-    },
+   //  async change(e) {
+	  
+   //    // this.getAlarmList()
+   //  },
     //确定导出
     async exportClick() {
       const sessionId = uni.getStorageSync("token");
       let filePath = `${wx.env.USER_DATA_PATH}/${+new Date()}.xlsx`;
-      
       uni.request({
-        url: `https://smartwell.gd.smartlog.work/alarm/export?keywords=${this.queryList.keywords}&alarmType=${this.queryList.alarmType}
-		&beginTime=${this.queryList.beginTime}&endTime=${this.queryList.endTime}&status=${this.queryList.status}`,
+        url: `https://smartwell.gd.smartlog.work/alarm/export`,
         responseType: "arraybuffer",
+		params:this.queryList,
         header: {
           token: sessionId, //自定义请求头信息
         },
@@ -355,7 +373,6 @@
           });
         },
       });
-      this.checkboxList = [];
     },
     //根据条件搜索
     async searchList(is) {
@@ -364,6 +381,7 @@
     statusSelect(e) {
 	this.statusInfo = e.name	
 	this.queryList.status = e.id
+	this.queryList.offset = 1
 	this.getAlarmList()
     },
 	// 点击取消告警弹窗中的确认按钮
@@ -428,6 +446,7 @@
 	};
 	this.statusInfo = "筛选状态";
 	this.time = "筛选时间";
+	this.startTimeShow = false;
     },
     //确定选择结束时间
     async confirmEndTime(e) {
@@ -510,7 +529,7 @@
 		//上拉加载
 		async getLoadingList() {
 		  if (this.nothingMore) return;
-		  this.queryList += 1;
+		  this.queryList.offset += 1;
 		  this.loading = true;
 		  await this.getAlarmList();
 		  this.loading = false;
diff --git a/pagesA/checkInfo/checkInfo.vue b/pagesA/checkInfo/checkInfo.vue
index 9af70e6..0b55845 100644
--- a/pagesA/checkInfo/checkInfo.vue
+++ b/pagesA/checkInfo/checkInfo.vue
@@ -50,7 +50,7 @@
 						</view>
 				</view>
 				<view class="map-info">
-					<map  :show-location='true' :scale="3" style="width: 100%; height:100%;"  :latitude="latitude" :longitude="longitude" :markers="marker"></map>
+					<map  :show-location='true' :scale="scale" style="width: 100%; height:100%;"  :latitude="latitude" :longitude="longitude" :markers="marker"></map>
 				</view>
 			</view>
 	</view>
@@ -72,35 +72,38 @@
 				iconPath: '../../static/checkIcon/manhole-line.png',    //显示的图标        
 				rotate:0,   // 旋转度数
 				width:30,   //宽
-				height:40,   //高
+				height:30,   //高
 				// title:'我在这里',//标注点名
 				alpha:0.5,   //透明度
-				// callout:{//自定义标记点上方的气泡窗口 点击有效  
-				// content:'天宝大厦',//文本
-				// color:'#ffffff',//文字颜色
-				// fontSize:14,//文本大小
-				// borderRadius:15,//边框圆角
-				// borderWidth:'10',
-				// bgColor:'#e51860',//背景颜色
-				// display:'ALWAYS',//常显
-				// },
+				callout:{//自定义标记点上方的气泡窗口 点击有效  
+				content:'',//文本
+				color:'#ffffff',//文字颜色
+				fontSize:14,//文本大小
+				borderRadius:15,//边框圆角
+				borderWidth:'10',
+				bgColor:'#0ca2e8',//背景颜色
+				display:'ALWAYS',//常显
+				},
 				}],
 				info: uni.getStorageSync('checkrow') ||{},
 				wellInfo: {},
-				imgUrl:''
+				imgUrl:'',
+				scale:3 ,// 缩放地图
 			}
 		},
 	   async onLoad() {
-			wx.getLocation({
+		   // 获取到自己的位置
+		   await wx.getLocation({
 			type:'gcj02',
 			success:(res)=>{
 			this.latitude = res.latitude;
-			this.longitude= res.longitude;
+			this.longitude = res.longitude;
 			},
 			fail: (err) => {
 			console.log(err,'地理位置错误')
 			}
 		})
+		// 获取到井详情
 		const res = await getWellInfo({id:this.info.wellId})
 		this.wellInfo = res
 		if(this.info.deviceTypeName === '燃气智能监测终端'){
@@ -113,6 +116,8 @@
 		// 将获取的值赋值给markers
 		this.marker[0].latitude  = res.coordinateY
 		this.marker[0].longitude = res.coordinateX
+		this.marker[0].callout.content = this.info.deviceTypeName
+		// 根据不同设备换取不同的地图图标
 		if (this.info.onlineStateName === '在线') {
 			if(this.info.deviceTypeName === '燃气智能监测终端'){
 				this.marker[0].iconPath = '../../static/checkIcon/gas-line.png'
@@ -138,7 +143,28 @@
 				this.marker[0].iconPath = '../../static/checkIcon/level-report.png'
 			}
 		}
+		},
+		watch: {  // 算出地图缩放
+		    longitude: {
+		    handler (newName, oldName) {
+			let coordinateArr = []
+			coordinateArr.push(Number(this.marker[0].longitude))  // 点位经度
+			coordinateArr.push(this.longitude)  // 自己位置经度
+			coordinateArr = coordinateArr.sort((max,next) => {  // 排序
+				return   next - max
+			})
+			let scaleNumber = coordinateArr[0] - coordinateArr[1] // 求距离
+			if(Math.ceil(scaleNumber) ===  1){
+				this.scale = Math.floor((20 - 10 + 1) *Math.random()) + 10; // 随机缩放10到20
+			}else if (Math.ceil(scaleNumber) ===  2) {
+				this.scale = Math.floor((5) *Math.random()) + 5; // 随机缩放5到10
+			}else if (Math.ceil(scaleNumber) >  2) {
+				this.scale = Math.floor((3) *Math.random()) + 2; // 随机缩放3到5
+			}
+		},
+			immediate: true
 		}
+}
 	}
 </script>