修改bug

feige

2025-01-02 43e1199ca0c75787fb6b52bef7d595abd115ceab

修改bug

 ruoyi-ui/src/assets/images/»ù±¾Çé¿ö.png

 ruoyi-ui/src/assets/images/»¤Àí²éÌå.png

 ruoyi-ui/src/assets/images/Éú»îÏ°¹ß.png

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

@@ -602,7 +602,7 @@
      dateRange: [],
      // æ•°æ®èŒƒå›´é€‰é¡¹
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
      fileList:[],
      fileList1:[],
            uploadFileList: [],

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

@@ -631,7 +631,7 @@
        dateRange: [],
        // æ•°æ®èŒƒå›´é€‰é¡¹
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','m4a'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','m4a','.M4A'],

        fileList:[
        ],

 ruoyi-ui/src/views/collection/index.vue

@@ -699,7 +699,7 @@
      dateRange: [],
      // æ•°æ®èŒƒå›´é€‰é¡¹
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
      fileList:[],
 fileList1:[],
       uploadFileList: [],

 ruoyi-ui/src/views/contacts/index.vue

@@ -682,7 +682,7 @@
      dateRange: [],
      // æ•°æ®èŒƒå›´é€‰é¡¹
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],

      fileList:[
      ],

 ruoyi-ui/src/views/device/index.vue

@@ -628,7 +628,7 @@
      dateRange: [],
      // æ•°æ®èŒƒå›´é€‰é¡¹
    fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
      '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
      '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],

      fileList:[
      ],

 ruoyi-ui/src/views/device/memo.vue

@@ -402,7 +402,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
     // æ•°æ®èŒƒå›´é€‰é¡¹
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
      fileList:[
      ],
      fileList1:[],

 ruoyi-ui/src/views/doctor/index.vue

@@ -646,7 +646,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng',
        '.m4a'],
        '.m4a','.M4A'],
      fileList:[],
      fileList1:[],
            uploadFileList: [],

 ruoyi-ui/src/views/economy/index.vue

@@ -591,7 +591,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
  // æ•°æ®èŒƒå›´é€‰é¡¹
  fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
    '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
    '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],

      fileList:[
      ],

 ruoyi-ui/src/views/genealogy/index.vue

@@ -203,7 +203,7 @@
      // æ—¥æœŸèŒƒå›´
      dateRange: [],
      // æ•°æ®èŒƒå›´é€‰é¡¹
      fot:[".jpg",".jif"],
      fot:[".jpg",".jif",'.M4A'],
      fileList:[],
      fileListOther:[],
      dsb:true,

 ruoyi-ui/src/views/healthy/Examination.vue

@@ -362,7 +362,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
      // æ•°æ®èŒƒå›´é€‰é¡¹
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],

      fileList:[
      ],

 ruoyi-ui/src/views/healthy/healthYear.vue

@@ -1289,7 +1289,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
     // æ•°æ®èŒƒå›´é€‰é¡¹
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],

      fileList:[
      ],

 ruoyi-ui/src/views/healthy/index.vue

@@ -410,7 +410,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹

    fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
      '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],

      fileList:[
      ],

 ruoyi-ui/src/views/honor/index.vue

@@ -613,7 +613,7 @@
      dateRange: [],
      // æ•°æ®èŒƒå›´é€‰é¡¹
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
      fileList:[],
      fileList1:[],
      uploadFileList: [],
@@ -872,6 +872,7 @@
                // //  alert(this.$store.state.user.clanId)
                //       this.listRoot = []
                 let clanId = this.$store.state.user.clanId
                  if(clanId!=null){
                getAllInfo(clanId).then(response => {
                    this.listRoot = response.data;
                    const kon = {}
@@ -889,6 +890,7 @@
                    this.loading1 = false;
                  }
                );
                }
        },
    // ç¡®è®¤åˆ†äº«
    subShare(row) {

 ruoyi-ui/src/views/marry/index.vue

@@ -623,7 +623,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
      // æ•°æ®èŒƒå›´é€‰é¡¹
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],

      fileList:[
      ],

 ruoyi-ui/src/views/meeting/webcast.vue

