Commit 7edb4e9d authored by kangzhenfei's avatar kangzhenfei

mnc&dnc

parent 174af202
......@@ -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: {
......
<template>
<div>
<div id="myChart" style="width:380px;height:426px;margin:0 auto;top: 0px;"></div>
<div id="myChart" style="width:380px;height:300px;margin:0 auto;top: 0px;"></div>
</div>
</template>
<script>
......
<template>
<div>
<div id="myChart03" style="width:865px;height:640px;top: 0px;"></div>
<div id="myChart03" style="width:865px;height:516px;top: 0px;"></div>
</div>
</template>
<script>
......
......@@ -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
......@@ -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="15">
<Col span="16">
<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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment