From b34fbeffb0d128b75ec0a91acf7fe8ac3816c597 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 18 七月 2023 20:15:38 +0800
Subject: [PATCH] 新增个人记事本按钮
---
ruoyi-ui/src/views/self/memo.vue | 13 +++++++++++++
ruoyi-ui/src/views/homeRoot/personInfo.vue | 2 ++
ruoyi-ui/src/views/self/show.vue | 24 ++++++++++++++++++++++--
ruoyi-ui/src/assets/icons/form.png | 0
ruoyi-ui/src/api/memo/index.js | 1 +
ruoyi-ui/src/router/index.js | 16 ++++++++++++++++
6 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/api/memo/index.js b/ruoyi-ui/src/api/memo/index.js
new file mode 100644
index 0000000..543ea86
--- /dev/null
+++ b/ruoyi-ui/src/api/memo/index.js
@@ -0,0 +1 @@
+import request from '@/utils/request'
diff --git a/ruoyi-ui/src/assets/icons/form.png b/ruoyi-ui/src/assets/icons/form.png
new file mode 100644
index 0000000..f9f10f1
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/form.png
Binary files differ
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 5cd0918..d48c6de 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -313,6 +313,22 @@
}
]
},
+ //涓汉璁颁簨鏈�
+ {
+ path: '/self/self',
+ component: Layout,
+ permissions: ['person:information:memo'],
+
+ hidden: true,
+ children: [
+ {
+ path: 'memo/:id(\\d+)',
+ component: () => import('@/views/self/memo'),
+ name: 'memo',
+ meta: { title: '涓汉璁颁簨鏈�',activeMenu: '/self/zSelfNote'}
+ }
+ ]
+ },
//璇佷功銆佽祫璐�
{
path: '/self/honor',
diff --git a/ruoyi-ui/src/views/homeRoot/personInfo.vue b/ruoyi-ui/src/views/homeRoot/personInfo.vue
index 595c8f9..c222436 100644
--- a/ruoyi-ui/src/views/homeRoot/personInfo.vue
+++ b/ruoyi-ui/src/views/homeRoot/personInfo.vue
@@ -13,6 +13,7 @@
<el-image
:src="'http://47.93.189.255:8080/'+ personInfos[0].url"
:fit="fit"
+ style="width: 100%;height: 100%;"
></el-image>
</el-avatar>
</el-col>
@@ -246,6 +247,7 @@
<el-image
:src="'http://47.93.189.255:8080/'+ personInfos[1].url"
:fit="fit"
+ style="width: 100%;height: 100%;"
></el-image>
</el-avatar>
</el-col>
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
new file mode 100644
index 0000000..7d38ef5
--- /dev/null
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -0,0 +1,13 @@
+<template>
+<div>hi</div>
+</template>
+
+<script>
+export default {
+ name: "memo"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 0e56f35..e4a3978 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -6,7 +6,16 @@
class="el-icon-top"
></el-button>
</el-backtop>
- <h1 style="font-size:21px;padding-top:30px">涓汉绠�鍘�</h1>
+ <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
+ <span>涓汉绠�鍘�</span>
+ <div style="display: flex; align-items: center;">
+ <el-button size="mini" type="text" @click="toMemo">
+ <div class="form" ><el-icon style="padding-right:110px;"></el-icon>
+ <span class="text" style="width: 69px;height: 26px;font-size: 16px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">涓汉璁颁簨鏈�</span></div>
+ </el-button>
+ </div>
+ </h1>
<el-divider />
<!-- 鍩烘湰淇℃伅-->
<h2 style="font-size:16px">鍩烘湰淇℃伅</h2>
@@ -108,9 +117,11 @@
<el-col :span="6" :data="individualList">
<div class="block" :model="individualList" >
<el-col v-model="individualList.img" prop="img">
- <el-avatar shape="square" :size=200 >
+ <el-avatar shape="square" style="width: 200px;height: 150px;" >
<el-image
:src="'http://47.93.189.255:8080/'+ individualList.img"
+ :fit="fit"
+ style="width: 100%;height: 100%;"
></el-image>
</el-avatar>
<!-- <el-upload-->
@@ -1227,6 +1238,11 @@
// this.title = "娣诲姞涓汉淇℃伅";
// },
+ //涓汉璁颁簨鏈�
+ toMemo(row){
+ const id = row.userId;
+ this.$router.push("/self/self/memo/" + id);
+ },
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
@@ -1550,4 +1566,8 @@
background:center no-repeat url('../../assets/icons/add1.png') ;
margin-left: 71vw;
}
+.form{
+ background:center/11% no-repeat url('../../assets/icons/form.png') ;
+
+}
</style>
--
Gitblit v1.9.1