Merge branch 'liubiao-main'

src/views/controlCenter/670/index.vue

@@ -525,8 +525,8 @@ const registerPostInit = () => {
   }
   let data = {
     code: deviceDetail.value.personnelInfo.code,
-    name: deviceDetail.value.personnelInfo.position,
-    position: deviceDetail.value.personnelInfo.name,
+    name: deviceDetail.value.personnelInfo.name,
+    position: deviceDetail.value.personnelInfo.position,
     unitName: deviceDetail.value.personnelInfo.unitName,
     deviceId: route.params.deviceId,
     deviceImei: deviceDetail.value.deviceImei

src/views/system/dict/index.vue

@@ -43,9 +43,9 @@
               删除
             </el-button>
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button v-hasPermi="['system:dict:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
-          </el-col>
+          </el-col> -->
           <el-col :span="1.5">
             <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>
           </el-col>

src/views/system/role/index.vue

@@ -48,9 +48,9 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['system:role:delete']" type="danger" plain :disabled="ids.length === 0" @click="handleDelete()">删除</el-button>
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button v-hasPermi="['system:role:export']" type="warning"  plain icon="Download" @click="handleExport">导出</el-button>
-          </el-col>
+          </el-col> -->
           <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
       </template>
@@ -84,7 +84,7 @@
               <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip v-if="scope.row.roleId !== 1" content="分配用户" placement="top">
-              <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="User" @click="handleAuthUser(scope.row)"></el-button>
+              <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="User" @click=" (scope.row)"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>