Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MES_PAD
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
Administrator
MES_PAD
Commits
ace52c26
Commit
ace52c26
authored
Jan 10, 2019
by
王文琼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
搜索栏优化,等
parent
486eec8b
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
234 additions
and
217 deletions
+234
-217
index.js
dest/js/index/index.js
+220
-213
FormingV2.js
dest/js/mes/FormingV2.js
+3
-1
NeedleMatch.js
dest/js/mes/NeedleMatch.js
+2
-0
NeedlecarHandover.js
dest/js/mes/NeedlecarHandover.js
+2
-0
NeedlecarreportV2.js
dest/js/mes/NeedlecarreportV2.js
+2
-0
cutting.js
dest/js/mes/cutting.js
+1
-0
update.min.js
dest/js/update.min.js
+2
-1
work.html
html/work.html
+1
-1
manifest.json
manifest.json
+1
-1
No files found.
dest/js/index/index.js
View file @
ace52c26
This diff is collapsed.
Click to expand it.
dest/js/mes/FormingV2.js
View file @
ace52c26
...
@@ -376,9 +376,10 @@ var app = new Vue({
...
@@ -376,9 +376,10 @@ var app = new Vue({
that
.
rightInfor
=
[];
that
.
rightInfor
=
[];
that
.
itemsDetail
=
[];
that
.
itemsDetail
=
[];
that
.
cur
=
0
;
that
.
cur
=
0
;
mui
.
toast
(
"没有对应的数据哦!"
)
}
}
},
function
(
xhr
,
type
,
res
)
{
},
function
(
xhr
,
type
,
res
)
{
mui
.
toast
(
JSON
.
stringify
(
res
.
message
))
mui
.
toast
(
JSON
.
stringify
(
res
.
message
))
;
});
});
}
else
{
}
else
{
Api
.
post
(
'/api/vMES/ProductionReportV2/SearchDone'
,
para
,
function
(
e
)
{
Api
.
post
(
'/api/vMES/ProductionReportV2/SearchDone'
,
para
,
function
(
e
)
{
...
@@ -394,6 +395,7 @@ var app = new Vue({
...
@@ -394,6 +395,7 @@ var app = new Vue({
that
.
rightInfor
=
[];
that
.
rightInfor
=
[];
that
.
itemsDetail
=
[];
that
.
itemsDetail
=
[];
that
.
cur
=
0
;
that
.
cur
=
0
;
mui
.
toast
(
"没有对应的数据哦!"
);
}
}
},
function
(
xhr
,
type
,
res
)
{
},
function
(
xhr
,
type
,
res
)
{
mui
.
toast
(
JSON
.
stringify
(
res
.
message
))
mui
.
toast
(
JSON
.
stringify
(
res
.
message
))
...
...
dest/js/mes/NeedleMatch.js
View file @
ace52c26
...
@@ -374,6 +374,7 @@ var app = new Vue({
...
@@ -374,6 +374,7 @@ var app = new Vue({
that
.
itemsLeft
=
[];
that
.
itemsLeft
=
[];
that
.
itemsDetail
=
[];
that
.
itemsDetail
=
[];
that
.
cur
=
0
;
that
.
cur
=
0
;
mui
.
toast
(
"没有对应的数据哦!"
);
}
}
}
}
},
function
(
xhr
,
type
,
res
)
{
},
function
(
xhr
,
type
,
res
)
{
...
@@ -393,6 +394,7 @@ var app = new Vue({
...
@@ -393,6 +394,7 @@ var app = new Vue({
that
.
itemsLeft2
=
[];
that
.
itemsLeft2
=
[];
that
.
itemsDetail
=
[];
that
.
itemsDetail
=
[];
that
.
cur
=
0
;
that
.
cur
=
0
;
mui
.
toast
(
"没有对应的数据哦!"
);
}
}
}
}
},
function
(
xhr
,
type
,
res
)
{
},
function
(
xhr
,
type
,
res
)
{
...
...
dest/js/mes/NeedlecarHandover.js
View file @
ace52c26
...
@@ -376,6 +376,7 @@ var app = new Vue({
...
@@ -376,6 +376,7 @@ var app = new Vue({
that
.
itemsLeft
=
[];
that
.
itemsLeft
=
[];
that
.
itemsDetail
=
[];
that
.
itemsDetail
=
[];
that
.
cur
=
0
;
that
.
cur
=
0
;
mui
.
toast
(
"没有对应的数据哦!"
);
}
}
}
}
},
function
(
xhr
,
type
,
res
)
{
},
function
(
xhr
,
type
,
res
)
{
...
@@ -395,6 +396,7 @@ var app = new Vue({
...
@@ -395,6 +396,7 @@ var app = new Vue({
that
.
itemsLeft2
=
[];
that
.
itemsLeft2
=
[];
that
.
itemsDetail
=
[];
that
.
itemsDetail
=
[];
that
.
cur
=
0
;
that
.
cur
=
0
;
mui
.
toast
(
"没有对应的数据哦!"
);
}
}
}
}
},
function
(
xhr
,
type
,
res
)
{
},
function
(
xhr
,
type
,
res
)
{
...
...
dest/js/mes/NeedlecarreportV2.js
View file @
ace52c26
...
@@ -375,6 +375,7 @@ var app = new Vue({
...
@@ -375,6 +375,7 @@ var app = new Vue({
that
.
rightInfor
=
[];
that
.
rightInfor
=
[];
that
.
itemsDetail
=
[];
that
.
itemsDetail
=
[];
that
.
cur
=
0
;
that
.
cur
=
0
;
mui
.
toast
(
"没有对应的数据哦!"
);
}
}
},
function
(
xhr
,
type
,
res
)
{
},
function
(
xhr
,
type
,
res
)
{
mui
.
toast
(
JSON
.
stringify
(
res
.
message
))
mui
.
toast
(
JSON
.
stringify
(
res
.
message
))
...
@@ -393,6 +394,7 @@ var app = new Vue({
...
@@ -393,6 +394,7 @@ var app = new Vue({
that
.
rightInfor
=
[];
that
.
rightInfor
=
[];
that
.
itemsDetail
=
[];
that
.
itemsDetail
=
[];
that
.
cur
=
0
;
that
.
cur
=
0
;
mui
.
toast
(
"没有对应的数据哦!"
);
}
}
},
function
(
xhr
,
type
,
res
)
{
},
function
(
xhr
,
type
,
res
)
{
mui
.
toast
(
JSON
.
stringify
(
res
.
message
))
mui
.
toast
(
JSON
.
stringify
(
res
.
message
))
...
...
dest/js/mes/cutting.js
View file @
ace52c26
...
@@ -374,6 +374,7 @@ var app = new Vue({
...
@@ -374,6 +374,7 @@ var app = new Vue({
that
.
rightInfor
=
[];
that
.
rightInfor
=
[];
that
.
itemsDetail
=
[];
that
.
itemsDetail
=
[];
that
.
cur
=
0
;
that
.
cur
=
0
;
mui
.
toast
(
"没有对应的数据哦!"
)
}
}
},
function
(
xhr
,
type
,
res
)
{
},
function
(
xhr
,
type
,
res
)
{
mui
.
toast
(
JSON
.
stringify
(
res
.
message
))
mui
.
toast
(
JSON
.
stringify
(
res
.
message
))
...
...
dest/js/update.min.js
View file @
ace52c26
(
function
(
$
){
(
function
(
$
){
var
t
=
(
new
Date
()).
valueOf
();
var
wgtVer
=
null
,
var
wgtVer
=
null
,
checkUrl
=
"http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes"
,
checkUrl
=
"http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes"
,
localDir
=
"update"
,
localDir
=
"update"
,
...
@@ -13,7 +14,6 @@
...
@@ -13,7 +14,6 @@
// 从设置那边调用 ,不检查"跳过此版本",如果没有新版本,也要跳出来提示框
// 从设置那边调用 ,不检查"跳过此版本",如果没有新版本,也要跳出来提示框
var
is_invoke_from_setting
=
false
;
var
is_invoke_from_setting
=
false
;
/**
/**
* 创建升级目录
* 创建升级目录
*/
*/
...
@@ -127,6 +127,7 @@ function getUpdateData(){
...
@@ -127,6 +127,7 @@ function getUpdateData(){
}
else
{
}
else
{
mui
.
toast
(
"xhr请求失败:"
+
xhr
.
status
)
console
.
log
(
"xhr请求失败:"
+
xhr
.
status
);
console
.
log
(
"xhr请求失败:"
+
xhr
.
status
);
}
}
break
;
break
;
...
...
html/work.html
View file @
ace52c26
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
border-radius
:
8px
;
border-radius
:
8px
;
}
}
.application-box
{
.application-box
{
display
:
block
;
display
:
none
;
}
}
</style>
</style>
</head>
</head>
...
...
manifest.json
View file @
ace52c26
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
"id"
:
"H544710A8"
,
/*应用的标识,创建应用时自动生成,勿手动修改*/
"id"
:
"H544710A8"
,
/*应用的标识,创建应用时自动生成,勿手动修改*/
"name"
:
"飞天兔MES"
,
/*应用名称,程序桌面图标名称*/
"name"
:
"飞天兔MES"
,
/*应用名称,程序桌面图标名称*/
"version"
:
{
"version"
:
{
"name"
:
"1.0.
0.97
"
,
/*应用版本名称*/
"name"
:
"1.0.
1.2
"
,
/*应用版本名称*/
"code"
:
338
"code"
:
338
},
},
"description"
:
"飞天兔MES平板版"
,
/*应用描述信息*/
"description"
:
"飞天兔MES平板版"
,
/*应用描述信息*/
...
...
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