diff --git a/.env.development b/.env.development
index 0a6098f..71611db 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
NODE_ENV=development
-VUE_APP_API_BASE_URL=http://rcproject.natapp1.cc/jeecg-boot
+VUE_APP_API_BASE_URL=http://192.168.31.195:8081/jeecg-boot
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/src/assets/img/analysisBG.jpg b/src/assets/img/analysisBG.jpg
new file mode 100644
index 0000000..df028e8
Binary files /dev/null and b/src/assets/img/analysisBG.jpg differ
diff --git a/src/assets/img/echarts4bg.png b/src/assets/img/echarts4bg.png
new file mode 100644
index 0000000..b4e1b8b
Binary files /dev/null and b/src/assets/img/echarts4bg.png differ
diff --git a/src/assets/img/echarts8bg.png b/src/assets/img/echarts8bg.png
new file mode 100644
index 0000000..6391edb
Binary files /dev/null and b/src/assets/img/echarts8bg.png differ
diff --git a/src/assets/img/数据9.png b/src/assets/img/数据9.png
new file mode 100644
index 0000000..450eeef
Binary files /dev/null and b/src/assets/img/数据9.png differ
diff --git a/src/assets/less/Suless.less b/src/assets/less/Suless.less
index 3bccb87..f53bd64 100644
--- a/src/assets/less/Suless.less
+++ b/src/assets/less/Suless.less
@@ -36,9 +36,12 @@ body{
.datanum{
font-family: 'MyCustomFont2', sans-serif;
}
+.analysisBG .num{
+ font-family: 'MyCustomFont1', sans-serif;
+}
.echartsTitle{
height: 36px;
- background: linear-gradient(90deg, rgb(9,62,81),rgb(8,43,62));
+ background: linear-gradient(90deg, rgb(9,62,81),rgb(9,62,81),rgb(8,43,62));
color: #ffffff;
font-size: 16px;
line-height: 34px;
diff --git a/src/components/menu/index.js b/src/components/menu/index.js
index 7881d58..7b617b5 100644
--- a/src/components/menu/index.js
+++ b/src/components/menu/index.js
@@ -61,8 +61,8 @@ export default {
// select menu item
onOpenChange (openKeys) {
console.log('openKeys',openKeys)
- if(openKeys.length == 1) this.latestOpenKey = openKeys
- if(openKeys.length == 2) this.latestOpenKey = [openKeys[1]]
+ if(openKeys.length == 1 || this.selectedKeys[0] == '/dashboard/analysis') this.latestOpenKey = openKeys
+ else if(openKeys.length == 2) this.latestOpenKey = [openKeys[1]]
// openKeys = this.latestOpenKey
console.log('latestOpenKey',this.latestOpenKey)
console.log('selectedKeys',this.selectedKeys)
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 1ae478d..11b528e 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -90,7 +90,7 @@ export default {
created() {
//--update-begin----author:scott---date:20190320------for:根据后台菜单配置,判断是否路由菜单字段,动态选择是否生成路由(为了支持参数URL菜单)------
//this.menus = this.mainRouters.find((item) => item.path === '/').children;
- var cc = this.permissionMenuList.shift()
+ // var cc = this.permissionMenuList.shift()
this.menus = this.permissionMenuList
console.log('顶部菜单',this.permissionMenuList)
// 根据后台配置菜单,重新排序加载路由信息
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 01204d7..6728515 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -1,51 +1,2376 @@
-
您好,欢迎使用末端数据接入处理系统
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
162
+
平台
+
474
+
总和
+
15
+
编队
+
36
+
反潜
+
59
+
航空兵
+
56
+
作战
+
18
+
舰炮
+
128
+
陆战队
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file