merge master

src/main.js

-import { createApp } from 'vue'
-import App from './App.vue'
-import router from './router'
-import ElementPlus from 'element-plus'
-import 'element-plus/dist/index.css'
-import * as ElementPlusIconsVue from '@element-plus/icons-vue'
-import CardTitle from './components/CardTitle.vue'
-import { withFallbackImage } from './utils'
-// import './styles/var.scss'
+import { createApp } from "vue";
+import App from "./App.vue";
+import router from "./router";
+import ElementPlus from "element-plus";
+import "element-plus/dist/index.css";
+import * as ElementPlusIconsVue from "@element-plus/icons-vue";
+import CardTitle from "./components/CardTitle.vue";
+import { withFallbackImage } from "./utils";
+import "./styles/scrollbar.css";
+import "./styles/elui.css";
+import "./styles/main.css";
 
-const app = createApp(App)
+const app = createApp(App);
 
 // 注册所有图标
 for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-  app.component(key, component)
+	app.component(key, component);
 }
 
 // 注册全局函数
-app.config.globalProperties.$withFallbackImage = withFallbackImage
-app.use(router)
-app.use(ElementPlus)
-app.component('CardTitle', CardTitle)
-app.mount('#app')
+app.config.globalProperties.$withFallbackImage = withFallbackImage;
+app.use(router);
+app.use(ElementPlus);
+app.component("CardTitle", CardTitle);
+app.mount("#app");
\ No newline at end of file

src/router/index.js

@@ -5,23 +5,19 @@ import ThinkTankDetail from "@/views/ThinkTankDetail/index.vue";
 import ReportDetail from "@/views/ReportDetail/index.vue";
 
 // 法案相关组件
-import BillHome from "@/views/billHome/index.vue";
-import BillLayoutContainer from "@/views/billLayout/index.vue";
+import BillHome from "@/views/bill/billHome/index.vue";
+import BillLayoutContainer from "@/views/bill/billLayout/index.vue";
 import BillLayout from "@/views/bill/index.vue";
 import BillIntroduction from "@/views/bill/introdoction/index.vue";
 import BillBackground from "@/views/bill/background/index.vue";
 import BillTemplate from "@/views/bill/template/index.vue";
-
-// 深度挖掘相关组件
-import DeepDigLayout from "@/views/deepDig/index.vue";
-import DeepDigProcessOverview from "@/views/deepDig/processOverview/index.vue";
-import DeepDigProcessAnalysis from "@/views/deepDig/processAnalysis/index.vue";
-import DeepDigProgressOverview from "@/views/deepDig/progressAnalysis/index.vue";
-
-// 影响分析相关组件
-import InfluenceLayout from "@/views/influence/index.vue";
-import InfluenceIndustry from "@/views/influence/industry/index.vue";
-import InfluenceScientificResearch from "@/views/influence/scientificResearch/index.vue";
+import DeepDigLayout from "@/views/bill/deepDig/index.vue";
+import DeepDigProcessOverview from "@/views/bill/deepDig/processOverview/index.vue";
+import DeepDigProcessAnalysis from "@/views/bill/deepDig/processAnalysis/index.vue";
+import DeepDigProgressOverview from "@/views/bill/deepDig/progressAnalysis/index.vue";
+import InfluenceLayout from "@/views/bill/influence/index.vue";
+import InfluenceIndustry from "@/views/bill/influence/industry/index.vue";
+import InfluenceScientificResearch from "@/views/bill/influence/scientificResearch/index.vue";
 
 // 出口管制
 import ExportControl from "@/views/exportControl/index.vue";
@@ -33,12 +29,16 @@ import OverviewLayout from "@/views/decree/decreeLayout/overview/index.vue";
 import DecreeIntroduction from "@/views/decree/decreeLayout/overview/introduction/index.vue";
 import DecreeBackground from "@/views/decree/decreeLayout/overview/background/index.vue";
 import DecreeDeepDig from "@/views/decree/decreeLayout/deepdig/index.vue";
+import DecreeInfluence from "@/views/decree/decreeLayout/influence/index.vue";
 
 // 市场准入限制
 import MarketAccessRestrictions from "@/views/marketAccessRestrictions/marketAccessHome/index.vue";
 import MarketAccessLayout from "@/views/marketAccessRestrictions/marketAccessLayout/index.vue";
 import MarketAccessOverview from "@/views/marketAccessRestrictions/marketAccessLayout/overview/index.vue";
 import MarketAccessCase from "@/views/marketAccessRestrictions/marketAccessLayout/case/index.vue";
