修改了数据

feige

2024-02-20 53d76ae60199fe1bdf5e1e5c9bafda755afb66bf

修改了数据

 ruoyi-ui/src/api/bignote/index.js

@@ -48,7 +48,7 @@
//上传文件
export function uploadPic(data) {
  return request({
    url: '/common/upload',
    url: '/common/uploads',
    method: 'post',
    data: data
  })

 ruoyi-ui/src/router/index.js

@@ -445,7 +445,7 @@
        path: 'memo/:id(\\d+)',
        component: () => import('@/views/self/memo'),
        name: 'memo',
        meta: { title: '个人记事本'}
        meta: { title: '个人简历'}
      }
    ]
  },

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

@@ -39,21 +39,25 @@
<!--      <el-form-item label="是否是本家庭记录" prop="ownData">-->
<!--        <el-input  v-model="formData.ownData=== 1 ? '是':'否'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>-->
<!--      </el-form-item>-->

    <!--    :http-request="requestUpload" -->

      <h4 class="form-header">相关图片 </h4>
      <el-upload
        action="#"
        list-type="picture-card"
        multiple
        :http-request="requestUpload"
        ref="upload"
		
 :http-request="requestUpload" 
        :file-list="fileList"
      :on-change="handleChange"
      :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}">
          <img
@@ -90,8 +94,15 @@


        </div>
      </el-upload>


      </el-upload>
         <el-button
                  style="margin-left: 10px"
                  size="small"
                  type="success"
                  @click="picUpload"
                >上传到服务器</el-button>
      <h4 class="form-header">其他附件 </h4>
      <el-upload
        action="#"
@@ -178,6 +189,7 @@

      fileList:[
      ],
      fileList1:[],
      uploadFileList:[],
      fileListOther:[

@@ -271,6 +283,7 @@
              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
            }
          }
          _this.fileList1 = _this.fileList
        }
        this.loading = false;
      });
@@ -335,12 +348,13 @@
          return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        }).join(",")
        this.formData.url = ul+","+uls;
        updateFamilyevent(this.formData).then(response => {
          this.$modal.msgSuccess("删除成功");
          // this.open = false;

        });
     
      }
      updateFamilyevent(this.formData).then(response => {
        this.$modal.msgSuccess("删除成功");
        // this.open = false;
	  
      });
    },
    handleRemove(file) {
      for(let i = 0; i < this.fileList.length; i++)
@@ -354,13 +368,15 @@
          return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        }).join(",")
        this.formData.url = ul+","+uls;
        updateFamilyevent(this.formData).then(response => {
          this.$modal.msgSuccess("删除成功");
          // this.open = false;

        });

        //alert(this.formData.url)
   
      }
      updateFamilyevent(this.formData).then(response => {
        this.$modal.msgSuccess("删除成功");
        // this.open = false;
	  
      });
	  
    },
    handleFileCardPreview(file){
      this.dialogFileUrl = file.url;
@@ -400,54 +416,71 @@
    },

//自定义上传方法
    handleChange(file, fileList) {
    handleChange(file, fileList1) {
       //定义一个全局数组uploadFileList来做存储

      this.uploadFileList.push(file.raw);
     // this.uploadFileList.push(file.raw);
      console.log("=========5555=========")
      //console.log(file)
      console.log(this.uploadFileList)
    //  console.log(this.uploadFileList)
    //  this.fileList = fileList
    },
    async requestUpload(params)
    {
     // alert(124)
      var file = params.file;
    picUpload()
    {
        var formData = new FormData();
        this.$refs.upload.submit();
	

      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this
     //alert(34)
      this.uploading1 = true;
        this.uploadFileList.forEach((elem)=>{
            formData.append("files", elem)
			
        })
        let _this = this

      await uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        _this.uploading1= false;
        console.log(_this.fot.includes(pth))
        // debugger
        if(_this.fot.includes(pth) === true)
        {
          _this.fileList.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)
		
        uploadPic(formData).then(response => {
            // console.log(response.originalFilenames)
            // console.log(response.urls)
            // console.log(response.fileNames)
            //         console.log(response.newFileNames)
        // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        // _this.uploading1= false;
        // console.log(_this.fot.includes(pth))
        // // debugger
        // if(_this.fot.includes(pth) === true)
        // {
        //   _this.fileList.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(",")
        //console.log(_this.fileList)
	
          _this.formData.url = _this.formData.url+","+response.fileNames

         // alert(87)
          updateFamilyevent(_this.formData).then(response => {
            _this.$modal.msgSuccess("图片上传成功");
            // this.open = false;

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

        }
      })
        // }
      });
    },
     requestUpload(params)
    {
     //alert(124)
     this.uploadFileList.push(params.file);

     //alert(34)
 
	
    },
    requestUpload1(params)
    {

 ruoyi-ui/src/views/clean/cleanInfo.vue

@@ -457,6 +457,7 @@
    {
      var file = params.file;
      var formData = new FormData();
     // console.log(file)
      formData.append('uploadFile', file);
      let _this = this
      this.uploading1 = true;

 ruoyi-ui/src/views/self/show.vue

@@ -7,7 +7,7 @@
      ></el-button>
    </el-backtop>
    <h1 style="font-size:21px;padding-top:30px;display: flex;">
      <span>个人简历</span>
      <span>个人记事本</span>
      <div class="button-container" >
          <el-button
            size="mini"
@@ -41,7 +41,7 @@
        <el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']" style="margin-left: 20px">
          <div class="form" ><el-icon  style="padding-right:100px;"></el-icon>
          <span class="text" style="width: 69px;height: 26px;font-size: 16px;
            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">个人记事本</span></div>
            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">个人简历</span></div>
        </el-button>
      </div>
    </h1>
@@ -1246,7 +1246,7 @@
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listNote(this.queryParams1).then(response => {
          alert(321)
         // alert(321)
          //   console.log(response.data)
          this.noteList = response.data.data;

@@ -1609,11 +1609,13 @@
    //新增主要经历的保存
    submitDataScope: function() {
      let _this = this
      this.$refs["elForm"].validate(valid => {
      this.$refs["elForm1"].validate(valid => {
        if (valid) {
            //alert(1235)
               _this.dialogVisible.open = false;
          addExperience(_this.formDat).then(response => {
            _this.$modal.msgSuccess("新增成功");
            _this.dialogVisible.open = false;
         
            _this.getList();
          });
        }
@@ -1627,9 +1629,10 @@
    submitDataScope2: function() {
      this.$refs["elForm"].validate(valid => {
        if (valid) {
                    this.dialogVisible.relation1 = false;
          addRelation(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.dialogVisible.relation1 = false;
    
            this.getList();
          });
        }

 ruoyi-ui/vue.config.js

@@ -35,8 +35,8 @@
    proxy: {
      // detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        target: `https://10.39.18.174:8080/`,
      //  target: 'https://www.bendudu.com:8080/',
     //   target: `https://192.168.1.5:8080/`,
       target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''