合并分支 'lzl-dev' 到 'master'

src/api/bill/billHome.js

@@ -39,10 +39,37 @@ export function getHotBills() {
 }
 
 // 获取法案风险信号
-export function getBillRiskSignal() {
+/**
+ * @param {moduleId} 
+ */
+export function getBillRiskSignal(params) {
+    return request({
+        method: 'GET',
+        // 这个是之前的接口地址，现在接口地址换成新的了所以使用新地址
+        // url: '/api/BillOverview/riskSignal',
+        url: `/api/commonFeature/riskSignal/${params.moduleId}`,
+    })
+}
+
+// 获取新闻资讯
+/**
+ * @param {moduleId} 
+ */
+export function getNews(params) {
     return request({
         method: 'GET',
-        url: '/api/BillOverview/riskSignal',
+        url: `/api/commonFeature/news/${params.moduleId}`,
+    })
+}
+
+// 获取社交媒体
+/**
+ * @param {moduleId} 
+ */
+export function getRemarks(params) {
+    return request({
+        method: 'GET',
+        url: `/api/commonFeature/remarks/${params.moduleId}`,
     })
 }
 
@@ -89,10 +116,27 @@ export function getMemberProposal(params) {
 }
 
 // 获取资源库
-export function getBills(params) {
+export function getBills(params, signal) {
     return request({
         method: 'GET',
         url: `/api/BillOverview/bills`,
-        params
+        params,
+        signal
+    })
+}
+
+// 获取提出部门列表
+export function getPostOrgList() {
+    return request({
+        method: 'GET',
+        url: `/api/BillDict/department`,
+    })
+}
+
+// 获取提出议员列表
+export function getPostMemberList() {
+    return request({
+        method: 'GET',
+        url: `/api/BillDict/member`,
     })
 }
\ No newline at end of file

src/views/bill/background/index.vue

@@ -505,7 +505,7 @@ const handleGetBillPersonAnalyze = async (isOppose) => {
 onMounted(() => {
   handleGetBillBackground();
   handleGetRelatedEvent();
-  handleGetBillPersonAnalyze(false);
+  // handleGetBillPersonAnalyze(false);
 });
 </script>
 

src/views/bill/billHome/utils/doublePieChart.js

@@ -16,11 +16,9 @@ const getDoublePieChart = (data1, data2) => {
         },
         label: {
           position: 'inside',
-          textStyle: {
-            fontSize: '16px',
-            fontWeight: 700,
-            // color: '#333'
-          }
+          fontSize: '16px',
+          fontWeight: 700,
+          // color: '#333'
         },
         data: data1.map(item => {
           return {

src/views/bill/billLayout/index.vue

@@ -212,6 +212,7 @@ onMounted(() => {
 	height: 1016px;
 	background: rgba(249, 250, 252, 1);
 	position: relative;
+	margin: 0 auto;
 	.layout-header {
 		width: 1920px;
 		height: 64px;

src/views/bill/introdoction/index.vue

@@ -37,10 +37,10 @@
 								<div class="right1-item" v-for="item in basicInfo.hylyList" :key="item">{{ item }}</div>
 							</div>
 						</div>
-						<div class="box1-right-item">
+						<!-- <div class="box1-right-item">
 							<div class="item-left">法案类别：</div>
 							<div class="item-right">{{ basicInfo.typeName }}</div>
-						</div>
+						</div> -->
 						<div class="box1-right-item">
 							<div class="item-left">委员会报告：</div>
 							<div class="item-right2" v-if="basicInfo.reportList">
@@ -132,11 +132,11 @@
 						</div> -->
 					</div>
 				</div>
-				<div class="box2-footer">
+				<!-- <div class="box2-footer">
 					<div class="btn-more">
 						<img src="../assets/images/btn-more.png" alt="" />
 					</div>
-				</div>
+				</div> -->
 			</div>
 		</div>
 		<div class="introduction-wrap-right">
@@ -154,7 +154,7 @@
 			</div>
 			<div class="introduction-wrap-right-main">
 				<div class="right-main-box1">
-					<div class="name-box">
+					<!-- <div class="name-box">
 						<el-select
 							v-model="selectValue"
 							placeholder="请选择"
@@ -174,7 +174,7 @@
 								{{ item.name }}
 							</div>
 						</div>
-					</div>
+					</div> -->
 					<div class="info-box">
 						<div class="info-left">
 							<img src="./assets/images/usr1.png" alt="" />
@@ -889,6 +889,7 @@ onMounted(() => {
 			background: #fff;
 			border-radius: 10px;
 			box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
+			position: relative;
 			.box2-main {
 				margin-top: 10px;
 				height: calc(100% - 70px); // Subtract header height
@@ -1001,6 +1002,11 @@ onMounted(() => {
 				margin-top: 7px;
 				display: flex;
 				justify-content: center;
+				position: absolute;
+				bottom: 10px;
+				left: 50%;
+				transform: translateX(-50%);
+				z-index: 99;
 				.btn-more {
 					width: 108px;
 					height: 32px;
@@ -1024,7 +1030,8 @@ onMounted(() => {
 		box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
 		.introduction-wrap-right-main {
 			.right-main-box1 {
-				height: 218px;
+				// height: 218px; 将选择框去掉后高度变化
+				height: 171px;
 				// border-bottom: 1px solid rgb(243, 243, 244);
 				.name-box {
 					display: flex;