+import MarketSingleCaseLayout from "@/views/marketAccessRestrictions/singleCaseLayout/index.vue";
+import MarketSingleCaseOverview from "@/views/marketAccessRestrictions/singleCaseLayout/overview/index.vue";
+import MarketSingleCaseDeepdig from "@/views/marketAccessRestrictions/singleCaseLayout/deepdig/index.vue";
 
 const routes = [
 	// 智库系统的主要路由
@@ -239,31 +239,16 @@ const routes = [
 				meta: {
 					title: "深度挖掘"
 				}
+			},
+			// 影响分析路由
+			{
+				path: "influence",
+				name: "DecreeInfluence",
+				component: DecreeInfluence,
+				meta: {
+					title: "影响分析"
+				}
 			}
-			// // 影响分析路由
-			// {
-			//   path: 'influence',
-			//   name: 'InfluenceLayout',
-			//   component: InfluenceLayout,
-			//   redirect: '/billLayout/influence/industry',
-			//   meta: {
-			//     title: '影响分析'
-			//   },
-			//   children: [
-			//     {
-			//       path: 'industry',
-			//       name: 'InfluenceIndustry',
-			//       component: InfluenceIndustry,
-			//       meta: { title: '对华产业影响' }
-			//     },
-			//     {
-			//       path: 'scientificResearch',
-			//       name: 'InfluenceScientificResearch',
-			//       component: InfluenceScientificResearch,
-			//       meta: { title: '对华科研影响' }
-			//     }
-			//   ]
-			// }
 		]
 	},
 
@@ -303,8 +288,33 @@ const routes = [
 			}
 		]
 	},
