Merge branch 'master' of http://8.140.26.4:10003/caijian/risk-monitor into dev_hhq

src/api/aiAnalysis/index.js

+import request from "@/api/request.js";
+
+// 图表解读（流式）
+/**
+ * @param {text} 
+ */
+export function getChartAnalysis(data) {
+  return request({
+    method: 'POST',
+    url: `/aiAnalysis/chart_interpretation`,
+    data,
+  })
+}
\ No newline at end of file

src/api/ruleRestriction/index.js

+import request from "@/api/request.js";
+
+// 规则限制-首页统计接口
+export function getStatCount() {
+  return request({
+    method: 'GET',
+    url: `/api/ruleLimitInfo/statCount`
+  })
+}
+
+// 规则限制-查询最新动态接口
+export function getLatestUpdates() {
+  return request({
+    method: 'GET',
+    url: `/api/ruleLimitInfo/getLatestUpdates`
+  })
+}
+
+// 规则限制-风险信号
+export function getRiskSignal(params) {
+  return request({
+    method: 'GET',
+    url: `/api/commonFeature/riskSignal/${params}`
+  })
+}
+
+// 规则限制-查询新闻资讯
+export function getNews(params) {
+  return request({
+    method: 'GET',
+    url: `/api/commonFeature/news/${params}`
+  })
+}
+
+// 规则限制-查询社交媒体
+export function getRemarks(params) {
+  return request({
+    method: 'GET',
+    url: `/api/commonFeature/remarks/${params}`
+  })
+}
+
+// 规则限制-限制领域分布情况
+/**
+ * @param {Object} params
+ * @param {string} params.year
+ * @header token
+ */
+export function getAreaDistribution(params) {
+  return request({
+    method: 'GET',
+    url: `/api/ruleLimitInfo/getAreaDistribution`,
+    params
+  })
+}
+
+// 规则限制-受限实体数量变化趋势
+/**
+ * @param {Object} params
+ * @param {Integer} params.year
+ * @param {String} params.type
+ * @header token
+ */
+export function getEntityChangeTrend(params) {
+  return request({
+    method: 'GET',
+    url: `/api/ruleLimitInfo/getEntityChangeTrend`,
+    params
+  })
+}
+
+// 规则限制-规则限制政令列表查询接口
+/**
+ * @param {Object} params
+ * @param {Integer} params.currentPage
+ * @param {Integer} params.pageSize
+ * @param {List<String>} params.years
+ * @param {List<String>} params.areas
+ * @param {String} params.keywords
+ * @param {String} params.sortField
+ * @param {String} params.sortOrder
+ * @header token
+ */
+export function getRuleLimitList(params) {
+  return request({
+    method: 'GET',
+    url: `/api/ruleLimitInfo/getRuleLimitList`,
+    params
+  })
+}
+
+// 规则限制-排华科技联盟列表接口
+/**
+ * @param {Object} params
+ * @param {Integer} params.currentPage
+ * @param {Integer} params.pageSize
+ * @param {List<String>} params.years
+ * @param {List<String>} params.countries
+ * @param {List<String>} params.areas
+ * @param {String} params.keywords
+ * @param {String} params.sortField
+ * @param {String} params.sortOrder
+ * @header token
+ */
+export function getACTAList(params) {
+  return request({
+    method: 'GET',
+    url: `/api/ruleLimitInfo/getACTAList`,
+    params
+  })
+}
+
+export function getAcTAAllcountry() {
+  return request({
+    method: 'GET',
+    url: `/api/ruleLimitInfo/getACTAAllCountry/`
+  })
+}
+
+
+// 规则限制-规则限制基本详情
+export function getSanctionOverview(params) {
+  return request({
+    method: 'GET',
+    url: `/api/ruleLimitInfo/getSanctionOverview/${params}`
+  })
+}
+
+
+// 实体清单-制裁概况-获取发布机构机构动态
+/**
+ * @param {Object} data
+ * @param {string} data.orgId
+ * @header token
+ */
+export function getPublishOrgInfo(data) {
+  return request({
+    method: 'POST',
+    url: `/api/organization/relate/news`,
+    data,
+  })
+}
\ No newline at end of file

