From 6de4ec8ac6822f22745c9bd059487a743e836e02 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期三, 12 四月 2023 00:04:07 +0800
Subject: [PATCH] 4.12日提交通讯录模块和成长经历模块
---
ruoyi-ui/src/views/self/show.vue | 250 ++++++++++++++++++++++++++-----------------------
1 files changed, 133 insertions(+), 117 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 01fe356..f28d412 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1,29 +1,34 @@
<template>
<div class="app-container">
-
+ <!-- 鍥炲埌椤堕儴-->
+ <el-backtop :bottom="150" :right="30">
+ <el-button type="primary" circle
+ class="el-icon-top"
+ ></el-button>
+ </el-backtop>
<h1 style="font-size:21px;padding-top:30px">涓汉绠�鍘�</h1>
<el-divider />
-<!-- 鍩烘湰淇℃伅-->
+ <!-- 鍩烘湰淇℃伅-->
<h2 style="font-size:16px">鍩烘湰淇℃伅</h2>
<el-container>
- <div style="padding-left:30px">
+ <div >
<el-container >
<el-col >
<el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left"
v-loading="loading" :data="individualList" @selection-change="handleSelectionChange" >
- <el-row :span="7">
+ <el-row :span="5">
<el-form-item label="濮撳悕" prop="nickName" label-width="40px">
<el-input v-model="individualList.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
- <el-row :span="7">
+ <el-row :span="5">
<el-form-item label="鏇剧敤鍚�" prop="oldName" label-width="60px">
<el-input v-model="individualList.oldName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
- <el-row :span="7">
+ <el-row :span="5">
<el-form-item label="韬唤璇佸彿" prop="idNum" label-width="70px">
<el-input v-model="individualList.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
@@ -33,23 +38,23 @@
</el-col>
</el-container>
</div>
- <div style="padding-left:70px">
+ <div style="padding-left:30px">
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
<el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left">
- <el-row :span="6">
+ <el-row :span="5">
<el-form-item label="鎬у埆" prop="sex" label-width="40px">
- <el-input v-model="individualList.sex" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="individualList.sex === 1 ? '鐢�':'濂�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
- <el-row :span="6">
+ <el-row :span="5">
<el-form-item label="姘戞棌" prop="nation"label-width="40px">
<el-input v-model="individualList.nation" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
</el-input>
</el-form-item>
</el-row>
- <el-row :span="8">
+ <el-row :span="5">
<el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber" label-width="70px">
<el-input v-model="individualList.phoneNumber" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
</el-input>
@@ -59,19 +64,19 @@
</el-col>
</el-container>
</div>
- <div style="padding-left:70px">
+ <div style="padding-left:30px">
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
<el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left":disabled="dsb">
- <el-row :span="6">
+ <el-row :span="5">
<el-form-item label="鍥界睄" prop="nationality" label-width="40px">
<el-input v-model="individualList.nationality" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
- <el-row :span="6">
+ <el-row :span="5">
<el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus" label-width="70px">
- <el-input v-model="individualList.maritalStatus" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="individualList.maritalStatus === 1 ? '宸插':'鏈'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
@@ -80,101 +85,95 @@
</el-col>
</el-container>
</div>
- <div style="padding-left:90px;padding-top:30px">
+ <div style="padding-left:30px;padding-top:30px">
<el-col :span="6" :data="individualList">
- <div class="block" :model="individualList" >
- <el-col v-model="individualList.url" prop="url">
+ <div class="block" :model="individualList" >
+ <el-col v-model="individualList.url" prop="url">
<el-avatar shape="square" :size=200 >
<el-image
:src="'http://47.93.189.255:8080/'+ individualList.url"
:fit="fit"
></el-image>
</el-avatar>
- </el-col>
- </div>
+ </el-col>
+ </div>
</el-col>
-<!-- <el-row>-->
-<!--<!– <el-table border style="width: 100%">–>-->
-<!--<!– <el-table-column–>-->
-<!--<!– prop="img"–>-->
-<!--<!– v-model="individualList.img"–>-->
-<!--<!– placeholder=""–>-->
-<!--<!– width="180">–>-->
-<!--<!– <template slot-scope="scope">–>-->
-<!--<!– <img :src="scope.row.src" style="width:100px;height:50px;"/>–>-->
-<!--<!– </template>–>-->
-<!--<!– </el-table-column>–>-->
+ <!-- <el-row>-->
+ <!--<!– <el-table border style="width: 100%">–>-->
+ <!--<!– <el-table-column–>-->
+ <!--<!– prop="img"–>-->
+ <!--<!– v-model="individualList.img"–>-->
+ <!--<!– placeholder=""–>-->
+ <!--<!– width="180">–>-->
+ <!--<!– <template slot-scope="scope">–>-->
+ <!--<!– <img :src="scope.row.src" style="width:100px;height:50px;"/>–>-->
+ <!--<!– </template>–>-->
+ <!--<!– </el-table-column>–>-->
-<!--<!– </el-table>–>-->
-<!--<!– <el-upload :class="{uoloadSty:showBtnDealImg,disUoloadSty:noneBtnImg}"–>-->
-<!--<!– ref="ref1"–>-->
-<!--<!– action=""–>-->
-<!--<!– :file-list="fileList"–>-->
-<!--<!– list-type="picture-card"–>-->
-<!--<!– accept="image/*"–>-->
-<!--<!– :auto-upload="false"–>-->
-<!--<!– :multiple="false"–>-->
-<!--<!– :limit="limitCountImg">–>-->
-<!--<!– <i class="el-icon-plus"></i>–>-->
-<!--<!– </el-upload>–>-->
-<!-- </el-row>-->
+ <!--<!– </el-table>–>-->
+ <!--<!– <el-upload :class="{uoloadSty:showBtnDealImg,disUoloadSty:noneBtnImg}"–>-->
+ <!--<!– ref="ref1"–>-->
+ <!--<!– action=""–>-->
+ <!--<!– :file-list="fileList"–>-->
+ <!--<!– list-type="picture-card"–>-->
+ <!--<!– accept="image/*"–>-->
+ <!--<!– :auto-upload="false"–>-->
+ <!--<!– :multiple="false"–>-->
+ <!--<!– :limit="limitCountImg">–>-->
+ <!--<!– <i class="el-icon-plus"></i>–>-->
+ <!--<!– </el-upload>–>-->
+ <!-- </el-row>-->
</div>
- <div style="padding-left:50px;padding-top:30px" >
+ <div style="padding-left:30px;padding-top:30px" >
<el-container >
-<!-- <template slot-scope="scope" v-if="scope.row.roleId !== 1">-->
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- icon="el-icon-edit"-->
-<!-- @click="handleUpdate(scope.row)"-->
-<!-- v-hasPermi="['system:role:edit']"-->
-<!-- >淇敼</el-button>-->
+ <!-- <template slot-scope="scope" v-if="scope.row.roleId !== 1">-->
+ <!-- <el-button-->
+ <!-- size="mini"-->
+ <!-- type="text"-->
+ <!-- icon="el-icon-edit"-->
+ <!-- @click="handleUpdate(scope.row)"-->
+ <!-- v-hasPermi="['system:role:edit']"-->
+ <!-- >淇敼</el-button>-->
-<!-- </template>-->
+ <!-- </template>-->
- <el-row :span="2" style="flex-direction: column;">
+ <el-row >
<el-button
type="primary"
-
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
-
-
>缂栬緫</el-button>
-<!-- <el-dropdown-->
-<!-- size="mini"-->
-<!-- @command="(command) => handleCommand(command, scope.row)"-->
-<!-- v-hasPermi="['system:role:edit']">-->
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- icon="el-icon-d-arrow-right"-->
-<!-- @click="handleCheck(scope.row)"-->
-<!-- >鏌ョ湅璇︽儏</el-button>-->
+ <!-- <el-dropdown-->
+ <!-- size="mini"-->
+ <!-- @command="(command) => handleCommand(command, scope.row)"-->
+ <!-- v-hasPermi="['system:role:edit']"> person:information:edit -->
+ <!-- <el-button-->
+ <!-- size="mini"-->
+ <!-- type="text"-->
+ <!-- icon="el-icon-d-arrow-right"-->
+ <!-- @click="handleCheck(scope.row)"-->
+ <!-- >鏌ョ湅璇︽儏</el-button>-->
-<!-- </el-dropdown>-->
+ <!-- </el-dropdown>-->
<br>
-
- <el-button
- type="primary"
-
- @click="handleExport"
- v-hasPermi="['self:user:export']"
- >瀵煎嚭</el-button>
-
+ <el-button
+ type="primary"
+ @click="handleExport"
+ v-hasPermi="['self:user:export']"
+ >瀵煎嚭</el-button>
</el-row>
</el-container>
</div>
-<!-- </el-dialog>-->
+ <!-- </el-dialog>-->
</el-container>
<el-container>
- <div style="padding-left:30px">
+ <div>
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
<el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left">
@@ -229,7 +228,7 @@
</div>
</el-container>
-<!--鎶樺彔闈㈡澘-->
+ <!--鎶樺彔闈㈡澘-->
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="涓昏瀛︿範鍙婂伐浣滅粡鍘�" name="1" >
<el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange">
@@ -250,7 +249,7 @@
size="mini"
type="text"
icon="el-icon-delete"
- @click="handleDelete(scope.row)"
+ @click="handleExperienceDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
@@ -284,7 +283,7 @@
size="mini"
type="text"
icon="el-icon-delete"
- @click="handleDelete(scope.row)"
+ @click="handleCertificateDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
@@ -338,17 +337,17 @@
</el-collapse-item>
</el-collapse>
-<!-- 鑷紶-->
+ <!-- 鑷紶-->
<div style="padding-top:30px">
<el-container>
<div style="width:100%"><h2 style="font-size:15px" >鑷紶</h2></div>
</el-container>
<el-tabs type="border-card" v-model="activeName" @tab-click="handleClick"
- v-loading="loading" :data="AutobiographyList" @selection-change="handleSelectionChange">
-<!-- <el-tab-pane label="鎬昏" name="0">-->
+ v-loading="loading" :data="AutobiographyList" @selection-change="handleSelectionChange">
+ <!-- <el-tab-pane label="鎬昏" name="0">-->
-<!-- </el-tab-pane>-->
-<!-- <div :model="AutobiographyList">-->
+ <!-- </el-tab-pane>-->
+ <!-- <div :model="AutobiographyList">-->
<el-tab-pane label="0~3宀�(濠村効鏈�)" name="1" >
<el-input v-model="AutobiographyList.content" prop="content" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
@@ -360,13 +359,13 @@
<el-tab-pane label="22~25(鐮旂┒鐢�)" name="6"></el-tab-pane>
<el-tab-pane label="26~ (宸ヤ綔)" name="7"></el-tab-pane>
<el-tab-pane label="锛熷瞾缁撳" name="8"></el-tab-pane>
-<!-- </div>-->
-<!-- <el-tab-pane-->
-<!-- v-for="(item, index) in AutobiographyTermList"-->
-<!-- :key="index"-->
-<!-- :name="item"-->
-<!-- :label="item"-->
-<!-- />-->
+ <!-- </div>-->
+ <!-- <el-tab-pane-->
+ <!-- v-for="(item, index) in AutobiographyTermList"-->
+ <!-- :key="index"-->
+ <!-- :name="item"-->
+ <!-- :label="item"-->
+ <!-- />-->
</el-tabs>
@@ -396,6 +395,7 @@
import {getIndividualList, getIndividualRelation, delIndividual, updateIndividual, addIndividual,listExperience,updateExperience,
addExperience,delExperience} from "@/api/self/index";
import {
+ delCertificate,
getAbroadList,
getAutobiography,
getAutobiographyList,
@@ -720,12 +720,12 @@
);
//鍑哄浗鎯呭喌
getAbroadList(this.queryParams).then(response => {
- // alert(123)
- // console.log(response.data)
- this.AbroadList = response.data;
- this.total = response.data.total;
- this.loading = false;
- }
+ // alert(123)
+ // console.log(response.data)
+ this.AbroadList = response.data;
+ this.total = response.data.total;
+ this.loading = false;
+ }
);
@@ -790,14 +790,14 @@
handleAdd() {
this.reset();
this.open = true;
- this.title = "娣诲姞瀹跺涵澶т簨璁颁俊鎭�";
+ this.title = "娣诲姞涓汉淇℃伅";
},
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
- this.$router.push("/family1/bignote/familyeventInfo/" + id);
+ this.$router.push("/self/self/edit/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -805,7 +805,7 @@
let jd = true
this.$router.push({
- path:"/self/self/edit" + id,
+ path:"/self/self/edit/" + id,
query:{
detail:jd
}
@@ -816,7 +816,7 @@
alert(23)
},
handleRemove(file) {
- alert(323)
+ alert("鎿嶄綔鎴愬姛")
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
@@ -861,10 +861,10 @@
this.$refs["elForm"].validate(valid => {
if (valid) {
- addFamilyevent(this.formDat).then(response => {
+ addIndividual(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
- this.getList1();
+ this.getList();
});
}
});
@@ -892,13 +892,23 @@
})
},
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
+ /** 鍒犻櫎涓汉缁忓巻鎸夐挳鎿嶄綔 */
+ handleExperienceDelete(row) {
const Ids = row.id || this.ids;
this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
- return delFamilyevent(Ids);
+ return delExperience(Ids);
}).then(() => {
- this.getList1();
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 鍒犻櫎鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐垫寜閽搷浣� */
+ handleCertificateDelete(row) {
+ const Ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+ return delCertificate(Ids);
+ }).then(() => {
+ this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
@@ -913,12 +923,18 @@
</script>
<style>
-.uoloadSty {
- width:110px;
- height:110px;
- line-height:110px;
+/*.uoloadSty {*/
+/* width:110px;*/
+/* height:110px;*/
+/* line-height:110px;*/
+/*}*/
+/*.disUoloadSty {*/
+/* display:none; !* 涓婁紶鎸夐挳闅愯棌 *!*/
+/*}*/
+
+.el-icon-top {
+ background: url("src/assets/icons/top.png");
}
-.disUoloadSty {
- display:none; /* 涓婁紶鎸夐挳闅愯棌 */
-}
+
+
</style>
--
Gitblit v1.9.1