-
-	,
+	{
+		path: "/marketSingleCaseLayout",
+		name: "MarketSingleCaseLayout",
+		component: MarketSingleCaseLayout,
+		redirect: "/marketSingleCaseLayout/overview",
+		meta: {
+			title: "单次调查案件布局"
+		},
+		children: [
+			{
+				path: "overview",
+				name: "MarketSingleCaseOverview",
+				component: MarketSingleCaseOverview,
+				meta: {
+					title: "调查简介"
+				}
+			},
+			{
+				path: "deepdig",
+				name: "MarketSingleCaseDeepdig",
+				component: MarketSingleCaseDeepdig,
+				meta: {
+					title: "深度挖掘"
+				}
+			}
+		]
+	},
 	// 转移过来的页面
 	{
 		path: "/analysis",

src/styles/elui.css

+:deep(.el-checkbox__input.is-checked+.el-checkbox__label) {
+  color: red !important;
+}
+
+:root {
+  --el-color-primary: rgba(10, 87, 166, 1);
+  /* --el-color-success: #1dd1a1;
+  --el-border-radius-base: 8px;
+  --el-font-size-base: 14px; */
+}
\ No newline at end of file

src/styles/main.css

+:root {
+  --color-main-active: rgba(10, 87, 166, 1);
+  --color-main-primay: rgba(59, 65, 75, 1);
+
+  /* 普通按钮颜色 */
+  --btn-plain-border-color: rgba(230, 231, 232, 1);
+  --btn-plain-bg-color: rgba(255, 255, 255, 1);
+  --btn-plain-text-color: rgba(59, 65, 75, 1);
+  /* 选中按钮颜色 */
+  --btn-active-border-color: rgba(10, 87, 166, 1);
+  --btn-active-bg-color: rgba(231, 243, 255, 1);
+  --btn-active-text-color: rgba(10, 87, 166, 1);
+  
+
+  /* 标签按钮颜色 */
+  --tag-btn1-bg-color: rgba(255, 241, 240, 1);
+  --tag-btn1-border-color: rgba(255, 204, 199, 1);
+  --tag-btn1-text-color: rgba(255, 77, 79, 1);
+
+  --tag-btn2-bg-color: rgba(255, 251, 230, 1);
+  --tag-btn2-border-color: rgba(255, 241, 184, 1);
+  --tag-btn2-text-color: rgba(250, 173, 20, 1);
+
+  --tag-btn2-bg-color: rgba(230, 244, 255, 1);
+  --tag-btn2-border-color: rgba(186, 224, 255, 1);
+  --tag-btn2-text-color: rgba(22, 119, 255, 1);
+
+  --tag-btn3-bg-color: rgba(246, 255, 237, 1);
+  --tag-btn3-border-color: rgba(217, 247, 190, 1);
+  --tag-btn3-text-color: rgba(82, 196, 26, 1);
+
+}
\ No newline at end of file

src/styles/scrollbar.css

+/* 全局滚动条样式 */
+* {
+  scrollbar-width: thin;
+  scrollbar-color: #c1c1c1 #f1f1f1;
+}
+
+/* Webkit 浏览器 */
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+
+::-webkit-scrollbar-track {
+  background: #f8f9fa;
+  border-radius: 6px;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #6c757d;
+  border-radius: 6px;
+  border: 2px solid #f8f9fa;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: #495057;
+}
+
+::-webkit-scrollbar-thumb:active {
+  background: #343a40;
+}
+
+::-webkit-scrollbar-corner {
+  background: #f8f9fa;
+}
+
+/* 特定元素的滚动条样式 */
+.el-scrollbar__bar {
+  z-index: 9999;
+}
+
+/* Element UI 组件滚动条优化 */
+.el-table__body-wrapper::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+.el-table__body-wrapper::-webkit-scrollbar-thumb {
+  background: #909399;
+  border-radius: 4px;
+}
+
+.el-select-dropdown .el-scrollbar__wrap {
+  scrollbar-width: thin;
+  scrollbar-color: #c1c1c1 #f1f1f1;
+}
\ No newline at end of file

src/views/bill/background/index.vue

@@ -80,9 +80,8 @@
           </div>
         </div>
         <div class="box2-footer">
-          <div class="box2-footer-text">查看更多</div>
-          <div class="box2-footer-icon">
-            <img src="./assets/images/more.png" alt="" />
+          <div class="btn-more">
+            <img src="../assets/images/btn-more.png" alt="" />
           </div>
         </div>
       </div>
@@ -150,15 +149,7 @@
         <div class="right-box2">
           <div class="right-box2-header">
             <div class="title">
-              <span
-                style="
-                  color: rgb(22, 119, 255);
-                  font-family: Microsoft YaHei;
-                  font-size: 16px;
-                  font-weight: 700;
-                "
-                >"传统能源"</span
-              >涉及议员动态 >
+              <span class="title-active">"传统能源"</span>涉及议员动态 >
             </div>
           </div>
           <div class="right-box2-center">
@@ -177,9 +168,8 @@
             </div>
           </div>
           <div class="right-box2-footer">
-            <div class="box2-footer-text">查看更多</div>
-            <div class="box2-footer-icon">
-              <img src="./assets/images/more.png" alt="" />
+            <div class="btn-more">
+              <img src="../assets/images/btn-more.png" alt="" />
             </div>
           </div>
         </div>
@@ -205,7 +195,11 @@ import userIcon from "./assets/icons/user-icon.png";
 import userIcon1 from "./assets/icons/user-icon1.png";
 import userIcon2 from "./assets/icons/user-icon2.png";
 
-import { getBillBackground, getBillEvent, getBillPersonAnalyze } from "@/api/bill";
+import {
+  getBillBackground,
+  getBillEvent,
+  getBillPersonAnalyze,
+} from "@/api/bill";
 
 const box1BtnActive = ref(1);
 const handleClickBox1Btn = (index) => {
@@ -220,10 +214,10 @@ const handleClickBox1Btn = (index) => {
 const box2BtnActive = ref(1);
 const handleClickBox2Btn = (index) => {
   box2BtnActive.value = index;
-  if(index === 1) {
-    handleGetBillPersonAnalyze(true)
+  if (index === 1) {
+    handleGetBillPersonAnalyze(true);
   } else {
-    handleGetBillPersonAnalyze(false)
+    handleGetBillPersonAnalyze(false);
   }
 };
 
@@ -249,7 +243,7 @@ const aboutUserList = ref([
 
 const backgroundList = ref([
   {
-    id: window.sessionStorage.getItem('billId'),
+    id: window.sessionStorage.getItem("billId"),
     bjnr: "将中国跨境电商描述为“利用低价商品冲击美国市场、规避关税监管”",
   },
   {
@@ -433,7 +427,7 @@ const wordCloudData = [
 const handleGetBillBackground = async (cRelated) => {
   const params = {
     cRelated: cRelated,
-    id: window.sessionStorage.getItem('billId'),
+    id: window.sessionStorage.getItem("billId"),
     currentPage: 0,
     pageSize: 10,
   };
@@ -445,58 +439,52 @@ const handleGetBillBackground = async (cRelated) => {
 };
 
 // 获取相关事件
-const handleGetRelatedEvent = async() => {
+const handleGetRelatedEvent = async () => {
   const params = {
-    id: 1
-  }
+    id: 1,
+  };
   try {
-    const res = await getBillEvent(params)
-    console.log('相关事件',res);
-    eventList.value = res.data
-    eventList.value.forEach((item,index) => {
-      if(index === 0) {
-        item.image = event1
-      } else if(index === 1) {
-        item.image = event2
-      } else if(index===2) {
-        item.image = event3
-      } else if(index ===3) {
-        item.image = event4
+    const res = await getBillEvent(params);
+    console.log("相关事件", res);
+    eventList.value = res.data;
+    eventList.value.forEach((item, index) => {
+      if (index === 0) {
+        item.image = event1;
+      } else if (index === 1) {
+        item.image = event2;
+      } else if (index === 2) {
+        item.image = event3;
+      } else if (index === 3) {
+        item.image = event4;
       } else {
-        item.image = event5
+        item.image = event5;
       }
-    })
-    
-  } catch (error) {
-    
-  }
-}
+    });
+  } catch (error) {}
+};
 
 // 议员相关性分析
 const handleGetBillPersonAnalyze = async (isOppose) => {
   const params = {
-    id: window.sessionStorage.getItem('billId'),
-    isOppose: isOppose
-  }
+    id: window.sessionStorage.getItem("billId"),
+    isOppose: isOppose,
+  };
   try {
-    const res = await getBillPersonAnalyze(params)
-    console.log('议员相关性分析', res);
-    personList.value = res.data
-    personList.value.forEach(item => {
-      item.image = user1
-      item.icon = userIcon
-      item.icon1 = userIcon1
-    })
-    
-  } catch (error) {
-    
-  }
-}
+    const res = await getBillPersonAnalyze(params);
+    console.log("议员相关性分析", res);
+    personList.value = res.data;
+    personList.value.forEach((item) => {
+      item.image = user1;
+      item.icon = userIcon;
+      item.icon1 = userIcon1;
+    });
+  } catch (error) {}
+};
 
 onMounted(() => {
   handleGetBillBackground(true);
-  handleGetRelatedEvent()
-  handleGetBillPersonAnalyze(true)
+  handleGetRelatedEvent();
+  handleGetBillPersonAnalyze(true);
 });
 </script>
 
@@ -515,14 +503,14 @@ onMounted(() => {
       width: 8px;
       height: 16px;
       border-radius: 0 4px 4px 0;
-      background: rgba(22, 119, 255, 1);
+      background: var(--color-main-active);
     }
     .title {
       margin-left: 22px;
       margin-top: 20px;
       height: 16px;
       line-height: 16px;
-      color: rgba(22, 119, 255, 1);
+      color: var(--color-main-active);
       font-family: Microsoft YaHei;
       font-size: 16px;
       font-weight: 600;
@@ -576,16 +564,16 @@ onMounted(() => {
             display: flex;
             margin-top: 8px;
             .id {
-              width: 18px;
-              height: 18px;
-              border-radius: 9px;
+              width: 24px;
+              height: 24px;
+              border-radius: 12px;
               background: rgba(231, 241, 255);
-              color: #1677ff;
+              color: var(--color-main-active);
               text-align: center;
-              line-height: 18px;
+              line-height: 24px;
               font-size: 12px;
-              font-weight: bold;
-              margin: 15px 16px 15px 18px;
+              font-weight: 400;
+              margin: 12px 16px 12px 18px;
             }
             .title {
               width: 440px;
@@ -702,13 +690,14 @@ onMounted(() => {
         margin-top: 7px;
         display: flex;
         justify-content: center;
-        .box2-footer-text {
-          color: rgba(22, 119, 255, 1);
-          font-family: Microsoft YaHei;
-          font-size: 14px;
-          font-weight: 400;
-          line-height: 22px;
-          margin-right: 4px;
+        .btn-more {
+          width: 108px;
+          height: 32px;
+          cursor: pointer;
+          img {
+            width: 100%;
+            height: 100%;
+          }
         }
       }
     }
@@ -724,7 +713,6 @@ onMounted(() => {
     .background-wrap-right-main {
       .right-box1 {
         height: 365px;
-        border-bottom: 1px solid rgba(243, 243, 244, 1);
         .right-box1-header {
           height: 22px;
           margin-left: 22px;
@@ -895,7 +883,7 @@ onMounted(() => {
         .right-box2-header {
           height: 22px;
           margin-left: 22px;
-          padding-top: 19px;
+          padding-top: 10px;
           display: flex;
           .icon {
             margin: 1px 12px 3px 0;
@@ -915,6 +903,12 @@ onMounted(() => {
             line-height: 22px;
             letter-spacing: 0px;
             text-align: left;
+            .title-active {
+              color: var(--color-main-active);
+              font-family: Microsoft YaHei;
+              font-size: 16px;
+              font-weight: 700;
+            }
           }
         }
         .right-box2-center {
@@ -963,13 +957,14 @@ onMounted(() => {
           margin-top: 7px;
           display: flex;
           justify-content: center;
-          .box2-footer-text {
-            color: rgba(22, 119, 255, 1);
-            font-family: Microsoft YaHei;
-            font-size: 14px;
-            font-weight: 400;
-            line-height: 22px;
-            margin-right: 4px;
+          .btn-more {
+            width: 108px;
+            height: 32px;
+            cursor: pointer;
+            img {
+              width: 100%;
+              height: 100%;
+            }
           }
         }
       }

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

@@ -86,7 +86,7 @@ const handleClickLeftSiderBtn = (item,index) => {
       }
     }
     .siderBtnActive {
-      background: rgba(22, 119, 255, 1);
+      background: var(--color-main-active);
       .btn-text {
         color: #fff !important;
       }