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 8e22a317..2c6c4522 100644 --- a/acupuncture-前台/src/assets/styles/variables.scss +++ b/acupuncture-前台/src/assets/styles/variables.scss @@ -9,16 +9,16 @@ $yellow: #fec171; $panGreen: #30b08f; // 默认菜单主题风格 -$base-menu-color: #c7bdb1; +$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: #5a332a; +$base-sub-menu-background: rgb(64, 110, 73); $base-sub-menu-hover: rgba(0, 0, 0, 0.2); // 自定义暗色菜单风格 diff --git a/acupuncture-前台/src/layout/components/Navbar.vue b/acupuncture-前台/src/layout/components/Navbar.vue index 7eb39d44..d97be4da 100644 --- a/acupuncture-前台/src/layout/components/Navbar.vue +++ b/acupuncture-前台/src/layout/components/Navbar.vue @@ -134,7 +134,7 @@ export default { +> diff --git a/acupuncture-前台/src/store/modules/settings.js b/acupuncture-前台/src/store/modules/settings.js index 614038c6..c15bad4e 100644 --- a/acupuncture-前台/src/store/modules/settings.js +++ b/acupuncture-前台/src/store/modules/settings.js @@ -13,7 +13,7 @@ const { const storageSetting = JSON.parse(localStorage.getItem("layout-setting")) || ""; const state = { title: "", - theme: "#70483E", + theme: "#406E49", sideTheme: storageSetting.sideTheme || sideTheme, showSettings: showSettings, topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav, 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 6aa78b55..401ab088 100644 --- a/acupuncture-前台/src/views/indexCom/XGZL.vue +++ b/acupuncture-前台/src/views/indexCom/XGZL.vue @@ -9,7 +9,7 @@
- + 中西医结合
@@ -52,19 +52,19 @@
- + 治愈
- + 显效
- + 好转
- + 无效
@@ -381,7 +381,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/follow.vue b/acupuncture-前台/src/views/indexCom/follow.vue index 3b16cc97..32a0a51d 100644 --- a/acupuncture-前台/src/views/indexCom/follow.vue +++ b/acupuncture-前台/src/views/indexCom/follow.vue @@ -89,46 +89,50 @@ export default { handleFollow() { followEcharts.series = []; let colorArr = [ - "#C7BDB1", - "#C6A268", - "#906C4A", - "#70483E", - "#582518", - "#C7BDB1", - "#C6A268", - "#906C4A", - "#70483E", - "#582518", - "#C7BDB1", - "#C6A268", - "#906C4A", - "#70483E", - "#582518", - "#C7BDB1", - "#C6A268", - "#906C4A", - "#70483E", - "#582518", - "#C7BDB1", - "#C6A268", - "#906C4A", - "#70483E", - "#582518", - "#C7BDB1", - "#C6A268", - "#906C4A", - "#70483E", - "#582518", - "#C7BDB1", - "#C6A268", - "#906C4A", - "#70483E", - "#582518", - "#C7BDB1", - "#C6A268", - "#906C4A", - "#70483E", - "#582518", + "#EBE4C6", + "#DF8845", + "#406E49", + "#00A046", + "#EBE4C6", + "#DF8845", + "#406E49", + "#00A046", + "#EBE4C6", + "#DF8845", + "#406E49", + "#00A046", + "#EBE4C6", + "#DF8845", + "#406E49", + "#00A046", + "#EBE4C6", + "#DF8845", + "#406E49", + "#00A046", + "#EBE4C6", + "#DF8845", + "#406E49", + "#00A046", + "#EBE4C6", + "#DF8845", + "#406E49", + "#00A046", + "#EBE4C6", + "#DF8845", + "#406E49", + "#00A046", + "#EBE4C6", + "#DF8845", + "#406E49", + "#00A046", + "#EBE4C6", + "#DF8845", + "#406E49", + "#00A046", + "#EBE4C6", + "#DF8845", + "#406E49", + "#00A046", ]; let index = 0; for (let key in this.followValue) { @@ -254,7 +258,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/image.png b/acupuncture-前台/src/views/indexCom/image.png index baced7af..365e8b80 100644 Binary files a/acupuncture-前台/src/views/indexCom/image.png and b/acupuncture-前台/src/views/indexCom/image.png differ diff --git a/acupuncture-前台/src/views/indexCom/index.js b/acupuncture-前台/src/views/indexCom/index.js index c784e6a7..b8c99e73 100644 --- a/acupuncture-前台/src/views/indexCom/index.js +++ b/acupuncture-前台/src/views/indexCom/index.js @@ -23,7 +23,7 @@ export const HZXX = { bottom: "0%", containLabel: true, }, - color: ["#C6A268"], + color: ["#DF8845"], graphic: { type: "text", left: "center", @@ -76,7 +76,7 @@ export const gende = { bottom: "0%", containLabel: true, }, - color: ["#70483E", "#C7BDB1"], + color: ["#406E49", "#EBE4C6"], series: [ { type: "pie", @@ -108,7 +108,7 @@ export const ageEcharts = { axisPointer: { type: "cross", label: { - backgroundColor: "#6a7985", + backgroundColor: "#DF8845", }, }, formatter: function (params) { @@ -156,14 +156,14 @@ export const ageEcharts = { data: [], type: "bar", barMaxWidth: 24, //柱图宽度 - color: "#C6A268", + color: "#DF8845", // itemStyle: { // normal: { // //这里设置柱形图圆角 [左上角,右上角,右下角,左下角] // barBorderRadius: [50, 50, 0, 0], // color: function (params) { // var colorList = [ - // "#C6A268", + // "#DF8845", // ]; // return colorList[params.dataIndex]; // }, @@ -179,7 +179,7 @@ export const diseaseEcharts = { axisPointer: { type: "cross", label: { - backgroundColor: "#6a7985", + backgroundColor: "#DF8845", }, }, formatter: function (params) { @@ -227,7 +227,7 @@ export const diseaseEcharts = { data: [], type: "bar", barMaxWidth: 24, //柱图宽度 - color: "#70483E", + color: "#406E49", }, ], }; @@ -240,7 +240,7 @@ export const diagnoseEcharts = { axisPointer: { type: "cross", label: { - backgroundColor: "#6a7985", + backgroundColor: "#DF8845", }, }, formatter: function (params) { @@ -290,7 +290,7 @@ export const diagnoseEcharts = { data: [], type: "bar", barMaxWidth: 24, //柱图宽度 - color: "#906C4A", + color: "#406E49", }, ], }; @@ -301,7 +301,7 @@ export const systemEcharts = { axisPointer: { type: "cross", label: { - backgroundColor: "#6a7985", + backgroundColor: "#DF8845", }, }, formatter: function (params) { @@ -349,7 +349,7 @@ export const systemEcharts = { data: [], type: "bar", barMaxWidth: 24, //柱图宽度 - color: "#C6A268", + color: "#DF8845", // itemStyle: { // normal: { // //这里设置柱形图圆角 [左上角,右上角,右下角,左下角] @@ -366,7 +366,7 @@ export const physiqueEcharts = { axisPointer: { type: "cross", label: { - backgroundColor: "#6a7985", + backgroundColor: "#DF8845", }, }, formatter: function (params) { @@ -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", "#DF8845", "#906C4A", "#406E49", "#582518"], series: [ { type: "pie", @@ -479,7 +479,7 @@ export const agrypniaEcharts = { axisPointer: { type: "cross", label: { - backgroundColor: "#6a7985", + backgroundColor: "#DF8845", }, }, formatter: function (params) { @@ -527,7 +527,7 @@ export const agrypniaEcharts = { data: [], type: "bar", barMaxWidth: 24, //柱图宽度 - color: "#C6A268", + color: "#DF8845", // itemStyle: { // normal: { // //这里设置柱形图圆角 [左上角,右上角,右下角,左下角] @@ -544,7 +544,7 @@ export const anxietyEcharts = { axisPointer: { type: "cross", label: { - backgroundColor: "#6a7985", + backgroundColor: "#DF8845", }, }, formatter: function (params) { @@ -592,7 +592,7 @@ export const anxietyEcharts = { data: [], type: "bar", barMaxWidth: 24, //柱图宽度 - color: "#70483E", + color: "#406E49", // itemStyle: { // normal: { // //这里设置柱形图圆角 [左上角,右上角,右下角,左下角] @@ -626,7 +626,7 @@ export const healTypeEcharts = { bottom: "0%", containLabel: true, }, - color: ["#C6A268", "#D8D8D8"], + color: ["#DF8845", "#D8D8D8"], series: [ { type: "pie", @@ -658,7 +658,7 @@ export const diseaseMethodEcharts = { axisPointer: { type: "cross", label: { - backgroundColor: "#6a7985", + backgroundColor: "#DF8845", }, }, formatter: function (params) { @@ -747,7 +747,7 @@ export const effectEcharts = { bottom: "0%", containLabel: true, }, - color: ["#C6A268", "#906C4A", "#70483E", "#C7BDB1"], + color: ["#DF8845", "#00A046", "#406E49", "#EBE4C6"], series: [ { type: "pie", @@ -779,7 +779,7 @@ export const costEcharts = { axisPointer: { type: "cross", label: { - backgroundColor: "#6a7985", + backgroundColor: "#DF8845", }, }, formatter: function (params) { @@ -827,7 +827,7 @@ export const costEcharts = { data: [], type: "bar", barMaxWidth: 24, //柱图宽度 - color: "#C6A268", + color: "#DF8845", // itemStyle: { // normal: { // //这里设置柱形图圆角 [左上角,右上角,右下角,左下角] @@ -844,7 +844,7 @@ export const followEcharts = { axisPointer: { type: "cross", label: { - backgroundColor: "#6a7985", + backgroundColor: "#DF8845", }, }, formatter: function (params) { @@ -895,7 +895,7 @@ export const lossFollowEcharts = { axisPointer: { type: "cross", label: { - backgroundColor: "#6a7985", + backgroundColor: "#DF8845", }, }, formatter: function (params) { @@ -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 1a643c93..c70393ee 100644 --- a/acupuncture-前台/src/views/indexCom/patient.vue +++ b/acupuncture-前台/src/views/indexCom/patient.vue @@ -41,10 +41,10 @@
- +
- +
@@ -283,7 +283,7 @@ export default { diff --git a/acupuncture-前台/src/views/medicalFile/h5eva.vue b/acupuncture-前台/src/views/medicalFile/h5eva.vue index e03015d6..43e897ea 100644 --- a/acupuncture-前台/src/views/medicalFile/h5eva.vue +++ b/acupuncture-前台/src/views/medicalFile/h5eva.vue @@ -199,7 +199,7 @@ export default { .hospital { background: #fff; font-size: 20px; - color: #70483e; + color: #406e49; line-height: 50px; font-weight: 600; margin-bottom: 10px; @@ -268,8 +268,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 { diff --git a/acupuncture-前台/src/views/screening/h5.vue b/acupuncture-前台/src/views/screening/h5.vue index ec550936..b3c869ce 100644 --- a/acupuncture-前台/src/views/screening/h5.vue +++ b/acupuncture-前台/src/views/screening/h5.vue @@ -181,7 +181,7 @@ export default { .hospital { background: #fff; font-size: 20px; - color: #70483e; + color: #406e49; font-weight: 600; margin-bottom: 10px; border-radius: 6px; @@ -247,8 +247,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 { diff --git a/acupuncture-前台/src/views/screening/h5Result.vue b/acupuncture-前台/src/views/screening/h5Result.vue index b4d94277..395567a5 100644 --- a/acupuncture-前台/src/views/screening/h5Result.vue +++ b/acupuncture-前台/src/views/screening/h5Result.vue @@ -139,7 +139,7 @@ export default { .hospital { background: #fff; font-size: 20px; - color: #70483e; + color: #406e49; line-height: 50px; font-weight: 600; margin-bottom: 10px; @@ -197,8 +197,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; } diff --git a/acupuncture-前台/src/views/screening/h5eva.vue b/acupuncture-前台/src/views/screening/h5eva.vue index e2f628c8..0a1a0829 100644 --- a/acupuncture-前台/src/views/screening/h5eva.vue +++ b/acupuncture-前台/src/views/screening/h5eva.vue @@ -1067,7 +1067,7 @@ export default { .hospital { background: #fff; font-size: 20px; - color: #70483e; + color: #406e49; line-height: 50px; font-weight: 600; margin-bottom: 10px; @@ -1147,8 +1147,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 {