Merge branch 'new-ays' of http://116.204.114.73:3000/ccsens_zhengzhichuan/acupuncture into new-ays

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 @@
   </div>
 </body>
 
-</html>
+</html>

acupuncture-前台/src/assets/styles/element-variables.scss

@@ -4,7 +4,7 @@
 **/
 
 /* theme color */
-$--color-primary: #c6a268;
+$--color-primary: #406e49;
 $--color-success: #13ce66;
 $--color-warning: #ffba00;
 $--color-danger: #ff4949;

acupuncture-前台/src/assets/styles/variables.scss

@@ -9,16 +9,16 @@ $yellow: #fec171;
 $panGreen: #30b08f;
 
 // 默认菜单主题风格
-$base-menu-color: #c7bdb1;
+$base-menu-color: #dad0a7;
 $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);
 
 // 自定义暗色菜单风格

acupuncture-前台/src/layout/components/Navbar.vue

@@ -134,7 +134,7 @@ export default {
 <style lang="scss" scoped>
 .logo-title {
   font-size: 20px;
-  color: #70483e;
+  color: #406e49;
   line-height: 50px;
   margin-left: 20px;
   font-weight: 600;

acupuncture-前台/src/layout/components/Sidebar/SidebarItem.vue

@@ -200,8 +200,8 @@ export default {
 </style>
 <style>
 #app .sidebar-container .theme-dark .is-active > .el-submenu__title {
-  color: #70483e !important;
-  background-color: #70483e !important;
+  color: #406e49 !important;
+  background-color: #406e49 !important;
 }
 #app .sidebar-container .theme-dark .is-active {
   background-color: #5a332a;
@@ -215,6 +215,7 @@ export default {
   background-color: #5a332a;
 }
 #app .sidebar-container .el-submenu__title:hover .header {
-  background-color: #5a3a32 !important;
+  background-color: #406e49 !important;
 }
 </style>
+>

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,

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;
 }

acupuncture-前台/src/views/indexCom/XGZL.vue

@@ -9,7 +9,7 @@
               <div class="dis">
                 <div class="dian-box dis">
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #c6a268"></span>
+                    <span class="dian" style="background: #dad0a7"></span>
                     中西医结合
                   </div>
                   <span class="dian" style="background: #d8d8d8"></span>
@@ -52,19 +52,19 @@
               <div class="dis">
                 <div class="dian-box dis">
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #c6a268"></span>
+                    <span class="dian" style="background: #dad0a7"></span>
                     治愈
                   </div>
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #906c4a"></span>
+                    <span class="dian" style="background: #00a046"></span>
                     显效
                   </div>
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #70483e"></span>
+                    <span class="dian" style="background: #406e49"></span>
                     好转
                   </div>
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #c7bdb1"></span>
+                    <span class="dian" style="background: #ebe4c6"></span>
                     无效
                   </div>
                 </div>
@@ -381,7 +381,7 @@ export default {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #70483e;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

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",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#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;
 }

acupuncture-前台/src/views/indexCom/index.js

