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
7edb4e9d
Commit
7edb4e9d
authored
Jun 19, 2020
by
kangzhenfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mnc&dnc
parent
174af202
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
67 additions
and
21 deletions
+67
-21
analysis.vue
pages/dncmnc/mnc/analysis.vue
+2
-1
echart2.vue
pages/dncmnc/mnc/compose/echart2.vue
+1
-1
echart3.vue
pages/dncmnc/mnc/compose/echart3.vue
+1
-1
mnc.less
pages/dncmnc/mnc/mnc.less
+23
-0
monitoring.vue
pages/dncmnc/mnc/monitoring.vue
+40
-18
No files found.
pages/dncmnc/mnc/analysis.vue
View file @
7edb4e9d
...
...
@@ -15,7 +15,7 @@
<Radio
label=
"1"
>
年度
</Radio>
<Radio
label=
"2"
>
月度
</Radio>
</RadioGroup>
<DatePicker
type=
"month"
placeholder=
"选择月份"
style=
"width: 200px"
></DatePicker>
<DatePicker
v-model=
"taskTime"
type=
"month"
placeholder=
"选择月份"
style=
"width: 200px"
></DatePicker>
<Button
@
click=
"search()"
>
查询
</Button>
</p>
<!-- 数据分析表 -->
...
...
@@ -34,6 +34,7 @@ export default {
data
()
{
return
{
nian
:
2
,
taskTime
:
new
Date
(),
};
},
methods
:
{
...
...
pages/dncmnc/mnc/compose/echart2.vue
View file @
7edb4e9d
<
template
>
<div>
<div
id=
"myChart"
style=
"width:380px;height:
426
px;margin:0 auto;top: 0px;"
></div>
<div
id=
"myChart"
style=
"width:380px;height:
300
px;margin:0 auto;top: 0px;"
></div>
</div>
</
template
>
<
script
>
...
...
pages/dncmnc/mnc/compose/echart3.vue
View file @
7edb4e9d
<
template
>
<div>
<div
id=
"myChart03"
style=
"width:865px;height:
640
px;top: 0px;"
></div>
<div
id=
"myChart03"
style=
"width:865px;height:
516
px;top: 0px;"
></div>
</div>
</
template
>
<
script
>
...
...
pages/dncmnc/mnc/mnc.less
View file @
7edb4e9d
...
...
@@ -44,4 +44,27 @@
}
}
}
}
#echarts{
.set_echarts{
.tips{
// padding: 20px;
.tips_item{
background: #eff1f7;
margin: 20px;
line-height: 36px;
padding: 0 20px;
.item_top{
border-bottom: 1px solid #b1b1b1;
}
.item_center{
text-align: center;
line-height: 32px;
}
.item_right{
float: right;
}
}
}
}
}
\ No newline at end of file
pages/dncmnc/mnc/monitoring.vue
View file @
7edb4e9d
...
...
@@ -98,35 +98,57 @@
</div>
</Col>
<Col
span=
"18"
>
<div
class=
"set_card_box"
>
<div
class=
"set_card_box"
id=
"echarts"
>
<p
class=
"set_top"
>
加工状态实时信息
</p>
<div
class=
"set_echarts"
>
<Row>
<Col
span=
"1
5
"
>
<Col
span=
"1
6
"
>
<div
class=
"echart3"
>
<Echart3
></Echart3>
</div>
</Col>
<Col
span=
"
9
"
>
<Col
span=
"
8
"
>
<div
class=
"tips"
>
<div
class=
"tips_item"
>
<P
class=
"item_top"
>
工件坐标 位置值 角速率
</P>
<p>
X 30mm 0
</p>
<p>
Y 30mm 0
</p>
<p>
Z 30mm 0
</p>
<p>
A 30deg 18
</p>
<p>
B 30deg 0
</p>
<Row
class=
"item_top"
>
<Col
span=
"8"
class=
"item_center"
>
工件坐标
</Col>
<Col
span=
"8"
class=
"item_center"
>
位置值
</Col>
<Col
span=
"8"
class=
"item_center"
>
角速率
</Col>
</Row>
<Row>
<Col
span=
"8"
class=
"item_center"
>
X
</Col>
<Col
span=
"8"
class=
"item_center"
>
30mm
</Col>
<Col
span=
"8"
class=
"item_center"
>
0
</Col>
</Row>
<Row>
<Col
span=
"8"
class=
"item_center"
>
Y
</Col>
<Col
span=
"8"
class=
"item_center"
>
30mm
</Col>
<Col
span=
"8"
class=
"item_center"
>
0
</Col>
</Row>
<Row>
<Col
span=
"8"
class=
"item_center"
>
Z
</Col>
<Col
span=
"8"
class=
"item_center"
>
30mm
</Col>
<Col
span=
"8"
class=
"item_center"
>
0
</Col>
</Row>
<Row>
<Col
span=
"8"
class=
"item_center"
>
A
</Col>
<Col
span=
"8"
class=
"item_center"
>
30deg
</Col>
<Col
span=
"8"
class=
"item_center"
>
18
</Col>
</Row>
<Row
>
<Col
span=
"8"
class=
"item_center"
>
B
</Col>
<Col
span=
"8"
class=
"item_center"
>
30deg
</Col>
<Col
span=
"8"
class=
"item_center"
>
6
</Col>
</Row>
</div>
<div
class=
"tips_item"
>
<p>
当前程序行:
G01*100
</p>
<p>
当前刀具名称:
GD236689
</p>
<p>
当前刀库号:
12
</p>
<p>
刀具已使用工时:
10
</p>
<p>
刀补值:
-20
</p>
<p>
刀补地址:
D1
</p>
<p>
扭矩:
200
</p>
<p>
当前程序行:
<span
class=
"item_right"
>
G01*100
</span>
</p>
<p>
当前刀具名称:
<span
class=
"item_right"
>
GD236689
</span>
</p>
<p>
当前刀库号:
<span
class=
"item_right"
>
1213
</span>
</p>
<p>
刀具已使用工时:
<span
class=
"item_right"
>
10
</span>
</p>
<p>
刀补值:
<span
class=
"item_right"
>
20
</span>
-
</p>
<p>
刀补地址:
<span
class=
"item_right"
>
D1
</span>
</p>
<p>
扭矩:
<span
class=
"item_right"
>
200
</span>
</p>
</div>
</div>
</Col>
...
...
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