合并分支 'zym-dev' 到 'pre'

.cursor/rules/g2.mdc

 ---
+description: 
 alwaysApply: true
 ---
+
 # Overview
 
 Insert overview text here. The agent will only see this should they choose to apply the rule.

.gitlab-ci.yml

@@ -71,9 +71,11 @@ build_check:
   image: node:20-bullseye
   tags:
     - risk-monitor-frontend
+  # 只在 push 时做构建校验，且排除 protected 分支与目标分支 pre
   only:
-    - branches
+    - pushes
   except:
+    - pre
     - protected_branches
   script:
     - node -v

src/views/bill/deepDig/processAnalysis/index.vue

@@ -384,7 +384,6 @@
 					</div>
 				</div> -->
 				<AnalysisBox title="投票分析">
-					<div class="analysis-ai-wrapper analysis-ai-wrapper--box3">
 					<div class="vote-legend">
 						<div class="vote-legend-item">
 							<span class="vote-legend-dot agree"></span>
@@ -395,6 +394,7 @@
 							<span>反对票</span>
 						</div>
 					</div>
+					<div class="analysis-ai-wrapper analysis-ai-wrapper--box3">
 						<div class="box3-main" :class="{ 'box3-main--full': !voteFooterText }">
 							<div class="box3-main-center">
 								<div class="box3-main-center-header">
@@ -405,14 +405,15 @@
 									<div class="box3-main-center-header-box5">
 										倒戈人数<span style="font-weight: normal; display: inline-block">(平均区间)</span>
 									</div>
-								<div class="box3-main-center-header-box6">关键议员</div>
 								</div>
 								<div class="box3-main-center-content">
-								<div class="box3-main-center-content-box" v-for="item in voteAnalysisList" :key="item.actionId">
+									<div class="box3-main-center-content-box" v-for="item in voteAnalysisList"
+										:key="item.actionId">
 										<div class="item">
 											<div class="item-box1">
 												<div class="box1-left">
-												<div style="width: 100%; display: flex; flex-direction: column; align-items: flex-end">
+													<div
+														style="width: 100%; display: flex; flex-direction: column; align-items: flex-end">
 														<div class="name nameBlod" :title="item.actionTitle" style="
 														white-space: nowrap;
 														overflow: hidden;
@@ -428,33 +429,34 @@
 												</div>
 												<div class="box1-right">
 													<div class="box1-right-top">
-													<el-progress :percentage="Number(item.agreePercent)" :show-text="false" color="rgb(33, 129, 57)">
+														<el-progress :percentage="Number(item.agreePercent)"
+															:show-text="false" color="rgb(33, 129, 57)">
 														</el-progress>
 													</div>
 													<div class="box1-right-bottom">
-													<el-progress :percentage="Number(item.againstPercent)" :show-text="false" color="rgb(206, 79, 81)">
+														<el-progress :percentage="Number(item.againstPercent)"
+															:show-text="false" color="rgb(206, 79, 81)">
 														</el-progress>
 													</div>
 												</div>
 											</div>
 											<div class="item-box2">
-											<div class="box2-1" style="color: rgb(33, 129, 57)">{{ item.agreeCount + "票" }}</div>
-											<div class="box2-2" style="color: rgb(206, 79, 81)">{{ item.againstCount + "票" }}</div>
+												<div class="box2-1" style="color: rgb(33, 129, 57)">{{ item.agreeCount +
+													"票" }}</div>
+												<div class="box2-2" style="color: rgb(206, 79, 81)">{{ item.againstCount
+													+ "票" }}</div>
 											</div>
 											<div class="item-box3">
 												<div class="box3-1"></div>
 												<div class="box3-2"></div>
 											</div>
 											<div class="item-box4">
-											<div class="box4-1" style="color: rgb(33, 129, 57)">{{ item.agreePercent + "%" }}</div>
-											<div class="box4-2" style="color: rgb(206, 79, 81)">{{ item.againstPercent + "%" }}</div>
+												<div class="box4-1" style="color: rgb(33, 129, 57)">{{ item.agreePercent
+													+ "%" }}</div>
+												<div class="box4-2" style="color: rgb(206, 79, 81)">{{
+													item.againstPercent + "%" }}</div>
 											</div>
 											<div class="item-box5"></div>
-										<div class="item-box6">
-											<el-icon size="20" color="#555">
-												<ArrowDownBold />
-											</el-icon>
-										</div>
 										</div>
 										<div class="item">
 											<div class="item-box1">
@@ -466,31 +468,33 @@
 												</div>
 												<div class="box1-right">
 													<div class="box1-right-top">
-													<el-progress :percentage="Number(item.dagreePercent)" :show-text="false" color="rgb(33, 129, 57)">
+														<el-progress :percentage="Number(item.dagreePercent)"
+															:show-text="false" color="rgb(33, 129, 57)">
 														</el-progress>
 													</div>
 													<div class="box1-right-bottom">
-													<el-progress :percentage="Number(item.dagainstPercent)" :show-text="false" color="rgb(206, 79, 81)">
+														<el-progress :percentage="Number(item.dagainstPercent)"
+															:show-text="false" color="rgb(206, 79, 81)">
 														</el-progress>
 													</div>
 												</div>
 											</div>
 											<div class="item-box2">
-											<div class="box2-1" style="color: rgb(33, 129, 57)">{{ item.dagreeCount + "票" }}</div>
-											<div class="box2-2" style="color: rgb(206, 79, 81)">{{ item.dagainstCount + "票" }}</div>
+												<div class="box2-1" style="color: rgb(33, 129, 57)">{{ item.dagreeCount
+													+ "票" }}</div>
+												<div class="box2-2" style="color: rgb(206, 79, 81)">{{
+													item.dagainstCount + "票" }}</div>
 											</div>
 											<div class="item-box3"></div>
 											<div class="item-box4">
