diff --git a/acupuncture-后台/public/index.html b/acupuncture-后台/public/index.html index 912f3f57..9e7cb41a 100644 --- a/acupuncture-后台/public/index.html +++ b/acupuncture-后台/public/index.html @@ -124,7 +124,7 @@ top: 0; width: 51%; height: 100%; - background: #70483E; + background: #406E49; z-index: 1000; -webkit-transform: translateX(0); -ms-transform: translateX(0); @@ -213,4 +213,4 @@ - \ No newline at end of file + diff --git a/acupuncture-后台/public/zj.png b/acupuncture-后台/public/zj.png index e3ba37bd..76a8071f 100644 Binary files a/acupuncture-后台/public/zj.png and b/acupuncture-后台/public/zj.png differ diff --git a/acupuncture-后台/src/assets/images/zj.png b/acupuncture-后台/src/assets/images/zj.png index e3ba37bd..76a8071f 100644 Binary files a/acupuncture-后台/src/assets/images/zj.png and b/acupuncture-后台/src/assets/images/zj.png differ diff --git a/acupuncture-后台/src/assets/styles/element-variables.scss b/acupuncture-后台/src/assets/styles/element-variables.scss index eaa04b17..323f3456 100644 --- a/acupuncture-后台/src/assets/styles/element-variables.scss +++ b/acupuncture-后台/src/assets/styles/element-variables.scss @@ -4,7 +4,7 @@ **/ /* theme color */ -$--color-primary: #c6a268; +$--color-primary: #ebe5c5; $--color-success: #13ce66; $--color-warning: #ffba00; $--color-danger: #ff4949; diff --git a/acupuncture-后台/src/assets/styles/variables.scss b/acupuncture-后台/src/assets/styles/variables.scss index 387016c9..40718931 100644 --- a/acupuncture-后台/src/assets/styles/variables.scss +++ b/acupuncture-后台/src/assets/styles/variables.scss @@ -9,17 +9,17 @@ $yellow: #fec171; $panGreen: #30b08f; // 默认菜单主题风格 -$base-menu-color: #fff; +$base-menu-color: #ebe5c5; $base-menu-color-active: #f4f4f5; -$base-menu-background: #70483e; +$base-menu-background: #406e49; $base-logo-title-color: #ffffff; -$base-menu-light-color: rgba(0, 0, 0, 0.7); +$base-menu-light-color: rgba(64, 110, 73, 0.7); $base-menu-light-background: #ffffff; $base-logo-light-title-color: #001529; -$base-sub-menu-background: #70483e; -$base-sub-menu-hover: #69443a; +$base-sub-menu-background: rgb(64, 110, 73); +$base-sub-menu-hover: rgba(0, 0, 0, 0.2); // 自定义暗色菜单风格 /** diff --git a/acupuncture-后台/src/views/indexCom/JM.vue b/acupuncture-后台/src/views/indexCom/JM.vue index 88e2a381..a99989f0 100644 --- a/acupuncture-后台/src/views/indexCom/JM.vue +++ b/acupuncture-后台/src/views/indexCom/JM.vue @@ -414,7 +414,7 @@ export default { display: inline-block; height: 20px; width: 6px; - background: #70483e; + background: #406e49; margin-right: 10px; border-radius: 8px; } diff --git a/acupuncture-后台/src/views/indexCom/XGZL.vue b/acupuncture-后台/src/views/indexCom/XGZL.vue index f556f7b6..5c636450 100644 --- a/acupuncture-后台/src/views/indexCom/XGZL.vue +++ b/acupuncture-后台/src/views/indexCom/XGZL.vue @@ -60,7 +60,7 @@ 显效
- + 好转
diff --git a/acupuncture-后台/src/views/indexCom/follow.vue b/acupuncture-后台/src/views/indexCom/follow.vue index c17ed2df..40ffcded 100644 --- a/acupuncture-后台/src/views/indexCom/follow.vue +++ b/acupuncture-后台/src/views/indexCom/follow.vue @@ -92,42 +92,42 @@ export default { "#C7BDB1", "#C6A268", "#906C4A", - "#70483E", + "#406E49", "#582518", "#C7BDB1", "#C6A268", "#906C4A", - "#70483E", + "#406E49", "#582518", "#C7BDB1", "#C6A268", "#906C4A", - "#70483E", + "#406E49", "#582518", "#C7BDB1", "#C6A268", "#906C4A", - "#70483E", + "#406E49", "#582518", "#C7BDB1", "#C6A268", "#906C4A", - "#70483E", + "#406E49", "#582518", "#C7BDB1", "#C6A268", "#906C4A", - "#70483E", + "#406E49", "#582518", "#C7BDB1", "#C6A268", "#906C4A", - "#70483E", + "#406E49", "#582518", "#C7BDB1", "#C6A268", "#906C4A", - "#70483E", + "#406E49", "#582518", ]; let index = 0; diff --git a/acupuncture-后台/src/views/indexCom/index.js b/acupuncture-后台/src/views/indexCom/index.js index c784e6a7..ff0fdb66 100644 --- a/acupuncture-后台/src/views/indexCom/index.js +++ b/acupuncture-后台/src/views/indexCom/index.js @@ -76,7 +76,7 @@ export const gende = { bottom: "0%", containLabel: true, }, - color: ["#70483E", "#C7BDB1"], + color: ["#406E49", "#C7BDB1"], series: [ { type: "pie", @@ -227,7 +227,7 @@ export const diseaseEcharts = { data: [], type: "bar", barMaxWidth: 24, //柱图宽度 - color: "#70483E", + color: "#406E49", }, ], }; @@ -414,7 +414,7 @@ export const physiqueEcharts = { data: [], type: "bar", barMaxWidth: 24, //柱图宽度 - color: "#70483E", + color: "#406E49", // itemStyle: { // normal: { // //这里设置柱形图圆角 [左上角,右上角,右下角,左下角] @@ -447,7 +447,7 @@ export const postureEcharts = { bottom: "0%", containLabel: true, }, - color: ["#C7BDB1", "#C6A268", "#906C4A", "#70483E", "#582518"], + color: ["#C7BDB1", "#C6A268", "#906C4A", "#406E49", "#582518"], series: [ { type: "pie", @@ -592,7 +592,7 @@ export const anxietyEcharts = { data: [], type: "bar", barMaxWidth: 24, //柱图宽度 - color: "#70483E", + color: "#406E49", // itemStyle: { // normal: { // //这里设置柱形图圆角 [左上角,右上角,右下角,左下角] @@ -747,7 +747,7 @@ export const effectEcharts = { bottom: "0%", containLabel: true, }, - color: ["#C6A268", "#906C4A", "#70483E", "#C7BDB1"], + color: ["#C6A268", "#906C4A", "#406E49", "#C7BDB1"], series: [ { type: "pie", @@ -968,7 +968,7 @@ export const lossFollowEcharts = { data: [], type: "bar", barMaxWidth: 24, //柱图宽度 - color: "#70483E", + color: "#406E49", // itemStyle: { // normal: { // //这里设置柱形图圆角 [左上角,右上角,右下角,左下角] diff --git a/acupuncture-后台/src/views/indexCom/patient.vue b/acupuncture-后台/src/views/indexCom/patient.vue index de5a7d38..dd7b78e1 100644 --- a/acupuncture-后台/src/views/indexCom/patient.vue +++ b/acupuncture-后台/src/views/indexCom/patient.vue @@ -41,7 +41,7 @@
- +
diff --git a/acupuncture-后台/src/views/medicalFile/details.vue b/acupuncture-后台/src/views/medicalFile/details.vue index 5ca0f8d5..7eef2140 100644 --- a/acupuncture-后台/src/views/medicalFile/details.vue +++ b/acupuncture-后台/src/views/medicalFile/details.vue @@ -1597,8 +1597,8 @@ export default { } .span-but-active { - color: #70483e; - border: 1px solid #70483e; + color: #406e49; + border: 1px solid #406e49; } .human-body { diff --git a/acupuncture-后台/src/views/screening/h5.vue b/acupuncture-后台/src/views/screening/h5.vue index 4015b476..09741335 100644 --- a/acupuncture-后台/src/views/screening/h5.vue +++ b/acupuncture-后台/src/views/screening/h5.vue @@ -662,7 +662,7 @@ export default { .hospital { background: #fff; font-size: 20px; - color: #70483e; + color: #406e49; line-height: 50px; font-weight: 600; margin-bottom: 10px; @@ -728,8 +728,8 @@ export default { } /* */ .app-container { - /* background: linear-gradient(to bottom, #70483e, #f7f8fa); */ - background: #70483e; + /* background: linear-gradient(to bottom, #406E49, #f7f8fa); */ + background: #406e49; min-height: 100vh; } >>> .el-input__inner {