heyang 9 meses atrás
pai
commit
e6c74204fe

+ 1 - 1
pages/views/dataBoard/dataBoard.vue

@@ -91,7 +91,7 @@
 				pageType:1,
 				rectangleLogo: uni.getStorageSync('rectangleLogo'),
 				navHeight: uni.getStorageSync('navHeight'),
-				title: '实验室安全智能监测与控制系统',
+				title: '实验室安全智慧化管控系统',
 				baseUrl: config.base_url,
 
 				// 查询参数

+ 2 - 2
pages/views/dataBoard/hazardSources.vue

@@ -4,11 +4,11 @@
 		<view class="statistics">
 			<view class="statistics-t">
 				<view class="statistics-t-l">危险源总数:</view>
-				<view class="statistics-t-r">739 </view>
+				<view class="statistics-t-r">240</view>
 			</view>
 			<view class="statistics-b">
 				<view class="statistics-b-li">
-					<view class="statistics-b-li-t color-A">2</view>
+					<view class="statistics-b-li-t color-A">10</view>
 					<view class="statistics-b-li-b">今日新增数</view>
 				</view>
 				<view class="line"></view>

+ 7 - 4
pages/views/dataBoard/labPage.vue

@@ -16,7 +16,7 @@
 		<view class="statistics">
 			<view class="statistics-t">
 				<view class="statistics-t-l">实验室总数:</view>
-				<view class="statistics-t-r">364 间</view>
+				<view class="statistics-t-r">324 间</view>
 			</view>
 			<view class="statistics-b">
 				<view class="statistics-b-li">
@@ -98,13 +98,16 @@
 				},
 				opts: {
 					color: ["#0183FA", "#16BF32", "#FF8C00", "#FF0000", ],
-					padding: [15, 0, 0, 0],
+					padding: [0, 0, 0, 0],
 					enableScroll: false,
 					dataLabel: false,
 					dataPointShape: false,
 					legend: {
-						show: false,
+						show: true,
 						fontColor: '#fff',
+						position:'top',
+						fontSize:8,
+						margin:10,
 					},
 					extra: {
 						tooltip: {
@@ -311,7 +314,7 @@
 			.chart-b {
 				width: 632rpx;
 				height: 444rpx;
-				margin-top: 34rpx;
+				/* margin-top: 34rpx; */
 			}
 		}