我生成的报告增加发送邮件功能、发送报告可选人、样式布局调整

components/CusSelectTeamUser/index.vue

@@ -0,0 +1,216 @@
+<template>
+	<view class="dialog adffc" v-if="show">
+		<view class="dialog-box">
+			<view class="dialog-box-title">{{title}}</view>
+			<image class="dialog-box-close" :src="imgBase+'remind_close.png'" @click="close"></image>
+			<div class="dialog-box-select adfacjb">
+				<div class="dialog-box-select-left">已选 {{selectNums}} 人</div>
+				<div class="dialog-box-select-right adfac" @click="changeAll">
+					<image :src="imgBase+'selected.png'" v-if="selectAll"></image>
+					<image :src="imgBase+'not_select.png'" v-else></image>
+					<text>全选</text>
+				</div>
+			</div>
+			<view class="dialog-box-list">
+				<view class="dialog-box-list-item adfac" v-for="(item,index) in list" :key="index" @click="handleSelectUser(item,index)">
+					<view class="dialog-box-list-item-status" :class="{'wzd':item.status===0,'yzd':item.status===1}">{{statusCfg[item.status]}}</view>
+					<view class="dialog-box-list-item-select">
+						<image :src="imgBase+'selected.png'" v-if="item.select"></image>
+						<image :src="imgBase+'not_select.png'" v-else></image>
+					</view>
+					<view>
+						<view class="dialog-box-list-item-name adfac">
+							<text>{{item.realName}}</text>
+							<view class="type">{{item.categoryName}}</view>
+						</view>
+						<view class="dialog-box-list-item-email">{{item.email}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="zt_btn" style="margin-top: 80rpx;" @click="handleConfirm">确认发送</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:{
+			show:{
+				typeof:Boolean,
+				default:false
+			},
+			list:{
+				typeof:Array,
+				default:[]
+			}
+		},
+		data(){
+			return {
+				title:'发送报告',
+				statusCfg:{
+					0:'未作答',
+					1:'已作答'
+				},
+				selectNums:0,
+				selectAll:false,
+			}
+		},
+		methods:{
+			close(){
+				this.$emit('close');
+			},
+			changeAll(){
+				this.selectAll = !this.selectAll;
+				this.$emit('changeAll',this.selectAll);
+			},
+			handleSelectUser(item,index){
+				this.$emit('handleSelectUser',index);
+			},
+			handleConfirm(){
+				this.$emit('handleConfirm');
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.dialog{
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 1001;
+		background: rgba(0,0,0,.4);
+		justify-content: flex-end;
+		&-box{
+			width: 100%;
+			background: #F7F7F7;
+			border-radius: 24rpx 24rpx 0rpx 0rpx;
+			padding: 48rpx 24rpx 64rpx;
+			box-sizing: border-box;
+			position: relative;
+			&-title{
+				font-family: PingFang-SC, PingFang-SC;
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #002846;
+				line-height: 32rpx;
+				text-align: center;
+			}
+			&-close{
+				width: 48rpx;
+				height: 48rpx;
+				position: absolute;
+				top: 30rpx;
+				right: 30rpx;
+			}
+			&-select{
+				margin-top: 66rpx;
+				&-left{
+					font-family: PingFang-SC, PingFang-SC;
+					font-weight: bold;
+					font-size: 32rpx;
+					color: #002846;
+					line-height: 36rpx;
+				}
+				&-right{
+					image{
+						width: 36rpx;
+						height: 36rpx;
+					}
+					text{
+						font-family: PingFangSC, PingFang SC;
+						font-weight: 400;
+						font-size: 30rpx;
+						color: #002846;
+						line-height: 36rpx;
+						margin-left: 10rpx;
+					}
+				}
+			}
+			&-bottom{
+				width: 100%;
+				height: 88rpx;
+				background: rgba(25,156,156,0.1);
+				border-radius: 44rpx;
+				font-family: PingFang-SC, PingFang-SC;
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #009191;
+				line-height: 88rpx;
+				text-align: center;
+				margin-top: 40rpx;
+			}
+			&-list{
+				height: 900rpx;
+				margin-top: 10rpx;
+				overflow-y: auto;
+				&-item{
+					background: #FFFFFF;
+					box-shadow: inset 0rpx -1rpx 0rpx 0rpx #EFEFEF;
+					border-radius: 24rpx;
+					margin-top: 20rpx;
+					position: relative;
+					padding: 36rpx 24rpx;
+					&-status{
+						padding: 11rpx 16rpx 29rpx 37rpx;
+						box-sizing: border-box;
+						position: absolute;
+						top: 0;
+						right: 0;
+						font-family: PingFangSC, PingFang SC;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #FFFFFF;
+						line-height: 24rpx;
+						&.wzd{
+							background: url('https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/team_user_wzd.png') no-repeat;
+							background-size: 100% 100%;
+							color: #193D59;
+						}
+						&.yzd{
+							background: url('https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/team_user_yzd.png') no-repeat;
+							background-size: 100% 100%;
+						}
+					}
+					&-select{
+						padding-right: 24rpx;
+						image{
+							width: 36rpx;
+							height: 36rpx;
+						}
+					}
+					&-name{
+						text{
+							font-family: PingFang-SC, PingFang-SC;
+							font-weight: bold;
+							font-size: 30rpx;
+							color: #002846;
+							line-height: 32rpx;
+						}
+						.type{
+							margin-left: 20rpx;
+							background: #FFF7DC;
+							border-radius: 20rpx;
+							padding: 5rpx 16rpx;
+							font-family: PingFangSC, PingFang SC;
+							font-weight: 400;
+							font-size: 22rpx;
+							color: #BA9B31;
+							line-height: 30rpx;
+						}
+					}
+					&-email{
+						font-family: PingFangSC, PingFang SC;
+						font-weight: 400;
+						font-size: 28rpx;
+						color: #667E90;
+						line-height: 28rpx;
+						margin-top: 24rpx;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/home.vue

@@ -219,7 +219,8 @@
 			},
 			toTurn(url){
 				if(!url) return 
-				if(url!=='/pages/dialog'&&!this.isLogin()) return
+				const notloginurls = ['/pages/dialog','/pages/support','/pagesHome/weixin'];
+				if(!notloginurls.includes(url)&&!this.isLogin()) return
 				uni.navigateTo({
 					url
 				})

pages/login.vue

@@ -126,6 +126,7 @@
 											info:{
 												channelType:that.channelType||'',
 												mobile:res.data.data.mobile||'',
+												email:res.data.data.email||'',
 												isRegister:res.data.data.isRegister,
 												referrerId:res.data.data.referrerId||that.referrerId||'',
 												teamQuestionnaireId:res.data.data.teamQuestionnaireId||that.teamQuestionnaireId||'',
@@ -139,6 +140,7 @@
 												gender:res.data.data.gender,
 												realName:res.data.data.realName,
 												mobile:res.data.data.mobile,
+												email:res.data.data.email,
 												headUrl:res.data.data.headUrl,
 												teamId:res.data.data.teamId,
 												enterpriseId:res.data.data.enterpriseId,
@@ -166,6 +168,7 @@
 					gender:res.data.data.gender,
 					realName:res.data.data.realName,
 					mobile:res.data.data.mobile,
+					email:res.data.data.email,
 					headUrl:res.data.data.headUrl,
 					teamId:res.data.data.teamId,
 					enterpriseId:res.data.data.enterpriseId,

pagesHome/components/report/generateList.vue

@@ -19,30 +19,41 @@
 						<view class="gbox-item-p-left">创建时间：</view>
 						<view class="gbox-item-p-right">{{item.createDate||''}}</view>
 					</view>
+					<image class="gbox-item-ask" :src="imgBase+'report_ask.png'" @click="askReport(item)" v-if="item.state==1&&item.fileUrl"></image>
 					<view class="gbox-item-bottom adfacjb">
 						<view class="gbox-item-bottom-left adfac"></view>
 						<div class="gbox-item-bottom-rightbox adfac" v-if="item.type==1">
-							<view class="gbox-item-bottom-right" @click="reviewPdf(item)" v-if="item.state==1">预览</view>
-							<view class="gbox-item-bottom-right" style="margin-left: 20rpx;" @click="askReport(item)" v-if="item.state==1&&item.fileUrl">提问</view>
-							<view class="gbox-item-bottom-right" style="margin-left: 20rpx;" @click="reviewReport(item)" v-if="item.state==1&&item.fileUrl">查看报告</view>
-							<view class="gbox-item-bottom-right" style="margin-left: 20rpx;" @click="reSendReport(item)" v-if="item.state==-1">重新生成</view>
+							<view class="gbox-item-bottom-right" @click="forwardReport(item)" v-if="item.state==1&&item.fileUrl">发送邮件</view>
+							<view class="gbox-item-bottom-right" style="margin-left: 27rpx;" @click="reviewPdf(item)" v-if="item.state==1">预览报告</view>
+							<view class="gbox-item-bottom-right" style="margin-left: 27rpx;" @click="reviewReport(item)" v-if="item.state==1&&item.fileUrl">查看报告</view>
+							<view class="gbox-item-bottom-right" style="margin-left: 27rpx;" @click="reSendReport(item)" v-if="item.state==-1">重新生成</view>
 						</div>
 						<div class="gbox-item-bottom-rightbox adfac" v-else-if="item.type==2">
-							<view class="gbox-item-bottom-right" @click="reviewPdf(item)" v-if="item.state==1">预览</view>
-							<view class="gbox-item-bottom-right" style="margin-left: 20rpx;" @click="askReport(item)" v-if="item.state==1&&item.fileUrl">提问</view>
-							<view class="gbox-item-bottom-right" style="margin-left: 20rpx;" @click="reviewReport(item)" v-if="item.state==1&&item.fileUrl">查看报告</view>
-							<view class="gbox-item-bottom-right" style="margin-left: 20rpx;" @click="sendReport(item)" v-if="item.state!=-1">发送报告</view>
-							<view class="gbox-item-bottom-right" style="margin-left: 20rpx;" @click="reSendReport(item)" v-if="item.state==-1">重新生成</view>
+							<view class="gbox-item-bottom-right" @click="forwardReport(item)" v-if="item.state==1&&item.fileUrl">发送邮件</view>
+							<view class="gbox-item-bottom-right" style="margin-left: 27rpx;" @click="reviewPdf(item)" v-if="item.state==1">预览报告</view>
+							<view class="gbox-item-bottom-right" style="margin-left: 27rpx;" @click="reviewReport(item)" v-if="item.state==1&&item.fileUrl">查看报告</view>
+							<view class="gbox-item-bottom-right" style="margin-left: 27rpx;" @click="sendReport(item)" v-if="item.state!=-1">发送报告</view>
+							<view class="gbox-item-bottom-right" style="margin-left: 27rpx;" @click="reSendReport(item)" v-if="item.state==-1">重新生成</view>
 						</div>
 					</view>
 				</view>
 			</u-list-item>
 		</u-list>
+		<cus-select-team-user 
+			ref="selectTeamUser" 
+			:show="teamUserShow"
+			:list="teamUserList"
+			@close="handleClose"
+			@changeAll="changeAll"
+			@handleSelectUser="handleSelectUser"
+			@handleConfirm="sendConfirm"
+		></cus-select-team-user>
 	</view>
 </template>
 
 <script>
 	import { getPlatformInfo } from '@/utils/platform.js'; 
+	import CusSelectTeamUser from '@/components/CusSelectTeamUser/index.vue'
 	export default {
 		props:{
 			list:{
@@ -50,6 +61,7 @@
 				default:[]
 			}
 		},
+		components:{ CusSelectTeamUser },
 		data(){
 			return {
 				typeCfg:{
@@ -66,13 +78,109 @@
 					'0':'#FFD750',
 					'1':'#33A7A7',
 					'-1':'#F4657A'
-				}
+				},
+				teamUserShow:false,
+				teamUserList:[],
+				categoryData:[],
+				sendType:1,
+				selectItem:null,
 			}
 		},
 		methods:{
 			scrolltolower(){
 				this.$emit('scrolltolower')
 			},
+			getUserCategoryData(){
+				return new Promise((resolve,reject)=>{
+					this.$api.get('/getListByType/UserCategory').then(({data:res})=>{
+						if(res.code!==0) return this.$showToast(res.msg)
+						this.categoryData = res.data.map(d=>({name:d.dictLabel,id:d.dictValue}))
+						resolve()
+					})
+				})
+			},
+			async forwardReport(item){
+				//发送给账号自己的邮箱
+				if(!uni.getStorageSync('userInfo')||!JSON.parse(uni.getStorageSync('userInfo')).email) return this.$showModal('发送邮件前请先在我的-设置-用户信息中绑定邮箱')
+				uni.showModal({
+					title:'温馨提示',
+					content:`是否确认将“${item.reportName||''}”下的PDF报告文件发送到账号绑定邮箱中？`,
+					confirmText:'确认',
+					success: (res) => {
+						if(res.confirm){
+							this.$api.get(`/core/report/sendToEmail/${item.reportId}`).then(({data:res})=>{
+								if(res.code!==0) return this.$showToast(res.msg)
+								this.$showModal('邮件发送成功，可在绑定的邮箱中查看详细内容。')
+							})
+						}
+					}
+				})
+				
+				// this.sendType = 1;
+				// this.$refs.selectTeamUser.title = '发送邮件'
+				// await this.getUserCategoryData()
+				// this.$api.get(`/core/member/listByQueTeamId/${item.teamQueId}`).then(({data:res})=>{
+				// 	if(res.code!==0) return this.$showToast(res.msg)
+				// 	this.teamUserList = res.data;
+				// 	this.teamUserList.forEach((l,i)=>{
+				// 		l.categoryName = this.categoryData.find(c=>c.id==l.category)?.name;
+				// 		this.$set(this.teamUserList[i],'select',false);
+				// 	})
+				// 	this.teamUserShow = true;
+				// })
+			},
+			handleSelectUser(index){
+				this.$set(this.teamUserList[index],'select',!this.teamUserList[index].select);
+				this.dealNumAndAll()
+			},
+			handleClose(){
+				this.teamUserShow = false;
+				this.initSelectUserComponent();
+			},
+			changeAll(selected){
+				this.teamUserList.forEach((l,i)=>{
+					this.$set(this.teamUserList[i],'select',selected);
+				})
+				this.$refs.selectTeamUser.selectNums = this.teamUserList.filter(l=>l.select).length;
+			},
+			dealNumAndAll(){
+				const selectnum = this.teamUserList.filter(l=>l.select).length;
+				this.$refs.selectTeamUser.selectNums = selectnum;
+				this.$refs.selectTeamUser.selectAll = selectnum === this.teamUserList.length;
+			},
+			sendConfirm(){
+				if(this.teamUserList.filter(t=>t.select).length===0) return this.$showToast('请选择要发送的用户')
+				if(this.sendType===1&&(!uni.getStorageSync('userInfo')||!JSON.parse(uni.getStorageSync('userInfo')).email)) return this.$showModal('发送前请先在我的-设置-用户信息中绑定邮箱')
+				
+				if(this.sendType===1){
+					this.handleClose();
+				} else if(this.sendType===2){
+					const item = JSON.parse(JSON.stringify(this.selectItem));
+					uni.showModal({
+						title:'发送报告',
+						content:`是否确认将“${item.reportName||''}”发送给团队成员`,
+						confirmText:'确认',
+						success: (res) => {
+							if(res.confirm){
+								this.$api.post(`/core/report/sendReport`,{
+									reportId:item.reportId,
+									memberList:this.teamUserList.filter(t=>t.select).map(t=>({id:t.id,mobile:t.mobile,category:t.category}))
+								}).then(({data:res})=>{
+									if(res.code!==0) return this.$showToast(res.msg)
+									this.handleClose();
+									uni.navigateTo({
+										url:'/pagesHome/sendResult?result='+res.code
+									})
+								})
+							}
+						}
+					})
+				}
+			},
+			initSelectUserComponent(){
+				this.$refs.selectTeamUser.selectNums = 0;
+				this.$refs.selectTeamUser.selectAll = false;
+			},
 			reviewPdf(item){
 				let url = `/pagesHome/pdf?reportId=${item.reportId}`;
 				if(item.type==2) url = `/pagesHome/pdfZyb?reportId=${item.reportId}`
@@ -94,21 +202,21 @@
 					url:`/pages/reportAsk?pdfUrl=${item.fileUrl}&fileName=${this.typeCfg[item.type]||'个人版'}-${item.reportName}`
 				})
 			},
-			sendReport(item){
+			async sendReport(item){
 				if(!item.fileUrl) return this.$showModal('该报告尚未生成PDF文件，请等待生成后发送。')
-				uni.showModal({
-					title:'发送报告',
-					content:`是否将“${item.reportName||''}”发送给团队成员`,
-					success: (res) => {
-						if(res.confirm){
-							this.$api.get(`/core/report/sendReport/${item.reportId}`).then(({data:res})=>{
-								if(res.code!==0) return this.$showToast(res.msg)
-								uni.navigateTo({
-									url:'/pagesHome/sendResult?result='+res.code
-								})
-							})
-						}
-					}
+				
+				this.sendType = 2;
+				this.$refs.selectTeamUser.title = '发送报告'
+				this.selectItem = item;
+				await this.getUserCategoryData()
+				this.$api.get(`/core/member/listByQueTeamId/${item.teamQueId}`).then(({data:res})=>{
+					if(res.code!==0) return this.$showToast(res.msg)
+					this.teamUserList = res.data;
+					this.teamUserList.forEach((l,i)=>{
+						l.categoryName = this.categoryData.find(c=>c.id==l.category)?.name;
+						this.$set(this.teamUserList[i],'select',false);
+					})
+					this.teamUserShow = true;
 				})
 			},
 			reSendReport(item){
@@ -156,7 +264,7 @@
 			}
 			
 			&-p{
-				margin-top: 36rpx;
+				margin-top: 32rpx;
 				&>view{
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
@@ -199,6 +307,14 @@
 				}
 			}
 			
+			&-ask{
+				width: 64rpx;
+				height: 64rpx;
+				position: absolute;
+				right: 24rpx;
+				top: 180rpx;
+			}
+			
 			&-bottom{
 				margin-top: 30rpx;
 				border-top: 1rpx solid #EFEFEF;

pagesHome/components/report/receiveList.vue

@@ -19,8 +19,11 @@
 						<view class="rbox-item-p-left">报告时间：</view>
 						<view class="rbox-item-p-right">{{item.createDate||''}}</view>
 					</view>
-					<view class="rbox-item-btn" @click="reviewReport(item)">查看报告</view>
-					<view class="rbox-item-btn ask" @click="askReport(item)">提问</view>
+					<image class="rbox-item-ask" :src="imgBase+'report_ask.png'" @click="askReport(item)"></image>
+					<view class="rbox-item-bottom adfacjb">
+						<view class="gbox-item-bottom-left adfac"></view>
+						<view class="rbox-item-bottom-right" @click="reviewReport(item)">查看报告</view>
+					</view>
 				</view>
 			</u-list-item>
 		</u-list>
@@ -89,7 +92,7 @@
 			margin-top: 20rpx;
 			background: #FFFFFF;
 			border-radius: 24rpx;
-			padding: 40rpx 24rpx;
+			padding: 40rpx 24rpx 10rpx;
 			position: relative;
 			&-top{
 				&-type{
@@ -127,6 +130,38 @@
 					width: calc(100% - 134rpx);
 				}
 			}
+			&-ask{
+				width: 64rpx;
+				height: 64rpx;
+				position: absolute;
+				right: 24rpx;
+				top: 180rpx;
+			}
+			&-bottom{
+				margin-top: 30rpx;
+				border-top: 1rpx solid #EFEFEF;
+				padding-top: 18rpx;
+				&-left{
+					&>view{
+						font-family: PingFangSC, PingFang SC;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #667E90;
+						line-height: 24rpx;
+					}
+				}
+				&-right{
+					padding: 17rpx 20rpx;
+					background: linear-gradient( 90deg, #33A7A7 0%, #4DB2B2 100%);
+					border-radius: 30rpx;
+					font-family: PingFang-SC, PingFang-SC;
+					font-weight: bold;
+					font-size: 24rpx;
+					color: #FFFFFF;
+					line-height: 26rpx;
+					letter-spacing: 2rpx;
+				}
+			}
 			&-btn{
 				padding: 17rpx 20rpx;
 				background: linear-gradient( 90deg, #33A7A7 0%, #4DB2B2 100%);

pagesHome/pdfZyb - 副本.vue

@@ -1,985 +0,0 @@
-<template>
-    <view class="page-wrappe">
-		<cus-header title=' ' bgColor="transparent"></cus-header>
-		<view id="pdfContainer" class="pdf-container" :style="{'transform':'scale('+scale+')', 'height': containerScaledHeight + 'px'}" v-if="reportData">
-			<!-- 封面 -->
-			<view class="cd_box fm2 adffc" style="margin-top: 20px;height: 868px;">
-				<img class="fm2-logo" src="https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/fm_logo.png">
-				<img class="fm2-logo2" src="https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/fm_logo2.png">
-				<img class="fm2-perill" src="https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/fm_perill.png">
-				<view class="fm2-line"></view>
-				<view class="fm2-p">团队发展动态评估报告(团队版)</view>
-				<view class="fm2-texts adf" style="margin-top: 5px;">
-					<view class="fm2-texts-pre adf" style="margin-top: 10px;">
-						<view class="fm2-texts-pre-span">客户名称：</view>
-						<view class="fm2-texts-pre-val">{{ reportData.teamInfo.enterpriseName||'' }}</view>
-					</view>
-					<view class="fm2-texts-pre adf" style="margin-top: 10px;">
-						<view class="fm2-texts-pre-span">团队名称：</view>
-						<view class="fm2-texts-pre-val">{{ reportData.teamInfo.teamName||'' }}</view>
-					</view>
-					<view class="fm2-texts-pre adf" style="margin-top: 10px;">
-						<view class="fm2-texts-pre-span">评估发起人：</view>
-						<view class="fm2-texts-pre-val">{{ reportData.teamInfo.initiator||'' }}</view>
-					</view>
-					<view class="fm2-texts-pre adf" style="margin-top: 10px;">
-						<view class="fm2-texts-pre-span">报告生成时间：</view>
-						<view class="fm2-texts-pre-val">{{ reportData.teamInfo.reportDate||'' }}</view>
-					</view>
-					<view class="fm2-texts-pre adf" style="margin-top: 10px;">
-						<view class="fm2-texts-pre-span">团队类型：</view>
-						<view class="fm2-texts-pre-val">{{ reportData.teamInfo.functionName||'' }}</view>
-					</view>
-					<view class="fm2-texts-pre adf" style="margin-top: 10px;">
-						<view class="fm2-texts-pre-span">团队层级：</view>
-						<view class="fm2-texts-pre-val">{{ reportData.teamInfo.hierarchy||'' }}</view>
-					</view>
-				</view>
-			</view>
-			<!-- 介绍 -->
-			<view class="cd_box">
-				<view class="v2-top adfacjb" :style="{'background-image':'url(https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/intro_title_bg.png)'}">
-					<view class="vt-left" style="color: #FFFFFF;">介绍<span>PERILL团队发展动态评估简介</span></view>
-					<view class="vt-right">PERILL团队发展动态评估报告(团队版)</view>
-				</view>
-				<view class="v2-box">
-					<img class="vb-img1" :src="'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/'+'intro'+'_box_img1.png'">
-					<img class="vb-img2" :src="'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/'+'intro'+'_box_img2.png'">
-					<view class="v2-p">PERILL团队发展动态评估源于团队教练辅导领域的先驱、管理思维与团队绩效领域的权威、全球顶尖团队教练David Clutterbuck教授及其团队通过深入研究，提炼出影响团队绩效的140多个基于实证的因素，整合而成的团队评估和提升工具-PERILL团队发展动态评估。</view>
-					<view class="v2-p" style="margin-top: 8px;">创衡国际基于10多年来在全球与200多家具有前瞻性的国际公司以及国内具有行业代表性公司的合作经验，结合CCMI的PERILL团队发展动态评估工具，在中国推出的团队发展动态评估系统，旨在帮助团队更全面、更有效地从六个维度评估团队的发展现状，为支持团队成为高价值团队提供全景式的客观评估。</view>
-					<view class="v2-p" style="margin-top: 8px;">PERILL团队发展动态评估的主体内容由<span>{{reportData.teamInfo.questionCount||0}}</span>个关于团队的描述组成。</view>
-				</view>
-				<view class="v2-six">
-					<view class="vsix-title">PERILL六大纬度</view>
-					<view class="vsix-p">PERILL团队发展动态评估提供了一个复杂的团队系统概览，它并非针对孤立的问题，也不是简单的优缺点，而是着眼于团队系统的复杂性。它 通过6个影响因素(如下所述)提出问题，以揭示团队系统各要素之间的联系，以及这些联系如何影响团队的高效运作能力。</view>
-					<view class="vsix-boxs">
-						<view class="vsb adfac" v-for="(item,index) in sixWd" :key="index">
-							<img class="vsb-img" :src="item.image"/>
-							<view class="vsb-right">
-								<view class="vsbr-top adfac">
-									<view class="vsbrt-type" :style="{'background':item.color}">{{ item.type }}</view>
-									<view class="vsbrt-title" :style="{'color':item.color}">{{ item.title }}</view>
-								</view>
-								<view class="vsbr-desc">{{ item.desc }}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 总体评估分析 -->
-			<view class="cd_box adffc">
-				<view class="v2-top adfacjb" :style="{'background-image':'url(https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/'+'intro'+'_top_title_bg2.png)'}">
-					<view class="vt-left">总体评估分析</view>
-					<view class="vt-right">PERILL团队发展动态评估报告(团队版)</view>
-				</view>
-				<view class="v2-box" @click="downloadZtzdfxImg">
-					<img class="vb-img1" :src="'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/'+'intro'+'_box_img1.png'">
-					<img class="vb-img2" :src="'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/'+'intro'+'_box_img2.png'">
-					<view class="v2-p2">报告的核心是PERILL团队发展动态评估分析下的整体团队表现。这包括团队在PERILL团队发展动态评估每个关键要素上的综合得分，通过结合得分和置信指数，我们能够展示出高功能领域和低功能域。</view>
-					<view class="v2-p2" style="margin-top: 16px;">下面图中的位置标记显示了团队按主题划分的总分。</view>
-					<view class="vb-category">
-						<view class="vbc-pre adfac">
-							<view class="vbcp-yuan y1"></view>
-							<view class="vbcp-text">团队Leader</view>
-						</view>
-						<view class="vbc-pre adfac">
-							<view class="vbcp-yuan y2"></view>
-							<view class="vbcp-text">团队Member</view>
-						</view>
-						<view class="vbc-pre adfac">
-							<view class="vbcp-yuan y3"></view>
-							<view class="vbcp-text">利益相关方Stakeholder</view>
-						</view>
-						<view class="vbc-pre adfac">
-							<view class="vbcp-yuan y4"></view>
-							<view class="vbcp-text">赞助人Sponsor</view>
-						</view>
-					</view>
-					<view style="width:360px;height:360px;margin: 0 auto;" class="pdfEchart">
-						<l-echart ref="ztzdfxRef" :canvas2d="true" @finished="initZtzdfxChart" style="width: 100%;height: 100%;"></l-echart>
-					</view>
-				</view>
-				<view class="v2-data">
-					<view class="vd-title" :style="{'background-image':'url(https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/'+'intro'+'_title_bg1.png)'}">评估结果</view>
-					<view class="v2-p" v-html="(reportData.totalDiagnosticOutput||'').replaceAll('\n\n','<br>')"></view>
-				</view>
-				<view class="v2-data" style="flex: 1;margin-top: 20px;">
-					<view class="vd-title vt2" :style="{'background-image':'url(https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/'+'intro'+'_title_bg2.png)'}">团队提升&教练建议</view>
-					<view class="v2-p" v-html="(reportData.totalDiagnosisSuggest||'').replaceAll('\n\n','<br>')"></view>
-				</view>
-			</view>
-			<!-- 多维度 -->
-			<canvas type="2d" id="table-canvas" canvas-id="table-canvas" class="offscreen-canvas"></canvas>
-			<template v-if="reportData&&reportData.dimensionAnalysis&&reportData.dimensionAnalysis.length">
-				<view class="cd_box adffc" style="border: none;" :style="{'background-image':'url('+'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/'+typeDict[item.title]+'_bg.png)'}" v-for="(item,index) in reportData.dimensionAnalysis" :key="index">
-					<view class="v2-top adfacjb" :style="{'background-image':'url('+'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/'+typeDict[item.title]+'_title_bg.png)'}">
-						<view class="vt-left" :class="{'black':(item.title=='人际关系'||item.title=='学习')}">{{ item.title }}</view>
-						<view class="vt-right">PERILL团队发展动态评估报告(团队版)</view>
-					</view>
-					<view class="v2-box" :style="{'border':'1px solid '+item.bcolor}">
-						<img class="vb-img1" :src="'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/'+typeDict[item.title]+'_box_img1.png'">
-						<img class="vb-img2" :src="'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/'+typeDict[item.title]+'_box_img2.png'">
-						<view class="v2-p2">{{ item.desc }}</view>
-						<!-- <view class="v2-p2" style="margin-top: 16px;">评分总体分布</view> -->
-						<view class="vb-table" :style="{'border':'1px solid '+item.bcolor,'margin-top':'22px'}">
-							<view class="vbt-th adfac" :class="{'black':(item.title=='人际关系'||item.title=='学习')}" :style="{'background':item.thcolor}">
-								<view class="vbtt-w1">主题</view>
-								<view class="vbtt-w2">最低分</view>
-								<view class="vbtt-w2">平均分</view>
-								<view class="vbtt-w2">最高分</view>
-								<view class="vbtt-w3">问卷陈述</view>
-							</view>
-							<view class="vbt-pre adfac" v-for="(ss,si) in item.scoreSpreads" :key="si">
-								<view class="vbtp-left vbtt-w1 adfacjc" :class="{'black':(item.title=='人际关系'||item.title=='学习'||item.title=='内部流程及系统与架构')}" :style="{'background':item.titlecolor,'padding':'0 16px'}">{{ ss.theme||'' }}</view>
-								<view class="vbtp-num vbtt-w2" :style="{'border-bottom':'1px solid '+item.bcolor}">{{ ss.minScore||0 }}</view>
-								<view class="vbtp-num vbtt-w2 green" :style="{'border-bottom':'1px solid '+item.bcolor}">{{ ss.avgScore||0 }}</view>
-								<view class="vbtp-num vbtt-w2" :style="{'border-bottom':'1px solid '+item.bcolor}">{{ ss.maxScore||0 }}</view>
-								<view class="vbtp-desc" :style="{'border-bottom':'1px solid '+item.bcolor}">
-									<view class="vbtpd-title">{{ ss.question||'' }}</view>
-									<view class="xr_tb adfac">
-										<view class="xt_pre p1"></view>
-										<view class="xt_pre p2"></view>
-										<view class="xt_pre p3"></view>
-										<view class="xt_score adfac" :style="{'left':ss.left,'width':(((ss.maxScore>25?25:ss.maxScore)-(ss.minScore>25?25:ss.minScore))*4)+'%'}">
-											<view class="xts_num adfacjc red">{{ ss.minScore>25?25:ss.minScore }}</view>
-											<view class="xts_box"></view>
-											<view class="xts_num adfacjc green">{{ ss.maxScore>25?25:ss.maxScore }}</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="v2-data" :style="{'border':'1px solid '+item.bcolor}">
-						<view class="vd-title vt3" :class="{'black':(item.title=='人际关系'||item.title=='学习')}" :style="{'background-image':'url(https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/'+typeDict[item.title]+'_title_bg1.png)'}">评估结果</view>
-						<view class="adfac">
-							<view class="v2-p3" style="width: 76px;">纬度得分</view>
-							<view class="vd-wd adfac" :style="{'background':item.wddf}">
-								<view class="vdwd-pre">维度加权总分：<span>{{ item.weightedTotal||0 }}</span><span>/{{ item.weightedTotalFull||0 }}</span></view>
-								<view class="vdwd-pre vp">维度同意度总分（未加权）：<span>{{ item.consentTotal||0 }}</span><span>/{{ item.consentTotalFull||0 }}</span></view>
-								<view class="vdwd-pre">维度权重：<span>{{ item.weight||0 }}</span><span>/{{ item.weightFull||0 }}</span></view>
-							</view>
-						</view>
-						<view class="v2-p" style="margin-top: 8px;" v-html="(item.diagnosisOutput||'').replaceAll('\n\n','<br>')"></view>
-					</view>
-					<view class="v2-data" :style="{'border':'1px solid '+item.bcolor}" style="flex: 1;margin-top: 15px;">
-						<view class="vd-title vt3" :class="{'black':(item.title=='人际关系'||item.title=='学习')}" :style="{'background-image':'url(https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/'+typeDict[item.title]+'_title_bg1.png)'}">评估建议</view>
-						<view class="v2-p" v-html="(item.diagnosisSuggest||'').replaceAll('\n\n','<br>')"></view>
-					</view>
-				</view>
-			</template>
-		</view>
-		<view class="pdf_btn" @click="createPdf">生成PDF</view>
-		<view class="loading adffcacjc" v-if="isLoading">
-			<u-loading-icon text="数据加载中，请耐心等待" :vertical="true" size="72" color="#FFFFFF" textSize="32" textColor="#FFFFFF"></u-loading-icon>
-		</view>
-   </view>
-</template>
-
-<script name="">
-	import { BaseApi } from '@/http/baseApi.js';
-	import * as echarts from '@/pagesHome/components/lime-echart/static/echarts.min.js'
-	import lEchart from '@/pagesHome/components/lime-echart/components/l-echart/l-echart.vue'
-    
-    export default {
-        name: 'ZtzdfxChart',
-		components:{ lEchart },
-        data() {
-        return {
-			isLoading: true,
-			reportId:'',
-			reportData: null,
-			isChartReady: false,
-			scale:1,
-			originalContainerHeight: 0,
-			containerScaledHeight: 'auto', 
-            typeDict: {
-				'宗旨与动机': 'zzdj',
-				'外部流程及系统与架构': 'wbjg',
-				'人际关系': 'rjgx',
-				'内部流程及系统与架构': 'nbjg',
-				'学习': 'xx',
-				'领导力': 'ldl'
-            },
-            sixWd: [
-				{
-				  image: 'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/intro_img_p.png',
-				  type: 'P',
-				  title: '宗旨与动机',
-				  desc: '指团队共享的目的和存在的意义, 包含对共同的愿景，目标和优先级的清晰度。',
-				  color: '#761E6A'
-				},
-				{
-				  image: 'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/intro_img_e.png',
-				  type: 'E',
-				  title: '外部流程、系统与结构',
-				  desc: '指团队与其外部利益相关者 - 客户，供应商，股东，组织内的其他团队等的互动关联。',
-				  color: '#009191'
-				},
-				{
-				  image: 'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/intro_img_r.png',
-				  type: 'R',
-				  title: '人际关系',
-				  desc: '指团队成员如何共同工作–他们是否相互尊重对方的能力，足够心理安全以能够坦诚相对，真正关心彼此的幸福感。',
-				  color: '#FFD750'
-				},
-				{
-				  image: 'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/intro_img_i.png',
-				  type: 'I',
-				  title: '内部流程、系统与结构',
-				  desc: '指团队如何管理工作流程，互相支持和高质量的沟通和决策（包括工作任务和团队感情）。',
-				  color: '#4EB2B2'
-				},
-				{
-				  image: 'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/intro_img_l.png',
-				  type: 'L',
-				  title: '学习',
-				  desc: '指团队应对多变的环境和保持持续的进步和成长的能力。团队如何提高绩效（如何完成今天的任务）、能力（如何提高技能和资源以处理明天的任务）和容量（长期的愿景， 如何用更少的资源做更多的事情）',
-				  color: '#AFCDF5'
-				},
-				{
-				  image: 'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/intro_img_l2.png',
-				  type: 'L',
-				  title: '领导力',
-				  desc: '指团队认为需要怎样的领导行为能够让他们，作为个人或者团队做到最好。团队可以和他们的领导者讨论他们的责任，以帮助领导者成为他们需要的领导者。',
-				  color: '#002846'
-				}
-            ],
-			pdfImages:[],
-		};
-    },
-	onLoad(options) {
-		this.reportId = options.reportId;
-		this.getReportData();
-	},
-    mounted() {
-		this.calculateScaleAndPosition();
-		uni.onWindowResize(() => {
-			this.calculateScaleAndPosition();
-		});
-    },
-    methods: {
-		getReportData(){
-			this.$api.get(`/core/report/previewReport/${this.reportId}`).then(async ({data:res})=>{
-				if(res.code!==0) return this.$showToast(res.msg)
-				this.reportData = res.data;
-				
-				const tempDimensionAnalysis = [
-					{title:'宗旨与动机',bcolor:'#E4D2E1',thcolor:'#761E6A',titlecolor:'#BA8EB4',wddf:'linear-gradient( 90deg, #F5EFF5 0%, #FAF2F9 100%)',
-						desc:`「宗旨与动机」维度，我们旨在探究是否存在一个清晰的存在理由和明确的方向，能够激发团队成员的动力并吸引他们的想象力，以及个人与集体的身份认同是否围绕共同的目标，并达成一致。`},
-					{title:'外部流程及系统与架构',bcolor:'#B3DEDE',thcolor:'#009191',titlecolor:'#80C8C8',wddf:'linear-gradient( 90deg, #E8F5F5 0%, #F0F8F8 100%)',
-						desc:`「外部流程、系统与结构」维度，我们旨在探究团队如何与各种利益相关者互动，他们与团队的利益相关方各自如何寻求了解对方，以及现有系统和流程的有效性，以帮助管理不同的期望和需求。`},
-					{title:'人际关系',bcolor:'#FFDF73',thcolor:'#FFD750',titlecolor:'#FFEBA8',wddf:'linear-gradient( 90deg, rgba(255,215,80,0.34) 0%, rgba(251,225,130,0.09) 100%)',
-						desc:`「人际关系」维度，我们旨在探究团队成员如何相互交流、信任程度、尊重和关心的程度，以及团队成员之间的关系如何促进（或破坏）协作。`},
-					{title:'内部流程及系统与架构',bcolor:'#B3DEDE',thcolor:'#4EB2B2',titlecolor:'#CDE9EA',wddf:'linear-gradient( 90deg, #E8F5F5 0%, #F0F8F8 100%)',
-						desc:`「内部流程、系统与结构」维度，我们旨在探究团队如何在平衡责任与自主权方面进行协作。我们关注团队的敏捷程度、沟通方式以及决策过程的有效性。`},
-					{title:'学习',bcolor:'#C7DCF8',thcolor:'#AFCDF5',titlecolor:'#D7E5FA',wddf:'linear-gradient( 270deg, #F2F5F9 0%, #E3ECF8 100%)',
-						desc:`「学习」维度，我们旨在探究团队如何提高其绩效、技能和资源以应对当前和未来的任务。我们还希望了解团队如何管理能力和提高效率。`},
-					{title:'领导力',bcolor:'#E6EAED',thcolor:'#002846',titlecolor:'#8093A3',wddf:'linear-gradient( 270deg, #F2F4F6 0%, #EDF0F2 100%)',
-						desc:`「领导力」维度，我们旨在探究领导素质和行为如何对团队功能和其他因素产生调节影响，以及这是积极的还是消极的。`}
-				]
-				this.reportData.dimensionAnalysis.forEach((d,i)=>{
-					d.scoreSpreads.forEach(s=>{
-						if((s.minScore+'').length>2) s.minScore = (s.minScore||0).toFixed(2)
-						if((s.maxScore+'').length>2) s.maxScore = (s.maxScore||0).toFixed(2)
-						if((s.avgScore+'').length>2) s.avgScore = (s.avgScore||0).toFixed(2)
-						s.theme = s.theme.replaceAll('，','').replaceAll(',','');
-						s.range = [s.minScore>25?25:s.minScore,s.maxScore>25?25:s.maxScore];
-						if(s.minScore==0) s.left = '0%';
-						else if(s.minScore>=25) s.left = 'calc(100% - 48px)';
-						else s.left = s.minScore*4+'%';
-					})
-					this.reportData.dimensionAnalysis[i] = {...d,...tempDimensionAnalysis[i]}
-				})
-				
-				// 【关键逻辑】在数据渲染后，开始预加载图片
-				await this.$nextTick(); // 确保DOM更新完毕
-
-				try {
-					const imageUrls = this.collectImageUrls();
-					const results = await this.preloadAllImages(imageUrls);
-					
-					// (可选) 检查加载结果并上报或提示
-					const failedImages = results
-						.filter(result => result.status === 'rejected')
-						.map(result => result.reason.url); // 获取加载失败的图片URL
-
-					if (failedImages.length > 0) {
-						console.error(`加载失败的图片 (重试3次后):`, failedImages);
-						this.$showToast('部分图片资源加载失败');
-					} else {
-						console.log('所有依赖的图片已加载完成!');
-					}
-
-				} catch (error) {
-					// Promise.allSettled 本身不应该抛出错误，这里作为保险
-					console.error('预加载过程中发生意外错误:', error);
-				} finally {
-					// 无论成功或失败，最后都隐藏loading
-					this.isLoading = false; 
-				}
-			}).catch(err => {
-				// 网络请求失败等情况
-				console.error('获取报告数据失败:', err);
-				this.isLoading = false;
-				this.$showToast('获取报告数据失败，请检查网络');
-			});
-		},
-		/**
-		 * @description 新增：收集页面上所有需要预加载的图片URL
-		 * @returns {Array<string>} 包含所有图片URL的数组
-		 */
-		collectImageUrls() {
-			// 使用 Set 来自动去重
-			const imageUrls = new Set();
-			const baseUrl = 'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/versionTwo/';
-			
-			// 1. 静态图片 (封面、介绍等)
-			imageUrls.add(baseUrl + 'fm_logo.png');
-			imageUrls.add(baseUrl + 'fm_logo2.png');
-			imageUrls.add(baseUrl + 'fm_perill.png');
-			imageUrls.add(baseUrl + 'intro_title_bg.png');
-			imageUrls.add(baseUrl + 'intro_box_img1.png');
-			imageUrls.add(baseUrl + 'intro_box_img2.png');
-			imageUrls.add(baseUrl + 'intro_top_title_bg2.png');
-			imageUrls.add(baseUrl + 'intro_title_bg1.png');
-			imageUrls.add(baseUrl + 'intro_title_bg2.png');
-			
-			// 2. sixWd 数组中的图片
-			this.sixWd.forEach(item => imageUrls.add(item.image));
-
-			// 3. ECharts 雷达图背景
-			imageUrls.add(baseUrl + 'six_chart_bg.png');
-
-			// 4. 动态生成的多维度图片
-			if (this.reportData && this.reportData.dimensionAnalysis) {
-				this.reportData.dimensionAnalysis.forEach(item => {
-					const typeKey = this.typeDict[item.title];
-					if (typeKey) {
-						imageUrls.add(baseUrl + typeKey + '_bg.png');
-						imageUrls.add(baseUrl + typeKey + '_title_bg.png');
-						imageUrls.add(baseUrl + typeKey + '_box_img1.png');
-						imageUrls.add(baseUrl + typeKey + '_box_img2.png');
-						imageUrls.add(baseUrl + typeKey + '_title_bg1.png');
-					}
-				});
-			}
-			
-			console.log(`[Preload] 收集到 ${imageUrls.size} 个待加载的图片URL`);
-			return Array.from(imageUrls); // 将 Set 转换为数组
-		},
-
-		/**
-		 * @description 【新增】带重试逻辑的单个图片加载器
-		 * @param {string} url 图片URL
-		 * @param {number} maxRetries 最大重试次数
-		 * @returns {Promise} 成功时 resolve, 彻底失败时 reject
-		 */
-		loadImageWithRetry(url, maxRetries = 5) {
-			return new Promise((resolve, reject) => {
-				let attempts = 0;
-
-				const tryLoad = () => {
-					attempts++;
-					uni.getImageInfo({
-						src: url,
-						success: (res) => {
-							// console.log(`图片加载成功: ${url} (尝试次数: ${attempts})`);
-							resolve(res);
-						},
-						fail: (err) => {
-							console.warn(`图片加载失败: ${url} (尝试次数: ${attempts}/${maxRetries})`);
-							if (attempts < maxRetries) {
-								// 稍作延迟后重试，避免立即请求导致服务器压力
-								setTimeout(tryLoad, 300); 
-							} else {
-								// 达到最大重试次数，彻底失败
-								console.error(`图片彻底加载失败: ${url}`);
-								reject({ url, error: err }); // reject时返回包含url的对象，方便追踪
-							}
-						}
-					});
-				};
-
-				tryLoad();
-			});
-		},
-		
-		/**
-		 * @description 【优化】预加载所有图片，并处理重试逻辑
-		 * @param {Array<string>} urls 图片URL数组
-		 * @returns {Promise<Array<Object>>} 返回 Promise.allSettled 的结果数组
-		 */
-		preloadAllImages(urls) {
-			const promises = urls.map(url => this.loadImageWithRetry(url, 5));
-			// 使用 Promise.allSettled
-			// 它会等待所有 Promise 完成（无论是 resolve还是reject）
-			// 这样即使有图片加载失败，也不会中断整个过程
-			return Promise.allSettled(promises);
-		},
-					
-		async createPdf(){
-		    uni.showLoading({
-		        title:'正在生成PDF所需的图片...'
-		    })
-		    try {
-		        const ztzdfxImgPromise = this.downloadZtzdfxImg();
-		        const dimensionImagePromises = this.reportData.dimensionAnalysis.map(d => {
-		            return this.generateTableImage(d,d.scoreSpreads);
-		        });
-		
-		        const allImageUrls = await Promise.all([
-		            ztzdfxImgPromise, 
-		            ...dimensionImagePromises
-		        ]);
-		        this.pdfImages = allImageUrls;
-				
-				this.$api.post('/core/report/reportToPdf',{
-					images:this.pdfImages,
-					reportId:this.reportId
-				}).then(({data:res})=>{
-					if(res.code!==0) return this.$showToast(res.msg)
-					uni.hideLoading();
-					this.$showToast('生成成功');
-					setTimeout(()=>{
-						uni.redirectTo({
-							url:'/pagesHome/report'
-						})
-					},1500)
-				})
-		    } catch (error) {
-		        uni.hideLoading();
-		        console.error('生成图片过程中发生错误:', error);
-		        uni.showToast({ title: '生成图片失败，请重试', icon: 'none' });
-		    }
-		},
-		/**
-		 * @description 使用 Canvas 绘制表格并生成图片
-		 * @param {Object} dimensionData 维度数据
-		 * @param {Array} tableData 表格数据
-		 * @returns {Promise<string>} 返回生成的图片临时文件路径
-		 */
-		generateTableImage(dimensionData, tableData) {
-			return new Promise((resolve, reject) => {
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#table-canvas')
-					.fields({ node: true, size: true })
-					.exec(async (res) => {
-						if (!res || !res[0] || !res[0].node) {
-							return reject('获取Canvas节点失败');
-						}
-						
-						const canvasNode = res[0].node;
-						const ctx = canvasNode.getContext('2d');
-						const dpr = uni.getSystemInfoSync().pixelRatio;
-		
-						// --- 1. 定义布局和尺寸常量
-						const TABLE_WIDTH = 548;
-						const HEADER_HEIGHT = 38;
-						const ROW_HEIGHT = 49;
-						const FONT_FAMILY = 'sans-serif';
-						const COL_WIDTHS = { theme: 72, min: 49, avg: 49, max: 49, statement: 329 };
-						const COL_POSITIONS = {
-							theme: 0,
-							min: COL_WIDTHS.theme,
-							avg: COL_WIDTHS.theme + COL_WIDTHS.min,
-							max: COL_WIDTHS.theme + COL_WIDTHS.min + COL_WIDTHS.avg,
-							statement: COL_WIDTHS.theme + COL_WIDTHS.min * 3
-						};
-		
-						const CANVAS_HEIGHT = HEADER_HEIGHT + tableData.length * ROW_HEIGHT;
-						const CANVAS_WIDTH = TABLE_WIDTH;
-						
-						canvasNode.width = CANVAS_WIDTH * dpr;
-						canvasNode.height = CANVAS_HEIGHT * dpr;
-						ctx.scale(dpr, dpr);
-						
-						ctx.fillStyle = '#FFFFFF';
-						ctx.fillRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT);
-						ctx.strokeStyle = dimensionData.bcolor;
-						ctx.lineWidth = 1;
-						ctx.strokeRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT);
-		
-						// --- 4. 绘制表头 ---
-						const isBlackHeader = (dimensionData.title == '人际关系'||dimensionData.title == '学习');
-						ctx.fillStyle = dimensionData.thcolor;
-						ctx.fillRect(1, 1, CANVAS_WIDTH - 2, HEADER_HEIGHT - 1);
-						ctx.fillStyle = isBlackHeader ? '#002846' : '#FFFFFF';
-						ctx.font = `bold 10px ${FONT_FAMILY}`;
-						ctx.textAlign = 'center';
-						ctx.textBaseline = 'middle';
-						
-						ctx.fillText('主题', COL_POSITIONS.theme + COL_WIDTHS.theme / 2, HEADER_HEIGHT / 2);
-						ctx.fillText('最低分', COL_POSITIONS.min + COL_WIDTHS.min / 2, HEADER_HEIGHT / 2);
-						ctx.fillText('平均分', COL_POSITIONS.avg + COL_WIDTHS.avg / 2, HEADER_HEIGHT / 2);
-						ctx.fillText('最高分', COL_POSITIONS.max + COL_WIDTHS.max / 2, HEADER_HEIGHT / 2);
-						ctx.fillText('问卷陈述', COL_POSITIONS.statement + COL_WIDTHS.statement / 2, HEADER_HEIGHT / 2);
-		
-						// --- 5. 循环绘制每一行---
-						tableData.forEach((row, index) => {
-							const y = HEADER_HEIGHT + index * ROW_HEIGHT;
-							
-							const isBlackLeftTitle = (dimensionData.title == '人际关系' || dimensionData.title == '学习' || dimensionData.title == '内部流程及系统与架构');
-							ctx.fillStyle = dimensionData.titlecolor;
-							ctx.fillRect(1, y, COL_WIDTHS.theme - 1, ROW_HEIGHT);
-							
-							// 绘制主题文字
-							ctx.textAlign = 'center';
-							ctx.textBaseline = 'middle';
-							ctx.fillStyle = isBlackLeftTitle ? '#002846' : '#FFFFFF';
-							ctx.font = `10px ${FONT_FAMILY}`;
-							this.drawWrappedText(ctx, row.theme, COL_POSITIONS.theme + COL_WIDTHS.theme / 2, y + ROW_HEIGHT / 2, 12, COL_WIDTHS.theme - 32);
-
-							// 绘制主题单元格的白色下边框
-							ctx.strokeStyle = '#FFFFFF';
-							ctx.lineWidth = 1;
-							ctx.beginPath();
-							ctx.moveTo(1, y + ROW_HEIGHT - 1);
-							ctx.lineTo(COL_WIDTHS.theme - 1, y + ROW_HEIGHT - 1);
-							ctx.stroke();
-		
-							// 绘制其他单元格的下边框
-							ctx.strokeStyle = dimensionData.bcolor;
-							['min', 'avg', 'max', 'statement'].forEach(key => {
-								ctx.beginPath();
-								ctx.moveTo(COL_POSITIONS[key], y + ROW_HEIGHT);
-								ctx.lineTo(COL_POSITIONS[key] + COL_WIDTHS[key], y + ROW_HEIGHT);
-								ctx.stroke();
-							});
-							
-							const minScore = ((row.minScore||0)+'').length>2?Number(row.minScore||0).toFixed(2):row.minScore;
-							const avgScore = ((row.avgScore||0)+'').length>2?Number(row.avgScore||0).toFixed(2):row.avgScore;
-							const maxScore = ((row.maxScore||0)+'').length>2?Number(row.maxScore||0).toFixed(2):row.maxScore;
-							ctx.font = `bold 14px ${FONT_FAMILY}`;
-							ctx.fillStyle = '#667E90';
-							ctx.fillText(minScore, COL_POSITIONS.min + COL_WIDTHS.min / 2, y + ROW_HEIGHT / 2);
-							ctx.fillStyle = '#27AE60';
-							ctx.fillText(avgScore, COL_POSITIONS.avg + COL_WIDTHS.avg / 2, y + ROW_HEIGHT / 2);
-							ctx.fillStyle = '#667E90';
-							ctx.fillText(maxScore, COL_POSITIONS.max + COL_WIDTHS.max / 2, y + ROW_HEIGHT / 2);
-							
-							// 5.3 绘制问卷陈述列
-							const statementX = COL_POSITIONS.statement;
-							const statementPadding = 10;
-							ctx.textAlign = 'left';
-							ctx.textBaseline = 'top';
-							ctx.fillStyle = '#193D59';
-							ctx.font = `9px ${FONT_FAMILY}`;
-							this.drawWrappedText(ctx, row.question, statementX + statementPadding, y + 8, 10, COL_WIDTHS.statement - statementPadding * 2);
-							
-							// 绘制范围指示器
-							const rangeBarY = y + 33;
-							const rangeBarWidth = COL_WIDTHS.statement - statementPadding * 2;
-							const rangeBarHeight = 4;
-							const rangeBarX = statementX + statementPadding;
-		
-							// 绘制三段色背景
-							const segWidth = rangeBarWidth / 3;
-							ctx.fillStyle = '#BA8EB4';
-							ctx.fillRect(rangeBarX, rangeBarY, segWidth, rangeBarHeight);
-							ctx.fillStyle = '#66BDBD';
-							ctx.fillRect(rangeBarX + segWidth, rangeBarY, segWidth, rangeBarHeight);
-							ctx.fillStyle = '#AFCDF5';
-							ctx.fillRect(rangeBarX + segWidth * 2, rangeBarY, segWidth, rangeBarHeight);
-		
-							// --- 开始绘制滑块 ---
-							const scaleFactor = rangeBarWidth / 25; 
-							const minVal = row.range[0];
-							const maxVal = row.range[1];
-							const rangeLeft = minVal * scaleFactor;
-							const rangeWidth = (maxVal - minVal) * scaleFactor;
-							
-							// 绘制中间的连接条
-							const connectorY = rangeBarY - (8 - rangeBarHeight) / 2;
-							const connectorHeight = 8;
-							ctx.fillStyle = '#199C9C';
-							ctx.fillRect(rangeBarX + rangeLeft, connectorY, rangeWidth, connectorHeight);
-		
-							// 绘制左右数字框
-							const numBoxPadding = { h: 7, v: 4 };
-							const numBoxFont = `bold 12px ${FONT_FAMILY}`;
-							
-							// 封装一个绘制数字框的函数
-							const drawNumberBox = (text, side) => {
-								ctx.font = numBoxFont;
-								const metrics = ctx.measureText(text);
-								const boxWidth = metrics.width + numBoxPadding.h * 2;
-								const boxHeight = 12 + numBoxPadding.v * 2;
-								
-								const value = parseFloat(text);
-								const centerPointX = rangeBarX + value * scaleFactor;
-								let x;
-								
-								// 核心逻辑：判断两值是否相等
-								if (minVal === maxVal) {
-									// 如果相等，左右滑块并排显示，整体居中
-									if (side === 'left') {
-										x = centerPointX - boxWidth;
-									} else { // 'right'
-										x = centerPointX;
-									}
-
-									// --- 边界检查（针对组合滑块）---
-									let combinedLeftX = centerPointX - boxWidth;
-									if (combinedLeftX < rangeBarX) {
-										const shift = rangeBarX - combinedLeftX;
-										x += shift; // 将两个滑块一起向右移动
-									}
-									let combinedRightX = centerPointX + boxWidth;
-									if (combinedRightX > rangeBarX + rangeBarWidth) {
-										const shift = combinedRightX - (rangeBarX + rangeBarWidth);
-										x -= shift; // 将两个滑块一起向左移动
-									}
-
-								} else {
-									// 如果不相等，各自居中显示
-									x = centerPointX - boxWidth / 2;
-
-									// --- 边界检查（针对单个滑块）---
-									if (x < rangeBarX) {
-										x = rangeBarX;
-									}
-									if (x + boxWidth > rangeBarX + rangeBarWidth) {
-										x = rangeBarX + rangeBarWidth - boxWidth;
-									}
-								}
-								
-								const boxY = connectorY + (connectorHeight - boxHeight) / 2;
-								
-								// 绘制阴影
-								ctx.shadowColor = 'rgba(118, 30, 106, 0.08)';
-								ctx.shadowBlur = 10;
-								ctx.shadowOffsetY = 4;
-								
-								// 绘制圆角矩形背景
-								ctx.fillStyle = '#FFFFFF';
-								ctx.beginPath();
-								ctx.moveTo(x + 4, boxY);
-								ctx.arcTo(x + boxWidth, boxY, x + boxWidth, boxY + boxHeight, 4);
-								ctx.arcTo(x + boxWidth, boxY + boxHeight, x, boxY + boxHeight, 4);
-								ctx.arcTo(x, boxY + boxHeight, x, boxY, 4);
-								ctx.arcTo(x, boxY, x + boxWidth, boxY, 4);
-								ctx.closePath();
-								ctx.fill();
-								
-								// 重置阴影
-								ctx.shadowColor = 'transparent';
-								ctx.shadowBlur = 0;
-								ctx.shadowOffsetY = 0;
-								
-								// 绘制边框
-								ctx.strokeStyle = 'rgba(131, 52, 120, 0.19)';
-								ctx.lineWidth = 1;
-								ctx.stroke();
-								
-								// 绘制文字
-								ctx.fillStyle = side === 'left' ? '#904A87' : '#199C9C';
-								ctx.textAlign = 'center';
-								ctx.textBaseline = 'middle';
-								ctx.fillText(text, x + boxWidth / 2, boxY + boxHeight / 2);
-							};
-							
-							drawNumberBox(minVal.toString(), 'left');
-							drawNumberBox(maxVal.toString(), 'right');
-						});
-						
-						// --- 6. 生成图片文件 ---
-						uni.canvasToTempFilePath({
-							canvas: canvasNode,
-							success: async (result) => {
-								const fileurl = await this.uploadFilePromise(result.tempFilePath);
-								resolve(fileurl);
-							},
-							fail: (err) => {
-								console.error('图片生成失败', err);
-								uni.showToast({ title: '图片生成失败', icon: 'none' });
-								reject(err);
-							}
-						}, this);
-					});
-			});
-		},
-		/**
-		 * @description 辅助函数：在Canvas中绘制可自动换行的文本
-		 * @param {CanvasRenderingContext2D} ctx
-		 * @param {string} text 要绘制的文本
-		 * @param {number} x 起始x坐标
-		 * @param {number} y 起始y坐标（对于居中对齐，这是中心y；对于top对齐，这是第一行的y）
-		 * @param {number} lineHeight 行高
-		 * @param {number} maxWidth 最大宽度
-		 */
-		drawWrappedText(ctx, text, x, y, lineHeight, maxWidth) {
-			let words = text.split('');
-			let line = '';
-			let lines = [];
-
-			for (let n = 0; n < words.length; n++) {
-				let testLine = line + words[n];
-				let metrics = ctx.measureText(testLine);
-				if (metrics.width > maxWidth && n > 0) {
-					lines.push(line);
-					line = words[n];
-				} else {
-					line = testLine;
-				}
-			}
-			lines.push(line);
-
-			let startY;
-			if (ctx.textBaseline === 'middle') {
-				startY = y - (lineHeight * (lines.length - 1)) / 2;
-			} else { // top
-				startY = y;
-			}
-			
-			for (let i = 0; i < lines.length; i++) {
-				ctx.fillText(lines[i], x, startY + (i * lineHeight));
-			}
-		},
-		calculateScaleAndPosition() {
-		    uni.getSystemInfo({
-				success: (res) => {
-				    const screenWidth = res.windowWidth; // 手机屏幕的宽度
-				    const pcContentWidth = 630; // PC端内容的原始宽度
-				    this.scale = screenWidth / pcContentWidth;
-				    this.$nextTick(() => {
-						if (this.$refs.ztzdfxRef) {
-							this.initZtzdfxChart();
-						}
-					});
-				}
-		    });
-		},
-		calculatePdfContainerHeight() {
-			uni.createSelectorQuery().in(this).select('#pdfContainer').boundingClientRect(rect => {
-				if (rect) {
-					this.originalContainerHeight = rect.height;
-					this.containerScaledHeight = this.originalContainerHeight * this.scale;
-					// console.log('原始高度:', this.originalContainerHeight, '缩放比例:', this.scale, '缩放后高度:', this.containerScaledHeight);
-				}
-			}).exec();
-		},
-		downloadZtzdfxImg(){
-			return new Promise(resolve=>{
-				if (!this.isChartReady) return console.log('图表尚未准备好');
-				
-				const chartRef = this.$refs.ztzdfxRef;
-				if (!chartRef) return console.log('无法找到图表组件');
-				
-				chartRef.canvasToTempFilePath({
-					success: async (res) => {
-						const imgUrl = await this.uploadFilePromise(res.tempFilePath);
-						console.log(imgUrl,'imgUrl');
-						resolve(imgUrl)
-					},
-					fail: (err) => {
-						console.log('生成图片失败:', err);
-					}
-				});
-			})
-		},
-		uploadFilePromise(url) {
-		  return new Promise((resolve, reject) => {
-		    let a = uni.uploadFile({
-		      url: BaseApi+'/uploadFile',
-		      filePath: url,
-		      name: 'file',
-		      success: (res) => {
-		        setTimeout(() => {
-					let data = JSON.parse(res.data)
-					if(data&&data.code===0){
-						resolve(data.data);
-					}else this.$showToast(data?.msg)
-		        }, 1000);
-		      },
-			  fail: err =>{
-				resolve('');
-			  }
-		    });
-		  });
-		},
-		async initZtzdfxChart() {
-			let dataSum = this.reportData.overall.length*this.reportData.overall[0].themeTotalSpreads.length;
-			const leaderData = [],memberData = [],stakeholderData=[],sponsorData=[];
-			const overall = this.reportData.overall||[];
-			overall.forEach(o=>{
-				let themeTotalSpreads = o.themeTotalSpreads||[];
-				if(['内部流程、系统与结构','学习','领导力'].includes(o.dimension)) themeTotalSpreads = o.themeTotalSpreads.reverse()||[];
-				themeTotalSpreads.forEach(t=>{
-					leaderData.push(t.scoreLeader||0);
-					memberData.push(t.scoreMember||0);
-					stakeholderData.push(t.scoreStakeholder||0);
-					sponsorData.push(t.scoreSponsor||0);
-				})
-			})
-			const sumArr = leaderData.concat(memberData).concat(stakeholderData).concat(sponsorData);
-			const maxValue = sumArr.reduce((a,b)=>Math.max(a,b));
-			const minValue = sumArr.reduce((a,b)=>Math.min(a,b));
-
-            const chart = await this.$refs.ztzdfxRef.init(echarts);
-            let option = {
-				graphic: [
-					{
-						type: 'image',	
-						id: 'radar-bg',
-						z: -1,
-						bounding: 'raw',
-						left: 'center',
-						top: 'center',
-						style: {
-							image:'https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/six_chart_bg.png',
-							width: 360*this.scale-20,
-							height: 360*this.scale-20,
-							opacity: 1
-						}
-					},
-					{
-						type: 'circle',
-						z: 100, // 设置一个较高的 z 值，确保它在最顶层
-						left: 'center', // 水平居中
-						top: 'center',  // 垂直居中
-						shape: {
-							r: 12*this.scale // 圆形的半径，您可以根据需要调整大小
-						},
-						style: {
-							fill: '#FFFFFF', // 填充色为白色
-							shadowBlur: 20*this.scale,  // 阴影的模糊范围
-							shadowColor: 'rgba(0, 0, 0, 0.15)', // 阴影颜色
-							shadowOffsetY: 4*this.scale // 向下的阴影偏移，产生悬浮效果
-						}
-					}
-				],
-				radar: {
-					// shape: 'circle',
-					indicator: new Array(dataSum).fill({ max:maxValue, min:minValue }),
-					axisName: {
-						show: false
-					},
-					splitArea:{
-					show:false
-					},
-					splitLine: {
-					show: false
-					},
-					axisLine: {
-					show: false
-					},
-					startAngle: 95
-				},
-				series: [
-					{
-						type: 'radar',
-						data: [
-							{
-								value: sponsorData,
-								itemStyle: {
-									color: '#012846'
-								},
-								lineStyle: {
-									color: '#012846',
-									width:1.5
-								},
-								areaStyle: {
-									color: 'rgba(255, 255, 255, 0.4)'
-								},
-								symbolSize: 3
-							},
-							{
-								value: stakeholderData,
-								itemStyle: {
-									color: '#FFD650'
-								},
-								lineStyle: {
-									color: '#FFD650',
-									width:1.5
-								},
-								areaStyle: {
-									color: 'rgba(255, 255, 255, 0.4)'
-								},
-								symbolSize: 3
-							},
-							{
-								value: memberData,
-								itemStyle: {
-									color: '#AFCDF5'
-								},
-								lineStyle: {
-									color: '#AFCDF5',
-									width:1.5
-								},
-								areaStyle: {
-									color: 'rgba(255, 255, 255, 0.4)'
-								},
-								symbolSize: 3
-							},
-							{
-								value: leaderData,
-								itemStyle: {
-									color: '#9F6196'
-								},
-								lineStyle: {
-									color: '#9F6196',
-									width:1.5
-								},
-								areaStyle: {
-									color: 'rgba(255, 255, 255, 0.4)'
-								},
-								symbolSize: 3
-							}
-						]
-					}
-				]
-			};
-			chart.setOption(option);
-			this.isChartReady = true;
-			this.$nextTick(() => {
-				this.calculatePdfContainerHeight();
-			});
-        },
-      }
-    };
-</script>
-
-<style scoped lang="scss">
-	.loading{
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		background: rgba(0,0,0,.4);
-		z-index: 1001;
-	}
-	
-	.page-wrappe{
-		width: 100%;
-		background: #FFFFFF;
-		overflow-x: hidden;
-		overflow-y: auto;
-		.pdf-container{
-			width: 630px;
-			padding: 0 20rpx;
-			box-sizing: border-box;
-			transform-origin: top left;
-		}
-	}
-	.offscreen-canvas {
-		position: fixed;
-		top: -9999px;
-		left: -9999px;
-	}
-
-	.pdf_btn{
-		padding: 15rpx 20rpx;
-		border-radius: 20rpx;
-		font-size: 28rpx;
-		color: #FFFFFF;
-		background: #189B9B;
-		position: fixed;
-		right: 30rpx;
-		bottom: 100rpx;
-		z-index: 1000;
-	}
-	
-	@import '../static/pdf.scss';
-</style>

pagesMy/userInfo.vue

@@ -30,6 +30,12 @@
 					<view class="info-form-item-left">手机</view>
 					<view class="info-form-item-right">{{ jmPhone }}</view>
 				</view>
+				<view class="info-form-item adfac">
+					<view class="info-form-item-left">邮箱</view>
+					<view class="info-form-item-right">
+						<u-input border="none" v-model="userInfo.email" placeholder="请输入邮箱" style="color: #193D59;font-size: 30rpx;" placeholder-style="color:#99A9B5;font-size: 30rpx;"></u-input>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="zt_btn" @click="handleSave">保存</view>
@@ -47,7 +53,8 @@
 					id:'',
 					headUrl:'',
 					realName:'',
-					gender:null
+					gender:null,
+					email:'',
 				},
 				jmPhone:'',
 				qicShow:false
@@ -56,11 +63,12 @@
 		onLoad() {
 			if(uni.getStorageSync('userInfo')){
 				let ui = JSON.parse(uni.getStorageSync('userInfo'));
-				this.jmPhone = ui?.mobile?.replace(/(\d{3})\d{4}(\d{4})/, '$1 **** $2');
-				this.userInfo.id = ui?.id;
+				this.jmPhone = ui.mobile?.replace(/(\d{3})\d{4}(\d{4})/, '$1 **** $2');
+				this.userInfo.id = ui.id;
 				this.userInfo.headUrl = ui.headUrl;
 				this.userInfo.realName = ui.realName;
 				this.userInfo.gender = ui.gender;
+				this.userInfo.email = ui.email;
 			}
 		},
 		methods:{
@@ -125,6 +133,7 @@
 				if(!this.userInfo.headUrl) return this.$showToast('请上传头像');
 				if(!this.userInfo.realName) return this.$showToast('请输入姓名');
 				if(this.userInfo.gender==null) return this.$showToast('请选择性别');
+				if(!this.$reg.email(this.userInfo.email)) return this.$showToast('请输入正确的邮箱');
 				
 				this.$api.put('/wx/updateUser',this.userInfo).then(({data:res})=>{
 					if(res.code!==0) return this.$showToast(res.msg)
@@ -133,6 +142,7 @@
 					ui.headUrl = this.userInfo.headUrl;
 					ui.realName = this.userInfo.realName;
 					ui.gender = this.userInfo.gender;
+					ui.email = this.userInfo.email;
 					uni.setStorageSync('userInfo',JSON.stringify(ui));
 					setTimeout(()=>{
 						uni.reLaunch({

static/pdf.scss

@@ -77,7 +77,7 @@
 		background-size: 100% 100%;
 		position: relative;
 		justify-content: flex-end;
-		padding: 0 40px 15px;
+		padding: 0 40px 40px;
 		box-sizing: border-box;
 	}
 	.fm2-logo {
@@ -133,7 +133,7 @@
         }
         .fm2-texts-pre-val{
             width: calc(100% - 84px);
-            padding-right: 10px;
+            padding-right: 5px;
             box-sizing: border-box;
             line-height: 16px;
         }
@@ -1109,8 +1109,17 @@
 		}
 	}
 
+    .v2-title2{
+        font-family: PingFang-SC, PingFang-SC;
+        font-weight: bold;
+        font-size: 18px;
+        color: #002846;
+        line-height: 18px;
+        margin-top: 30px;
+    }
+
 	.v2-box {
-		margin-top: 13px;
+		margin-top: 20px;
 		background: #ffffff;
 		border-radius: 10px;
 		border: 1px solid #33a7a7;
@@ -1431,6 +1440,15 @@
 			&.green {
 				color: #199c9c;
 			}
+            &.vw1{
+                color: #199C9C;
+            }
+            &.vw2{
+                color: #AFCDF5;
+            }
+            &.vw3{
+                color: #F4657A;
+            }
 		}
 
 		.vbtp-desc {
@@ -1531,6 +1549,15 @@
 				margin-left: 8px;
 			}
 		}
+        .vbc-tip{
+            margin-top: 20px;
+            width: 120px;
+            font-family: PingFangSC, PingFang SC;
+            font-weight: 400;
+            font-size: 10px;
+            color: #667E90;
+            line-height: 16px;
+        }
 	}
 }