修改了对应的bug

feige

2024-12-17 4b1fbea0d8099259ea7d0ef10bd7633c3bc62f2e

 ruoyi-ui/src/views/bignote/familyeventInfo.vue

@@ -48,7 +48,7 @@
        multiple
      ref="upload"
              :show-file-list="true"
 :http-request="requestUpload" 
 :http-request="requestUpload"
        :file-list="fileList"
      :on-change="handleChange"
     :auto-upload="false"
@@ -56,7 +56,7 @@
        :class="{ hide: !btn }"

      >
	  

  <!--      <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}">
@@ -105,23 +105,23 @@
                @click="picUpload"
              >上传到服务器</el-button>
      <h4 class="form-header">其他附件 </h4>
	  

<!--      <el-upload
            action="#"
            list-type="picture-card"
            multiple
           ref="upload"
	  		
     :http-request="requestUpload" 

     :http-request="requestUpload"
            :file-list="fileList"
          :on-change="handleChange"
          :auto-upload="false"
            :disabled="!btn"
            :class="{ hide: !btn }"
	  

          >
     -->
	  

      <el-upload
        action="#"
        multiple
@@ -136,7 +136,7 @@

        :class="{ hide: !btn }"
      >
<!-- 
<!--
        <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}">
@@ -150,7 +150,7 @@
          ></video>
          <img v-else
               class="el-upload-list__item-thumbnail"
               :src="file.url"
               src="../../assets/images/deviceLis.png"
               alt=""
               style="width: 100%; height: 100%"
               fit="cover">
@@ -225,6 +225,7 @@
      fileListOther:[

      ],
      fileListOther1:[],
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      dsb:true,
@@ -293,11 +294,12 @@
      this.isShow=false
     //       alert(this.btn)
    }
   this.ID = id; 
   this.ID = id;
    let _this = this
    if (id) {
      this.loading = true;
      getFamilyeventInfo(id).then((response) => {
        // console.log(response,'666666666')
        this.formData = response.data;
        let paths = this.formData.url.split(",");
        for(let i = 0; i < paths.length; i++)
@@ -308,10 +310,18 @@
      //   alert(pth)
            if (_this.fot.includes(pth) === true)
         {
            if(paths[i][0]=="/")
              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
           else
              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
        if(paths[i].includes(process.env.VUE_APP_BASE_TRUE_API)){
          if(paths[i][0]=="/")
                _this.fileList.push({name:paths[i],url: paths[i].substr(1),res:false})
          else
             _this.fileList.push({name:paths[i],url: paths[i],res:false})
        }else{
          if(paths[i][0]=="/")
                _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
          else
             _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
        }

           }
            else {
              // alert(paths[i])
@@ -322,7 +332,7 @@
              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
            else
            _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
				

         }
          }
      //  _this.fileList1 = _this.fileList
@@ -330,18 +340,56 @@
        this.loading = false;
      });
    }
    console.log(this.fileList,'fileListfilelllllllllllll')
    console.log(this.fileListOther,'fileListOtherfileListOtherfileListOther')
  },
  mounted() {},
  methods: {
    getData(){
          const id = this.$route.params && this.$route.params.id;
          let _this = this
          if (id) {
            this.loading = true;
            getFamilyeventInfo(id).then((response) => {
              // console.log(response,'666666666')
              this.formData = response.data;
              let paths = this.formData.url.split(",");
              for(let i = 0; i < paths.length; i++)
              {
                if(paths[i]!="") {

                  let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
          //   alert(pth)
                  if (_this.fot.includes(pth) === true)
             {
              console.log()
               }
                  else {
                    let nms = paths[i].split("\/")
                    let nm = nms[nms.length - 1]
               if(paths[i][0]=="/")
                    _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
                else
                _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})

             }
                }

              }
              _this.fileListOther = _this.fileListOther1
              this.loading = false;
            });
          }
    },

    submitForm() {
      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      let uls = this.fileListOther.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      this.formData.url = ul+","+uls
      // let ul = this.fileList.map(function (elem){
      //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      // }).join(",")
      // let uls = this.fileListOther.map(function (elem){
      //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      // }).join(",")
      // this.formData.url = ul+","+uls

      this.$refs['elForm'].validate(valid => {
        if (valid) {
@@ -387,10 +435,10 @@
            this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
         }
          this.$delete(this.fileListOther,i);
    

      }
      }
	  

     let ul = ""
     this.fileList.map(function (elem){
           if(elem.res==false)
@@ -407,11 +455,11 @@
        updateFamilyevent(this.formData).then(response => {
         this.$modal.msgSuccess("删除成功");
         // this.open = false;
		  

        });
     }
    },
    handleRemove(file) {	  
    handleRemove(file) {
           //判断是否是之前的图片
     let res = false
   //  alert(this.fileList.length)
@@ -431,7 +479,7 @@
             //     alert(this.uploadFileList.length)
          }
          this.$delete(this.fileList,i);
   

      }
     }
     let ul = ""
