feat:新增跳转资源库其他方法

src/utils/goToPage.js

@@ -396,6 +396,216 @@ export const goToDataCountryBill = (selectParam) => {
   window.open(route.href, "_blank");
 }
 
+// 跳转数据资源库-政令
+export const goToDataDecree = (selectParam) => {
+  // JSON -> Base64
+  const jsonStr = JSON.stringify(selectParam);
+  // 处理中文：先 encodeURIComponent
+  const base64 = btoa(encodeURIComponent(jsonStr));
+  const route = router.resolve({
+    path: "/dataLibrary/dataDecree",
+    query: {
+      data: base64
+    }
+  });
+  window.open(route.href, "_blank");
+}
+
+// 跳转数据资源库-智库
+export const goToDataThinkTank = (selectParam) => {
+  // JSON -> Base64
+  const jsonStr = JSON.stringify(selectParam);
+  // 处理中文：先 encodeURIComponent
+  const base64 = btoa(encodeURIComponent(jsonStr));
+  const route = router.resolve({
+    path: "/dataLibrary/dataThinkTank",
+    query: {
+      data: base64
+    }
+  });
+  window.open(route.href, "_blank");
+}
+
+// 跳转数据资源库-出口管制-实体清单
+export const goToDataEntityList = (selectParam) => {
+  // JSON -> Base64
+  const jsonStr = JSON.stringify(selectParam);
+  // 处理中文：先 encodeURIComponent
+  const base64 = btoa(encodeURIComponent(jsonStr));
+  const route = router.resolve({
+    path: "/dataLibrary/dataEntityList",
+    query: {
+      data: base64
+    }
+  });
+  window.open(route.href, "_blank");
+}
+
+// 跳转数据资源库-出口管制-商业管制清单
+export const goToDataCCLList = (selectParam) => {
+  // JSON -> Base64
+  const jsonStr = JSON.stringify(selectParam);
+  // 处理中文：先 encodeURIComponent
+  const base64 = btoa(encodeURIComponent(jsonStr));
+  const route = router.resolve({
+    path: "/dataLibrary/dataCommerceControlList",
+    query: {
+      data: base64
+    }
+  });
+  window.open(route.href, "_blank");
+}
+
+// 跳转数据资源库-出口管制-实体清单事件
+export const goToDataSingleEntityEvent = (selectParam) => {
+  // JSON -> Base64
+  const jsonStr = JSON.stringify(selectParam);
+  // 处理中文：先 encodeURIComponent
+  const base64 = btoa(encodeURIComponent(jsonStr));
+  const route = router.resolve({
+    path: "/dataLibrary/dataEntityListEvent",
+    query: {
+      data: base64
+    }
+  });
+  window.open(route.href, "_blank");
+}
+
+// 跳转数据资源库-出口管制-商业管制清单事件
+export const goToDataSingleCCLEvent = (selectParam) => {
+  // JSON -> Base64
+  const jsonStr = JSON.stringify(selectParam);
+  // 处理中文：先 encodeURIComponent
+  const base64 = btoa(encodeURIComponent(jsonStr));
+  const route = router.resolve({
+    path: "/dataLibrary/dataCommerceControlListEvent",
+    query: {
+      data: base64
+    }
+  });
+  window.open(route.href, "_blank");
+}
+
+
+// 跳转数据资源库-投融资限制-SDN清单
+export const goToDataSDNList = (selectParam) => {
+  // JSON -> Base64
+  const jsonStr = JSON.stringify(selectParam);
+  // 处理中文：先 encodeURIComponent
+  const base64 = btoa(encodeURIComponent(jsonStr));
+  const route = router.resolve({
+    path: "/dataLibrary/sDNList",
+    query: {
+      data: base64
+    }
+  });
+  window.open(route.href, "_blank");
+}
+
+// 跳转数据资源库-投融资限制-涉军企业清单
+export const goToDataMREList = (selectParam) => {
+  // JSON -> Base64
+  const jsonStr = JSON.stringify(selectParam);
+  // 处理中文：先 encodeURIComponent
+  const base64 = btoa(encodeURIComponent(jsonStr));
+  const route = router.resolve({
+    path: "/dataLibrary/mREList",
+    query: {
+      data: base64
+    }
+  });
+  window.open(route.href, "_blank");
+}
+
+// 跳转数据资源库-投融资限制-SDN清单事件
+export const goToDataSingleSDNEvent = (selectParam) => {
+  // JSON -> Base64
+  const jsonStr = JSON.stringify(selectParam);
+  // 处理中文：先 encodeURIComponent
+  const base64 = btoa(encodeURIComponent(jsonStr));
+  const route = router.resolve({
+    path: "/dataLibrary/sDNListEvent",
+    query: {
+      data: base64
+    }
+  });
+  window.open(route.href, "_blank");
+}
+
+// 跳转数据资源库-投融资限制-涉军企业清单事件
+export const goToDataSingleMREEvent = (selectParam) => {
+  // JSON -> Base64
+  const jsonStr = JSON.stringify(selectParam);
+  // 处理中文：先 encodeURIComponent
+  const base64 = btoa(encodeURIComponent(jsonStr));
+  const route = router.resolve({
+    path: "/dataLibrary/mREListEvent",
+    query: {
+      data: base64
+    }
+  });
+  window.open(route.href, "_blank");
+}
+
+// 跳转数据资源库-科技人物
+export const goToDataTechnologyFigures = (selectParam) => {
+  // JSON -> Base64
+  const jsonStr = JSON.stringify(selectParam);
+  // 处理中文：先 encodeURIComponent
+  const base64 = btoa(encodeURIComponent(jsonStr));
+  const route = router.resolve({
+    path: "/dataLibrary/dataTechnologyFigures",
+    query: {
+      data: base64
+    }
+  });
+  window.open(route.href, "_blank");
+}
+
+// 跳转数据资源库-重要实体-科技企业
+export const goToDataCompany = (selectParam) => {
+  // JSON -> Base64
+  const jsonStr = JSON.stringify(selectParam);
+  // 处理中文：先 encodeURIComponent
+  const base64 = btoa(encodeURIComponent(jsonStr));
+  const route = router.resolve({
+    path: "/dataLibrary/dataCompany",
+    query: {
+      data: base64
+    }
+  });
+  window.open(route.href, "_blank");
+}
+
+// 跳转数据资源库-重要实体-机构
+export const goToDataInstitution = (selectParam) => {
+  // JSON -> Base64
+  const jsonStr = JSON.stringify(selectParam);
+  // 处理中文：先 encodeURIComponent
+  const base64 = btoa(encodeURIComponent(jsonStr));
+  const route = router.resolve({
+    path: "/dataLibrary/dataInstitution",
+    query: {
+      data: base64
+    }
+  });
+  window.open(route.href, "_blank");
+}
+
+// 跳转数据资源库-新闻
+export const goToDataNews = (selectParam) => {
+  // JSON -> Base64
+  const jsonStr = JSON.stringify(selectParam);
+  // 处理中文：先 encodeURIComponent
+  const base64 = btoa(encodeURIComponent(jsonStr));
+  const route = router.resolve({
+    path: "/dataLibrary/dataNews",
+    query: {
+      data: base64
+    }
+  });
+  window.open(route.href, "_blank");
+}
 
 // 解码-------------------------------------------!!!!!
 export const getDecodedParams = () => {

src/utils/setChart.js

@@ -5,7 +5,7 @@ import * as echarts from 'echarts'
 import 'echarts-wordcloud';
 import router from '@/router/index'
 import { goToDataCountryBill } from './goToPage';
-const setChart = (option, chartId, allowClick, selectParam) => {
+const setChart = (option, chartId, allowClick, selectParam, otherAreaList) => {
   let chartDom = document.getElementById(chartId);
   if (!chartDom) {
     return null;
@@ -57,14 +57,13 @@ const setChart = (option, chartId, allowClick, selectParam) => {
             // goToDataCountryBill(selectParam)
             // return
           } else if (selectParam.key === 2) {
+            if(params.name === '其他') {
+              selectParam.selectedAreaList = JSON.stringify(otherAreaList)
+              selectParam.domains = null
+            } else {
               selectParam.domains = params.name
-            // const route = router.resolve({
-            //   path: "/dataLibrary/countryBill",
-            //   query: selectParam
-            // });
-            // window.open(route.href, "_blank");
-            // goToDataCountryBill(selectParam)
-            // return
+              selectParam.selectedAreaList = null
+            }
           } else if (selectParam.key === 3) {
             if (params.name === '众议院' || params.name === '参议院') {
               selectParam.selectedCongress = params.name

src/views/bill/billHome/ResourceLibrarySection.vue

@@ -283,6 +283,7 @@ import cyyIcon from "@/assets/icons/cyy.png";
 import ghdIcon from "@/assets/icons/ghd.png";
 import mzdIcon from "@/assets/icons/mzd.png";
 import { ElMessage } from "element-plus";
+import { goToDataCountryBill } from "@/utils/goToPage";
 
 const router = useRouter();
 
@@ -454,13 +455,7 @@ const handleClickAvatar = async member => {
 					}
 				});
 				window.open(routeData.href, "_blank");
-				// router.push({
-				// 	path: "/characterPage",
-				// 	query: {
-				// 		type,
-				// 		personId: member.id
-				// 	}
-				// })
+
 			} else {
 				personTypeName = "";
 				ElMessage.warning("找不到当前人员的类型值！");
@@ -887,11 +882,13 @@ const handleCooperationToDataLibrary = (item) => {
 		}
 	}
 
-	const route = router.resolve({
-		path: "/dataLibrary/countryBill",
-		query: param
-	});
-	window.open(route.href, "_blank");
+	// const route = router.resolve({
+	// 	path: "/dataLibrary/countryBill",
+	// 	query: param
+	// });
+	// window.open(route.href, "_blank");
+
+	goToDataCountryBill(param)
 }
 
 // 委员会跳转至数据资源库
@@ -918,11 +915,12 @@ const handleToDataLibrary = (item) => {
 		}
 	}
 
-	const route = router.resolve({
-		path: "/dataLibrary/countryBill",
-		query: param
-	});
-	window.open(route.href, "_blank");
+	// const route = router.resolve({
+	// 	path: "/dataLibrary/countryBill",
+	// 	query: param
+	// });
+	// window.open(route.href, "_blank");
+	goToDataCountryBill(param)
 }
 
 onMounted(() => {

src/views/bill/billHome/index.vue

@@ -1100,6 +1100,7 @@ const handleBox6 = async () => {
 
 // 涉华领域分布
 const box9ChartData = ref([]);
+const box9OtherAreaList = ref([])
 const box9selectetedTime = ref(String(currentYear));
 // 立法状态下拉：提出法案、众议院通过、参议院通过、解决分歧、呈交总统、完成立法
 // v-model 存储的是接口需要的 status 值（直接作为接口参数）
@@ -1119,9 +1120,12 @@ const BOX9_MAX_DOMAIN_COUNT = 7;
 const BOX9_OTHER_DOMAIN_NAME = "其他";
 const formatBox9DomainData = (list = []) => {
 	if (!Array.isArray(list) || list.length <= BOX9_MAX_DOMAIN_COUNT) {
+		box9OtherAreaList.value = []
 		return list;
 	}
+	box9OtherAreaList.value = list.slice(BOX9_MAX_DOMAIN_COUNT,).map(item => item.industryName)
 	const topDomainList = list.slice(0, BOX9_MAX_DOMAIN_COUNT);
+	
 	const otherDomainCount = list.slice(BOX9_MAX_DOMAIN_COUNT).reduce((sum, item) => {
 		return sum + Number(item?.countBill || 0);
 	}, 0);
@@ -1187,7 +1191,8 @@ const handleBox9Data = async () => {
 			selectedStatus: status ? status : '全部阶段',
 			isInvolveCn: true
 		}
-		box9ChartInstance = setChart(box9Chart, "box9Chart", true, selectParam);
+
+		box9ChartInstance = setChart(box9Chart, "box9Chart", true, selectParam, box9OtherAreaList.value);
 	}
 };
 

src/views/dataLibrary/exportControl/commerceControlList/index.vue

@@ -3,7 +3,7 @@
     <div class="header-box">
       <div class="header-top">
   <SelectBox :placeholder-name="areaPlaceHolder" select-title="科技领域" :select-list="areaList"
-          :select-name="selectedArea" @update:select-text="handleSelectArea" />
+          :select-name="selectedArea" :is-multiple="true" @update:select-text="handleSelectArea" />
         <SelectBox :placeholder-name="DatePlaceHolder" select-title="制裁时间" :select-list="dateList"
           :select-name="selectedDate" :custom-time="customTime" @update:select-text="handleSelectDate"
           @update:custom-time="handleCustomDate" />
@@ -307,11 +307,11 @@ const handleChangeTime = value => {
 // 激活的标签列表
 const activeTagList = computed(() => {
   const arr = []
-  if (selectedArea.value && selectedArea.value !== '全部领域') {
+  if (selectedArea.value && selectedArea.value[0] !== '全部领域') {
     arr.push(
       {
         tag: '科技领域',
-        name: selectedArea.value
+        name: selectedArea.value.join('、')
       }
     )
   }
@@ -364,7 +364,7 @@ const activeTagList = computed(() => {
 const handleCloseCurTag = (tag, index) => {
   switch (tag.tag) {
     case '科技领域':
-      selectedArea.value = '全部领域'
+      selectedArea.value = ['全部领域']
       break
     case '制裁时间':
       selectedDate.value = ''
@@ -400,7 +400,7 @@ const operationList = ref([
 
 // 科技领域
 const areaPlaceHolder = ref('请选择领域')
-const selectedArea = ref('全部领域')
+const selectedArea = ref(['全部领域'])
 const areaList = ref([
   {
     name: '全部领域',
@@ -468,7 +468,11 @@ const areaList = ref([
   },
 ])
 const handleSelectArea = (value) => {
-  selectedArea.value = value
+  if (value[value.length - 1] === '全部领域') {
+    selectedArea.value = ['全部领域']
+    return
+  }
+  selectedArea.value = value.length > 1 && value.includes('全部领域') ? value.filter(item => item !== '全部领域') : value;
 }
 
 // 制裁时间
@@ -582,7 +586,7 @@ const handleInputCategoryName = value => {
 
 // 清空条件
 const handleClear = () => {
-  selectedArea.value = '全部领域'
+  selectedArea.value = ['全部领域']
   selectedDate.value = ''
   customTime.value = []
   selectedType.value = '全部类别'
@@ -643,7 +647,7 @@ const fetchTableData = async () => {
     page: currentPage.value,
     size: pageSize.value,
     type: 11,  // 商业管制清单
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     materialCategory: selectedType.value === '全部类别' ? null : selectedType.value,  // 物项类别
@@ -725,7 +729,7 @@ const fetchAllData = async () => {
     page: 1,
     size: 9999,
     type: 11,  // 商业管制清单
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     materialCategory: selectedType.value === '全部类别' ? null : selectedType.value,  // 物项类别
@@ -881,7 +885,11 @@ const handleDownloadCurChartData = () => {
 const initParam = () => {
   const hasQuery = Object.keys(route.query).length > 0;
   if (hasQuery) {
-    selectedArea.value = route.query.domains ? route.query.domains : '全部领域'
+    if (route.query.selectedAreaList) {
+      selectedArea.value = JSON.parse(route.query.selectedAreaList)
+    } else {
+      selectedArea.value = route.query.domains ? [route.query.domains] : ['全部领域']
+    }
 
     if (route.query.selectedDate && Array.isArray(JSON.parse(route.query.selectedDate)) && JSON.parse(route.query.selectedDate).length) {
       selectedDate.value = '自定义'
@@ -897,7 +905,11 @@ const initParam = () => {
     }
   } else {
     const savedQuery = JSON.parse(sessionStorage.getItem('commerceRouteQuery') || '{}');
-    selectedArea.value = savedQuery.domains ? savedQuery.domains : '全部领域'
+    if (savedQuery.selectedAreaList) {
+      selectedArea.value = JSON.parse(savedQuery.selectedAreaList)
+    } else {
+      selectedArea.value = savedQuery.domains ? [savedQuery.domains] : ['全部领域']
+    }
     if (savedQuery.selectedDate && Array.isArray(JSON.parse(savedQuery.selectedDate)) && JSON.parse(savedQuery.selectedDate).length) {
       selectedDate.value = '自定义'
       customTime.value = JSON.parse(savedQuery.selectedDate)

src/views/dataLibrary/exportControl/commerceControlListEvent/index.vue

@@ -3,7 +3,7 @@
     <div class="header-box">
       <div class="header-top">
         <SelectBox :placeholder-name="areaPlaceHolder" select-title="科技领域" :select-list="areaList"
-          :select-name="selectedArea" @update:select-text="handleSelectArea" />
+          :select-name="selectedArea" :is-multiple="true" @update:select-text="handleSelectArea" />
         <SelectBox :placeholder-name="DatePlaceHolder" select-title="制裁时间" :select-list="dateList"
           :select-name="selectedDate" :custom-time="customTime" @update:select-text="handleSelectDate"
           @update:custom-time="handleCustomDate" />
@@ -282,11 +282,11 @@ const handleChangeTime = value => {
 // 激活的标签列表
 const activeTagList = computed(() => {
   const arr = []
-  if (selectedArea.value && selectedArea.value !== '全部领域') {
+  if (selectedArea.value && selectedArea.value[0] !== '全部领域') {
     arr.push(
       {
         tag: '科技领域',
-        name: selectedArea.value
+        name: selectedArea.value.join('、')
       }
     )
   }
@@ -316,7 +316,7 @@ const activeTagList = computed(() => {
 const handleCloseCurTag = (tag, index) => {
   switch (tag.tag) {
     case '科技领域':
-      selectedArea.value = '全部领域'
+      selectedArea.value = ['全部领域']
       break
     case '制裁时间':
       selectedDate.value = ''
@@ -403,7 +403,7 @@ const operationList = ref([
 
 // 科技领域
 const areaPlaceHolder = ref('请选择领域')
-const selectedArea = ref('全部领域')
+const selectedArea = ref(['全部领域'])
 const areaList = ref([
   {
     name: '全部领域',
@@ -471,7 +471,11 @@ const areaList = ref([
   },
 ])
 const handleSelectArea = (value) => {
-  selectedArea.value = value
+  if (value[value.length - 1] === '全部领域') {
+    selectedArea.value = ['全部领域']
+    return
+  }
+  selectedArea.value = value.length > 1 && value.includes('全部领域') ? value.filter(item => item !== '全部领域') : value;
 }
 
 // 制裁时间
@@ -518,7 +522,7 @@ const isInvolveCnOnly = ref(false)
 
 // 清空条件
 const handleClear = () => {
-  selectedArea.value = '全部领域'
+  selectedArea.value = ['全部领域']
   selectedDate.value = ''
   customTime.value = []
   isInvolveCnOnly.value = false
@@ -578,7 +582,7 @@ const fetchTableData = async () => {
     size: pageSize.value,
     // keyword: '',
     type: 13,  // 实体清单事件
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     isInvolveCn: isInvolveCnOnly.value ? 'Y' : null,  // 是否只看中国实体
@@ -648,7 +652,7 @@ const fetchAllData = async () => {
     page: 1,
     size: 9999,
     type: 13,  // 实体清单事件
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     isInvolveCn: isInvolveCnOnly.value ? 'Y' : null,  // 是否只看中国实体
@@ -802,7 +806,11 @@ const handleDownloadCurChartData = () => {
 const initParam = () => {
   const hasQuery = Object.keys(route.query).length > 0;
   if (hasQuery) {
-    selectedArea.value = route.query.domains ? route.query.domains : '全部领域'
+    if (route.query.selectedAreaList) {
+      selectedArea.value = JSON.parse(route.query.selectedAreaList)
+    } else {
+      selectedArea.value = route.query.domains ? [route.query.domains] : ['全部领域']
+    }
 
     if (route.query.selectedDate && Array.isArray(JSON.parse(route.query.selectedDate)) && JSON.parse(route.query.selectedDate).length) {
       selectedDate.value = '自定义'
@@ -818,7 +826,11 @@ const initParam = () => {
     }
   } else {
     const savedQuery = JSON.parse(sessionStorage.getItem('commerceEventRouteQuery') || '{}');
-    selectedArea.value = savedQuery.domains ? savedQuery.domains : '全部领域'
+    if (savedQuery.selectedAreaList) {
+      selectedArea.value = JSON.parse(savedQuery.selectedAreaList)
+    } else {
+      selectedArea.value = savedQuery.domains ? [savedQuery.domains] : ['全部领域']
+    }
     if (savedQuery.selectedDate && Array.isArray(JSON.parse(savedQuery.selectedDate)) && JSON.parse(savedQuery.selectedDate).length) {
       selectedDate.value = '自定义'
       customTime.value = JSON.parse(savedQuery.selectedDate)

src/views/dataLibrary/exportControl/entityList/index.vue

@@ -3,7 +3,7 @@
     <div class="header-box">
       <div class="header-top">
          <SelectBox :placeholder-name="areaPlaceHolder" select-title="科技领域" :select-list="areaList"
-          :select-name="selectedArea" @update:select-text="handleSelectArea" />
+          :select-name="selectedArea" :is-multiple="true" @update:select-text="handleSelectArea" />
         <SelectBox :placeholder-name="DatePlaceHolder" select-title="制裁时间" :select-list="dateList"
           :select-name="selectedDate" :custom-time="customTime" @update:select-text="handleSelectDate"
           @update:custom-time="handleCustomDate" />
@@ -355,11 +355,11 @@ const handleChangeTime = value => {
 // 激活的标签列表
 const activeTagList = computed(() => {
   const arr = []
-  if (selectedArea.value && selectedArea.value !== '全部领域') {
+  if (selectedArea.value && selectedArea.value[0] !== '全部领域') {
     arr.push(
       {
         tag: '科技领域',
-        name: selectedArea.value
+        name: selectedArea.value.join('、')
       }
     )
   }
@@ -434,7 +434,7 @@ const activeTagList = computed(() => {
 const handleCloseCurTag = (tag, index) => {
   switch (tag.tag) {
     case '科技领域':
-      selectedArea.value = '全部领域'
+      selectedArea.value = ['全部领域']
       break
     case '制裁时间':
       selectedDate.value = ''
@@ -533,7 +533,7 @@ const operationList = ref([
 
 // 科技领域
 const areaPlaceHolder = ref('请选择领域')
-const selectedArea = ref('全部领域')
+const selectedArea = ref(['全部领域'])
 const areaList = ref([
   {
     name: '全部领域',
@@ -601,7 +601,11 @@ const areaList = ref([
   },
 ])
 const handleSelectArea = (value) => {
-  selectedArea.value = value
+  if (value[value.length - 1] === '全部领域') {
+    selectedArea.value = ['全部领域']
+    return
+  }
+  selectedArea.value = value.length > 1 && value.includes('全部领域') ? value.filter(item => item !== '全部领域') : value;
 }
 
 // 制裁时间
@@ -750,7 +754,7 @@ const isCnEntityOnly = ref(false)
 
 // 清空条件
 const handleClear = () => {
-  selectedArea.value = '全部领域'
+  selectedArea.value = ['全部领域']
   selectedDate.value = ''
   customTime.value = []
   selectedCountry.value = '全部国家'
@@ -814,7 +818,7 @@ const fetchTableData = async () => {
     size: pageSize.value,
     // keyword: '',
     type: 10,  // 实体清单
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     countryId: selectedCountry.value === '全部国家' ? null : selectedCountry.value,  // 国家地区
@@ -904,7 +908,7 @@ const fetchAllData = async () => {
     page: 1,
     size: 9999,
     type: 10,  // 实体清单
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     countryId: selectedCountry.value === '全部国家' ? null : selectedCountry.value,  // 国家地区
@@ -1061,7 +1065,11 @@ const handleDownloadCurChartData = () => {
 const initParam = () => {
   const hasQuery = Object.keys(route.query).length > 0;
   if (hasQuery) {
-    selectedArea.value = route.query.domains ? route.query.domains : '全部领域'
+    if (route.query.selectedAreaList) {
+      selectedArea.value = JSON.parse(route.query.selectedAreaList)
+    } else {
+      selectedArea.value = route.query.domains ? [route.query.domains] : ['全部领域']
+    }
 
     if (route.query.selectedDate && Array.isArray(JSON.parse(route.query.selectedDate)) && JSON.parse(route.query.selectedDate).length) {
       selectedDate.value = '自定义'
@@ -1088,7 +1096,11 @@ const initParam = () => {
     }
   } else {
     const savedQuery = JSON.parse(sessionStorage.getItem('entityRouteQuery') || '{}');
-    selectedArea.value = savedQuery.domains ? savedQuery.domains : '全部领域'
+    if (savedQuery.selectedAreaList) {
+      selectedArea.value = JSON.parse(savedQuery.selectedAreaList)
+    } else {
+      selectedArea.value = savedQuery.domains ? [savedQuery.domains] : ['全部领域']
+    }
     if (savedQuery.selectedDate && Array.isArray(JSON.parse(savedQuery.selectedDate)) && JSON.parse(savedQuery.selectedDate).length) {
       selectedDate.value = '自定义'
       customTime.value = JSON.parse(savedQuery.selectedDate)

src/views/dataLibrary/exportControl/entityListEvent/index.vue

@@ -3,7 +3,7 @@
     <div class="header-box">
       <div class="header-top">
         <SelectBox :placeholder-name="areaPlaceHolder" select-title="科技领域" :select-list="areaList"
-          :select-name="selectedArea" @update:select-text="handleSelectArea" />
+          :select-name="selectedArea" :is-multiple="true" @update:select-text="handleSelectArea" />
         <SelectBox :placeholder-name="DatePlaceHolder" select-title="制裁时间" :select-list="dateList"
           :select-name="selectedDate" :custom-time="customTime" @update:select-text="handleSelectDate"
           @update:custom-time="handleCustomDate" />
@@ -283,11 +283,11 @@ const handleChangeTime = value => {
 // 激活的标签列表
 const activeTagList = computed(() => {
   const arr = []
-  if (selectedArea.value && selectedArea.value !== '全部领域') {
+  if (selectedArea.value && selectedArea.value[0] !== '全部领域') {
     arr.push(
       {
         tag: '科技领域',
-        name: selectedArea.value
+        name: selectedArea.value.join('、')
       }
     )
   }
@@ -317,7 +317,7 @@ const activeTagList = computed(() => {
 const handleCloseCurTag = (tag, index) => {
   switch (tag.tag) {
     case '科技领域':
-      selectedArea.value = '全部领域'
+      selectedArea.value = ['全部领域']
       break
     case '制裁时间':
       selectedDate.value = ''
@@ -404,7 +404,7 @@ const operationList = ref([
 
 // 科技领域
 const areaPlaceHolder = ref('请选择领域')
-const selectedArea = ref('全部领域')
+const selectedArea = ref(['全部领域'])
 const areaList = ref([
   {
     name: '全部领域',
@@ -472,7 +472,11 @@ const areaList = ref([
   },
 ])
 const handleSelectArea = (value) => {
-  selectedArea.value = value
+  if (value[value.length - 1] === '全部领域') {
+    selectedArea.value = ['全部领域']
+    return
+  }
+  selectedArea.value = value.length > 1 && value.includes('全部领域') ? value.filter(item => item !== '全部领域') : value;
 }
 
 // 制裁时间
@@ -519,7 +523,7 @@ const isInvolveCnOnly = ref(false)
 
 // 清空条件
 const handleClear = () => {
-  selectedArea.value = '全部领域'
+  selectedArea.value = ['全部领域']
   selectedDate.value = ''
   customTime.value = []
   isInvolveCnOnly.value = false
@@ -579,7 +583,7 @@ const fetchTableData = async () => {
     size: pageSize.value,
     // keyword: '',
     type: 12,  // 实体清单事件
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     isInvolveCn: isInvolveCnOnly.value ? 'Y' : null,  // 是否只看中国实体
@@ -649,7 +653,7 @@ const fetchAllData = async () => {
     page: 1,
     size: 9999,
     type: 12,  // 实体清单事件
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     isInvolveCn: isInvolveCnOnly.value ? 'Y' : null,  // 是否只看中国实体
@@ -803,7 +807,11 @@ const handleDownloadCurChartData = () => {
 const initParam = () => {
   const hasQuery = Object.keys(route.query).length > 0;
   if (hasQuery) {
-    selectedArea.value = route.query.domains ? route.query.domains : '全部领域'
+    if (route.query.selectedAreaList) {
+      selectedArea.value = JSON.parse(route.query.selectedAreaList)
+    } else {
+      selectedArea.value = route.query.domains ? [route.query.domains] : ['全部领域']
+    }
 
     if (route.query.selectedDate && Array.isArray(JSON.parse(route.query.selectedDate)) && JSON.parse(route.query.selectedDate).length) {
       selectedDate.value = '自定义'
@@ -819,7 +827,11 @@ const initParam = () => {
     }
   } else {
     const savedQuery = JSON.parse(sessionStorage.getItem('entityEventRouteQuery') || '{}');
-    selectedArea.value = savedQuery.domains ? savedQuery.domains : '全部领域'
+    if (savedQuery.selectedAreaList) {
+      selectedArea.value = JSON.parse(savedQuery.selectedAreaList)
+    } else {
+      selectedArea.value = savedQuery.domains ? [savedQuery.domains] : ['全部领域']
+    }
     if (savedQuery.selectedDate && Array.isArray(JSON.parse(savedQuery.selectedDate)) && JSON.parse(savedQuery.selectedDate).length) {
       selectedDate.value = '自定义'
       customTime.value = JSON.parse(savedQuery.selectedDate)

src/views/dataLibrary/financeControl/mREList/index.vue

@@ -3,7 +3,7 @@
     <div class="header-box">
       <div class="header-top">
         <SelectBox :placeholder-name="areaPlaceHolder" select-title="科技领域" :select-list="areaList"
-          :select-name="selectedArea" @update:select-text="handleSelectArea" />
+          :select-name="selectedArea" :is-multiple="true" @update:select-text="handleSelectArea" />
         <SelectBox :placeholder-name="DatePlaceHolder" select-title="制裁时间" :select-list="dateList"
           :select-name="selectedDate" :custom-time="customTime" @update:select-text="handleSelectDate"
           @update:custom-time="handleCustomDate" />
@@ -307,11 +307,11 @@ const handleChangeTime = value => {
 // 激活的标签列表
 const activeTagList = computed(() => {
   const arr = []
-  if (selectedArea.value && selectedArea.value !== '全部领域') {
+  if (selectedArea.value && selectedArea.value[0] !== '全部领域') {
     arr.push(
       {
         tag: '科技领域',
-        name: selectedArea.value
+        name: selectedArea.value.join('、')
       }
     )
   }
@@ -364,7 +364,7 @@ const activeTagList = computed(() => {
 const handleCloseCurTag = (tag, index) => {
   switch (tag.tag) {
     case '科技领域':
-      selectedArea.value = '全部领域'
+      selectedArea.value = ['全部领域']
       break
     case '制裁时间':
       selectedDate.value = ''
@@ -400,7 +400,7 @@ const operationList = ref([
 
 // 科技领域
 const areaPlaceHolder = ref('请选择领域')
-const selectedArea = ref('全部领域')
+const selectedArea = ref(['全部领域'])
 const areaList = ref([
   {
     name: '全部领域',
@@ -468,7 +468,11 @@ const areaList = ref([
   },
 ])
 const handleSelectArea = (value) => {
-  selectedArea.value = value
+  if (value[value.length - 1] === '全部领域') {
+    selectedArea.value = ['全部领域']
+    return
+  }
+  selectedArea.value = value.length > 1 && value.includes('全部领域') ? value.filter(item => item !== '全部领域') : value;
 }
 
 // 制裁时间
@@ -582,7 +586,7 @@ const handleInputCategoryName = value => {
 
 // 清空条件
 const handleClear = () => {
-  selectedArea.value = '全部领域'
+  selectedArea.value = ['全部领域']
   selectedDate.value = ''
   customTime.value = []
   selectedType.value = '全部类别'
@@ -643,7 +647,7 @@ const fetchTableData = async () => {
     page: currentPage.value,
     size: pageSize.value,
     type: 15,  // 涉军企业清单
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     materialCategory: selectedType.value === '全部类别' ? null : selectedType.value,  // 物项类别
@@ -725,7 +729,7 @@ const fetchAllData = async () => {
     page: 1,
     size: 9999,
     type: 15,  // 涉军企业清单
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     materialCategory: selectedType.value === '全部类别' ? null : selectedType.value,  // 物项类别
@@ -881,7 +885,11 @@ const handleDownloadCurChartData = () => {
 const initParam = () => {
   const hasQuery = Object.keys(route.query).length > 0;
   if (hasQuery) {
-    selectedArea.value = route.query.domains ? route.query.domains : '全部领域'
+    if (route.query.selectedAreaList) {
+      selectedArea.value = JSON.parse(route.query.selectedAreaList)
+    } else {
+      selectedArea.value = route.query.domains ? [route.query.domains] : ['全部领域']
+    }
 
     if (route.query.selectedDate && Array.isArray(JSON.parse(route.query.selectedDate)) && JSON.parse(route.query.selectedDate).length) {
       selectedDate.value = '自定义'
@@ -897,15 +905,16 @@ const initParam = () => {
     }
   } else {
     const savedQuery = JSON.parse(sessionStorage.getItem('mRListRouteQuery') || '{}');
-    selectedArea.value = savedQuery.domains ? savedQuery.domains : '全部领域'
+    if (savedQuery.selectedAreaList) {
+      selectedArea.value = JSON.parse(savedQuery.selectedAreaList)
+    } else {
+      selectedArea.value = savedQuery.domains ? [savedQuery.domains] : ['全部领域']
+    }
     if (savedQuery.selectedDate && Array.isArray(JSON.parse(savedQuery.selectedDate)) && JSON.parse(savedQuery.selectedDate).length) {
       selectedDate.value = '自定义'
       customTime.value = JSON.parse(savedQuery.selectedDate)
     }
-
-
   }
-
 }
 
 // 跳转企业详情

src/views/dataLibrary/financeControl/mREListEvent/index.vue

@@ -3,7 +3,7 @@
     <div class="header-box">
       <div class="header-top">
  <SelectBox :placeholder-name="areaPlaceHolder" select-title="科技领域" :select-list="areaList"
-          :select-name="selectedArea" @update:select-text="handleSelectArea" />
+          :select-name="selectedArea" :is-multiple="true" @update:select-text="handleSelectArea" />
         <SelectBox :placeholder-name="DatePlaceHolder" select-title="制裁时间" :select-list="dateList"
           :select-name="selectedDate" :custom-time="customTime" @update:select-text="handleSelectDate"
           @update:custom-time="handleCustomDate" />
@@ -282,11 +282,11 @@ const handleChangeTime = value => {
 // 激活的标签列表
 const activeTagList = computed(() => {
   const arr = []
-  if (selectedArea.value && selectedArea.value !== '全部领域') {
+  if (selectedArea.value && selectedArea.value[0] !== '全部领域') {
     arr.push(
       {
         tag: '科技领域',
-        name: selectedArea.value
+        name: selectedArea.value.join('、')
       }
     )
   }
@@ -316,7 +316,7 @@ const activeTagList = computed(() => {
 const handleCloseCurTag = (tag, index) => {
   switch (tag.tag) {
     case '科技领域':
-      selectedArea.value = '全部领域'
+      selectedArea.value = ['全部领域']
       break
     case '制裁时间':
       selectedDate.value = ''
@@ -403,7 +403,7 @@ const operationList = ref([
 
 // 科技领域
 const areaPlaceHolder = ref('请选择领域')
-const selectedArea = ref('全部领域')
+const selectedArea = ref(['全部领域'])
 const areaList = ref([
   {
     name: '全部领域',
@@ -471,7 +471,11 @@ const areaList = ref([
   },
 ])
 const handleSelectArea = (value) => {
-  selectedArea.value = value
+  if (value[value.length - 1] === '全部领域') {
+    selectedArea.value = ['全部领域']
+    return
+  }
+  selectedArea.value = value.length > 1 && value.includes('全部领域') ? value.filter(item => item !== '全部领域') : value;
 }
 
 // 制裁时间
@@ -518,7 +522,7 @@ const isInvolveCnOnly = ref(false)
 
 // 清空条件
 const handleClear = () => {
-  selectedArea.value = '全部领域'
+  selectedArea.value = ['全部领域']
   selectedDate.value = ''
   customTime.value = []
   isInvolveCnOnly.value = false
@@ -578,7 +582,7 @@ const fetchTableData = async () => {
     size: pageSize.value,
     // keyword: '',
     type: 17,  // 涉军企业清单事件
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     isInvolveCn: isInvolveCnOnly.value ? 'Y' : null,  // 是否只看中国实体
@@ -648,7 +652,7 @@ const fetchAllData = async () => {
     page: 1,
     size: 9999,
     type: 17,  // 涉军企业清单事件
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     isInvolveCn: isInvolveCnOnly.value ? 'Y' : null,  // 是否只看中国实体
@@ -802,7 +806,11 @@ const handleDownloadCurChartData = () => {
 const initParam = () => {
   const hasQuery = Object.keys(route.query).length > 0;
   if (hasQuery) {
-    selectedArea.value = route.query.domains ? route.query.domains : '全部领域'
+    if (route.query.selectedAreaList) {
+      selectedArea.value = JSON.parse(route.query.selectedAreaList)
+    } else {
+      selectedArea.value = route.query.domains ? [route.query.domains] : ['全部领域']
+    }
 
     if (route.query.selectedDate && Array.isArray(JSON.parse(route.query.selectedDate)) && JSON.parse(route.query.selectedDate).length) {
       selectedDate.value = '自定义'
@@ -818,7 +826,11 @@ const initParam = () => {
     }
   } else {
     const savedQuery = JSON.parse(sessionStorage.getItem('mRListEventRouteQuery') || '{}');
-    selectedArea.value = savedQuery.domains ? savedQuery.domains : '全部领域'
+    if (savedQuery.selectedAreaList) {
+      selectedArea.value = JSON.parse(savedQuery.selectedAreaList)
+    } else {
+      selectedArea.value = savedQuery.domains ? [savedQuery.domains] : ['全部领域']
+    }
     if (savedQuery.selectedDate && Array.isArray(JSON.parse(savedQuery.selectedDate)) && JSON.parse(savedQuery.selectedDate).length) {
       selectedDate.value = '自定义'
       customTime.value = JSON.parse(savedQuery.selectedDate)

src/views/dataLibrary/financeControl/sDNList/index.vue

@@ -3,7 +3,7 @@
     <div class="header-box">
       <div class="header-top">
         <SelectBox :placeholder-name="areaPlaceHolder" select-title="科技领域" :select-list="areaList"
-          :select-name="selectedArea" @update:select-text="handleSelectArea" />
+          :select-name="selectedArea" :is-multiple="true" @update:select-text="handleSelectArea" />
         <SelectBox :placeholder-name="DatePlaceHolder" select-title="制裁时间" :select-list="dateList"
           :select-name="selectedDate" :custom-time="customTime" @update:select-text="handleSelectDate"
           @update:custom-time="handleCustomDate" />
@@ -142,7 +142,7 @@
             </el-table-column>
             <el-table-column label="上市地点">
               <template #default="scope">
-                <span class="person-item text-compact" >{{ scope.row.organizationName
+                <span class="person-item text-compact">{{ scope.row.organizationName
                 }}</span>
               </template>
             </el-table-column>
@@ -355,11 +355,11 @@ const handleChangeTime = value => {
 // 激活的标签列表
 const activeTagList = computed(() => {
   const arr = []
-  if (selectedArea.value && selectedArea.value !== '全部领域') {
+  if (selectedArea.value && selectedArea.value[0] !== '全部领域') {
     arr.push(
       {
         tag: '科技领域',
-        name: selectedArea.value
+        name: selectedArea.value.join('、')
       }
     )
   }
@@ -434,7 +434,7 @@ const activeTagList = computed(() => {
 const handleCloseCurTag = (tag, index) => {
   switch (tag.tag) {
     case '科技领域':
-      selectedArea.value = '全部领域'
+      selectedArea.value = ['全部领域']
       break
     case '制裁时间':
       selectedDate.value = ''
@@ -533,7 +533,7 @@ const operationList = ref([
 
 // 科技领域
 const areaPlaceHolder = ref('请选择领域')
-const selectedArea = ref('全部领域')
+const selectedArea = ref(['全部领域'])
 const areaList = ref([
   {
     name: '全部领域',
@@ -601,7 +601,11 @@ const areaList = ref([
   },
 ])
 const handleSelectArea = (value) => {
-  selectedArea.value = value
+  if (value[value.length - 1] === '全部领域') {
+    selectedArea.value = ['全部领域']
+    return
+  }
+  selectedArea.value = value.length > 1 && value.includes('全部领域') ? value.filter(item => item !== '全部领域') : value;
 }
 
 // 制裁时间
@@ -750,7 +754,7 @@ const isCnEntityOnly = ref(false)
 
 // 清空条件
 const handleClear = () => {
-  selectedArea.value = '全部领域'
+  selectedArea.value = ['全部领域']
   selectedDate.value = ''
   customTime.value = []
   selectedCountry.value = '全部国家'
@@ -814,7 +818,7 @@ const fetchTableData = async () => {
     size: pageSize.value,
     // keyword: '',
     type: 14,  // SDN清单
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     countryId: selectedCountry.value === '全部国家' ? null : selectedCountry.value,  // 国家地区
@@ -904,7 +908,7 @@ const fetchAllData = async () => {
     page: 1,
     size: 9999,
     type: 14,  // SDN清单
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     countryId: selectedCountry.value === '全部国家' ? null : selectedCountry.value,  // 国家地区
@@ -1061,7 +1065,11 @@ const handleDownloadCurChartData = () => {
 const initParam = () => {
   const hasQuery = Object.keys(route.query).length > 0;
   if (hasQuery) {
-    selectedArea.value = route.query.domains ? route.query.domains : '全部领域'
+    if (route.query.selectedAreaList) {
+      selectedArea.value = JSON.parse(route.query.selectedAreaList)
+    } else {
+      selectedArea.value = route.query.domains ? [route.query.domains] : ['全部领域']
+    }
 
     if (route.query.selectedDate && Array.isArray(JSON.parse(route.query.selectedDate)) && JSON.parse(route.query.selectedDate).length) {
       selectedDate.value = '自定义'
@@ -1088,7 +1096,11 @@ const initParam = () => {
     }
   } else {
     const savedQuery = JSON.parse(sessionStorage.getItem('sDNListRouteQuery') || '{}');
-    selectedArea.value = savedQuery.domains ? savedQuery.domains : '全部领域'
+    if (savedQuery.selectedAreaList) {
+      selectedArea.value = JSON.parse(savedQuery.selectedAreaList)
+    } else {
+      selectedArea.value = savedQuery.domains ? [savedQuery.domains] : ['全部领域']
+    }
     if (savedQuery.selectedDate && Array.isArray(JSON.parse(savedQuery.selectedDate)) && JSON.parse(savedQuery.selectedDate).length) {
       selectedDate.value = '自定义'
       customTime.value = JSON.parse(savedQuery.selectedDate)

src/views/dataLibrary/financeControl/sDNListEvent/index.vue

@@ -2,8 +2,8 @@
   <div class="countrybill-wrapper">
     <div class="header-box">
       <div class="header-top">
-        <SelectBox :placeholder-name="areaPlaceHolder" select-title="科技领域" :select-list="areaList"
-          :select-name="selectedArea" @update:select-text="handleSelectArea" />
+<SelectBox :placeholder-name="areaPlaceHolder" select-title="科技领域" :select-list="areaList"
+          :select-name="selectedArea" :is-multiple="true" @update:select-text="handleSelectArea" />
         <SelectBox :placeholder-name="DatePlaceHolder" select-title="制裁时间" :select-list="dateList"
           :select-name="selectedDate" :custom-time="customTime" @update:select-text="handleSelectDate"
           @update:custom-time="handleCustomDate" />
@@ -283,11 +283,11 @@ const handleChangeTime = value => {
 // 激活的标签列表
 const activeTagList = computed(() => {
   const arr = []
-  if (selectedArea.value && selectedArea.value !== '全部领域') {
+  if (selectedArea.value && selectedArea.value[0] !== '全部领域') {
     arr.push(
       {
         tag: '科技领域',
-        name: selectedArea.value
+        name: selectedArea.value.join('、')
       }
     )
   }
@@ -317,7 +317,7 @@ const activeTagList = computed(() => {
 const handleCloseCurTag = (tag, index) => {
   switch (tag.tag) {
     case '科技领域':
-      selectedArea.value = '全部领域'
+      selectedArea.value = ['全部领域']
       break
     case '制裁时间':
       selectedDate.value = ''
@@ -404,7 +404,7 @@ const operationList = ref([
 
 // 科技领域
 const areaPlaceHolder = ref('请选择领域')
-const selectedArea = ref('全部领域')
+const selectedArea = ref(['全部领域'])
 const areaList = ref([
   {
     name: '全部领域',
@@ -472,7 +472,11 @@ const areaList = ref([
   },
 ])
 const handleSelectArea = (value) => {
-  selectedArea.value = value
+  if (value[value.length - 1] === '全部领域') {
+    selectedArea.value = ['全部领域']
+    return
+  }
+  selectedArea.value = value.length > 1 && value.includes('全部领域') ? value.filter(item => item !== '全部领域') : value;
 }
 
 // 制裁时间
@@ -519,7 +523,7 @@ const isInvolveCnOnly = ref(false)
 
 // 清空条件
 const handleClear = () => {
-  selectedArea.value = '全部领域'
+  selectedArea.value = ['全部领域']
   selectedDate.value = ''
   customTime.value = []
   isInvolveCnOnly.value = false
@@ -579,7 +583,7 @@ const fetchTableData = async () => {
     size: pageSize.value,
     // keyword: '',
     type: 16,  // SDN清单事件
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     isInvolveCn: isInvolveCnOnly.value ? 'Y' : null,  // 是否只看中国实体
@@ -649,7 +653,7 @@ const fetchAllData = async () => {
     page: 1,
     size: 9999,
     type: 12,  // 实体清单事件
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],  // 科技领域
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     isInvolveCn: isInvolveCnOnly.value ? 'Y' : null,  // 是否只看中国实体
@@ -803,7 +807,11 @@ const handleDownloadCurChartData = () => {
 const initParam = () => {
   const hasQuery = Object.keys(route.query).length > 0;
   if (hasQuery) {
-    selectedArea.value = route.query.domains ? route.query.domains : '全部领域'
+    if (route.query.selectedAreaList) {
+      selectedArea.value = JSON.parse(route.query.selectedAreaList)
+    } else {
+      selectedArea.value = route.query.domains ? [route.query.domains] : ['全部领域']
+    }
 
     if (route.query.selectedDate && Array.isArray(JSON.parse(route.query.selectedDate)) && JSON.parse(route.query.selectedDate).length) {
       selectedDate.value = '自定义'
@@ -819,7 +827,11 @@ const initParam = () => {
     }
   } else {
     const savedQuery = JSON.parse(sessionStorage.getItem('sDNListEventRouteQuery') || '{}');
-    selectedArea.value = savedQuery.domains ? savedQuery.domains : '全部领域'
+    if (savedQuery.selectedAreaList) {
+      selectedArea.value = JSON.parse(savedQuery.selectedAreaList)
+    } else {
+      selectedArea.value = savedQuery.domains ? [savedQuery.domains] : ['全部领域']
+    }
     if (savedQuery.selectedDate && Array.isArray(JSON.parse(savedQuery.selectedDate)) && JSON.parse(savedQuery.selectedDate).length) {
       selectedDate.value = '自定义'
       customTime.value = JSON.parse(savedQuery.selectedDate)

src/views/dataLibrary/news/index.vue

@@ -3,7 +3,7 @@
     <div class="header-box">
       <div class="header-top">
         <SelectBox :placeholder-name="areaPlaceHolder" select-title="科技领域" :select-list="areaList"
-          :select-name="selectedArea" @update:select-text="handleSelectArea" />
+          :select-name="selectedArea" :is-multiple="true" @update:select-text="handleSelectArea" />
         <SelectBox :placeholder-name="DatePlaceHolder" select-title="发布时间" :select-list="dateList"
           :select-name="selectedDate" :custom-time="customTime" @update:select-text="handleSelectDate"
           @update:custom-time="handleCustomDate" />
@@ -300,11 +300,11 @@ const handleChangeTime = value => {
 // 激活的标签列表
 const activeTagList = computed(() => {
   const arr = []
-  if (selectedArea.value && selectedArea.value !== '全部领域') {
+  if (selectedArea.value && selectedArea.value[0] !== '全部领域') {
     arr.push(
       {
         tag: '科技领域',
-        name: selectedArea.value
+        name: selectedArea.value.join('、')
       }
     )
   }
@@ -332,7 +332,7 @@ const activeTagList = computed(() => {
 const handleCloseCurTag = (tag, index) => {
   switch (tag.tag) {
     case '科技领域':
-      selectedArea.value = '全部领域'
+      selectedArea.value = ['全部领域']
       break
     case '发布时间':
       selectedDate.value = ''
@@ -360,7 +360,7 @@ const operationList = ref([
 
 // 科技领域
 const areaPlaceHolder = ref('请选择领域')
-const selectedArea = ref('全部领域')
+const selectedArea = ref(['全部领域'])
 const areaList = ref([
   {
     name: '全部领域',
@@ -428,7 +428,11 @@ const areaList = ref([
   },
 ])
 const handleSelectArea = (value) => {
-  selectedArea.value = value
+  if (value[value.length - 1] === '全部领域') {
+    selectedArea.value = ['全部领域']
+    return
+  }
+  selectedArea.value = value.length > 1 && value.includes('全部领域') ? value.filter(item => item !== '全部领域') : value;
 }
 
 // 提出时间
@@ -484,7 +488,7 @@ const handleSelectSourceMedia = value => {
 
 // 清空条件
 const handleClear = () => {
-  selectedArea.value = '全部领域'
+  selectedArea.value = ['全部领域']
   selectedDate.value = ''
   customTime.value = []
   selectedSourceMedia.value = '全部来源媒体'
@@ -544,7 +548,7 @@ const fetchTableData = async () => {
     size: pageSize.value,
     // keyword: '',
     type: 8,  // type 1= 法案  2= 政令 3 =智库 4=智库报告 5=实体清单【制裁记录】 6= 人物 7= 机构 8=新闻 9= 社媒
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0] ? customTime.value[0] : null,
     proposedDateEnd: customTime.value[1] ? customTime.value[1] : null,
     sort: isSort.value ? 0 : 1     // 0 先按分数降序 后按时间降序  1 先按分数降序，再按时间升序
@@ -625,7 +629,7 @@ const fetchAllData = async () => {
     size: 9999,
     // keyword: '',
     type: 8,  // type 1= 法案  2= 政令 3 =智库 4=智库报告 5=实体清单【制裁记录】 6= 人物 7= 机构 8=新闻 9= 社媒
-    domains: selectedArea.value === '全部领域' ? null : [selectedArea.value],
+    domains: selectedArea.value[0] === '全部领域' ? null : selectedArea.value,
     proposedDateStart: customTime.value[0],
     proposedDateEnd: customTime.value[1],
     sort: isSort.value ? 0 : 1
@@ -778,7 +782,11 @@ const handleDownloadCurChartData = () => {
 const initParam = () => {
   const hasQuery = Object.keys(route.query).length > 0;
   if (hasQuery) {
-    selectedArea.value = route.query.domains ? route.query.domains : '全部领域'
+    if (route.query.selectedAreaList) {
+      selectedArea.value = JSON.parse(route.query.selectedAreaList)
+    } else {
+      selectedArea.value = route.query.domains ? [route.query.domains] : ['全部领域']
+    }
 
     if (route.query.selectedDate && Array.isArray(JSON.parse(route.query.selectedDate)) && JSON.parse(route.query.selectedDate).length) {
       selectedDate.value = '自定义'
@@ -793,7 +801,11 @@ const initParam = () => {
     }
   } else {
     const savedQuery = JSON.parse(sessionStorage.getItem('dataNewsRouteQuery') || '{}');
-    selectedArea.value = savedQuery.domains ? savedQuery.domains : '全部领域'
+    if (savedQuery.selectedAreaList) {
+      selectedArea.value = JSON.parse(savedQuery.selectedAreaList)
+    } else {
+      selectedArea.value = savedQuery.domains ? [savedQuery.domains] : ['全部领域']
+    }
     if (savedQuery.selectedDate && Array.isArray(JSON.parse(savedQuery.selectedDate)) && JSON.parse(savedQuery.selectedDate).length) {
       selectedDate.value = '自定义'
       customTime.value = JSON.parse(savedQuery.selectedDate)