提交新代码

feige

2024-02-20 016f890b89151f2edfee3ae792a9c5594460bf2b

提交新代码

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

@@ -47,7 +47,7 @@
        list-type="picture-card"
        multiple
        ref="upload"
		
                :show-file-list="true"
 :http-request="requestUpload" 
        :file-list="fileList"
      :on-change="handleChange"
@@ -104,17 +104,39 @@
                  @click="picUpload"
                >上传到服务器</el-button>
      <h4 class="form-header">其他附件 </h4>
	  
<!--       <el-upload
             action="#"
             list-type="picture-card"
             multiple
              ref="upload"
	  		
      :http-request="requestUpload" 
             :file-list="fileList"
           :on-change="handleChange"
            :auto-upload="false"
             :disabled="!btn"
             :class="{ hide: !btn }"
	  
           >
      -->
	  
      <el-upload
        action="#"
        multiple
        list-type="picture-card"
         :file-list="fileListOther"
                      ref="upload1"
 
        :http-request="requestUpload1"
               :file-list="fileListOther"
        :on-change="handleChange1"
                :auto-upload="false"
        :disabled="!btn"

        :class="{ hide: !btn }"
      >

        <div v-if="uploading" class="upload-status">正在上传...</div>
<!-- 
        <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}">
          <!-- 添加video元素用于显示视频 -->
@@ -160,7 +182,13 @@


      </el-upload>

     <el-button
                  style="margin-left: 10px"
                  size="small"
                  type="success"
                  @click="fileUpload"
                >上传到服务器</el-button>
                      <h4 class="form-header"> </h4>
      <el-form-item size="large">
        <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
      </el-form-item>
@@ -191,6 +219,7 @@
      ],
      fileList1:[],
      uploadFileList:[],
      uploadFileList1:[],
      fileListOther:[

      ],
@@ -425,6 +454,60 @@
    //  console.log(this.uploadFileList)
    //  this.fileList = fileList
    },
    //自定义上传方法
    handleChange1(file, fileListOther) {
           //定义一个全局数组uploadFileList来做存储
	
         // this.uploadFileList.push(file.raw);
          console.log("=========5555=========")
          //console.log(file)
        //  console.log(this.uploadFileList)
        //  this.fileList = fileList
    },
    fileUpload(){
    //    var file = params.file;
        var formData = new FormData();
        this.$refs.upload1.submit();
        // formData.append('uploadFile', file);
		
		
        this.uploadFileList1.forEach((elem)=>{
            formData.append("files", elem)
			
        })
        console.log(this.uploadFileList1)
        let _this = this

        this.uploading = true;
        uploadPic(formData).then(response => {
        //   let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        //   _this.uploading = false;
        //   // this.$modal.msgSuccess("上传成功");
        //   if(_this.fot.includes(pth) === true)
        //   {
        //     _this.fileList.push({name:response.data.fileName, "url":response.data.url})
		
        //   }
		
        //   else{
        //     _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
        //     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
        //     console.log(_this.formData.url)
          _this.formData.url = _this.formData.url+","+response.fileNames
            updateFamilyevent(_this.formData).then(response => {
              this.$modal.msgSuccess("文档上传成功");
              // this.open = false;
		
            });
          })

    },
    picUpload()
    {
        var formData = new FormData();
@@ -484,39 +567,10 @@
    },
    requestUpload1(params)
    {
      var file = params.file;
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this
      this.uploading = true;
      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        _this.uploading = false;
        // this.$modal.msgSuccess("上传成功");
        if(_this.fot.includes(pth) === true)
        {
          _this.fileList.push({name:response.data.fileName, "url":response.data.url})

        }

        else{
          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
          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
          console.log(_this.formData.url)
          updateFamilyevent(_this.formData).then(response => {
            this.$modal.msgSuccess("文档上传成功");
            // this.open = false;

          });
        }
      })

    //    alert(123)
    this.uploadFileList1.push(params.file);
  //  console.log("-----------")
    //console.log(this.uploadFileList1)
    },

    /** 导出按钮操作 */

 ruoyi-ui/vue.config.js