yz3456
2024-04-15 28301a7a64c7092e985d2c4f261d4892245995de
备忘录修改
3个文件已修改
291 ■■■■ 已修改文件
ruoyi-ui/src/api/allmemo/index.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/memo.vue 253 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/pet/petnote.vue 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/allmemo/index.js
@@ -55,3 +55,11 @@
}
//根据id进行查询
//上传文件
export function uploadPic(data) {
  return request({
    url: '/common/uploads',
    method: 'post',
    data: data
  })
}
ruoyi-ui/src/views/note/memo.vue
@@ -11,6 +11,7 @@
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
      <el-table-column label="内容" prop="content" sortable width="180px" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
@@ -59,10 +60,84 @@
            </el-input>
          </el-form-item>
        <h4 class="form-header">相关图片 </h4>
          <el-upload
            action="#"
            list-type="picture-card"
            multiple
            :http-request="requestUpload"
            :file-list="fileList"
        :on-change="handleChange"
        :auto-upload="false"
          ref="upload"
          >
          <i slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <img
              class="el-upload-list__item-thumbnail"
              :src="file.url"
              alt=""
              style="width: 126px; height: 126px"
              fit="cover"
              :preview-src-list="[file.url]"
            >
            <span class="el-upload-list__item-actions">
        <span
          class="el-upload-list__item-preview"
          @click="handlePictureCardPreview(file)"
        >
          <i class="el-icon-zoom-in"></i>
        </span>
        <span
          v-if="!disabled"
          class="el-upload-list__item-delete"
          @click="handleRemove(file)"
        >
          <i class="el-icon-delete"></i>
        </span>
      </span>
          </div>
        </el-upload>
        <el-button
                 style="margin-left: 10px"
                 size="small"
                 type="success"
                 @click="picUpload"
               >上传到服务器</el-button>
        <h4 class="form-header">其他附件 </h4>
<el-upload
          action=""
          :file-list="fileListOther"
          class="upload-demo"
          multiple
          :on-remove="handleRemoveFile"
          :show-file-list="true"
          ref="upload1"
          :on-change="handleChange1"
          :auto-upload="false"
          list-type="picture-card"
            :http-request="requestUpload1"
        >
          <el-button type="primary">点击上传</el-button>
          <template #tip>
            <div class="el-upload__tip">
            </div>
          </template>
        </el-upload>
<el-button
                  style="margin-left: 10px"
                  size="small"
                  type="success"
                  @click="fileUpload"
                >上传到服务器</el-button>
        </el-form>
      </el-col>
      <h4 class="form-header"> </h4>
      <div slot="footer" class="dialog-footer">
@@ -95,6 +170,8 @@
  dicts: ['sys_normal_disable'],
  data() {
    return {
      // dialogImageUrl: '',
      // dialogVisible: false,
      isEdit1:false,
      // 遮罩层
      disabled: false,
@@ -117,7 +194,8 @@
        content: undefined,
        happenTime: undefined,
        fid:2007,
        cid:undefined,},
        cid:undefined,
        url:''},
      // 弹出层标题
      title: "",
      // 是否显示弹出层
@@ -134,12 +212,12 @@
     // 数据范围选项
     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:[
      ],
      fileList1:[],
      uploadFileList: [],
      uploadFileList1: [],
      fileListOther:[],
      dsb:true,
      btn:false,
      formDat: {
@@ -148,6 +226,7 @@
        happenTime: undefined,
        fid:2007,
        cid:undefined,
        url:''
      },
      // 菜单列表
      menuOptions: [],
