最新需求优化

pagesHome/pdf.vue

@@ -8,7 +8,7 @@
 				<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">PERILL团队发展动态评估报告(基础版)</view>
+				<view class="fm2-p">团队发展动态评估报告(基础版)</view>
 				<view class="fm2-texts adf">
 					<view class="fm2-texts-pre"><span style="letter-spacing: 6px;">客户公司：</span>{{ reportData.teamInfo.enterpriseName||'' }}</view>
 					<view class="fm2-texts-pre"><span style="letter-spacing: 6px;">团队名称：</span>{{ reportData.teamInfo.teamName||'' }}</view>
@@ -98,11 +98,13 @@
 					</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="v2-p3">纬度得分</view>
-						<view class="vd-wd adfac" :style="{'background':item.wddf}">
-							<view class="vdwd-pre">维度加权总分：<span>{{ item.weightedTotal||0 }}</span></view>
-							<view class="vdwd-pre vp">维度同意度总分（未加权）：<span>{{ item.consentTotal||0 }}</span></view>
-							<view class="vdwd-pre">维度权重：<span>{{ item.weight||0 }}</span></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>
@@ -660,10 +662,12 @@
 					// 隐藏X轴轴线和标签，使图表更干净
 				  axisLine: {
 					show: false
-				  },
-				  axisLabel: {
-					show: false // X轴刻度值也不显示
-				  }
+				  },
+					axisLabel: {
+						show: true,
+						color: '#193D59',
+						fontSize: 10*this.scale // X轴刻度值也不显示
+					}
 				},
 				yAxis: {
 				  type: 'category',

pagesHome/pdfZyb.vue

@@ -8,7 +8,7 @@
 				<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">PERILL团队发展动态评估报告(专业版)</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>
@@ -152,11 +152,13 @@
 					</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="v2-p3">纬度得分</view>
-						<view class="vd-wd adfac" :style="{'background':item.wddf}">
-							<view class="vdwd-pre">维度加权总分：<span>{{ item.weightedTotal||0 }}</span></view>
-							<view class="vdwd-pre vp">维度同意度总分（未加权）：<span>{{ item.consentTotal||0 }}</span></view>
-							<view class="vdwd-pre">维度权重：<span>{{ item.weight||0 }}</span></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>

static/pdf.scss

@@ -1258,7 +1258,7 @@
 		border-radius: 10px;
 		border: 1px solid #aedada;
 		width: calc(100% - 9px);
-		min-height: 400rpx;
+		min-height: 254px;
 		padding: 46px 16px 16px;
 		box-sizing: border-box;
 		margin: 27px 0 0 8px;
@@ -1290,30 +1290,33 @@
 	}
 
 	.vd-wd {
-		margin-top: 8px;
 		width: 100%;
 		height: 34px;
 		border-radius: 6px;
 		padding: 0 10px;
 		box-sizing: border-box;
 		.vdwd-pre {
-			width: 30%;
-			font-family: PingFangSC, PingFang SC;
-			font-weight: 400;
-			font-size: 12px;
-			color: #4d697e;
-			line-height: 34px;
-			text-align: left;
-			&.vp {
-				width: 40%;
-			}
-			span {
-				font-family: DIN, DIN;
-				font-weight: bold;
-				font-size: 14px;
-				color: #002846;
-				line-height: 20px;
-			}
+            width: 30%;
+            font-family: PingFangSC, PingFang SC;
+            font-weight: 400;
+            font-size: 10px;
+            color: #4D697E;
+            line-height: 34px;
+            text-align: left;
+            &.vp{
+                width: 40%;
+            }
+            span{
+                font-family: DIN, DIN;
+                font-weight: bold;
+                font-size: 12px;
+                color: #002846;
+                line-height: 20px;
+                &:last-child{
+                    font-weight: 400;
+                    color: #4D697E;
+                }
+            }
 		}
 	}