Merge branch 'feature/2082-front-chart-sponsor' into develop

backendEle/src/utils/config_trial.js

@@ -0,0 +1,33 @@
+const APP_NAME = 'Settlement system background'
+const SERVER_API_DOMAIN = '16.163.228.151'
+const SERVER_API_HTTP_TYPE = 'http://'
+const SERVER_API_PORT = ':8032'  // ':8102'
+const SERVER_API_VERSION = 'v1'
+const REQUEST_URL = `${SERVER_API_HTTP_TYPE}${SERVER_API_DOMAIN}${SERVER_API_PORT}/${SERVER_API_VERSION}/`
+const WEBSOCKET_HOST = 'ws://127.0.0.1:9513'
+const BONUS_WEBSOCKET_HOST = 'ws://127.0.0.1:9513'
+const DEVICE_TYPE = 'pc'
+const ACCESS_TOKEN_PREFIX = 'Bearer '
+const CDN_BASE_URL = 'http://16.163.228.151:8036'
+const CDN_IMG_URL = `${CDN_BASE_URL}/cdn/`
+const PRICE_IS_ROUND = true
+const FRONTEND_SERVER = 'http://16.163.228.151:8035'
+const REGION_URL = `${CDN_BASE_URL}/cdn/jsdata/ar_region_data.js?ver=0.1`
+
+export {
+  APP_NAME,
+  SERVER_API_DOMAIN,
+  SERVER_API_HTTP_TYPE,
+  SERVER_API_PORT,
+  SERVER_API_VERSION,
+  REQUEST_URL,
+  WEBSOCKET_HOST,
+  BONUS_WEBSOCKET_HOST,
+  DEVICE_TYPE,
+  ACCESS_TOKEN_PREFIX,
+  CDN_BASE_URL,
+  CDN_IMG_URL,
+  PRICE_IS_ROUND,
+  FRONTEND_SERVER,
+  REGION_URL
+}

frontendEle/src/utils/config_trial.js

@@ -1,13 +1,13 @@
 const APP_NAME = '奖金结算系统'
 const SERVER_API_DOMAIN = '16.163.228.151'
 const SERVER_API_HTTP_TYPE = 'http://'
-const SERVER_API_PORT = ':8026'  // ':8102'
+const SERVER_API_PORT = ':8033' // ':8102'
 const SERVER_API_VERSION = 'v1'
 const REQUEST_URL = `${SERVER_API_HTTP_TYPE}${SERVER_API_DOMAIN}${SERVER_API_PORT}/${SERVER_API_VERSION}/`
 const WEBSOCKET_HOST = 'ws://127.0.0.1:9512'
 const DEVICE_TYPE = 'pc'
 const ACCESS_TOKEN_PREFIX = 'Bearer '
-const CDN_BASE_URL = 'http://16.163.228.151:8029'
+const CDN_BASE_URL = 'http://16.163.228.151:8036'
 const CDN_IMG_URL = `${CDN_BASE_URL}/cdn/`
 const PRICE_IS_ROUND = true
 const REGION_URL = `${CDN_BASE_URL}/cdn/jsdata/ar_region_data.js?ver=0.1`

frontendEle/src/views/atlas/network.vue

