heyang

pages.json

@@ -1,7 +1,9 @@
 {
 	"pages": [
+		
+
 		{
-			"path": "pages/views/dataBoard/dataBoard",
+			"path": "pages/views/login/login",//登录
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationBarTextStyle": "white", //导航文字颜色
@@ -9,17 +11,16 @@
 			}
 		},
 		{
-			"path": "pages/views/dataBoard/equipmentControlOverdue",
+			"path": "pages/views/home/home",//首页
 			"style": {
-				"navigationBarTitleText": "超期服役排行",
-				"navigationBarTextStyle": "#FFFFFF", //导航文字颜色
-				"navigationBarBackgroundColor": "#363744" //导航背景色
+				"navigationBarTitleText": "实验室安全智慧化管控系统",
+				"navigationBarTextStyle": "white", //导航文字颜色
+				"navigationBarBackgroundColor": "#0183FA" ,//导航背景色
+				"navigationStyle": "custom"
 			}
 		},
-		
-
 		{
-			"path": "pages/views/login/login",//登录
+			"path": "pages/views/dataBoard/dataBoard",
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationBarTextStyle": "white", //导航文字颜色
@@ -27,14 +28,14 @@
 			}
 		},
 		{
-			"path": "pages/views/home/home",//首页
+			"path": "pages/views/dataBoard/equipmentControlOverdue",
 			"style": {
-				"navigationBarTitleText": "实验室安全智慧化管控系统",
-				"navigationBarTextStyle": "white", //导航文字颜色
-				"navigationBarBackgroundColor": "#0183FA" ,//导航背景色
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "超期服役排行",
+				"navigationBarTextStyle": "#FFFFFF", //导航文字颜色
+				"navigationBarBackgroundColor": "#363744" //导航背景色
 			}
 		},
+		
 		{
 			"path": "pages/views/teacherPage/laboratoryList",//实验室列表
 			"style": {

pages/views/dataBoard/cagePosition.vue

@@ -5,7 +5,7 @@
 			<view class="chart-t">
 				<viwe class="chart-t-l">
 					<text>笼位总数：</text>
-					<text>333</text>
+					<text>879</text>
 				</viwe>
 				<viwe class="chart-tab">
 					<view class="chart-tab-li" :class="chartTabIndex==index?'tab-A':'tab-B'"
@@ -149,15 +149,15 @@
 					let res = {
 						series: [{
 							data: [{
-								"name": "一班",
+								"name": "生物实验室",
 								"value": 50,
 								"labelShow": false
 							}, {
-								"name": "二班",
+								"name": "动物实验室",
 								"value": 30,
 								"labelShow": false
 							}, {
-								"name": "三班",
+								"name": "兽医实验室",
 								"value": 20,
 								"labelShow": false
 							}, ]
@@ -171,7 +171,7 @@
 				setTimeout(() => {
 					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
 					let res = {
-						categories: ["维度1", "维度2", "维度3", "维度4", "维度5"],
+						categories: ["测定仪", "色谱仪", "分析仪", "光度计", "离子色谱仪"],
 						series: [{
 			 				name: "成交量1",
 			 				data: [90, 110, 165, 195, 187]

pages/views/dataBoard/daYiReservation.vue

@@ -65,11 +65,14 @@
 				</view>
 				<view class="table-tb">
 					<view class="table-tb-li" v-for="(item,index) in dataList" :key="index">
-						<view>{{index}}</view>
-						<view>{{item.data2}}</view>
-						<view>{{item.data2}}</view>
-						<view>{{item.data2}}</view>
+						<view>
+							<text
+								:class="index==0?'sortOne':(index==1?'sortTow':(index==2?'sortThree':'sortFive'))">{{index+1}}</text>
+						</view>
+						<view>{{item.data1}}</view>
 						<view>{{item.data2}}</view>
+						<view>{{item.data3}}</view>
+						<view>{{item.data4}}</view>
 					</view>
 				</view>
 			</view>
@@ -91,10 +94,13 @@
 				</view>
 				<view class="table-tb">
 					<view class="table-tb-li" v-for="(item,index) in dataList" :key="index">
-						<view>{{index}}</view>
-						<view>{{item.data2}}</view>
-						<view>{{item.data2}}</view>
+						<view>
+							<text
+								:class="index==0?'sortOne':(index==1?'sortTow':(index==2?'sortThree':'sortFive'))">{{index+1}}</text>
+						</view>
+						<view>{{item.data1}}</view>
 						<view>{{item.data2}}</view>
+						<view>{{item.data3}}</view>
 					</view>
 				</view>
 			</view>
@@ -196,20 +202,39 @@
 					pageSize: 10,
 				},
 				dataList: [{
-						data1: '学院学院简称',
-						data2: '666',
+						data1: '压力容器',
+						data2: '499',
+						data3: '47',
+						data4: '220',
+						data5: '137',
 					},
 					{
-						data1: '学院学院简称',
-						data2: '666',
+						data1: '浓缩设备',
+						data2: '199',
+						data3: '7',
+						data4: '120',
+						data5: '37',
 					},
 					{
-						data1: '学院学院简称',
-						data2: '666',
+						data1: '高压灭菌锅',
+						data2: '299',
+						data3: '71',
+						data4: '10',
+						data5: '37',
 					},
 					{
-						data1: '学院学院简称',
-						data2: '666',
+						data1: '纯水设备',
+						data2: '199',
+						data3: '7',
+						data4: '120',
+						data5: '37',
+					},
+					{
+						data1: '二氧化碳培养箱',
+						data2: '299',
+						data3: '71',
+						data4: '10',
+						data5: '37',
 					},
 				],
 				total: 0,
@@ -233,15 +258,15 @@
 					let res = {
 						series: [{
 							data: [{
-								"name": "一班",
+								"name": "压力容器",
 								"value": 50,
 								"labelShow": false
 							}, {
-								"name": "二班",
+								"name": "浓缩设备",
 								"value": 30,
 								"labelShow": false
 							}, {
-								"name": "三班",
+								"name": "高压灭菌锅",
 								"value": 20,
 								"labelShow": false
 							}, ]
@@ -255,13 +280,13 @@
 				setTimeout(() => {
 					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
 					let res = {
-						categories: ["维度1", "维度2", "维度3", "维度4", "维度5"],
+						categories: ["测定仪", "色谱仪", "分析仪", "光度计", "离子色谱仪"],
 						series: [{
 								name: "成交量1",
 								data: [90, 110, 165, 195, 187]
-			  		},
+							},
 							{
-			 				name: "成交量2",
+								name: "成交量2",
 								data: [190, 210, 105, 35, 27]
 							}
 						]
@@ -566,9 +591,70 @@
 					}
 				}
 
+
 			}
 		}
 
+		.sortOne {
+			display: inline-block;
+			width: 40rpx;
+			height: 40rpx;
+			padding: 4rpx;
+			box-sizing: border-box;
+			background: rgba(255, 0, 0, 0.2);
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #FF0000;
+			line-height: 40rpx;
+			text-align: center;
+			border-radius: 20rpx;
+		}
+
+		.sortTow {
+			display: inline-block;
+			width: 40rpx;
+			height: 40rpx;
+			padding: 4rpx;
+			box-sizing: border-box;
+			background: rgba(255, 153, 0, 0.2);
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #FF9900;
+			line-height: 40rpx;
+			text-align: center;
+			border-radius: 20rpx;
+		}
+
+		.sortThree {
+			display: inline-block;
+			width: 40rpx;
+			height: 40rpx;
+			padding: 4rpx;
+			box-sizing: border-box;
+			background: rgba(255, 242, 0, 0.2);
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #FFF200;
+			line-height: 40rpx;
+			text-align: center;
+			border-radius: 20rpx;
+		}
+
+		.sortFive {
+			display: inline-block;
+			width: 40rpx;
+			height: 40rpx;
+			padding: 4rpx;
+			box-sizing: border-box;
+			background: rgba(1, 131, 250, 0.2);
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #0183FA;
+			line-height: 40rpx;
+			text-align: center;
+			border-radius: 20rpx;
+		}
+
 		.table-tow {
 			width: 690rpx;
 			margin-top: 20rpx;

pages/views/dataBoard/dataBoard.vue

@@ -39,15 +39,15 @@
 				</view>
 			</view>
 		</scroll-view>
-		<lab-page v-if="pageType==1"></lab-page>
-		<hazard-sources v-if="pageType==2"></hazard-sources>
-		<hazardous-chemicals v-if="pageType==3"></hazardous-chemicals>
-		<security-hidden v-if="pageType==4"></security-hidden>
-		<warning-dispose v-if="pageType==5"></warning-dispose>
-		<equipment-control v-if="pageType==6"></equipment-control>
-		<da-yi-reservation v-if="pageType==7"></da-yi-reservation>
-		<cage-position v-if="pageType==8"></cage-position>
-		<resource-reservation v-if="pageType==9"></resource-reservation>
+		<lab-page v-if="pageType==1" class="pageFlex"></lab-page>
+		<hazard-sources v-if="pageType==2" class="pageFlex"></hazard-sources>
+		<hazardous-chemicals v-if="pageType==3" class="pageFlex"></hazardous-chemicals>
+		<security-hidden v-if="pageType==4" class="pageFlex"></security-hidden>
+		<warning-dispose v-if="pageType==5" class="pageFlex"></warning-dispose>
+		<equipment-control v-if="pageType==6" class="pageFlex"></equipment-control>
+		<da-yi-reservation v-if="pageType==7" class="pageFlex"></da-yi-reservation>
+		<cage-position v-if="pageType==8" class="pageFlex"></cage-position>
+		<resource-reservation v-if="pageType==9" class="pageFlex"></resource-reservation>
 	</view>
 
 </template>
@@ -88,7 +88,7 @@
 		},
 		data() {
 			return {
-				pageType:4,
+				pageType:1,
 				rectangleLogo: uni.getStorageSync('rectangleLogo'),
 				navHeight: uni.getStorageSync('navHeight'),
 				title: '实验室安全智能监测与控制系统',
@@ -177,7 +177,9 @@
 		height: 100%;
 		width: 100%;
 		background: #363744;
-
+		.pageFlex{
+			display: flex;
+		}
 		.header {
 			width: 750rpx;
 			height: 476rpx;
@@ -201,10 +203,10 @@
 				z-index: 200;
 
 				.header-t-l {
-					width: 300rpx;
-					height: 50rpx;
+					width: 400rpx;
+					height: 88rpx;
 					position: absolute;
-					left: 30rpx;
+					left: 0rpx;
 					top: 0;
 				}
 

pages/views/dataBoard/equipmentControl.vue

@@ -117,7 +117,7 @@
 					legend: {
 						show: false,
 					},
-					padding: [15, 15, 10, 15],
+					padding: [15, 95, 10, 0],
 					enableScroll: false,
 					extra: {
 						funnel: {
@@ -195,11 +195,11 @@
 				setTimeout(() => {
 					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
 					let res = {
-						categories: ["化学与药学院", "化学与药学院", "化学与药学院", "化学与药学院", "化学与药学院"],
+						categories: ["植物保护", "园林艺术", "生命科学", "理学院", "农学院"],
 						series: [{
 							name: "目标值",
 							textColor: '#fff',
-							data: [35, 36, 31, 33, 13]
+							data: [62, 37, 20, 41, 32]
 						}, ]
 					};
 					this.chartData = JSON.parse(JSON.stringify(res));
@@ -212,20 +212,25 @@
 					let res = {
 						series: [{
 							data: [{
-								"name": "一班",
-								"value": 50
+								"name": "5年内",
+								"value": 147,
+								"labelText":"5年内 147台 26%",
 							}, {
-								"name": "二班",
-								"value": 40,
+								"name": "10年内",
+								"value": 136,
+								"labelText":"10年内 136台 24%",
 							}, {
-								"name": "三班",
-								"value": 30,
+								"name": "12年内",
+								"value": 124,
+								"labelText":"12年内 124台 22%",
 							}, {
-								"name": "四班",
-								"value": 20,
+								"name": "20年内",
+								"value": 96,
+								"labelText":"20年内 96台 17%",
 							}, {
-								"name": "五班",
-								"value": 10,
+								"name": "超期服役",
+								"value": 67,
+								"labelText":"超期服役 67台 11%",
 							}]
 						}]
 					};
@@ -239,20 +244,17 @@
 					let res = {
 						series: [{
 							data: [{
-								"name": "一班",
+								"name": "13.2压力容器30%",
 								"value": 50
 							}, {
-								"name": "二班",
+								"name": "13.1起重类设备10%",
 								"value": 30
 							}, {
-								"name": "三班",
+								"name": "13.4加热及制冷装置管理40%",
 								"value": 20
 							}, {
-								"name": "四班",
+								"name": "13.3场（厂）内专用机动车辆20%",
 								"value": 18
-							}, {
-								"name": "五班",
-								"value": 8
 							}]
 						}]
 					};

pages/views/dataBoard/equipmentControlOverdue.vue

@@ -14,7 +14,9 @@
 				</view>
 				<view class="table-tb">
 					<view class="table-tb-li" v-for="(item,index) in dataList" :key="index">
-						<view>{{index}}</view>
+						<view>
+							<text :class="index==0?'sortOne':(index==1?'sortTow':(index==2?'sortThree':'sortFive'))">{{index+1}}</text>
+						</view>
 						<view>{{item.data2}}</view>
 						<view>{{item.data2}}</view>
 						<view>{{item.data2}}</view>
@@ -69,20 +71,39 @@
 					pageSize: 10,
 				},
 				dataList: [{
-						data1: '学院学院简称',
-						data2: '666',
+						data1: '植物保护',
+						data2: '499',
+						data3: '47',
+						data4: '220',
+						data5: '137',
 					},
 					{
-						data1: '学院学院简称',
-						data2: '666',
+						data1: '资源环境',
+						data2: '199',
+						data3: '7',
+						data4: '120',
+						data5: '37',
 					},
 					{
-						data1: '学院学院简称',
-						data2: '666',
+						data1: '生命科学',
+						data2: '299',
+						data3: '71',
+						data4: '10',
+						data5: '37',
 					},
 					{
-						data1: '学院学院简称',
-						data2: '666',
+						data1: '资源环境',
+						data2: '199',
+						data3: '7',
+						data4: '120',
+						data5: '37',
+					},
+					{
+						data1: '生命科学',
+						data2: '299',
+						data3: '71',
+						data4: '10',
+						data5: '37',
 					},
 				],
 				total: 0,
@@ -126,7 +147,6 @@
 
 		.table {
 			width: 750rpx;
-			margin-top: 20rpx;
 
 			.table-border {
 				overflow: auto;
@@ -224,10 +244,67 @@
 			}
 
 		}
-
+		.sortOne {
+			display: inline-block;
+			width: 40rpx;
+			height: 40rpx;
+			padding: 4rpx;
+			box-sizing: border-box;
+			background: rgba(255, 0, 0, 0.2);
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #FF0000;
+			line-height: 40rpx;
+			text-align: center;
+			border-radius: 20rpx;
+		}
+		
+		.sortTow {
+			display: inline-block;
+			width: 40rpx;
+			height: 40rpx;
+			padding: 4rpx;
+			box-sizing: border-box;
+			background: rgba(255, 153, 0, 0.2);
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #FF9900;
+			line-height: 40rpx;
+			text-align: center;
+			border-radius: 20rpx;
+		}
+		
+		.sortThree {
+			display: inline-block;
+			width: 40rpx;
+			height: 40rpx;
+			padding: 4rpx;
+			box-sizing: border-box;
+			background: rgba(255, 242, 0, 0.2);
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #FFF200;
+			line-height: 40rpx;
+			text-align: center;
+			border-radius: 20rpx;
+		}
+		
+		.sortFive {
+			display: inline-block;
+			width: 40rpx;
+			height: 40rpx;
+			padding: 4rpx;
+			box-sizing: border-box;
+			background: rgba(1, 131, 250, 0.2);
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #0183FA;
+			line-height: 40rpx;
+			text-align: center;
+			border-radius: 20rpx;
+		}
 		.table-tow {
 			width: 750rpx;
-			margin-top: 20rpx;
 
 			.table-border {
 				overflow: auto;

pages/views/dataBoard/hazardousChemicals.vue

@@ -93,14 +93,9 @@
 					enableScroll: false,
 					extra: {
 						funnel: {
-							activeOpacity: 0.3,
-							activeWidth: 10,
+							type: 'triangle',
 							border: false,
-							borderWidth: 2,
-							borderColor: "#FFFFFF",
-							fillOpacity: 1,
 							labelAlign: "right",
-							type: "pyramid",
 						}
 					}
 				},

pages/views/dataBoard/resourceReservation.vue

@@ -5,7 +5,7 @@
 			<view class="chart-t">
 				<viwe class="chart-t-l">
 					<text>资源总数：</text>
-					<text>333</text>
+					<text>965</text>
 				</viwe>
 				<viwe class="chart-tab">
 					<view class="chart-tab-li" :class="chartTabIndex==index?'tab-A':'tab-B'"
@@ -26,15 +26,15 @@
 				</view>
 				<view class="chart-b-b">
 					<view class="chart-b-li">
-						<view>总数：333 </view>
-						<view>预约数：60</view>
+						<view>总数：200 </view>
+						<view>预约数：50</view>
 					</view>
 					<view class="chart-b-li">
-						<view>总数：333 </view>
+						<view>总数：100 </view>
 						<view>预约数：60</view>
 					</view>
 					<view class="chart-b-li">
-						<view>总数：333 </view>
+						<view>总数：230 </view>
 						<view>预约数：60</view>
 					</view>
 				</view>
@@ -258,7 +258,7 @@
 				setTimeout(() => {
 					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
 					let res = {
-						categories: ["维度1", "维度2", "维度3", "维度4", "维度5"],
+						categories: ["测定仪", "色谱仪", "分析仪", "光度计", "离子色谱仪"],
 						series: [{
 								name: "成交量1",
 								data: [90, 110, 165, 195, 187]

pages/views/dataBoard/securityHidden.vue

@@ -40,7 +40,7 @@
 				<qiun-data-charts type="radar" :opts="optsTow" :echartsH5="true" :chartData="chartDataTow" />
 			</view>
 		</view>
-		<scroll-view scroll-x @scrolltolower="scrollGet">
+		<scroll-view scroll-x @scrolltolower="scrollGet" v-if="chartIndex!=0">
 			<view class="tabTitle_tow">
 				<view class="tabTitle_tow_li" @tap="tabClickTow(item,index)" :key="index"
 					v-for="(item,index) in tabTextTow">
@@ -50,7 +50,7 @@
 			</view>
 		</scroll-view>
 		<!--安全隐患排行 -->
-		<view class="table" v-if="chartType==1">
+		<view class="table" v-if="chartIndex==0">
 			<view class="table-border">
 				<view class="table-th">
 					<view class="table-th-li">
@@ -64,7 +64,10 @@
 				</view>
 				<view class="table-tb">
 					<view class="table-tb-li" v-for="(item,index) in dataList" :key="index">
-						<view>{{index}}</view>
+						<view>
+							<text
+								:class="index==0?'sortOne':(index==1?'sortTow':(index==2?'sortThree':'sortFive'))">{{index+1}}</text>
+						</view>
 						<view>{{item.data1}}</view>
 						<view>{{item.data2}}</view>
 						<view>{{item.data2}}</view>
@@ -76,7 +79,7 @@
 			</view>
 		</view>
 		<!-- 一级指标排行 -->
-		<view class="table-tow" v-if="chartType==2">
+		<view class="table-tow" v-if="chartIndex!=0 && curTabTow==0">
 			<view class="table-border">
 				<view class="table-th">
 					<view class="table-th-li">
@@ -88,7 +91,10 @@
 				</view>
 				<view class="table-tb">
 					<view class="table-tb-li" v-for="(item,index) in dataList" :key="index">
-						<view>{{index}}</view>
+						<view>
+							<text
+								:class="index==0?'sortOne':(index==1?'sortTow':(index==2?'sortThree':'sortFive'))">{{index+1}}</text>
+						</view>
 						<view>{{item.data1}}</view>
 						<view>{{item.data2}}</view>
 						<view>{{item.data2}}</view>
@@ -97,7 +103,7 @@
 			</view>
 		</view>
 		<!--学院单位 -->
-		<view class="table-three" v-if="chartType==3">
+		<view class="table-three" v-if="chartIndex!=0 && curTabTow==1">
 			<view class="table-border">
 				<view class="table-th">
 					<view class="table-th-li">
@@ -270,7 +276,7 @@
 			//顶部tab点击
 			tabClickTow(item, index) {
 				this.curTabTow = index;
-				
+
 			},
 			getServerData() {
 				//模拟从服务器获取数据时的延时
@@ -606,13 +612,14 @@
 						}
 					}
 
-					
+
 
 				}
 			}
 
 
 		}
+
 		.sortOne {
 			display: inline-block;
 			width: 40rpx;
@@ -627,7 +634,7 @@
 			text-align: center;
 			border-radius: 20rpx;
 		}
-		
+
 		.sortTow {
 			display: inline-block;
 			width: 40rpx;
@@ -642,7 +649,7 @@
 			text-align: center;
 			border-radius: 20rpx;
 		}
-		
+
 		.sortThree {
 			display: inline-block;
 			width: 40rpx;
@@ -657,7 +664,7 @@
 			text-align: center;
 			border-radius: 20rpx;
 		}
-		
+
 		.sortFive {
 			display: inline-block;
 			width: 40rpx;

pages/views/dataBoard/warningDispose.vue

@@ -12,25 +12,30 @@
 					</view>
 				</view>
 				<view class="chart-b">
-					<!-- <qiun-data-charts type="tarea" :chartData="chartData" background="none" /> -->
+					<view class="chart-b-li" 
+					v-for="(item,index) in deptList" :key="index"
+					:style="'top:'+item.top+'rpx;left:'+item.left+'rpx;'"> 
+						<view>{{item.name}}</view>
+						<img  src="@/pages/images/dataBoard/img_xyzc_bg.png">
+					</view>
 				</view>
 			</view>
 		</view>
 		<view class="statistics">
 			<view class="statistics-b">
 				<view class="statistics-b-li">
-					<view class="statistics-b-li-t">99</view>
+					<view class="statistics-b-li-t">13</view>
 					<view class="statistics-b-li-b">昨日预警处置数</view>
 				</view>
 				<view class="line"></view>
 				<view class="statistics-b-li">
-					<view class="statistics-b-li-t">16</view>
+					<view class="statistics-b-li-t">9</view>
 					<view class="statistics-b-li-b">今日预警处置数</view>
 				</view>
 				<view class="line"></view>
 				<view class="statistics-b-li">
 					<view class="statistics-b-li-t-tow">
-						<text class="color-B">-0.9%</text>
+						<text class="color-B">0.9%</text>
 						<img src="@/pages/images/dataBoard/dataBoard-icon3.png">
 					</view>
 					<view class="statistics-b-li-b">环比增长</view>
@@ -51,7 +56,9 @@
 				</view>
 				<view class="table-tb">
 					<view class="table-tb-li" v-for="(item,index) in dataList" :key="index">
-						<view>{{index}}</view>
+						<view>
+							<text :class="index==0?'sortOne':(index==1?'sortTow':(index==2?'sortThree':'sortFive'))">{{index+1}}</text>
+						</view>
 						<view>{{item.data2}}</view>
 						<view>{{item.data2}}</view>
 						<view>{{item.data2}}</view>
@@ -109,26 +116,95 @@
 					},
 				],
 				dateIndex: 0,
+				deptList:[
+				          {
+				            name:"农学院",
+				            value:"0",
+				            top:18,
+				            left:46,
+				          },
+				          {
+				            name:"理学院",
+				            value:"0",
+				            top:18,
+				            left:508,
+				          },
+				          {
+				            name:"化学与药物",
+				            value:"0",
+				            top:100,
+				            left:136,
+				          },
+				          {
+				            name:"生命科学",
+				            value:"0",
+				            top:85,
+				            left:370,
+				          },
+				          {
+				            name:"园林艺术",
+				            value:"0",
+				            top:146,
+				            left:546,
+				          },
+				          {
+				            name:"植物保护",
+				            value:"0",
+				            top:271,
+				            left:533,
+				          },
+				          {
+				            name:"资源环境",
+				            value:"0",
+				            top:208,
+				            left:42,
+				          },
+				          {
+				            name:"国重楼",
+				            value:"0",
+				            top:200,
+				            left:333,
+				          },
+				        ],
 				// 查询参数
 				queryParams: {
 					page: 1,
 					pageSize: 10,
 				},
 				dataList: [{
-						data1: '学院学院简称',
-						data2: '666',
+						data1: '植物保护',
+						data2: '499',
+						data3: '47',
+						data4: '220',
+						data5: '137',
+					},
+					{
+						data1: '资源环境',
+						data2: '199',
+						data3: '7',
+						data4: '120',
+						data5: '37',
 					},
 					{
-						data1: '学院学院简称',
-						data2: '666',
+						data1: '生命科学',
+						data2: '299',
+						data3: '71',
+						data4: '10',
+						data5: '37',
 					},
 					{
-						data1: '学院学院简称',
-						data2: '666',
+						data1: '资源环境',
+						data2: '199',
+						data3: '7',
+						data4: '120',
+						data5: '37',
 					},
 					{
-						data1: '学院学院简称',
-						data2: '666',
+						data1: '生命科学',
+						data2: '299',
+						data3: '71',
+						data4: '10',
+						data5: '37',
 					},
 				],
 				total: 0,
@@ -170,14 +246,14 @@
 				z-index: 100;
 			}
 			.chart-n{
-				padding: 34rpx 30rpx 26rpx;
+				padding: 34rpx 0rpx 26rpx;
 				box-sizing: border-box;
 				position: absolute;
 				z-index: 200;
 				.chart-t {
 					display: flex;
 					justify-content: space-between;
-
+					margin: 0 30rpx;
 					.chart-t-li {
 						width: 76rpx;
 						height: 100rpx;
@@ -228,6 +304,34 @@
 				.chart-b {
 					width: 690rpx;
 					height: 350rpx;
+					position: absolute;
+					.chart-b-li{
+						position: absolute;
+						z-index: 300;
+						width: 200rpx;
+						height: 46rpx;
+						
+						>img{
+							width: 200rpx;
+							height: 46rpx;
+							position: absolute;
+							z-index: 400;
+						}
+						>view{
+							padding-left: 16rpx;
+							box-sizing: border-box;
+							width: 200rpx;
+							height: 46rpx;
+							position: absolute;
+							z-index: 500;
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #FFFFFF;
+							line-height: 46rpx;
+							text-align: left;
+						}
+						
+					}
 				}
 			}
 
@@ -383,6 +487,65 @@
 					}
 				}
 
+				.sortOne {
+					display: inline-block;
+					width: 40rpx;
+					height: 40rpx;
+					padding: 4rpx;
+					box-sizing: border-box;
+					background: rgba(255, 0, 0, 0.2);
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #FF0000;
+					line-height: 40rpx;
+					text-align: center;
+					border-radius: 20rpx;
+				}
+				
+				.sortTow {
+					display: inline-block;
+					width: 40rpx;
+					height: 40rpx;
+					padding: 4rpx;
+					box-sizing: border-box;
+					background: rgba(255, 153, 0, 0.2);
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #FF9900;
+					line-height: 40rpx;
+					text-align: center;
+					border-radius: 20rpx;
+				}
+				
+				.sortThree {
+					display: inline-block;
+					width: 40rpx;
+					height: 40rpx;
+					padding: 4rpx;
+					box-sizing: border-box;
+					background: rgba(255, 242, 0, 0.2);
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #FFF200;
+					line-height: 40rpx;
+					text-align: center;
+					border-radius: 20rpx;
+				}
+				
+				.sortFive {
+					display: inline-block;
+					width: 40rpx;
+					height: 40rpx;
+					padding: 4rpx;
+					box-sizing: border-box;
+					background: rgba(1, 131, 250, 0.2);
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #0183FA;
+					line-height: 40rpx;
+					text-align: center;
+					border-radius: 20rpx;
+				}
 			}