Merge remote-tracking branch 'origin/dev' into dev

src/views/emergencyCommandMap/RightSection/JointDuty.vue

@@ -105,13 +105,16 @@ const handleDownLoad = () => {
   };
 };
 
+// 设置定时器
+const fetchInterval = process.env.NODE_ENV === 'development' ? 60000 : 3000; // 每60秒刷新一次(刷新太频繁影响调试)
+
 const nextFetchData = ()=> {
   setTimeout(()=>{
     getCheckinList(eventId.value).then((res) => {
       listData.value = res.data;
       nextFetchData();
     });
-  }, 1500)
+  }, fetchInterval)
 };
 
 onMounted(() => {

src/views/emergencyCommandMap/RightSection/RightTop.vue

@@ -66,9 +66,9 @@ const activeTab = ref('任务跟踪');
 
 const setActiveTab = (id) => {
   activeTab.value = id;
-  if(id === '预案通知' && notifications.value.length === 0) {
-    fetchData();
-  }
+  //if(id === '预案通知' && notifications.value.length === 0) {
+  //  fetchData();
+  //}
 };
 
 // 定义 notifications

src/views/emergencyCommandMap/RightSection/knowledgeWarehouse.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog custom-show type="xl" title="事件管理列表" @close="closeDialog">
+  <Dialog custom-show type="xl" title="知识库列表" @close="closeDialog">
     <!-- 表格组件 -->
     <div class="common-table">
       <div class="table-header">