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

src/api/allGovernment.js

@@ -3,11 +3,13 @@ import request from "@/api/request.js";
 // 全政府-获取美国政府部门制裁数据
 /**
  * @header token
+ *  * @param {String} params.monthNum // 月份数
  */
-export function getAllGovernmentList() {
+export function getAllGovernmentList(params) {
   return request({
     method: 'GET',
-    url: `/api/rivalryIndex/governmentSanctionsData`
+    url: `/api/rivalryIndex/governmentSanctionsData`,
+    params
   })
 }
 
@@ -17,7 +19,7 @@ export function getAllGovernmentList() {
  * @header token
  * @param {Object} params
  * @param {String} params.field // 领域
- * @param {String} params.monthNum = 12 // 月份数
+ * @param {String} params.monthNum // 月份数
  * @param {String} params.orgId // 机构ID
  * @param {String} params.sanType // 制裁手段
  */
@@ -66,3 +68,15 @@ export function getUSGovernmentSanctionHistory(params) {
     params
   })
 }
+
+
+// 全政府-获取部门数据
+/**
+ * @header token
+ */
+export function getDepartmentList() {
+  return request({
+    method: 'GET',
+    url: `/api/organization/summaryDepartList`
+  })
+}
\ No newline at end of file

src/api/allUnion.js

@@ -3,11 +3,13 @@ import request from "@/api/request.js";
 // 全联盟-获取联盟列表
 /**
  * @header token
+ * @param {Object} params
+ * @param {String} params.date - 日期
  */
-export function getAllUnionList() {
+export function getAllUnionList(params) {
   return request({
     method: 'GET',
-    url: `/api/union/union/unionList`
+    url: `/api/union/union/unionList/${params.date}`
   })
 }
 

src/api/zmOverview/allDomains/index.js

@@ -2,18 +2,31 @@ import request from "@/api/request.js";
 // 全领域
 
 // 全领域统计
-export function getAllDomainCount() {
+/**
+ * @header token
+ * @param {Object} params
+ * @param {String} params.startDate - 开始日期
+ * @param {String} params.endDate - 结束日期
+ */
+export function getAllDomainCount(params) {
 	return request({
 		method: "GET",
-		url: `/api/rivalryIndexV2/AllDomainCount`
+		url: `/api/rivalryIndexV2/AllDomainCount`,
+		params
 	});
 }
 
 // 美对华制裁措施数量趋势
-export function getDomainContainmentTrend(byYOrM = "按月统计") {
+/**
+ * @header token
+ * @param {Object} params
+ * @param {String} params.byYOrM - 按月统计或按年统计
+ */
+export function getDomainContainmentTrend(params) {
 	return request({
 		method: "GET",
-		url: `/api/rivalryIndexV2/DomainContainmentTrend?byYOrM=${byYOrM}`
+		url: `/api/rivalryIndexV2/DomainContainmentTrend`,
+		params
 	});
 }
 

src/views/ZMOverView/components/fourSuppress/components/addDomain/multiLineChart.js

@@ -10,6 +10,7 @@ const getMultiLineChart = (data) => {
   const echartsSeries = series.map((item, index) => ({
     name: item.name,
     type: 'line',
+    smooth: true,
     symbol: 'circle',
     symbolSize: 8,
     itemStyle: {
@@ -88,8 +89,8 @@ const getMultiLineChart = (data) => {
       {
         type: 'value',
         min: 0,
-        max: 100,
-        interval: 20,
+        // max: 100,
+        // interval: 20,
         axisLine: {
           show: false
         },

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

@@ -212,7 +212,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref, computed } from "vue";
+import { onMounted, ref, computed, inject } from "vue";
 import setChart from "@/utils/setChart";
 import getWordCloudChart from "./uitls/worldCloudChart";
 import {
@@ -225,6 +225,8 @@ import {
 	getOrderInfo
 } from "@/api/zmOverview/allElement";
 
+const activeDate = inject("activeDate");
+
 // 全要素统计
 const headerList = ref([]);
 const handleGetHeaderList = async () => {

src/views/ZMOverView/index.vue

@@ -81,7 +81,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref, computed } from "vue";
+import { onMounted, ref, computed, provide } from "vue";
 import { useRouter } from "vue-router";
 import { ElMessage } from "element-plus";
 import background from "./assets/images/backgroundBT.png";
@@ -149,11 +149,13 @@ const handleToSearch = () => {
 };
 
 const dateList = ref([
-	{ name: "本周", type: "week", icon: week, activeIcon: weekActive },
-	{ name: "本月", type: "month", icon: month, activeIcon: monthActive },
-	{ name: "今年", type: "year", icon: year, activeIcon: yearActive }
+	{ name: "近一个月", type: "week", icon: week, activeIcon: weekActive },
+	{ name: "近三个月", type: "three_month", icon: month, activeIcon: monthActive },
+	{ name: "近半年", type: "six_month", icon: month, activeIcon: monthActive },
+	{ name: "近一年", type: "year", icon: year, activeIcon: yearActive }
 ]);
 const activeDate = ref("week");
+provide("activeDate", activeDate);
 const handleDateClick = type => {
 	activeDate.value = type;
 };
@@ -270,7 +272,7 @@ const handleDateClick = type => {
 			position: relative;
 			margin-top: 64px;
 			.data-select {
-				width: 120px;
+				width: 140px;
 				height: 144px;
 				position: absolute;
 				top: 80px;