From aa37f75a07a2f0d3fad7bd3860ea3adafdbc93ef Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 24 Mar 2026 17:19:15 +0800 Subject: [PATCH] fix: bug --- back/application/api/controller/Work.php | 3 +- front/config/dev.env.js | 4 +-- front/config/prod.env.js | 4 +-- front/src/router/index.js | 36 ++++++++++++------------ 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/back/application/api/controller/Work.php b/back/application/api/controller/Work.php index 048d2fc..1c995a8 100644 --- a/back/application/api/controller/Work.php +++ b/back/application/api/controller/Work.php @@ -227,7 +227,6 @@ class Work extends Common ->field('s.*, i.project_name, i.project_number, t.desp as issue_state_name, i.involve_manager,1 as project_types') ->select(); - for ($i = 0; $i < count($ret); $i++) { $info = $user->GetUserInfoByLoginId($ret[$i]['issue_processor']); if ($info != "") @@ -239,6 +238,8 @@ class Work extends Common $ret[$i]['issue_processor_name'] = '-'; } $info = $user->GetUserInfoByLoginId($ret[$i]['issue_creator']); + + // error_log("ret: " . print_r($info, true)); $ret[$i]['issue_creator_name'] = $info['name']; } diff --git a/front/config/dev.env.js b/front/config/dev.env.js index 1fba01b..ec8b85c 100644 --- a/front/config/dev.env.js +++ b/front/config/dev.env.js @@ -1,7 +1,7 @@ module.exports = { NODE_ENV: '"development"', ENV_CONFIG: '"dev"', - BASE_WMS_API: '"http://127.0.0.1:8080/api"', - BASE_WMS_FILE: '"http://127.0.0.1:8080/"' + BASE_WMS_API: '"http://127.0.0.1:8011/api"', + BASE_WMS_FILE: '"http://127.0.0.1:8011/"' // 47.101.147.253 } diff --git a/front/config/prod.env.js b/front/config/prod.env.js index 9874c6a..7fd7bf4 100644 --- a/front/config/prod.env.js +++ b/front/config/prod.env.js @@ -1,8 +1,8 @@ module.exports = { NODE_ENV: '"production"', ENV_CONFIG: '"prod"', - BASE_WMS_API: '"http://127.0.0.1:8080/api"', - BASE_WMS_FILE: '"http://127.0.0.1:8080/"' + BASE_WMS_API: '"http://127.0.0.1:8011/api"', + BASE_WMS_FILE: '"http://127.0.0.1:8011/"' ////BASE_AGV_API: '"http://192.168.3.223:55200/v1"', //BASE_WMS_API: '"http://169.254.71.103/api"', //BASE_AGV_API: '"http://127.0.0.1:55200/v1"', diff --git a/front/src/router/index.js b/front/src/router/index.js index 9309142..5b4753c 100644 --- a/front/src/router/index.js +++ b/front/src/router/index.js @@ -59,36 +59,36 @@ export const constantRouterMap = [ { path: "/", component: Layout, - meta: { - title: "系统首页", - icon: "camera" - }, - children: [ - { - path: "/dashboard", - component: () => import("@/views/dashboard/index"), - name: "系统首页", - meta: { title: "系统首页", icon: "component", noCache: true } - } - ] - }, - { - path: "/workbench", - component: Layout, meta: { title: "我的工作台", icon: "camera" }, children: [ { - path: "/workbench", + path: "/dashboard", component: () => import("@/views/workbench/index"), name: "我的工作台", meta: { title: "我的工作台", icon: "component", noCache: true } } ] } -]; + // { + // path: "/workbench", + // component: Layout, + // meta: { + // title: "我的工作台", + // icon: "camera" + // }, + // children: [ + // { + // path: "/workbench", + // component: () => import("@/views/workbench/index"), + // name: "我的工作台", + // meta: { title: "我的工作台", icon: "component", noCache: true } + // } + // ] + // } +] //需要权限的路由表 export const asyncRouterMap = [