Merge branch 'manage' of http://www.sysuimars.cn:3000/lxf/foster-pc-vue into manage

src/views/home/album_compoents/albumCarousel.vue

@@ -70,7 +70,7 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, onUnmounted } from "vue";
+import { ref, computed, onMounted, onUnmounted, onActivated } from "vue";
 import "./cacheImg.js";
 import AlbumCarouselItem from "./albumCarouselItem";
 import { dateFormat } from "@/utils/date_util.js";
@@ -108,6 +108,7 @@ const qualityBox = ref([
     { id: 7, name: "病虫比例", value: "" },
 ]);
 const showTag = ref(false);
+
 eventBus.off("click:point", handleClickPoint);
 eventBus.on("click:point", handleClickPoint);
 

src/views/home/album_compoents/albumDrawBox.vue

@@ -71,9 +71,8 @@ let data = {year:props.photo.uploadDate.substring(0,4),
 }
 
 async function drawWatermark(event,name) {
-  console.log(name)
   if(!name){
-    drawWatermark1(event)
+    // drawWatermark1(event)
   }else{
     // drawTargetRectangles2(event.target,props.photo.watermarks.find(item=>item.name === name))
   }

src/views/home/index.vue

@@ -76,7 +76,6 @@
 
     <!-- 图片弹窗 -->
     <PicturePreview :imageUrl="urls" :curIndex="urlsIndex"></PicturePreview>
-    <album-carousel></album-carousel>
     <PdfDialog title="果园报告"></PdfDialog>
 </template>
 
@@ -98,7 +97,6 @@ import { convertPointToArray } from "@/utils/index";
 import { useRouter } from "vue-router";
 import { useStore } from "vuex";
 import eventBus from "@/api/eventBus";
-import AlbumCarousel from "./album_compoents/albumCarousel.vue";
 import PdfDialog from "../../components/PdfDialog";
 let store = useStore();
 const components = {