Merge remote-tracking branch 'origin/master'

src/router/index.js

@@ -120,7 +120,7 @@ export const constantRoutes = [
 
       },
       {
-        path: 'equipment-detail/:id',
+        path: 'equipment-detail/:id/:identify',
         props: true,
         component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
         name: 'EquipmentDetail',

src/views/equipment-management/equipment-management/equipment-management.vue

@@ -70,7 +70,7 @@
     <el-row>
       <el-col :span="12" style="padding-bottom: 20px;">
         <el-button
-          v-hasPermi="['system:device:add']"
+          v-hasPermi="['business:device:add']"
           class="fourWordsBtn"
           icon="el-icon-plus"
           @click="handleAdd"
@@ -89,14 +89,14 @@
         >反向选择
         </el-button>
         <el-button
-          v-hasPermi="['system:device:import']"
+          v-hasPermi="['business:device:import']"
           class="fourWordsBtn"
           icon="el-icon-bottom-left"
           @click="handleImport"
         >批量导入
         </el-button>
         <el-button
-          v-hasPermi="['system:device:export']"
+          v-hasPermi="['business:device:export']"
           class="fourWordsBtn"
           icon="el-icon-top-right"
           @click="handleExport"
@@ -169,7 +169,7 @@
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            v-hasPermi="['system:device:edit']"
+            v-hasPermi="['business:device:edit']"
             size="mini"
             type="success"
             icon="el-icon-document"
@@ -179,7 +179,7 @@
           >详情
           </el-button>
           <el-button
-            v-hasPermi="['system:device:edit']"
+            v-hasPermi="['business:device:edit']"
             plain
             size="mini"
             type="success"

src/views/equipment-management/use-management/use-management.vue

@@ -88,7 +88,7 @@
       </el-col>
     </el-row>
 
-    <el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" @selection-change="handleSelectionChange" @select-all="selectAll($event, false)">
+    <el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
       <el-table-column type="index" label="序号" width="50" />
       <el-table-column label="设备ID" align="left" prop="deviceCode" :show-overflow-tooltip="true" />