样式问题修改

conponents/Echar/ring.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="main-chart" ref="main" id="main" style="width: 520rpx;height:230px;background-color: #fff; margin: 0 auto;"></div>
+	<div class="main-chart" ref="main" id="main" style="width: 100%;height:230px;background-color: #fff; margin: 0 auto;"></div>
 </template>
 
 <script>
@@ -102,6 +102,18 @@ export default {
 							  borderColor: '#ffffff',
 							  },
 						},
+						label: {
+							normal: {
+								formatter: "{c|{c}人}\n\n{b|{b}}", //百分比之后换行显示文字
+								rich: {
+									per: {  
+									   color: "#333",  //百分比文字颜色
+									   align: "center",
+									   fontSize: 12
+									}
+								}
+							}
+						},
 					  radius: ['40%', '60%']
 					}
 				  ]

conponents/table/tabel.vue

@@ -5,9 +5,10 @@
 			style=" border-bottom: 2rpx solid #f0f0f0; color: #434343;"
 			v-for="(items, id) in eyeData"
 		>
-			<u-col v-for="item in tableEye" :span="item.span" style='padding: 32rpx 0;'>
-				<view v-if="id == 0" class="demo-layout bg-purple-light">{{item.label}}</view>
-				<view v-else style="color: rgba(0,0,0,0.60);">{{items[item.title]}}</view>
+			<u-col v-for="item in tableEye" :span="item.span">
+				<view v-if="id == 0" class="demo-layout bg-purple-light"  style='padding: 32rpx 0;'>{{item.label}}</view>
+				<view v-if="id == 0" style="color: rgba(0,0,0,0.60); padding: 32rpx 0;">{{items[item.title]}}</view>
+				<view v-else style="color: rgba(0,0,0,0.60); padding: 32rpx 0;">{{items[item.title]}}</view>
 			</u-col>
 		</u-row>
 	</view>
@@ -25,6 +26,9 @@
 				default: []
 			}
 		},
+		created(){
+			
+		},
 		data() {
 			return {
 				

pages/addHandle/index.vue

@@ -93,7 +93,7 @@
 		<!-- </view> -->
 
 		<view class="symptom">
-			<RedDot text="备注" :required="true"></RedDot>
+			<RedDot text="备注"></RedDot>
 			<u--textarea border="none" style="margin: 32rpx 0 72rpx 0; padding: 0;" v-model="formData.remark"
 				placeholder="请输入" autoHeight></u--textarea>
 		</view>
@@ -388,10 +388,11 @@
 				} else if (this.formData.disposeRecords[0].text == '') {
 					this.$u.toast('处理措施未填写')
 					return
-				} else if (this.formData.remark == '') {
-					this.$u.toast('备注未填写')
-					return
-				}
+				} 
+				// else if (this.formData.remark == '') {
+				// 	this.$u.toast('备注未填写')
+				// 	return
+				// }
 
 				this.checkboxValue1.indexOf("需要观察") != -1 ? this.formData.isWatch = 1 : this.formData.isWatch = 0
 				this.checkboxValue1.indexOf("通知家长") != -1 ? this.formData.isNoticeParent = 1 : this.formData

pages/addLeave/index.vue

@@ -46,7 +46,7 @@
 		
 		<!-- 请假类型 -->
 		<template>
-			<view class="content" style="margin-top: 20rpx;">
+			<view class="content">
 			   <u-cell :value="LeaveTypeData || '请选择'" isLink @click="leaveTypeShow=true">
 				   <view
 						slot="title"

pages/face/index.vue

@@ -252,7 +252,8 @@
 				this.intervalTakeImg = setInterval(() => {
 					// 把当前视频帧内容渲染到canvas上
 					// ctx.drawImage(document.createElement('canvas'), 0, 0, 520, 520);
-					html2Cvs(document.querySelector('video'), {
+					// 修改后代码 将 html2Cvs 修改为 (window.html2Cvs || html2Cvs)
+					(window.html2Cvs || html2Cvs)(document.querySelector('video'), {
 						backgroundColor: null,
 						useCORS: true
 					}).then(cvs => {

pages/leave/index.vue

@@ -81,6 +81,12 @@
 			<view class="student" style="margin-bottom: 20rpx;">
 				<text style="display: block; margin-bottom: 32rpx;">请假学生</text>
 				
+				<view v-if="listData.length == 0">
+					<view style="text-align: center; line-height: 150rpx;">
+						暂无数据
+					</view>
+				</view>
+				
 				<Table v-if="listData.length < 3" :tableEye="tableEye" :eyeData="eyeDataOpen" />
 				<Table v-else :tableEye="tableEye" :eyeData="tabelShow ? eyeDataOpen : eyeData" />
 				
@@ -330,7 +336,7 @@
 						this.Chart = []
 						this.Chart.push({
 							name: '暂无数据',
-							value: 1
+							value: 0
 						})
 					}else{
 						this.Chart = arr
@@ -358,7 +364,7 @@
 				}).then(res=>{
 					// console.log('res', res)
 					this.listData = res.data.records
-					this.eyeDataOpen = this.listData
+					this.eyeDataOpen = res.data.records
 					if(this.listData.length > 2){
 						this.eyeData = [
 							this.listData[0],
@@ -366,8 +372,9 @@
 						]
 					}
 					
-					this.eyeData.unshift({})
-					this.eyeDataOpen.unshift({})
+					console.log('listData', this.listData, res)
+					// this.eyeData.unshift({})
+					// this.eyeDataOpen.unshift({})
 				}).catch(err=>{
 					console.log('err' , err)
 				})
@@ -534,7 +541,7 @@
 	.total{
 		height: 302rpx;
 		box-sizing: border-box;
-		padding: 36rpx 22rpx;
+		padding: 32rpx 32rpx;
 		background-color: #fff;
 		border-radius: 32rpx;
 		margin: 20rpx 32rpx 0;