@@ -195,7 +195,7 @@ export default {
   .filter-user .el-input-group{float: left;margin-right: 15px;}
   .filter-user >>> .el-input__inner{border: 1px solid #DCDFE6;width: 100%;background: none;border-radius: 0;float: right;display: block; }
   .filter-user >>> .el-input-group__prepend{border-top: 1px solid #DCDFE6;border-left: 1px solid #DCDFE6;border-bottom: 1px solid #DCDFE6;border-right:none;}
-  .el-tree {
+  /deep/ .el-tree {
       padding-bottom: 20px;
       font-size: 14px;
       overflow-x: auto;
@@ -205,19 +205,19 @@ export default {
       height: 20px;
       line-height: 18px;vertical-align: middle;
   }
-  .el-tree-node{position: relative;}
+  /deep/ .el-tree-node{position: relative;}
 
-  .el-tree-node__content {
+  /deep/ .el-tree-node__content {
       height: 30px;
       line-height: 30px;
   }
 
-  .el-tree-node__children {
+  /deep/ .el-tree-node__children {
       position: relative;
       padding: 0 0 0 16px;
   }
 
-  .el-tree-node:before {
+  /deep/ .el-tree-node:before {
       position: absolute;
       content: '';
       top: 0px;
@@ -225,7 +225,7 @@ export default {
       height: 100%;
       border-left: 1px solid #ccc;
   }
-  .el-tree-node:last-child:before{height: 15px;}
+  /deep/ .el-tree-node:last-child:before{height: 15px;}
 
   .custom-tree-node {
       position: relative;
@@ -236,7 +236,7 @@ export default {
       display: none;
   }
 
-  .custom-tree-node:before {
+  /deep/ .custom-tree-node:before {
       position: absolute;
       width: 8px;
       content: '';
@@ -245,7 +245,7 @@ export default {
       border-bottom: 1px solid #ccc;
   }
 
-  .el-tree-node__expand-icon {
+  /deep/ .el-tree-node__expand-icon {
       display: none !important;
   }
 </style>

frontendEle/src/views/atlas/relation.vue

@@ -19,10 +19,10 @@
           <span :class="'el-icon-loading '+ data.displayNone"></span>
           <span :class="data.icon"></span>
           <span>
-            <el-tag type="danger">Number of Layers: {{countTopDeep(data.TOP_NETWORK_DEEP,topDeep)}}</el-tag>
+<!--            <el-tag type="danger">Number of Layers: {{countTopDeep(data.TOP_NETWORK_DEEP,topDeep)}}</el-tag>-->
             <el-tag>Member Code: {{ node.label }}</el-tag>
             <el-tag>Name: {{data.REAL_NAME}}</el-tag>
-            <el-tag type="danger">Location: {{data.RELATIVE_LOCATION}}</el-tag>
+<!--            <el-tag type="danger">Location: {{data.RELATIVE_LOCATION}}</el-tag>-->
             <el-tag type="success">Level: {{data.DEC_LV_NAME}}</el-tag>
             <el-tag type="warning">Rank: {{data.EMP_LV_NAME}}, {{data.CROWN_LV_NAME}}</el-tag>
 <!--            <el-tag type="warning">Star: {{data.CROWN_LV_NAME}}</el-tag>-->
@@ -195,7 +195,7 @@ export default {
   .filter-user .el-input-group{float: left;margin-right: 15px;}
   .filter-user >>> .el-input__inner{border: 1px solid #DCDFE6;width: 100%;background: none;border-radius: 0;float: right;display: block; }
   .filter-user >>> .el-input-group__prepend{border-top: 1px solid #DCDFE6;border-left: 1px solid #DCDFE6;border-bottom: 1px solid #DCDFE6;border-right:none;}
-  .el-tree {
+  /deep/ .el-tree {
       padding-bottom: 20px;
       font-size: 14px;
       overflow-x: auto;
@@ -205,19 +205,19 @@ export default {
       height: 20px;
       line-height: 18px;vertical-align: middle;
   }
-  .el-tree-node{position: relative;}
+  /deep/ .el-tree-node{position: relative;}
 
-  .el-tree-node__content {
+  /deep/ .el-tree-node__content {
       height: 30px;
       line-height: 30px;
   }
 
-  .el-tree-node__children {
+  /deep/ .el-tree-node__children {
       position: relative;
       padding: 0 0 0 16px;
   }
 
-  .el-tree-node:before {
+  /deep/ .el-tree-node:before {
       position: absolute;
       content: '';
       top: 0px;
@@ -225,7 +225,7 @@ export default {
       height: 100%;
       border-left: 1px solid #ccc;
   }
-  .el-tree-node:last-child:before{height: 15px;}
+  /deep/ .el-tree-node:last-child:before{height: 15px;}
 
   .custom-tree-node {
       position: relative;
@@ -236,7 +236,7 @@ export default {
       display: none;
   }
 
-  .custom-tree-node:before {
+  /deep/ .custom-tree-node:before {
       position: absolute;
       width: 8px;
       content: '';
@@ -245,7 +245,7 @@ export default {
       border-bottom: 1px solid #ccc;
   }
 
-  .el-tree-node__expand-icon {
+  /deep/ .el-tree-node__expand-icon {
       display: none !important;
   }
 </style>

frontendEle/src/views/layout/layout.vue

@@ -94,7 +94,7 @@ import websocketHelper from '@/utils/websocketHelper';
 import userInfo from '@/utils/userInfo'
 import network from '@/utils/network'
 import tool from '@/utils/tool'
-import Waves from '@/static/plugins/waves/waves.js'
+import Waves from '../../static/plugins/waves/waves.js'
 import store from '@/utils/vuexStore'
 import baseInfo from '@/utils/baseInfo'
 import initRegion from '@/utils/region'