theo пре 3 година
родитељ
комит
76ebb75d80

+ 2 - 2
common/components/SwooleAsyncTimer.php

@@ -52,7 +52,7 @@ class SwooleAsyncTimer extends SwooleAsyncTimerComponent implements SocketInterf
         // 自动执行任务队列中的任务
         Queue::instance()->consumeTask();
         // 实时监听计算系统修改的period表字段
-        CalcConsole::listenCalcPeriod();
+//        CalcConsole::listenCalcPeriod();
         CalcConsole::listenAutoPerfPeriod();
         return true;
     }
@@ -234,4 +234,4 @@ class SwooleAsyncTimer extends SwooleAsyncTimerComponent implements SocketInterf
             // 忽略错误
         }
     }
-}
+}

+ 3 - 3
frontendApi/config/menu.php

@@ -81,7 +81,7 @@ return [
             ['name'=>'My account', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'index', 'routePath'=>'bonus/index', 'show'=>1,],//我的账户
 //            ['name'=>'最新奖金', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'new', 'routePath'=>'bonus/new', 'show'=>1,'allow'=>'newBonusSwitch'],
             ['name'=>'My bonus', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other', 'routePath'=>'bonus/other', 'show'=>1,'allow'=>'pastBonusSwitch'],//往期奖金
-            ['name'=>'团队查询', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'teams', 'routePath'=>'bonus/teams', 'show'=>1,],
+            ['name'=>'Team inquiry', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'teams', 'routePath'=>'bonus/teams', 'show'=>1,], // 团队查询
             ['name'=>'Historical cumulative bonus', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other', 'routePath'=>'bonus/historical-cumulative-bonus', 'show'=>1,'allow'=>'pastBonusSwitch'],//历史累积奖金
             //['name'=>'实时业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'real-time-perf', 'routePath'=>'bonus/real-time-perf', 'show'=>1,],
            // ['name'=>'房产积分', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'fc-point', 'routePath'=>'bonus/fc-point', 'show'=>1,],
@@ -119,7 +119,7 @@ return [
         'routePath'=>'article',
         'show'=>1,
         'child'=>[
-			
+
         ]
     ],
 //    'message'=>[
@@ -148,4 +148,4 @@ return [
             ['name'=>'Shipping Address', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'receive-address-list', 'routePath'=>'config/receive-address-list', 'show'=>1,],//收货地址管理
         ]
     ],
-];
+];

+ 3 - 3
frontendEle/src/router/index.js

@@ -486,10 +486,10 @@ export const constantRouterMap = [
         component: _import('bonus/teams'),
         name: 'bonus_teams',
         meta: {
-          title: '团队查询',
+          title: 'Team inquiry', // 团队查询
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '奖金管理', path: '/bonus/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},
+            {title: 'Bonus management', path: '/bonus/index'},
           ],
         },
       },

+ 27 - 27
frontendEle/src/views/bonus/teams.vue

@@ -6,7 +6,7 @@
     style="width: 100%"
     :cell-style="tableCellStyle"
     >
-    <el-table-column label="个人情况">
+    <el-table-column label="Personal details"><!-- 个人情况 -->
       <el-table-column
       type="index"
       :index="indexMethod"
@@ -16,33 +16,33 @@
         </el-table-column>
         <el-table-column
           prop="number"
-          label="会员编号"
-          >
+          label="Member code"
+          ><!-- 会员编号 -->
         </el-table-column>
         <el-table-column
           prop="name"
-          label="会员姓名"
-          >
+          label="Member name"
+          ><!-- 会员姓名 -->
         </el-table-column>
         <el-table-column
           prop="perf_status_name"
-          label="状态"
-          >
+          label="Status"
+          ><!-- 状态 -->
         </el-table-column>
         <el-table-column
           prop="user_perf"
-          label="个人业绩"
-          >
+          label="Personal Performance"
+          ><!-- 个人业绩 -->
         </el-table-column>
          <el-table-column
           prop="team_perf"
-          label="累计业绩"
-          >
+          label="Cumulative Performance"
+          ><!-- 累计业绩 -->
         </el-table-column>
          <el-table-column
           prop="total_perf"
-          label="合计"
-          >
+          label="Total Performance"
+          ><!-- 合计 -->
         </el-table-column>
       </el-table-column>
 
@@ -54,7 +54,7 @@
     style="width: 100%;margin-top:20px;"
     :cell-style="tableCellStyle"
    >
-    <el-table-column label="团队情况">
+    <el-table-column label="Team details"><!-- 团队情况 -->
       <el-table-column
       type="index"
       :index="indexMethod"
@@ -64,40 +64,40 @@
         </el-table-column>
          <el-table-column
           prop="number"
-          label="会员编号"
-          >
+          label="Member code"
+          ><!-- 会员编号 -->
         </el-table-column>
         <el-table-column
           prop="name"
-          label="会员姓名"
-          >
+          label="Member name"
+          ><!-- 会员姓名 -->
         </el-table-column>
         <el-table-column
           class="dsdd"
           prop="perf_status_name"
-          label="状态"
-          >
+          label="Status"
+          ><!-- 状态 -->
         </el-table-column>
         <el-table-column
           prop="user_perf"
-          label="个人业绩"
-          >
+          label="Personal Performance"
+          ><!-- 个人业绩 -->
         </el-table-column>
          <el-table-column
           prop="team_perf"
-          label="累计业绩"
-          >
+          label="Cumulativ Performance"
+          ><!-- 累计业绩 -->
         </el-table-column>
          <el-table-column
           prop="total_perf"
-          label="合计"
-          >
+          label="Total Performance"
+          ><!-- 合计 -->
         </el-table-column>
       </el-table-column>
 
   </el-table>
   <el-descriptions  :column="2"  >
-  <el-descriptions-item label="最新计算时间" >{{getWatTime(calcTime)}}</el-descriptions-item>
+  <el-descriptions-item label="Latest calculation time" >{{getWatTime(calcTime)}}</el-descriptions-item><!-- 最新计算时间 -->
 </el-descriptions>
   </div>
 </template>