feige
2024-10-27 a191b146987b36eaad9b441c458f74c69aeef63f
修改了对应的bug
5个文件已修改
31 ■■■■■ 已修改文件
ruoyi-ui/src/api/marry/index.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/permission.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/marry/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/user/index.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/vue.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/marry/index.js
@@ -1,11 +1,11 @@
import request from '@/utils/request'
// 查询数据
export function listMarry(query) {
export function listMarry() {
  return request({
    url: '/marrySelf',
    method: 'get',
    params: query
  //  params: query
  })
}
ruoyi-ui/src/permission.js
@@ -28,6 +28,8 @@
          store.dispatch('GenerateRoutes').then(accessRoutes => {
            // 根据roles权限生成可访问的路由表
       //     alert(90)
       // alert(90)
            console.log(accessRoutes)
            router.addRoutes(accessRoutes) // 动态添加可访问路由表
         //   console.log(router)
ruoyi-ui/src/views/marry/index.vue
@@ -800,7 +800,7 @@
    getList() {
      this.loading = true;
      //个人信息
      listMarry(this.queryParams).then(response => {
      listMarry().then(response => {
          if(response.data.length === 0){
            this.loading = false;
@@ -1088,7 +1088,8 @@
      this.$set(row, 'isEdit', false);
      this.$set(this.editStatus, row.id, false);
    },
handleSelectionChange()
{},
    //隔行变色
    tableRowClassName({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
ruoyi-ui/src/views/system/user/index.vue
@@ -864,10 +864,10 @@
      this.getSex();
      this.getAllIn()
    alert(34)
      const userId = row.userId || this.ids;
      this.cuid= row.userId || this.ids;
    alert(345)
      let clanId = this.$store.state.user.clanId
          this.allInfo2 = []
          //alert(this.form.sex)
@@ -898,13 +898,14 @@
        // this.rt = response.roleIds[0]
        let _this = this
        // alert(response.data.roles[0].roleName)
         if(response.data.role!=102)
        {
          return
        }
        // console.log(response.data.role)
  //        if(response.data.role!=102)
  //       {
  //         return
  //       }
     getIndividual(userId).then(response => {
            
           // console.log('++++++++-----0000((((((9999))))))')
              console.log(response.data,'getIndividualgetIndividualgetIndividual')
            if(response.data!=undefined)
@@ -935,6 +936,9 @@
              _this.zinfid = response.data.userId
            //  alert(78)
              }
              else{
                  _this.$set(_this.form,'role',2);
              }
          }
        );
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.8:8080/`,
//     target: `https://192.168.1.8:8080/`,
      target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {