Merge remote-tracking branch 'origin/boardTest' into boardTest

src/views/ems/record/recordIOTInstant/index.vue

@@ -142,14 +142,14 @@
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+<!--          <el-col :span="1.5">
             <el-button
               type="primary"
               plain
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['ems/record:recordIotenvInstant:add']"
+              v-hasPermi="['ems/record:recordIOTInstant:add']"
             >新增</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -160,7 +160,7 @@
               size="mini"
               :disabled="single"
               @click="handleUpdate"
-              v-hasPermi="['ems/record:recordIotenvInstant:edit']"
+              v-hasPermi="['ems/record:recordIOTInstant:edit']"
             >修改</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -171,9 +171,9 @@
               size="mini"
               :disabled="multiple"
               @click="handleDelete"
-              v-hasPermi="['ems/record:recordIotenvInstant:remove']"
+              v-hasPermi="['ems/record:recordIOTInstant:remove']"
             >删除</el-button>
-          </el-col>
+          </el-col>-->
           <el-col :span="1.5">
             <el-button
               type="warning"
@@ -181,7 +181,7 @@
               icon="el-icon-download"
               size="mini"
               @click="openExportDialog"
-              v-hasPermi="['ems/record:recordIotenvInstant:export']"
+              v-hasPermi="['ems/record:recordIOTInstant:export']"
             >导出</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/ems/record/recordVibrationInstant/index.vue

@@ -150,14 +150,14 @@
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+<!--          <el-col :span="1.5">
             <el-button
               type="primary"
               plain
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['ems/record:recordIotenvInstant:add']"
+              v-hasPermi="['ems/record:recordVibrationInstant:add']"
             >新增</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -168,7 +168,7 @@
               size="mini"
               :disabled="single"
               @click="handleUpdate"
-              v-hasPermi="['ems/record:recordIotenvInstant:edit']"
+              v-hasPermi="['ems/record:recordVibrationInstant:edit']"
             >修改</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -179,9 +179,9 @@
               size="mini"
               :disabled="multiple"
               @click="handleDelete"
-              v-hasPermi="['ems/record:recordIotenvInstant:remove']"
+              v-hasPermi="['ems/record:recordVibrationInstant:remove']"
             >删除</el-button>
-          </el-col>
+          </el-col>-->
           <el-col :span="1.5">
             <el-button
               type="warning"
@@ -189,7 +189,7 @@
               icon="el-icon-download"
               size="mini"
               @click="handleExport"
-              v-hasPermi="['ems/record:recordIotenvInstant:export']"
+              v-hasPermi="['ems/record:recordVibrationInstant:export']"
             >导出</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>