合并分支 'pre' 到 'master'

src/api/bill.js

@@ -20,7 +20,7 @@ export function getBillInfo(params) {
 export function getBillPerson(params) {
     return request({
         method: 'GET',
-        url: `/bill/billInfoBean/person/${params.billId}`,
+        url: `/api/billInfoBean/person/${params.billId}`,
         params,
     })
 }

src/api/bill/billHome.js

@@ -111,7 +111,7 @@ export function getBillPostOrg(params) {
 export function getBillProcess(params) {
     return request({
         method: 'GET',
-        url: `/bill/BillOverview/billsProcess/${params.year}`,
+        url: `/api/BillOverview/billsProcess/${params.year}`,
     })
 }
 
@@ -119,7 +119,7 @@ export function getBillProcess(params) {
 export function getBills(params, signal) {
     return request({
         method: 'GET',
-        url: `/bill/BillOverview/bills`,
+        url: `/api/BillOverview/bills`,
         params,
         signal
     })
@@ -129,7 +129,7 @@ export function getBills(params, signal) {
 export function getBillsPerson(params, signal) {
     return request({
         method: 'GET',
-        url: `/bill/BillOverview/billsPerson`,
+        url: `/api/BillOverview/billsPerson`,
         params,
         signal
     })

src/components/RiskSignal/RiskSignal.vue

@@ -16,7 +16,7 @@
         <div :class="{
           itemLeftStatus1: item[props.riskLevel] === '特别重大',
           itemLeftStatus2: item[props.riskLevel] === '重大风险',
-          itemLeftStatus3: item[props.riskLevel] === '较大风险',
+          itemLeftStatus3: item[props.riskLevel] === '较大风险' || item[props.riskLevel] === '中等风险',
           itemLeftStatus4: item[props.riskLevel] === '一般风险' || !item[props.riskLevel],
           itemLeftStatus5: item[props.riskLevel] === '低风险',
         }">

src/views/bill/introdoction/STimeline.vue

@@ -25,7 +25,7 @@
 
 			<div class="empty" v-if="displayList.length === 0">暂无进展数据</div>
 		</div>
-		<div class="more" v-if="hasMore">查看更多<img :src="arrowDown"/></div>
+		<!-- <div class="more" v-if="hasMore">查看更多<img :src="arrowDown"/></div> -->
 	</div>
 </template>
 

src/views/exportControl/index.vue

@@ -626,7 +626,7 @@
 </template>
 
 <script setup>
-import NewsList from "@/components/NewsList.vue";
+import NewsList from "@/components/base/newsList/index.vue";
 import RiskSignal from "@/components/RiskSignal/RiskSignal.vue";
 import { onMounted, ref, computed, reactive, shallowRef, watch, nextTick } from "vue";
 import { useContainerScroll } from "@/hooks/useScrollShow";