Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-pc-vue

src/views/home/album_compoents/albumCarousel.vue

@@ -6,9 +6,11 @@
         class="picture-preview-wrap v-dialog"
         :show-close="false"
         append-to-body
+        @close="closeDialog"
     >
         <div class="picture-file">
-            <div class="left-img" v-loading="isLoadingImg"  element-loading-background="rgba(0, 0, 0, 0.3)">
+            <div class="left-img">
+                <!-- v-loading="isLoadingImg"  element-loading-background="rgba(0, 0, 0, 0.3)" -->
                 <album-carousel-item
                     lbum-carousel-item
                     v-if="images"
@@ -123,9 +125,9 @@ eventBus.on("click:point",function({farmId,sampleId, data}){
   sampleId = data.id;
     isLoadingImg.value = true
   let params = {sampleId,farmId}
-      dialogVisible.value = true
   VE_API.miniimage.list(params).then(res => {
-    if(res.code === 0){
+      if(res.code === 0){
+        dialogVisible.value = true
       images.value = res.data
       isLoadingImg.value = false
     }
@@ -189,7 +191,7 @@ const photoList = ref([
     {key: "营养", statement: "无营养异常"},
 ]);
 
-const activeOuput = ref(1);
+const activeOuput = ref(null);
 
 // 产量详情
 function toggleAcitve(name) {
@@ -207,6 +209,11 @@ function toggleAcitve(name) {
     }
 }
 
+function closeDialog() {
+    activeOuput.value = null
+    eventBus.emit("change:watermark", "")
+}
+
 // 质量详情
 function toggleQualityAcitve() {
 
@@ -219,6 +226,7 @@ function toggleQualityAcitve() {
     display: flex;
     .left-img {
         min-width: 500px;
+        min-height: 300px;
     }
     .file-wrap {
         background: url("@/assets/images/home/file-bg.png") no-repeat top center / 100% 100%;