Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

src/components/icss/IndeptLabel.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <crumbs title="独立标签维护" style="min-width: 1085px">
+        <crumbs title="独立标签维护" style="min-width: 980px">
             <el-form :inline="true" class="demo-form-inline">
                 <!--<el-form-item label="标签类型：">
                     <el-select size="mini" v-model="filter.tagType[0]" placeholder="标签类型" clearable>
@@ -64,14 +64,17 @@
             </el-table>
 
         </div>
-        <el-pagination v-if="total>pageSize"
-                       :current-page.sync="currentPage"
-                       @current-change="currentChange"
-                       background
-                       :page-size="pageSize"
-                       layout="total,prev, pager, next, jumper"
-                       :total="total">
-        </el-pagination>
+        <div class="pagination">
+            <el-pagination v-if="total>pageSize"
+                        :current-page.sync="currentPage"
+                        @current-change="currentChange"
+                        background
+                        :page-size="pageSize"
+                        layout="total,prev, pager, next, jumper"
+                        :total="total">
+            </el-pagination>
+        </div>
+        
     </div>
 </template>
 

src/components/icss/InspactTagGroup.vue

@@ -320,6 +320,9 @@ export default {
         top: -5px;
         right: -5px;
     }
+    .pagination {
+        min-width: 1010px;
+    }
     .active {
         color: #aBcdef;
     }