liuQiang пре 1 година
родитељ
комит
fb13c1b8b2
3 измењених фајлова са 24 додато и 7 уклоњено
  1. 11 1
      src/components/ImgPreview/ImgPreview.vue
  2. 10 3
      src/views/collect/index.vue
  3. 3 3
      src/views/liveChat/index.vue

+ 11 - 1
src/components/ImgPreview/ImgPreview.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 图片预览 -->
-  <div class="demo-image__preview" v-if="copyFileType === '.png'">
+  <div class="demo-image__preview" v-if="canSeeImg(copyFileType)">
     <el-image-viewer
       v-if="showImageViewer"
       :url-list="[previewData]"
@@ -84,6 +84,16 @@ const closeImgPreview = () => {
   // console.log('sonClose');
   emit("closeImgPreview");
 };
+const canSeeImg = (copyFileType)=>{
+  // console.log('copyFileType',props.copyFileType);
+  const arr = ['.jpg','.JPG','.png','.PNG','.jpeg','JPEG','gif','GIF']
+  if(arr.includes(copyFileType)){
+    // console.log(1);
+    return true
+  }else{
+    return false
+  }
+}
 </script>
 
 <style scoped>

+ 10 - 3
src/views/collect/index.vue

@@ -223,7 +223,14 @@
                   :src="setIcon(item.docInfo.fileType)"
                   alt=""
                 />
+                <el-tooltip
+                  class="box-item"
+                  effect="dark"
+                  :content="item.docInfo.fileName"
+                  placement="top"
+                >
                 <span>{{ item.docInfo.fileName }}</span>
+                </el-tooltip>
               </div>
             </div>
           </el-scrollbar>
@@ -446,14 +453,14 @@ const tabchange = async (labelId) => {
     isAsc: isAsc.value,
     orderByColumn: "createTime",
   };
-  let res
+  let res;
   if (labelId === "second") {
-     res = await listFavoriteById(-1);
+    res = await listFavoriteById(-1);
     console.log("res", res);
     // return;
   } else {
     // 获取当前标签下的数据
-     res = await listFavoriteById(labelId);
+    res = await listFavoriteById(labelId);
   }
 
   // console.log("----res", res);

+ 3 - 3
src/views/liveChat/index.vue

@@ -220,8 +220,8 @@ const msgSendClick = (event) => {
     event.preventDefault();
   }
 };
-const msgSendClick2 = (event) => {
-  if (!event.shiftKey && event.keyCode == 13 && !event.ctrlKey) {
+const msgSendClick2 = (event,icon) => {
+  if ((!event.shiftKey && event.keyCode == 13 && !event.ctrlKey)||icon) {
   event.preventDefault();
   noMes.value = false;
     if (messageText.value.trim() == "") {
@@ -702,7 +702,7 @@ onMounted(() => {
               @keydown.enter="msgSendClick2($event)"
             />
             <!-- 发送按钮 -->
-            <img :src="send" class="send-info" @click="msgSendClick2" />
+            <img :src="send" class="send-info" @click="msgSendClick2($event,true)" />
           </el-footer>
         </el-container>
       </div>