1903

common/models/UserNetwork.php

@@ -298,6 +298,7 @@ class UserNetwork extends \common\components\ActiveRecord
                 $allData[$key]['icon'] = $icon;
                 $allData[$key]['isExpanded'] = false;
                 $allData[$key]['displayNone'] = 'display-none';
+                $allData[$key]['RELATIVE_LOCATION'] = $data['RELATIVE_LOCATION'] == 1 ? 'L' : 'R';
             }
         }
         return $allData;

frontendApi/modules/v1/controllers/AtlasController.php

@@ -36,7 +36,7 @@ class AtlasController extends BaseController {
 
         if ($userName !== '') {
             if (!$userId = Info::getUserIdByUserName($userName)) {
-                return static::notice('会员不存在', 400);
+                return static::notice('Member does not exist', 400); // 会员不存在
             }
             $topUid = \Yii::$app->user->id;
             $userNetInfo = UserNetwork::findOneAsArray('USER_ID=:USER_ID', [':USER_ID' => $userId], 'PARENT_UIDS');
@@ -84,7 +84,7 @@ class AtlasController extends BaseController {
         $periodNum = Yii::$app->request->get('periodNum', null);
         $deep = Yii::$app->request->get('deep', 5);
         if ($deep > 20) {
-            return static::notice('最多查看会员的前20层子会员', 400);
+            return static::notice('View the top 20 sub members of the member at most', 400); // 最多查看会员的前20层子会员
         }
         $allData = UserNetwork::getChildrenWithDeepAndLayer($userId, $deep, 1, $periodNum);
         return static::notice(['allData' => $allData, 'periodNum' => $periodNum]);
@@ -105,7 +105,7 @@ class AtlasController extends BaseController {
             $userId = \Yii::$app->user->id;
         } else {
             if (!$userId = Info::getUserIdByUserName($userName)) {
-                return static::notice('会员不存在', 400);
+                return static::notice('Member does not exist', 400); //  会员不存在
             }
             $topUid = \Yii::$app->user->id;
             $userNetInfo = UserNetwork::findOneAsArray('USER_ID=:USER_ID', [':USER_ID' => $userId], 'PARENT_UIDS');

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

@@ -2,18 +2,18 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="tabActiveName">
-        <el-tab-pane label="安置网络图" name="first">
+        <el-tab-pane label="Resettlement network diagram" name="first"><!-- 安置网络图 -->
           <div class="filter-user" @keyup.enter="enterToGetData()">
             <el-input v-model="mainUserName" size="small" style="width:300px;">
-              <template slot="prepend">顶级会员</template>
+              <template slot="prepend">Top member</template><!-- 顶级会员 -->
             </el-input>
             <el-input v-model="expandDeep" size="small" style="width:150px;">
-              <template slot="prepend">展开深度</template>
+              <template slot="prepend">Spread depth</template><!-- 展开深度 -->
             </el-input>
             <el-input v-model="periodNum" size="small" style="width:150px;" v-show="false">
-              <template slot="prepend">期数</template>
+              <template slot="prepend">Number of periods</template><!-- 期数 -->
             </el-input>
-            <el-button type="primary" size="small" @click="getMainData()">确定</el-button>
+            <el-button type="primary" size="small" @click="getMainData()">confirm</el-button><!--  -->
           </div>
           <el-tree :props="props" :data="treeData" node-key="USER_ID" @node-click="getChildData" ref="tree" :indent="0"
                    default-expand-all :height="tool.getTableHeight(true)">
@@ -22,22 +22,29 @@
                     <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>会员编号：{{ node.label }}</el-tag> <el-tag>姓名：{{data.REAL_NAME}}</el-tag> <el-tag type="danger">区位：{{data.RELATIVE_LOCATION}}</el-tag> <el-tag type="success">级别：{{data.DEC_LV_NAME}}</el-tag> <el-tag type="warning">聘级：{{data.EMP_LV_NAME}}</el-tag> <el-tag>加入期数：{{data.PERIOD_AT}}</el-tag></span>
+                      <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="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>Joining Period：{{data.PERIOD_AT}}</el-tag><!-- 加入期数 -->
+                    </span>
                 </span>
           </el-tree>
         </el-tab-pane>
-        <el-tab-pane label="安置网络列表" name="two">
+        <el-tab-pane label="Placement network list" name="two"><!-- 安置网络列表 -->
           <div class="filter-user">
             <el-input v-model="filterForm.userName" size="small" style="width:300px;">
-              <template slot="prepend">会员编号</template>
+              <template slot="prepend">Member code</template><!-- 会员编号 -->
             </el-input>
             <el-input v-model="filterForm.deep" size="small" style="width:150px;">
-              <template slot="prepend">深度</template>
+              <template slot="prepend">depth</template><!-- 深度 -->
             </el-input>
             <el-input v-model="filterForm.periodNum" size="small" style="width:150px;" v-show="false">
-              <template slot="prepend">期数</template>
+              <template slot="prepend">Number of periods</template><!-- 期数 -->
             </el-input>
-            <el-button type="primary" size="small" @click="handleFilter">确定</el-button>
+            <el-button type="primary" size="small" @click="handleFilter">confirm</el-button><!-- 确定 -->
           </div>
 
           <el-table :data="tableData" stripe style="width: 100%;" :height="tool.getTableHeight(true)">
@@ -53,7 +60,7 @@
                 </template>
                 <template v-else>
                   <template v-if="tableHeader.index === 'USER_NAME'">
-                    <el-tooltip class="item" effect="dark" content="查看该会员的下级" placement="top">
+                    <el-tooltip class="item" effect="dark" content="View the subordinates of this member" placement="top"><!-- 查看该会员的下级 -->
                     <el-button @click.native="handleShow(scope.row)" size="small" type="primary">
                       {{scope.row[tableHeader.index].value}}
                     </el-button>
@@ -125,7 +132,7 @@
     methods: {
       getData() {
         this.$message({
-          message: '正在获取数据，请稍后',
+          message: 'Getting data, please wait', // 正在获取数据，请稍后
         })
         //this.periodNum = baseInfo.nowPeriodNum()
         //this.filterForm.periodNum = baseInfo.nowPeriodNum()
@@ -134,7 +141,7 @@
       getMainData (userName = null, getList = false) {
         this.$message.closeAll()
         this.$message({
-          message: '正在获取数据，请稍后',
+          message: 'Getting data, please wait', // 正在获取数据，请稍后
         })
         let thisObj = this
         let requestData = {