BPA_MES
/
PZTJ.MES
4
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

添加配料

master
yanko 11 months ago
parent
affababa4f
commit
f05330078c
16 changed files with 2923 additions and 4257 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -0
      .gitignore
  2. +8
    -8
      frontend/config/proxy.ts
  3. +16
    -20
      frontend/config/routes.ts
  4. +0
    -993
      frontend/dist/348.5c88ec60.async.js
  5. +1
    -5
      frontend/dist/index.html
  6. +0
    -1
      frontend/dist/p__kep__index.c95cb979.async.js
  7. +0
    -1
      frontend/dist/p__kep__index.feb0c626.chunk.css
  8. +0
    -1
      frontend/dist/p__recipe__index.5666d931.async.js
  9. +0
    -1
      frontend/dist/p__user__login__index.0dee4dca.async.js
  10. BIN
     
  11. +0
    -1
      frontend/dist/t__plugin-layout__Layout.f1f97356.async.js
  12. +0
    -345
      frontend/dist/umi.eeba41ac.js
  13. +39
    -7
      frontend/src/api/KepService.ts
  14. +2797
    -2797
      frontend/src/components/KepData/index.tsx
  15. +11
    -27
      frontend/src/pages/recipe/index.tsx
  16. +50
    -50
      frontend/src/pages/user/login/index.tsx

+ 1
- 0
.gitignore View File

@@ -1,3 +1,4 @@
.vs .vs
obj obj
bin bin
Properties

+ 8
- 8
frontend/config/proxy.ts View File

