Commit 212345b2 authored by wuhao's avatar wuhao 🎯

zxc

parent c80ff9f4
......@@ -9,7 +9,7 @@ const Settings = {
logo: "https://img1.baidu.com/it/u=4245241897,3920774166&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500",
headerHeight: 48,
splitMenus: false,
name: "MES",
name: "WMS",
};
export default Settings;
......@@ -9,12 +9,12 @@
export default {
dev: {
// localhost:8000/api/** -> https://preview.pro.ant.design/api/**
"/mes/": {
"/wms/": {
// 要代理的地址
target: "http://192.168.40.39:18040/", //39:18040 23/mes/ //60 翔
target: "http://192.168.40.15:18040/", //39:18040 23/wms/ //60 翔
changeOrigin: true,
pathRewrite: {
"^/mes": "",
"^/wms": "",
},
},
"/staticfile/": {
......
{
"name": "MES",
"name": "WMS",
"version": "5.2.0",
"private": true,
"description": "An out-of-box UI solution for enterprise applications",
......
......@@ -51,23 +51,31 @@ export async function getInitialState() {
settings: defaultSettings,
newMenu: menuData,
getmenuData,
collapsed: false
};
}
return {
fetchUserInfo,
settings: defaultSettings,
getmenuData,
collapsed: false
};
} // ProLayout 支持的api https://procomponents.ant.design/components/layout
export const layout = async (props) => {
let { initialState, setInitialState } = props;
let token = localStorage.getItem("TOKEN_MES");
return {
rightContentRender: () => <RightContent />,
headerContentRender: () => <RightContent />,
rightContentRender:()=>null,
disableContentMargin: false,
waterMarkProps: {
content: initialState?.currentUser?.name,
},
collapsed: initialState.collapsed,
onCollapse: (cols) => {
setInitialState(s => ({ ...s, collapsed: cols }))
},
onPageChange: () => {
const { location } = history; // 如果没有登录,重定向到 login
if (location.pathname != "/user/logon") {
......@@ -99,10 +107,10 @@ export const layout = async (props) => {
},
request: (params, defaultMenuData) => {
let lastArr = initialState?.newMenu?.userHavePermList
? JSON.parse(
JSON.stringify(initialState?.newMenu?.userHavePermList)
)
: [],
? JSON.parse(
JSON.stringify(initialState?.newMenu?.userHavePermList)
)
: [],
newArr = [
{
path: "/welcome",
......
......@@ -273,7 +273,7 @@ class Mtable extends PureComponent {
delete newparams.pageSize;
}
let res = await request("/mes" + path, {
let res = await request("/wms" + path, {
body: JSON.stringify(newparams ? newparams : {}),
headers,
method: "POST",
......
......@@ -1050,7 +1050,7 @@ let InitForm = ({
const props = {
name: "file",
action: "/mes/ngic-base-business/sysAttachment/uploadFile",
action: "/wms/ngic-base-business/sysAttachment/uploadFile",
listType: item.listType == "img" ? "picture-card" : "text",
accept: item.listType == "img" ? ".jpg,.png,.jpeg," : "*",
multiple: item.multiple ? item.multiple : false,
......
import React, { useCallback, useState, useMemo } from "react";
import { LogoutOutlined, LockOutlined } from "@ant-design/icons";
import { Menu, Spin, Form, Modal, message } from "antd";
import { Menu, Spin, Form, Modal, message, Avatar } from "antd";
import { history, useModel, useRequest } from "umi";
import { stringify } from "querystring";
import HeaderDropdown from "../HeaderDropdown";
......@@ -130,9 +130,9 @@ const AvatarDropdown = ({ menu }) => {
padding: Pkcs7,
}).toString();
let newPassword = AES.encrypt(values.newPassword, Utf8.parse(timestamp), {
mode: ECB,
padding: Pkcs7,
}).toString(),
mode: ECB,
padding: Pkcs7,
}).toString(),
password = AES.encrypt(values.password, Utf8.parse(timestamp), {
mode: ECB,
padding: Pkcs7,
......@@ -175,15 +175,18 @@ const AvatarDropdown = ({ menu }) => {
formRef={formRef}
fields={fields}
col={{ span: 24 }}
onChange={(changedValues, allValues) => {}}
onChange={(changedValues, allValues) => { }}
submitData={(values, fn) => {
saveData(values, fn);
}}
submitting={loading || !visible}
></InitForm>
>
</InitForm>
</Modal>
<HeaderDropdown overlay={menuHeaderDropdown}>
<span className={`${styles.action} ${styles.account}`}>
<Avatar style={{marginRight:12,backgroundColor:"#1890ff"}}>{currentUser.userName.substr(0,1)}</Avatar>
<span className={`${styles.name} anticon`}>
{currentUser.userName}
</span>
......
......@@ -5,10 +5,11 @@ import { useModel, SelectLang } from "umi";
import Avatar from "./AvatarDropdown";
import HeaderSearch from "../HeaderSearch";
import styles from "./index.less";
import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons'
const GlobalHeaderRight = () => {
const { initialState } = useModel("@@initialState");
const { initialState, setInitialState } = useModel("@@initialState");
const { collapsed } = initialState;
if (!initialState || !initialState.settings) {
return null;
}
......@@ -22,6 +23,26 @@ const GlobalHeaderRight = () => {
return (
<Space className={className}>
<div
style={{ color: "#000", fontSize: 20, paddingLeft: 12 }}
onClick={() => { }}
>
{collapsed ? (
<MenuFoldOutlined
style={{ cursor: "pointer" }}
onClick={() => {
setInitialState(s => ({ ...s, collapsed: !collapsed }));
}}
/>
) : (
<MenuUnfoldOutlined
style={{ cursor: "pointer" }}
onClick={() => {
setInitialState(s => ({ ...s, collapsed: !collapsed }));
}}
/>
)}
</div>
<Avatar />
</Space>
);
......
......@@ -13,7 +13,8 @@
.right {
display: flex;
float: right;
justify-content: space-between;
align-items: center;
height: 48px;
margin-left: auto;
overflow: hidden;
......
......@@ -159,26 +159,6 @@ function Diymenu({
<h1 style={{ fontSize: 12 }}>{name}</h1>
</Link>
</div>
<div
style={{ color: "#fff", fontSize: 20, paddingLeft: 12 }}
onClick={() => {}}
>
{collapsed ? (
<MenuFoldOutlined
style={{ cursor: "pointer" }}
onClick={() => {
onCollapse(!collapsed);
}}
/>
) : (
<MenuUnfoldOutlined
style={{ cursor: "pointer" }}
onClick={() => {
onCollapse(!collapsed);
}}
/>
)}
</div>
<Suspense
fallback={<div style={{ width: "100vw", height: "100vh" }} />}
>
......
......@@ -139,12 +139,12 @@
padding: 6px;
background-color: transparent;
cursor: pointer;
transition: all 0.4s;
transition: all 0.02s;
break-inside: avoid !important;
.diylink {
color: #666 !important;
transition: all 0.4s;
transition: all 0.02s;
}
> .tocollect {
......@@ -176,7 +176,7 @@
padding-left: 12px;
border-left: transparent solid 1px;
cursor: pointer;
transition: all 0.4s;
transition: all 0.02s;
&:hover {
color: @primary-color;
......@@ -203,6 +203,8 @@
overflow: hidden;
background-color: #f0f0f0;
transform-origin: left top;
transform: scale(1);
}
.containboxs {
......@@ -210,11 +212,10 @@
top: 0;
left: 100%;
z-index: 1002;
width: 0px;
height: 100%;
padding: 0px;
overflow: hidden;
background-color: #f0f0f0;
transform: scale(0);
transform-origin: left top;
}
}
......@@ -229,7 +230,7 @@
line-height: @nav-header-height;
line-height: 48px !important;
background: #002140;
transition: all 0.3s;
transition: all 0.1s !important;
img {
display: inline-block;
height: 32px;
......@@ -280,26 +281,6 @@
}
}
}
&.light {
background-color: white;
box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
.logo {
height: 48px !important;
line-height: 48px !important;
background: white;
box-shadow: 1px 1px 0 0 @border-color-split;
h1 {
color: @primary-color;
}
}
:global(.ant-menu-light) {
border-right-color: transparent;
}
}
}
.icon {
......
......@@ -118,7 +118,7 @@ class Mtable extends PureComponent {
delete newparams.pageSize;
}
let res = await request("/mes" + path, {
let res = await request("/wms" + path, {
body: JSON.stringify(newparams ? newparams : {}),
headers,
method: "POST",
......
......@@ -289,3 +289,10 @@ pre {
font-weight: normal !important;
}
}
.ant-layout-header {
transition: all 200ms !important;
transition-timing-function: ease-out !important;
}
.ant-pro-global-header {
padding-left: 6px !important;
}
......@@ -22,23 +22,6 @@ export default {
name: ["userName"],
required: true,
},
gender: {
value: null,
type: "select",
title: "性别",
name: ["gender"],
required: false,
options: [
{
label: "男",
value: 1,
},
{
label: "女",
value: 2,
},
],
},
telephone: {
value: null,
type: "input",
......@@ -69,11 +52,11 @@ export default {
params: {},
},
},
shopIdList: {
storeIdList: {
value: null,
type: "select",
title: "负责车间",
name: ["shopIdList"],
name: ["storeIdList"],
required: false,
belinked: {
options: {
......@@ -84,34 +67,6 @@ export default {
linked: true,
multiple: true,
},
sectionIdList: {
value: null,
type: "select",
title: "负责工段",
name: ["sectionIdList"],
required: false,
belinked: {
options: {
database: sectionSelectByShops,
params: { shopIdList: "linked", factoryId: "linked" },
},
},
multiple: true,
},
productionLineIdList: {
value: null,
type: "select",
title: "负责产线",
name: ["productionLineIdList"],
required: false,
belinked: {
options: {
database: productionLineSelectByShops,
params: { shopIdList: "linked", factoryId: "linked" },
},
},
multiple: true,
},
roleIdList: {
value: null,
type: "select",
......@@ -149,47 +104,14 @@ export default {
span: 12,
},
},
academicCareer: {
value: null,
type: "input",
title: "学历",
name: ["academicCareer"],
required: false,
col: {
span: 12,
},
},
university: {
value: null,
type: "input",
title: "毕业院校",
name: ["university"],
required: false,
col: {
span: 12,
},
},
major: {
value: null,
type: "input",
title: "专业",
name: ["major"],
required: false,
col: {
span: 12,
},
},
userImgList: {
remark: {
value: null,
type: "upload",
title: "个人图片",
name: ["userImgList"],
type: "textarea",
title: "备注",
name: ["remark"],
required: false,
col: {
span: 24,
},
listType: "img",
multiple: false,
limit: 1,
},
};
......@@ -178,19 +178,9 @@ const Staff = (props) => {
key: "departmentName",
},
{
title: "负责车间",
dataIndex: "shopNames",
key: "shopNames",
},
{
title: "负责工段",
dataIndex: "sectionNames",
key: "sectionNames",
},
{
title: "负责产线",
dataIndex: "productionLines",
key: "productionLines",
title: "负责仓库",
dataIndex: "chargeStoreName",
key: "chargeStoreName",
},
{
......
......@@ -2,7 +2,7 @@ import request from "@/utils/request";
//单位下拉框
export async function unitSelect(params) {
return request(`/mes/ngic-base-business/sysDic/querySelectListByParentKey`, {
return request(`/wms/ngic-base-business/sysDic/querySelectListByParentKey`, {
method: "POST",
data: params,
});
......@@ -10,7 +10,7 @@ export async function unitSelect(params) {
//序列号规则
export async function serialNumberRuleSelect(params) {
return request(
`/mes/ngic-base-business/bmMainNumberRule/querySunSelectByNoTypeCode`,
`/wms/ngic-base-business/bmMainNumberRule/querySunSelectByNoTypeCode`,
{
method: "POST",
data: params,
......@@ -19,7 +19,7 @@ export async function serialNumberRuleSelect(params) {
}
//工艺路线
export async function processLineSelect(params) {
return request(`/mes/ngic-workmanship/pmProcessLine/selectionBox`, {
return request(`/wms/ngic-workmanship/pmProcessLine/selectionBox`, {
method: "POST",
data: params,
});
......@@ -27,7 +27,7 @@ export async function processLineSelect(params) {
//工艺路线下的工序 下拉
export async function processByProcessLine(params) {
return request(
`/mes/ngic-workmanship/workingProcedure/query/selectbox/processLine`,
`/wms/ngic-workmanship/workingProcedure/query/selectbox/processLine`,
{
method: "POST",
data: params,
......@@ -37,7 +37,7 @@ export async function processByProcessLine(params) {
//车间下的工序 下拉
export async function workingProcedureByShop(params) {
return request(
`/mes/ngic-workmanship/workingProcedure/query/selectbox/shop`,
`/wms/ngic-workmanship/workingProcedure/query/selectbox/shop`,
{
method: "POST",
data: params,
......@@ -46,7 +46,7 @@ export async function workingProcedureByShop(params) {
}
//物料工艺路线所属车间的工序 下拉
export async function processByShop(params) {
return request(`/mes/ngic-workmanship/workingProcedure/query/selectbox`, {
return request(`/wms/ngic-workmanship/workingProcedure/query/selectbox`, {
method: "POST",
data: params,
});
......@@ -54,14 +54,14 @@ export async function processByShop(params) {
//产出物料编号-名称-单位 下拉
export async function selectboxMaterie(params) {
return request(`/mes/ngic-workmanship/pmMaterie/query/selectboxMaterie`, {
return request(`/wms/ngic-workmanship/pmMaterie/query/selectboxMaterie`, {
method: "POST",
data: params,
});
}
//标签模板下拉
export async function bmTableSelect(params) {
return request(`/mes/ngic-base-business/bmTable/querySelectByType`, {
return request(`/wms/ngic-base-business/bmTable/querySelectByType`, {
method: "POST",
data: params,
});
......
......@@ -2,7 +2,7 @@ import request from "@/utils/request";
//登录
export async function fakeAccountLogin(params) {
return request("/mes/ngic-auth/sysAccount/login", {
return request("/wms/ngic-auth/sysAccount/login", {
method: "POST",
data: params,
});
......@@ -10,7 +10,7 @@ export async function fakeAccountLogin(params) {
//登出
export async function fakeAccountLoginOut(params) {
return request(`/mes/ngic-auth/sysAccount/logout`, {
return request(`/wms/ngic-auth/sysAccount/logout`, {
method: "POST",
body: params,
});
......@@ -18,7 +18,7 @@ export async function fakeAccountLoginOut(params) {
//个人信息
export async function queryCurrentUser(params) {
return request("/mes/ngic-auth/sysUser/query", {
return request("/wms/ngic-auth/sysUser/query", {
method: "POST",
data: params,
});
......@@ -26,7 +26,7 @@ export async function queryCurrentUser(params) {
//获取菜单/权限/菜单/公司类型
export async function getMenu(params) {
return request(`/mes/ngic-auth/sysPermission/queryMenu`, {
return request(`/wms/ngic-auth/sysPermission/queryMenu`, {
method: "POST",
data: params,
});
......@@ -34,7 +34,7 @@ export async function getMenu(params) {
/*---------------菜单收藏-------------------*/
export async function collectPerms(params) {
return request(`/mes/ngic-auth/sysUserPermission/collectPerm`, {
return request(`/wms/ngic-auth/sysUserPermission/collectPerm`, {
method: "POST",
data: params,
});
......@@ -42,14 +42,14 @@ export async function collectPerms(params) {
/*---------------取消菜单收藏-------------------*/
export async function cancelCollectPerms(params) {
return request(`/mes/ngic-auth/sysUserPermission/cancelCollectPerm`, {
return request(`/wms/ngic-auth/sysUserPermission/cancelCollectPerm`, {
method: "POST",
data: params,
});
}
/*---------------菜单历史记录-------------------*/
export async function mtosave(params) {
return request(`/mes/ngic-auth/sysUserVisitPermission/save`, {
return request(`/wms/ngic-auth/sysUserVisitPermission/save`, {
method: "POST",
data: params,
});
......
......@@ -2,20 +2,20 @@ import request from "@/utils/request";
//查询编号类型下拉框(去除已存在的没有子类的类型)
export async function bmNoType(params) {
return request(`/mes/ngic-base-business/bmNoType/querySelect`, {
return request(`/wms/ngic-base-business/bmNoType/querySelect`, {
method: "POST",
data: params,
});
}
//查询编号类型下拉框全部
export async function bmNoTypeAll(params) {
return request(`/mes/ngic-base-business/bmNoType/querySelectAll`, {
return request(`/wms/ngic-base-business/bmNoType/querySelectAll`, {
method: "POST",
data: params,
});
}
export async function bmNoRule(params) {
return request(`/mes/ngic-base-business/bmNoRule/querySelect`, {
return request(`/wms/ngic-base-business/bmNoRule/querySelect`, {
method: "POST",
data: params,
});
......@@ -23,7 +23,7 @@ export async function bmNoRule(params) {
//根据表单id查询条件下拉框
export async function paFormConditionSelect(params) {
return request(
`/mes/ngic-base-business/paFormCondition/querySelectByFormId`,
`/wms/ngic-base-business/paFormCondition/querySelectByFormId`,
{
method: "POST",
data: params,
......@@ -33,7 +33,7 @@ export async function paFormConditionSelect(params) {
//根据条件id查询条件值的下拉框
export async function queryConValueSelect(params) {
return request(
`/mes/ngic-base-business/paFormCondition/queryConValueSelectByconId`,
`/wms/ngic-base-business/paFormCondition/queryConValueSelectByconId`,
{
method: "POST",
data: params,
......@@ -42,7 +42,7 @@ export async function queryConValueSelect(params) {
}
//标签模板
export async function bmTableFileSelect(params) {
return request(`/mes/ngic-base-business/bmTableFile/querySelect`, {
return request(`/wms/ngic-base-business/bmTableFile/querySelect`, {
method: "POST",
data: params,
});
......
......@@ -2,21 +2,21 @@ import request from "@/utils/request";
//工厂下拉框
export async function factorySelect(params) {
return request(`/mes/ngic-auth/sysFactory/selectionBox`, {
return request(`/wms/ngic-auth/sysFactory/selectionBox`, {
method: "POST",
data: params,
});
}
//查询个人所属工厂下拉框
export async function factorySelectByuser(params) {
return request(`/mes/ngic-auth/sysFactory/selectionBoxU`, {
return request(`/wms/ngic-auth/sysFactory/selectionBoxU`, {
method: "POST",
data: params,
});
}
//查询工厂下拉框---注册
export async function factorySelectRegister(params) {
return request(`/mes/ngic-auth/sysFactory/selectionBoxAll`, {
return request(`/wms/ngic-auth/sysFactory/selectionBoxAll`, {
method: "POST",
data: params,
});
......@@ -24,7 +24,7 @@ export async function factorySelectRegister(params) {
//全部车间下拉框
export async function shopSelect(params) {
return request(`/mes/ngic-auth/sysShop/selectionBox`, {
return request(`/wms/ngic-auth/sysShop/selectionBox`, {
method: "POST",
data: params,
});
......@@ -32,77 +32,77 @@ export async function shopSelect(params) {
//根据工厂id查询车间下拉
export async function shopSelectByFactory(params) {
return request(`/mes/ngic-auth/sysShop/query/selectbox/factory`, {
return request(`/wms/ngic-auth/sysShop/query/selectbox/factory`, {
method: "POST",
data: params,
});
}
//根据车间id查询产线下拉
export async function productionLineSelectByShop(params) {
return request(`/mes/ngic-auth/sysProductionLine/query/selectbox/shopId`, {
return request(`/wms/ngic-auth/sysProductionLine/query/selectbox/shopId`, {
method: "POST",
data: params,
});
}
//根据车间id集合查询产线下拉
export async function productionLineSelectByShops(params) {
return request(`/mes/ngic-auth/sysProductionLine/query/selectbox/shopIds`, {
return request(`/wms/ngic-auth/sysProductionLine/query/selectbox/shopIds`, {
method: "POST",
data: params,
});
}
//根据车间id查询工段下拉
export async function sectionSelectByShop(params) {
return request(`/mes/ngic-auth/sysSection/query/selectbox/shopId`, {
return request(`/wms/ngic-auth/sysSection/query/selectbox/shopId`, {
method: "POST",
data: params,
});
}
//根据车间id集合查询工段下拉
export async function sectionSelectByShops(params) {
return request(`/mes/ngic-auth/sysSection/query/selectbox/shopIds`, {
return request(`/wms/ngic-auth/sysSection/query/selectbox/shopIds`, {
method: "POST",
data: params,
});
}
//授权前查询权限树
export async function roleTree(params) {
return request(`/mes/ngic-auth/sysRolePermission/queryAll`, {
return request(`/wms/ngic-auth/sysRolePermission/queryAll`, {
method: "POST",
data: params,
});
}
//角色下权限数据
export async function adminDataqueryAll(params) {
return request(`/mes/ngic-auth/sysRoleDataPermission/queryAll`, {
return request(`/wms/ngic-auth/sysRoleDataPermission/queryAll`, {
method: "POST",
data: params,
});
}
//不包含自己在内的全部用户下拉框
export async function userSelect(params) {
return request(`/mes/ngic-auth/sysUser/queryParentSelectionByUserId`, {
return request(`/wms/ngic-auth/sysUser/queryParentSelectionByUserId`, {
method: "POST",
data: params,
});
}
//全部用户下拉框
export async function allUserSelect(params) {
return request(`/mes/ngic-auth/sysUser/query/selectbox/company`, {
return request(`/wms/ngic-auth/sysUser/query/selectbox/company`, {
method: "POST",
data: params,
});
}
//根据工厂id查询树结构
export async function departmentTree(params) {
return request(`/mes/ngic-auth/sysDepartment/query/tree`, {
return request(`/wms/ngic-auth/sysDepartment/query/tree`, {
method: "POST",
data: params,
});
}
//查询角色下拉框
export async function roleSelect(params) {
return request(`/mes/ngic-auth/sysRole/queryAllSelectList`, {
return request(`/wms/ngic-auth/sysRole/queryAllSelectList`, {
method: "POST",
data: params,
});
......@@ -110,14 +110,14 @@ export async function roleSelect(params) {
//查询角色下拉框---注册
export async function roleSelectRegister(params) {
return request(`/mes/ngic-auth/sysRole/queryAllSelectByComId`, {
return request(`/wms/ngic-auth/sysRole/queryAllSelectByComId`, {
method: "POST",
data: params,
});
}
//查询全部编号类型下拉框(登录人公司)
export async function bmNoRule(params) {
return request(`/mes/ngic-base-business/bmNoRule/querySelect`, {
return request(`/wms/ngic-base-business/bmNoRule/querySelect`, {
method: "POST",
data: params,
});
......@@ -125,7 +125,7 @@ export async function bmNoRule(params) {
//根据物料查询产线下拉框
export async function productionLineSelectByMaterieId(params) {
return request(`/mes/ngic-auth/sysProductionLine/query/selectbox/materieId`, {
return request(`/wms/ngic-auth/sysProductionLine/query/selectbox/materieId`, {
method: "POST",
data: params,
});
......@@ -133,7 +133,7 @@ export async function productionLineSelectByMaterieId(params) {
//根据物料查询班组下拉框
export async function groupSelectByMaterieId(params) {
return request(`/mes/ngic-auth/sysGroup/query/selectbox/materieId`, {
return request(`/wms/ngic-auth/sysGroup/query/selectbox/materieId`, {
method: "POST",
data: params,
});
......@@ -141,7 +141,7 @@ export async function groupSelectByMaterieId(params) {
//根据物料查询班次下拉框
export async function shiftSelectByMaterieId(params) {
return request(`/mes/ngic-auth/sysShift/query/selectbox/materieId`, {
return request(`/wms/ngic-auth/sysShift/query/selectbox/materieId`, {
method: "POST",
data: params,
});
......@@ -149,7 +149,7 @@ export async function shiftSelectByMaterieId(params) {
//根据车间id查询班次下拉框
export async function shiftSelectByShopId(params) {
return request(`/mes/ngic-auth/sysShift/query/selectbox/shopId`, {
return request(`/wms/ngic-auth/sysShift/query/selectbox/shopId`, {
method: "POST",
data: params,
});
......
......@@ -8,7 +8,7 @@ export async function postFetch({ url, params }) {
});
}
export async function doFetch({ url, params }) {
return request("/mes" + url, {
return request("/wms" + url, {
method: "POST",
data: params,
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment