总步数:285
健康建议
+ +若要健,天天练,运动是健康的源泉
+From 9310d6b89b9d4229d562ec2e70566551b52a9094 Mon Sep 17 00:00:00 2001 From: chenJinxu <2183691628@qq.com> Date: Mon, 25 Dec 2023 09:25:18 +0800 Subject: [PATCH] =?UTF-8?q?`2023=E5=B9=B412=E6=9C=8825=E6=97=A5`=20UPDATE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 测试环境部署文件 - 增加 洞悉 月报详情页面 --- .env.development | 4 - .env.production | 4 - .env.test | 4 - README.md | 5 + package.json | 2 +- setup_test.sh | 2 +- src/config/appId.js | 2 +- src/config/env.development.js | 3 +- src/config/env.production.js | 3 +- src/config/{env.test.js => env.testing.js} | 3 +- src/config/models.js | 2 +- src/main.js | 3 - src/router/router.config.js | 6 + src/views/insight/index.vue | 6 +- src/views/insight/monthReport.vue | 1258 ++++++++++++++++++++ src/views/today/emotionDetails.vue | 2 +- src/views/today/report.vue | 2 +- vue.config.js | 63 +- 18 files changed, 1287 insertions(+), 87 deletions(-) delete mode 100644 .env.development delete mode 100644 .env.production delete mode 100644 .env.test rename src/config/{env.test.js => env.testing.js} (76%) create mode 100644 src/views/insight/monthReport.vue diff --git a/.env.development b/.env.development deleted file mode 100644 index 9e26dad..0000000 --- a/.env.development +++ /dev/null @@ -1,4 +0,0 @@ -NODE_ENV='development' -# must start with VUE_APP_ -VUE_APP_ENV = 'development' - diff --git a/.env.production b/.env.production deleted file mode 100644 index 4b2d764..0000000 --- a/.env.production +++ /dev/null @@ -1,4 +0,0 @@ -NODE_ENV='production' -# must start with VUE_APP_ -VUE_APP_ENV = 'production' - \ No newline at end of file diff --git a/.env.test b/.env.test deleted file mode 100644 index e60a797..0000000 --- a/.env.test +++ /dev/null @@ -1,4 +0,0 @@ -NODE_ENV='test' -# must start with VUE_APP_ -VUE_APP_ENV = 'test' - diff --git a/README.md b/README.md index 8b9a234..44ef6cb 100644 --- a/README.md +++ b/README.md @@ -56,3 +56,8 @@ npm run lint `2023年12月21日` FETURE - 增加 情绪,情绪周报和体征详情页面 + +`2023年12月25日` UPDATE + +- 修改 测试环境部署文件 +- 增加 洞悉 月报详情页面 diff --git a/package.json b/package.json index 22dd2b3..0d960ee 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build", - "build-test": "vue-cli-service build --mode test", + "build-test": "vue-cli-service build --mode testing", "lint": "vue-cli-service lint", "deps": "yarn upgrade-interactive --latest", "dev": "vue-cli-service serve --mode development", diff --git a/setup_test.sh b/setup_test.sh index a84dd71..16a3d67 100644 --- a/setup_test.sh +++ b/setup_test.sh @@ -10,7 +10,7 @@ npm -v npm config set registry https://registry.npm.taobao.org npm install -npm run build +npm run build-test image_version=$version; # 删除镜像 docker rmi -f $( diff --git a/src/config/appId.js b/src/config/appId.js index d493db1..3543f08 100644 --- a/src/config/appId.js +++ b/src/config/appId.js @@ -1,3 +1,3 @@ // 微信公众号AppId -const AppId = process.env.NODE_ENV === 'test' ? 'wx23f697736154110b' : 'wx5e26f0813859e5f6'; +const AppId = process.env.NODE_ENV === 'production' ? 'wx23f697736154110b' : 'wx5e26f0813859e5f6'; export default AppId; diff --git a/src/config/env.development.js b/src/config/env.development.js index cff186b..659756d 100644 --- a/src/config/env.development.js +++ b/src/config/env.development.js @@ -4,6 +4,5 @@ module.exports = { baseUrl: 'https://id.ssjlai.com/webapi', // 项目地址 baseApi: 'https://id.ssjlai.com/webapi', // 本地api请求地址,注意:如果你使用了代理,请设置成'/' APPID: 'xxx', - APPSECRET: 'xxx', - $cdn: 'https://www.sunniejs.cn/static' + APPSECRET: 'xxx' }; diff --git a/src/config/env.production.js b/src/config/env.production.js index dcda6da..c79fba3 100644 --- a/src/config/env.production.js +++ b/src/config/env.production.js @@ -4,6 +4,5 @@ module.exports = { baseUrl: 'https://id.ssjlai.com/webapi', // 正式项目地址 baseApi: 'https://id.ssjlai.com/webapi', // 正式api请求地址 APPID: 'xxx', - APPSECRET: 'xxx', - $cdn: 'https://www.sunniejs.cn/static' + APPSECRET: 'xxx' }; diff --git a/src/config/env.test.js b/src/config/env.testing.js similarity index 76% rename from src/config/env.test.js rename to src/config/env.testing.js index ab8dbcd..7e310d9 100644 --- a/src/config/env.test.js +++ b/src/config/env.testing.js @@ -3,6 +3,5 @@ module.exports = { baseUrl: 'https://id.ssjlai.com/webapi', // 测试项目地址 baseApi: 'https://id.ssjlai.com/webapi', // 测试api请求地址 APPID: 'xxx', - APPSECRET: 'xxx', - $cdn: 'https://www.sunniejs.cn/static' + APPSECRET: 'xxx' }; diff --git a/src/config/models.js b/src/config/models.js index 792bf1f..7daa88b 100644 --- a/src/config/models.js +++ b/src/config/models.js @@ -128,4 +128,4 @@ export const EmotionModel = { //心理健康相关接口地址 export const PsyBaseUrl = - process.env.NODE_ENV === 'test' ? 'https://dbmq.rzliot.com/auth_heart' : 'https://dbmq.rzliot.com/heart'; + process.env.NODE_ENV === 'production' ? 'https://dbmq.rzliot.com/auth_heart' : 'https://dbmq.rzliot.com/heart'; diff --git a/src/main.js b/src/main.js index 17b3398..4dceb70 100644 --- a/src/main.js +++ b/src/main.js @@ -8,9 +8,6 @@ import App from './App.vue'; import router from './router'; import store from './store/index'; import request from './config/request'; -// 设置 js中可以访问 $cdn -import { $cdn } from '@/config'; -Vue.prototype.$cdn = $cdn; import dayjs from 'dayjs'; import own from '@/common/own.js'; // 引入echarts diff --git a/src/router/router.config.js b/src/router/router.config.js index bf0b071..51070f5 100644 --- a/src/router/router.config.js +++ b/src/router/router.config.js @@ -278,6 +278,12 @@ export const constantRouterMap = [ component: () => import('@/views/today/report'), meta: { title: '心理监测周报', keepAlive: false } }, + { + path: '/monthReport', + name: 'monthReport', + component: () => import('@/views/insight/monthReport'), + meta: { title: '心理监测月报', keepAlive: false } + }, { path: '/experts', name: 'experts', diff --git a/src/views/insight/index.vue b/src/views/insight/index.vue index d03eb89..6d16e27 100644 --- a/src/views/insight/index.vue +++ b/src/views/insight/index.vue @@ -17,7 +17,7 @@
{{ pieTitle }}数据图
+总步数:285
平均步数:285
健康建议
+ +若要健,天天练,运动是健康的源泉
+总消耗:285
平均消耗:285