页面修改及新增显示炉头温度

components/u-charts/u-charts.js

@@ -52,7 +52,7 @@ var config = {
 	pixelRatio:1,//适配H5高分屏
 	rotate:false,//横屏模式
     columePadding: 3,
-    fontSize: 13,
+    fontSize: 11,
     //dataPointShape: ['diamond', 'circle', 'triangle', 'rect'],
 	dataPointShape: ['circle', 'circle', 'circle', 'circle'],//仿F2图例样式改为圆点
     colors: ['#0B80E3', '#FC9F32', '#facc14', '#f04864', '#8543e0', '#90ed7d'],

pages/Charts/mainStatistics.vue

@@ -423,7 +423,7 @@
 					enableScroll: true,
 					type: 'column',
 					legend: true,
-					fontSize: 11,
+					fontSize: 10,
 					background: '#FFFFFF', //y轴颜色
 					pixelRatio: 1,
 					animation: true,
@@ -438,8 +438,10 @@
 						scrollBackgroundColor: '#F7F7FF', //默认为 #EFEBEF  滚动条颜色底色
 						scrollColor: '#DEE7F7', //默认为 #A6A6A6  滚动条颜色
 						disableGrid:true,
+						
 					},
 					yAxis: {
+						
 						type: 'grid',
 						gridType: 'soild',
 						// disabled:true
@@ -451,7 +453,7 @@
 					extra: {
 						column: {
 							// width: _self.cWidth*_self.pixelRatio*0.45/chartData.categories.length
-							width: 15
+							width: 18
 						}
 					}
 				});

pages/User/equipmentStatusList.vue

@@ -30,9 +30,9 @@
 											<view class="line1"></view>
 											<view><span>机器唯一码：</span><span>{{equipment.clientId}}</span></view>
 											<view><span>所在地：</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view>
-											<view><span>温度：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
-											<view><span>湿度：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
-											<view><span>转速：</span><span>{{equipment.furnaceSp?equipment.furnaceSp:''}}</span></view>
+											<view><span>炉头温度：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
+											<view><span>柜内湿度：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
+											<view><span>柜内温度：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
 											<view  v-if="equipment.hasTodayAlarm">
 												<view><span>报警内容：</span></view>
 												<view v-for="(alarm,index) in equipment.alarmList" :key="index">
@@ -77,9 +77,9 @@
 						<view class="line1"></view>
 						<view><span>机器唯一码：</span><span>{{equipment.clientId}}</span></view>
 						<view><span>所在地：</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view>
-						<view><span>温度：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
-						<view><span>湿度：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
-						<view><span>转速：</span><span>{{equipment.furnaceSp?equipment.furnaceSp:''}}</span></view>
+						<view><span>炉头温度：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
+						<view><span>柜内湿度：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
+						<view><span>柜内温度：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
 						<view class="" v-if="equipment.hasTodayAlarm">
 							<view><span>报警内容：</span></view>
 							<view v-for="(alarm,index) in equipment.alarmList" :key="index">

pages/User/user.vue

@@ -20,7 +20,7 @@
 			<view v-for="(list,index) in listName" :key="index" class="body">
 				<view class="input-two">
 					<input :id=list.id type="text" class="input" @focus="setStyle()" @blur="setStyle2()" :value=list.name @input="getValue" />
-					<p id="p2" class="p2" :style="{display:showOrNo}">如:广东省广州市xx广场301型x号机</p>
+					<p id="p2" class="p2" :style="{display:showOrNo}">如:xx广场301机</p>
 				</view>
 				<view class="button2">
 					<button type="primary" @click="updata1()" class="button">