Merge branch 'develop/3.0.6' into test

src/views/device/list/detail.vue

@@ -27,12 +27,12 @@
           <el-option v-for="item in manuOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="设备类型：" prop="categoryId">
+      <el-form-item label="设备分类：" prop="categoryId">
         <el-select v-model="form.categoryId" placeholder="请选择设备类型">
           <el-option v-for="item in categoryOptions" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="设备分类：" prop="deviceType">
+      <el-form-item label="设备类型：" prop="deviceType">
         <el-select v-model="form.deviceType" placeholder="请选择设备分类">
           <el-option v-for="item in deviceTypeOptions" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
@@ -53,7 +53,7 @@
           <el-form-item label="离线图片：" prop="offlineImg" style="float:right">
             <Upload listType="picture-card" :url="form.offlineImg" @upload="handleUploadImg($event, 'offline')"
               :disabled="disabled" />
-          </el-form-item> 
+          </el-form-item>
         </el-col>
       </el-row>
       <!-- 子表单 -->

src/views/device/list/index.vue

@@ -38,8 +38,8 @@
           <el-image :src="scope.row.img" />
         </template>
       </el-table-column>
-      <el-table-column label="设备类型" prop="categoryName" align="center" />
-      <el-table-column label="设备分类" prop="deviceType" align="center" :formatter="deviceTypeFormatter" />
+      <el-table-column label="设备分类" prop="categoryName" align="center" />
+      <el-table-column label="设备类型" prop="deviceType" align="center" :formatter="deviceTypeFormatter" />
       <el-table-column label="是否热门" prop="isHot" align="center" :formatter="hotFormatter" />
       <el-table-column label="升级方式" align="center" :formatter="upgradeTypeFormatter" />
       <el-table-column label="创建时间" prop="createTimeText" align="center" />

src/views/order/list/index.vue

@@ -59,8 +59,8 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="getSearch">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="getRefresh">重置</el-button>
-        <el-button type="primary" icon="el-icon-download" @click="handleExport">导出</el-button>
-        <el-button type="primary" @click="getDialog">查看</el-button>
+        <el-button type="primary" icon="el-icon-download" @click="handleExport" v-hasPermi="['order:list:export']">导出</el-button>
+        <el-button type="primary" @click="getDialog" v-hasPermi="['order:list:export']">查看</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->

src/views/push/update/index.vue

@@ -13,7 +13,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="getSearch">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="getRefresh">重置</el-button>
-        <el-button type="primary" icon="el-icon-plus" plain @click="getDetail()">新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" plain @click="getDetail()" v-hasPermi="['push:update:add']">新增</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
@@ -28,8 +28,8 @@
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
           <el-button type="text" @click="getDetail(scope.row.id, true)">查看</el-button>
-          <el-button type="text" @click="getDetail(scope.row.id)">编辑</el-button>
-          <el-button type="delete" @click="getDelete(scope.row)">删除</el-button>
+          <el-button type="text" @click="getDetail(scope.row.id)" v-hasPermi="['push:update:edit']">编辑</el-button>
+          <el-button type="delete" @click="getDelete(scope.row)" v-hasPermi="['push:update:delete']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>