@@ -280,7 +280,7 @@
      submitDataScope: function() {
        let ul = this.fileList[0].url
        this.formDat.avatar = ul,
        alert(this.formDat.avatar)
        // alert(this.formDat.avatar)
        this.$refs["elForm"].validate(valid => {
          if (valid && this.formDat.roomId > 0) {
            addWebcast(this.formDat).then(response => {
@@ -297,6 +297,7 @@
              // for(let i = 0; i < this.fileListOther.length; i++){
              //   this.handleRemoveFile(this.fileListOther[0]);
              // }
              this.fileList = []
              this.getList();
            });
          }else{
@@ -343,7 +344,7 @@
        _this.fileList.push({name:response.data.fileName, url:response.data.url})
        console.log(this.fileList)
        // _this.fileList2.push({name:response.data.fileName, url:response.data.url})
        alert('ok')
        // alert('ok')
      })

    },

 ruoyi-ui/src/views/note/index.vue

@@ -613,7 +613,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
     // æ•°æ®èŒƒå›´é€‰é¡¹
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],

      fileList:[
      ],

 ruoyi-ui/src/views/note/memo.vue

@@ -407,7 +407,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
     // æ•°æ®èŒƒå›´é€‰é¡¹
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
      fileList:[
      ],
      fileList1:[],

 ruoyi-ui/src/views/pet/index.vue

@@ -564,7 +564,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
      // æ•°æ®èŒƒå›´é€‰é¡¹
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],

      fileList1:[ ],
      fileList2:[ ],

 ruoyi-ui/src/views/pet/petnote.vue

@@ -341,7 +341,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
      // æ•°æ®èŒƒå›´é€‰é¡¹
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],

      fileList:[
      ],

 ruoyi-ui/src/views/secret/index.vue

@@ -636,7 +636,7 @@
        // æ•°æ®èŒƒå›´é€‰é¡¹
        // æ•°æ®èŒƒå›´é€‰é¡¹
        fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
          '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
          '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],

        fileList:[
        ],
@@ -908,6 +908,7 @@
                  // //  alert(this.$store.state.user.clanId)
                  //       this.listRoot = []
                   let clanId = this.$store.state.user.clanId
                 if(clanId!=null){
                  getAllInfo(clanId).then(response => {
                      this.listRoot = response.data;
                      const kon = {}
@@ -925,7 +926,8 @@
                      this.loading1 = false;
                    }
                  );
          },
          }
          },
      // ç¡®è®¤åˆ†äº«
      subShare(row) {
        const shareList = {}
@@ -946,8 +948,10 @@
      // ------------------------------------------------------------------

      getInfo(){
		  
            console.log('-----------------')
            getInfo().then(response=>{
				
              console.log(response.user.roles[0].roleId,'roleID')
              this.userId = response.user.roles[0].roleId
            })

 ruoyi-ui/src/views/secret/memo.vue

@@ -402,7 +402,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
     // æ•°æ®èŒƒå›´é€‰é¡¹
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
      fileList:[
      ],
      fileList1:[],

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

@@ -118,7 +118,7 @@
                  <template v-if="!isEditing" >
                    <el-input v-if="individualList.maritalStatus===0" placeholder="未婚"></el-input>
                    <el-input v-if="individualList.maritalStatus===1" placeholder="已婚"></el-input>
                    <el-input v-if="individualList.maritalStatus===2" placeholder="未婚"></el-input>
                    <el-input v-if="individualList.maritalStatus===2" placeholder="离婚"></el-input>

                  </template>
                  <template v-else>
@@ -785,7 +785,7 @@
      // æ—¥æœŸèŒƒå›´
      dateRange: [],
      // æ•°æ®èŒƒå›´é€‰é¡¹
      fot:[".jpg",".jif"],
      fot:[".jpg",".jif",'.M4A'],
      fileList:[],
      fileListOther:[],
     //下拉实现
@@ -1028,6 +1028,7 @@
            // //  alert(this.$store.state.user.clanId)
            //       this.listRoot = []
             let clanId = this.$store.state.user.clanId
              if(clanId!=null){
            getAllInfo(clanId).then(response => {
                this.listRoot = response.data;
                const kon = {}
@@ -1045,6 +1046,7 @@
                this.loading1 = false;
              }
            );
            }
        },

    /** æŸ¥è¯¢è®°å½•åˆ—表 */
@@ -1160,17 +1162,19 @@
    },  //个人基本信息
    submitForm() {

      if(this.inds=='1')
      if(this.inds=='1'||this.inds=='女')
        this.individualList.sex = 1;
      else
        this.individualList.sex = 0;
      
      if(this.mrs=='0')
      if(this.mrs=='0'||this.mrs=='未婚')
        this.individualList.maritalStatus = 0
      else if(this.mrs == '1')
      else if(this.mrs == '1'||this.mrs=='已婚')
        this.individualList.maritalStatus = 1
      else
        this.individualList.maritalStatus = 2
		
		
    //alert(123)
       // alert(10)
    //   let ul = this.fileList.map(function (elem){
@@ -1189,13 +1193,15 @@
              // å¼ºåˆ¶æ›´æ–°ç›¸å…³ç»„件
               
            //  this.individualList={...this.individualList}

              // this.open = false;
            // alert(this.individualList.sex)
			  
   //            // this.open = false;
              this.dsb = true
              this.btn=false
              this.isShow_2=false
              this.isShow=true
              this.isEditing = false
              //this.getList()
            })
          } else {
            this.$modal.msgSuccess("修改失败");

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

@@ -155,7 +155,7 @@
          >导入模板下载</el-button>
        </el-col>

        <el-col :span="1.5">
        <el-col :span="1.5" v-if="userId != 2">
          <el-upload
            action=""

@@ -689,7 +689,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
     // æ•°æ®èŒƒå›´é€‰é¡¹
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],

      fileList1:[],
      fileList:[],
