diff --git a/api/driverapi.js b/api/driverapi.js
index 2f15bf2..01df2de 100644
--- a/api/driverapi.js
+++ b/api/driverapi.js
@@ -30,51 +30,51 @@ let api = {
 	getcontrol_cpermission: '/getcontrol/cpermission', //根据设备id查询控制器权限
 	getControl_getState: '/readControl/getState', //控制器 设备运行状态
 	getReadControlliShuiControl: '/readControl/liShuiControl', //控制器 顶模和风机
-	
-	readControl_fiveControl:'/readControl/fiveControl',//读取（五防项目）控制器
-	getcontrol_wxgetpermission:'/getcontrol/wxgetpermission',//小程序手机控制权限数据
-	
-	readControl_solenoidValve1:'/readControl/solenoidValve1',//1#电磁阀
-	readControl_solenoidValve2:'/readControl/solenoidValve2',//2#电磁阀
-	readControl_solenoidValve3:'/readControl/solenoidValve3',//3#电磁阀
-	readControl_solenoidValve4:'/readControl/solenoidValve4',//4#电磁阀
-	readControl_solenoidValve5:'/readControl/solenoidValve5',//5#电磁阀
-	readControl_solenoidValve6:'/readControl/solenoidValve6',//6#电磁阀
-	readControl_solenoidValve7:'/readControl/solenoidValve7',//7#电磁阀
-	readControl_solenoidValve8:'/readControl/solenoidValve8',//8#电磁阀
-	
-	readControl_readfilllight:'/readControl/readfilllight',//读取（补光灯）控制器
-	readControl_readcirculationfan:'/readControl/readcirculationfan',//读取（环流风扇）控制器
-	readControl_fanwetcurtain:'/readControl/fanwetcurtain',//读取（风机湿帘）控制器
-	
-	readControl_innercurtain:'/readControl/innercurtain',//内遮阳
-	readControl_externalsunshade:'/readControl/externalsunshade',//外遮阳
-	readControl_readskylight:'/readControl/readskylight',//通风窗
-	readControl_highpressuremist:'/readControl/highpressuremist',//读取（高压微雾）控制器
-	
-	camera_gethls:'/camera/gethls',//获取摄像头得地址
-	camera_getphonehls:'/camera/getphonehls',//获取摄像头得地址 Copy Copy Copy Copy
-	
-	getFi_getName:'/getFi/getName',//查看用户智能灌溉组名称信息
-	readFs_byid:'/readFs/byid',//查看用户施肥机名称信息
-	getFiState:"/getFI/getState",//智能灌溉控制器读取.
-	getFi_rtdata:"/getFi/rtdata",//首页智能灌溉
-	writeFi_write:"/writeFi/write",//智能灌溉组写入
-	chart_fidata:'/chart/fidata',//智能灌溉的折线图
-	getcontrol_geteqetdata:'/getcontrol/geteqetdata',//小程序气象站显示
-	
-	getcontrol_rtDatastation:'/getcontrol/rtDatastation',//主页查看控制器气象站实时数据 
-	
-	readControl_interiorthermalinsulation:'/readControl/interiorthermalinsulation',//读取（内保温）控制器 
-	
-	readControl_facadeinsulation:'/readControl/facadeinsulation',//读取（立面保温）控制器
-	
-	equip_chartdata:'/equip/chartdata',//气象站实时数据折线图
-	
-	camera_start:'/camera/start',//摄像头开始
-	camera_stop:'/camera/stop',//摄像头结束
 
-	
+	readControl_fiveControl: '/readControl/fiveControl', //读取（五防项目）控制器
+	getcontrol_wxgetpermission: '/getcontrol/wxgetpermission', //小程序手机控制权限数据
+
+	readControl_solenoidValve1: '/readControl/solenoidValve1', //1#电磁阀
+	readControl_solenoidValve2: '/readControl/solenoidValve2', //2#电磁阀
+	readControl_solenoidValve3: '/readControl/solenoidValve3', //3#电磁阀
+	readControl_solenoidValve4: '/readControl/solenoidValve4', //4#电磁阀
+	readControl_solenoidValve5: '/readControl/solenoidValve5', //5#电磁阀
+	readControl_solenoidValve6: '/readControl/solenoidValve6', //6#电磁阀
+	readControl_solenoidValve7: '/readControl/solenoidValve7', //7#电磁阀
+	readControl_solenoidValve8: '/readControl/solenoidValve8', //8#电磁阀
+
+	readControl_readfilllight: '/readControl/readfilllight', //读取（补光灯）控制器
+	readControl_readcirculationfan: '/readControl/readcirculationfan', //读取（环流风扇）控制器
+	readControl_fanwetcurtain: '/readControl/fanwetcurtain', //读取（风机湿帘）控制器
+
+	readControl_innercurtain: '/readControl/innercurtain', //内遮阳
+	readControl_externalsunshade: '/readControl/externalsunshade', //外遮阳
+	readControl_readskylight: '/readControl/readskylight', //通风窗
+	readControl_highpressuremist: '/readControl/highpressuremist', //读取（高压微雾）控制器
+
+	camera_gethls: '/camera/gethls', //获取摄像头得地址
+	camera_getphonehls: '/camera/getphonehls', //获取摄像头得地址 Copy Copy Copy Copy
+
+	getFi_getName: '/getFi/getName', //查看用户智能灌溉组名称信息
+	readFs_byid: '/readFs/byid', //查看用户施肥机名称信息
+	getFiState: "/getFI/getState", //智能灌溉控制器读取.
+	getFi_rtdata: "/getFi/rtdata", //首页智能灌溉
+	writeFi_write: "/writeFi/write", //智能灌溉组写入
+	chart_fidata: '/chart/fidata', //智能灌溉的折线图
+	getcontrol_geteqetdata: '/getcontrol/geteqetdata', //小程序气象站显示
+
+	getcontrol_rtDatastation: '/getcontrol/rtDatastation', //主页查看控制器气象站实时数据 
+
+	readControl_interiorthermalinsulation: '/readControl/interiorthermalinsulation', //读取（内保温）控制器 
+
+	readControl_facadeinsulation: '/readControl/facadeinsulation', //读取（立面保温）控制器
+
+	equip_chartdata: '/equip/chartdata', //气象站实时数据折线图
+
+	camera_start: '/camera/start', //摄像头开始
+	camera_stop: '/camera/stop', //摄像头结束
+
+
 	//countType计算类型 0是原数据 1是原数据-400 2是原数据/10 3是(原数据-400) / 10 4是(原数据-1000)/10
 	typeList: [{
 			label: '无意义的传感器',
@@ -192,7 +192,7 @@ let api = {
 		},
 		{
 			label: '土壤PH',
-			value: 19, 
+			value: 19,
 			countType: 2,
 			unit: ''
 		},
@@ -311,16 +311,16 @@ let api = {
 			unit: '℃'
 		},
 		{
-			label: '设备电压',
+			label: '一氧化碳',
 			value: 39,
-			countType: 2,
-			unit: 'V'
+			countType: 0,
+			unit: 'ppm'
 		},
 		{
-			label: '设备电流',
+			label: '氨氮',
 			value: 40,
 			countType: 2,
-			unit: 'A'
+			unit: 'mg/L'
 		},
 		{
 			label: '土壤氮含量',
@@ -346,7 +346,12 @@ let api = {
 			countType: 0,
 			unit: 'Kpa'
 		},
-		{ label: '水位', value: 45, countType: 0,unit:'cm' },
+		{
+			label: '水位',
+			value: 45,
+			countType: 0,
+			unit: 'cm'
+		},
 		{
 			label: '氨气',
 			value: 46,
@@ -354,10 +359,10 @@ let api = {
 			unit: 'ppm'
 		},
 		{
-			label: '硫化氢',
+			label: '浊度',
 			value: 47,
 			countType: 0,
-			unit: 'ppm'
+			unit: 'NTU'
 		},
 		{
 			label: '氧气',
@@ -396,10 +401,10 @@ let api = {
 			unit: 'dB'
 		},
 		{
-			label: '叶面面积',
+			label: '溶解氧',
 			value: 54,
-			countType: 0,
-			unit: 'mm'
+			countType: 2,
+			unit: 'mg/L'
 		},
 		{
 			label: '虫数量',