开拓和安置网络增加星级等

backendApi/config/menu.php

@@ -145,11 +145,11 @@ return [
         'routePath'=>'atlas',
         'show'=>1,
         'child'=>[
-            ['name'=>'Expand network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-opt', 'routePath'=>'atlas/relation-opt', 'show'=>1,],//开拓网络
+            ['name'=>'Sponor network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-opt', 'routePath'=>'atlas/relation-opt', 'show'=>1,],//开拓网络
             ['name'=>'开拓网络图', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation', 'routePath'=>'atlas/relation', 'show'=>0,],
             ['name'=>'开拓网络列表', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-list', 'routePath'=>'atlas/relation-list', 'show'=>0,],
             ['name'=>'开拓网络列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-list-export', 'routePath'=>'atlas/relation-list-export', 'show'=>0,],
-            ['name'=>'Resettlement network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-opt', 'routePath'=>'atlas/network-opt', 'show'=>1,],//安置网络
+            ['name'=>'Placement network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-opt', 'routePath'=>'atlas/network-opt', 'show'=>1,],//安置网络
             ['name'=>'安置网络图', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network', 'routePath'=>'atlas/network', 'show'=>0,],
             ['name'=>'安置网络列表', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-list', 'routePath'=>'atlas/network-list', 'show'=>0,],
             ['name'=>'安置网络列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-list-export', 'routePath'=>'atlas/network-list-export', 'show'=>0,],
@@ -270,7 +270,7 @@ return [
             ['name'=>'Performance sheet', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-order', 'routePath'=>'bonus/perf-order', 'show'=>1,],//业绩单
             ['name'=>'业绩单导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-order-export', 'routePath'=>'bonus/perf-order-export', 'show'=>0,],
 //            ['name'=>'会员实时业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'real-time-perf', 'routePath'=>'bonus/real-time-perf', 'show'=>1,],
-            ['name'=>'Interim performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-period-list', 'routePath'=>'bonus/perf-period-list', 'show'=>1,],//期业绩
+            ['name'=>'Period performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-period-list', 'routePath'=>'bonus/perf-period-list', 'show'=>1,],//期业绩
             ['name'=>'期业绩导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-period-list-export', 'routePath'=>'bonus/perf-period-list-export', 'show'=>0,],
             ['name'=>'Monthly performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-month', 'routePath'=>'bonus/perf-month', 'show'=>1,],//月业绩
             ['name'=>'月业绩导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-month-export', 'routePath'=>'bonus/perf-month-export', 'show'=>0,],

backendApi/modules/v1/controllers/AtlasController.php

@@ -78,8 +78,10 @@ class AtlasController extends BaseController {
             $userId = Yii::$app->params['mainUserId'];
         }
         $baseInfo = Info::baseInfo($userId, $periodNum);
+//        print_r($baseInfo);exit;
         $decLevelConfig = Cache::getDecLevelConfig();
         $empLevelConfig = Cache::getEmpLevelConfig();
+        $starLevelConfig = Cache::getStarCrownLevelConfig();
         return static::notice([
             [
                 'TOP_RELATION_DEEP' => $baseInfo['RELATION_DEEP'],
@@ -90,6 +92,7 @@ class AtlasController extends BaseController {
                 'PERIOD_AT' => $baseInfo['PERIOD_AT'],
                 'DEC_LV_NAME' => $decLevelConfig[$baseInfo['DEC_LV']]['LEVEL_NAME'],
                 'EMP_LV_NAME' => isset($empLevelConfig[$baseInfo['EMP_LV']])?$empLevelConfig[$baseInfo['EMP_LV']]['LEVEL_NAME']:'',
+                'STAR_LV_NAME' => $starLevelConfig[$baseInfo['STAR_LV']]['LEVEL_NAME'],
                 'leaf' => false,
                 'icon' => 'el-icon-user-solid',
                 'children' => null,

backendEle/src/router/index.js

@@ -436,18 +436,18 @@ export const constantRouterMap = [
           ],
         },
       },
-        {
-            path: '/user/dec-level-list',
-            component: _import('user/dec-level-list'),
-            name: 'user_dec-level-list',
-            meta: {
-                title: 'Member level adjustment list',//会员级别调整列表
-                breadcrumb: [
-                    {title: 'Dashboard', path: '/dashboard/index'},//Dashboard
-                    {title: 'Member management', path: '/user/index'},//会员管理
-                ],
-            },
-        },
+      {
+          path: '/user/dec-level-list',
+          component: _import('user/dec-level-list'),
+          name: 'user_dec-level-list',
+          meta: {
+              title: 'Member level adjustment list',//会员级别调整列表
+              breadcrumb: [
+                  {title: 'Dashboard', path: '/dashboard/index'},//Dashboard
+                  {title: 'Member management', path: '/user/index'},//会员管理
+              ],
+          },
+      },
       {
         path: '/user/change-user-dec-level',
         component: _import('user/change-user-dec-level'),
@@ -508,10 +508,10 @@ export const constantRouterMap = [
         component: _import('atlas/relation-opt'),
         name: 'atlas_relation-opt',
         meta: {
-          title: 'Expand network',//开拓网络
+          title: 'Sponor network', // 开拓网络
           breadcrumb: [
-            {title: 'Dashboard', path: '/dashboard/index'},//Dashboard
-            {title: 'Network Atlas', path: '/atlas/relation-opt'},//网络图谱
+            {title: 'Dashboard', path: '/dashboard/index'}, // Dashboard
+            {title: 'Network Atlas', path: '/atlas/relation-opt'}, // 网络图谱
           ],
         },
       },
@@ -520,10 +520,10 @@ export const constantRouterMap = [
         component: _import('atlas/network-opt'),
         name: 'atlas_network-opt',
         meta: {
-          title: 'Resettlement network',//安置网络
+          title: 'Placement network', // 安置网络
           breadcrumb: [
-            {title: 'Dashboard', path: '/dashboard/index'},//Dashboard
-            {title: 'Network Atlas', path: '/atlas/relation-opt'},//网络图谱
+            {title: 'Dashboard', path: '/dashboard/index'}, // Dashboard
+            {title: 'Network Atlas', path: '/atlas/relation-opt'}, // 网络图谱
           ],
         },
       },
@@ -1109,24 +1109,24 @@ export const constantRouterMap = [
         component: _import('bonus/perf-period-list'),
         name: 'bonus_perf-period-list',
         meta: {
-          title: 'Interim performance',//期业绩
+          title: 'Period performance', // 期业绩
           breadcrumb: [
-            {title: 'Dashboard', path: '/dashboard/index'},//Dashboard
-            {title: 'Bonus management', path: '/bonus/period'},//奖金管理
+            {title: 'Dashboard', path: '/dashboard/index'}, // Dashboard
+            {title: 'Bonus management', path: '/bonus/period'}, // 奖金管理
           ],
         },
       },
       {
-          path: '/bonus/perf-month',
-          component: _import('bonus/perf-month'),
-          name: 'bonus_perf-month',
-          meta: {
-              title: 'Monthly performance',//月业绩
-              breadcrumb: [
-                  {title: 'Dashboard', path: '/dashboard/index'},//Dashboard
-                  {title: 'Bonus management', path: '/bonus/period'},//奖金管理
-              ],
-          },
+        path: '/bonus/perf-month',
+        component: _import('bonus/perf-month'),
+        name: 'bonus_perf-month',
+        meta: {
+          title: 'Monthly performance', // 月业绩
+          breadcrumb: [
+            {title: 'Dashboard', path: '/dashboard/index'}, // Dashboard
+            {title: 'Bonus management', path: '/bonus/period'}, // 奖金管理
+          ],
+        },
       },
       {
         path: '/bonus/perf-standard',

backendEle/src/views/atlas/network-opt.vue

@@ -22,7 +22,15 @@
                     <span :class="'el-icon-loading '+ data.displayNone"></span>
                     <span :class="data.icon"></span>
                     <span>
-                      <el-tag type="danger">层数：{{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="success"><!-- 级别 -->Level：{{data.DEC_LV_NAME}}</el-tag> <el-tag type="warning"><!-- 聘级 -->Rank：{{data.EMP_LV_NAME}}</el-tag> <el-tag><!-- 加入期数 -->Number of joining periods：{{data.PERIOD_AT}}</el-tag></span>
+                      <el-tag type="danger">层数：{{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="success"><!-- 级别 -->Level：{{data.DEC_LV_NAME}}</el-tag>
+                      <el-tag type="warning"><!-- 聘级 -->Rank：{{data.EMP_LV_NAME}}</el-tag>
+                      <el-tag type="warning"><!-- 聘级 -->Star：{{data.STAR_LV_NAME}}</el-tag>
+                      <el-tag><!-- 加入期数 -->Number of joining periods：{{data.PERIOD_AT}}</el-tag>
+                    </span>
                 </span>
           </el-tree>
         </el-tab-pane>

backendEle/src/views/atlas/relation-opt.vue

@@ -21,7 +21,14 @@
                       slot-scope="{ node, data }">
                     <span :class="'el-icon-loading '+ data.displayNone"></span>
                     <span :class="data.icon"></span>
-                  <span><el-tag type="danger"><!-- 代数 -->Algebra：{{countTopDeep(data.TOP_RELATION_DEEP,topDeep)}}</el-tag> <el-tag><!-- 会员编号 -->Member code：{{ node.label }}</el-tag> <el-tag type="success">Name<!-- 姓名 -->：{{data.REAL_NAME}}</el-tag> <el-tag type="warning">Level<!-- 级别 -->：{{data.DEC_LV_NAME}}</el-tag> <el-tag type="warning"><!-- 聘级 -->Rank：{{data.EMP_LV_NAME}}</el-tag></span>
+                    <span>
+                      <el-tag type="danger"><!-- 代数 -->Algebra：{{countTopDeep(data.TOP_RELATION_DEEP,topDeep)}}</el-tag>
+                      <el-tag><!-- 会员编号 -->Member code：{{ node.label }}</el-tag>
+                      <el-tag type="success">Name<!-- 姓名 -->：{{data.REAL_NAME}}</el-tag>
+                      <el-tag type="warning">Level<!-- 级别 -->：{{data.DEC_LV_NAME}}</el-tag>
+                      <el-tag type="warning">Rank：<!-- 聘级 -->{{data.EMP_LV_NAME}}</el-tag>
+                      <el-tag type="warning">Star：<!-- 星级 -->{{data.STAR_LV_NAME}}</el-tag>
+                    </span>
                 </span>
           </el-tree>
         </el-tab-pane>

common/config/main.php

@@ -11,7 +11,7 @@ if (YII_ENV_DEV) {
 
 return [
     'language' => 'en',
-    'timeZone' => 'PRC',
+    'timeZone' => 'Africa/Lagos',
     'aliases' => [
         '@bower' => '@vendor/bower-asset',
         '@npm'   => '@vendor/npm-asset',

common/models/UserNetwork.php

@@ -261,6 +261,7 @@ class UserNetwork extends \common\components\ActiveRecord
         if($allData){
             $decLevelConfig = Cache::getDecLevelConfig();
             $empLevelConfig = Cache::getEmpLevelConfig();
+            $starLevelConfig = Cache::getStarCrownLevelConfig();
             foreach($allData as $key=>$data){
                 // 获取用户的基本信息
                 $baseInfo = Info::baseInfo($data['USER_ID'], $periodNum);
@@ -270,6 +271,7 @@ class UserNetwork extends \common\components\ActiveRecord
                     'REAL_NAME' => $baseInfo['REAL_NAME'],
                     'DEC_LV_NAME' => $decLevelConfig[$baseInfo['DEC_LV']]['LEVEL_NAME'],
                     'EMP_LV_NAME' => isset($empLevelConfig[$baseInfo['EMP_LV']])?$empLevelConfig[$baseInfo['EMP_LV']]['LEVEL_NAME']:'',
+                    'STAR_LV_NAME' => $starLevelConfig[$baseInfo['STAR_LV']]['LEVEL_NAME'],
 //                    'MOBILE' => $baseInfo['MOBILE'],
                     'PERIOD_AT' => $baseInfo['PERIOD_AT'],
                 ]);

common/models/UserRelation.php

@@ -205,6 +205,7 @@ class UserRelation extends \common\components\ActiveRecord
         if($allData){
             $decLevelConfig = Cache::getDecLevelConfig();
             $empLevelConfig = Cache::getEmpLevelConfig();
+            $starLevelConfig = Cache::getStarCrownLevelConfig();
             foreach($allData as $key=>$data){
                 // 获取用户的基本信息
                 $baseInfo = Info::baseInfo($data['USER_ID'], $periodNum);
@@ -214,6 +215,7 @@ class UserRelation extends \common\components\ActiveRecord
                     'REAL_NAME' => $baseInfo['REAL_NAME'],
                     'DEC_LV_NAME' => $decLevelConfig[$baseInfo['DEC_LV']]['LEVEL_NAME'],
                     'EMP_LV_NAME' => isset($empLevelConfig[$baseInfo['EMP_LV']])?$empLevelConfig[$baseInfo['EMP_LV']]['LEVEL_NAME']:'',
+                    'STAR_LV_NAME' => $starLevelConfig[$baseInfo['STAR_LV']]['LEVEL_NAME'],
                     'PERIOD_AT' => $baseInfo['PERIOD_AT'],
                 ]);
                 // 获取字节点数量