-											<div class="box4-1" style="color: rgb(33, 129, 57)">{{ item.dagreePercent + "%" }}</div>
-											<div class="box4-2" style="color: rgb(206, 79, 81)">{{ item.dagainstPercent + "%" }}</div>
+												<div class="box4-1" style="color: rgb(33, 129, 57)">{{
+													item.dagreePercent + "%" }}</div>
+												<div class="box4-2" style="color: rgb(206, 79, 81)">{{
+													item.dagainstPercent + "%" }}</div>
 											</div>
 											<div class="item-box5">
-											<div class="box5-1" style="color: #ce4f51">{{ item.dreverseCount + "人" }}</div>
-										</div>
-										<div class="item-box6">
-											<div class="img-box" v-if="item.dpersonImageUrl">
-												<img :src="item.dpersonImageUrl" alt="" />
-											</div>
+												<div class="box5-1" style="color: #ce4f51">{{ item.dreverseCount + "人"
+												}}</div>
 											</div>
 										</div>
 										<div class="item">
@@ -503,31 +507,33 @@
 												</div>
 												<div class="box1-right">
 													<div class="box1-right-top">
-													<el-progress :percentage="Number(item.ragreePercent)" :show-text="false" color="rgb(33, 129, 57)">
+														<el-progress :percentage="Number(item.ragreePercent)"
+															:show-text="false" color="rgb(33, 129, 57)">
 														</el-progress>
 													</div>
 													<div class="box1-right-bottom">
-													<el-progress :percentage="Number(item.ragainstPercent)" :show-text="false" color="rgb(206, 79, 81)">
+														<el-progress :percentage="Number(item.ragainstPercent)"
+															:show-text="false" color="rgb(206, 79, 81)">
 														</el-progress>
 													</div>
 												</div>
 											</div>
 											<div class="item-box2">
-											<div class="box2-1" style="color: rgb(33, 129, 57)">{{ item.ragreeCount + "票" }}</div>
-											<div class="box2-2" style="color: rgb(206, 79, 81)">{{ item.ragainstCount + "票" }}</div>
+												<div class="box2-1" style="color: rgb(33, 129, 57)">{{ item.ragreeCount
+													+ "票" }}</div>
+												<div class="box2-2" style="color: rgb(206, 79, 81)">{{
+													item.ragainstCount + "票" }}</div>
 											</div>
 											<div class="item-box3"></div>
 											<div class="item-box4">
-											<div class="box4-1" style="color: rgb(33, 129, 57)">{{ item.ragreePercent + "%" }}</div>
-											<div class="box4-2" style="color: rgb(206, 79, 81)">{{ item.ragainstPercent + "%" }}</div>
+												<div class="box4-1" style="color: rgb(33, 129, 57)">{{
+													item.ragreePercent + "%" }}</div>
+												<div class="box4-2" style="color: rgb(206, 79, 81)">{{
+													item.ragainstPercent + "%" }}</div>
 											</div>
 											<div class="item-box5">
-											<div class="box5-1" style="color: #ce4f51">{{ item.rreverseCount + "人" }}</div>
-										</div>
-										<div class="item-box6">
-											<div class="img-box" v-if="item.rpersonImageUrl">
-												<img :src="item.rpersonImageUrl" alt="" />
-											</div>
+												<div class="box5-1" style="color: #ce4f51">{{ item.rreverseCount + "人"
+												}}</div>
 											</div>
 										</div>
 									</div>
@@ -701,7 +707,8 @@
 								<TipTab class="analysis-ai-tip" />
 								<AiButton class="analysis-ai-tip-action" @mouseenter="handleShowAiPane('box3')" />
 							</div>
-						<div v-if="aiPaneVisible.box3" class="analysis-ai-pane" @mouseleave="handleHideAiPane('box3')">
+							<div v-if="aiPaneVisible.box3" class="analysis-ai-pane"
+								@mouseleave="handleHideAiPane('box3')">
 								<AiPane :aiContent="overviewAiContent.box3" />
 							</div>
 						</div>
@@ -1248,6 +1255,7 @@ onMounted(async () => {
 		.box1 {
 			width: 792px;
 			height: 415px;
+
 			.box1-main {
 				height: 368px;
 
@@ -1393,6 +1401,7 @@ onMounted(async () => {
 			margin-top: 17px;
 			width: 792px;
 			height: 415px;
+
 			.box2-main {
 				height: 359px;
 
@@ -1640,6 +1649,7 @@ onMounted(async () => {
 		margin-top: 16px;
 		width: 792px;
 		height: 847px;
+
 		.box3 {
 			width: 100%;
 			height: 100%;
@@ -1647,7 +1657,7 @@ onMounted(async () => {
 
 			.vote-legend {
 				position: absolute;
-				top: 15px;
+				top: 10px;
 				left: 50%;
 				transform: translateX(-50%);
 				display: inline-flex;
@@ -1735,12 +1745,6 @@ onMounted(async () => {
 							min-width: 0;
 							text-align: center;
 						}
-
-						.box3-main-center-header-box6 {
-							flex: 90 1 0;
-							min-width: 0;
-							text-align: center;
-						}
 					}
 
 					.box3-main-center-content {
@@ -1976,23 +1980,6 @@ onMounted(async () => {
 										line-height: 14px;
 									}
 								}
-
-								.item-box6 {
-									flex: 90 1 0;
-									min-width: 0;
-									text-align: center;
-
-									.img-box {
-										width: 30px;
-										height: 30px;
-										margin-left: 30px;
-
-										img {
-											width: 100%;
-											height: 100%;
-										}
-									}
-								}
 							}
 						}
 					}