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
26234a35
Commit
26234a35
authored
Jun 22, 2020
by
kangzhenfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dnc-diff
parent
17cf57b2
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
66 additions
and
0 deletions
+66
-0
datalist.vue
pages/dncmnc/dnc/datalist.vue
+1
-0
difftext.vue
pages/dncmnc/dnc/difftext.vue
+65
-0
textdiff.png
pages/dncmnc/image/textdiff.png
+0
-0
No files found.
pages/dncmnc/dnc/datalist.vue
View file @
26234a35
...
...
@@ -505,6 +505,7 @@ export default {
},
fileBeyong
(){
this
.
$Message
.
success
(
"对比文件"
)
this
.
$router
.
push
(
"/dncmnc/dnc/difftext"
);
},
// 打开抽屉
openDrawer
()
{
...
...
pages/dncmnc/dnc/difftext.vue
0 → 100644
View file @
26234a35
<
style
lang=
"less"
scoped
>
@import "./dispatch.less";
</
style
>
<
template
>
<div
class=
"diff_box"
>
<a
class=
"back_href"
@
click=
"goView"
>
<Icon
type=
"ios-undo-outline"
size=
"24"
/>
返回设备监控
</a>
<div
class=
"diff_card"
>
<div
class=
"diff_top"
>
程序名:00123_281
</div>
<div
class=
"diff_top"
>
程序名:1288-268
绑定设备:数控机床
</div>
<img
src=
"../image/textdiff.png"
alt=
""
>
</div>
</div>
</
template
>
<
script
>
import
Api
from
"./api"
;
export
default
{
components
:
{},
data
()
{
return
{
action
:
Api
.
index
,
byheight
:
"450px"
,
};
},
created
()
{
// this.getUserInfoFn();
this
.
byheight
=
window
.
innerHeight
-
178
+
"px"
;
},
mounted
()
{
this
.
byheight
=
window
.
innerHeight
-
178
+
"px"
;
},
async
fetch
({
store
,
params
})
{
await
store
.
dispatch
(
"loadDictionary"
);
// 加载数据字典
},
methods
:
{
goView
(){
//返回数控程序传输页面
this
.
$router
.
push
(
"/dncmnc/dnc/datalist"
);
},},
computed
:
{},
watch
:
{}
};
</
script
>
<
style
lang=
"less"
>
.diff_card{
width: 100%;
height: 86vh;
.diff_top{
width: 50%;
float: left;
text-align: center;
}
img{
display: block;
width: 90%;
margin: 0vh auto;
}
}
</
style
>
\ No newline at end of file
pages/dncmnc/image/textdiff.png
0 → 100644
View file @
26234a35
6.98 KB
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