Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
周远喜
mes-ui
Commits
049b4d00
Commit
049b4d00
authored
Jun 05, 2020
by
周远喜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ok
parent
f2bf918b
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
39 deletions
+6
-39
productNumberSelect.vue
components/page/productNumberSelect.vue
+1
-1
index.vue
pages/produce/execute/index.vue
+0
-36
orderlist.vue
pages/produce/orderlist.vue
+3
-1
config.js
static/config.js
+2
-1
No files found.
components/page/productNumberSelect.vue
View file @
049b4d00
...
@@ -30,7 +30,7 @@ export default {
...
@@ -30,7 +30,7 @@ export default {
this
.
getCodes
();
this
.
getCodes
();
},
},
props
:
{
props
:
{
eid
:
Number
,
eid
:
[
Number
,
String
]
,
value
:
[
String
,
Number
,
Array
],
value
:
[
String
,
Number
,
Array
],
placeholder
:
{
placeholder
:
{
type
:
String
,
type
:
String
,
...
...
pages/produce/execute/index.vue
View file @
049b4d00
...
@@ -69,42 +69,6 @@ export default {
...
@@ -69,42 +69,6 @@ export default {
odermodel
:
-
9
,
odermodel
:
-
9
,
orderId
:
null
,
orderId
:
null
,
row
:{},
row
:{},
oderList
:
[
{
value
:
-
9
,
label
:
"全部"
},
{
value
:
12
,
label
:
"未开工"
},
{
value
:
14
,
label
:
"执行中"
},
{
value
:
0
,
label
:
"已完成"
},
{
value
:
5
,
label
:
"暂停中"
},
{
value
:
7
,
label
:
"已终止"
},
{
value
:
-
1
,
label
:
"待派工"
}
// value: '交检中',
// label: '交检中'
// },{
// value: '交接中',
// label: '交接中'
// },{
],
condition
:
[]
condition
:
[]
};
};
},
},
...
...
pages/produce/orderlist.vue
View file @
049b4d00
...
@@ -53,6 +53,7 @@
...
@@ -53,6 +53,7 @@
:src=
"getUrl(row.productUrl)"
:src=
"getUrl(row.productUrl)"
width=
"120"
width=
"120"
height=
"120"
height=
"120"
:title=
"row.productUrl"
style=
"border:#cacbd0 dashed 1px"
style=
"border:#cacbd0 dashed 1px"
/>
/>
</Col>
</Col>
...
@@ -278,7 +279,7 @@ export default {
...
@@ -278,7 +279,7 @@ export default {
//返回img需要显示的src值
//返回img需要显示的src值
let
tempUrl
=
""
;
let
tempUrl
=
""
;
if
(
url
&&
url
.
length
>
0
)
{
if
(
url
&&
url
.
length
>
0
)
{
tempUrl
=
this
.
downUrl
+
JSON
.
parse
(
url
)[
0
].
filePath
;
tempUrl
=
url
;
}
else
{
}
else
{
tempUrl
=
iconImg
+
"noPic_product.png"
;
tempUrl
=
iconImg
+
"noPic_product.png"
;
}
}
...
@@ -297,6 +298,7 @@ export default {
...
@@ -297,6 +298,7 @@ export default {
// height: 100%;
// height: 100%;
// overflow: auto;
// overflow: auto;
// padding: 15px 0 15px 15px;
// padding: 15px 0 15px 15px;
height: calc(100vh - 110px);
.body {
.body {
background: white;
background: white;
border-radius: 4px;
border-radius: 4px;
...
...
static/config.js
View file @
049b4d00
...
@@ -12,7 +12,8 @@ let address=systemApi.dev;
...
@@ -12,7 +12,8 @@ let address=systemApi.dev;
window
.
systemUrl
=
`http://
${
address
}
:10000/system`
;
//System-api 系统管理(基础数据)
window
.
systemUrl
=
`http://
${
address
}
:10000/system`
;
//System-api 系统管理(基础数据)
window
.
authUrl
=
`http://
${
address
}
:10010`
;
//Authentication-api //统一登陆认证
window
.
authUrl
=
`http://
${
address
}
:10010`
;
//Authentication-api //统一登陆认证
window
.
designUrl
=
`http://
${
address
}
:10000/process`
;
// 工艺规程
window
.
designUrl
=
`http://
${
address
}
:10000/process`
;
// 工艺规程
window
.
PlanUrl
=
`http://
${
address
}
:10000/plan`
;
//订单
// window.PlanUrl = `http://${address}:10000/plan`; //订单
window
.
PlanUrl
=
`http://localhost:10050/api/services/app`
;
//Process-api
window
.
bugUrl
=
`http://
${
address
}
:10000/bug`
;
//bug
window
.
bugUrl
=
`http://
${
address
}
:10000/bug`
;
//bug
window
.
fileUrl
=
`http://
${
address
}
:10080/fileServer`
;
//文件上传url
window
.
fileUrl
=
`http://
${
address
}
:10080/fileServer`
;
//文件上传url
window
.
fileUrlDown
=
`http://
${
address
}
`
;
//文件下载url
window
.
fileUrlDown
=
`http://
${
address
}
`
;
//文件下载url
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment