From 02aa4d157d800650f1dc2fa2b7fbee52837df074 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 01 十二月 2023 13:46:07 +0800
Subject: [PATCH] Merge branch 'wulong' of http://116.62.18.175:6699/r/~yxh/smartor-web into yxh01
---
src/views/patient/patient/profile/index.vue | 150 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 130 insertions(+), 20 deletions(-)
diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue
index 2bef9ad..3475bfd 100644
--- a/src/views/patient/patient/profile/index.vue
+++ b/src/views/patient/patient/profile/index.vue
@@ -11,10 +11,34 @@
<div>鍚村ぇ榫�</div>
</div></el-col
>
- <el-col :span="4"
+ <el-col :span="8"
><div class="xinz-inf">
- <div class="addtag">锛嬫柊澧炴爣绛�</div>
- <div class="tagvalue">蹇冭绠�</div>
+ <el-tag
+ :key="tag"
+ v-for="tag in dynamicTags"
+ closable
+ :disable-transitions="false"
+ @close="handleClose(tag)"
+ >
+ {{ tag }}
+ </el-tag>
+ <el-input
+ class="input-new-tag"
+ v-if="inputVisible"
+ v-model="inputValue"
+ ref="saveTagInput"
+ size="small"
+ @keyup.enter.native="handleInputConfirm"
+ @blur="handleInputConfirm"
+ >
+ </el-input>
+ <el-button
+ v-else
+ class="button-new-tag"
+ size="small"
+ @click="showInput"
+ >+ 鏂板鏍囩</el-button
+ >
</div></el-col
>
<el-col :span="4"
@@ -95,9 +119,7 @@
<span class="mulsz" slot="label"
><i class="el-icon-s-custom"></i> 鏈嶅姟璁板綍</span
>
-
- 瀹氭椂浠诲姟琛ュ伩</el-tab-pane
- >
+ </el-tab-pane>
</el-tabs>
<!-- 鍋ュ悍妗ｆ妯″潡 -->
@@ -254,7 +276,62 @@
</div>
<!-- 鏈嶅姟璁板綍 -->
- <div class="medical-record" v-else-if="activeName == 'serve'">sdaad</div>
+ <div
+ class="medical-recordc"
+ style="margin-top: 20px; font-size: 20px !important"
+ v-else-if="activeName == 'serve'"
+ >
+ <el-tabs type="border-card">
+ <el-tab-pane label="棣栨闅忚">
+ <div style="margin-top: 10px">
+ 闅忚鐘舵�侊細宸茬粓姝�<span style="color: #2775b6"
+ >锛堢粓姝㈠師鍥狅細鎮ｈ�呯棅鎰堝洖璁跨粨鏉燂紝缁堟鏃堕棿锛�2023-12-18 12:00锛�</span
+ >
+ </div>
+ <div style="margin-top: 10px">
+ 闅忚鍙戦�佹椂闂达細<span style="color: #2775b6">2023-11-23 12:00</span>
+ </div>
+ <div style="margin-top: 10px">
+ 闅忚瀹屾垚鏃堕棿锛�<span style="color: #2775b6">2023-12-18 12:00</span>
+ </div>
+ <div style="margin-top: 10px">
+ 鐤肩棝绋嬪害锛�<span style="color: #2775b6">涓害</span>
+ </div>
+ <div
+ style="
+ font-size: 22px;
+ padding-left: 5px;
+ margin: 15px 0;
+ border-left: 4px solid rgb(65, 161, 190);
+ "
+ >
+ 浜哄伐闅忚璁板綍
+ </div>
+ <div style="margin-top: 10px">
+ <el-row :gutter="20">
+ <el-col :span="6"
+ >闅忚鏃ユ湡锛�
+ <span style="color: #2775b6">2023-11-22 11:22</span></el-col
+ >
+ <el-col :span="6"
+ >闅忚浜猴細 <span style="color: #2775b6">鍚村皬榫�</span></el-col
+ >
+ <el-col :span="6"
+ >鎮ｈ�呴厤鍚堝害锛� <span style="color: #2775b6">楂�</span></el-col
+ >
+ </el-row>
+ </div>
+ <div style="margin-top: 10px">
+ 闅忚缁撴灉锛� <span style="color: #2775b6">鎮ｈ�呯棅鎰堬紝韬綋鍊嶆</span>
+ </div>
+ <div style="margin-top: 10px">
+ 闅忚澶囨敞锛� <span style="color: #2775b6">鎻愰啋娉ㄦ剰楗鍋ュ悍</span>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="浜屾闅忚">浜屾闅忚</el-tab-pane>
+ <el-tab-pane label="涓夋闅忚">涓夋闅忚</el-tab-pane>
+ </el-tabs>
+ </div>
<!-- 鍋ュ悍鐩戞祴 -->
<div class="medical-record" v-show="activeName == 'monitor'">
<!-- 琛�鍘嬪浘鏍� -->
@@ -315,6 +392,9 @@
activeName: "health", //涓�绫诲鑸�
sonactiveName: "outpatient", //鍋ュ悍鐩戞祴瀵艰埅
sontwoactiveName: "blood", //鍖荤枟妗ｆ瀵艰埅
+ dynamicTags: ["鏍囩涓�", "鏍囩浜�", "鏍囩涓�"],
+ inputVisible: false,
+ inputValue: "",
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -385,15 +465,27 @@
this.loading = false;
});
},
- // getUser() {
- // getUserProfile().then((response) => {
- // this.user = response.data;
- // this.roleGroup = response.roleGroup;
- // this.postGroup = response.postGroup;
- // });
- // },
handleClick(tab, event) {
console.log(tab, event);
+ },
+ handleClose(tag) {
+ this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
+ },
+
+ showInput() {
+ this.inputVisible = true;
+ this.$nextTick((_) => {
+ this.$refs.saveTagInput.$refs.input.focus();
+ });
+ },
+
+ handleInputConfirm() {
+ let inputValue = this.inputValue;
+ if (inputValue) {
+ this.dynamicTags.push(inputValue);
+ }
+ this.inputVisible = false;
+ this.inputValue = "";
},
// 琛�鍘嬪浘琛ㄩ儴鍒�
@@ -680,16 +772,32 @@
}
}
.xinz-inf {
- display: flex;
font-size: 18px;
- cursor: pointer;
- .addtag{
-
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+
+ line-height: 48px;
+
+ .el-tag + .el-tag {
+ margin-left: 10px;
+ }
+ .button-new-tag {
+ margin-left: 10px;
+ height: 32px;
+ line-height: 30px;
+ padding-top: 0;
+ padding-bottom: 0;
+ }
+ .input-new-tag {
+ width: 90px;
+ margin-left: 10px;
+ vertical-align: bottom;
}
}
}
.el-tabs--border-card {
- font-size: 25px;
+ // font-size: 25px;
.mulsz {
font-size: 25px;
margin-top: 20px;
@@ -706,6 +814,7 @@
margin-left: 100px;
.detailed {
width: 70%;
+ border-radius: 8px;
padding: 30px;
margin-bottom: 30px;
background-color: #ddf0f8;
@@ -737,9 +846,10 @@
margin-bottom: 25px;
margin-left: 100px;
.Table-screen {
- width: 70%;
+ width: 88%;
padding: 30px;
margin-bottom: 30px;
+ border-radius: 8px;
background-color: #ddf0f8;
font-size: 20px !important;
}
--
Gitblit v1.9.3