From a191b146987b36eaad9b441c458f74c69aeef63f Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 27 十月 2024 21:16:58 +0800
Subject: [PATCH] 修改了对应的bug
---
ruoyi-ui/src/permission.js | 2 ++
ruoyi-ui/src/views/marry/index.vue | 5 +++--
ruoyi-ui/src/api/marry/index.js | 4 ++--
ruoyi-ui/vue.config.js | 2 +-
ruoyi-ui/src/views/system/user/index.vue | 18 +++++++++++-------
5 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/api/marry/index.js b/ruoyi-ui/src/api/marry/index.js
index 574fa57..f740c16 100644
--- a/ruoyi-ui/src/api/marry/index.js
+++ b/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
})
}
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index 93a20bd..d67452c 100644
--- a/ruoyi-ui/src/permission.js
+++ b/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)
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index 098c5d0..ff18923 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/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) {
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 640a291..468fce1 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/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);
+ }
}
);
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index a8723e0..091dc53 100644
--- a/ruoyi-ui/vue.config.js
+++ b/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: {
--
Gitblit v1.9.1