zc

pages/views/dataBoard/cagePosition.vue

@@ -9,7 +9,7 @@
 			<view class="chart-b">
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts" :chartData="chartData0" />
+						<qiun-data-charts type="arcbar" :opts="opts" :canvas2d="true" :chartData="chartData0" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].appointNum}}</text>
@@ -18,7 +18,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts2" :chartData="chartData1" />
+						<qiun-data-charts type="arcbar" :opts="opts2" :canvas2d="true" :chartData="chartData1" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].freeNum}}</text>
@@ -27,7 +27,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts3" :chartData="chartData2" />
+						<qiun-data-charts type="arcbar" :opts="opts3" :canvas2d="true" :chartData="chartData2" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].appointNum}}</text>
@@ -36,7 +36,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts4" :chartData="chartData3" />
+						<qiun-data-charts type="arcbar" :opts="opts4" :canvas2d="true" :chartData="chartData3" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].lockedNum}}</text>
@@ -45,7 +45,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts5" :chartData="chartData4" />
+						<qiun-data-charts type="arcbar" :opts="opts5" :canvas2d="true" :chartData="chartData4" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].killNum}}</text>
@@ -54,7 +54,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts6" :chartData="chartData5" />
+						<qiun-data-charts type="arcbar" :opts="opts6" :canvas2d="true" :chartData="chartData5" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].repairNum}}</text>
@@ -71,7 +71,7 @@
 			<view class="chart-b">
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts" :chartData="chartDataTow0" />
+						<qiun-data-charts type="arcbar" :opts="opts" :canvas2d="true" :chartData="chartDataTow0" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].appointNum}}</text>
@@ -80,7 +80,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts2" :chartData="chartDataTow1" />
+						<qiun-data-charts type="arcbar" :opts="opts2" :canvas2d="true" :chartData="chartDataTow1" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].freeNum}}</text>
@@ -89,7 +89,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts3" :chartData="chartDataTow2" />
+						<qiun-data-charts type="arcbar" :opts="opts3" :canvas2d="true" :chartData="chartDataTow2" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].appointNum}}</text>
@@ -98,7 +98,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts4" :chartData="chartDataTow3" />
+						<qiun-data-charts type="arcbar" :opts="opts4" :canvas2d="true" :chartData="chartDataTow3" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].lockedNum}}</text>
@@ -107,7 +107,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts5" :chartData="chartDataTow4" />
+						<qiun-data-charts type="arcbar" :opts="opts5" :canvas2d="true" :chartData="chartDataTow4" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].killNum}}</text>
@@ -116,7 +116,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts6" :chartData="chartDataTow5" />
+						<qiun-data-charts type="arcbar" :opts="opts6" :canvas2d="true" :chartData="chartDataTow5" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].repairNum}}</text>

pages/views/dataBoard/daYiReservation.vue

@@ -9,7 +9,7 @@
 				</viwe>
 			</view>
 			<view class="chart-b">
-				<qiun-data-charts type="ring" :opts="opts" :echartsH5="true" :chartData="chartData" />
+				<qiun-data-charts type="ring" :opts="opts" :echartsH5="true" :canvas2d="true" :chartData="chartData" />
 			</view>
 		</view>
 		<view class="small-title">
@@ -50,7 +50,7 @@
 		</view>
 		<view class="chart-tow">
 			<view class="chart-tow-b">
-				<qiun-data-charts type="radar" :opts="optsTow" :echartsH5="true" :chartData="chartDataTow" />
+				<qiun-data-charts type="radar" :opts="optsTow" :echartsH5="true" :canvas2d="true" :chartData="chartDataTow" />
 			</view>
 		</view>
 	</view>

pages/views/dataBoard/dataBoard.vue

@@ -44,7 +44,7 @@
 		<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>
