From 784f598b870c16ee93075fdc23df3f68bec0a460 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 02 十一月 2024 22:18:39 +0800
Subject: [PATCH] 修改bug
---
ruoyi-ui/src/views/homeRoot/personInfo.vue | 34 ++++++++--
ruoyi-ui/src/views/clanManager/ancestor/index.vue | 2
ruoyi-ui/src/views/system/user/profile/index.vue | 4 +
ruoyi-ui/src/views/travel/index.vue | 38 ++++++------
ruoyi-ui/src/api/login.js | 2
ruoyi-ui/vue.config.js | 2
ruoyi-ui/src/views/healthy/healthYear.vue | 2
ruoyi-ui/src/api/root/index.js | 10 +++
ruoyi-ui/src/router/index.js | 2
ruoyi-ui/src/views/doctor/index.vue | 2
ruoyi-ui/src/views/login.vue | 24 ++++---
11 files changed, 78 insertions(+), 44 deletions(-)
diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
index b8e6d5a..ce50a53 100644
--- a/ruoyi-ui/src/api/login.js
+++ b/ruoyi-ui/src/api/login.js
@@ -23,6 +23,8 @@
// 娉ㄥ唽鏂规硶
export function register(data) {
+ // console.log(data)
+ // console.log("]]]]]]]]]]]]]]]]")
return request({
url: '/register',
headers: {
diff --git a/ruoyi-ui/src/api/root/index.js b/ruoyi-ui/src/api/root/index.js
index d245238..ff88b79 100644
--- a/ruoyi-ui/src/api/root/index.js
+++ b/ruoyi-ui/src/api/root/index.js
@@ -47,5 +47,13 @@
params: query
})
}
-
+//淇敼鐢ㄦ埛绠�浠�
+export function updateInfoUser(data)
+{
+ return request({
+ url: '/self/user',
+ method: 'put',
+ data: data
+ })
+}
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index d91409b..831e2ff 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -495,7 +495,7 @@
path: '/familymodel/jiagenwang',
component: Layout,
// permissions: [],
- hidden: true,
+ // hidden: true,
permissions: ['familymodel:jiagenwang:info'],
children: [
{
diff --git a/ruoyi-ui/src/views/clanManager/ancestor/index.vue b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
index 8a78b80..8fb6926 100644
--- a/ruoyi-ui/src/views/clanManager/ancestor/index.vue
+++ b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
@@ -551,7 +551,7 @@
const userId = row.id || this.ids;
this.cuid= row.id || this.ids;
// this.fid = response.data.familyId
- // alert(userId)
+ alert(userId)
//alert(this.fid)
getUser(userId).then(response => {
this.form = response.data;
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 63b18b6..de51fd4 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -156,7 +156,7 @@
<el-table v-loading="loading" border :data="doctorList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
- <el-table-column label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
+ <el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
<el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="80" align="center">
<!-- <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>-->
<template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
diff --git a/ruoyi-ui/src/views/healthy/healthYear.vue b/ruoyi-ui/src/views/healthy/healthYear.vue
index 6e3ff87..dcc293f 100644
--- a/ruoyi-ui/src/views/healthy/healthYear.vue
+++ b/ruoyi-ui/src/views/healthy/healthYear.vue
@@ -2201,7 +2201,7 @@
if (valid) {
if (this.HealthyBaseList!== undefined) {
updateHealthBase(this.HealthyBaseList).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛11");
+ this.$modal.msgSuccess("淇敼鎴愬姛");
// this.open = false;
this.btn=false
diff --git a/ruoyi-ui/src/views/homeRoot/personInfo.vue b/ruoyi-ui/src/views/homeRoot/personInfo.vue
index bb384ee..c95ed04 100644
--- a/ruoyi-ui/src/views/homeRoot/personInfo.vue
+++ b/ruoyi-ui/src/views/homeRoot/personInfo.vue
@@ -133,10 +133,10 @@
- <div style="margin-bottom: 20px;">
+ <div style="margin-bottom: 20px;" v-if="cid==uid">
<el-button size='mini' type="text" class="btn_edit" @click="editAutography" style='top: 0px; bottom:20px;right: 20px;'>
- <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
- <span >{{ editMode ? this.bstn='淇濆瓨' : this.bstn='淇敼' }}</span>
+ <sapn v-if="cid==uid" v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
+ <span v-if="cid==uid">{{ editMode ? this.bstn='淇濆瓨' : this.bstn='淇敼' }}</span>
</el-button>
</div>
<el-tab-pane
@@ -183,14 +183,16 @@
</template>
<script>
-import {getRoot} from "@/api/root/index";
+import {getRoot,updateInfoUser} from "@/api/root/index";
export default {
- name: "index",
+ name: "personInfo",
data(){
return{
+ cid: undefined,
+ uid: undefined,
bstn: undefined,
editMode:false,
- autoGrahpy: "22222222222222222",
+ autoGrahpy: "濮撳悕__________锛屾�у埆__________锛屽嚭鐢熶簬____骞確_鏈坃_鏃ャ�傛垜姣曚笟浜巁_________澶у鐨刜_________涓撲笟锛岃幏寰梍_________瀛﹀巻銆傜洰鍓嶅氨鑱屼簬__________鐨刜_________鑱屼綅锛屼富瑕佽礋璐_________锛岄�氳繃杩愮敤__________鎶�鑳�/鏂规硶锛屾垚鍔熷疄鐜颁簡__________锛屼笉浠呮彁鍗囦簡涓汉涓撲笟鑳藉姏锛屼篃淇冭繘浜嗗洟闃熶笌椤圭洰鐨勬垚鍔熴�傚湪涓氫綑鏃堕棿锛屾垜鐑》浜巁_________锛堝闃呰銆佹梾琛屻�佹憚褰辩瓑锛変綔涓烘垜鐨勫叴瓒ｇ埍濂斤紝杩欎簺娲诲姩涓嶄粎涓板瘜浜嗘垜鐨勭敓娲伙紝涔熻鎴戝湪鏀炬澗鐨勫悓鏃朵笉鏂涔犲拰鎴愰暱銆傚洖椤捐繃寰�锛屾渶浠ゆ垜闅惧繕鐨勪竴浠朵簨鏄痏_________锛堢畝杩颁簨浠讹紝濡傚弬涓庣殑涓�娆￠噸澶ч」鐩�佷竴娆￠毦蹇樼殑鏃呰缁忓巻鎴栬В鍐虫煇涓毦棰樼殑杩囩▼锛夛紝杩欎欢浜嬩笉浠呰鎴戞繁鍒讳綋浼氬埌浜哶_________锛堝鍥㈤槦鍚堜綔鐨勫姏閲忋�佸潥鎸佷笉鎳堢殑閲嶈鎬с�佺敓娲荤殑缇庡ソ绛夛級锛屼篃瀵规垜鐨勪汉鐢熻鍜屼环鍊艰浜х敓浜嗘繁杩滅殑褰卞搷銆傛垜鍏峰__________绛夌壒璐紝鑳藉蹇�熼�傚簲鏂扮幆澧冿紝鍕囦簬鎸戞垬锛岃嚧鍔涗簬鍦╛_________棰嗗煙涓笉鏂拷姹傚崜瓒�",
// 閬僵灞�
disabled: false,
@@ -251,6 +253,7 @@
,
mounted() {
const id = this.$route.params && this.$route.params.id;
+ this.uid = id;
this.getList(id);
},
methods:{
@@ -259,7 +262,11 @@
// const id = row.userId;
//alert(id)
// alert(id)
- this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
+ // alert(23)
+this.$store.dispatch("tagsView/delView", this.$route); //鍏抽棴褰撳墠椤�
+ this.$router.replace({ path: "/familymodel/jiagenwang/personInfo/" + id });
+
+ // this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
},
editAutography(data)
@@ -267,12 +274,21 @@
this.editMode = true;
if(this.bstn=="淇濆瓨")
{
+
this.editMode = false
- }
+ var fdt = {
+ selfIntroduction: this.autoGrahpy}
+ updateInfoUser(fdt).then(response=>{
+ this.$modal.msgSuccess("淇敼鎴愬姛")
+ this.getList(this.uid)
+ })
+ }
},
getList(id)
{
+ this.cid = this.$store.state.user.userId
+
let _this = this;
getRoot(id).then(response => {
console.log(response.data)
@@ -282,6 +298,8 @@
// if(_this.personInfos[1]==null)
// _this.isshow = false;
_this.personInfo1 = response.data[0]
+ if(response.data[0].selfIntroduction!=null)
+ _this.autoGrahpy = response.data[0].selfIntroduction
//alert(this.personInfos[0].url)
});
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index ca81110..e1fb05a 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -150,8 +150,8 @@
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">鏂扮敤鎴锋敞鍐�</h3>
- <el-form-item prop="nickName">
- <el-input v-model="registerForm.nickName" type="text" auto-complete="off" placeholder="璐﹀彿">
+ <el-form-item prop="nickname">
+ <el-input v-model="registerForm.nickname" type="text" auto-complete="off" placeholder="璐﹀彿">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
@@ -223,7 +223,7 @@
</template>
<script>
-import { getCodeImg,Download } from "@/api/login";
+import { getCodeImg,Download,register } from "@/api/login";
import Cookies from "js-cookie";
import { encrypt, decrypt } from '@/utils/jsencrypt'
@@ -264,23 +264,23 @@
// 楠岃瘉鐮佸紑鍏�
captchaEnabled: true,
// 娉ㄥ唽寮�鍏�
- register: true,
+ // register: true,
redirect: undefined,
registerForm: {
- nickName: "",
+ nickname: "",
password: "",
confirmPassword: "",
code: "",
uuid: ""
},
registerRules: {
- nickName: [
+ nickname: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" },
- { min: 2, max: 20, message: '鐢ㄦ埛璐﹀彿闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' }
+ // { min: 2, max: 20, message: '鐢ㄦ埛璐﹀彿闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' }
],
password: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" },
@@ -309,16 +309,19 @@
},
methods: {
handleRegister() {
+ //alert(this.registerForm.nickname)
this.$refs.registerForm.validate(valid => {
if (valid) {
this.loading = true;
+ //alert(this.registerForm.nickname)
register(this.registerForm).then(res => {
- const nickName = this.registerForm.nickName;
+ const nickName = this.registerForm.nickname;
this.$alert("<font color='red'>鎭枩浣狅紝鎮ㄧ殑璐﹀彿 " + nickName + " 娉ㄥ唽鎴愬姛锛�</font>", '绯荤粺鎻愮ず', {
dangerouslyUseHTMLString: true,
type: 'success'
}).then(() => {
- this.$router.push("/login");
+ this.openRegister = false;
+ // this.$router.push("/login");
}).catch(() => {});
}).catch(() => {
this.loading = false;
@@ -338,11 +341,12 @@
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;
this.loginForm.uuid = res.data.uuid;
+ this.registerForm.uuid = res.data.uuid;
}
});
},
diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue
index 1aa1188..f728a33 100644
--- a/ruoyi-ui/src/views/system/user/profile/index.vue
+++ b/ruoyi-ui/src/views/system/user/profile/index.vue
@@ -238,7 +238,7 @@
label: '淇濇磥鏀剁撼',
},
{
- id: 2020,
+ id: 2021,
label: '閫氳褰�',
},
{ id:2033,
@@ -320,6 +320,8 @@
let checkedKeys = this.$refs.authr.getCheckedKeys();
let peoKeys = this.$refs.peoInfo.getCheckedKeys();
console.log(peoKeys)
+ console.log(checkedKeys)
+
//alert(this.fid)
// alert(checkedKeys.length)
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 65b27bf..bef6853 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -113,26 +113,26 @@
<template slot-scope="props">
<div >
<el-table :header-row-class-name="tableHeaderRowClassName" v-loading="loading" :data="travelBase[props.row.id]" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;" :row-class-name="tableRowClassName1" >
- <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="50px"/>
+ <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="114px"/>
<el-table-column label="鏃堕棿" prop="happenDate" sortable width="100" align="center" >
<template slot-scope="scope">{{scope.row.happenDate? scope.row.happenDate: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鍦扮偣" prop="address" sortable width="100" />
+ <el-table-column label="鍦扮偣" prop="address" sortable width="200" />
<el-table-column label="寤虹瓚" prop="scenic" sortable width="100" />
<!-- <el-table-column label="鏃呮湡" prop="travelPeriod" sortable width="100" /> -->
<el-table-column label="浣跨敤璇佷欢" prop="document" sortable width="100" />
<el-table-column label="杞︽/鑸彮" prop="flight" sortable width="120px" />
- <el-table-column label="椁愯垂" prop="eat" sortable width="70px" />
- <el-table-column label="浣忓璐�" prop="stay" sortable width="100px" />
- <el-table-column label="浜ら��" prop="travel" sortable width="70px" />
- <el-table-column label="闂ㄧエ" prop="entrance" sortable width="70px" />
- <el-table-column label="鍏跺畠璐圭敤" prop="otherCost" sortable width="120px" />
- <el-table-column label="澶囨敞" prop="backInfo" sortable width="120px" />
+ <el-table-column label="椁愯垂" prop="eat" sortable width="80px" />
+ <el-table-column label="浣忓璐�" prop="stay" sortable width="110px" />
+ <el-table-column label="浜ら��" prop="travel" sortable width="80px" />
+ <el-table-column label="闂ㄧエ" prop="entrance" sortable width="80px" />
+ <el-table-column label="鍏跺畠璐圭敤" prop="otherCost" sortable width="130px" />
+ <el-table-column label="澶囨敞" prop="backInfo" sortable width="130px" />
- <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="201px" >
<template slot-scope="scope" >
<img
class="el-upload-list__item-thumbnail"
@@ -155,7 +155,7 @@
<!-- <el-table-column label="澶囨敞" prop="remark" sortable width="100" />-->
- <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding " v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
size="mini"
@@ -190,21 +190,21 @@
<template slot-scope="scope">{{scope.row.endTime? scope.row.endTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<!-- <el-table-column label="鎬诲ぉ鏁�" prop="totalDay" sortable width="85px" />-->
- <el-table-column label="鏃呮父鍚嶇О" prop="name" sortable width="200px" />
- <el-table-column label="鍘诲悜" prop="destination" sortable width="150px" />
- <el-table-column label="鏃呮父鎬ц川" prop="property" sortable width="100" />
+ <el-table-column label="鏃呮父鍚嶇О" prop="name" sortable width="160px" />
+ <el-table-column label="鍘诲悜" prop="destination" sortable width="120px" />
+ <el-table-column label="鏃呮父鎬ц川" prop="property" sortable width="100px" />
<el-table-column label="鎰熻█" prop="spee" sortable width="120px" />
<el-table-column label="鏃呮父鏂瑰紡" prop="manner" sortable width="100" />
<el-table-column label="鎬婚噾棰�" prop="totalPrice" sortable width="100" />
- <el-table-column label="椁愯垂" prop="eatTotal" sortable width="70px" />
- <el-table-column label="浣忓" prop="stayTotal" sortable width="70px" />
- <el-table-column label="浜ら��" prop="travelTotal" sortable width="70px" />
- <el-table-column label="闂ㄧエ" prop="entranceTotal" sortable width="70px" />
- <el-table-column label="鍥㈣垂" prop="groupTotal" sortable width="70px" />
+ <el-table-column label="椁愯垂" prop="eatTotal" sortable width="80px" />
+ <el-table-column label="浣忓" prop="stayTotal" sortable width="80px" />
+ <el-table-column label="浜ら��" prop="travelTotal" sortable width="80px" />
+ <el-table-column label="闂ㄧエ" prop="entranceTotal" sortable width="80px" />
+ <el-table-column label="鍥㈣垂" prop="groupTotal" sortable width="80px" />
- <el-table-column fixed="right" label="鎿嶄綔" align="center" sortable width="250" v-if="userId != 2">
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" sortable width="250px" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
size="mini"
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 091dc53..0b0cb0e 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.7:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.1