meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2018-12-28 20:45:14 +08:00
parent 61ce0ae9bf 344fe94622
commit 2c41c3e306
6 changed files with 13 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/ManufacturingCenter/ProcessPlanning.js
View File

@@ -115,7 +115,7 @@ export function processNameClick() {
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_工艺分类名称_查询数据'
name: '车间生产管理工艺_基础表_工艺分类名称_查询数据_零件工艺制定专用'
}
})
}

1
src/icons/svg/CreatePreparationBill.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545978709631" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="889" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M905.991306 283.750529l-22.87294-22.791076 0-51.319829-51.486628 0-22.87294-22.791076 0-51.326992-51.479465 0-22.881127-22.799262L734.398206 61.402465 213.876112 61.402465c-82.138742 0-148.72016 66.3655-148.72016 148.237159l0 592.950683c0 81.871659 66.582441 148.237159 148.72016 148.237159l594.881662 0c82.138742 0 148.72016-66.3655 148.72016-148.237159L957.477934 283.750529 905.991306 283.750529zM808.757774 802.590308 213.876112 802.590308 213.876112 209.639624l297.441343 0 0 296.475342 297.441343 0L808.758798 802.590308zM808.757774 357.876784 660.037614 357.876784 660.037614 209.639624l74.360592 0 0 74.110905 74.360592 0L808.758798 357.876784z" p-id="890"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

1
src/icons/svg/MachiningSequenceAdjustment.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545978842550" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1498" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 1024C229.248 1024 0 794.752 0 512 0 229.205333 229.248 0 512 0s512 229.205333 512 512c0 282.752-229.248 512-512 512z m0-938.666667C276.352 85.333333 85.333333 276.352 85.333333 512s191.018667 426.666667 426.666667 426.666667 426.666667-191.018667 426.666667-426.666667S747.648 85.333333 512 85.333333z m213.333333 640h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z m0-170.666666h-42.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333334h298.666666a42.666667 42.666667 0 0 1 85.333334 0h42.666666a42.666667 42.666667 0 0 1 0 85.333334z m0-170.666667h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z" p-id="1499"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

1
src/icons/svg/MaterialArrivalManagement.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545978796022" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1103" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M835.584 1016.32H50.176c-14.336 0-25.6-11.264-25.6-25.6V76.8c0-14.336 11.264-25.6 25.6-25.6h545.28c6.656 0 13.312 2.56 17.92 7.68l240.128 240.64c4.608 4.608 7.68 11.264 7.68 17.92v673.28c0 14.336-11.264 25.6-25.6 25.6z m-759.808-51.2h734.208V328.192l-225.28-225.792H75.776v862.72z" p-id="1104"></path><path d="M835.584 343.04h-240.128c-14.336 0-25.6-11.264-25.6-25.6V76.8c0-14.336 11.264-25.6 25.6-25.6s25.6 11.264 25.6 25.6v215.04h214.528c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM688.128 865.792c-6.656 0-13.312-2.56-17.92-7.68l-99.84-99.84c-4.608-4.608-7.68-11.264-7.68-17.92 0-6.656 2.56-13.312 7.68-17.92l99.84-99.328c10.24-9.728 26.112-9.728 36.352 0 9.728 10.24 9.728 26.112 0 36.352l-81.92 80.896 81.92 81.92c10.24 10.24 10.24 26.112 0 36.352-5.12 4.608-11.776 7.168-18.432 7.168zM574.464 428.544H247.808c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h326.656c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM574.464 604.672H247.808c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h326.656c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6z" p-id="1105"></path><path d="M984.064 769.024h-345.6c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h345.6c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM376.32 770.56H247.808c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h128.512c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6z" p-id="1106"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

18
src/utils/request.js
View File

@@ -3,23 +3,23 @@ import axios from 'axios'
// import store from '../store'
// import { getToken } from '@/utils/auth'
export const wsuri = `ws://localhost:61101//WebMoudule//websocket`
export const wsuri = `ws://192.168.0.2:61101//WebMoudule//websocket`
export const name = `OP8888`
// 创建axios实例
export const readFile = `http://localhost:8411/webpage/file/` // invoice
export const readImg = `http://localhost:8411/webpage/img/` // delivery/MS/performancebond
export const upload = `http://localhost:8411/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `http://localhost:8411/submit/upload2.ashx` // delivery
export const upload3 = `http://localhost:8411/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `http://localhost:8411/submit/uploadInvoiceScan.ashx` // invoice
export const download = `http://localhost:8411/submit/downloadFile.ashx` // ContractInformationManagement
export const readFile = `http://192.168.0.2:8411/webpage/file/` // invoice
export const readImg = `http://192.168.0.2:8411/webpage/img/` // delivery/MS/performancebond
export const upload = `http://192.168.0.2:8411/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `http://192.168.0.2:8411/submit/upload2.ashx` // delivery
export const upload3 = `http://192.168.0.2:8411/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `http://192.168.0.2:8411/submit/uploadInvoiceScan.ashx` // invoice
export const download = `http://192.168.0.2:8411/submit/downloadFile.ashx` // ContractInformationManagement
const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.0.2:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间

40
src/views/login/index.vue
View File

@@ -39,46 +39,6 @@
<el-button :loading="loading" class="signIn" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
登录
</el-button>
<div class="tips">
<span>超级管理员</span>
<span>账号：0000</span>
<span>密码：admin</span>
</div>
<div class="tips">
<span>营销中心</span>
<span>账号：2001</span>
<span>密码：2001</span>
</div>
<div class="tips">
<span>技术中心</span>
<span>账号：3001</span>
<span>密码：3001</span>
</div>
<div class="tips">
<span>制造中心</span>
<span>账号：4001</span>
<span>密码：4001</span>
</div>
<div class="tips">
<span>采购部</span>
<span>账号：4101</span>
<span>密码：4101</span>
</div>
<div class="tips">
<span>仓库</span>
<span>账号：4201</span>
<span>密码：4201</span>
</div>
<div class="tips">
<span>金工车间</span>
<span>账号：4301</span>
<span>密码：4301</span>
</div>
<div class="tips">
<span>装配车间</span>
<span>账号：4401</span>
<span>密码：4401</span>
</div>
</div>
</el-form>
</div>