Merge branch 'master' into map_model

resources/js/views/device/categories.vue

@@ -6,7 +6,7 @@
           <span>{{ scope.row.tid }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="分类名称" width="150">
+      <el-table-column prop="name" label="分类名称">
         <template slot-scope="scope">
           <span>{{ scope.row.tname }}</span>
         </template>

resources/js/views/device/index.vue

@@ -6,6 +6,9 @@
         <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleSubmit">
           {{ $t('table.search') }}
         </el-button>
+        <el-button v-waves class="filter-item" type="primary" icon="el-icon-plus" @click="addDevice">
+          {{ $t('table.add') }}
+        </el-button>
       </el-form>
       <el-button v-if="device != '' " v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">
         {{ $t('table.export') }}