@@ -6,7 +6,7 @@
export default { export default {
dev: { dev: {
'/api/': { '/api/': {
target: 'http://localhost:5001',
target: 'http://localhost:5002',
pathRewrite: { pathRewrite: {
'/api': '/api' '/api': '/api'
}, },
@@ -15,12 +15,12 @@ export default {
}, },
pre: { pre: {
'/api/': { '/api/': {
target: 'http://localhost:5000',
changeOrigin: true,
secure: false,
pathRewrite: {
'/api': ''
},
target: 'http://localhost:5002',
changeOrigin: true,
secure: false,
pathRewrite: {
'/api': ''
},
}, },
},
},
}; };

+ 16
- 20
frontend/config/routes.ts View File

@@ -1,6 +1,5 @@
export default [ export default [
{ path: '/user', layout: false, routes: [{ path: '/user/login', component: './user/login' }] }, { path: '/user', layout: false, routes: [{ path: '/user/login', component: './user/login' }] },
<<<<<<< HEAD
// { path: '/', icon: 'SmileOutlined', component: './welcome', name: '数据看板' }, // { path: '/', icon: 'SmileOutlined', component: './welcome', name: '数据看板' },
// { // {
// icon: 'SettingOutlined', // icon: 'SettingOutlined',
@@ -21,19 +20,19 @@
// path: '/wmx/deviceProduct', // path: '/wmx/deviceProduct',
// component: './deviceProductInfo/index', // component: './deviceProductInfo/index',
// }, // },
// ] // ]
// }, // },
{ {
path: '/kep', icon: 'SettingOutlined', name: '大屏数据', path: '/kep', icon: 'SettingOutlined', name: '大屏数据',
routes: [ {
name: '数据看板',
path: '/kep/datav',
routes: [{
name: '数据看板',
path: '/kep/datav',
component: './kep/datav', component: './kep/datav',
}, },
{ {
name: '报警限制',
path: '/kep/alarmLimit',
name: '报警限制',
path: '/kep/alarmLimit',
component: './kep/alarmLimit', component: './kep/alarmLimit',
} }
] ]
@@ -48,7 +47,7 @@
// { path: '/base/dict',name:'数据字典',component:'./dict/index'} // { path: '/base/dict',name:'数据字典',component:'./dict/index'}
// ] // ]
// }, // },
// { // {
// path: '/line', icon: 'SettingOutlined', name: '产线管理', // path: '/line', icon: 'SettingOutlined', name: '产线管理',
// routes: [ // routes: [
@@ -87,7 +86,6 @@
// { path: '/report/material', name: '原料统计', component: './report/material' }, // { path: '/report/material', name: '原料统计', component: './report/material' },
// ] // ]
// }, // },
=======
{ path: '/', icon: 'SmileOutlined', component: './welcome', name: '数据看板' }, { path: '/', icon: 'SmileOutlined', component: './welcome', name: '数据看板' },
{ {
icon: 'SettingOutlined', icon: 'SettingOutlined',
@@ -111,16 +109,15 @@


] ]
}, },
{
path: '/kep', icon: 'SettingOutlined', name: '大屏数据',
routes: [{
name: '数据看板',
path: '/kep',
component: './kep',
},

]
},
// {
// path: '/kep', icon: 'SettingOutlined', name: '大屏数据',
// routes: [{
// name: '数据看板',
// path: '/kep',
// component: './kep',
// },
// ]
// },
{ {
path: '/base', icon: 'SettingOutlined', name: '基础数据管理', path: '/base', icon: 'SettingOutlined', name: '基础数据管理',
routes: [{ path: '/base/deviceinfo', name: '设备管理', component: './deviceInfo/index' }, routes: [{ path: '/base/deviceinfo', name: '设备管理', component: './deviceInfo/index' },
@@ -171,7 +168,6 @@
{ path: '/report/material', name: '原料统计', component: './report/material' }, { path: '/report/material', name: '原料统计', component: './report/material' },
] ]
}, },
>>>>>>> 6f4b2f1df49c81e7fad80144116bbcedd9567b2e
{ path: '*', layout: false, component: './404' }, { path: '*', layout: false, component: './404' },


]; ];

+ 0
- 993
frontend/dist/348.5c88ec60.async.js
File diff suppressed because it is too large
View File


+ 1
- 5
frontend/dist/index.html View File

@@ -6,10 +6,6 @@
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<<<<<<< HEAD
<script src="/umi.21356be0.js"></script>
=======
<script src="/umi.eeba41ac.js"></script>
>>>>>>> 6f4b2f1df49c81e7fad80144116bbcedd9567b2e
<script src="/umi.65cd7f67.js"></script>


</body></html> </body></html>

+ 0
- 1
frontend/dist/p__kep__index.c95cb979.async.js
File diff suppressed because it is too large
View File


+ 0
- 1
frontend/dist/p__kep__index.feb0c626.chunk.css View File

@@ -1 +0,0 @@
#data-view{width:100%;height:100%;background-color:#030409;color:#fff}#data-view #dv-full-screen-container{background-image:url(./static/bg.9a80c9d4.png);background-size:100% 100%;box-shadow:0 0 3px #00f;display:flex;flex-direction:column}#data-view #dv-full-screen-container #chart_title{padding:10;color:"#04b2f7";font-size:"18px";font-weight:"bold"}#data-view .head_title{text-align:center;position:relative}#data-view .head_title_txt{position:absolute;top:15px;font-size:24px;right:46%}#data-view .g2-tooltip-title{color:#fff}#data-view .g2-html-annotation{font-size:14px}

+ 0
- 1
frontend/dist/p__recipe__index.5666d931.async.js
File diff suppressed because it is too large
View File


+ 0
- 1
frontend/dist/p__user__login__index.0dee4dca.async.js
File diff suppressed because it is too large
View File


BIN
View File


+ 0
- 1
frontend/dist/t__plugin-layout__Layout.f1f97356.async.js
File diff suppressed because it is too large
View File


+ 0
- 345
frontend/dist/umi.eeba41ac.js
File diff suppressed because it is too large
View File


+ 39
- 7
frontend/src/api/KepService.ts View File

@@ -2,15 +2,47 @@ import { request } from '@umijs/max';




export default { export default {
//列表
List() {
return request('/api/kepdata/getlist', {

Getdatavalarmlimitpage(params) {
return request('/api/kepdata/getdatavalarmlimitlist', {
method: 'POST',
data: {
...params
}
});
},
Adddatavalarmlimit(params) {
return request('/api/kepdata/adddatavalarmlimit', {
method: 'POST', method: 'POST',
data: {
...params
}
}); });
}, },
DeleteKep() {
return request('/api/kepdata/deletekep', {
method: 'Get',
Updatedatavalarmlimit(params) {
return request('/api/kepdata/updatedatavalarmlimit', {
method: 'POST',
data: {
...params
}
}); });
}, },
}
Del(parms) {
return request(`/api/kepdata/deldatavalarmlimitlist/`+parms, {
method: 'POST',
});
},
getdatavData() {
return request(`/api/kepdata/getdatavlist`, {
method: 'GET',
});
},
getlogs() {
return request(`/api/kepdata/getlogs`, {
method: 'GET',
});
}
}


+ 2797
- 2797
frontend/src/components/KepData/index.tsx
File diff suppressed because it is too large
View File


+ 11
- 27
frontend/src/pages/recipe/index.tsx View File

@@ -184,33 +184,17 @@ const Index = () => {
}; };
}, },
}, },
// {
// title: '步骤',
// dataIndex: 'sort',
// valueType: 'text',
// tooltip: "步骤不可重复",
// ellipsis: true,
// formItemProps: () => {
// return {
// rules: [{ required: true, message: '此项为必填项' }]
// // ,
// // () => ({
// // validator(_, value) {
// // if (!materiallist[rowIndex]) {
// // if (!materiallist.find(x => x.sort === value)) {
// // return Promise.resolve();
// // }
// // } else {
// // if (materiallist.filter(x => x.sort === value && x.id !== materiallist[rowIndex].id).length < 1) {
// // return Promise.resolve();
// // }
// // }
// // return Promise.reject(new Error('已存在步骤!'));
// // },
// // })
// };
// },
// },
{
title: '重量误差(±)',
dataIndex: 'errorWeight',
valueType: 'text',
ellipsis: true,
formItemProps: () => {
return {
rules: [{ required: true, message: '此项为必填项' }],
};
},
},
{ {
title: '操作', title: '操作',
valueType: 'option', valueType: 'option',


+ 50
- 50
frontend/src/pages/user/login/index.tsx View File

@@ -20,9 +20,9 @@ const Login: React.FC = () => {
setIsLoading(true); setIsLoading(true);
const md5_str = md5(params.pwd); const md5_str = md5(params.pwd);
params.pwd = md5_str; params.pwd = md5_str;
userApi.Login(params).then((response: MyResponse.Content)=>{
userApi.Login(params).then((response: MyResponse.Content) => {
setIsLoading(false); setIsLoading(false);
if (response.statusCode===200) {
if (response.statusCode === 200) {
refresh(); refresh();
history.push('/'); history.push('/');
message.success('登录成功！'); message.success('登录成功！');
@@ -30,63 +30,63 @@ const Login: React.FC = () => {
setIsLoading(false); setIsLoading(false);
message.error(response.errors || '登录失败！'); message.error(response.errors || '登录失败！');
} }
}).catch(()=>{
}).catch(() => {
setIsLoading(false); setIsLoading(false);
})
})
}; };


return ( return (
<div className={styles.container}> <div className={styles.container}>
<div className={styles.content}> <div className={styles.content}>
<div className={styles.login_box}> <div className={styles.login_box}>
<div className={styles.login_header}>
{/* <div className={styles.login_logo}>
<div className={styles.login_header}>
{/* <div className={styles.login_logo}>
<img src={LogoImg}></img> <img src={LogoImg}></img>
</div> */} </div> */}
<div className={styles.login_logo_name}></div>
</div>
<div className={styles.login_input}>
<div className={styles.login_logo_name}>控管理系统</div>
<Divider/>
<Form name="basic" onFinish={onUserLogin} >
<Form.Item name="account" style={{width:'90%'}} rules={[{ required: true, message: '请输入用户名！' }]}>
<Input
bordered={false}
size="large"
prefix={<UserOutlined color='white' />}
placeholder="请输入用户名！"
className={styles.from_Input}
allowClear
/>
</Form.Item>
<Divider/>
<Form.Item name="pwd" style={{width:'90%'}} rules={[{ required: true, message: '请输入密码！' }]}>
<Input.Password
bordered={false}
size="large"
prefix={<LockOutlined color='white' />}
placeholder="请输入密码！"
className={styles.from_Input}
allowClear
/>
</Form.Item>
<Divider/>
<Form.Item style={{height:'80px',width:'90%'}}>
<Button
type="primary"
htmlType="submit"
style={{ width: '90%' }}
icon={isLoading ? <LoadingOutlined /> : null}
>
登录
</Button>
</Form.Item>
</Form>
</div>
<div className={styles.login_logo_name}></div>
</div>
<div className={styles.login_input}>
<div className={styles.login_logo_name}>中控管理系统</div>
<Divider />
<Form name="basic" onFinish={onUserLogin} >
<Form.Item name="account" style={{ width: '90%' }} rules={[{ required: true, message: '请输入用户名！' }]}>
<Input
bordered={false}
size="large"
prefix={<UserOutlined color='white' />}
placeholder="请输入用户名！"
className={styles.from_Input}
allowClear
/>
</Form.Item>
<Divider />
<Form.Item name="pwd" style={{ width: '90%' }} rules={[{ required: true, message: '请输入密码！' }]}>
<Input.Password
bordered={false}
size="large"
prefix={<LockOutlined color='white' />}
placeholder="请输入密码！"
className={styles.from_Input}
allowClear
/>
</Form.Item>
<Divider />
<Form.Item style={{ height: '80px', width: '90%' }}>
<Button
type="primary"
htmlType="submit"
style={{ width: '90%' }}
icon={isLoading ? <LoadingOutlined /> : null}
>
登录
</Button>
</Form.Item>
</Form>
</div>
</div> </div>
</div> </div>
<Footer /> <Footer />


Write Preview
Loading…
Cancel
Save