Merge branch 'pre' into zz-dev

src/components/base/moduleHeader/index.vue

@@ -53,7 +53,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="menu-box" v-show="isShowMenu" @mouseenter="handleHoverMenu(true)"
+			<div class="menu-box" v-if="isShowMenu" @mouseenter="handleHoverMenu(true)"
 				@mouseleave="handleHoverMenu(false)">
 				<div class="menu-content">
 					<div class="menu-item" v-for="(item, index) in menuList" :key="index" @click="handleToModule(item, 1)">
@@ -64,9 +64,9 @@
 					</div>
 				</div>
 			</div>
-			<div class="tool-box" v-show="isShowTool" @mouseenter="handleHoverTool(true)"
+			<div class="tool-box" v-if="isShowTool" @mouseenter="handleHoverTool(true)"
 				@mouseleave="handleHoverTool(false)">
-				<div class="menu-content">
+				<div class="tool-content">
 					<div class="menu-item" v-for="(item, index) in toolList" :key="index" @click="handleToModule(item, 2)">
 						<div class="icon">
 							<img :src="item.icon" alt="" />
@@ -815,23 +815,6 @@ onMounted(() => {
 		}
 
 		.menu-box {
-			// position: absolute;
-			// z-index: 999999999;
-			// width: 713px;
-			// height: 413px;
-			// top: 52px;
-			// left: 0;
-			// box-sizing: border-box;
-			// border-radius: 10px;
-			// backdrop-filter: blur(10px);
-			// -webkit-backdrop-filter: blur(10px);
-			// box-shadow: 0px 8px 32px 0px rgba(31, 38, 135, 0.15);
-			// background: rgba(255, 255, 255, 0.25);
-			// backdrop-filter: blur(10px);
-			// -webkit-backdrop-filter: blur(10px);
-			// border: 1px solid rgba(255, 255, 255, 0.3);
-			// background: linear-gradient(135deg, rgba(255, 255, 255, 0.1) 0%, rgba(255, 255, 255, 0.2) 100%);
-			// box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.2);
 			position: absolute;
 			z-index: 999999;
 			width: 713px;
@@ -912,21 +895,17 @@ onMounted(() => {
 			box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 			background: rgba(255, 255, 255, 0.8);
 
-			.menu-content {
-				width: 562px;
-				height: 348px;
+			.tool-content {
+				width: 130px;
+				height: 120px;
 				margin-top: 8px;
 				margin-left: 72px;
-
 				.menu-item {
 					margin-top: 36px;
-					width: 280px;
+					width: 100%;
 					height: 24px;
 					display: flex;
 					cursor: pointer;
-
-
-
 					&:hover {
 						.title {
 							color: var(--color-main-active);

src/utils/goToPage.js

+import { useRouter } from "vue-router";
+const router = useRouter()
+
+// 跳转法案详情
+export const goToBill = (id, tabName) => {
+  window.sessionStorage.setItem("billId", id);
+  window.sessionStorage.setItem("curTabName", tabName);
+  const route = router.resolve({
+    path: "/billLayout",
+    query: {
+      billId: id
+    }
+  });
+  window.open(route.href, "_blank");
+};
+
+// 跳转政令详情
+export const goToDecree = (id, tabName) => {
+  window.sessionStorage.setItem("decreeId", id);
+  window.sessionStorage.setItem("curTabName", tabName);
+  const route = router.resolve({
+    path: "/decreeLayout",
+    query: {
+      id: id
+    }
+  });
+  window.open(route.href, "_blank");
+};
+
+// 跳转智库
+export const goToThinkTank = (id, tabName) => {
+  window.sessionStorage.setItem("curTabName", tabName);
+  const route = router.resolve({
+    name: "ReportDetail",
+    params: {
+      id: id
+    }
+  });
+  window.open(route.href, "_blank");
+}
+
+// 跳转机构详情
+export const goToInstitution = (id, tabName) => {
+  window.sessionStorage.setItem('curTabName', tabName)
+  const curRoute = router.resolve({
+    path: "/institution",
+    query: {
+      id: id
+    }
+  });
+  window.open(curRoute.href, "_blank");
+}
\ No newline at end of file

src/views/dataLibrary/bill/countryBill/index.vue

@@ -124,7 +124,7 @@
           <el-table ref="tableRef" :data="tableData" row-key="id" @selection-change="handleSelectionChange"
             @select="handleSelect" @select-all="handleSelectAll" style="width: 100%" :row-style="{ height: '52px' }">
             <el-table-column type="selection" width="40" />
-            <el-table-column label="法案名称" width="455">
+            <el-table-column label="法案名称" width="600">
               <template #default="scope">
                 <span class="title-item text-compact-bold" @click="handleClickToDetail(scope.row)">{{
                   scope.row.originalTitle
@@ -134,14 +134,14 @@
             <el-table-column label="日期" width="120" class-name="date-column">
               <template #default="scope">{{ scope.row.date }}</template>
             </el-table-column>
-            <el-table-column label="提案人" width="480">
+            <el-table-column label="提案人" width="300">
               <template #default="scope">
                 <span class="person-item text-compact" @click="handlePerClick(scope.row)">{{ scope.row.sponsorPersonName
                 }}</span>
               </template>
             </el-table-column>
             <el-table-column property="affiliation" label="所属党派" width="120" />
-            <el-table-column property="originDepart" label="提出委员会" width="180" />
+            <el-table-column property="originDepart" label="提出委员会" />
             <el-table-column property="status" label="所处阶段" width="120" />
           </el-table>
         </div>

src/views/dataLibrary/components/LineChart/lineChart.js

@@ -23,6 +23,7 @@ const getLineChart = (dataX, dataY) => {
     },
     yAxis: {
       type: 'value',
+      name: '数量',
       splitLine: {
         show: true,
         lineStyle: {

src/views/dataLibrary/components/PieChart/piechart.js

@@ -2,8 +2,8 @@ import { MUTICHARTCOLORS } from "@/common/constant";
 const getPieChart = (data) => {
   const colorList = MUTICHARTCOLORS
   let showData = data
-  if(data.length > 14) {
-    showData = data.slice(0,13)
+  if(data.length > 12) {
+    showData = data.slice(0,11)
     let num = 0
     data.slice(13,).forEach(item => {
       num = num + item.value
@@ -22,8 +22,9 @@ const getPieChart = (data) => {
         radius: [150, 180],
         // height: '96%',
         left: 'center',
-        top: 24,
+        top: 60,
         width: '98%',
+        height: '90%',
         itemStyle: {
           borderColor: '#fff',
           borderWidth: 1

src/views/dataLibrary/index.vue

@@ -134,16 +134,15 @@ const siderList = ref([
 				active: false
 			},
 			{
-				name: "实体清单事件",
-				path: "/dataLibrary/dataEntityListEvent",
+				name: "商业管制清单",
+				path: "/dataLibrary/dataCommerceControlList",
 				active: false
 			},
 			{
-				name: "商业管制清单",
-				path: "/dataLibrary/dataCommerceControlList",
+				name: "实体清单事件",
+				path: "/dataLibrary/dataEntityListEvent",
 				active: false
 			},
-
 			{
 				name: "商业管制清单事件",
 				path: "/dataLibrary/dataCommerceControlListEvent",
@@ -257,6 +256,10 @@ const siderList = ref([
 ]);
 
 const handleSiderItem = item => {
+	if (item.name === '风险信号' || item.name === '市场准入限制') {
+		ElMessage.warning('当前模块开发中，敬请期待！')
+		return
+	}
 	siderList.value.forEach(val => {
 		val.active = false;
 		val.isExpanded = false;
@@ -282,6 +285,10 @@ const handleSiderItem = item => {
 };
 
 const handleSiderSecondItem = item => {
+	if (item.name === '州法案' || item.name === '研究型大学' || item.name === '重点实验室') {
+		ElMessage.warning('当前模块开发中，敬请期待！')
+		return
+	}
 	siderList.value.forEach(item => {
 		if (item.children.length) {
 			item.children.forEach(val => {
@@ -437,17 +444,16 @@ onMounted(() => {
 			siderList.value[3].isExpanded = true;
 			siderList.value[3].children[0].active = true;
 			break;
-		case "/dataLibrary/dataEntityListEvent":
+		case "/dataLibrary/dataCommerceControlList":
 			siderList.value[3].active = true;
 			siderList.value[3].isExpanded = true;
 			siderList.value[3].children[1].active = true;
 			break;
-		case "/dataLibrary/dataCommerceControlList":
+		case "/dataLibrary/dataEntityListEvent":
 			siderList.value[3].active = true;
 			siderList.value[3].isExpanded = true;
 			siderList.value[3].children[2].active = true;
 			break;
-
 		case "/dataLibrary/dataCommerceControlListEvent":
 			siderList.value[3].active = true;
 			siderList.value[3].isExpanded = true;
@@ -559,6 +565,7 @@ onBeforeUnmount(() => {
 					height: 100%;
 				}
 			}
+
 			.title {
 				color: var(--color-primary-100);
 			}
@@ -737,6 +744,7 @@ onBeforeUnmount(() => {
 
 				.tab-item-active {
 					border-bottom: 2px solid var(--color-primary-100) !important;
+					background: var(--color-primary-2);
 				}
 			}
 

src/views/dataLibrary/news/index.vue

@@ -105,7 +105,7 @@
           <el-table ref="tableRef" :data="tableData" row-key="id" @selection-change="handleSelectionChange"
             @select="handleSelect" @select-all="handleSelectAll" style="width: 100%" :row-style="{ height: '52px' }">
             <el-table-column type="selection" width="40" />
-            <el-table-column label="新闻标题" width="600">
+            <el-table-column label="新闻标题" width="420">
               <template #default="scope">
                 <span class="title-item text-compact-bold" @click="handleClickToDetail(scope.row)">{{
                   scope.row.originalTitle

src/views/decree/institution/index.vue

@@ -9,7 +9,7 @@
 				<div class="en-title">{{ institutionInfo.enName }}</div>
 				<div class="desc">{{ institutionInfo.desc }}</div>
 				<div class="tag-box">
-					<div class="tag" v-for="(tag, index) in institutionInfo.tagList" :key="index">
+					<div class="tag" v-for="(tag, index) in showTagList" :key="index">
 						{{ tag }}
 					</div>
 				</div>
@@ -22,13 +22,8 @@
 			</div> -->
 		</div>
 		<div class="tab-box">
-			<div
-				class="tab"
-				@click="handleClickTab(item)"
-				:class="{ tabActive: activeTabName == item.name }"
-				v-for="(item, index) in tabList"
-				:key="index"
-			>
+			<div class="tab" @click="handleClickTab(item)" :class="{ tabActive: activeTabName == item.name }"
+				v-for="(item, index) in tabList" :key="index">
 				{{ item.name }}
 			</div>
 		</div>
@@ -61,6 +56,14 @@ const institutionInfo = ref({
 	logo: ""
 });
 
+const showTagList = computed(() => {
+	if(institutionInfo.value.tagList.length > 10) {
+		return institutionInfo.value.tagList.slice(0,10)
+	} else {
+		return institutionInfo.value.tagList
+	}
+})
+
 const handleGetInfo = async () => {
 	const params = {
 		id: route.query.id
@@ -75,7 +78,7 @@ const handleGetInfo = async () => {
 			institutionInfo.value.desc = res.data.orgIntroduction;
 			institutionInfo.value.name = res.data.orgName;
 		}
-	} catch (error) {}
+	} catch (error) { }
 };
 
 handleGetInfo();
@@ -95,7 +98,7 @@ const tabList = ref([
 ]);
 
 const handleClickTab = val => {
-	if(val.name === '深度挖掘' || val.name === '对华制裁') {
+	if (val.name === '深度挖掘' || val.name === '对华制裁') {
 		ElMessage.warning('当前功能开发中，敬请期待！')
 		return
 	}
@@ -125,6 +128,7 @@ onUnmounted(() => {
 	background-repeat: no-repeat;
 	background-size: 100% 100%;
 	padding-top: 16px;
+
 	.header {
 		width: 1600px;
 		height: 200px;
@@ -136,20 +140,23 @@ onUnmounted(() => {
 		background: rgba(255, 255, 255, 0.8);
 		display: flex;
 		position: relative;
+
 		.header-left {
 			width: 160px;
 			height: 160px;
 			margin: 20px;
+
 			img {
 				width: 100%;
 				height: 100%;
 			}
 		}
+
 		.header-right {
 			margin-left: 24px;
 			width: 1350px;
 			overflow: hidden;
-			overflow-y: auto;
+
 			.title {
 				margin-top: 26px;
 				height: 42px;
@@ -164,6 +171,7 @@ onUnmounted(() => {
 				text-overflow: ellipsis;
 				white-space: nowrap;
 			}
+
 			.en-title {
 				margin-top: 8px;
 				height: 24px;
@@ -178,7 +186,9 @@ onUnmounted(() => {
 				text-overflow: ellipsis;
 				white-space: nowrap;
 			}
+
 			.desc {
+				height: 48px;
 				margin-top: 6px;
 				color: rgba(59, 65, 75, 1);
 				font-family: Microsoft YaHei;
@@ -187,11 +197,25 @@ onUnmounted(() => {
 				line-height: 24px;
 				letter-spacing: 0px;
 				text-align: justify;
+				overflow: hidden;
+				display: -webkit-box;
+				/* 3. 限制显示的行数（修改数字即可改变行数） */
+				-webkit-line-clamp: 2;
+				/* 4. 设置文字垂直排列方向 */
+				-webkit-box-orient: vertical;
+				/* 5. 隐藏超出部分 */
+				overflow: hidden;
+				/* 6. 显示省略号 */
+				text-overflow: ellipsis;
+				/* 可选：修复文字间距/换行问题 */
+				word-break: break-all;
 			}
+
 			.tag-box {
 				margin-top: 14px;
 				display: flex;
 				gap: 8px;
+
 				.tag {
 					height: 24px;
 					padding: 0px 8px;
@@ -206,6 +230,7 @@ onUnmounted(() => {
 				}
 			}
 		}
+
 		.header-btn {
 			position: absolute;
 			top: 26px;
@@ -219,14 +244,17 @@ onUnmounted(() => {
 			justify-content: center;
 			align-items: center;
 			cursor: pointer;
+
 			.icon {
 				width: 16px;
 				height: 16px;
+
 				img {
 					width: 100%;
 					height: 100%;
 				}
 			}
+
 			.text {
 				height: 22px;
 				color: rgba(255, 255, 255, 1);
@@ -237,6 +265,7 @@ onUnmounted(() => {
 			}
 		}
 	}
+
 	.tab-box {
 		width: 1600px;
 		height: 64px;
@@ -249,6 +278,7 @@ onUnmounted(() => {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
+
 		.tab {
 			width: 526px;
 			height: 54px;
@@ -263,10 +293,12 @@ onUnmounted(() => {
 			font-weight: 400;
 			letter-spacing: 0px;
 			cursor: pointer;
+
 			&:hover {
 				background: rgba(231, 243, 255, 1);
 			}
 		}
+
 		.tabActive {
 			border: 2px solid rgba(174, 214, 255, 1);
 			background: rgba(231, 243, 255, 1);
@@ -275,6 +307,7 @@ onUnmounted(() => {
 			font-weight: 700;
 		}
 	}
+
 	.main {
 		height: 800px;
 		width: 1600px;

vite.config.js

@@ -19,26 +19,8 @@ export default defineConfig({
       resolvers: [ElementPlusResolver()],
     }),
   ],
-  // build: {
-  //   minify: 'terser',
-  //   terserOptions: {
-  //     compress: {
-  //       drop_console: true,
-  //       drop_debugger: true
-  //     }
-  //   }
-  // },
-  // build: {
-  //   // minify: 'terser',
-  //   terserOptions: {
-  //     compress: {
-  //       drop_console: true,    // 移除所有 console.*
-  //       drop_debugger: true,   // 移除 debugger
-  //     },
-  //   },
-  // },
   esbuild: {
-    drop: process.env.NODE_ENV === 'production' ? ['console', 'debugger'] : []
+    drop: process.env.NODE_ENV === 'production' ? ['console', 'debugger'] : []  // 正式环境去除掉console
   },
   resolve: {
     alias: {