anytrek-front-public-component 1.13.2 → 1.13.4

package/README.md

@@ -753,9 +753,6 @@ const saveFunctionLandmark = async (
   :haveMap="haveMap"
   :needPath="needPath"
   :mapJson="mapJson"
-  :childImages="childImages"
-  :isMutiple="isMutiple"
-  :carouselInterval="1000"
   :google-map-key="googleMapKey"
   :on-get-history-trail="fetchHistoryTrail"
   :on-get-history-trail-point="fetchHistoryTrailPoint"
@@ -763,7 +760,6 @@ const saveFunctionLandmark = async (
   @handle-close="onClose"
   @handle-download="onDownload"
   @update-cur-img="onUpdateCurImg"
-  @updateChildUrl="onUpdateChildUrl"
   @changeCurPicWH="changeCurPicWH"
   @to-history="onToHistory"
 />
@@ -776,8 +772,6 @@ const visible = ref(false)
 const imageData = ref<any>({})
 const previewItem = ref<any>({})//当前设备
 const imgList = ref<any[]>([]);
-const childImages = ref<any[]>([]);
-const isMutiple = ref(false);
 
 /* 图片宽高 */
 const curPicWH = ref<any>({
@@ -786,18 +780,23 @@ const curPicWH = ref<any>({
 });
 const showImageDisplay = () => {
   imageDisplayParams.value.curImg = {};
-  imageDisplayParams.value.isMutiple = false;
-  imageDisplayParams.value.childImages = [];
   imageDisplayRef.value?.loadImageListFun();
 
   visible.value = true;
 }
-/* CargoHandling 相同 uuid并且index相同 归为一项，新增 imageList 字段存所有帧按 takeTime 最新排序 */
-const groupCargoHandlingImages = (list: any[]): any[] => {
+/* 2310图片轮播，triggerType为CargoHandling或者eventType为9且uuid，index相同归为一项，新增 imageList 字段存，按 takeTime 最新排序 */
+// 2310视频，uuid一样，含有media字段
+export const groupCargoHandlingImages = (list: any[]): any[] => {
   const groupMap = new Map<string, any[]>();
+  const needMergeVideo = true;//
   list.forEach((item: any) => {
-    if (item.triggerType === 'CargoHandling' && item.uuid) {
-      const key = `${item.uuid}-${item.index}`;
+    if ((item.triggerType === 'CargoHandling' || item.eventType === 9) && item.uuid) {
+      const key = `picture-${item.uuid}-${item.index}`;
+      if (!groupMap.has(key)) groupMap.set(key, []);
+      groupMap.get(key)!.push(item);
+    }
+    if (item.media && item.uuid && needMergeVideo) {
+      const key = `media-${item.uuid}`;
       if (!groupMap.has(key)) groupMap.set(key, []);
       groupMap.get(key)!.push(item);
     }
@@ -807,11 +806,21 @@ const groupCargoHandlingImages = (list: any[]): any[] => {
   groupMap.forEach((items) => {
     items.sort((a: any, b: any) => new Date(a.takeTime).getTime() - new Date(b.takeTime).getTime());
     const timeStampGap = new Date(items[items.length - 1].takeTime).getTime() - new Date(items[0].takeTime).getTime();
-    const timeGap = formatDuration(timeStampGap, { d: true, h: true, m: true });
-    result.push({ ...items[0], imageList: [...items], timeGap });
+    const timeGap = formatDuration(timeStampGap, { d: true, h: true, m: true, s: true });
+    if (items[0].media) {
+      result.push({ ...items[0], videoList: [...items], timeGap });
+    } else {
+      result.push({ ...items[0], imageList: [...items], timeGap });
+    }
+    
   });
   list.forEach((item: any) => {
-    if (!(item.triggerType === 'CargoHandling' && item.uuid && groupedUuids.has(`${item.uuid}-${item.index}`))) {
+    // if (!(item.triggerType === 'CargoHandling' && item.uuid && groupedUuids.has(`picture-${item.uuid}-${item.index}`))) {
+    //   result.push(item);
+    // }
+    const isNotMutiplePicture = item.triggerType !== 'CargoHandling' && item.eventType !== 9;
+    const isNotMedia = !needMergeVideo || !item.media;
+    if (isNotMutiplePicture && isNotMedia) {
       result.push(item);
     }
   });
@@ -864,8 +873,6 @@ const fetchImgList = async (successFun: Function) => {
   if (list[0]) {
     imageData.value = { ...list[0] };
   }
-  isMutiple.value = imageData.value.imageList?.length > 1;
-  childImages.value = imageData.value.imageList?.map((i: any) => i.url) || [];
   imgList.value = list;
   successFun();
 }
@@ -882,25 +889,9 @@ const onDownload = async(data: any) => {
 
 const onUpdateCurImg = (index: number) => {
   const img = { ...imgList.value[index] };
-  delete img._mainUrl;
   imageData.value = img;
-  isMutiple.value = img?.imageList?.length > 1;
-  childImages.value = img?.imageList?.map((i: any) => i.url) || [];
 }
 
-const onUpdateChildUrl = (url: string) => {
-  const img = imageData.value;
-  if (!img._mainUrl) {
-    img._mainUrl = img.url;
-  }
-  if (img.imageList) {
-    const child = img.imageList.find((i: any) => i.url === url);
-    if (child) {
-        Object.assign(img, child);
-        img.url = url;
-    }
-  }
-}
 
 const changeCurPicWH = (data: any) => {
   if (curPicWH.value.imgW !== data.imgW || curPicWH.value.imgH !== data.imgH) {
@@ -961,9 +952,6 @@ const onToHistory = (data: any) => {
 | `onGetHistoryTrail` | 获取历史轨迹 | `Function` | — |
 | `onGetHistoryTrailPoint` | 获取轨迹点详情 | `Function` | — |
 | `getImgList` | 获取图片列表（弹窗打开且列表为空时调用） | `Function` | — |
-| `isMutiple` | 是否开启多帧图片轮播模式 | `Boolean` | `false` |
-| `childImages` | 子图 URL 列表（多帧轮播时使用） | `String[]` | `[]` |
-| `carouselInterval` | 图片轮播的时间间隙(毫秒) | `Number` | 1000 |
 
 
 
@@ -975,7 +963,6 @@ const onToHistory = (data: any) => {
 | `handleDownload` | 下载图片，始终返回数组，父组件通过数组长度判断下载方式 | `data: Object[]` |
 | `updateCurImg` | 切换图片 | `index: Number` |
 | `toHistory` | 跳转轨迹历史 | `params: Object` |
-| `updateChildUrl` | 多帧轮播切换子图时触发 | `url: String` |
 | `changeCurPicWH` | 图片加载后会返回原图宽高 | `params: Object` |
 
 ### 📋 Methods Reference (通过 ref 调用)