| ruoyi-ui/src/api/honor/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/collection/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/components/superMindmap.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/contacts/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/homeRoot/personInfo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/honor/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/login.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/self/memo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/self/show.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/system/user/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/wish/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/vue.config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-ui/src/api/honor/index.js
@@ -90,6 +90,7 @@ // ------------------------------- // 分享 export function share(data) { return request({ url: '/zHonorShare/share', method: 'post', ruoyi-ui/src/views/collection/index.vue
@@ -842,7 +842,7 @@ deleteShareData(list).then(()=>{ Message({ message: "收回成功", type: 'success' }) this.getList1(); alert(234) //alert(234) const list2 = {"shareIds": [this.selectWho]} shareToWho(list2,this.queryParams2).then(response => { this.shareList1 = response.data.data ruoyi-ui/src/views/components/superMindmap.vue
@@ -239,6 +239,8 @@ }) .on("click",function (event, node) { let data = node.data // alert(213) // alert("/familymodel/jiagenwang/personInfo/" + data.id) that.$router.push("/familymodel/jiagenwang/personInfo/" + data.id); }) ruoyi-ui/src/views/contacts/index.vue
@@ -606,7 +606,7 @@ import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"; import {getInfo} from "@/api/login"; import { Notification, MessageBox, Message, Loading } from 'element-ui' import {showShareUser} from "@/api/bignote/index"; import {s} from "@/api/bignote/index"; import {getAllInfo} from "@/api/system/user" //导入接口函数 ruoyi-ui/src/views/homeRoot/personInfo.vue
@@ -123,269 +123,59 @@ </div> </el-container> <el-divider /> <el-container v-if="isshow"> <div style="padding-left:30px;padding-top: 10px"> <el-col> <el-row :span="8"> <el-form-item label="姓名" prop="nickName" label-width="50px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;" > <el-input v-model="personInfos[1].nickName" placeholder="请输入姓名" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="身份" prop="identity" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].identity" placeholder="请输入身份" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="曾用名" prop="oldName" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].oldName" placeholder="请输入曾用名" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="生肖" prop="shengXiao" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].shengXiao" placeholder="请输入生肖" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="星座" prop="constellation" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input type="textarea" v-model="personInfos[1].constellation" placeholder="请输入星座" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-col> </div> <div style="padding-left:30px;padding-top: 10px" v-show="personInfos[1]"> <el-col> <el-row :span="8"> <el-form-item label="性别" prop="sex" label-width="45px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].sex=== 1 ? '男':'女'" placeholder="请输入性别" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="民族" prop="nation" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].nation" placeholder="请输入民族" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="联系方式" prop="phoneNumber" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].phoneNumber" placeholder="请输入联系方式" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="微信号" prop="wxNo" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].wxNo" placeholder="请输入微信号" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="常住地址" prop="alwaysAddress" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input type="textarea" v-model="personInfos[1].alwaysAddress" placeholder="请输入常住地址" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-col> </div> <div style="padding-left:30px;padding-top: 10px"> <el-col> <el-row :span="8"> <el-form-item label="婚姻状况" prop="maritalStatus" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].maritalStatus === 1 ? '已婚':'未婚'" placeholder="请输入婚姻状况" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="配偶" prop="nickName" label-width="50px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[0].nickName" placeholder="请输入配偶" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="职务职称" prop="position" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].position" placeholder="请输入职务职称" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="星座" prop="constellation" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].constellation" placeholder="请输入星座" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="单位" prop="unit" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input type="textarea" v-model="personInfos[1].unit" placeholder="请输入单位" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-col> </div> <div style="padding-left:30px;padding-top: 45px"> <el-container> <el-col :span="6" :data="personInfos"> <div class="block" :model="personInfos" > <el-col v-model="personInfos[1].url" prop="url"> <el-avatar shape="square" :size=200 > <el-image :src="'https://www.bendudu.com:8080/'+ personInfos[1].url" style="width: 100%;height: 100%;" ></el-image> </el-avatar> </el-col> </div> </el-col> </el-container> </div> </el-container> <div> <el-tabs type="border-card" > <el-button size='mini' type="text" class="btn_edit" @click="editAutography" style='top: 0px;right: 20px;'> <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> <span >{{ editMode ? this.bstn='保存' : this.bstn='修改' }}</span> </el-button> <el-tab-pane label="个人简介"> <template v-if="editMode"> <div style="padding-top: 10px"> <el-input v-model="autoGrahpy" type="textarea" ></el-input></div> </template> <template v-else> {{autoGrahpy}} </template> </el-tab-pane> </el-tabs></div> </el-form> </div> <el-divider style="top:120px;"/> <div id="building2" v-show="!isshow"> <el-form ref="elForm" :model="personInfo1" :rules="rules" size="medium" label-position="center" label-width="100px"> <el-container> <div style="padding-left:30px;padding-top: 50px"> <el-container> <el-col :span="6" :data="personInfo1"> <div class="block" :model="personInfo1" > <el-col v-model="personInfo1.url" prop="url"> <el-avatar shape="square" :size=200 > <el-image :src="'https://www.bendudu.com:8080/'+ personInfo1.url" style="width: 100%;height: 100%;" ></el-image> </el-avatar> </el-col> </div> </el-col> </el-container> </div> <div style="padding-left:30px;padding-top: 15px"> <el-container> <el-col> <el-row :span="8"> <el-form-item label="姓名" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.nickName" placeholder="请输入姓名" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="身份" prop="identity" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.identity" placeholder="请输入身份" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="曾用名" prop="oldName" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.oldName" placeholder="请输入曾用名" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="生肖" prop="shengXiao" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.shengXiao" placeholder="请输入生肖" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="户籍地址" prop="locationAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input type="textarea" v-model="personInfo1.locationAddress" placeholder="请输入户籍地址" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-col> </el-container> </div> <div style="padding-left:30px;padding-top: 15px"> <el-container> <el-col> <el-row :span="8"> <el-form-item label="性别" prop="sex" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.sex === 1 ? '男':'女'" placeholder="请输入性别" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="民族" prop="nation" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.nation" placeholder="请输入民族" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="联系方式" prop="phoneNumber" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.phoneNumber" placeholder="请输入联系方式" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="微信号" prop="wxNo" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.wxNo" placeholder="请输入微信号" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="常住地址" prop="alwaysAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input type="textarea" v-model="personInfo1.alwaysAddress" placeholder="请输入常住地址" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-col> </el-container> </div> <div style="padding-left:30px;padding-top: 15px"> <el-container> <el-col> <el-row :span="8"> <el-form-item label="婚姻状况" prop="maritalStatus" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.maritalStatus === 1 ? '已婚':'未婚'" placeholder="请输入婚姻状况" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="配偶" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.spouseId" placeholder="请输入配偶" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="星座" prop="constellation" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.constellation" placeholder="请输入星座" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="职务职称" prop="position" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.position" placeholder="请输入职务职称" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item class="centered-label" label="单位" prop="unit" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input type="textarea" v-model="personInfo1.unit" placeholder="请输入单位" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-col> </el-container> </div> </el-container> </el-form> </div> </div> <div> <el-row> <el-col :span="11" class="bordered-col"> <div class="left-content">我的分享</div> <el-divider /> <el-card class="box-card"> <div v-for="o in 4" :key="o" class="text item"> <a href="www.baidu.com">{{'列表内容 ' + o }}</a> </div> </el-card> </el-col> <el-col :span="11" class="bordered-col"> <div class="left-content">我的收藏</div> <el-divider /> <el-card class="box-card"> <div v-for="o in 4" :key="o" class="text item"> {{'列表内容 ' + o }} </div> </el-card> </el-col> </el-row> </div> </div> </template> @@ -395,7 +185,11 @@ name: "index", data(){ return{ bstn: undefined, editMode:false, autoGrahpy: "22222222222222222", // 遮罩层 disabled: false, personInfos:{}, personInfo1:{}, @@ -457,6 +251,15 @@ this.getList(id); }, methods:{ editAutography(data) { this.editMode = true; if(this.bstn=="保存") { this.editMode = false } }, getList(id) { let _this = this; @@ -512,4 +315,39 @@ border: 1px solid red; text-align: center; } .btn_edit{ background:center no-repeat url('../../assets/icons/edit.png') ; position: absolute; top: 0; padding-right: 90px; } .bordered-col { border: 1px solid #d3dce6; /* 设置边框样式 */ border-radius: 4px; /* 可选：设置圆角 */ padding: 10px; /* 内边距 */ margin-right: 20px; } .btn_del{ background:center no-repeat url('../../assets/images/删除2.png') ; } .el-row { margin-bottom: 20px; &:last-child { margin-bottom: 0; } } .el-col { border-radius: 4px; } .text { font-size: 14px; } .item { padding: 18px 0; } .box-card { width:100%; } </style> ruoyi-ui/src/views/honor/index.vue
@@ -858,7 +858,7 @@ this.loading1 = true; let userId = this.$store.state.user.userId // alert(userId) // alert(124) showShareUser(userId, 2030).then(response=>{ console.log("===========ddddddddddddd") console.log(response.data) @@ -899,7 +899,7 @@ this.$modal.confirm('是否确认分享？').then(function() { return share(shareList); }).then(() => { this.userOptions = [] this.getList(); this.getList1(); this.$modal.msgSuccess("分享成功"); ruoyi-ui/src/views/login.vue
@@ -216,7 +216,9 @@ </div> </div> <div class="gpr"></div> <div class="gpr"> <img :key="url" :src="url" style="width:100%;height:100%"></img> </div> </div> </template> @@ -236,6 +238,7 @@ } }; return { url: require('../assets/images/index.png'), openRegister: false, open: false, codeUrl: "", @@ -385,8 +388,8 @@ <style rel="stylesheet/scss" lang="scss"> .gpr{ width:100%; height:600px; background: no-repeat center/40% url("../assets/images/Group 132.png"); height:1200px; //background: no-repeat center/100% url("../assets/images/index.png"); } .customWidth{ width:40%; // 设置弹出框宽度的数值 @@ -396,8 +399,10 @@ margin-right: 20px; } .Group_132{ //background: no-repeat center/100% url("../assets/images/index.png"); // background: no-repeat center/40% url("../assets/images/Group 132.png"); height: 100%; height: 1200px; width: 100%; background-color: #FEF7FC; //background-position: 49.5% 16.2% ; ruoyi-ui/src/views/self/memo.vue
@@ -149,7 +149,7 @@ accept="image/*" :multiple="false" :http-request="requestUpload" :on-success="handleSucess" :limit="1"> <el-avatar shape="square" style="width: 200px;;height: 200px;" > @@ -628,7 +628,7 @@ <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value" ></el-option> </el-select> <el-input v-model="newOption" v-if="showInput" placeholder="若未在上述选项中找到对应类型，请在此输入新的证件类型" @change="addNewOption"></el-input> <el-input v-model="newOption" placeholder="若未在上述选项中找到对应类型，请在此输入新的证件类型" ></el-input> </el-form-item> <el-form-item label="持有情况" prop="ownStatus"> @@ -688,7 +688,7 @@ <!--新增自传--> <el-dialog :title="isEdit1 ? '编辑记录' : '新增记录'" :visible.sync="dialogVisible.autobiography" width="900px" append-to-body> <el-col > <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-position="left" > <el-form ref="elFormzz" :model="formDat6" :rules="rules" size="medium" label-position="left" > <el-row :span="5"> <!-- <el-form-item label="需要修改的记录：" prop="id">--> <!-- <el-select v-model="formDat.id" placeholder="请选择需要修改的记录" clearable :style="{width: '50%'}" >--> @@ -697,10 +697,10 @@ <!-- </el-select>--> <!-- </el-form-item>--> <el-form-item label="年龄段：" prop="ageBegin ageEnd" label-width="70px"> <el-input type="number" v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" > <el-input @input="$forceUpdate()" type="number" v-model="formDat6.ageBegin" placeholder="" clearable :style="{width: '20%'}" > </el-input> <span> 岁 ——</span> <el-input type="number" v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" > <el-input @input="$forceUpdate()" type="number" v-model="formDat6.ageEnd" placeholder="" clearable :style="{width: '20%'}" > </el-input> <span> 岁 </span> </el-form-item> @@ -709,11 +709,11 @@ <!-- <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"--> <!-- ></el-option>--> <!-- </el-select>--> <el-input v-model="formDat.term" placeholder="请输入时期" clearable :style="{width: '100%'}" > <el-input @input="$forceUpdate()" v-model="formDat6.term" placeholder="请输入时期" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="内容编辑：" prop="content"> <el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="" clearable :style="{width: '100%'}" > <el-input @input="$forceUpdate()" v-model="formDat6.content" type="textarea" :rows="5" placeholder="" clearable :style="{width: '100%'}" > </el-input> </el-form-item> </el-row> @@ -750,6 +750,7 @@ dicts: ['sys_normal_disable'], data() { return { userId: undefined, // 遮罩层 disabled: false, inds:undefined, @@ -759,7 +760,7 @@ formData:[], // 选中数组 ids: [], fit:['cover'], fit:'cover', // 非单个禁用 single: true, // 非多个禁用 @@ -797,11 +798,11 @@ }, // 个人经历数据 experienceList: [], experienceList: undefined, // isEdit:true, editStatus: {}, //家庭成员关系数据 relationList:[], relationList: undefined, //出入境证件情况 certificateList:[], typeList:[], @@ -810,7 +811,7 @@ uploading: false, uploading1: false, fit:['fill'], fit1: ['fill'], keyword:'', rules: { //基本信息 @@ -899,12 +900,12 @@ }], ageBegin: [{ required: true, message: '', message: '请输入开始时间', trigger: 'blur' }], ageEnd: [{ required: true, message: '', message: '请输入结束时间', trigger: 'blur' }], @@ -912,6 +913,7 @@ open:false, formDat6: {}, formDat: { //个人记事本详情 id:undefined, @@ -923,6 +925,7 @@ url: undefined, }, individualList:[], newOption: undefined, // 菜单列表 menuOptions: [], // 部门列表 @@ -977,6 +980,7 @@ trigger: 'blur' }], }, typeOption: [], typeOptions: [], isShow:true, dsb:true, @@ -1000,10 +1004,10 @@ methods: { getInfo(){ console.log('-----------------') getInfo().then(response=>{ console.log(response.user.roles[0].roleId,'roleID') this.userId = response.user.roles[0].roleId }) // getInfo().then(response=>{ // console.log(response.user.roles[0].roleId,'roleID') // this.userId = response.user.roles[0].roleId // }) }, getList1() { this.loading1 = true; @@ -1125,7 +1129,7 @@ // 取消按钮 cancel() { this.open = false; this.reset(); // this.reset(); }, getRowId(row) { @@ -1375,7 +1379,9 @@ if (this.isEdit1) { // 执行修改操作 updateAutobiography(this.formDat).then(response => { console.log(this.formDat6) updateAutobiography(this.formDat6).then(response => { // 将选中选项的文本设置为"term"字段的值 // this.formDat.term = selectedOption.value; // this.formDat.id = selectedOption.id; @@ -1384,18 +1390,30 @@ this.dialogVisible.autobiography = false; this.isEdit1 = false; this.getList(); // 清空formDat对象的数据 Object.keys(this.formDat6).forEach(key => { this.formDat6[key] = ''; }); }).catch(error => { // alert(24) console.log(error); this.isEdit1 = false; this.dialogVisible.autobiography = false; }); } else { // 执行新增操作 addAutobiography(this.formDat).then(response => { addAutobiography(this.formDat6).then(response => { // this.formDat.term = selectedOption.label; this.$modal.msgSuccess("新增成功"); this.dialogVisible.autobiography = false; this.getList(); // 清空formDat对象的数据 Object.keys(this.formDat6).forEach(key => { this.formDat6[key] = ''; }); // 重置isEdit为false，以便下次点击新增时为新增操作 this.isEdit1 = false; }).catch(error => { console.log(error); this.dialogVisible.autobiography = false; @@ -1403,12 +1421,7 @@ } } }); // 清空formDat对象的数据 Object.keys(this.formDat).forEach(key => { this.formDat[key] = ''; }); // 重置isEdit为false，以便下次点击新增时为新增操作 this.isEdit1 = false; }, editRow(row) { @@ -1585,12 +1598,17 @@ this.dialogVisible.abroad=false; this.dialogVisible.autobiography=false; this.isEdit1 = false; this.reset(); // this.reset(); // alert(32) // 清空formDat对象的数据 Object.keys(this.formDat).forEach(key => { this.formDat[key] = ''; }); // 清空formDat对象的数据 Object.keys(this.formDat6).forEach(key => { this.formDat6[key] = ''; }); }, handleUploadSuccess(response, file) { // 处理文件上传成功后的回调 @@ -1600,34 +1618,51 @@ //下拉 handleChange5(activeNames) { // console.log(activeNames); this.reset(); //this.reset(); }, showDialog(dialogName) { this.dialogVisible[dialogName] = true; // alert(dialogName) // if(dialogName=="autobiography") // { // alert(123) // } }, //个人自传 handleClick(tab, event) { // console.log(tab, event); alert(987) this.getAutobiographyInfor(); // this.getSrc1(typeOptions) }, //个人自传编辑 editData(data) { // alert(1234) this.isEdit1 = true; // 设置为编辑操作 // 将要修改的数据填充到formDat对象中 this.formDat.ageBegin = data.ageBegin; this.formDat.ageEnd = data.ageEnd; this.formDat.term = data.term; this.formDat.content = data.content; this.formDat6.ageBegin = data.ageBegin; this.formDat6.ageEnd = data.ageEnd; this.formDat6.term = data.term; this.formDat6.content = data.content; // 打开弹窗 this.dialogVisible.autobiography = true; }, editAutobiography(item) { editAutobiography(data) { //alert(234) //alert(23) console.log(data) this.isEdit1 = true; this.formDat6.ageBegin = data.ageBegin; this.formDat6.ageEnd = data.ageEnd; this.formDat6.term = data.term; this.formDat6.content = data.content; // alert(data.id) this.formDat6.id = data.id this.dialogVisible.autobiography = true; this.formDat = { item }; //this.formDat = { item }; }, getTypeOptions() { const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== ''); ruoyi-ui/src/views/self/show.vue
@@ -442,12 +442,12 @@ <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId2" ref="table1" @selection-change="handleSelectionChange1" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> <el-table-column type="selection" width="55" align="center" /> <el-table-column fixed label="序号" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/> <el-table-column label="身份" prop="identity" sortable width="130" > <!-- <el-table-column label="身份" prop="identity" sortable width="130" > <template slot-scope="scope" > <span v-if="scope.row.isMyFamily==1">第{{scope.row.identity}}代</span> <span v-else>——</span> </template> </el-table-column> </el-table-column> --> <el-table-column label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/> </el-table>
@@ -475,7 +475,10 @@ nickName: [ { required: true, message: "用户昵称不能为空", trigger: "blur" } ], roleIds: [ roleIds: [ { required: true, message: "用户角色不能为空", trigger: "blur" } ], role: [ { required: true, message: "用户角色不能为空", trigger: "blur" } ], isMyFamily: [ @@ -969,6 +972,7 @@ fm.roleId = this.form.role fm.sex = this.form.sex // alert(fm.sex) fm.status = this.form.status if(this.originRole==102 && fm.roleId==2) { @@ -977,8 +981,8 @@ } fm.fid = this.form.fid fm.mid = this.form.mid alert(this.form.fid) alert(this.form.mid) // alert(this.form.fid) // alert(this.form.mid) // alert(this.form.isMyFamily) fm.isMyFamily = this.form.isMyFamily=='1'?1:0
@@ -447,12 +447,12 @@ <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1" @selection-change="handleSelectionChange1" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> <el-table-column type="selection" width="55" align="center" /> <el-table-column fixed label="序号" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/> <el-table-column label="身份" prop="identity" sortable width="130" > <!-- <el-table-column label="身份" prop="identity" sortable width="130" > <template slot-scope="scope" > <span v-if="scope.row.isMyFamily==1">第{{scope.row.identity}}代</span> <span v-else>——</span> </template> </el-table-column> </el-table-column> --> <el-table-column label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/> </el-table>
@@ -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.7:8080/`, // target: `https://192.168.1.6:8080/`, target: 'https://www.bendudu.com:8080/', changeOrigin: true, pathRewrite: {
