Merge branch 'lab-xcx-dev' into SCHOOL-XiBeiNongLin

pages/views/dataBoard/cagePosition.vue

@@ -322,11 +322,10 @@
 						show:false,
 					},
 					xAxis: {
-						boundaryGap: "justify",
-						disableGrid: false,
-						min: 0,
+						disabled: true,
+						disableGrid: true,
 						axisLine: false,
-						max: 40
+						fontColor: '#fff',
 					},
 					yAxis: {},
 					extra: {

pages/views/dataBoard/daYiReservation.vue

@@ -114,18 +114,16 @@
 					rotateLock: false,
 					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"],
 					padding: [15, 20, 15, 15],
-					dataLabel: true,
 					enableScroll: false,
 					fontColor:'#ffffff',
 					legend: {
 						show:false,
 					},
 					xAxis: {
-						boundaryGap: "justify",
-						disableGrid: false,
-						min: 0,
+						disabled: true,
+						disableGrid: true,
 						axisLine: false,
-						max: 40
+						fontColor: '#fff',
 					},
 					yAxis: {},
 					extra: {

pages/views/dataBoard/equipmentControl.vue

@@ -25,7 +25,7 @@
 		</view>
 		<view class="chart">
 			<view class="chart-b">
-				<qiun-data-charts :canvas2d="true" type="bar" :opts="opts" :echartsH5="true" :chartData="chartData" />
+				<qiun-data-charts :tapLegend="false" :tooltipShow="false" :canvas2d="true" type="bar" :opts="opts" :echartsH5="true" :chartData="chartData" />
 			</view>
 		</view>
 		<view class="small-title">
@@ -230,8 +230,15 @@
 					let list = [];
 					let list2 = [];
 					data.data.forEach(function(item, index) {
-						list.push(item.deptName)
-						list2.push(item.deviceNum)
+						if(index<5){
+							let newName = item.deptName;
+							if(newName.length > 6){
+								newName = newName.slice(0, 6) + '..';
+							}
+							list.push(newName)
+							// list.push(item.deptName)
+							list2.push(item.deviceNum)
+						}
 					})
 
 					let res = {

pages/views/dataBoard/hazardSources.vue

@@ -29,7 +29,7 @@
 		</view>
 		<view class="chart">
 			<view class="chart-b">
-				<qiun-data-charts :canvas2d="true" type="bar" :opts="opts" :echartsH5="true" :chartData="chartData" />
+				<qiun-data-charts :tapLegend="false" :tooltipShow="false" :canvas2d="true" type="bar" :opts="opts" :echartsH5="true" :chartData="chartData" />
 			</view>
 		</view>
 		<view class="table">
@@ -60,7 +60,7 @@
 				opts: {
 					color: ["#FF8C00", "#0183FA", ],
 					// color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"],
-					padding: [0, 30, 10, 10],
+					padding: [0, 30, 10, 0],
 					enableScroll: false,
 					legend: {
 						position: 'top',
@@ -69,8 +69,8 @@
 					},
 					xAxis: {
 						disabled: true,
-						axisLine: false,
 						disableGrid: true,
+						axisLine: false,
 						fontColor: '#fff',
 					},
 					yAxis: {
@@ -173,7 +173,12 @@
 						let list2 = [];
 						data.data.hazardTotalSortSubs.forEach(function(item, index) {
 							if (index < 5) {
-								name.push(item.deptSortName)
+								let newName = item.deptSortName;
+								if(newName.length > 6){
+									newName = newName.slice(0, 6) + '..';
+								}
+								// name.push(item.deptSortName)
+								name.push(newName)
 								list.push(item.chemical)
 								list2.push(item.coolHotdevice)
 							}

pages/views/dataBoard/resourceReservation.vue

@@ -200,11 +200,10 @@
 						show:false,
 					},
 					xAxis: {
-						boundaryGap: "justify",
-						disableGrid: false,
-						min: 0,
+						disabled: true,
+						disableGrid: true,
 						axisLine: false,
-						max: 40
+						fontColor: '#fff',
 					},
 					yAxis: {},
 					extra: {

pages/views/dataBoard/securityHidden.vue

@@ -122,7 +122,7 @@
 					rotate: false,
 					rotateLock: false,
 					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"],
-					padding: [15, 20, 15, 15],
+					padding: [15, 20, 15, 0],
 					dataLabel: true,
 					enableScroll: false,
 					fontColor: '#ffffff',
@@ -130,10 +130,10 @@
 						show: false,
 					},
 					xAxis: {
-						boundaryGap: "justify",
-						disableGrid: false,
-						min: 0,
+						disabled: true,
+						disableGrid: true,
 						axisLine: false,
+						fontColor: '#fff',
 					},
 					yAxis: {},
 					extra: {
@@ -438,7 +438,12 @@
 									label: item.name,
 									align: 'center',
 								})
-								name.push(item.name)
+								let newName = item.name;
+								if(newName.length > 6){
+									newName = newName.slice(0, 6) + '..';
+								}
+								name.push(newName)
+								// name.push(item.name)
 								list.push(item.num)
 							}
 						})
@@ -512,7 +517,12 @@
 									label: item.name,
 									align: 'center',
 								})
-								name.push(item.name)
+								let newName = item.name;
+								if(newName.length > 6){
+									newName = newName.slice(0, 6) + '..';
+								}
+								name.push(newName)
+								// name.push(item.name)
 								list.push(item.num)
 							}
 						})