diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index c3c3d4933..545d10d2f 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -498,7 +498,7 @@ class ProjectController extends AbstractController $project = Project::userProject($project_id, true, true); // if (!User::whereUserid($owner_userid)->exists()) { - return Base::retError('会员不存在'); + return Base::retError('成员不存在'); } // AbstractModel::transaction(function() use ($owner_userid, $project) { @@ -978,7 +978,7 @@ class ProjectController extends AbstractController return Base::retError('参数错误'); } if (count($userid) > 20) { - return Base::retError('导出会员限制最多20个'); + return Base::retError('导出成员限制最多20个'); } if (!(is_array($time) && Base::isDateOrTime($time[0]) && Base::isDateOrTime($time[1]))) { return Base::retError('时间选择错误'); diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 2ebc4cbdf..3910c14a2 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -599,7 +599,7 @@ class UsersController extends AbstractController // $userInfo = User::find($userid); if (empty($userInfo)) { - return Base::retError('会员不存在或已被删除'); + return Base::retError('成员不存在或已被删除'); } $userInfo->checkSystem(1); // diff --git a/app/Services/WebSocketService.php b/app/Services/WebSocketService.php index f0fc9d72a..26b5a38e8 100644 --- a/app/Services/WebSocketService.php +++ b/app/Services/WebSocketService.php @@ -69,7 +69,7 @@ class WebSocketService implements WebSocketHandlerInterface $server->push($fd, Base::array2json([ 'type' => 'error', 'data' => [ - 'error' => '会员不存在' + 'error' => '成员不存在' ], ])); $server->close($fd); diff --git a/docker/php/php.conf b/docker/php/php.conf index 14a4861a6..0837cbf54 100644 --- a/docker/php/php.conf +++ b/docker/php/php.conf @@ -2,10 +2,10 @@ directory=/var/www # 生产环境 -command=php bin/laravels start -i +#command=php bin/laravels start -i # 开发环境 -#command=./bin/inotify ./app +command=./bin/inotify ./app numprocs=1 autostart=true diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 7090ab8ff..773ad7c41 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -283,8 +283,8 @@ :title="$L('导出任务统计')" :mask-closable="false">
- - + +
  • - +
  • diff --git a/resources/assets/js/pages/manage/components/ProjectArchived.vue b/resources/assets/js/pages/manage/components/ProjectArchived.vue index 996a964fd..1015ff938 100644 --- a/resources/assets/js/pages/manage/components/ProjectArchived.vue +++ b/resources/assets/js/pages/manage/components/ProjectArchived.vue @@ -118,7 +118,7 @@ export default { width: 168, }, { - title: this.$L('归档会员'), + title: this.$L('归档人员'), key: 'archived_userid', minWidth: 80, render: (h, {row}) => { diff --git a/resources/assets/js/pages/manage/components/TaskArchived.vue b/resources/assets/js/pages/manage/components/TaskArchived.vue index d5b035796..1ba0b775b 100644 --- a/resources/assets/js/pages/manage/components/TaskArchived.vue +++ b/resources/assets/js/pages/manage/components/TaskArchived.vue @@ -151,7 +151,7 @@ export default { width: 168, }, { - title: this.$L('归档会员'), + title: this.$L('归档人员'), key: 'archived_userid', minWidth: 100, render: (h, {row}) => {