Commit be1af7da authored by renjintao's avatar renjintao

Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

parents ed03c33f 8c0f4574
......@@ -38,7 +38,7 @@
</Form>
<Table border :columns="columns" :data="data"></Table>
<div class="page-v">
<Page :total="4" size="small" show-elevator show-sizer show-total :page-size="20" />
<Page :total="5" size="small" show-elevator show-sizer show-total :page-size="20" />
</div>
<Modal v-model="modal" :title="title" @on-ok="ok" @on-cancel="cancel" width="600">
<Form :model="formItem" :label-width="150">
......
......@@ -41,7 +41,7 @@
</Form>
<Table border :columns="columns" :data="data"></Table>
<div class="page-v">
<Page :total="4" size="small" show-elevator show-sizer show-total :page-size="20" />
<Page :total="14" size="small" show-elevator show-sizer show-total :page-size="20" />
</div>
<Modal v-model="modal" title="修程报警设置" @on-ok="ok" @on-cancel="cancel">
<Form :model="formItem" :label-width="200">
......
......@@ -50,7 +50,7 @@
</Form>
<Table border :columns="columns" :data="data"></Table>
<div class="page-v">
<Page :total="4" size="small" show-elevator show-sizer show-total :page-size="20" />
<Page :total="11" size="small" show-elevator show-sizer show-total :page-size="20" />
</div>
<Modal v-model="modal" :title="title" @on-ok="ok" @on-cancel="cancel" width="600">
......
......@@ -50,7 +50,7 @@
</Form>
<Table border :columns="columns" :data="data"></Table>
<div class="page-v">
<Page :total="4" size="small" show-elevator show-sizer show-total :page-size="20" />
<Page :total="11" size="small" show-elevator show-sizer show-total :page-size="20" />
</div>
<Modal v-model="modal" :title="title" @on-ok="ok" @on-cancel="cancel" width="600">
<Form :model="formItem" :label-width="100">
......
......@@ -55,7 +55,7 @@
</Form>
<Table border :columns="columns" :data="data"></Table>
<div class="page-v">
<Page :total="4" size="small" show-elevator show-sizer show-total :page-size="20" />
<Page :total="10" size="small" show-elevator show-sizer show-total :page-size="20" />
</div>
<Modal v-model="modal" :title="title" @on-ok="ok" @on-cancel="cancel" width="600">
<Form :model="formItem" :label-width="100">
......
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