Skip to content

W
wms
Commit c0681bfb authored by 李翰林's avatar 李翰林
Browse files
Options

修改面板

parent fa3f7a99
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 71 deletions
config/proxy.js
View file @ c0681bfb
...@@ -12,8 +12,8 @@ export default { ...@@ -12,8 +12,8 @@ export default {
"/srwms/": { "/srwms/": {
// 要代理的地址 // 要代理的地址
// target: "http://192.168.40.18/wms/", //39:28040 18/wms/ // target: "http://192.168.40.18/wms/", //39:28040 18/wms/
// target: "http://192.168.40.203:28040", //39:28040 18/wms/ dj target: "http://192.168.40.228:28040", //39:28040 18/wms/ dj
target: "http://192.168.40.117:28040", //39:28040 18/wms/ jf // target: "http://192.168.40.117:28040", //39:28040 18/wms/ jf
// target: "http://192.168.40.108:28040", //39:28040 18/wms/ jf // target: "http://192.168.40.108:28040", //39:28040 18/wms/ jf
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
package.json
View file @ c0681bfb
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"description": "An out-of-box UI solution for enterprise applications", "description": "An out-of-box UI solution for enterprise applications",
"scripts": { "scripts": {
"analyze": "cross-env ANALYZE=1 umi build", "analyze": "cross-env ANALYZE=1 umi build",
"build": "umi build", "build": "set NODE_OPTIONS=--openssl-legacy-provider & umi build",
"deploy": "npm run build && npm run gh-pages", "deploy": "npm run build && npm run gh-pages",
"dev": "npm run start:dev", "dev": "npm run start:dev",
"gh-pages": "gh-pages -d dist", "gh-pages": "gh-pages -d dist",
......
src/components/Imgdetail/index.jsx 0 → 100644
View file @ c0681bfb
import { Image } from "antd";
const Imgdetail = ({ files, width, height }) => {
return <div style={{ display: "flex", flexFlow: "row wrap", width: "100%" }}>
{
files && typeof (files) == "string" ?
<Image style={{ marginRight: 15}} src={files} width={width ?? 40} height={height ?? 40}></Image>
: files && Array.isArray(files) && files?.length ?
files?.map(el => {
return <div style={{ marginRight: 15}} key={el?.uid} >
<Image src={el?.url} width={width ?? 40} height={height ?? 40} ></Image>
</div>
})
:
"-"
}
</div>
}
export default Imgdetail;
\ No newline at end of file
src/components/PremButton/index.jsx 0 → 100644
View file @ c0681bfb
import React, { useState } from 'react';
import { Popconfirm, Button } from 'antd';
import { useModel } from 'umi';
function PremButton(props) {
const { initialState, setInitialState } = useModel('@@initialState');
let buttonPerm = initialState?.newMenu?.buttonPerm;
const { children, btn, pop, access } = props;
let res =
buttonPerm && buttonPerm.length > 0
? buttonPerm?.filter((it) => it.typeName == access && it.show == 1)
: [];
let accesses = access ? res.map((it) => it.typeName).includes(access) : true;
//配置按钮权限接口
return pop ? (
<Popconfirm {...pop} disabled={pop?.disabled || !accesses}>
<Button {...btn} disabled={btn?.disabled || !accesses}>
{children}
</Button>
</Popconfirm>
) : (
<Button {...btn} disabled={btn?.disabled || !accesses}>
{children}
</Button>
);
}
export default PremButton;
src/pages/Printer/fields.js
View file @ c0681bfb
...@@ -126,7 +126,7 @@ export function getColumns(setDrawer, formRef) { ...@@ -126,7 +126,7 @@ export function getColumns(setDrawer, formRef) {
}, },
columns: [ columns: [
{ {
title: "数量", title: "重量",
dataIndex: "weight", dataIndex: "weight",
key: "weight", key: "weight",
valueType: "digit", valueType: "digit",
......
src/pages/Printer/index.jsx
View file @ c0681bfb
...@@ -8,6 +8,7 @@ import { ...@@ -8,6 +8,7 @@ import {
Modal, Modal,
Space, Space,
message, message,
Image,
} from "antd"; } from "antd";
import AutoTable from "@/components/AutoTable"; import AutoTable from "@/components/AutoTable";
import { useRequest } from "umi"; import { useRequest } from "umi";
...@@ -16,8 +17,8 @@ import { doFetch } from "@/utils/doFetch"; ...@@ -16,8 +17,8 @@ import { doFetch } from "@/utils/doFetch";
import InitForm from "@/components/NewInitForm"; import InitForm from "@/components/NewInitForm";
import { start } from "@/utils/printHandle.js"; import { start } from "@/utils/printHandle.js";
import { ExclamationCircleFilled } from "@ant-design/icons"; import { ExclamationCircleFilled } from "@ant-design/icons";
import PremButton from "@/components/PremButton/index.jsx";
const { confirm } = Modal; const { confirm } = Modal;
const Station = (props) => { const Station = (props) => {
let actionRef = useRef(), let actionRef = useRef(),
formRef = useRef(), formRef = useRef(),
...@@ -53,7 +54,7 @@ const Station = (props) => { ...@@ -53,7 +54,7 @@ const Station = (props) => {
key: "specificationModel", key: "specificationModel",
}, },
{ {
title: "数量", title: "重量",
dataIndex: "weight", dataIndex: "weight",
key: "weight", key: "weight",
search: false, search: false,
...@@ -93,6 +94,15 @@ const Station = (props) => { ...@@ -93,6 +94,15 @@ const Station = (props) => {
key: "unilateralThickness", key: "unilateralThickness",
search: false, search: false,
}, },
{
title: "二维码",
dataIndex: "qrCodeUrl ",
key: "qrCodeUrl ",
search: false,
render: (_, row) => {
return <Image src={row?.qrCodeUrl} width={30} height={30} ></Image>
}
},
{ {
title: "创建人", title: "创建人",
dataIndex: "createUserName", dataIndex: "createUserName",
...@@ -105,6 +115,39 @@ const Station = (props) => { ...@@ -105,6 +115,39 @@ const Station = (props) => {
key: "orderDate", key: "orderDate",
search: false, search: false,
}, },
{
title: "操作",
valueType: "option",
render: (_, row) => {
return [
<PremButton
key="remove"
pop={{
title: "是否删除该条信息?",
okText: "确认",
cancelText: "取消",
onConfirm: async () => {
let res = await doFetch({
url: "/ngic-workmanship/wmsMaterieLabel/deleteById",
params: {
id: row?.id,
},
});
if (res && res?.code === "0000") {
actionRef?.current?.reload();
}
},
}}
btn={{
size: "small",
type: "danger",
}}
>
删除
</PremButton>,
];
},
},
]; ];
const [drawer, setDrawer] = useState({ const [drawer, setDrawer] = useState({
......
src/pages/Storeboard/DataTable.jsx
View file @ c0681bfb
...@@ -105,7 +105,7 @@ export default (props) => { ...@@ -105,7 +105,7 @@ export default (props) => {
})} })}
</div> </div>
{data.length === 0 ? ( {data.length === 0 ? (
<div style={{ width: "100%", height: "auto",color:'#ffffff80',textAlign:'center',marginTop:'20%' }}>暂无数据</div> <div style={{ width: "100%", height: "auto",color:'#ffffff80',textAlign:'center',marginTop:'10%' }}>暂无数据</div>
) : ( ) : (
<ScrollBoard <ScrollBoard
config={config} config={config}
......
src/pages/Storeboard/Krjk.jsx
View file @ c0681bfb
...@@ -7,12 +7,10 @@ export default ({ data }) => { ...@@ -7,12 +7,10 @@ export default ({ data }) => {
let allArr = data?.[0]?.thirdList; let allArr = data?.[0]?.thirdList;
let newArr = []; let newArr = [];
allArr?.forEach((item) => { allArr?.forEach((item) => {
item?.fourthList?.forEach((it) => { item?.fourthList?.reverse()?.forEach((it) => {
newArr.push(it?.status); newArr.push(it?.status);
}); });
}); });
console.log("arr1", newArr);
return newArr; return newArr;
}, [data]); }, [data]);
const statusArr2 = useMemo(() => { const statusArr2 = useMemo(() => {
...@@ -20,7 +18,7 @@ export default ({ data }) => { ...@@ -20,7 +18,7 @@ export default ({ data }) => {
let newArr = []; let newArr = [];
allArr?.forEach((item) => { allArr?.forEach((item) => {
console.log(item); console.log(item);
item?.fourthList?.forEach((it) => { item?.fourthList?.reverse()?.forEach((it) => {
newArr.push(it?.status); newArr.push(it?.status);
}); });
}); });
...@@ -33,7 +31,7 @@ export default ({ data }) => { ...@@ -33,7 +31,7 @@ export default ({ data }) => {
let newArr = []; let newArr = [];
allArr?.forEach((item) => { allArr?.forEach((item) => {
console.log(item); console.log(item);
item?.fourthList?.forEach((it) => { item?.fourthList?.reverse()?.forEach((it) => {
newArr.push(it?.status); newArr.push(it?.status);
}); });
}); });
...@@ -68,19 +66,6 @@ export default ({ data }) => { ...@@ -68,19 +66,6 @@ export default ({ data }) => {
<span>10</span> <span>10</span>
</div> </div>
<div className="jk-content-unit"> <div className="jk-content-unit">
<div className="jk-status " style={{ position: "relative" }}>
<div className="statusLine bgline1"></div>
<span
style={{
position: "absolute",
bottom: "-20px",
left: "-2px",
color: "white",
}}
>
高
</span>
</div>
<div className="jk-statusContent"> <div className="jk-statusContent">
{statusArr1?.map((it) => { {statusArr1?.map((it) => {
return ( return (
...@@ -94,27 +79,27 @@ export default ({ data }) => { ...@@ -94,27 +79,27 @@ export default ({ data }) => {
})} })}
<div className="jk-statusBottom"> <div className="jk-statusBottom">
<span>1</span>
<span>2</span>
<span>3</span>
<span>4</span> <span>4</span>
<span>3</span>
<span>2</span>
<span>1</span>
</div> </div>
</div> </div>
</div> <div className="jk-status " style={{ position: "relative" }}>
<div className="jk-content-unit"> <div className="statusLine bgline1"></div>
<div className="jk-status" style={{ position: "relative" }}>
<div className="statusLine bgline2"></div>
<span <span
style={{ style={{
position: "absolute", position: "absolute",
bottom: "-20px", left: "-18px",
left: "0", bottom: "-4px",
color: "white", color: "white",
}} }}
> >
中 高
</span> </span>
</div> </div>
</div>
<div className="jk-content-unit">
<div className="jk-statusContent"> <div className="jk-statusContent">
{statusArr2?.map((it) => { {statusArr2?.map((it) => {
return ( return (
...@@ -128,27 +113,27 @@ export default ({ data }) => { ...@@ -128,27 +113,27 @@ export default ({ data }) => {
})} })}
<div className="jk-statusBottom"> <div className="jk-statusBottom">
<span>1</span>
<span>2</span>
<span>3</span>
<span>4</span> <span>4</span>
<span>3</span>
<span>2</span>
<span>1</span>
</div> </div>
</div> </div>
</div>
<div className="jk-content-unit">
<div className="jk-status" style={{ position: "relative" }}> <div className="jk-status" style={{ position: "relative" }}>
<div className="statusLine bgline3"></div> <div className="statusLine bgline2"></div>
<span <span
style={{ style={{
position: "absolute", position: "absolute",
bottom: "-20px", left: "-18px",
left: "0", bottom: "-4px",
color: "white", color: "white",
}} }}
> >
低 中
</span> </span>
</div> </div>
</div>
<div className="jk-content-unit">
<div className="jk-statusContent"> <div className="jk-statusContent">
{statusArr3?.map((it) => { {statusArr3?.map((it) => {
return ( return (
...@@ -162,12 +147,25 @@ export default ({ data }) => { ...@@ -162,12 +147,25 @@ export default ({ data }) => {
})} })}
<div className="jk-statusBottom"> <div className="jk-statusBottom">
<span>1</span>
<span>2</span>
<span>3</span>
<span>4</span> <span>4</span>
<span>3</span>
<span>2</span>
<span>1</span>
</div> </div>
</div> </div>
<div className="jk-status" style={{ position: "relative" }}>
<div className="statusLine bgline3"></div>
<span
style={{
position: "absolute",
left: "-18px",
bottom: "-4px",
color: "white",
}}
>
低
</span>
</div>
</div> </div>
</div> </div>
<div <div
......
src/pages/Storeboard/index.less
View file @ c0681bfb
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
.jk-content { .jk-content {
display: flex; display: flex;
flex-direction: row; flex-direction: column;
height: calc(100% - 32px); height: calc(100% - 32px);
padding: 12px 0px 24px 24px; padding: 12px 0px 24px 24px;
...@@ -259,39 +259,41 @@ ...@@ -259,39 +259,41 @@
.jk-content-unit { .jk-content-unit {
flex: 1; flex: 1;
height: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: column;
margin-left: 6px; margin-left: 6px;
gap: 2px;
height: 100%;
.jk-statusBottom { .jk-statusBottom {
width: 100%; width: 100%;
position: absolute; position: absolute;
top: 1; top: 1;
height: 100%;
} }
} }
.statusDiv { .statusDiv {
width: 10px;
height: auto; height: auto;
flex: 22%; flex: 22%;
background-color: #00bbf2; background-color: #00bbf2;
border-radius: 10px; border-radius: 10px;
margin: 6px 1px; margin: 1px
} }
.statusLine { .statusLine {
width: 10px; width: 100%;
background-color: green; background-color: green;
height: 100%; height: 10px;
// margin-top: 4px;
// margin-bottom: 4px;
} }
.jk-status { .jk-status {
width: 10px; height: 10px;
height: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
...@@ -302,18 +304,18 @@ ...@@ -302,18 +304,18 @@
.bgline1 { .bgline1 {
background: linear-gradient(180deg, rgba(255, 15, 15, 0.49) 0%, rgba(246, 244, 244, 0.00) 51%, rgba(255, 0, 0, 0.38) 100%); background: linear-gradient(90deg, rgba(255, 15, 15, 0.49) 0%, rgba(246, 244, 244, 0.00) 51%, rgba(255, 0, 0, 0.38) 100%);
} }
.bgline2 { .bgline2 {
background: linear-gradient(180deg, rgba(255, 147, 15, 0.49) 0%, rgba(246, 244, 244, 0.00) 51%, rgba(255, 140, 0, 0.38) 100%); background: linear-gradient(90deg, rgba(255, 147, 15, 0.49) 0%, rgba(246, 244, 244, 0.00) 51%, rgba(255, 140, 0, 0.38) 100%);
} }
.bgline3 { .bgline3 {
background: linear-gradient(180deg, rgba(255, 251, 15, 0.49) 0%, rgba(246, 244, 244, 0.00) 51%, rgba(255, 251, 0, 0.38) 100%); background: linear-gradient(90deg, rgba(255, 251, 15, 0.49) 0%, rgba(246, 244, 244, 0.00) 51%, rgba(255, 251, 0, 0.38) 100%);
} }
...@@ -322,22 +324,24 @@ ...@@ -322,22 +324,24 @@
.jk-statusContent { .jk-statusContent {
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: row; flex-direction: column;
flex-wrap: wrap; flex-wrap: wrap;
position: relative; position: relative;
height: 100%;
.jk-statusBottom { .jk-statusBottom {
position: absolute; position: absolute;
bottom: -20px; left: -18px;
width: 100%; height: calc(100% - 10px);
display: flex; display: flex;
flex-direction: row; flex-direction: column;
span { span {
flex: 1; flex: 1;
text-align: center; display: flex;
color: skyblue;
font-size: 16px; font-size: 16px;
flex-direction: column;
justify-content: center;
color: skyblue;
font-weight: 600; font-weight: 600;
} }
} }
...@@ -350,16 +354,17 @@ ...@@ -350,16 +354,17 @@
.numberStatus { .numberStatus {
display: flex; display: flex;
flex-direction: column; flex-direction: row;
justify-content: space-around; justify-content: space-around;
height: 100%;
align-self: center; align-self: center;
height: auto;
width: 100%;
span { span {
color: #fff; color: #fff;
flex: 1; flex: 1;
height: auto; height: auto;
align-self: center; text-align: center;
font-size: 16px; font-size: 16px;
padding-top: 6px; padding-top: 6px;
} }
......
src/utils/printHandle.js
View file @ c0681bfb
...@@ -63,7 +63,8 @@ export async function start(url, params) { ...@@ -63,7 +63,8 @@ export async function start(url, params) {
), ),
okText: "下载插件", okText: "下载插件",
onOk() { onOk() {
location.href = "http://192.168.40.251/staticfile/group1/M00/00/00/CLodop_Setup_for_Win32NT1111111.exe"; location.href = "http://10.110.84.250/staticfile/group1/M00/00/00/CLodop_Setup_for_Win32NT1111111.exe"; // 郑州思锐生产环境
// http://192.168.40.18/staticfile/download/CLodop_Setup_for_Win32NT.exe 测试环境
}, },
}); });
}; };
......
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