| ruoyi-ui/src/api/login.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/api/root/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/router/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/clanManager/ancestor/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/doctor/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/healthy/healthYear.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/homeRoot/personInfo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/login.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/system/user/profile/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/travel/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/vue.config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-ui/src/api/login.js
@@ -23,6 +23,8 @@ // 注册方法 export function register(data) { // console.log(data) // console.log("]]]]]]]]]]]]]]]]") return request({ url: '/register', headers: { 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 }) }
@@ -495,7 +495,7 @@ path: '/familymodel/jiagenwang', component: Layout, // permissions: [], hidden: true, // hidden: true, permissions: ['familymodel:jiagenwang:info'], children: [ { 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; 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> 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 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) }); 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; } }); }, 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)
@@ -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" 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: {
