Merge branch 'master' of http://192.168.1.22:3000/Web/bigscreenWeb

src/views/SagTraceResult_WX/components/eventStatistics/index.vue

@@ -611,7 +611,11 @@ const handleChartClick = (params: any) => {
 };
 
 // 定义 emit
-const emit = defineEmits(["flag-changed", "expand-detail"]);
+const emit = defineEmits([
+  "flag-changed",
+  "expand-detail",
+  "refresh-security-detail",
+]);
 
 watch(flag, (newVal) => {
   // 向父组件发送 flag 变化事件
@@ -745,7 +749,7 @@ const initHasEventList = () => {
 
         const dataObject = {
           eventList: [...eventList.value],
-          color: "#7ac1f9",
+          color: "#375db4",
         };
 
         // 发送eventList数据到iframe，注意发送的是.value而不是响应式对象本身
@@ -781,7 +785,7 @@ const initHasUpEventList = () => {
 
         const dataObject = {
           eventList: [...eventList.value],
-          color: "#fcfc57",
+          color: "#f08a0a",
           flagValue: "2",
         };
 
@@ -849,14 +853,13 @@ const analysisClick = (row: any) => {
           maxResponsibilityMonitorId.value = res.data
             .filter((item) => item.isImport == 1)
             .map((item) => item.lineId); // 筛选 isImport 为 1
-          console.log(maxResponsibilityMonitorId.value, "890jhuj");
         }
 
         const dataObject = {
           eventList: [...eventList.value],
-          color: "#fcfc57",
+          color: "#1dd1a1",
           maxResponsibilityMonitorId: [...maxResponsibilityMonitorId.value],
-          maxColor: "#ff0000",
+          maxColor: "#f9065b",
         };
 
         // 发送eventList数据到iframe，注意发送的是.value而不是响应式对象本身
@@ -951,6 +954,8 @@ const initialResponsibilityList = () => {
         }
         loading.value = false;
       }
+      // 通知父组件刷新 manage/securityDetail.vue 中的数据
+      emit("refresh-security-detail");
     })
     .catch((error) => {
       traceabilityTableData.value = [];
@@ -1181,11 +1186,11 @@ const callHarmOneImageApi = (row: any, selectedTime: string) => {
       const dataObject = {
         eventListAll: [JSON.parse(JSON.stringify(eventListAll.value))],
         eventList: [...eventList.value],
-        color: "#fcfc57",
+        color: "#09ee06",
         maxResponsibilityMonitorId: [...maxResponsibilityMonitorId.value],
-        maxColor: "#ff0000",
+        maxColor: "#c708fe",
         backgroundPointId: [...backgroundPoint.value],
-        backgroundPointColor: "#03df6d",
+        backgroundPointColor: "#0936f4",
       };
       // 发送所有 monitorId 数据到 iframe
       sendMessageToIframe("SEND_KEYS_TO_IFRAME", dataObject);

src/views/SagTraceResult_WX/components/eventStatistics/system.vue

@@ -420,7 +420,7 @@ const submit = () => {
 
 // 执行
 const execute = async (item: any, index: number) => {
-  if (item.time == undefined) {
+  if (time.value == undefined || time.value.length == 0) {
     return ElMessage.warning("请选择时间范围");
   }
   tabList.value[activeName.value].showDynamic = false;

src/views/SagTraceResult_WX/components/manage/securityDetail.vue

@@ -526,6 +526,7 @@ const loading = ref(false);
 
 const trendChartRef = ref();
 
+
 // 页码
 const params = reactive({
   pageNum: 1,
@@ -945,9 +946,14 @@ const init = () => {
   eventList();
 };
 
+const refreshResponsibilityList = () => {
+  initialResponsibilityList();
+};
+
 defineExpose({
   init,
   setShowDetail, // 暴露方法给父组件调用
+  refreshResponsibilityList
 });
 </script>