设备管理 设备列表

src/views/device/list/detail.vue

@@ -350,7 +350,7 @@ export default {
 
     // 取消
     getCancel() {
-      this.$tab.closeOpenPage("/device/list");
+      this.$tab.closeOpenPage("/device/deviceList");
     },
 
     // 提交

src/views/device/list/index.vue

@@ -43,7 +43,7 @@
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
           <el-button type="text" @click="getChange(scope.row.id, '查看')">查看</el-button>
-          <el-button type="text" @click="getChange(scope.row.id)" v-hasPermi="['device:list:edit']">
+          <el-button v-if="scope.row.status === 2" type="text" @click="getChange(scope.row.id)" v-hasPermi="['device:list:edit']">
             编辑
           </el-button>
           <el-button v-if="scope.row.status === 2" type="text" @click="getShelves(1, scope.row.id)"