Merge branch 'yly' into test
This commit is contained in:
commit
dca92ed5cb
@ -27,9 +27,9 @@
|
|||||||
</el-form>
|
</el-form>
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<el-table stripe :data="tableData">
|
<el-table stripe :data="tableData">
|
||||||
<el-table-column prop="order" label="序号" width="50px"> </el-table-column>
|
<el-table-column prop="order" label="序号" width="50px" />
|
||||||
<el-table-column prop="time" label="时间" width="120px"> </el-table-column>
|
<el-table-column prop="time" label="时间" width="120px" />
|
||||||
<el-table-column prop="origin" label="来源" width="120px"> </el-table-column>
|
<el-table-column prop="origin" label="来源" width="120px" />
|
||||||
<el-table-column prop="desc" label=""> </el-table-column>
|
<el-table-column prop="desc" label=""> </el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
@ -55,13 +55,13 @@ export default {
|
|||||||
desc: '设置股道3防溜,上行.铁鞋(无编号);下行.无防溜措施',
|
desc: '设置股道3防溜,上行.铁鞋(无编号);下行.无防溜措施',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
order: 0,
|
order: 1,
|
||||||
time: '2017-05-09 08:53:11',
|
time: '2017-05-09 08:53:11',
|
||||||
origin: '<12>12',
|
origin: '<12>12',
|
||||||
desc: '设置股道3防溜,上行.铁鞋(无编号);下行.无防溜措施',
|
desc: '设置股道3防溜,上行.铁鞋(无编号);下行.无防溜措施',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
order: 0,
|
order: 2,
|
||||||
time: '2017-05-09 08:53:11',
|
time: '2017-05-09 08:53:11',
|
||||||
origin: '<12>12',
|
origin: '<12>12',
|
||||||
desc: '设置股道3防溜,上行.铁鞋(无编号);下行.无防溜措施',
|
desc: '设置股道3防溜,上行.铁鞋(无编号);下行.无防溜措施',
|
||||||
|
Loading…
Reference in New Issue
Block a user