@@ -203,39 +282,100 @@
  },
  methods: {
    //  弹窗
    handleShow(scope){
      this.openDataScope = true
      this.getList()
    },
    fileUpload(){
    //    var file = params.file;
        var formData = new FormData();
    //    this.$refs.upload1.submit();
        // formData.append('uploadFile', file);
        if(this.uploadFileList1.length==0){
              this.$modal.msgSuccess("文档上传列表不能为空!");
              return
        }
        this.uploadFileList1.forEach((elem)=>{
            formData.append("files", elem)
        })
        let _this = this
        this.uploading = true;
        uploadPic(formData).then(response => {
        _this.uploadFileList1 = []
        _this.formDat.url = _this.formDat.url+","+response.fileNames
        _this.$modal.msgSuccess("文件上传成功!");
          })
    },
    picUpload()
    {
      // alert('1321321')
        var formData = new FormData();
    if(this.uploadFileList.length==0){
          this.$modal.msgSuccess("图片上传列表不能为空!");
          return}
        this.uploadFileList.forEach((elem)=>{
            formData.append("files", elem)
        })
        let _this = this
        uploadPic(formData).then(response => {
          _this.formDat.url = _this.formDat.url+","+response.fileNames
      alert(_this.formDat.url)
          _this.uploadFileList = []
          _this.$modal.msgSuccess("图片上传成功");
      });
            console.log(this.formDat,'formDatformDatformDatformDat')
    },
    //个人自传的保存
    submitDataScope6: function() {
      const cid = this.$route.params && this.$route.params.id;
      const fid =2007;
      this.formDat.fid = 2007;
      this.formDat.cid = cid ;
      console.log(this.formDat)
      console.log(this.isEdit1)
      // console.log(this.formDat,'formDatformDatformDatformDat')
      // console.log(this.isEdit1)
      this.$refs["elForm"].validate(valid => {
        if (valid) {
          if (this.isEdit1) {
            // 执行修改操作
            updateNote(this.formDat).then(response => {
              console.log("1")
              // console.log("1")
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              //清空formDat对象的数据
              Object.keys(this.formDat).forEach(key => {
                this.formDat[key] = '';
              });
              for(let i = 0; i <= this.fileList.length; i++)
              {
                this.handleRemove(this.fileList[0]);
              }
              for(let i = 0; i < this.fileListOther.length; i++){
                this.handleRemoveFile(this.fileListOther[0]);
              }
              this.isEdit1 = false;
              this.getList(2007,cid);
            }).catch(error => {
              console.log(error);
              console.log(error,'erroerro1');
              this.isEdit1 = false;
              this.open = false;
            });
          } else {
            // 执行新增操作
            console.log(this.formDat)
            // console.log(this.formDat)
            addNote(this.formDat).then(response => {
              // this.formDat.term = selectedOption.label;
              this.$modal.msgSuccess("新增成功");
@@ -244,9 +384,16 @@
              Object.keys(this.formDat).forEach(key => {
                this.formDat[key] = '';
              });
              for(let i = 0; i <= this.fileList.length; i++)
              {
                this.handleRemove(this.fileList[0]);
              }
              for(let i = 0; i < this.fileListOther.length; i++){
                this.handleRemoveFile(this.fileListOther[0]);
              }
              this.getList(2007,cid);
            }).catch(error => {
              console.log(error);
              console.log(error,'erroerro2');
              this.open = false;
            });
          }
@@ -259,8 +406,8 @@
    editAutobiography(row) {
      const id = row.id;
      console.log(id)
      console.log(row.content)
      // console.log(id)
      // console.log(row.content)
      this.isEdit1 = true;
      this.formDat.cid = row.cid;
      this.formDat.id = row.id;
@@ -297,16 +444,38 @@
      listNote(cid, 2007).then(response => {
          this.memoList = response.data;
          console.log(this.memoList)
          console.log(response,'11111111111111111111111')
          this.loading = false;
        }
      );
    },
    // handleRemove(file) {
    //   for(let i = 0; i < this.fileListOther.length; i++)
    //   {
    //     if(this.fileListOther[i].url==file.url)
    //       this.$delete(this.fileListOther,i);
    //   }
    // },
    handleRemove(file) {
        for(let i = 0; i < this.fileList.length; i++)
        {
          if(this.fileList[i].url==file.url)
          {
            this.$delete(this.fileList,i);
                 this.$delete(this.uploadFileList,i);
                 }
        }
      },
    handleRemoveFile(file) {
      for(let i = 0; i < this.fileListOther.length; i++)
      {
        if(this.fileListOther[i].url==file.url)
        {
          this.$delete(this.fileListOther,i);
          this.$delete(this.uploadFileList1,i);
          }
      }
    },
@@ -424,29 +593,27 @@
      });
    },
    requestUpload(params)
    {
      var file = params.file;
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this
      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        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})
        }
      })
    requestUpload(params) {
    //alert(98)
     //    this.uploadFileList.push(params.file);
    },
    requestUpload1(params)
    {
    //     this.uploadFileList1.push(params.file);
    },
    handleChange(file, fileList1) {
           //定义一个全局数组uploadFileList来做存储
          console.log("=========5555=========")
          console.log(file)
            this.uploadFileList.push(file.raw);
             this.fileList.push({name:file.name,url:file.url})
        },
        handleChange1(file, fileOtherList1) {
           //定义一个全局数组uploadFileList来做存储
        this.uploadFileList1.push(file.raw);
         this.fileListOther.push({name:file.name,url:file.url})
          console.log("=========5555=========")
        },
    /** 删除按钮操作 */
    handleDelete(row) {
      const id = row.id || this.id;
@@ -487,7 +654,7 @@
      var formData = new FormData();
      formData.append('excelImport', file);
      let _this = this
      enload(formData).then(response => {
        _this.getList();
        Message({ message: "导入成功", type: 'warning' })
@@ -500,12 +667,8 @@
    }
  },
  //  弹窗
  handleShow(scope){
    this.openDataScope = true
    this.getList()
  }
};
</script>
ruoyi-ui/src/views/pet/petnote.vue
@@ -202,7 +202,7 @@
                 style="margin-left: 10px"
                 size="small"
                 type="success"
                 @click="picUpload"
               >上传到服务器</el-button>
        <h4 class="form-header">其他附件 </h4>