+		<warning-dispose v-if="pageType==5" class="pageFlex" style="flex:1;"></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>
@@ -187,8 +187,11 @@
 
 <style lang="stylus" scoped>
 	.dataBoard {
-		height: 100%;
-		width: 100%;
+		display: flex;
+		flex-direction: column;
+		flex:1;
+		// height: 100%;
+		// width: 100%;
 		background: #363744;
 
 		.pageFlex {

pages/views/dataBoard/equipmentControl.vue

@@ -25,7 +25,7 @@
 		</view>
 		<view class="chart">
 			<view class="chart-b">
-				<qiun-data-charts type="bar" :opts="opts" :echartsH5="true" :chartData="chartData" />
+				<qiun-data-charts type="bar" :opts="opts" :echartsH5="true" :canvas2d="true" :chartData="chartData" />
 			</view>
 		</view>
 		<view class="small-title">
@@ -34,7 +34,7 @@
 		</view>
 		<view class="chart-tow">
 			<view class="chart-tow-b">
-				<qiun-data-charts type="funnel" :opts="optsTow" :echartsH5="true" :chartData="chartDataTow" />
+				<qiun-data-charts type="funnel" :opts="optsTow" :echartsH5="true" :canvas2d="true" :chartData="chartDataTow" />
 			</view>
 		</view>
 		<view class="small-title">
@@ -51,7 +51,7 @@
 				</viwe>
 			</view>
 			<view class="chart-three-b">
-				<qiun-data-charts type="pie" :opts="optsThree" :echartsH5="true" :chartData="chartDataThree" />
+				<qiun-data-charts type="pie" :opts="optsThree" :echartsH5="true" :canvas2d="true" :chartData="chartDataThree" />
 			</view>
 		</view>
 		<view class="chart-title">

pages/views/dataBoard/hazardSources.vue

@@ -29,7 +29,7 @@
 		</view>
 		<view class="chart">
 			<view class="chart-b">
-				<qiun-data-charts type="bar" :opts="opts" :echartsH5="true" :chartData="chartData" />
+				<qiun-data-charts type="bar" :opts="opts" :echartsH5="true" :canvas2d="true" :chartData="chartData" />
 			</view>
 		</view>
 		<view class="table">

pages/views/dataBoard/hazardousChemicals.vue

@@ -29,7 +29,7 @@
 		</view>
 		<view class="chart">
 			<view class="chart-t">
-				<qiun-data-charts type="funnel" :opts="opts" :echartsH5="true" :chartData="chartData" />
+				<qiun-data-charts type="funnel" :opts="opts" :echartsH5="true" :canvas2d="true" :chartData="chartData" />
 			</view>
 			<view class="chart-b" v-for="(item,index) in dataList" :key="index">
 				<view :class="index==0?'chartOne':(index==1?'chartTow':(index==2?'chartThree':'chartFive'))">

pages/views/dataBoard/labPage.vue

@@ -10,7 +10,7 @@
 				</view>
 			</view> -->
 			<view class="chart-b">
-				<qiun-data-charts type="line" :opts="opts" :echartsH5="true" :chartData="chartData" :ontouch="true" />
+				<qiun-data-charts type="line" :opts="opts" :echartsH5="true" :chartData="chartData" :canvas2d="true" :ontouch="true" />
 			</view>
 		</view>
 		<view class="statistics">

pages/views/dataBoard/resourceReservation.vue

@@ -15,7 +15,7 @@
 			<view class="chart-b">
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts0" :chartData="chartData0" />
+						<qiun-data-charts type="arcbar" :opts="opts0" :canvas2d="true" :chartData="chartData0" />
 					</view>
 					<view class="chart-b-li-r">
 						<view>总数: {{dataList[0].equNumber}}</view>
@@ -25,7 +25,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts1" :chartData="chartData1" />
+						<qiun-data-charts type="arcbar" :opts="opts1" :canvas2d="true" :chartData="chartData1" />
 					</view>
 					<view class="chart-b-li-r">
 						<view>总数: {{dataList[1].equNumber}}</view>
@@ -35,7 +35,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts2" :chartData="chartData2" />
+						<qiun-data-charts type="arcbar" :opts="opts2" :canvas2d="true" :chartData="chartData2" />
 					</view>
 					<view class="chart-b-li-r">
 						<view>总数: {{dataList[2].equNumber}}</view>
@@ -45,7 +45,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts3" :chartData="chartData3" />
+						<qiun-data-charts type="arcbar" :opts="opts3" :canvas2d="true" :chartData="chartData3" />
 					</view>
 					<view class="chart-b-li-r">
 						<view>总数: {{dataList[3].equNumber}}</view>
@@ -65,7 +65,7 @@
 		</view>
 		<view class="chart-tow">
 			<view class="chart-tow-b">
-				<qiun-data-charts type="radar" :opts="optsTow" :echartsH5="true" :chartData="chartDataThree" />
+				<qiun-data-charts type="radar" :opts="optsTow" :echartsH5="true" :canvas2d="true" :chartData="chartDataThree" />
 			</view>
 		</view>
 	</view>

pages/views/dataBoard/securityHidden.vue

@@ -13,7 +13,7 @@
 					v-for="(item,index) in chartTitle">{{item}}</view>
 			</view>
 			<view class="chart-b" v-if="chartIndex==0">
-				<qiun-data-charts type="column" :opts="opts" :echartsH5="true" :chartData="chartData" />
+				<qiun-data-charts type="column" :opts="opts" :echartsH5="true" :canvas2d="true" :chartData="chartData" />
 			</view>
 			<view class="chart-b2" v-if="chartIndex==0">
 				<view class="chart-b2-li" v-for="(item,index) in hiddenChartBottom">
@@ -25,7 +25,7 @@
 				</view>
 			</view>
 			<view class="chart-b-tow" v-if="chartIndex==1 || chartIndex==2">
-				<qiun-data-charts type="radar" :opts="optsTow" :echartsH5="true" :chartData="chartDataTow" />
+				<qiun-data-charts type="radar" :opts="optsTow" :echartsH5="true" :canvas2d="true" :chartData="chartDataTow" />
 			</view>
 		</view>
 		<scroll-view scroll-x @scrolltolower="scrollGet" v-if="chartIndex!=0">

pages/views/dataBoard/warningDispose.vue

@@ -1,7 +1,7 @@
 <!-- 数据看板-预警处置 -->
 <template>
 	<view class="warningDispose">
-		<view class="chart">
+		<!-- <view class="chart">
 			<img class="chart-bg" src="@/pages/images/dataBoard/dataBoard-icon4.png">
 			<view class="chart-n">
 				<view class="chart-t">
@@ -12,14 +12,14 @@
 					</view>
 				</view>
 				<view class="chart-b">
-					<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 class="chart-b-li" v-for="(item,index) in deptList" :key="index">
+						<view>{{item.deptSortName}}：{{item.todayTotal}}</view>
+						<img v-if="item.todayTotal==0" src="@/pages/images/dataBoard/img_xyzc_bg.png">
+						<img v-if="item.todayTotal!=0" src="@/pages/images/newImage/img_xyyc_bg@1x.png">
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="statistics">
 			<view class="statistics-b">
 				<view class="statistics-b-li">
@@ -43,7 +43,7 @@
 		</view>
 		<view class="table">
 			<uni-card>
-				<view style="height: 200px">
+				<view style="height: 400px">
 					<zb-table :columns="column" :stripe="false" :border="false" :data="dataList"></zb-table>
 				</view>
 			</uni-card>
@@ -67,55 +67,7 @@
 			return {
 				dateList: [],
 				dateIndex: 6,
-				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,
-					},
-				],
+				deptList: [],
 				// 查询参数
 				queryParams: {
 					page: 1,
@@ -171,15 +123,13 @@
 
 		},
 		mounted() {
-			this.reportAppStatisticsWarningHandle();
 			this.getCurrentDate();
 		},
 		methods: {
 			dateClick(index) {
 				this.dateIndex = index;
-				console.log(this.dateList[index])
+				this.reportAppStatisticsWarningHandle();
 			},
-
 			getCurrentDate() {
 				// 获取当前日期和星期
 				let date = new Date();
@@ -219,6 +169,7 @@
 						})
 				}
 				this.dateList=this.dateList.reverse();
