Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

yz3456

2024-03-26 eaafe26cb6aa070b002037ede1c7de74b6b5600b

 ruoyi-ui/src/views/travel/travelInfo.vue

@@ -136,37 +136,44 @@
          <div v-if="uploading" class="upload-status">正在上传...</div>
          <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <img
            <!-- 添加video元素用于显示视频 -->
            <video
              v-if="file.url.includes('.mp4')"
              class="el-upload-list__item-thumbnail"
              src="../../assets/401_images/401.gif"
              alt=""
              :src="file.url"
              style="width: 147px; height: 147px"
              fit="cover"
            >
            ></video>
            <img v-else
                 class="el-upload-list__item-thumbnail"
                 src="../../assets/401_images/401.gif"
                 alt=""
                 style="width: 147px; height: 147px"
                 fit="cover">

            <span class="el-upload-list__item-actions">
                  <span
               <span class="el-upload-list__item-name">{{ file.name }}</span>
                    <span
                      class="el-upload-list__item-preview"
                      @click="handleFileCardPreview(file)"
                    >
                      <i class="el-icon-zoom-in"></i>
                    </span>
                    <span

                    class="el-upload-list__item-preview"
                    @click="handleFileCardPreview(file)"
                  >
                    <i class="el-icon-zoom-in"></i>
                  </span>
                  <span

                    class="el-upload-list__item-delete"
                    @click="handleDownload(file.url)"
                  >
                      class="el-upload-list__item-delete"
                      @click="handleDownload(file.url)"
                    >
                 <i class="el-icon-download"></i>
                 </span>
                  <span
                    v-if="isShow"
                    class="el-upload-list__item-delete"
                    @click="handleRemoveFile(file)"
                  >
                    <i class="el-icon-delete"></i>
                  </span>
                </span>

                    <span
                      v-if="isShow"
                      class="el-upload-list__item-delete"
                      @click="handleRemoveFile(file)"
                    >
                      <i class="el-icon-delete"></i>
                    </span>
              </span>

          </div>

@@ -179,7 +186,7 @@
      </el-form>
    </div>
    <el-dialog  :visible.sync="dialogVisible">
      <img w-full :src="dialogImageUrl"    style="width: 700px; height: 700px" alt="Preview Image" />
      <img w-full :src="dialogImageUrl"    style="width: 100%; height: 100%" alt="Preview Image" />
    </el-dialog>
  </div>
</template>
@@ -198,7 +205,10 @@
    return {
      cdi:"家庭大事记信息",
      udi:"家庭大事记修改",
      fot:[".jpg",".jif","png"],
    // 数据范围选项
    fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
      '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
    
      fileList:[
      ],
      fileListOther:[
@@ -269,11 +279,11 @@
      this.btn= jd
      this.dsb = !jd
      this.isShow=true
      document.title = "修改旅游经历详细信息";
     // document.title = "修改旅游经历详细信息";
      this.$route.meta.title = "修改旅游经历详细信息";//列表的名称
    }
    else{
      document.title = "旅游经历详细信息";
   //   document.title = "旅游经历详细信息";
      this.$route.meta.title = "旅游经历详细信息";//列表的名称
      this.isShow=true
      this.btn = false;
@@ -292,12 +302,21 @@
            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)

            if (_this.fot.includes(pth) === true)
         {
            if(paths[i].includes("https"))
            _this.fileList.push({name:paths[i],url: paths[i]})
            else
              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
           }
            else {
              // alert(paths[i])
           if(paths[i].includes("https"))
           _this.fileListOther.push({name:paths[i],url: paths[i]})
           else{
              let nms = paths[i].split("\/")
              let nm = nms[nms.length - 1]
              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
           }
            }
          }
        }
@@ -369,9 +388,16 @@
    },
    handleFileCardPreview(file){
      this.dialogFileUrl = file.url;
      // alert(file.url)
      // this.dialogFileUrl = 'https://www.bendudu.com:8080/profile/upload/2023/10/18/20231018214647A011.doc'
      // this.dialogFileUrl = 'https://47.93.189.255:8080/profile/upload/2023/03/19/test7_20230319222030A007.jpg'
      if(this.dialogFileUrl.includes("47.93.189.255")==true)
        this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
      //alert(this.dialogFileUrl)
      const Base64 = require('js-base64').Base64
      this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
      myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');

      this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
      let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
    },
    handlePictureCardPreview(file) {
      this.dialogImageUrl = file.url;
@@ -451,7 +477,7 @@
  display: block;
  position: absolute;
}
.hide .el-upload--picture-card {
.hide /deep/ .el-upload--picture-card {
  display: none;
}
.form{