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
3011faa4
Commit
3011faa4
authored
Dec 14, 2018
by
王文琼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
c测试发布软件更新
parent
afa3ff4f
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
15 deletions
+9
-15
index.js
dest/js/index/index.js
+4
-4
cutting.js
dest/js/mes/cutting.js
+3
-6
update.min.js
dest/js/update.min.js
+1
-2
Cutting.html
html/Cutting.html
+0
-1
index.html
index.html
+0
-1
manifest.json
manifest.json
+1
-1
No files found.
dest/js/index/index.js
View file @
3011faa4
...
@@ -54,14 +54,14 @@ var minepage_style = {
...
@@ -54,14 +54,14 @@ var minepage_style = {
// 下载wgt文件
// 下载wgt文件
var
wgtUrl
=
"http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes/ftt_mes_hot.wgt"
;
var
wgtUrl
=
"http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes/ftt_mes_hot.wgt"
;
function
downWgtHot
(){
function
downWgtHot
(){
plus
.
nativeUI
.
showWaiting
(
"下载
wgt
文件..."
);
plus
.
nativeUI
.
showWaiting
(
"下载
补丁
文件..."
);
plus
.
downloader
.
createDownload
(
wgtUrl
,
{
filename
:
"_doc/update/"
},
function
(
d
,
status
){
plus
.
downloader
.
createDownload
(
wgtUrl
,
{
filename
:
"_doc/update/"
},
function
(
d
,
status
){
if
(
status
==
200
)
{
if
(
status
==
200
)
{
console
.
log
(
"下载
wgt
成功:"
+
d
.
filename
);
console
.
log
(
"下载
补丁
成功:"
+
d
.
filename
);
installWgtHOt
(
d
.
filename
);
// 安装wgt包
installWgtHOt
(
d
.
filename
);
// 安装wgt包
}
else
{
}
else
{
console
.
log
(
"下载
wgt
失败!"
);
console
.
log
(
"下载
补丁
失败!"
);
plus
.
nativeUI
.
alert
(
"下载
wgt
失败!"
);
plus
.
nativeUI
.
alert
(
"下载
补丁
失败!"
);
}
}
plus
.
nativeUI
.
closeWaiting
();
plus
.
nativeUI
.
closeWaiting
();
}).
start
();
}).
start
();
...
...
dest/js/mes/cutting.js
View file @
3011faa4
...
@@ -196,16 +196,14 @@ var app = new Vue({
...
@@ -196,16 +196,14 @@ var app = new Vue({
});
});
mui
(
'#progress .mui-text-center'
).
each
(
function
()
{
mui
(
'#progress .mui-text-center'
).
each
(
function
()
{
//console.log(this.getAttribute("data-progress"));
//console.log(this.getAttribute("data-progress"));
mui
(
this
).
progressbar
({
progress
:
this
.
getAttribute
(
"data-progress"
)}).
show
()
mui
(
this
).
progressbar
({
progress
:
this
.
getAttribute
(
"data-progress"
)}).
show
()
;
})
})
mui
(
".mui-icon-clear"
)[
0
].
addEventListener
(
'tap'
,
function
()
{
mui
(
".mui-icon-clear"
)[
0
].
addEventListener
(
'tap'
,
function
()
{
document
.
activeElement
.
blur
();
//收起虚拟键盘
document
.
activeElement
.
blur
();
//收起虚拟键盘
app
.
searchText
=
''
;
app
.
searchText
=
''
;
app
.
getData
();
app
.
getData
();
//console.log('1111');
//console.log('1111');
});
});
setTimeout
(
function
()
{
setTimeout
(
function
()
{
plus
.
nativeUI
.
closeWaiting
();
plus
.
nativeUI
.
closeWaiting
();
...
@@ -220,7 +218,6 @@ var app = new Vue({
...
@@ -220,7 +218,6 @@ var app = new Vue({
this
.
today
=
this
.
dateTime
;
this
.
today
=
this
.
dateTime
;
this
.
getData
();
this
.
getData
();
},
},
getData
:
function
()
{
getData
:
function
()
{
var
that
=
this
;
var
that
=
this
;
this
.
createZhezhao
(
-
1
)
this
.
createZhezhao
(
-
1
)
...
@@ -232,7 +229,7 @@ var app = new Vue({
...
@@ -232,7 +229,7 @@ var app = new Vue({
that
.
cur
=
0
;
that
.
cur
=
0
;
Api
.
post
(
'/api/vMES/CutOffProductionReport/ToDo'
,
para
,
function
(
e
)
{
Api
.
post
(
'/api/vMES/CutOffProductionReport/ToDo'
,
para
,
function
(
e
)
{
//console.log("one :::;" +JSON.stringify(e.items.length))
//console.log("one :::;" +JSON.stringify(e.items.length))
console
.
log
(
"
完成进度:"
+
JSON
.
stringify
(
e
.
items
[
0
].
CompleteRatio
))
console
.
log
(
"
getData:"
+
JSON
.
stringify
(
e
.
items
))
//console.log("点击之前"+JSON.stringify(that.rightInfor))
//console.log("点击之前"+JSON.stringify(that.rightInfor))
if
(
e
.
items
.
length
>
0
)
{
if
(
e
.
items
.
length
>
0
)
{
that
.
itemsHead
=
e
.
items
;
that
.
itemsHead
=
e
.
items
;
...
...
dest/js/update.min.js
View file @
3011faa4
...
@@ -14,7 +14,6 @@
...
@@ -14,7 +14,6 @@
var
is_invoke_from_setting
=
false
;
var
is_invoke_from_setting
=
false
;
/**
/**
* 创建升级目录
* 创建升级目录
*/
*/
...
...
html/Cutting.html
View file @
3011faa4
...
@@ -8,7 +8,6 @@
...
@@ -8,7 +8,6 @@
<link
href=
"../dest/css/mui.min.css"
rel=
"stylesheet"
/>
<link
href=
"../dest/css/mui.min.css"
rel=
"stylesheet"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"../dest/css/mui.picker.min.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"../dest/css/mui.picker.min.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"../dest/css/Cutting.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"../dest/css/Cutting.css"
/>
</head>
</head>
<body>
<body>
<div
id=
"app"
style=
" display:block"
v-cloak
>
<div
id=
"app"
style=
" display:block"
v-cloak
>
...
...
index.html
View file @
3011faa4
...
@@ -31,7 +31,6 @@
...
@@ -31,7 +31,6 @@
</style>
</style>
</head>
</head>
<body>
<body>
<script
src=
"dest/js/mui.min.js"
></script>
<script
src=
"dest/js/mui.min.js"
></script>
<script
src=
"dest/js/update.min.js"
></script>
<script
src=
"dest/js/update.min.js"
></script>
<script
src=
"dest/js/app.min.js"
></script>
<script
src=
"dest/js/app.min.js"
></script>
...
...
manifest.json
View file @
3011faa4
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
"id"
:
"H544710A8"
,
/*应用的标识,创建应用时自动生成,勿手动修改*/
"id"
:
"H544710A8"
,
/*应用的标识,创建应用时自动生成,勿手动修改*/
"name"
:
"飞天兔MES"
,
/*应用名称,程序桌面图标名称*/
"name"
:
"飞天兔MES"
,
/*应用名称,程序桌面图标名称*/
"version"
:
{
"version"
:
{
"name"
:
"1.0.0.
84
"
,
/*应用版本名称*/
"name"
:
"1.0.0.
90
"
,
/*应用版本名称*/
"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