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

pages/aps/results/compare.vue

 <template>
 <div class="compare">
-    <div class="btn">
+    <div class="btn"  style="z-index:9999;position:absolute;right:0">
         <Button type="primary" @click="parameter">下发</Button>
           <!-- <Button type="primary">导出</Button>000 -->
         <Button type="primary" icon="ios-redo" @click="comeBlck">返回</Button>

pages/aps/results/result.vue

@@ -3,7 +3,7 @@
 </style>
 <template>
 <div>
-    <div class="btn">
+    <div class="btn" style="z-index:9999;position:absolute;right:0">
         <Button type="primary" @click="parameter">下发</Button>
           <!-- <Button type="primary">导出</Button>000 -->
         <Button type="primary" icon="ios-redo" @click="comeBlck">返回</Button>

pages/technology/details/index.vue

 <template>
   <div>
-    <DataGrid :columns="columns" ref="grid" :data="list" :easy="false" :high="false">
+    <DataGrid :columns="columns" ref="grid" :data="list" :easy="false" :high="false" :page="false">
       <template slot="buttons">
         <Button type="primary" @click="add">新增</Button>
       </template>