src/router/modules/ZMGame.js

@@ -2,7 +2,6 @@
 import ZMGame from "@/views/ZMGame/index.vue";
 
 const ZMGameRoutes = [
-  //创新主体
   {
     path: "/ZMGame",
     name: "ZMGame",

src/router/modules/ZMOverView.js

@@ -2,10 +2,9 @@
 import ZMOverview from "@/views/ZMOverView/index.vue";
 
 const ZMOverviewRoutes = [
-  //创新主体
   {
-    path: "/ZMOerView",
-    name: "ZMOerView",
+    path: "/ZMOverView",
+    name: "ZMOverView",
     component: ZMOverview,
     meta: {
       title: "ZM博弈概览"
@@ -14,4 +13,4 @@ const ZMOverviewRoutes = [
 
 ]
 
-export default ZMOverviewRoutes
+export default ZMOverviewRoutes
\ No newline at end of file

src/views/ZMOverView/components/fourSuppress/components/addDomain/index.vue

+<!--科技要闻-->
+<template>
+	<div class="content-wrapper">
+		全领域
+	</div>
+</template>
+
+<script setup>
+import { onMounted, ref, computed } from "vue";
+
+</script>
+
+<style lang="scss" scoped>
+.content-wrapper {
+    width: 1666px;
+    height: 2132px;
+    
+}
+</style>

src/views/ZMOverView/components/fourSuppress/components/allElement/uitls/worldCloudChart.js

+
+
+const getWordCloudChart = (data) => {
+  const option = {
+    grid: {
+      left: 0,
+      top: 0,
+      right: 0,
+      bottom: 0,
+    },
+    series: [
+      {
+        type: "wordCloud",
+        width: '80%',
+        height: '80%',
+        shape: "rect",  // 
+        // 其他形状你可以使用形状路径
+        // 或者自定义路径
+        //         shape: 'circle'      // 圆形（默认）
+        // shape: 'rect'        // 矩形
+        // shape: 'roundRect'   // 圆角矩形
+        // shape: 'triangle'    // 三角形
+        // shape: 'diamond'     // 菱形
+        // shape: 'pentagon'    // 五边形
+        // shape: 'star'        // 星形
+        // shape: 'cardioid'    // 心形
+        gridSize: 15, // 网格大小，影响词间距。
+        sizeRange: [10, 30], // 定义词云中文字大小的范围
+        rotationRange: [0, 0],
+        rotationStep: 15,
+        drawOutOfBound: false,  // 是否超出画布
+        // 字体
+        textStyle: {
+          // normal: {
+          //   color: function () {
+          //     return 'rgb(' + [
+          //       Math.round(Math.random() * 160),
+          //       Math.round(Math.random() * 160),
+          //       Math.round(Math.random() * 160)
+          //     ].join(',') + ')';
+          //   }
+          // },
+          color: function () {
+            let colors = [
+              "rgba(189, 33, 33, 1)",
+              "rgba(232, 151, 21, 1)",
+              "rgba(220, 190, 68, 1)",
+              "rgba(96, 58, 186, 1)",
+              "rgba(32, 121, 69, 1)",
+              "rgba(22, 119, 255, 1)",
+            ];
+            return colors[parseInt(Math.random() * colors.length)];
+          },
+          emphasis: {
+            shadowBlur: 5,
+            shadowColor: "#333",
+          },
+        },
+        // 设置词云数据
+        data: data,
+      },
+    ],
+  }
+
+  return option
+}
+
+export default getWordCloudChart
\ No newline at end of file

src/views/ZMOverView/components/fourSuppress/components/allUnion/index.vue

+<!--科技要闻-->
+<template>
+	<div class="content-wrapper">
+		全联盟
+	</div>
+</template>
+
+<script setup>
+import { onMounted, ref, computed } from "vue";
+
+</script>
+
+<style lang="scss" scoped>
+.content-wrapper {
+    width: 1666px;
+    height: 2132px;
+    
+}
+</style>

src/views/ZMOverView/components/fourSuppress/index.vue

 <!--科技要闻-->
 <template>
 	<div class="content-wrapper">
-		美对华四全打压
+		<div class="main-nav">
+			<div
+				v-for="item in navList"
+				:key="item.name"
+				class="nav-item"
+				:class="{ active: activeNav === item.name }"
+				@click="handleNavClick(item.name)"
+			>
+				<div class="item-content">
+					<img v-if="activeNav === item.name" :src="right" class="active-icon" alt="" />
+					<span>{{ item.name }}</span>
+				</div>
+				<img v-if="activeNav === item.name" :src="background" class="active-bg" alt="" />
+			</div>
+		</div>
+		<!-- 切换不同的组件 -->
+		<AllGovernment v-if="activeNav === '全政府'" />
+		<AddDomain v-if="activeNav === '全领域'" />
+		<AllUnion v-if="activeNav === '全联盟'" />
+		<AllElement v-if="activeNav === '全要素'" />
 	</div>
 </template>
 
 <script setup>
 import { onMounted, ref, computed } from "vue";
+import right from "./assets/right.png";
+import background from "./assets/background.png";
 
+// 组件引入
+import AllGovernment from "./components/allGovernment/index.vue";
+import AddDomain from "./components/addDomain/index.vue";
+import AllUnion from "./components/allUnion/index.vue";
+import AllElement from "./components/allElement/index.vue";
+
+const navList = ref([{ name: "全政府" }, { name: "全领域" }, { name: "全联盟" }, { name: "全要素" }]);
+
+const activeNav = ref("全政府");
+
+const handleNavClick = name => {
+	activeNav.value = name;
+};
 </script>
 
 <style lang="scss" scoped>
 .content-wrapper {
-    width: 100%;
-    height: 2203px;
-    
+	// width: 1601px;
+    width: 1666px;
+	height: 2203px;
+	margin: 0 auto;
+	.main-nav {
+		width: 1601px;
+		height: 55px;
+        margin: 0 auto;
+		padding: 4px 5px;
+		display: flex;
+		align-items: center;
+		border-radius: 10px;
+		background-color: rgba(255, 255, 255, 0.65);
+		box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
+		box-sizing: border-box;
+		gap: 8px;
+		margin-bottom: 16px;
+		.nav-item {
+			flex: 1;
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			cursor: pointer;
+			position: relative;
+			// transition: all 0.3s;
+
+			.item-content {
+				display: flex;
+				align-items: center;
+				z-index: 1;
+
+				.active-icon {
+					width: 18px;
+					height: 18px;
+					margin-right: 8px;
+				}
+
+				span {
+					font-family: "YouSheBiaoTiHei";
+					font-size: 24px;
+					font-weight: 400;
+					line-height: 31px;
+					color: rgb(59, 65, 75);
+				}
+			}
+
+			.active-bg {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+				width: 400px;
+				height: 60px;
+				z-index: 0;
+			}
+
+			&.active {
+				background-color: rgba(246, 250, 255, 1);
+				border: 1px solid rgba(174, 214, 255, 1);
+				border-radius: 10px;
+
+				span {
+					color: rgb(5, 95, 194);
+				}
+			}
+		}
+	}
 }
 </style>

src/views/ZMOverView/components/newRisk/index.vue

@@ -286,7 +286,7 @@ onMounted(() => {
 <style lang="scss" scoped>
 .content-wrapper {
 	width: 100%;
-	height: 100%;
+	// height: 100%;
 
 	.policy-monitoring {
 		font-family: Arial, sans-serif;

src/views/bill/billHome/index.vue

@@ -299,9 +299,10 @@
 												{{ news.newsDate ? news.newsDate.slice(5) : "" }} - {{ news.newsOrg }}
 											</div>
 										</div>
-										<CommonPrompt :content="news.newsContent">
+										<div class="right-footer">{{ news.newsContent }}</div>
+										<!-- <CommonPrompt :content="news.newsContent">
 											<div class="right-footer">{{ news.newsContent }}</div>
-										</CommonPrompt>
+										</CommonPrompt> -->
 									</div>
 								</div>
 							</div>
@@ -597,7 +598,7 @@
 									<el-checkbox class="filter-checkbox" label="全部领域"> 全部领域 </el-checkbox>
 									<el-checkbox
 										v-for="(area, index) in cateKuList"
-										:key="area.id"
+										:key="index"
 										:label="area.id"
 										class="filter-checkbox"
 									>
@@ -615,7 +616,7 @@
 								<el-checkbox-group class="checkbox-group" v-model="activeDpList" @change="handleDpChange">
 									<el-checkbox
 										v-for="(dp, index) in dpList"
-										:key="dp.id"
+										:key="index"
 										:label="dp.id"
 										class="filter-checkbox"
 									>
@@ -633,7 +634,7 @@
 								<el-checkbox-group class="checkbox-group" v-model="activeYyList" @change="handleYyChange">
 									<el-checkbox
 										v-for="(yy, index) in yyList"
-										:key="yy.id"
+										:key="index"
 										:label="yy.id"
 										class="filter-checkbox"
 									>
@@ -652,7 +653,7 @@
 								<el-checkbox-group class="checkbox-group" v-model="activePubTime" @change="handlePubTimeChange">
 									<el-checkbox
 										v-for="(time, index) in pubTime"
-										:key="time.id"
+										:key="index"
 										:label="time.id"
 										class="filter-checkbox"
 									>
@@ -2936,7 +2937,7 @@ onUnmounted(() => {
 							justify-content: flex-end;
 						}
 						.box7-main {
-							height: 380px;
+							height: 390px;
 						}
 					}
 					.box8 {

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

@@ -6,7 +6,7 @@ const getDoublePieChart = (data1, data2) => {
     series: [
       {
         type: 'pie',
-        radius: [45, 88],
+        radius: [35, 78],
         // height: '100%',
         left: 'center',
         // width: '100%',
@@ -32,7 +32,7 @@ const getDoublePieChart = (data1, data2) => {
       },
       {
         type: 'pie',
-        radius: [90, 120],
+        radius: [80, 110],
         height: '100%',
         left: 'center',
         width: '98%',
@@ -45,18 +45,20 @@ const getDoublePieChart = (data1, data2) => {
           formatter: '{name|{b}}\n{time|{c} 条 {d}%}',
           minMargin: 5,
           edgeDistance: 10,
-          lineHeight: 24,
+          lineHeight: 20,
            rich: {
             name: {
               color: 'rgba(59, 65, 75, 1)',
               fontFamily: 'Microsoft YaHei',
-              fontSize: 16,
+              fontSize: 14,
               fontWeight: 'bold',
+              padding: [10,0,10,0]
             },
             time: {
-              fontSize: 16,
+              fontSize: 14,
               fontFamily: 'Microsoft YaHei',
-              color: '#rgba(95, 101, 108, 1)'
+              color: '#rgba(95, 101, 108, 1)',
+              padding: [10,0,10,0]
             }
           }
         },

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

@@ -17,18 +17,20 @@ const getPieChart = (data, colorList) => {
           formatter: '{name|{b}}\n{time|{c} 条 {d}%}',
           minMargin: 5,
           edgeDistance: 10,
-          lineHeight: 25,
+          lineHeight: 22,
           rich: {
             name: {
               color: 'rgba(59, 65, 75, 1)',
               fontFamily: 'Microsoft YaHei',
               fontSize: 16,
               fontWeight: 'bold',
+              padding: [10, 0, 10, 0]
             },
             time: {
               fontSize: 16,
               fontFamily: 'Microsoft YaHei',
-              color: '#rgba(95, 101, 108, 1)'
+              color: '#rgba(95, 101, 108, 1)',
+              padding: [10, 0, 10, 0]
             }
           }
 
@@ -36,10 +38,10 @@ const getPieChart = (data, colorList) => {
         labelLine: {
           length: 15,
           length2: 0,
-          maxSurfaceAngle: 80
+          maxSurfaceAngle: 88
         },
         labelLayout: function (params) {
-          const isLeft = params.labelRect.x < params.viewWidth / 2;
+          const isLeft = params.labelRect.x < 556 / 2;
           const points = params.labelLinePoints;
           // Update the end point.
           points[2][0] = isLeft

src/views/coopRestriction/components/resLib/index.vue

@@ -106,7 +106,8 @@ const getMainDataList = async () => {
 		params.sortOrder = value.value;
 	}
 
-	try {
+  try {
+    console.log('----params getMainDataList', params)
 		const res = await getCoopRestrictionList(params);
 		if (res && res.code === 200) {
 			mainDataList.value = (res.data.content || []).map(item => ({

src/views/decree/decreeHome/utils/piechart.js

@@ -16,7 +16,7 @@ const getPieChart = (data) => {
           formatter: '{name|{b}}\n{time|{d}%}',
           minMargin: 5,
           edgeDistance: 10,
-          lineHeight: 24,
+          lineHeight: 22,
           rich: {
             name: {
               color: 'rgba(59, 65, 75, 1)',
@@ -27,7 +27,7 @@ const getPieChart = (data) => {
             time: {
               fontSize: 16,
               fontFamily: 'Microsoft YaHei',
-              color: '#rgba(95, 101, 108, 1)'
+              color: '#rgba(95, 101, 108, 1)',
             }
           }
         },

src/views/exportControl/v2.0CommercialControlList/components/sanctionsOverview/components/introductionPage/index.vue

@@ -161,26 +161,26 @@
 							@click="handlePerClick(item)"
 						>
 							<img :src="item.imageUrl" alt />
-              
+
 							<div class="person-info">
-                <el-tooltip
-								effect="dark"
-								:content="item.name"
-								popper-class="common-prompt-popper"
-								placement="top"
-								:show-after="500"
-							>
-								<div class="name">{{ item.name }}</div>
-							</el-tooltip>
-              <el-tooltip
-								effect="dark"
-								:content="item.position"
-								popper-class="common-prompt-popper"
-								placement="top"
-								:show-after="500"
-							>
-								<div class="title1">{{ item.position }}</div>
-							</el-tooltip>
+								<el-tooltip
+									effect="dark"
+									:content="item.name"
+									popper-class="common-prompt-popper"
+									placement="top"
+									:show-after="500"
+								>
+									<div class="name">{{ item.name }}</div>
+								</el-tooltip>
+								<el-tooltip
+									effect="dark"
+									:content="item.position"
+									popper-class="common-prompt-popper"
+									placement="top"
+									:show-after="500"
+								>
+									<div class="title1">{{ item.position }}</div>
+								</el-tooltip>
 							</div>
 						</div>
 					</div>
@@ -916,10 +916,10 @@ onMounted(() => {
 							flex-shrink: 0;
 						}
 						.person-info {
-              width: calc(100% - 48px - 8px);
+							width: calc(100% - 48px - 8px);
 							overflow: hidden;
 							text-overflow: ellipsis;
-              white-space: nowrap; /* 防止文本换行 */
+							white-space: nowrap; /* 防止文本换行 */
 							.name {
 								font-size: 16px;
 								font-weight: 700;

src/views/exportControl/v2.0EntityList/components/sanctionsOverview/components/listPage/RuleSubsidiaryDialog.vue

@@ -78,7 +78,7 @@
 </template>
 
 <script setup>
-import { ref, defineProps, defineEmits, computed, watch } from "vue";
+import { ref, computed, watch } from "vue";
 import router from "@/router";
 import { Close } from "@element-plus/icons-vue";
 import defaultIcon from "@/assets/icons/default-icon1.png";

src/views/marketAccessRestrictions/marketAccessHome/index.vue

@@ -620,13 +620,13 @@
 									<div class="item-right-header">
 										<div class="tag" :class="{tag1: item.SORTCODE === '337', tag2: item.SORTCODE === '301', tag3: item.SORTCODE === '232' }">{{ item.SORTCODE }}</div>
 										<div class="title">{{ item.SEARCHNAME }}</div>
-										<div class="status">
+										<div class="status" v-if="item.CASESTATUS">
 											<div class="status-icon"></div>
 											<div class="status-text">{{ item.CASESTATUS }}</div>
 										</div>
 									</div>
-									<div class="item-right-content">
-										{{ item.content }}
+									<div class="item-right-content" v-if="item.CONTENT">
+										{{ item.CONTENT }}
 									</div>
 									<div class="item-right-footer">
 										<div class="area-box" v-for="(val, idx) in item.searchArea" :key="idx">
@@ -1600,9 +1600,6 @@ const handleGetSurveyList = async () => {
 		if (res.code === 200 && res.data) {
 			totalDiscussNum.value = res.data.totalElements;
 			surveyInfoList.value = res.data.content;
-			surveyInfoList.value.forEach(item => {
-				item.SORTIMAGEURL = `http://${item.SORTIMAGEURL}`
-			})
 		} else {
 			surveyInfoList.value = [];
 		}
@@ -3179,7 +3176,8 @@ onMounted(async () => {
 						border-bottom: 1px solid rgba(230, 231, 232, 1);
 						// height: 780px;
 						.item {
-							height: 154px;
+							// height: 154px;
+							min-height: 94px;
 							display: flex;
 							cursor: pointer;
 							&:hover {
@@ -3199,17 +3197,21 @@ onMounted(async () => {
 							}
 							.item-center {
 								width: 30px;
-								height: 154px;
+								// height: 154px;
 								.icon {
 									width: 30px;
 									height: 30px;
 									border-radius: 15px;
-									background: orange;
+									img{
+										width: 100%;
+										height: 100%;
+									}
 								}
 								.line {
 									margin-left: 14px;
 									width: 2px;
-									height: 124px;
+									min-height: 64px;
+									max-height: 124px;
 									border-radius: 1.5px;
 									background: rgba(234, 236, 238, 1);
 								}
@@ -3261,13 +3263,17 @@ onMounted(async () => {
 										line-height: 26px;
 										letter-spacing: 0px;
 										text-align: left;
+										overflow: hidden;
+										text-overflow: ellipsis;
+										white-space: nowrap;
 									}
 									.status {
 										margin-left: 9px;
 										display: flex;
 										width: 76px;
 										height: 24px;
-										justify-content: space-between;
+										justify-content: flex-end;
+										gap: 5px;
 										align-items: center;
 										.status-icon {
 											width: 4px;
@@ -3323,16 +3329,23 @@ onMounted(async () => {
 									}
 									.flag-box {
 										display: flex;
+										position: relative;
 										.flag {
 											width: 24px;
 											height: 24px;
 											border-radius: 12px;
+											border: 2px solid #fff;
 											overflow: hidden;
+											position: absolute;
 											img{
 												width: 100%;
 												height: 100%;
 											}
 										}
+										:nth-child(1) {
+											left: 18px;
+											z-index: 99;
+										}
 									}
 								}
 							}

src/views/marketAccessRestrictions/marketAccessHome/utils/barChart1.js

@@ -54,24 +54,19 @@ const getBarChart = (nameList, valueList) => {
       },
       barWidth: 20,
       markPoint: {
-        symbol: 'circle',
-        symbolSize: 0,
+        // symbol: 'circle',
+        // symbolSize: 0,
         data: (function () {
           const data = [];
           nameList.forEach((item, index) => {
             data.push({
               name: 'icon',
-              // value: '',
               xAxis: index,
               yAxis: valueList[index],
               symbol: `image://${item.img}`,
               symbolSize: [20, 20],
               symbolOffset: [0, 10],
-              // itemStyle: {
-              //   borderRadius: 10,  // 设置为圆形
-              //   borderColor: '#fff',
-              //   borderWidth: 2
-              // }
+              symbolCircle: 10
             });
           });
           return data;