diff --git a/acupuncture-前台/.env.productions b/acupuncture-前台/.env.productions new file mode 100644 index 00000000..2303e6b7 --- /dev/null +++ b/acupuncture-前台/.env.productions @@ -0,0 +1,12 @@ +# 页面标题 +VUE_APP_TITLE = 朱琏针灸数据云系统 + +# 生产环境配置 +NODE_ENV = 'production' +# 因孚生产 +VUE_APP_BASE_API = 'https://nnzjpt.ylinno.com/acupuncture/api/' +VUE_APP_API_QZURL = 'https://nnzjpt.ylinno.com/acupuncture/api/' +# 筛查访问地址 +VUE_APP_H5_URL = 'https://nnzjpt.ylinno.com/acupuncture/clientssl/screening/h5' +# 访问路径 +VUE_APP_PUBLIC_PATH = '/acupuncture/clientssl/' diff --git a/acupuncture-前台/package.json b/acupuncture-前台/package.json index 604bfe17..40dde908 100644 --- a/acupuncture-前台/package.json +++ b/acupuncture-前台/package.json @@ -7,6 +7,7 @@ "scripts": { "dev": "vue-cli-service serve", "build:prod": "vue-cli-service build", + "build:prods": "vue-cli-service build --mode productions", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src" diff --git a/acupuncture-前台/src/layout/components/Sidebar/Logo.vue b/acupuncture-前台/src/layout/components/Sidebar/Logo.vue index 66279a31..87f1581e 100644 --- a/acupuncture-前台/src/layout/components/Sidebar/Logo.vue +++ b/acupuncture-前台/src/layout/components/Sidebar/Logo.vue @@ -52,8 +52,9 @@ export default { justify-content: center; align-items: center; img { - width: 40px; - height: 40px; + margin-top: -10px; + width: 48px; + height: 48px; } &.collapse { diff --git a/acupuncture-前台/src/views/indexCom/XGZL.vue b/acupuncture-前台/src/views/indexCom/XGZL.vue index 7c00173e..6aa78b55 100644 --- a/acupuncture-前台/src/views/indexCom/XGZL.vue +++ b/acupuncture-前台/src/views/indexCom/XGZL.vue @@ -13,7 +13,7 @@ 中西医结合 - 纯中医 + 单纯中医 @@ -196,7 +196,7 @@ export default { }, { value: zllxtj?.czy || 0, - name: "纯中医", + name: "单纯中医", }, ]; this.handleHealType(); diff --git a/acupuncture-前台/src/views/indexCom/index.js b/acupuncture-前台/src/views/indexCom/index.js index 23c8aa9f..c784e6a7 100644 --- a/acupuncture-前台/src/views/indexCom/index.js +++ b/acupuncture-前台/src/views/indexCom/index.js @@ -915,6 +915,31 @@ export const lossFollowEcharts = { xAxis: { type: "category", data: [], + axisLabel: { + formatter: function (value) { + var ret = ""; //拼接加\n返回的类目项 + var max = 10; //每行显示的文字字数 + var val = value.length; //X轴内容的文字字数 + var rowN = Math.ceil(val / max); //需要换的行数 + // 最后一行不加\n + // 根据最大字数限制进行换行处理 + if (rowN > 1) { + // 如果需要换行 + for (var i = 0; i < rowN; i++) { + // 遍历每行 + var temp = value.substring(i * max, (i + 1) * max); // 截取当前行内容 + ret += temp; // 添加到结果字符串 + if (i < rowN - 1) { + // 如果不是最后一行 + ret += "\n"; // 添加换行符 + } + } + return ret; + } else { + return value; // 不需要换行时直接返回原值 + } + }, + }, }, grid: { top: "12%", diff --git a/acupuncture-前台/src/views/medicalFile/components/anxiety/HAMD.vue b/acupuncture-前台/src/views/medicalFile/components/anxiety/HAMD.vue index 7572aab8..43cdf833 100644 --- a/acupuncture-前台/src/views/medicalFile/components/anxiety/HAMD.vue +++ b/acupuncture-前台/src/views/medicalFile/components/anxiety/HAMD.vue @@ -247,14 +247,24 @@ export default { }, { index: 19, - question: "日夜变化", + question: "日夜变化(早)", criteria: [ { label: "无", value: 0 }, - { label: "有日夜变化", value: 1 }, + { label: "轻度", value: 1 }, + { label: "中度", value: 2 }, ], }, { index: 20, + question: "日夜变化(晚)", + criteria: [ + { label: "无", value: 0 }, + { label: "轻度", value: 1 }, + { label: "中度", value: 2 }, + ], + }, + { + index: 21, question: "人格解体", criteria: [ { label: "无", value: 0 }, @@ -265,7 +275,7 @@ export default { ], }, { - index: 21, + index: 22, question: "偏执症状", criteria: [ { label: "无", value: 0 }, @@ -276,7 +286,7 @@ export default { ], }, { - index: 22, + index: 23, question: "强迫症状", criteria: [ { label: "无", value: 0 }, @@ -287,7 +297,7 @@ export default { ], }, { - index: 23, + index: 24, question: "躯体化症状", criteria: [ { label: "无", value: 0 }, @@ -298,7 +308,7 @@ export default { ], }, { - index: 24, + index: 25, question: "社交退缩", criteria: [ { label: "无", value: 0 }, diff --git a/acupuncture-前台/src/views/medicalFile/components/posture/TRACE.vue b/acupuncture-前台/src/views/medicalFile/components/posture/TRACE.vue index 435ae930..18ce3b15 100644 --- a/acupuncture-前台/src/views/medicalFile/components/posture/TRACE.vue +++ b/acupuncture-前台/src/views/medicalFile/components/posture/TRACE.vue @@ -49,6 +49,7 @@ export default { index: 1, question: "肩部-肩膀的不对称性", criteria: [ + { label: "无差异", value: 0 }, { label: "轻微差异", value: 1 }, { label: "有差异", value: 2 }, { label: "差异性很大", value: 3 }, @@ -58,6 +59,7 @@ export default { index: 2, question: "肩胛骨-肩胛骨的对称性", criteria: [ + { label: "无差异", value: 0 }, { label: "轻微差异", value: 1 }, { label: "差异较大", value: 2 }, ], @@ -66,6 +68,7 @@ export default { index: 3, question: "腰部-腰部的对称性", criteria: [ + { label: "无差异", value: 0 }, { label: "轻微差异", value: 1 }, { label: "有差异", value: 2 }, { label: "差异性很大", value: 3 }, @@ -76,6 +79,7 @@ export default { index: 4, question: "半胸-上半身不对称的状况", criteria: [ + { label: "无差异", value: 0 }, { label: "轻微差异", value: 1 }, { label: "差异较大", value: 2 }, ], diff --git a/acupuncture-前台/src/views/medicalFile/details.vue b/acupuncture-前台/src/views/medicalFile/details.vue index a893cedd..3d4f4401 100644 --- a/acupuncture-前台/src/views/medicalFile/details.vue +++ b/acupuncture-前台/src/views/medicalFile/details.vue @@ -393,7 +393,7 @@
- - + + v-model="form.educationYears" + placeholder="请选择" + filterable + > + + + - - + + diff --git a/acupuncture-后台/针灸-后台1.zip b/acupuncture-后台/针灸后台6.zip similarity index 93% rename from acupuncture-后台/针灸-后台1.zip rename to acupuncture-后台/针灸后台6.zip index a03eb887..6e702b6b 100644 Binary files a/acupuncture-后台/针灸-后台1.zip and b/acupuncture-后台/针灸后台6.zip differ diff --git a/acupuncture-后台/针灸后台http-1.zip b/acupuncture-后台/针灸后台http-1.zip new file mode 100644 index 00000000..3521e1c6 Binary files /dev/null and b/acupuncture-后台/针灸后台http-1.zip differ diff --git a/acupuncture-前台/针灸-前台6.zip b/acupuncture-后台/针灸后台http-2.zip similarity index 71% rename from acupuncture-前台/针灸-前台6.zip rename to acupuncture-后台/针灸后台http-2.zip index 3b16fbce..d0d6a3fa 100644 Binary files a/acupuncture-前台/针灸-前台6.zip and b/acupuncture-后台/针灸后台http-2.zip differ diff --git a/acupuncture-后台/dist.zip b/acupuncture-后台/针灸后台ssl-1.zip similarity index 56% rename from acupuncture-后台/dist.zip rename to acupuncture-后台/针灸后台ssl-1.zip index 215ddd7c..28eb57a4 100644 Binary files a/acupuncture-后台/dist.zip and b/acupuncture-后台/针灸后台ssl-1.zip differ