From 4f66e0e7c89dfdbc02ecb300feb20de1ca38022e Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 31 八月 2024 21:41:44 +0800
Subject: [PATCH] 新增之后，修改用户
---
ruoyi-ui/src/views/self/show.vue | 119 ++++++++++++++++++++++++-----------------------------------
1 files changed, 48 insertions(+), 71 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 59779a3..1204088 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -38,7 +38,7 @@
v-hasPermi="['family:note:export']"
>鎵撳嵃</el-button>
</div> -->
- <div style="display: flex; align-items: center;">
+ <div style="display: flex; align-items: center;">
<el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']" style="margin-left: 20px">
<div class="form" ><el-icon style="padding-right:100px;"></el-icon>
<span class="text" style="width: 69px;height: 26px;font-size: 16px;
@@ -158,8 +158,8 @@
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5">
<el-upload
action=""
@@ -174,53 +174,26 @@
</el-upload>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- :disabled="multiple"
- @click="handleShare"
+ <el-dropdown placement="鍒嗕韩鐩稿叧">
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
- >鍒嗕韩</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleWho"
- >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="whoShare"
- >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
- </el-col>
-
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-top"
- size="mini"
- @click="showData"
- >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
- </el-col>
+ <el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+ <el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</div>
- <el-table v-loading="loading" border :data="noteList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="noteList" :row-key="getRowId1" 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 fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
@@ -233,7 +206,7 @@
<el-table-column label="鍦扮偣" prop="address" sortable :show-overflow-tooltip="true" width="160" align="center" >
<template slot-scope="scope">{{scope.row.address? scope.row.address: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="浜嬩欢鏍囬" prop="title" sortable :show-overflow-tooltip="true" width="160" align="center">
+ <el-table-column label="浜嬩欢鏍囬" prop="title" sortable :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">{{scope.row.title? scope.row.title: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="150" align="center">
@@ -339,11 +312,11 @@
accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
list-type="picture-card"
multiple
- :http-request="requestUpload"
+ :http-request="requestUpload1m"
:file-list="fileList"
- :on-change="handleChange"
- :auto-upload="false"
- ref="upload"
+ :on-change="handleChange"
+ :auto-upload="false"
+ ref="upload"
>
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{ file }">
@@ -377,6 +350,7 @@
</div>
</el-upload>
+ <br>
<el-button
style="margin-left: 10px"
size="small"
@@ -409,8 +383,7 @@
class="el-upload-list__item-thumbnail"
:src="file.url"
style="width: 147px; height: 147px"
- fit="cover"
- ></video>
+ fit="cover"></video>
<img v-else
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceLis.png"
@@ -439,7 +412,7 @@
</div>
</el-upload>
-
+ <br>
<el-button
style="margin-left: 10px"
size="small"
@@ -499,7 +472,7 @@
<div class="left-content">涓昏瀛︿範鍙婂伐浣滅粡鍘�</div>
<div>
<el-button class="button" size="mini" type="text" @click="showDialog('open')" >
- <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
+ <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></el-button>
</div>
</div>
</template>
@@ -553,7 +526,7 @@
<div class="left-content">瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�</div>
<div>
<el-button class="button" size="mini" type="text" @click="showDialog('relation1')">
- <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
+ <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></el-button>
</div>
</div>
</template>
@@ -607,7 +580,7 @@
<div class="title-wrapper">
<div class="left-content">鎸佹湁璇佷欢鎯呭喌</div>
<el-button class="button" size="mini" type="text" @click="showDialog('certificate')">
- <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
+ <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></el-button>
</div>
</template>
<el-table v-loading="loading" border :data="certificateList" @selection-change="handleSelectionChange"
@@ -672,7 +645,7 @@
<div class="title-wrapper">
<div class="left-content">鍑哄浗锛堝锛夋儏鍐�</div>
<el-button class="button" size="mini" type="text" @click="showDialog('abroad')">
- <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
+ <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></el-button>
</div>
</template>
<el-table v-loading="loading" border :data="AbroadList" @selection-change="handleSelectionChange"
@@ -726,12 +699,12 @@
<div class="left-content">鑷紶</div>
<div>
<el-button size='mini' type="text" class="button" @click="showDialog('autobiography')" >
- <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
+ <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
</el-button>
</div>
</div>
</template>
- <el-contain>
+ <el-container>
<div>
<el-tabs type="border-card" v-model="activeName" @tab-click="handleClick"
v-loading="loading" :data="AutobiographyList" >
@@ -739,16 +712,16 @@
:key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'宀�'+'('+item.term+')'">
<div>{{ item.content }}</div>
<el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='position: absolute;right:40px;top:5px;'>
- <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
+ <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
</el-button>
<el-button size="mini" type="text" class="btn_del" @click="handleAutobiography(item)" style='position: absolute;right:10px;top:5px;'>
- <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
+ <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
</el-button>
</el-tab-pane>
</el-tabs></div>
- </el-contain>
+ </el-container>
</el-collapse-item>
</el-collapse>
@@ -940,7 +913,7 @@
<!-- 鍒嗕韩瀵硅瘽妗�1 -->
<el-dialog :title="title1" :visible.sync="open1" width="500px" append-to-body @close="handleClose2">
- <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 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" >
@@ -975,7 +948,7 @@
</el-select>
</div>
- <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId2" ref="multipleTable" @selection-change="handleSelectionChange2" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId3" ref="multipleTable" @selection-change="handleSelectionChange2" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="鏃堕棿" prop="happenTime" sortable :show-overflow-tooltip="true" width="150" align="center" >
<template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
@@ -1061,7 +1034,7 @@
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import axios from 'axios';
-//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
+//鍦ˊ/api/self/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
import {
getIndividualList, addIndividual, updateIndividual, delIndividual,
listExperience, addExperience, updateExperience, delExperience,
@@ -1146,6 +1119,7 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
+ total1: 0,
totalm: 0,
//澶村儚涓婁紶
showBtnDealImg:true,
@@ -1629,10 +1603,15 @@
{
return row.id
},
+ getRowId3(row)
+ {
+ return row.id
+ },
getList1() {
this.loading1 = true;
this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ this.queryParams.clanId = this.$store.state.user.clanId
listUserAll(this.queryParams1).then(response => {
this.listRoot = response.data.data;
const kon = {}
@@ -1830,16 +1809,17 @@
editAutobiography(item) {
this.isEdit1 = true;
this.dialogVisible.autobiography = true;
- this.formDat = { ...item };
+ this.formDat = { item };
},
//闅旇鍙樿壊
- tableRowClassName({ row, rowIndex }) {
+ tableRowClassName({row, rowIndex}) {
if (rowIndex % 2 == 0) {
- return "statistics-warning-row1";
- } else {
return "statistics-warning-row";
+ } else {
+ return "statistics-warning-row1";
}
+ return '';
},
//璇佷欢绫诲埆
getSrc(type) {
@@ -2515,15 +2495,13 @@
.el-icon-top {
background: no-repeat center url("../../assets/icons/top.png");
}
+
.el-table__row.statistics-warning-row {
background: #E0EEFE;
-
}
.el-table__row.statistics-warning-row1 {
background: #FFEFF2;
-
}
-
.el-collapse-item__header {
background-color:#FEF7FC;
width: 100%;
@@ -2535,7 +2513,6 @@
width: calc(100% - 50px);
}
.left-content {
-
width: 100%;
}
.btn_autobiography{
--
Gitblit v1.9.1