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

src/components/Dialog/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     v-if="modelValue || customShow"
-    v-drag="{ draggable: draggable, position: 'fixed', scale: containerScale, handle: '.dialog-header' }"
+    v-drag="{ draggable: draggable, position: 'fixed', scale: containerScale, handle: headerType === 'header2' ? '.dialog-header2' : '.dialog-header' }"
     class="common-dialog"
     :class="customClass"
     :style="{ width: computedWidth, height: computedHeight, zIndex: zIndex }"

src/components/Dialog/index2.vue

@@ -1,77 +0,0 @@
-<template>
-  <div>
-    <div v-if="modelValue" class="dialog-wrap" :style="{ width: width ? width : '780px', height: height ? height : '590px' }">
-      <!--    <div class="overlay" @click="closeDialog"></div>-->
-      <div class="dialog" :style="{ width: width ? width : '780px', height: height ? height : '590px' }">
-        <div class="dialog-header">
-          <div class="dialog-title">{{ title }}</div>
-          <div class="icon-close" @click="closeDialog">
-            <el-icon size="40px"><Close /></el-icon>
-          </div>
-        </div>
-        <div class="dialog-content">
-          <slot />
-        </div>
-      </div>
-    </div>
-  </div>
-
-</template>
-
-<script lang="ts" setup>
-interface Props {
-  modelValue: boolean;
-  title?: string;
-  width?: string;
-  height?: string;
-}
-const props = withDefaults(defineProps<Props>(), {
-  modelValue: false
-});
-const emit = defineEmits(['update:modelValue', 'close']);
-
-// 关闭弹窗
-const closeDialog = () => {
-  emit('update:modelValue', false);
-  emit('close');
-};
-</script>
-
-<style lang="scss" scoped>
-.dialog-wrap {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 2000;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 16px;
-  .dialog {
-    height: 590px;
-    margin: 0 auto;
-    background-color: #fff;
-    border-radius: 10px;
-  }
-}
-.dialog {
-  padding: 0 20px;
-  .dialog-header {
-    width: 100%;
-    height: 70px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    .dialog-title {
-      font-size: 36px;
-    }
-    .icon-close {
-      cursor: pointer;
-    }
-  }
-  .dialog-content {
-    padding: 10px 0;
-  }
-}
-</style>

src/components/VideoTagEdit/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="show" title="视频标签" height="auto" @close="handleClose" @confirm="handleAdd">
+  <Dialog v-model="show" title="视频标签" height="auto" draggable @close="handleClose" @confirm="handleAdd">
     <div class="title-box">
       <div class="title">当前标签</div>
     </div>

src/types/components.d.ts

@@ -89,7 +89,7 @@ declare module 'vue' {
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']
-    Index2: typeof import('./../components/Dialog/index2.vue')['default']
+    Index2: typeof import('./../components/HKVideo/index2.vue')['default']
     LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
     LineWidthSelect: typeof import('./../components/LineWidthSelect/index.vue')['default']
     Map: typeof import('./../components/Map/index.vue')['default']

src/views/globalMap/RightMenu/UAV/DroneDetail.vue

@@ -20,7 +20,7 @@
         </div>
         <div class="btn3" @click="handleSwitchFlyVideo">
           <i class="icon-switch" />
-          <div>{{ isFlyVideo ? '切换监控视频' : '切换飞行视频' }}</div>
+          <div>{{ isFlyVideo ? '切换机库视频' : '切换飞行视频' }}</div>
         </div>
       </div>
       <div class="title-box2">

src/views/globalMap/index.vue

@@ -275,9 +275,7 @@ const getDrawTool = () => {
 };
 const getPlaceSearch = () => {
   const domRef = mapStore.isAMap ? mapRef.value : map2Ref.value;
-  if (!!domRef) {
-    domRef.getPlaceSearch();
-  }
+  return !!domRef ? domRef.getPlaceSearch() : {};
 };
 const trackPlayback = (data) => {
   const domRef = mapStore.isAMap ? mapRef.value : mapUtils;