feige
2023-12-05 d80a5794d029c8a5fe58a80464ab0e1ae097c87c
增加图像查看功能
53个文件已修改
635 ■■■■ 已修改文件
ruoyi-ui/.env.development 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/.env.production 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/login.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/permission.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/router/index.js 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/utils/permission.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/bignote/familyeventInfo.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/bignote/index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/clean/cleanInfo.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/clean/index.vue 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/collection/collectionInfo.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/collection/index.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/contacts/contactsInfo.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/contacts/index.vue 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/device/equipmentInfo.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/device/index.vue 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/device/memo.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/doctor/doctorInfo.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/doctor/index.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/economy/economyInfo.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/economy/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/healthy/Examination.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/healthy/ExaminationInfo.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/healthy/healthYear.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/healthy/healthyInfo.vue 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/healthy/index.vue 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/honor/honorInfo.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/login.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/marry/edit.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/marry/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/index.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/memo.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/propertyInfo.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/pet/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/pet/noteInfo.vue 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/pet/petInfo.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/pet/petnote.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/register.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/secretInfo.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/self/edit.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/self/memoInfo.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/self/show.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/selfeconomy/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/user/index.vue 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/travel/Info.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/travel/edit.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/travel/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/travel/travelInfo.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/wish/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/wish/wishInfo.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/vue.config.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/.env.development
@@ -6,7 +6,7 @@
# 若依管理系统/开发环境
VUE_APP_BASE_API = '/dev-api'
VUE_APP_BASE_TRUE_API = 'https://47.93.189.255:8080/'
VUE_APP_BASE_TRUE_API = 'https://www.bendudu.com:8080/'
VUE_APP_BASE_OTHER_API = 'https://www.bendudu.com:8085/'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
ruoyi-ui/.env.production
@@ -6,5 +6,5 @@
# 若依管理系统/生产环境
VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_TRUE_API = 'https://47.93.189.255:8080/'
VUE_APP_BASE_TRUE_API = 'https://www.bendudu.com:8080/'
VUE_APP_BASE_OTHER_API = 'https://www.bendudu.com:8085/'
ruoyi-ui/src/api/login.js
@@ -50,7 +50,7 @@
// 获取验证码
export function getCodeImg() {
  console.log("-----")
  return request({
    url: '/captchaImage',
    headers: {
ruoyi-ui/src/permission.js
@@ -24,11 +24,13 @@
        // 判断当前用户是否已拉取完user_info信息
        store.dispatch('GetInfo').then(() => {
          isRelogin.show = false
        //  alert(12)
          store.dispatch('GenerateRoutes').then(accessRoutes => {
            // 根据roles权限生成可访问的路由表
       //     alert(90)
            console.log(accessRoutes)
            router.addRoutes(accessRoutes) // 动态添加可访问路由表
            console.log(router)
         //   console.log(router)
            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
          })
        }).catch(err => {
ruoyi-ui/src/router/index.js
@@ -122,7 +122,7 @@
  {
    path: '/system/user-auth',
    component: Layout,
    hidden: true,
    hidden: false,
    permissions: ['system:user:edit'],
    children: [
      {
@@ -664,7 +664,7 @@
  {
    path: '/system/role-auth',
    component: Layout,
    hidden: true,
    hidden: false,
    permissions: ['system:role:edit'],
    children: [
      {
@@ -678,7 +678,7 @@
  {
    path: '/system/dict-data',
    component: Layout,
    hidden: true,
    hidden: false,
    permissions: ['system:dict:list'],
    children: [
      {
@@ -692,7 +692,7 @@
  {
    path: '/monitor/job-log',
    component: Layout,
    hidden: true,
    hidden: false,
    permissions: ['monitor:job:list'],
    children: [
      {
@@ -706,7 +706,7 @@
  {
    path: '/tool/gen-edit',
    component: Layout,
    hidden: true,
    hidden: false,
    permissions: ['tool:gen:edit'],
    children: [
      {
ruoyi-ui/src/utils/permission.js
@@ -6,6 +6,7 @@
 * @returns {Boolean}
 */
export function checkPermi(value) {
  alert(value)
  if (value && value instanceof Array && value.length > 0) {
    const permissions = store.getters && store.getters.permissions
    const permissionDatas = value
ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -407,22 +407,23 @@
      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        this.uploading1= false;
        _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){
          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){
          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.formData.url = ul+","+uls
          console.log(_this.formData.url)
         // alert(87)
          updateFamilyevent(_this.formData).then(response => {
            _this.$modal.msgSuccess("图片上传成功");
            // this.open = false;
          });
@@ -443,7 +444,7 @@
      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.uploading = false;
        // this.$modal.msgSuccess("上传成功");
        if(_this.fot.includes(pth) === true)
        {
@@ -453,15 +454,15 @@
        else{
          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
          let ul = this.fileList.map(function (elem){
          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){
          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.formData.url = ul+","+uls
          console.log(_this.formData.url)
          updateFamilyevent(_this.formData).then(response => {
            this.$modal.msgSuccess("文档上传成功");
            // this.open = false;
ruoyi-ui/src/views/bignote/index.vue
@@ -478,16 +478,21 @@
      console.log(this.queryParams)
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      let _this = this
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listFamilyevent(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data.data)
          // alert(response.data.data[1].url)
          this.familyList = response.data.data;
          if(response.msg=="您没加入到对应的家庭,请联系管理员")
          {
              _this.$modal.msgSuccess("您没加入到对应的家庭,请联系管理员");
              _this.loading = false;
          }else{
          _this.familyList = response.data.data;
          this.total = response.data.total;
          this.loading = false;
          _this.total = response.data.total;
          _this.loading = false;
          }
        }
      );
    },
ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -192,7 +192,10 @@
    return {
      cdi:"资产详细信息",
      udi:"资产信息修改",
      fot:[".jpg",".jif"],
     // 数据范围选项
     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:[
ruoyi-ui/src/views/clean/index.vue
@@ -363,7 +363,9 @@
        // 日期范围
        dateRange: [],
        // 数据范围选项
        fot:[".jpg",".jif"],
      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:[
@@ -487,14 +489,21 @@
        this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
        // console.log(this.queryParams)
        let _this = this
        //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
        listClean(this.queryParams).then(response => {
            //  alert(123)
            //   console.log(response.data)
            this.cleanList = response.data.data;
            if(response.msg=="您没加入到对应的家庭,请联系管理员")
            {
                _this.$modal.msgSuccess("您没加入到对应的家庭,请联系管理员");
                _this.loading = false;
            }else{
            _this.cleanList = response.data.data;
            this.total = response.data.total;
            this.loading = false;
            _this.total = response.data.total;
            _this.loading = false;
            }
          }
        );
      },
ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -219,7 +219,10 @@
    return {
      cdi:"收藏与荣誉详细信息",
      udi:"收藏与荣誉信息详情",
      fot:[".jpg",".jif"],
    // 数据范围选项
    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:[],
      dsb:true,
ruoyi-ui/src/views/collection/index.vue
@@ -582,14 +582,20 @@
      // console.log(this.queryParams)
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      let _this = this
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listCollection(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.collectionList = response.data.data;
          this.total = response.data.total;
          this.loading = false;
          if(response.msg=="您没加入到对应的家庭,请联系管理员")
          {
              _this.$modal.msgSuccess("您没加入到对应的家庭,请联系管理员");
              _this.loading = false;
          }else{
          _this.collectionList = response.data.data;
          _this.total = response.data.total;
          _this.loading = false;
          }
        }
      );
      listType(this.queryParams).then(response => {
ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -213,7 +213,10 @@
    return {
      cdi:"通讯录详细信息",
      udi:"通讯录信息详情",
      fot:[".jpg",".jif","png"],
    // 数据范围选项
    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:[
ruoyi-ui/src/views/contacts/index.vue
@@ -416,7 +416,9 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      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:[
@@ -570,15 +572,22 @@
    /** 查询通讯录列表 */
    getList() {
      this.loading = true;
      let _this = this
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      getContactList(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.contactList = response.data.data;
         if(response.msg=="您没加入到对应的家庭,请联系管理员")
         {
             _this.$modal.msgSuccess("您没加入到对应的家庭,请联系管理员");
             _this.loading = false;
         }else{
          _this.contactList = response.data.data;
          this.total = response.data.total;
          this.loading = false;
          _this.total = response.data.total;
          _this.loading = false;
          }
        }
      );
    },
ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -190,7 +190,10 @@
    return {
      cdi:"家庭设备信息",
      udi:"家庭设备修改",
      fot:[".jpg",".jif"],
    // 数据范围选项
    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:[
@@ -444,6 +447,20 @@
          _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)
        //  alert(87)
          updateEquipment(_this.formData).then(response => {
            this.$modal.msgSuccess("图片上传成功");
            // this.open = false;
          });
      })
    }
ruoyi-ui/src/views/device/index.vue
@@ -377,7 +377,9 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
    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:[
@@ -508,13 +510,20 @@
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      let _this = this
      listEquipment(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.equipmentList = response.data.data;
          if(response.msg=="您没加入到对应的家庭,请联系管理员")
          {
              _this.$modal.msgSuccess("您没加入到对应的家庭,请联系管理员");
              _this.loading = false;
          }else{
          _this.equipmentList = response.data.data;
          this.total = response.data.total;
          this.loading = false;
          _this.total = response.data.total;
          _this.loading = false;
          }
        }
      );
    },
ruoyi-ui/src/views/device/memo.vue
@@ -122,7 +122,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
     // 数据范围选项
     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:[
ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -217,7 +217,10 @@
    return {
      cdi:"就医记录详细信息",
      udi:"就医记录信息详情",
      fot:[".jpg",".jif"],
      // 数据范围选项
      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:[],
      dsb:true,
ruoyi-ui/src/views/doctor/index.vue
@@ -520,14 +520,21 @@
    /** 查询记录列表 */
    getList() {
      this.loading = true;
      let _this = this;
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listDoctor(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.doctorList = response.data.data;
          this.total = response.data.total;
          this.loading = false;
          if(response.msg=="您没加入到对应的家庭,请联系管理员")
          {
              _this.$modal.msgSuccess("您没加入到对应的家庭,请联系管理员");
              _this.loading = false;
          }else{
              _this.doctorList = response.data.data;
              _this.total = response.data.total;
              _this.loading = false;
          }
        }
      );
      listType(this.queryParams).then(response => {
ruoyi-ui/src/views/economy/economyInfo.vue
@@ -183,7 +183,10 @@
    return {
      cdi:"资产详细信息",
      udi:"资产信息修改",
      fot:[".jpg",".jif"],
      // 数据范围选项
      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:[
@@ -425,6 +428,20 @@
          _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)
        //  alert(87)
          updateEconomy(_this.formData).then(response => {
            this.$modal.msgSuccess("图片上传成功");
            // this.open = false;
          });
      })
    },
ruoyi-ui/src/views/economy/index.vue
@@ -347,7 +347,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
  // 数据范围选项
  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:[
ruoyi-ui/src/views/healthy/Examination.vue
@@ -302,7 +302,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      // 数据范围选项
      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:[ ],
ruoyi-ui/src/views/healthy/ExaminationInfo.vue
@@ -159,7 +159,10 @@
    return {
      cdi:"健康详细信息",
      udi:"健康信息修改",
      fot:[".jpg",".jif"],
      // 数据范围选项
      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:[
@@ -393,6 +396,20 @@
          _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)
        // alert(87)
         updateExamination(_this.formData).then(response => {
           _this.$modal.msgSuccess("图片上传成功");
           // this.open = false;
         });
      })
    },
ruoyi-ui/src/views/healthy/healthYear.vue
@@ -938,7 +938,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
     // 数据范围选项
     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:[
ruoyi-ui/src/views/healthy/healthyInfo.vue
@@ -100,7 +100,7 @@
        list-type="picture-card"
        :on-preview="handleFileCardPreview"
        :on-remove="handleRemoveFile"
        :http-request="requestUpload"
        :http-request="requestUpload1"
        :show-file-list="true"
        :disabled="!btn"
        :class="{ hide: !btn }"
@@ -177,7 +177,10 @@
    return {
      cdi:"健康详细信息",
      udi:"健康信息修改",
      fot:[".jpg",".jif"],
 // 数据范围选项
 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:[
@@ -406,6 +409,48 @@
      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})
          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.fileListOther.push({name:response.data.fileName, url:response.data.url})
               console.log(_this.formData.url)
               alert(12)
               updateHealth(_this.formData).then(response => {
                 this.$modal.msgSuccess("修改成功");
                 // this.open = false;
                 this.btn=false
               });
        }
        else{
          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
        }
      })
    },  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)
@@ -419,8 +464,24 @@
        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
              // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
               console.log(_this.formData.url)
               updateHealth(_this.formData).then(response => {
                 this.$modal.msgSuccess("修改成功");
                 // this.open = false;
                 this.btn=false
               });
        }
      })
    },
ruoyi-ui/src/views/healthy/index.vue
@@ -44,17 +44,7 @@
        />
      </el-form-item>
        <el-button size="mini" type="text" @click="toYearhealthy" v-hasPermi="['person:healthy:healthYear']">
          <div class="form1" ><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>
        </el-button>
      <el-button size="mini" type="text" @click="toExamination" v-hasPermi="['person:healthy:healthYear']">
        <div class="form2" ><el-icon  style="padding-right:50px;"></el-icon>
          <span class="text" style="width: 69px;height: 26px;font-size: 16px;
            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">历年体检情况</span></div>
      </el-button>
      <el-form-item>
        <el-button  size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;border-radius:6px 6px 6px 6px;opacity:1;">搜索</el-button>
@@ -117,8 +107,23 @@
                 icon="el-icon-top">导入</el-button>
        </el-upload>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       <el-col></el-col>
      <el-col>
<el-button size="mini" type="text" @click="toYearhealthy" v-hasPermi="['person:healthy:healthYear']">
            <div class="form1" ><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>
          </el-button>
        <el-button size="mini" type="text" @click="toExamination" v-hasPermi="['person:healthy:healthYear']">
          <div class="form2" ><el-icon  style="padding-right:50px;"></el-icon>
            <span class="text" style="width: 69px;height: 26px;font-size: 16px;margin-right: 20px;
              font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">历年体检情况</span></div>
        </el-button>
        </el-col>
    </el-row>
    <el-table v-loading="loading" :data="healthList"  @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
@@ -343,7 +348,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
    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:[ ],
ruoyi-ui/src/views/honor/honorInfo.vue
@@ -222,7 +222,10 @@
    return {
      cdi:"荣誉证书详细信息",
      udi:"荣誉证书信息详情",
      fot:[".jpg",".jif"],
     // 数据范围选项
     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:[],
      dsb:true,
ruoyi-ui/src/views/login.vue
@@ -183,7 +183,9 @@
  },
  methods: {
    getCode() {
      getCodeImg().then(res => {
        this.captchaEnabled = res.data.captchaEnabled === undefined ? true : res.captchaEnabled;
        if (this.captchaEnabled) {
          this.codeUrl = "data:image/gif;base64," + res.data.img;
@@ -247,7 +249,7 @@
  align-items: center;
  height: 100%;
  width:  100%;
  background: no-repeat center/40% url("../assets/images/Group 221.png");
  background: no-repeat center/40% url("../assets/images/login_logo.png");
  background-color: #FEF7FC;
  background-position: 183px 145px;
ruoyi-ui/src/views/marry/edit.vue
@@ -287,7 +287,10 @@
        // 日期范围
        dateRange: [],
        // 数据范围选项
        fot:[".jpg",".jif"],
       // 数据范围选项
       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:[
ruoyi-ui/src/views/marry/index.vue
@@ -619,7 +619,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      // 数据范围选项
      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:[
ruoyi-ui/src/views/note/index.vue
@@ -377,7 +377,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
     // 数据范围选项
     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:[
@@ -487,14 +490,21 @@
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      // console.log(this.queryParams)
      let _this = this
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listProperty(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.propertyList = response.data.data;
          if(response.msg=="您没加入到对应的家庭,请联系管理员")
          {
              _this.$modal.msgSuccess("您没加入到对应的家庭,请联系管理员");
              _this.loading = false;
          }else{
          _this.propertyList = response.data.data;
          this.total = response.data.total;
          this.loading = false;
          _this.total = response.data.total;
          _this.loading = false;
          }
        }
      );
    },
ruoyi-ui/src/views/note/memo.vue
@@ -130,7 +130,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
     // 数据范围选项
     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:[
ruoyi-ui/src/views/note/propertyInfo.vue
@@ -187,7 +187,10 @@
    return {
      cdi:"资产详细信息",
      udi:"资产信息修改",
      fot:[".jpg",".jif",".png"],
    // 数据范围选项
    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:[
@@ -424,6 +427,20 @@
        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)
      //  alert(87)
        updateProperty(_this.formData).then(response => {
          this.$modal.msgSuccess("图片上传成功");
          // this.open = false;
        });
      })
    }
ruoyi-ui/src/views/pet/index.vue
@@ -364,7 +364,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      // 数据范围选项
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      fileList1:[ ],
      fileList2:[ ],
      fileListOther:[ ],
ruoyi-ui/src/views/pet/noteInfo.vue
@@ -33,6 +33,8 @@
        multiple
        :http-request="requestUpload"
        :file-list="fileList"
        :disabled="!btn"
        :class="{ hide: !btn }"
      >
        <div v-if="uploading" class="upload-status">正在上传...</div>
        <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
@@ -84,6 +86,8 @@
        :on-remove="handleRemoveFile"
        :http-request="requestUpload"
        :show-file-list="true"
        :disabled="!btn"
        :class="{ hide: !btn }"
      >
        <div v-if="uploading" class="upload-status">正在上传...</div>
        <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
@@ -156,7 +160,10 @@
    return {
      cdi:"魅宠备忘本详细信息",
      udi:"魅宠备忘本信息修改",
      fot:[".jpg",".jif",".png"],
      // 数据范围选项
      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:[
@@ -224,13 +231,14 @@
      this.btn= jd
      this.dsb = !jd
      this.isShow=true
      document.title = "修改资产详细信息";
      this.$route.meta.title = "修改资产详细信息";//列表的名称
      document.title = "修改魅宠备忘录详细信息";
      this.$route.meta.title = "修改魅宠备忘录详细信息";//列表的名称
    }
    else{
      document.title = "家庭资产详细信息";
      this.$route.meta.title = "家庭资产详细信息";//列表的名称
      document.title = "魅宠备忘录详细信息";
      this.$route.meta.title = "魅宠备忘录详细信息";//列表的名称
      this.isShow=false
      this.btn = false;
    }
    let _this = this
@@ -372,6 +380,20 @@
        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)
        //  alert(87)
          updatenotePet(_this.formData).then(response => {
            this.$modal.msgSuccess("图片上传成功");
            // this.open = false;
          });
      })
    }
@@ -380,7 +402,7 @@
}
</script>
<style>
<style scoped>
.mt
{
  position: relative;
@@ -389,6 +411,9 @@
  display: block;
}
.hide /deep/ .el-upload--picture-card {
  display: none;
}
.form{
  background:center/11% no-repeat url('../../assets/icons/form.png') ;
}
ruoyi-ui/src/views/pet/petInfo.vue
@@ -394,7 +394,10 @@
    return {
      cdi:"魅宠详细信息",
      udi:"魅宠信息修改",
      fot:[".jpg",".jif"],
      // 数据范围选项
      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:[
ruoyi-ui/src/views/pet/petnote.vue
@@ -277,7 +277,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      // 数据范围选项
      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:[
@@ -515,6 +518,20 @@
          _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)
        //  alert(87)
          updatenotePet(_this.formData).then(response => {
            this.$modal.msgSuccess("图片上传成功");
            // this.open = false;
          });
      })
    },
ruoyi-ui/src/views/register.vue
@@ -115,8 +115,8 @@
      getCodeImg().then(res => {
        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
        if (this.captchaEnabled) {
          this.codeUrl = "data:image/gif;base64," + res.img;
          this.registerForm.uuid = res.uuid;
          this.codeUrl = "data:image/gif;base64," + res.data.img;
          this.registerForm.uuid = res.data.uuid;
        }
      });
    },
@@ -145,7 +145,7 @@
};
</script>
<style rel="stylesheet/scss" lang="scss">
<style rel="stylesheet/scss" scoped>
.register {
  display: flex;
  justify-content: center;
ruoyi-ui/src/views/secret/index.vue
@@ -385,7 +385,10 @@
        // 日期范围
        dateRange: [],
        // 数据范围选项
        fot:[".jpg",".jif"],
        // 数据范围选项
        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:[
ruoyi-ui/src/views/secret/secretInfo.vue
@@ -188,7 +188,10 @@
      return {
        cdi:"隐私详细信息",
        udi:"隐私信息修改",
        fot:[".jpg",".jif"],
       // 数据范围选项
       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:[
@@ -448,6 +451,20 @@
            _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)
          //  alert(87)
            updateSecret(_this.formData).then(response => {
              this.$modal.msgSuccess("图片上传成功");
              // this.open = false;
            });
        })
      },
ruoyi-ui/src/views/self/edit.vue
@@ -284,7 +284,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      // 数据范围选项
      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:[
ruoyi-ui/src/views/self/memoInfo.vue
@@ -192,7 +192,10 @@
    return {
      cdi:"个人记事本详情",
      udi:"个人记事本详情",
      fot:[".jpg",".jif","png"],
     // 数据范围选项
     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:[],
      dsb:true,
ruoyi-ui/src/views/self/show.vue
@@ -821,7 +821,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
     // 数据范围选项
     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:[],
      dsb:true,
ruoyi-ui/src/views/selfeconomy/index.vue
@@ -408,7 +408,10 @@
        // 日期范围
        dateRange: [],
        // 数据范围选项
        fot:[".jpg",".jif"],
    // 数据范围选项
    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:[
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -225,7 +225,10 @@
    return {
      cdi:"个人财产详细信息",
      udi:"个人财产信息详情",
      fot:[".jpg",".jif"],
     // 数据范围选项
     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:[
ruoyi-ui/src/views/system/user/index.vue
@@ -2,31 +2,7 @@
  <div class="app-container">
    <el-row :gutter="20">
      <!--部门数据-->
      <el-col :span="4" :xs="24">
        <div class="head-container">
          <el-input
            v-model="deptName"
            placeholder="请输入部门名称"
            clearable
            size="small"
            prefix-icon="el-icon-search"
            style="margin-bottom: 20px"
          />
        </div>
        <div class="head-container">
          <el-tree
            :data="deptOptions"
            :props="defaultProps"
            :expand-on-click-node="false"
            :filter-node-method="filterNode"
            ref="tree"
            node-key="id"
            default-expand-all
            highlight-current
            @node-click="handleNodeClick"
          />
        </div>
      </el-col>
      <!--用户数据-->
      <el-col :span="20" :xs="24">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
@@ -141,7 +117,7 @@
          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
            <template slot-scope="scope">
@@ -212,17 +188,28 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="归属部门" prop="deptId">
              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
            <el-form-item label="角色" prop="roleIds">
              <el-select v-model="form.roleIds"  multiple placeholder="请选择角色">
                <el-option
                  v-for="item in roleOptions"
                  :key="item.roleId"
                  :label="item.roleName"
                  :value="item.roleId"
                  :disabled="item.status == 1"
                ></el-option>
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="手机号码" prop="phonenumber">
              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
            </el-form-item>
          </el-col>
       <el-col :span="12">
         <el-form-item label="家庭号">
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择家庭号" />
         </el-form-item>
       </el-col>
          <el-col :span="12">
            <el-form-item label="邮箱" prop="email">
              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
@@ -268,29 +255,8 @@
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="岗位">
              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
                <el-option
                  v-for="item in postOptions"
                  :key="item.postId"
                  :label="item.postName"
                  :value="item.postId"
                  :disabled="item.status == 1"
                ></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="角色">
              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
                <el-option
                  v-for="item in roleOptions"
                  :key="item.roleId"
                  :label="item.roleName"
                  :value="item.roleId"
                  :disabled="item.status == 1"
                ></el-option>
              </el-select>
            <el-form-item label="手机号码" prop="phonenumber">
              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -431,6 +397,13 @@
        nickName: [
          { required: true, message: "用户昵称不能为空", trigger: "blur" }
        ],
        roleIds: [
          { required: true, message: "用户角色不能为空", trigger: "blur" }
        ],
        deptId: [
          { required: true, message: "用户角色不能为空", trigger: "blur" }
        ],
        password: [
          { required: true, message: "用户密码不能为空", trigger: "blur" },
          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
ruoyi-ui/src/views/travel/Info.vue
@@ -354,7 +354,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
    // 数据范围选项
    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:[
ruoyi-ui/src/views/travel/edit.vue
@@ -65,7 +65,10 @@
    return {
      cdi:"旅游费用信息",
      udi:"旅游费用修改",
      fot:[".jpg",".jif","png"],
     // 数据范围选项
     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:[
ruoyi-ui/src/views/travel/index.vue
@@ -508,7 +508,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
   // 数据范围选项
   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:[
ruoyi-ui/src/views/travel/travelInfo.vue
@@ -205,7 +205,10 @@
    return {
      cdi:"家庭大事记信息",
      udi:"家庭大事记修改",
      fot:[".jpg",".jif","png"],
    // 数据范围选项
    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:[
ruoyi-ui/src/views/wish/index.vue
@@ -409,7 +409,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      // 数据范围选项
      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:[],
      dsb:true,
ruoyi-ui/src/views/wish/wishInfo.vue
@@ -215,7 +215,10 @@
    return {
      cdi:"百年心愿详细信息",
      udi:"百年心愿信息详情",
      fot:[".jpg",".jif"],
     // 数据范围选项
     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:[],
      dsb:true,
ruoyi-ui/vue.config.js
@@ -33,9 +33,10 @@
    port: port,
    open: true,
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      // detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        target: `https://47.93.189.255:8080/`,
        //target: `https://10.39.18.174:8080/`,
        target: `https://www.bendudu.com:8080/`,
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''