@@ -23,7 +23,7 @@ export const HZXX = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#C6A268"],
+  color: ["#dad0a7"],
   graphic: {
     type: "text",
     left: "center",
@@ -76,7 +76,7 @@ export const gende = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#70483E", "#C7BDB1"],
+  color: ["#406E49", "#dad0a7"],
   series: [
     {
       type: "pie",
@@ -108,7 +108,7 @@ export const ageEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -156,14 +156,14 @@ export const ageEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
       //     barBorderRadius: [50, 50, 0, 0],
       //     color: function (params) {
       //       var colorList = [
-      //         "#C6A268",
+      //         "#dad0a7",
       //       ];
       //       return colorList[params.dataIndex];
       //     },
@@ -179,7 +179,7 @@ export const diseaseEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     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: "#dad0a7",
       },
     },
     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: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -349,7 +349,7 @@ export const systemEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -366,7 +366,7 @@ export const physiqueEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     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", "#dad0a7", "#906C4A", "#406E49", "#582518"],
   series: [
     {
       type: "pie",
@@ -479,7 +479,7 @@ export const agrypniaEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -527,7 +527,7 @@ export const agrypniaEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -544,7 +544,7 @@ export const anxietyEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     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: ["#dad0a7", "#D8D8D8"],
   series: [
     {
       type: "pie",
@@ -658,7 +658,7 @@ export const diseaseMethodEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -747,7 +747,7 @@ export const effectEcharts = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#C6A268", "#906C4A", "#70483E", "#C7BDB1"],
+  color: ["#dad0a7", "#00A046", "#406E49", "#EBE4C6"],
   series: [
     {
       type: "pie",
@@ -779,7 +779,7 @@ export const costEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -827,7 +827,7 @@ export const costEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -844,7 +844,7 @@ export const followEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -895,7 +895,7 @@ export const lossFollowEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -968,7 +968,7 @@ export const lossFollowEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#70483E",
+      color: "#406E49",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]

acupuncture-前台/src/views/indexCom/patient.vue

@@ -41,10 +41,10 @@
               <div class="dis">
                 <div class="dian-box dis">
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #70483e"></span>
+                    <span class="dian" style="background: #406e49"></span>
                     男
                   </div>
-                  <span class="dian" style="background: #c7bdb1"></span>
+                  <span class="dian" style="background: #dad0a7"></span>
                   女
                 </div>
               </div>
@@ -283,7 +283,7 @@ export default {
 <style scoped src="@/assets/styles/common.css"></style>
 <style scoped>
 .div-hz {
-  background: #c6a268;
+  background: #dad0a7;
   width: 80%;
   height: 70%;
   border-radius: 10px;
@@ -372,7 +372,7 @@ export default {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #70483e;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-前台/src/views/indexCom/query.vue

@@ -170,12 +170,13 @@ export default {
   align-items: center;
   font-size: 20px;
   font-weight: 600;
+  color: #406e49;
 }
 .title-bor {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #70483e;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-前台/src/views/login.vue

@@ -8,7 +8,7 @@
         :rules="loginRules"
         class="login-form"
       >
-        <h3 class="title" style="color: #fff; text-align: left">
+        <h3 class="title11" style="color: #406e49; text-align: left">
           登录到
           <br />
           体重管理数据云平台系统
@@ -62,7 +62,7 @@
         </el-form-item>
         <el-checkbox
           v-model="loginForm.rememberMe"
-          style="margin: 0px 0px 25px 0px; color: #fff"
+          style="margin: 0px 0px 25px 0px; color: #406e49"
           >记住密码</el-checkbox
         >
         <el-form-item style="width: 100%">
@@ -243,11 +243,12 @@ export default {
   }
 }
 
-.title {
+.title11 {
   font-size: 26 px;
   margin: 0px auto 30px auto;
   text-align: left;
   color: #fff;
+  font-weight: bold;
   line-height: 28px;
 }
 

acupuncture-前台/src/views/medicalFile/details.vue

@@ -1286,7 +1286,7 @@ export default {
       zytzQrcode({
         param: {
           id: this.form.id,
-          // rewrite: 1,
+          rewrite: 1,
           path: `${process.env.VUE_APP_VISIT_URL}medicalEva?id=${this.form.id}&name=${this.form.name}&phone=${this.form.phone}&tenantId=${this.userInfo.tenantId}`,
         },
       }).then((res) => {
@@ -1705,8 +1705,8 @@ export default {
 }
 
 .span-but-active {
-  color: #70483e;
-  border: 1px solid #70483e;
+  color: #406e49;
+  border: 1px solid #406e49;
 }
 
 .human-body {

acupuncture-前台/src/views/medicalFile/h5Result.vue

@@ -54,7 +54,7 @@ export default {
 .hospital {
   background: #fff;
   font-size: 20px;
-  color: #70483e;
+  color: #406e49;
   line-height: 50px;
   font-weight: 600;
   margin-bottom: 10px;
@@ -109,8 +109,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;
 }
 </style>

acupuncture-前台/src/views/medicalFile/h5eva.vue

@@ -189,7 +189,7 @@ export default {
 .idcardupd >>> .el-upload {
   height: 44px;
   border: none;
-  background: #c6a268;
+  background: #dad0a7;
 }
 .hospital1 {
   text-align: center;
@@ -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;
@@ -245,7 +245,7 @@ export default {
   align-items: center;
 }
 .submit-box .submit-box-but {
-  background: #c6a268;
+  background: #dad0a7;
   width: 100%;
   font-size: 16px;
 }
@@ -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 {

acupuncture-前台/src/views/screening/h5.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <div class="hospital">
-      安阳市“享‘瘦’美好·邕抱健康”
+      安阳市“安享阳光，瘦出美好模样”
       <br />
       全民科学减重活动知情同意书
     </div>
     <div class="zqty">
       <div class="text-bt">尊敬的先生/女士：</div>
       <div class="text-dl">
-        您好！非常感谢您参与安阳市“享‘瘦’美好·邕抱健康”全民科学减重活动。本次活动是安阳市“体重管理年”系列活动之一，旨在倡导市民树立“每个人是健康第一责任人”理念，科学管理体重，提升健康水平。
+        您好！非常感谢您参与安阳市“安享阳光，瘦出美好模样”全民科学减重活动。本次活动是安阳市“体重管理年”系列活动之一，旨在倡导市民树立“每个人是健康第一责任人”理念，科学管理体重，提升健康水平。
       </div>
       <div class="text-dl">在您参与此次活动前，请您仔细阅读以下内容：</div>
       <div class="text-dl">
@@ -118,7 +118,7 @@ export default {
   text-align: center;
 }
 .btn-dl-gl {
-  color: #c6a268;
+  color: #dad0a7;
 }
 .btn-dl-ty {
   margin-right: 16px;
@@ -171,7 +171,7 @@ export default {
 .idcardupd >>> .el-upload {
   height: 44px;
   border: none;
-  background: #c6a268;
+  background: #dad0a7;
 }
 .hospital1 {
   text-align: center;
@@ -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;
@@ -224,7 +224,7 @@ export default {
   align-items: center;
 }
 .submit-box .submit-box-but {
-  background: #c6a268;
+  background: #dad0a7;
   width: 100%;
   font-size: 16px;
 }
@@ -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 {

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;
 }
 </style>

acupuncture-前台/src/views/screening/h5eva.vue

@@ -6,7 +6,7 @@
       :rules="rules"
       ref="form"
       :model="form"
-      label-width="135px"
+      label-width="140px"
     >
       <!-- 姓名、性别（单选）、出生日期、年龄、联系方式 -->
       <div class="card">
@@ -1057,7 +1057,7 @@ export default {
 .idcardupd >>> .el-upload {
   height: 44px;
   border: none;
-  background: #c6a268;
+  background: #dad0a7;
 }
 .hospital1 {
   text-align: center;
@@ -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;
@@ -1117,7 +1117,7 @@ export default {
 }
 
 .submit-box .submit-box-but {
-  background: #c6a268;
+  background: #dad0a7;
   width: 100%;
   font-size: 16px;
   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 {

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 @@
   </div>
 </body>
 
-</html>
+</html>

acupuncture-后台/src/assets/styles/element-variables.scss

@@ -4,7 +4,7 @@
 **/
 
 /* theme color */
-$--color-primary: #c6a268;
+$--color-primary: #dad0a7;
 $--color-success: #13ce66;
 $--color-warning: #ffba00;
 $--color-danger: #ff4949;

acupuncture-后台/src/assets/styles/variables.scss

@@ -9,17 +9,17 @@ $yellow: #fec171;
 $panGreen: #30b08f;
 
 // 默认菜单主题风格
-$base-menu-color: #fff;
+$base-menu-color: #dad0a7;
 $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);
 
 // 自定义暗色菜单风格
 /**

acupuncture-后台/src/store/modules/permission.js

@@ -126,12 +126,13 @@ export function filterDynamicRoutes(routes) {
 }
 
 export const loadView = (view) => {
-  if (process.env.NODE_ENV === "development") {
-    return (resolve) => require([`@/views/${view}`], resolve);
-  } else {
-    // 使用 import 实现生产环境的路由懒加载
-    return () => import(`@/views/${view}`);
-  }
+  return (resolve) => require([`@/views/${view}`], resolve);
+  // if (process.env.NODE_ENV === "development") {
+  //   return (resolve) => require([`@/views/${view}`], resolve);
+  // } else {
+  //   // 使用 import 实现生产环境的路由懒加载
+  //   return () => import(`@/views/${view}`);
+  // }
 };
 
 export default permission;

acupuncture-后台/src/store/modules/settings.js

@@ -13,7 +13,7 @@ const {
 const storageSetting = JSON.parse(localStorage.getItem("layout-setting")) || "";
 const state = {
   title: "",
-  theme: storageSetting.theme || "#C6A268",
+  theme: storageSetting.theme || "#dad0a7",
   sideTheme: storageSetting.sideTheme || sideTheme,
   showSettings: showSettings,
   topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,

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;
 }

acupuncture-后台/src/views/indexCom/XGZL.vue

@@ -9,7 +9,7 @@
               <div class="dis">
                 <div class="dian-box dis">
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #c6a268"></span>
+                    <span class="dian" style="background: #dad0a7"></span>
                     中西医结合
                   </div>
                   <span class="dian" style="background: #d8d8d8"></span>
@@ -52,19 +52,19 @@
               <div class="dis">
                 <div class="dian-box dis">
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #c6a268"></span>
+                    <span class="dian" style="background: #dad0a7"></span>
                     治愈
                   </div>
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #906c4a"></span>
+                    <span class="dian" style="background: #00a046"></span>
                     显效
                   </div>
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #70483e"></span>
+                    <span class="dian" style="background: #406e49"></span>
                     好转
                   </div>
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #c7bdb1"></span>
+                    <span class="dian" style="background: #dad0a7"></span>
                     无效
                   </div>
                 </div>
@@ -381,7 +381,7 @@ export default {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #4f8bff;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

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",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#406E49",
+        "#00A046",
+        "#EBE4C6",
+        "#dad0a7",
+        "#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: #4f8bff;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-后台/src/views/indexCom/index.js

@@ -23,7 +23,7 @@ export const HZXX = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#C6A268"],
+  color: ["#dad0a7"],
   graphic: {
     type: "text",
     left: "center",
@@ -76,7 +76,7 @@ export const gende = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#70483E", "#C7BDB1"],
+  color: ["#406E49", "#dad0a7"],
   series: [
     {
       type: "pie",
@@ -108,7 +108,7 @@ export const ageEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -156,14 +156,14 @@ export const ageEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
       //     barBorderRadius: [50, 50, 0, 0],
       //     color: function (params) {
       //       var colorList = [
-      //         "#C6A268",
+      //         "#dad0a7",
       //       ];
       //       return colorList[params.dataIndex];
       //     },
@@ -179,7 +179,7 @@ export const diseaseEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     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: "#dad0a7",
       },
     },
     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: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -349,7 +349,7 @@ export const systemEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -366,7 +366,7 @@ export const physiqueEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     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", "#dad0a7", "#906C4A", "#406E49", "#582518"],
   series: [
     {
       type: "pie",
@@ -479,7 +479,7 @@ export const agrypniaEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -527,7 +527,7 @@ export const agrypniaEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -544,7 +544,7 @@ export const anxietyEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     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: ["#dad0a7", "#D8D8D8"],
   series: [
     {
       type: "pie",
@@ -658,7 +658,7 @@ export const diseaseMethodEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -747,7 +747,7 @@ export const effectEcharts = {
     bottom: "0%",
     containLabel: true,
   },
-  color: ["#C6A268", "#906C4A", "#70483E", "#C7BDB1"],
+  color: ["#dad0a7", "#00A046", "#406E49", "#dad0a7"],
   series: [
     {
       type: "pie",
@@ -779,7 +779,7 @@ export const costEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -827,7 +827,7 @@ export const costEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#C6A268",
+      color: "#dad0a7",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]
@@ -844,7 +844,7 @@ export const followEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -895,7 +895,7 @@ export const lossFollowEcharts = {
     axisPointer: {
       type: "cross",
       label: {
-        backgroundColor: "#6a7985",
+        backgroundColor: "#dad0a7",
       },
     },
     formatter: function (params) {
@@ -968,7 +968,7 @@ export const lossFollowEcharts = {
       data: [],
       type: "bar",
       barMaxWidth: 24, //柱图宽度
-      color: "#70483E",
+      color: "#406E49",
       // itemStyle: {
       //   normal: {
       //     //这里设置柱形图圆角 [左上角，右上角，右下角，左下角]

acupuncture-后台/src/views/indexCom/patient.vue

@@ -41,10 +41,10 @@
               <div class="dis">
                 <div class="dian-box dis">
                   <div class="dian-box dis">
-                    <span class="dian" style="background: #70483e"></span>
+                    <span class="dian" style="background: #406e49"></span>
                     男
                   </div>
-                  <span class="dian" style="background: #c7bdb1"></span>
+                  <span class="dian" style="background: #dad0a7"></span>
                   女
                 </div>
               </div>
@@ -283,7 +283,7 @@ export default {
 <style scoped src="@/assets/styles/common.css"></style>
 <style scoped>
 .div-hz {
-  background: #c6a268;
+  background: #dad0a7;
   width: 80%;
   height: 70%;
   border-radius: 10px;
@@ -372,7 +372,7 @@ export default {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #4f8bff;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-后台/src/views/indexCom/query.vue

@@ -147,7 +147,10 @@ export default {
 </script>
 <style scoped src="@/assets/styles/common.css"></style>
 <style scoped>
-. >>> .el-radio--small.is-bordered {
+>>> .el-card {
+  margin-bottom: 0 !important;
+}
+>>> .el-radio--small.is-bordered {
   margin-right: 20px !important;
   margin-left: 0 !important;
 }
@@ -167,12 +170,13 @@ export default {
   align-items: center;
   font-size: 20px;
   font-weight: 600;
+  color: #406e49;
 }
 .title-bor {
   display: inline-block;
   height: 20px;
   width: 6px;
-  background: #4f8bff;
+  background: #406e49;
   margin-right: 10px;
   border-radius: 8px;
 }

acupuncture-后台/src/views/login.vue

@@ -8,7 +8,7 @@
         :rules="loginRules"
         class="login-form"
       >
-        <h3 class="title">
+        <h3 class="title11">
           登录到
           <br />
           体重管理数据云平台系统
@@ -243,11 +243,12 @@ export default {
   }
 }
 
-.title {
+.title11 {
   font-size: 26 px;
   margin: 0px auto 30px auto;
   text-align: left;
   color: #fff;
+  font-weight: bold;
   line-height: 28px;
 }
 

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 {

acupuncture-后台/src/views/screening/h5.vue

@@ -652,7 +652,7 @@ export default {
 .idcardupd >>> .el-upload {
   height: 44px;
   border: none;
-  background: #c6a268;
+  background: #dad0a7;
 }
 .hospital1 {
   text-align: center;
@@ -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;
@@ -705,7 +705,7 @@ export default {
   align-items: center;
 }
 .submit-box .submit-box-but {
-  background: #c6a268;
+  background: #dad0a7;
   width: 100%;
   font-size: 16px;
   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 {