From b3e00f677518d8c0a5ad7d74c427af4abba810b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 24 八月 2024 08:20:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/self/show.vue | 52 ++++++++++++--------------
ruoyi-ui/src/views/marry/index.vue | 2
ruoyi-ui/src/views/selfeconomy/index.vue | 10 ++--
ruoyi-ui/src/views/login.vue | 19 ++-------
4 files changed, 35 insertions(+), 48 deletions(-)
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 15fe9c9..b030f3a 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -2,22 +2,13 @@
<div class="login Group_132">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" style="margin-left: 0px;margin-right: 180px;">
<h3 class="title" style="margin-top: 80px;margin-right: 108px;margin-bottom: 0;margin-left: 109px;">鏈兘閮藉缃�</h3>
- <div class="second-box" style=" margin-top: 25px;
- margin-left: 140px;
- margin-right: 141px;
-">
+ <div class="second-box" style=" margin-top: 25px; margin-left: 140px; margin-right: 141px;">
<div class="little-title" style=" margin-top: 20px;">
- <h5 >鐧诲綍鍙煡鐪嬫洿澶氫俊鎭�</h5>
- <h5 >鏈敞鍐岀殑璐﹀彿鐧诲綍鎴愬姛鍚庝細鑷姩娉ㄥ唽</h5></div></div>
+ <h5>鐧诲綍鍙煡鐪嬫洿澶氫俊鎭�</h5>
+ <h5>鏈敞鍐岀殑璐﹀彿鐧诲綍鎴愬姛鍚庝細鑷姩娉ㄥ唽</h5></div></div>
<div class="yonghuming" style="margin-left: 99px;margin-right: 425px;">鐢ㄦ埛鍚�</div>
- <el-form-item prop="username" style="
- width: 380px;
- height: 48px;
- margin-left: 96px;
- margin-right: 96px;
-">
-
+ <el-form-item prop="username" style="width: 380px; height: 48px; margin-left: 96px; margin-right: 96px; ">
<el-input
v-model="loginForm.username"
type="text"
@@ -117,7 +108,7 @@
<span v-if="!loading" style="width: 97px;height: 62px;">鐧诲綍</span>
<span v-else>鐧� 褰� 涓�...</span>
</el-button>
- <a href="https://47.93.189.255:8080/profile/upload/2023/10/10/Bendudu20231010_20231010203358A033.apk">鐐瑰嚮姝ゅ涓嬭浇搴旂敤绋嬪簭</a>
+ <a href="https://www.bendudu.com:8080/profile/upload/2023/10/10/Bendudu20231010_20231010203358A033.apk">鐐瑰嚮姝ゅ涓嬭浇搴旂敤绋嬪簭</a>
<div style="float: right;
height:94px;" v-if="register">
<router-link class="link-type" :to="'/register'">绔嬪嵆娉ㄥ唽</router-link>
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index a32137c..5957b93 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -278,7 +278,7 @@
<div class="title-wrapper">
<div>
<el-button class="button" size="mini" type="text" @click="handleAdd">
- <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>
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 59779a3..79a9714 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;
@@ -233,7 +233,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 +339,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 +377,7 @@
</div>
</el-upload>
+ <br>
<el-button
style="margin-left: 10px"
size="small"
@@ -439,7 +440,7 @@
</div>
</el-upload>
-
+ <br>
<el-button
style="margin-left: 10px"
size="small"
@@ -499,7 +500,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 +554,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 +608,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 +673,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 +727,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 +740,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 +941,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="getRowId" 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 +976,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="getRowId" 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>
@@ -1146,6 +1147,7 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
+ total1: 0,
totalm: 0,
//澶村儚涓婁紶
showBtnDealImg:true,
@@ -1621,11 +1623,7 @@
// this.single1 = selection.length!=1
// this.multiple1 = !selection.length
},
- getRowId1(row)
- {
- return row.id
- },
- getRowId2(row)
+ getRowId(row)
{
return row.id
},
@@ -1834,12 +1832,13 @@
},
//闅旇鍙樿壊
- tableRowClassName({ row, rowIndex }) {
+ tableRowClassName({row, rowIndex}) {
if (rowIndex % 2 == 0) {
return "statistics-warning-row1";
} else {
return "statistics-warning-row";
}
+ return '';
},
//璇佷欢绫诲埆
getSrc(type) {
@@ -2515,15 +2514,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 +2532,6 @@
width: calc(100% - 50px);
}
.left-content {
-
width: 100%;
}
.btn_autobiography{
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index f33fb95..dcd0308 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -139,18 +139,18 @@
<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-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 :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-
+
</el-row>
</div>
--
Gitblit v1.9.1