@@ -299,7 +299,7 @@
      // 数据范围选项
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      fileList:[
      ],
      fileList1:[],
@@ -418,9 +418,9 @@
          this.$delete(this.fileList,i);
               this.$delete(this.uploadFileList,i);
               }
              //alert(this.formData.url)
      }
    },
    handleRemoveFile(file) {
@@ -428,10 +428,10 @@
      {
        if(this.fileListOther[i].url==file.url)
        {
          this.$delete(this.fileListOther,i);
          this.$delete(this.uploadFileList1,i);
          }
      }
    },
@@ -521,6 +521,7 @@
      //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      // }).join(",")
      this.formDat.pid = pid;
      // console.log(this.formDat,'formDatformDatformDatformDat')
      // this.formDat.url = ul+","+uls
      this.$refs["elForm"].validate(valid => {
        if (valid) {
@@ -539,7 +540,7 @@
    },
    handleChange(file, fileList1) {
           //定义一个全局数组uploadFileList来做存储
         // this.uploadFileList.push(file.raw);
          console.log("=========5555=========")
          console.log(file)
@@ -562,7 +563,7 @@
        },
        fileUpload(){
        //    var file = params.file;
            var formData = new FormData();
        //    this.$refs.upload1.submit();
            // formData.append('uploadFile', file);
@@ -572,18 +573,18 @@
            }
            this.uploadFileList1.forEach((elem)=>{
                formData.append("files", elem)
            })
            let _this = this
            this.uploading = true;
            uploadPic(formData).then(response => {
            _this.uploadFileList1 = []
            _this.formDat.url = _this.formDat.url+","+response.fileNames
            _this.$modal.msgSuccess("文件上传成功!");
              })
        },
        picUpload()
        {
@@ -598,7 +599,7 @@
        //console.log(this.uploadFileList)
            this.uploadFileList.forEach((elem)=>{
                formData.append("files", elem)
            })
            //alert(90)
            let _this = this
@@ -609,8 +610,9 @@
              alert(_this.formDat.url)
              _this.uploadFileList = []
              _this.$modal.msgSuccess("图片上传成功");
          });
        // console.log(this.formDat,'formDatformDatformDatformDat')
        },
        requestUpload(params) {
    //alert(98)