@@ -459,7 +507,7 @@
      // 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)
      // alert(this.dialogFileUrl)
      const Base64 = require('js-base64').Base64

      this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
@@ -471,7 +519,7 @@
    },
    handleDownload(url) {
      var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};

      alert(formData['path'])
      let lens = formData.path.split(".")
      let suffix = lens[lens.length-1]
      download(formData).then(async (response) => {
@@ -499,9 +547,9 @@
      this.fileList.push({name:file.name,url:file.url,res:true})
    },
   //自定义上传方法
   handleChange1(file, fileListOther1) {
   handleChange1(file, fileListOther12) {
          //定义一个全局数组uploadFileList来做存储
	

        // this.uploadFileList.push(file.raw);
       this.uploadFileList1.push(file.raw);
        this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -520,10 +568,10 @@
      if(this.uploadFileList1.length==0){
           this.$modal.msgSuccess("文档上传列表不能为空！");
           return}
		

      this.uploadFileList1.forEach((elem)=>{
         formData.append("files", elem)
			

      })
      console.log(this.uploadFileList1)
      let _this = this
@@ -535,27 +583,24 @@
          updateFamilyevent(_this.formData).then(response => {
            this.$modal.msgSuccess("文档上传成功");
            // this.open = false;
          this.getData()
          this.fileListOther1=[]
          });
        })

   },
   picUpload()
   {

      var formData = new FormData();
      //this.$refs.upload.submit();
      //alert(this.uploadFileList.length)
   if(this.uploadFileList.length==0){
        this.$modal.msgSuccess("图像上传列表不能为空！");
        return}

      this.uploadFileList.forEach((elem)=>{
         formData.append("files", elem)
			
      })
      let _this = this

		
        uploadPic(formData).then(response => {
         // console.log(response.originalFilenames)
         // console.log(response.urls)
@@ -577,55 +622,15 @@
      //console.log(_this.fileList)
   //   alert(response.fileNames)
          _this.formData.url = _this.formData.url+","+response.fileNames
		  
      _this.uploadFileList = []
          _this.uploadFileList = []
         // alert(87)
          updateFamilyevent(_this.formData).then(response => {
            _this.$modal.msgSuccess("图片上传成功");
         let id = _this.ID
         if (id) {
           _this.loading = true;
           getFamilyeventInfo(id).then((response) => {
             _this.formData = response.data;
            alert(123)
             let paths = _this.formData.url.split(",");
             for(let i = 0; i < paths.length; i++)
             {
               if(paths[i]!="") {
			
                 let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
            //   alert(pth)
                 if (_this.fot.includes(pth) === true)
               {
                  if(paths[i][0]=="/")
                   _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
                 else
                    _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
                 }
                 else {
                   // alert(paths[i])
                // alert()
                   let nms = paths[i].split("\/")
                   let nm = nms[nms.length - 1]
                 if(paths[i][0]=="/")
                   _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
                  else
                  _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
						
               }
               }
            //  _this.fileList1 = _this.fileList
             }
             _this.loading = false;
           });
         }
            // this.open = false;

          });
        // }
        // else{
        //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

        // }
      });
   },
@@ -635,8 +640,8 @@
//    this.uploadFileList.push(params.file);

     //alert(34)
 
	


    },
    requestUpload1(params)
    {