浏览代码

feat: 中台-首页隐藏快捷入口/用户管理删除增加二次确认

bxy 1 年之前
父节点
当前提交
3899c58b8e

+ 7 - 7
src/views/dashboard/home/components/QuickAction.vue

@@ -13,10 +13,10 @@
 
 <script setup lang="ts">
   import { ref } from 'vue';
-  import CameraConfig from '@/assets/camera/camera-config.png';
-  import CameraPlayback from '@/assets/camera/camera-playback.png';
+  // import CameraConfig from '@/assets/camera/camera-config.png';
+  // import CameraPlayback from '@/assets/camera/camera-playback.png';
   import CameraPreview from '@/assets/camera/camera-preview.png';
-  import AlgoManage from '@/assets/camera/algorithm-manage.png';
+  // import AlgoManage from '@/assets/camera/algorithm-manage.png';
   import UserManage from '@/assets/camera/user-manage.png';
   import OrgaManage from '@/assets/camera/organization-manage.png';
   import { useRouter } from 'vue-router';
@@ -25,10 +25,10 @@
   const router = useRouter();
 
   const quickList = ref([
-    { name: '相机配置', img: CameraConfig, address: '/cameras/overview' },
-    { name: '相机回放', img: CameraPlayback, address: '' },
+    // { name: '相机配置', img: CameraConfig, address: '/cameras/overview' },
+    // { name: '相机回放', img: CameraPlayback, address: '' },
     { name: '相机预览', img: CameraPreview, address: '/cameras/preview' },
-    { name: '算法管理', img: AlgoManage, address: '/cameras/algo-manager' },
+    // { name: '算法管理', img: AlgoManage, address: '/cameras/algo-manager' },
     { name: '用户管理', img: UserManage, address: '/auth/user' },
     { name: '组织管理', img: OrgaManage, address: '' },
   ]);
@@ -58,7 +58,7 @@
   } */
 
   .quick-go {
-    width: 139px;
+    width: 280px;
     height: 149px;
     margin-top: 2px;
     box-sizing: border-box;

+ 1 - 0
src/views/datamanager/alertformdata/components/common/QueryForm.vue

@@ -43,6 +43,7 @@
             :props="location"
             clearable
             collapse-tags
+            :show-all-levels="false"
             @change="handleCascaderChange"
           />
         </el-form-item>

+ 36 - 10
src/views/system/user/user.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="user-page">
-    <UserQuery  :departmentList="departmentList" />
+    <UserQuery :departmentList="departmentList" />
     <div class="user-list">
       <BasicTable
         :columns="columns"
@@ -56,7 +56,12 @@
         </template>
       </BasicTable>
     </div>
-    <CreateDrawer ref="createDrawerRef" :title="drawerTitle" @change="reloadTable" :departmentList="departmentList" />
+    <CreateDrawer
+      ref="createDrawerRef"
+      :title="drawerTitle"
+      @change="reloadTable"
+      :departmentList="departmentList"
+    />
     <ResetCodeDrawer ref="ResetCodeDrawerRef" :title="drawerTitle" @change="reloadTable" />
     <CreateAdminDrawer
       v-if="userStore?.info?.username === ROOT_USER"
@@ -95,12 +100,12 @@
   import { EditType } from './types';
   import { ROOT_USER } from './types';
   import { deptTreeList } from '@/api/auth/dept';
-import useSceneInfos from '@/hooks/useSceneInfos';
-// import { TreeProps,ElTreeItem } from 'element-plus/es/components/tree-v2/src/types';
-
-const sceneInfos = useSceneInfos();
-  const {calculateTreeData } = sceneInfos;
+  import useSceneInfos from '@/hooks/useSceneInfos';
+  import { ElMessage, ElMessageBox } from 'element-plus';
+  // import { TreeProps,ElTreeItem } from 'element-plus/es/components/tree-v2/src/types';
 
+  const sceneInfos = useSceneInfos();
+  const { calculateTreeData } = sceneInfos;
 
   const useUserDetail = useUser();
   const { userList, page, pageSize, totalCount } = storeToRefs(useUserDetail);
@@ -141,7 +146,7 @@ const sceneInfos = useSceneInfos();
     key: 'action',
     fixed: 'right',
     render(record) {
-      return h(ActionColomns as any,{
+      return h(ActionColomns as any, {
         space: 20,
         color: '#629bf9',
         style: 'img',
@@ -219,13 +224,34 @@ const sceneInfos = useSceneInfos();
       nickname: record.nickname,
       username: record.username,
     };
-    userDel(delDetail);
+    ElMessageBox.confirm('确认要删除该用户吗', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+      .then(() => {
+        userDel(delDetail);
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        });
+      })
+      .catch(() => {
+        ElMessage({
+          type: 'info',
+          message: '取消删除',
+        });
+      });
   }
 
   onMounted(async () => {
     getList();
     deptTreeList().then((res) => {
-      departmentList.value = calculateTreeData(res, { level: 3, valueKey: 'deptId', labelKey: 'deptName' }, 1);
+      departmentList.value = calculateTreeData(
+        res,
+        { level: 3, valueKey: 'deptId', labelKey: 'deptName' },
+        1,
+      );
     });
     const res = await roleAllList();
     roleData.value = res.list.map((item: any) => {