@@ -974,7 +974,7 @@
    };
  },
  created() {

    this.getInfo()
    this.getList();
    this.getList1();
  },
@@ -996,15 +996,24 @@
      this.queryParams2.pageNo = 1
            this.total1 = 0
    },
	
    getInfo(){
          console.log('-----------------')
          getInfo().then(response=>{
            console.log(response.user.roles[0].roleId,'roleID')
            this.userId = response.user.roles[0].roleId
          })
        },
	
    handleClose2(){
      this.$refs.table1.clearSelection()
    },
 getList1() {
          this.loading1 = true;
                    let userId = this.$store.state.user.userId
                  //  alert(userId)
          		 
                    
                    showShareUser(userId, 2062).then(response=>{
                    showShareUser(userId, 2010).then(response=>{
                        console.log("===========ddddddddddddd")
                        console.log(response.data)
                        console.log("--------------------")
@@ -1017,6 +1026,7 @@
                  // //  alert(this.$store.state.user.clanId)
                  //       this.listRoot = []
                   let clanId = this.$store.state.user.clanId
                  if(clanId!=null){
                  getAllInfo(clanId).then(response => {
                      this.listRoot = response.data;
                      const kon = {}
@@ -1034,6 +1044,7 @@
                      this.loading1 = false;
                    }
                  );
                  }
          },
    // ä¸‹è½½ä»–人给我分享的数据
    handleDown(row){

 ruoyi-ui/src/views/selfeconomy/index.vue

@@ -667,7 +667,7 @@
        // æ•°æ®èŒƒå›´é€‰é¡¹
    // æ•°æ®èŒƒå›´é€‰é¡¹
    fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
      '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
      '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],

        fileList:[
        ],
@@ -953,6 +953,7 @@
                 // //  alert(this.$store.state.user.clanId)
                 //       this.listRoot = []
                  let clanId = this.$store.state.user.clanId
                  if(clanId!=null){
                 getAllInfo(clanId).then(response => {
                     this.listRoot = response.data;
                     const kon = {}
@@ -970,6 +971,7 @@
                     this.loading1 = false;
                   }
                 );
                 }
          },
      // ç¡®è®¤åˆ†äº«
      subShare(row) {

 ruoyi-ui/src/views/selfeconomy/memo.vue

@@ -402,7 +402,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
     // æ•°æ®èŒƒå›´é€‰é¡¹
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
      fileList:[
      ],
      fileList1:[],

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

@@ -748,7 +748,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
   // æ•°æ®èŒƒå›´é€‰é¡¹
   fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
     '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
     '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],

      fileList:[
      ],
@@ -1102,7 +1102,7 @@
           
           
           let clanId = this.$store.state.user.clanId
		   
            if(clanId!=null){
            getAllInfo(clanId).then(response => {
                this.listRoot = response.data;
                const kon = {}
@@ -1120,6 +1120,7 @@
                this.loading1 = false;
              }
            );
            }
        },
    // ç¡®è®¤åˆ†äº«
    subShare(row) {

 ruoyi-ui/src/views/wish/index.vue

@@ -656,7 +656,7 @@
      // æ•°æ®èŒƒå›´é€‰é¡¹
      // æ•°æ®èŒƒå›´é€‰é¡¹
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],

      fileList:[],
      fileList1:[],
@@ -913,6 +913,7 @@
                // //  alert(this.$store.state.user.clanId)
                //       this.listRoot = []
                 let clanId = this.$store.state.user.clanId
                  if(clanId!=null){
                getAllInfo(clanId).then(response => {
                    this.listRoot = response.data;
                    const kon = {}
@@ -930,6 +931,7 @@
                    this.loading1 = false;
                  }
                );
                }
        },
    // ç¡®è®¤åˆ†äº«
    subShare(row) {

 ruoyi-ui/vue.config.js

@@ -37,7 +37,7 @@
      // 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://192.168.1.5:8080/`,
     // target: `https://192.168.1.5:8080/`,
      target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {