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

src/api/operlog/index.ts

@@ -9,3 +9,13 @@ export function list(query){
     params: query
   });
 }
+
+
+// 指挥日志
+export function event_log(query: OperLogQuery): AxiosPromise<OperLogVO[]> {
+  return request({
+    url: '/api/system/czrz/event_log',
+    method: 'get',
+    params: query
+  });
+}

src/views/emergencyCommandMap/LeftSection/Drone.vue

@@ -23,8 +23,10 @@
 </template>
 
 <script setup lang="ts">
+import { ref, reactive, toRefs, onMounted } from 'vue';
 import { Search } from '@element-plus/icons-vue';
 import { getDroneTree } from '@/api/emergencyCommandMap/Drone';
+const proxy = getCurrentInstance()?.proxy;
 interface QueryParams {
   equipment: string;
 }
@@ -40,11 +42,12 @@ let showIframe = ref(false);
 let iframeUrl = ref('');
 let iframeTitle = ref('');
 const handleNodeClick = (data, node) => {
-  if (!!data.url && node.isLeaf) {
-    iframeUrl.value = data.url;
-    iframeTitle.value = data.label;
-    showIframe.value = true;
-  }
+  proxy?.$modal.msgWarning('省厅的茂名应急无人机需要手工启动【统一融合通信平台】查看');
+  // if (!!data.url && node.isLeaf) {
+  //   iframeUrl.value = data.url;
+  //   iframeTitle.value = data.label;
+  //   showIframe.value = true;
+  // }
 };
 const treeData = ref([]);
 onMounted(() => {

src/views/routineCommandMap/RightSection/EventReport/CommandRecord.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script lang="ts" setup name="CommandRecord">
-import { list } from '@/api/operlog';
+import { event_log } from '@/api/operlog';
 
 const props = defineProps({
   modelValue: {
@@ -50,7 +50,7 @@ const queryParams = reactive({
 
 /** 查询日志 */
 const getList = async () => {
-  const res = await list(queryParams);
+  const res = await event_log(queryParams);
   operlogList.value = res.rows;
   total.value = res.total;
 };