+				this.reportAppStatisticsWarningHandle();
 			},
 			//预警处置
 			async reportAppStatisticsWarningHandle(planId) {
@@ -226,14 +177,14 @@
 				const {
 					data
 				} = await reportAppStatisticsWarningHandle({
-					'date': '2024-10-14'
+					'date': this.dateList[this.dateIndex].format
 				});
 				if (data.code == 200) {
-					this.dataList = data.data.warningList;
+					this.deptList = data.data.warningList;
+					this.dataList = data.data.warningScatterList;
 					this.$set(self, 'todayTotal', data.data.warning.todayTotal);
 					this.$set(self, 'yesterdayTotal', data.data.warning.yesterdayTotal);
 					this.$set(self, 'rate', data.data.warning.rate);
-
 				}
 			},
 		},
@@ -356,6 +307,90 @@
 						}
 
 					}
+					.chart-b-li:nth-child(1){
+						top:20rpx;
+						left:30rpx;
+					}
+					.chart-b-li:nth-child(2){
+						top:20rpx;
+						left:260rpx;
+					}
+					.chart-b-li:nth-child(3){
+						top:20rpx;
+						left:490rpx;
+					}
+					.chart-b-li:nth-child(4){
+						top:80rpx;
+						left:30rpx;
+					}
+					.chart-b-li:nth-child(5){
+						top:80rpx;
+						left:260rpx;
+					}
+					.chart-b-li:nth-child(6){
+						top:80rpx;
+						left:490rpx;
+					}
+					.chart-b-li:nth-child(7){
+						top:140rpx;
+						left:30rpx;
+					}
+					.chart-b-li:nth-child(8){
+						top:140rpx;
+						left:260rpx;
+					}
+					.chart-b-li:nth-child(9){
+						top:140rpx;
+						left:490rpx;
+					}
+					.chart-b-li:nth-child(10){
+						top:200rpx;
+						left:30rpx;
+					}
+					.chart-b-li:nth-child(11){
+						top:200rpx;
+						left:260rpx;
+					}
+					.chart-b-li:nth-child(12){
+						top:200rpx;
+						left:490rpx;
+					}
+					.chart-b-li:nth-child(13){
+						top:260rpx;
+						left:30rpx;
+					}
+					.chart-b-li:nth-child(14){
+						top:260rpx;
+						left:260rpx;
+					}
+					.chart-b-li:nth-child(15){
+						top:260rpx;
+						left:490rpx;
+					}
+					.chart-b-li:nth-child(16){
+						top:320rpx;
+						left:30rpx;
+					}
+					.chart-b-li:nth-child(17){
+						top:320rpx;
+						left:260rpx;
+					}
+					.chart-b-li:nth-child(18){
+						top:320rpx;
+						left:490rpx;
+					}
+					.chart-b-li:nth-child(19){
+						top:380rpx;
+						left:30rpx;
+					}
+					.chart-b-li:nth-child(20){
+						top:380rpx;
+						left:260rpx;
+					}
+					.chart-b-li:nth-child(21){
+						top:380rpx;
+						left:490rpx;
+					}
 				}
 			}
 

pages/views/teacherPage/teacherHome.vue

@@ -1,7 +1,7 @@
 <!-- 教师首页 -->
 <template>
 	<view class="teacherHome">
-		<dataBoard v-if="pageType == 1"></dataBoard>
+		<dataBoard v-if="pageType == 1" style="display: flex;flex-direction:column;flex:1;"></dataBoard>
 		<view class="home-page" v-if="pageType == 2">
 			<nav-bar :title="title" :background="background"></nav-bar>
 			<view class="top-back-img" :style="{top:navHeight+'rpx'}">