diff --git a/.env.Staging b/.env.Staging
deleted file mode 100644
index b9b3971..0000000
--- a/.env.Staging
+++ /dev/null
@@ -1,6 +0,0 @@
-NODE_ENV = Staging
-VITE_NAME='Staging'
-VITE_BASE_URL='https://106.52.199.114:8000'
-VITE_FiLE_SYS='https://106.52.199.114:8000'
-VITE_HOME_URL='https://106.52.199.114:8000'
-VITE_CLIENT_ID='55DFB4F6-9FF1-4E26-8766-C9F1B1E2A912'
\ No newline at end of file
diff --git a/.env.development b/.env.development
index 5f20a02..3ce3ee9 100644
--- a/.env.development
+++ b/.env.development
@@ -1,9 +1,13 @@
NODE_ENV = development
VITE_NAME='开发环境'
-VITE_BASE_URL='http://localhost:19903'
-VITE_BASE_URL_SYSTEM='http://localhost:19901'
-VITE_HOME_URL='http://localhost:3000'
-VITE_CLIENT_ID="66DFB4F6-9FF1-4E26-8766-C9F1B1E2A984"
-VITE_FiLE_SYS='http://localhost:19901'
-VITE_FiLE_IMG='http://localhost:19903'
-VITE_FiLE='http://localhost:19903'
\ No newline at end of file
+
+# 系统管理服务API
+VITE_API_URL_SYS='http://localhost:19901'
+# 健康辅助监测服务API
+VITE_API_URL_JKFZJC='http://localhost:19903'
+# 整个系统入口首页
+VITE_HOME_URL='http://localhost:8000'
+# 授权服务地址
+VITE_AUTH_URL=''
+# 授权ID
+VITE_CLIENT_ID="66DFB4F6-9FF1-4E26-8766-C9F1B1E2A984"
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 87d6042..3a36540 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,13 @@
NODE_ENV = production
VITE_NAME='生产环境'
-VITE_BASE_URL=''
+
+# 系统管理服务API
+VITE_API_URL_SYS=''
+# 健康辅助监测服务API
+VITE_API_URL_JKFZJC=''
+# 整个系统入口首页
VITE_HOME_URL=''
+# 授权服务地址
+VITE_AUTH_URL=''
+# 授权ID
VITE_CLIENT_ID="66DFB4F6-9FF1-4E26-8766-C9F1B1E2A984"
\ No newline at end of file
diff --git a/.env.test b/.env.test
index 5cd533b..2bcb1b1 100644
--- a/.env.test
+++ b/.env.test
@@ -1,10 +1,13 @@
NODE_ENV = test
VITE_NAME='测试环境'
-VITE_BASE_URL=''
-VITE_BASE_URL2='https://192.168.1.100:8000'
+
+# 系统管理服务API
+VITE_API_URL_SYS='http://192.168.1.100:8000'
+# 健康辅助监测服务API
+VITE_API_URL_JKFZJC='https://192.168.1.100:8002'
+# 整个系统入口首页
VITE_HOME_URL='https://192.168.1.100:8000'
-VITE_BASE_URL_SYSTEM='http://192.168.1.100:8001'
-VITE_CLIENT_ID="66DFB4F6-9FF1-4E26-8766-C9F1B1E2A984"
-VITE_FiLE='https://192.168.1.100:19902'
-VITE_FiLE_SYS='https://192.168.1.100:19901'
-VITE_FiLE_IMG='https://192.168.1.100:19903'
\ No newline at end of file
+# 授权服务地址
+VITE_AUTH_URL='https://192.168.1.100:8000'
+# 授权ID
+VITE_CLIENT_ID="66DFB4F6-9FF1-4E26-8766-C9F1B1E2A984"
\ No newline at end of file
diff --git a/src/style.css b/src/style.css
deleted file mode 100644
index c85c552..0000000
--- a/src/style.css
+++ /dev/null
@@ -1,316 +0,0 @@
-* {
- padding: 0px;
- margin: 0px;
-}
-ul,
-li {
- list-style-type: none;
- padding:0;
- margin:0;
-}
-
-a {
- color: #333;
- text-decoration: none;
-}
-body {
- font-size: 14px;
- background-color: #11145C;
- color: #fff;
-}
-body,html{
- width:100%;
- height:100%;
-}
-#module {
- height:100%;
-}
-#app {
- height:100%;
-}
-/*登录*/
-.login {
- background: url(./assets/img/bg.jpg) no-repeat;
- width: 100%;
- height: 100vh;
- background-size: cover;
- perspective: 800px;
-}
-.login-content {
-display: flex;
-align-items:center;
-justify-content: center;
-position: relative;
-left: 0;
-top: 50%;
-transform: translate(0,-50%);
-background: rgba(255,255,255,.3);
-padding: 40px;
-}
-.login-box {
-width: 250px;
-height: 200px;
-margin: 0 10px;
-box-shadow: 0 3px 20px 2px rgba(0, 0, 0, .3);
-display:flex;
-flex-direction: column;
-align-items: center;
-justify-content: center;
-color: #fff;
-}
-.login-box i{
-font-size: 40px;
-}
-
-.login-form {
- width: 45vh;
- padding: 20px;
- box-shadow: 0 3px 20px 2px rgba(0, 0, 0, .3);
- /* position: relative;
- left: 50%;
- top: 50%;
- transform: translate(-50%,-50%); */
- text-align: center;
-}
-.login-form .el-form-item__content {
-display: flex;
-flex-wrap: wrap;
-align-items: center;
-flex: 1;
-line-height: 32px;
-position: relative;
-font-size: var(--font-size);
-min-width: 0;
-justify-content: center;
-}
-.login-form .el-form-item__content .el-button {
-margin-left: -70px;
-}
-.login-form .login-title,
-.login-form .el-form-item__label {
-color: #fff;
-}
-
-.login .login-title {
- font-size: 25px;
- margin: 20px 0;
-}
-.login .login-button {
- margin-left: -70px;
- width: 100px;
-}
-.exit {
- float: right;
- margin:10px;
- padding: 2px 10px;
- background: #233444;
- border: none;
- color: #fff;
-}
-/* 首页 */
-#module .el-container {
- height:100%;
-}
-#module .el-container .el-menu-item ,
-#module .el-container .el-sub-menu .el-sub-menu__title{
- color:#f9f9f9;
-}
-#module .el-container .el-menu-item:hover ,
-#module .el-container .el-sub-menu .el-sub-menu__title:hover{
- color:#fff;
- background:#30377d;
-}
-#module .el-menu-item.is-active,
-#module .el-sub-menu.is-active {
- color: #fff;
- background:#30377d;
-}
-
-#module .el-container .el-sub-menu.is-active.is-opened,
-#module .el-container .el-sub-menu.is-active.is-opened .el-sub-menu__title {
- color: #f9f9f9;
- background:#20266d;
-}
-#module .el-container .el-header {
- /* border-bottom: 1px solid #f1f1f1; */
- background: #20266d;
-}
-#module .el-container .el-header .exit{
- margin-top:10px;
-}
-#module .aside {
- background: #20266d;
- }
-#module .aside .el-menu {
- border-right: solid 1px #20266d;
- background: #20266d;
- }
-#module .el-submenu__title {
- color:#f9f9f9;
- }
-
-/* 面包屑 */
-#module .breadcrumb {
- padding:20px;
- display: inline-block;
-}
-#module .breadcrumb ul li {
- display: inline-block;
-}
-#module .breadcrumb ul li span{
- padding: 0 5px;
-}
-#module .el-carousel__item img {
- color: #fff;
- font-size: 14px;
- opacity: 0.75;
- line-height: 200px;
- margin: 0;
- max-width:100%;
-}
-#module .breadcrumb .el-breadcrumb__item .el-breadcrumb__inner ,
-#module .breadcrumb .el-breadcrumb__item .el-breadcrumb__inner a {
- color: #fff;
-}
-
-#module .el-carousel__item:nth-child(2n) {
- background-color: #99a9bf;
-}
-
-#module .el-carousel__item:nth-child(2n+1) {
- background-color: #d3dce6;
-}
-
-/* 首页主体部分 */
-#module .index-content {
- display: flex;
- width:100%;
-}
-#module .index-content .content-left {
- flex:30%;
-}
-#module .index-content .content-right {
- flex:70%;
-}
-#module .index-content .content {
- margin: 10px;
- background: #fff;
-}
-
-
-#module .el-main .el-card {
-border:none;
-background: #20266d;
-}
-
-#module .el-main .el-card .el-card__body {
-color: #fff;
-}
-@media screen and (max-width: 1024px) {
- .index-title li {
- width: 18%;
- }
-}
-.index-title li:nth-child(1) {
- background: #fe8688;
-}
-.index-title li:nth-child(2) {
- background: #feba35;
-}
-.index-title li:nth-child(3) {
- background: #1bc6bd;
-}
-.index-title li:nth-child(4) {
- background: #ba99ff;
-}
-
-
-
-.banner {
- position: relative;
- float:left;
-}
-.banner .banner-circle {
- position: absolute;
- bottom: 5px;
- left: 0;
- right: 0;
- color: #fff;
-}
-.banner .banner-circle li{
- display:inline-block;
- background: rgba(0,0,0,.3);
- border-radius: 50%;
- padding:5px;
- margin:2px;
-}
-.banner .banner-circle ul {
- text-align: center;
-}
-.banner .banner-circle .selected {
- background: rgba(0,0,0,.8);
-}
-.banner img {
- max-width: 100%;
- margin: 0;
- padding: 0;
-}
-
-.table{
- width: 100%;
- border-collapse: collapse;
- margin: 20px 10px;
- text-align: center;
-}
-.table tbody {
-background:#fff;
-}
-.table td,
-.table th{
- border: 1px solid #1890ff;
- padding: 10px;
-}
-.table thead tr {
-background:#1f76b3;
-color:#fff;
-}
-
-.module-box {
- display:flex; /*弹性布局*/
- justify-content: space-between;
-}
-
-.list-box{
- margin: 0 10px;
- padding: 20px;
- box-shadow: 0 3px 20px 2px rgb(0 0 0 / 30%);
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- color: #fff;
-}
-.list-box i {
- font-size: 40px;
-}
-.box:nth-child(1) .list-box {
- background-image:linear-gradient(#2277ce,#0356ab);
-}
-.box:nth-child(2) .list-box {
- background-image:linear-gradient(#ba5bd8,#9f3fbd);
-}
-.box:nth-child(3) .list-box{
- background-image:linear-gradient(#ea8052,#cf673a);
-}
-.box:nth-child(4) .list-box {
- background-image:linear-gradient(#84f395,#71c24a);
-}
-.box:nth-child(5) .list-box {
- background-image:linear-gradient(#A44A38,#902569);
-}
-.marginBottom {
- margin-bottom: 10px;
-}
-.pagination{
- margin: 10px 0;
-}
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 4812e34..c29a52f 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,7 +3,7 @@ import { showMessage } from '@/common/message'
import { ElMessageBox } from 'element-plus';
-const baseURL = import.meta.env.MODE === 'development' ? '' : import.meta.env.VITE_BASE_URL;
+const baseURL = import.meta.env.MODE === 'development' ? '' : import.meta.env.VITE_API_URL_JKFZJC;
const service = axios.create({
baseURL: baseURL,
diff --git a/src/utils/requestSystem.js b/src/utils/requestSystem.js
index 121cc79..dea912f 100644
--- a/src/utils/requestSystem.js
+++ b/src/utils/requestSystem.js
@@ -2,7 +2,7 @@ import axios from "axios";
import { showMessage } from '@/common/message'
import { ElMessageBox } from 'element-plus';
-const baseURL = import.meta.env.MODE === 'development' ? '' : import.meta.env.VITE_BASE_URL;
+const baseURL = import.meta.env.MODE === 'development' ? '' : import.meta.env.VITE_API_URL_JKFZJC;
const service = axios.create({
baseURL: baseURL,
diff --git a/src/views/healthWarning/index.vue b/src/views/healthWarning/index.vue
index 292e2a9..62592c9 100644
--- a/src/views/healthWarning/index.vue
+++ b/src/views/healthWarning/index.vue
@@ -151,11 +151,11 @@
{{ scope.row.A7
- }}
+ }}
{{ scope.row.A7
- }}
+ }}
{{ scope.row.A7
- }}
+ }}
@@ -192,8 +192,18 @@ watch(activeTimeRange, (newVal) => {
import * as echarts from 'echarts'
-const chart2Ref = ref(null)
+const chart1Ref = ref(null)
+const renderChart1 = () => {
+ const chart1 = echarts.init(chart1Ref.value)
+ const option = {
+
+ };
+ chart1.setOption(option)
+}
+
+
+const chart2Ref = ref(null)
const renderChart2 = () => {
const chart2 = echarts.init(chart2Ref.value)
const option = {
@@ -228,7 +238,7 @@ const renderChart2 = () => {
},
label: {
show: true,
- formatter: function (value) {
+ formatter: function (value) {
return value + '岁';
}
}
@@ -286,6 +296,10 @@ const renderChart2 = () => {
chart2.setOption(option)
}
+
+
+
+
const projectList = ref([])
const sectionList = ref([])
const projectState = ref('')
@@ -320,6 +334,7 @@ const onExport = () => { }
onMounted(() => {
+ renderChart1()
renderChart2()
})
\ No newline at end of file
diff --git a/vite.config.js b/vite.config.js
index 1429992..db97b6c 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -34,7 +34,7 @@ export default defineConfig(({ mode }) => {
proxy: {
// 系统管理服务19901
'/api/sys': {
- target: env.VITE_BASE_URL_SYSTEM,
+ target: env.VITE_API_URL_SYS,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api\/sys/, '/api'),
secure: false,
@@ -46,7 +46,7 @@ export default defineConfig(({ mode }) => {
}
},
'/auth': {
- target: env.VITE_BASE_URL_SYSTEM,
+ target: env.VITE_AUTH_URL,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/auth/, ''),
secure: false,
@@ -59,7 +59,7 @@ export default defineConfig(({ mode }) => {
},
// 业务系统服务19903
'/api/lmg': {
- target: env.VITE_BASE_URL,
+ target: env.VITE_API_URL_JKFZJC,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api\/lmg/, '/api'),
secure: false,
@@ -70,8 +70,9 @@ export default defineConfig(({ mode }) => {
console.log(' Request Headers:', req.headers);
}
},
+ //
'/api/jkfzjc': {
- target: env.VITE_BASE_URL,
+ target: env.VITE_API_URL_JKFZJC,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api\/lmg/, '/api'),
secure: false,