root/oms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: bug

Browse Source
This commit is contained in:
liyongde
2026-03-24 17:19:15 +08:00
parent 5364df097b
commit aa37f75a07
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
back/application/api/controller/Work.php
View File

@@ -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') ->field('s.*, i.project_name, i.project_number, t.desp as issue_state_name, i.involve_manager,1 as project_types')
->select(); ->select();
for ($i = 0; $i < count($ret); $i++) { for ($i = 0; $i < count($ret); $i++) {
$info = $user->GetUserInfoByLoginId($ret[$i]['issue_processor']); $info = $user->GetUserInfoByLoginId($ret[$i]['issue_processor']);
if ($info != "") if ($info != "")
@@ -239,6 +238,8 @@ class Work extends Common
$ret[$i]['issue_processor_name'] = '-'; $ret[$i]['issue_processor_name'] = '-';
} }
$info = $user->GetUserInfoByLoginId($ret[$i]['issue_creator']); $info = $user->GetUserInfoByLoginId($ret[$i]['issue_creator']);
// error_log("ret: " . print_r($info, true));
$ret[$i]['issue_creator_name'] = $info['name']; $ret[$i]['issue_creator_name'] = $info['name'];
} }

4
front/config/dev.env.js
View File

@@ -1,7 +1,7 @@
module.exports = { module.exports = {
NODE_ENV: '"development"', NODE_ENV: '"development"',
ENV_CONFIG: '"dev"', ENV_CONFIG: '"dev"',
BASE_WMS_API: '"http://127.0.0.1:8080/api"', BASE_WMS_API: '"http://127.0.0.1:8011/api"',
BASE_WMS_FILE: '"http://127.0.0.1:8080/"' BASE_WMS_FILE: '"http://127.0.0.1:8011/"'
// 47.101.147.253 // 47.101.147.253
} }

4
front/config/prod.env.js
View File

@@ -1,8 +1,8 @@
module.exports = { module.exports = {
NODE_ENV: '"production"', NODE_ENV: '"production"',
ENV_CONFIG: '"prod"', ENV_CONFIG: '"prod"',
BASE_WMS_API: '"http://127.0.0.1:8080/api"', BASE_WMS_API: '"http://127.0.0.1:8011/api"',
BASE_WMS_FILE: '"http://127.0.0.1:8080/"' BASE_WMS_FILE: '"http://127.0.0.1:8011/"'
////BASE_AGV_API: '"http://192.168.3.223:55200/v1"', ////BASE_AGV_API: '"http://192.168.3.223:55200/v1"',
//BASE_WMS_API: '"http://169.254.71.103/api"', //BASE_WMS_API: '"http://169.254.71.103/api"',
//BASE_AGV_API: '"http://127.0.0.1:55200/v1"', //BASE_AGV_API: '"http://127.0.0.1:55200/v1"',

36
front/src/router/index.js
View File

@@ -59,36 +59,36 @@ export const constantRouterMap = [
{ {
path: "/", path: "/",
component: Layout, 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: { meta: {
title: "我的工作台", title: "我的工作台",
icon: "camera" icon: "camera"
}, },
children: [ children: [
{ {
path: "/workbench", path: "/dashboard",
component: () => import("@/views/workbench/index"), component: () => import("@/views/workbench/index"),
name: "我的工作台", name: "我的工作台",
meta: { title: "我的工作台", icon: "component", noCache: true } 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 = [ export const asyncRouterMap = [