From 38b17821f508620d6c8bbf8b1b1fd1a72e2d71f2 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 24 十一月 2023 12:39:48 +0800
Subject: [PATCH] Merge branch 'wulong' of http://116.62.18.175:6699/r/~yxh/smartor-web into yxh01
---
src/views/index.vue | 444 +++++++++++++++++++++++--------
vue.config.js | 2
src/views/patient/patient/index.vue | 32 +
.env.staging | 4
src/views/register.vue | 2
.env.development | 4
src/views/login.vue | 2
src/layout/components/Sidebar/Logo.vue | 2
src/views/patient/servefn/index.vue | 52 ++-
package.json | 2
src/views/patient/patient/profile/index.vue | 244 ++++++++--------
.env.production | 4
src/App.vue | 5
src/components/SFtable/index.vue | 1
src/views/patient/follow/index.vue | 25 +
15 files changed, 547 insertions(+), 278 deletions(-)
diff --git a/.env.development b/.env.development
index ef23cc5..dde9393 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 鏅烘収闅忚绠＄悊绯荤粺
+VUE_APP_TITLE = 鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�
# 寮�鍙戠幆澧冮厤缃�
ENV = 'development'
-# 鏅烘収闅忚绠＄悊绯荤粺/寮�鍙戠幆澧�
+# 鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�/寮�鍙戠幆澧�
VUE_APP_BASE_API = '/dev-api'
# 璺敱鎳掑姞杞�
diff --git a/.env.production b/.env.production
index d1886c0..df7f99e 100644
--- a/.env.production
+++ b/.env.production
@@ -1,8 +1,8 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 鏅烘収闅忚绠＄悊绯荤粺
+VUE_APP_TITLE = 鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�
# 鐢熶骇鐜閰嶇疆
ENV = 'production'
-# 鏅烘収闅忚绠＄悊绯荤粺/鐢熶骇鐜
+# 鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�/鐢熶骇鐜
VUE_APP_BASE_API = '/prod-api'
diff --git a/.env.staging b/.env.staging
index bd22e83..097f6ae 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,10 +1,10 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 鏅烘収闅忚绠＄悊绯荤粺
+VUE_APP_TITLE = 鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�
NODE_ENV = production
# 娴嬭瘯鐜閰嶇疆
ENV = 'staging'
-# 鏅烘収闅忚绠＄悊绯荤粺/娴嬭瘯鐜
+# 鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�/娴嬭瘯鐜
VUE_APP_BASE_API = '/stage-api'
diff --git a/package.json b/package.json
index 18e00e7..cdbad73 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "ruoyi",
"version": "3.8.5",
- "description": "鏅烘収闅忚绠＄悊绯荤粺",
+ "description": "鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�",
"author": "鏉柊",
"license": "MIT",
"scripts": {
diff --git a/src/App.vue b/src/App.vue
index 2bf66ab..a91e2a5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -30,6 +30,11 @@
};
</script>
<style scoped>
+#app {
+ overflow: scroll;
+ height: 100vh;
+ background: #F8FAFD;
+}
#app .theme-picker {
display: none;
}
diff --git a/src/components/SFtable/index.vue b/src/components/SFtable/index.vue
index 4740111..feb19b5 100644
--- a/src/components/SFtable/index.vue
+++ b/src/components/SFtable/index.vue
@@ -1,3 +1,4 @@
+<!-- 琛ㄦ牸缁勪欢灏佽 -->
<template>
<el-table
:data="currentList"
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 7245441..36f833b 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -70,7 +70,7 @@
},
data() {
return {
- title: "鏅烘収闅忚绠＄悊绯荤粺",
+ title: "鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�",
logo: logoImg,
};
},
diff --git a/src/views/index.vue b/src/views/index.vue
index d44d565..bd0bbfe 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -3,53 +3,62 @@
<div class="home" style="margin-top: 40px; margin-left: 20px">
<!-- 澶撮儴涓や釜 -->
<el-row :gutter="20">
- <el-col :span="10">
+ <el-col :span="11">
<!-- 灏辫瘖缁熻鐩掑瓙 -->
<div class="grid-content bg-purple headerBox bgc1">
<div class="title">
- 灏辫瘖缁熻
+ 鎮ｈ�呯粺璁�<span
+ style="
+ font-size: 25px;
+ font-weight: 600;
+ text-shadow: 2px 4px 7px rgb(85 132 255 / 50%);
+ color: black;
+ "
+ >12322 (浜�)</span
+ >
<span>{{ endatd }} ~ {{ statd }}</span>
</div>
<el-row :gutter="20">
- <el-col :span="6">
+ <el-col :span="8">
<div class="home-user-task-stats">
- <p>{{ 12322 }}</p>
- </div>
- <div class="text-color2">
- <p>灏辫瘖鎬绘暟锛堜釜锛�</p>
- </div>
- </el-col>
- <el-col :span="6">
- <div class="home-user-task-stats">
- <p>{{ 1231 }}</p>
+ <p>{{ 11231 }}</p>
<div class="text-color2">
- <p>鍦ㄩ櫌鎬绘暟锛堜汉锛�</p>
+ <p>闂ㄨ瘖鎬绘暟锛堜汉锛�</p>
</div>
</div>
</el-col>
- <el-col :span="6">
+ <el-col :span="7">
<div class="home-user-task-stats">
- <p>{{ ticketStatistics.progressTotal || "0" }}</p>
+ <p>{{ 9207 }}</p>
<div class="text-color2">
- <p>绂婚櫌鎬绘暟锛堜汉锛�</p>
+ <p>浣忛櫌鎬绘暟锛堜汉锛�</p>
</div>
</div>
</el-col>
- <el-col :span="6">
+ <el-col :span="7">
<div class="home-user-task-stats">
- <p>{{ 12 }}</p>
+ <p>{{ 1209 }}</p>
<div class="text-color2">
- <p>鎶曡瘔鎬绘暟</p>
+ <p>浣撴鎬绘暟锛堜汉锛�</p>
</div>
</div>
</el-col>
</el-row>
</div>
</el-col>
- <el-col :span="7">
+ <el-col :span="9">
<div class="grid-content bg-purple headerBox bgc2">
<div class="title">
- 鍖诲姟浜哄憳鏁伴噺
+ 闂ㄨ瘖鏈嶅姟鎬绘暟
+ <span
+ style="
+ font-size: 25px;
+ text-shadow: 2px 4px 7px rgb(255 99 85 / 50%);
+ font-weight: 600;
+ color: red;
+ "
+ >12322 (浜�)</span
+ >
<span>{{ endatd }} ~ {{ statd }}</span>
</div>
<el-row :gutter="20">
@@ -58,14 +67,14 @@
<p style="color: red">{{ 3453 }}</p>
</div>
<div class="text-color2">
- <p>鍖诲笀</p>
+ <p>浣忛櫌鏈嶅姟浜烘暟</p>
</div>
</el-col>
<el-col :span="12">
<div class="home-user-task-stats">
<p style="color: red">{{ 4213 }}</p>
<div class="text-color2">
- <p>鎶ゅ＋</p>
+ <p>浣撴鏈嶅姟浜烘暟</p>
</div>
</div>
</el-col>
@@ -75,7 +84,7 @@
</el-row>
<!-- 涓棿鍜屽彸杈� -->
<el-row :gutter="20">
- <el-col :span="17">
+ <el-col :span="20">
<!-- echars鏁版嵁鍙鍖� -->
<div class="grid-content bg-purple" style="min-height: 365px">
<div class="title">
@@ -106,36 +115,33 @@
</div>
</el-col>
<!-- 涓棿鍜屽彸杈� -->
- <el-col :span="6" class="aside">
- <div
- class="grid-content bg-purple"
- style="height: 560px; margin-top: -180px"
- >
+ <el-col :span="4" class="aside">
+ <div class="grid-content bg-purple" style="margin-top: -180px">
<div class="title">
- 鎺ヨ瘖鎺掕
+ 鍋ュ悍瀹ｆ暀
<span>{{ endatd }} ~ {{ statd }}</span>
</div>
- <el-table style="width: 100%" :data="SkuTop">
- <template v-for="(item, index) in SkuTop"></template>
- <el-table-column
- prop="order"
- width="30"
- style="background: url(~@/assets/order/4.png)"
- type="index"
-
- ></el-table-column>
- <el-table-column
- prop="skuName"
- width="124"
- class-name="name"
-
- ></el-table-column>
- <el-table-column
- prop="count"
- class-name="count"
-
- ></el-table-column>
- </el-table>
+ <div style="max-height: 690px; width: 100%; overflow: auto">
+ <el-table style="width: 100%" :data="SkuTop">
+ <template v-for="(item, index) in SkuTop"></template>
+ <el-table-column
+ prop="order"
+ width="30"
+ style="background: url(~@/assets/order/4.png)"
+ type="index"
+ ></el-table-column>
+ <el-table-column
+ prop="skuName"
+ width="88"
+ class-name="name"
+ ></el-table-column>
+ <el-table-column prop="count" class-name="count">
+ <template slot-scope="scope">
+ {{ scope.row.count }}娆�
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
</div>
</el-col>
</el-row>
@@ -144,7 +150,7 @@
<el-col :span="13">
<div class="grid-content bg-purple" style="min-height: 300px">
<div class="title">
- 鍚堜綔鍟嗙偣浣嶆暟Top5
+ 璇婂悗缁熻
<span class="el-icon-s-unfold moreIcon"></span>
</div>
<div class="cooperate">
@@ -152,9 +158,11 @@
<div class="pieChart" id="pieCharts"></div>
<div class="Points">
<p>{{ 122 }}</p>
- <span>鐐逛綅鏁�</span>
- <p>{{ 18 }}</p>
- <span>鍚堜綔鍟�</span>
+ <span>鍏朵腑闅忚骞查浜烘</span>
+ <p>{{ 122 }}</p>
+ <span>闂ㄨ瘖闅忚</span>
+ <p>{{ 122 }}</p>
+ <span>鍑洪櫌闅忚</span>
</div>
</div>
</div>
@@ -162,10 +170,85 @@
<el-col :span="10">
<div class="grid-content bg-purple" style="min-height: 300px">
<div class="title">
- 寮傚父璁惧鐩戞帶
+ 鍚勯」鏈嶅姟缁熻
<span class="el-icon-s-unfold moreIcon2"></span>
</div>
- <div class="empenty"></div>
+ <div class="empenty">
+ <el-row>
+ <el-col :span="4"
+ ><div class="grid-content bg-purple">璇婄枟棰勭害</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple-light">123娆�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple">杞瘖鏈嶅姟</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple-light">231娆�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple">淇℃伅鎺ㄩ��</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple-light">900娆�</div></el-col
+ > </el-row
+ ><el-row>
+ <el-col :span="4"
+ ><div class="grid-content bg-purple">鏍囪瘑涓庡鑸�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple-light">23娆�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple">
+ 鎮ｈ�呬究鍒╀繚闅滄湇鍔�
+ </div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple-light">13娆�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple">杩滅▼鍖荤枟</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple-light">31娆�</div></el-col
+ > </el-row
+ ><el-row>
+ <el-col :span="4"
+ ><div class="grid-content bg-purple">鎮ｈ�呭弽棣�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple-light">150浜�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple">鎮ｈ�呯鐞�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple-light">231浜�</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple">鍋ュ悍瀹ｆ暀</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple-light">400</div></el-col
+ >
+ </el-row>
+ <el-row>
+ <el-col :span="4"
+ ><div class="grid-content bg-purple">鍙嶉鍗犳瘮</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple-light">23%</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple">绠＄悊鍗犳瘮</div></el-col
+ >
+ <el-col :span="4"
+ ><div class="grid-content bg-purple-light">32%</div></el-col
+ >
+ </el-row>
+ </div>
</div>
</el-col>
</el-row>
@@ -235,7 +318,7 @@
this.getnodeCollect();
this.getSkuTop();
this.getOrderAmount();
- })
+ });
},
mounted() {},
methods: {
@@ -291,12 +374,8 @@
// const res = await getnodeCollect();
// this.nodeCollect = res.data;
this.nodeCollect = [
- { name: "娴欏ぇ涓�闄�", value: 12 },
- { name: "娴欏ぇ浜岄櫌", value: 8 },
- { name: "閲戝叞鍖婚櫌", value: 8 },
- { name: "閭甸�稿か鍖婚櫌", value: 6 },
- { name: "鐪佷汉姘戝尰闄�", value: 5 },
- { name: "鏈濇櫀闄㈠尯", value: 4 },
+ { name: "闂ㄨ瘖闅忚", value: 1232 },
+ { name: "鍑洪櫌闅忚", value: 342 },
];
this.myPieChart();
},
@@ -305,16 +384,23 @@
// const res = await getSkuTop(10, this.endatd, this.statd);
// this.SkuTop = res.data;
this.SkuTop = [
- { amount: 0, count: 123, skuId: "0", skuName: "鐜嬪ぇ澶�" },
- { amount: 0, count: 122, skuId: "0", skuName: "鍚村ぇ澶�" },
- { amount: 0, count: 112, skuId: "0", skuName: "鏉庝富浠�" },
- { amount: 0, count: 111, skuId: "0", skuName: "寮犳姢澹�" },
- { amount: 0, count: 102, skuId: "0", skuName: "鏉庢姢澹�" },
- { amount: 0, count: 98, skuId: "0", skuName: "鍒樻姢澹�" },
- { amount: 0, count: 89, skuId: "0", skuName: "椹ぇ澶�" },
- { amount: 0, count: 88, skuId: "0", skuName: "椹ぇ澶�" },
- { amount: 0, count: 87, skuId: "0", skuName: "椹ぇ澶�" },
- { amount: 0, count: 67, skuId: "0", skuName: "椹ぇ澶�" },
+ { amount: 0, count: 123, skuId: "0", skuName: "蹇冭偤绉�" },
+ { amount: 0, count: 122, skuId: "0", skuName: "鑲捐剰绉�" },
+ { amount: 0, count: 112, skuId: "0", skuName: "娉屽翱绉�" },
+ { amount: 0, count: 111, skuId: "0", skuName: "鐢风" },
+ { amount: 0, count: 102, skuId: "0", skuName: "濡囦骇绉�" },
+ { amount: 0, count: 98, skuId: "0", skuName: "澶栫" },
+ { amount: 0, count: 89, skuId: "0", skuName: "鎬ヨ瘖" },
+ { amount: 0, count: 88, skuId: "0", skuName: "鍣ㄦ绉�" },
+ { amount: 0, count: 87, skuId: "0", skuName: "楠ㄧ" },
+ { amount: 0, count: 67, skuId: "0", skuName: "鏀惧皠绉�" },
+ { amount: 0, count: 89, skuId: "0", skuName: "鎬ヨ瘖" },
+ { amount: 0, count: 88, skuId: "0", skuName: "鍣ㄦ绉�" },
+ { amount: 0, count: 87, skuId: "0", skuName: "楠ㄧ" },
+ { amount: 0, count: 67, skuId: "0", skuName: "鏀惧皠绉�" },
+ { amount: 0, count: 67, skuId: "0", skuName: "鏀惧皠绉�" },
+
+ { amount: 0, count: 67, skuId: "0", skuName: "鏀惧皠绉�" },
];
},
// 鑾峰彇宸ュ崟鏁伴噺
@@ -328,7 +414,6 @@
// start: this.atd,
// end: this.td,
// });
-
// this.order = res.data;
},
// 鑾峰彇鎬婚噺鏁伴噺
@@ -349,23 +434,64 @@
// 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
var option = {
title: {
- text: "灏辫瘖鍒嗗竷",
- left: "center",
+ text: "璇婁腑缁熻",
},
- grid: { top: "18%", left: "19%", right: "0%", bottom: "24%" },
- xAxis: {
- type: "category",
- data: this.cylinderXAxis,
+ tooltip: {
+ trigger: "axis",
},
- yAxis: {
- type: "value",
- name: "鍗曚綅/鍏�",
+ legend: {
+ data: ["闄㈠唴鎺ㄩ��", "瀹ｆ暀瀹屾垚"],
},
+ toolbox: {
+ show: true,
+ feature: {
+ dataView: { show: true, readOnly: false },
+ magicType: { show: true, type: ["line", "bar"] },
+ restore: { show: true },
+ saveAsImage: { show: true },
+ },
+ },
+ calculable: true,
+ xAxis: [
+ {
+ type: "category",
+ // prettier-ignore
+ data: ["涓�鏈�","浜屾湀","涓夋湀","鍥涙湀","浜旀湀","鍏湀","涓冩湀","鍏湀","涔濇湀","鍗佹湀"],
+ },
+ ],
+ yAxis: [
+ {
+ type: "value",
+ },
+ ],
series: [
{
- data: this.cylinderSeries,
- barWidth: "5%",
+ name: "闄㈠唴鎺ㄩ��",
type: "bar",
+ data: [20, 49, 70, 32, 56, 76, 56, 122, 26, 20, 64, 33],
+ markPoint: {
+ data: [
+ { type: "max", name: "Max" },
+ { type: "min", name: "Min" },
+ ],
+ },
+ markLine: {
+ data: [{ type: "average", name: "Avg" }],
+ },
+ },
+ {
+ name: "瀹ｆ暀瀹屾垚",
+ type: "bar",
+ data: [26, 59, 90, 64, 87, 70, 75, 182, 87, 82, 60, 23],
+ markPoint: {
+ data: [
+ { name: "Max", value: 182, xAxis: 7, yAxis: 183 },
+ { name: "Min", value: 2.3, xAxis: 11, yAxis: 3 },
+ ],
+ },
+ markLine: {
+ data: [{ type: "average", name: "Avg" }],
+ },
},
],
};
@@ -378,16 +504,7 @@
// const res = await getregionAmountCollect(1, this.endatd, this.statd);
// this.xAxis = res.data.xAxis;
// this.series = res.data.series;
- this.xAxis = [
- "1鏈�",
- "2鏈�",
- "3鏈�",
- "4鏈�",
- "5鏈�",
- "6鏈�",
- "7鏈�",
- "8鏈�",
- ];
+ this.xAxis = ["1鏈�", "2鏈�", "3鏈�", "4鏈�", "5鏈�", "6鏈�", "7鏈�", "8鏈�"];
this.series = [123, 123, 223, 212, 432, 123, 442, 234];
this.myEcharts2();
},
@@ -396,28 +513,86 @@
var echarts = require("echarts");
var myChart2 = echarts.init(document.getElementById("echars"));
var option2 = {
- color: ["red"],
title: {
- text: "灏辫瘖瓒嬪娍鍥�",
- left: "center",
+ text: "璇婂墠鏁版嵁",
},
- grid: { top: "18%", left: "17%", right: "0%", bottom: "24%" },
- xAxis: {
- type: "category",
- data: this.xAxis,
- boundaryGap: true,
+ tooltip: {
+ trigger: "axis",
},
- yAxis: {
- name: "鍗曚綅/鍏�",
- type: "value",
+ dataset: {
+ source: [
+ ["product", "2018", "2019", "2020", "2021", "2022", "2023"],
+ ["澶嶈瘖", 256, 182, 388, 270, 253, 385],
+ ["浣忛櫌", 351, 451, 355, 353, 373, 468],
+ ["鎵嬫湳", 440, 362, 569, 436, 445, 332],
+ ["杞瘖", 525, 237, 541, 518, 433, 249],
+ ],
},
+ xAxis: { type: "category" },
+ yAxis: { gridIndex: 0 },
+ grid: { top: "55%" },
series: [
{
- data: this.series,
type: "line",
+ smooth: true,
+ seriesLayoutBy: "row",
+ emphasis: { focus: "series" },
+ },
+ {
+ type: "line",
+ smooth: true,
+ seriesLayoutBy: "row",
+ emphasis: { focus: "series" },
+ },
+ {
+ type: "line",
+ smooth: true,
+ seriesLayoutBy: "row",
+ emphasis: { focus: "series" },
+ },
+ {
+ type: "line",
+ smooth: true,
+ seriesLayoutBy: "row",
+ emphasis: { focus: "series" },
+ },
+ {
+ type: "pie",
+ id: "pie",
+ radius: "30%",
+ center: ["50%", "25%"],
+ emphasis: {
+ focus: "self",
+ },
+ label: {
+ formatter: "{b}: {@2018} ({d}%)",
+ },
+ encode: {
+ itemName: "product",
+ value: "2018",
+ tooltip: "2018",
+ },
},
],
};
+ myChart2.on("updateAxisPointer", function (event) {
+ const xAxisInfo = event.axesInfo[0];
+ if (xAxisInfo) {
+ const dimension = xAxisInfo.value + 1;
+ myChart2.setOption({
+ series: {
+ id: "pie",
+ label: {
+ formatter: "{b}: {@[" + dimension + "]} ({d}%)",
+ },
+ encode: {
+ value: dimension,
+ tooltip: dimension,
+ },
+ },
+ });
+ }
+ });
myChart2.setOption(option2);
},
// 楗肩姸鍥�
@@ -428,9 +603,9 @@
// 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
var optionPie = {
- title: {
- left: "left",
- },
+ // title: {
+ // left: "left",
+ // },
tooltip: {
trigger: "item",
@@ -442,14 +617,36 @@
mark: { show: true },
},
},
+ legend: {
+ top: "5%",
+ left: "center",
+ },
series: [
{
- name: "鍚堜綔鍟嗙偣浣嶆暟Top5",
+ name: "Access From",
type: "pie",
- radius: ["10%", "70%"],
- center: ["50%", "50%"],
- roseType: "radius",
- data: this.nodeCollect,
+ radius: ["40%", "70%"],
+ avoidLabelOverlap: false,
+ itemStyle: {
+ borderRadius: 10,
+ borderColor: "#fff",
+ borderWidth: 2,
+ },
+
+ emphasis: {
+ label: {
+ show: true,
+ fontSize: 40,
+ fontWeight: "bold",
+ },
+ },
+ labelLine: {
+ show: false,
+ },
+ data: [
+ { value: 580, name: "闂ㄨ瘖闅忚" },
+ { value: 484, name: "鍑洪櫌闅忚" },
+ ],
},
],
};
@@ -466,9 +663,10 @@
padding: 0;
margin: 0;
}
+
.boxEchars {
width: 100%;
- height: 280px;
+ height: 480px;
margin-top: 45px;
display: flex;
.echars1 {
@@ -560,6 +758,7 @@
}
.empenty {
width: 100%;
+ padding: 20px 0;
height: 280px;
}
.cooperate {
@@ -573,8 +772,8 @@
.Points {
width: 154px;
height: 230px;
- padding-top: 47px;
- padding-left: 38px;
+ text-align: center;
+ padding: 20px 0;
background: linear-gradient(135deg, transparent, #f8f8f9 0) 0 0,
linear-gradient(-135deg, transparent 12px, #f8f8f9 0) 100% 0,
linear-gradient(-45deg, transparent, #f8f8f9 0) 100% 100%,
@@ -690,6 +889,10 @@
line-height: 17px;
}
}
+::v-deep.aside .el-table__header-wrapper {
+ overflow: hidden;
+ display: none;
+}
.headerBox {
height: 150px;
padding: 25px;
@@ -711,6 +914,9 @@
}
.bg-purple-light {
background: #e5e9f2;
+ text-align: center;
+ align-items: center;
+ line-height: 36px;
}
.grid-content {
min-height: 36px;
diff --git a/src/views/login.vue b/src/views/login.vue
index f595938..e23ddcf 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -6,7 +6,7 @@
:rules="loginRules"
class="login-form"
>
- <h3 class="title">鏅烘収闅忚绠＄悊绯荤粺</h3>
+ <h3 class="title">鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
diff --git a/src/views/patient/follow/index.vue b/src/views/patient/follow/index.vue
index 289990c..35488b3 100644
--- a/src/views/patient/follow/index.vue
+++ b/src/views/patient/follow/index.vue
@@ -1,11 +1,18 @@
<template>
- <div>鎮ｈ�呭洖璁�</div>
+ <div>
+ 鎮ｈ�呭洖璁�
+ <transition name="slide-fade">
+ <p v-if="show">hello world</p>
+ </transition>
+ </div>
</template>
<script>
export default {
data() {
- return {};
+ return {
+ show: true,
+ };
},
created() {},
@@ -14,4 +21,16 @@
};
</script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.slide-fade-enter-active {
+ transition: all 1s ease;
+}
+.slide-fade-leave-active {
+ transition: all 2s cubic-bezier(1, 0.5, 0.8, 1);
+}
+.slide-fade-enter,
+.slide-fade-leave-to {
+ transform: translateX(40px);
+ opacity: 0;
+}
+</style>
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index a90e1da..a700041 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -155,6 +155,31 @@
</template>
</el-table-column>
<el-table-column
+ label="骞撮緞"
+ align="center"
+ key="age"
+ prop="age"
+ width="120"
+ />
+ <el-table-column
+ label="鍑虹敓骞存湀"
+ align="center"
+ key="archivetime"
+ prop="archivetime"
+ width="160"
+ >
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.createTime) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="瀹跺涵浣忓潃"
+ align="center"
+ key="age"
+ prop="age"
+ width="120"
+ />
+ <el-table-column
label="鎮ｈ�呮爣绛�"
align="center"
key="tagList"
@@ -178,13 +203,6 @@
key="iccardno"
prop="iccardno"
width="190"
- />
- <el-table-column
- label="骞撮緞"
- align="center"
- key="age"
- prop="age"
- width="120"
/>
<el-table-column
diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue
index cd3849d..2bef9ad 100644
--- a/src/views/patient/patient/profile/index.vue
+++ b/src/views/patient/patient/profile/index.vue
@@ -1,108 +1,105 @@
<template>
<div class="app-container">
- <el-row :gutter="20">
- <el-col :span="4" :xs="24">
- <el-card class="box-card">
- <!-- <div slot="header" class="clearfix">
- <span>涓汉淇℃伅</span>
- </div> -->
- <div class="personage">
+ <!-- 澶撮儴鐩掑瓙 -->
+ <div class="personages">
+ <el-row :gutter="20">
+ <el-col :span="4"
+ ><div class="headportrait">
<div class="text-center">
<img v-imgError="require('@/assets/common/head.jpg')" src="" />
</div>
- <div class="information">
- <div class="info-xx">
- 鍚撮緳
- <div class="xinz-inf">+鏂板鏍囩</div>
- </div>
- <div class="info-xx">鐢�<span>66宀�</span></div>
- <div class="info-xx">13803963330</div>
- </div>
- </div>
- </el-card>
- </el-col>
- <el-col :span="18" :xs="24">
- <el-tabs
- type="border-card"
- v-model="activeName"
- @tab-click="handleClick"
+ <div>鍚村ぇ榫�</div>
+ </div></el-col
>
- <el-tab-pane name="health">
- <span class="mulsz" slot="label"
- ><i class="el-icon-date"></i> 鍋ュ悍妗ｆ</span
- >
- 鍩烘湰淇℃伅
- </el-tab-pane>
- <el-tab-pane name="medical">
- <span class="mulsz" slot="label"
- ><i class="el-icon-s-management"></i> 鍖荤枟妗ｆ</span
- >
- <el-tabs v-model="sonactiveName" @tab-click="handleClick">
- <el-tab-pane name="outpatient"
- ><span class="mulsz" slot="label"
- >闂ㄨ瘖({{ mznumber }})</span
- ></el-tab-pane
- >
- <el-tab-pane name="inhospital"
- ><span class="mulsz" slot="label"
- >浣忛櫌({{ zynumber }})
- </span></el-tab-pane
- >
- <el-tab-pane name="checkout"
- ><span class="mulsz" slot="label"
- >妫�楠�({{ jynumber }})
- </span></el-tab-pane
- >
- <el-tab-pane name="examine"
- ><span class="mulsz" slot="label"
- >妫�鏌�({{ jcnumber }})
- </span></el-tab-pane
- >
- <el-tab-pane name="physical"
- ><span class="mulsz" slot="label">
- 浣撴({{ tjnumber }})</span
- ></el-tab-pane
- >
- <el-tab-pane name="pharmacy"
- ><span class="mulsz" slot="label"
- >鐢ㄨ嵂({{ yynumber }})
- </span></el-tab-pane
- >
- </el-tabs>
- </el-tab-pane>
- <el-tab-pane name="monitor">
- <span class="mulsz" slot="label"
- ><i class="el-icon-s-data"></i> 鍋ュ悍鐩戞祴</span
- >
+ <el-col :span="4"
+ ><div class="xinz-inf">
+ <div class="addtag">锛嬫柊澧炴爣绛�</div>
+ <div class="tagvalue">蹇冭绠�</div>
+ </div></el-col
+ >
+ <el-col :span="4"
+ ><div class="info-xx">鐢�<span>66宀�</span></div></el-col
+ >
+ <el-col :span="4"><div class="info-xx">13803963330</div></el-col>
+ </el-row>
+ </div>
- <el-tabs v-model="sontwoactiveName" @tab-click="handleClick">
- <el-tab-pane name="blood"
- ><span class="mulsz" slot="label"
- ><i class="el-icon-s-operation"></i> 琛�鍘�</span
- ></el-tab-pane
- >
- <el-tab-pane name="glucose"
- ><span class="mulsz" slot="label"
- ><i class="el-icon-odometer"></i>琛�绯�
- </span></el-tab-pane
- >
- <el-tab-pane name="weight"
- ><span class="mulsz" slot="label"
- ><i class="el-icon-s-data"></i>浣撻噸
- </span></el-tab-pane
- >
- </el-tabs></el-tab-pane
+ <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
+ <el-tab-pane name="health">
+ <span class="mulsz" slot="label"
+ ><i class="el-icon-date"></i> 鍋ュ悍妗ｆ</span
+ >
+ 鍩烘湰淇℃伅
+ </el-tab-pane>
+ <el-tab-pane name="medical">
+ <span class="mulsz" slot="label"
+ ><i class="el-icon-s-management"></i> 鍖荤枟妗ｆ</span
+ >
+ <el-tabs v-model="sonactiveName" @tab-click="handleClick">
+ <el-tab-pane name="outpatient"
+ ><span class="mulsz" slot="label"
+ >闂ㄨ瘖({{ mznumber }})</span
+ ></el-tab-pane
>
- <el-tab-pane name="serve">
- <span class="mulsz" slot="label"
- ><i class="el-icon-s-custom"></i> 鏈嶅姟璁板綍</span
- >
-
- 瀹氭椂浠诲姟琛ュ伩</el-tab-pane
+ <el-tab-pane name="inhospital"
+ ><span class="mulsz" slot="label"
+ >浣忛櫌({{ zynumber }})
+ </span></el-tab-pane
+ >
+ <el-tab-pane name="checkout"
+ ><span class="mulsz" slot="label"
+ >妫�楠�({{ jynumber }})
+ </span></el-tab-pane
+ >
+ <el-tab-pane name="examine"
+ ><span class="mulsz" slot="label"
+ >妫�鏌�({{ jcnumber }})
+ </span></el-tab-pane
+ >
+ <el-tab-pane name="physical"
+ ><span class="mulsz" slot="label">
+ 浣撴({{ tjnumber }})</span
+ ></el-tab-pane
+ >
+ <el-tab-pane name="pharmacy"
+ ><span class="mulsz" slot="label"
+ >鐢ㄨ嵂({{ yynumber }})
+ </span></el-tab-pane
>
</el-tabs>
- </el-col>
- </el-row>
+ </el-tab-pane>
+ <el-tab-pane name="monitor">
+ <span class="mulsz" slot="label"
+ ><i class="el-icon-s-data"></i> 鍋ュ悍鐩戞祴</span
+ >
+
+ <el-tabs v-model="sontwoactiveName" @tab-click="handleClick">
+ <el-tab-pane name="blood"
+ ><span class="mulsz" slot="label"
+ ><i class="el-icon-s-operation"></i> 琛�鍘�</span
+ ></el-tab-pane
+ >
+ <el-tab-pane name="glucose"
+ ><span class="mulsz" slot="label"
+ ><i class="el-icon-odometer"></i>琛�绯�
+ </span></el-tab-pane
+ >
+ <el-tab-pane name="weight"
+ ><span class="mulsz" slot="label"
+ ><i class="el-icon-s-data"></i>浣撻噸
+ </span></el-tab-pane
+ >
+ </el-tabs></el-tab-pane
+ >
+ <el-tab-pane name="serve">
+ <span class="mulsz" slot="label"
+ ><i class="el-icon-s-custom"></i> 鏈嶅姟璁板綍</span
+ >
+
+ 瀹氭椂浠诲姟琛ュ伩</el-tab-pane
+ >
+ </el-tabs>
+
<!-- 鍋ュ悍妗ｆ妯″潡 -->
<div class="information-content" v-if="activeName == 'health'">
<div class="top-message">
@@ -658,37 +655,36 @@
</script>
<style lang="scss" scoped>
-.personage {
- display: flex;
- .text-center {
- width: 40px;
- height: 40px;
- margin-right: 10px;
- img {
- width: 100%;
+.personages {
+ height: 88px;
+ width: 100%;
+ background-color: #2486b9;
+ border-radius: 5px;
+ padding: 20px;
+ margin-bottom: 10px;
+ line-height: 48px;
+ font-size: 25px;
+ font-weight: 600;
+ color: #ffffff;
+ .headportrait {
+ display: flex;
+ .text-center {
+ width: 55px;
+ height: 55px;
+ margin-right: 10px;
+ img {
+ width: 100%;
+ height: 100%;
+ border-radius: 50%;
+ }
}
}
- .information {
- font-size: 25px;
- .info-xx {
- margin-top: 15px;
- border-bottom: 2px solid rgb(65, 161, 190);
- display: flex;
- span {
- margin-left: 30px;
- }
- .xinz-inf {
- cursor: pointer;
- margin-left: 20px;
- height: 23px;
- line-height: 23px;
- padding: 2px;
- align-items: center;
- font-size: 16px;
- color: rgb(85, 151, 250);
- border: 1px solid #439fff;
- border-radius: 9px;
- }
+ .xinz-inf {
+ display: flex;
+ font-size: 18px;
+ cursor: pointer;
+ .addtag{
+
}
}
}
diff --git a/src/views/patient/servefn/index.vue b/src/views/patient/servefn/index.vue
index 2f0b835..dd8701a 100644
--- a/src/views/patient/servefn/index.vue
+++ b/src/views/patient/servefn/index.vue
@@ -23,20 +23,14 @@
<!-- 鍙充晶鏁版嵁 -->
<div class="leftvlue">
<div>
- <el-row :gutter="8">
- <el-col :span="2.5">
+ <el-row :gutter="10">
+ <el-col :span="2.5" v-for="(item,index) in cardlist" :key="index">
<el-card shadow="hover">
- <div style="padding: 10px">
- <span>鎮ｈ�呮�绘暟</span>
- <div class="bottom clearfix">1232</div>
+ <div style="padding: 8px">
+ <span>{{item.name}}</span>
+ <div style="text-align: center; font-size: 18px; margin-top: 10px; font-weight: 600;">{{item.value}}</div>
</div>
</el-card>
- </el-col>
- <el-col :span="2.5">
- <el-card shadow="hover"> 榧犳爣鎮诞鏃舵樉绀� </el-card>
- </el-col>
- <el-col :span="2.5">
- <el-card shadow="hover"> 浠庝笉鏄剧ず </el-card>
</el-col>
</el-row>
</div>
@@ -544,6 +538,28 @@
tagname: undefined,
tagdescription: undefined,
},
+ cardlist:[
+{
+ name:'鎮ｈ�呮�绘暟',
+ value:123
+},
+{
+ name:'鍦ㄩ櫌鎮ｈ��',
+ value:23
+},
+{
+ name:'绂婚櫌鎮ｈ��',
+ value:41
+},
+{
+ name:'璇婄枟鎮ｈ��',
+ value:56
+},
+{
+ name:'绂讳笘鎮ｈ��',
+ value:0
+},
+ ],
// 鍒椾俊鎭�
columns: [
{ key: 0, label: `鏍囩缂栧彿`, visible: true },
@@ -718,7 +734,7 @@
margin-top: 20px;
margin: 20px;
padding: 30px;
- background: #edf1f7;
+ background: #d0e9fd;
border: 1px solid #dcdfe6;
-webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
0 0 6px 0 rgba(0, 0, 0, 0.04);
@@ -785,11 +801,19 @@
text-align: left;
font-size: 20px;
}
-
+::v-deep.leftvlue .el-card__body{
+ background: #d0e9fd;
+}
+::v-deep.leftvlue .el-card__body:hover{
+ background: #8dc8f8;
+}
+.leftvlue{
+ width: 80%;
+ margin-top: 10px;
+}
.leftvlue-bg {
// display: flex;
// flex: 1;
- width: 80%;
margin-top: 20px;
// margin: 20px;
padding: 30px;
diff --git a/src/views/register.vue b/src/views/register.vue
index 5530e9a..fda2d82 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -6,7 +6,7 @@
:rules="registerRules"
class="register-form"
>
- <h3 class="title">鏅烘収闅忚绠＄悊绯荤粺</h3>
+ <h3 class="title">鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�</h3>
<el-form-item prop="username">
<el-input
v-model="registerForm.username"
diff --git a/vue.config.js b/vue.config.js
index cb5e5a9..675412b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,7 +7,7 @@
const CompressionPlugin = require('compression-webpack-plugin')
-const name = process.env.VUE_APP_TITLE || '鏅烘収闅忚绠＄悊绯荤粺' // 缃戦〉鏍囬
+const name = process.env.VUE_APP_TITLE || '鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�' // 缃戦〉鏍囬
const port = process.env.port || process.env.npm_config_port || 8091 // 绔彛
--
Gitblit v1.9.3