debug

杨泽宇
1 parent 7ddbdeb0
Showing 8 changed files with 99 additions and 42 deletions
src/components/Pagination/index.vue
src/layout/enter.vue
src/layout/header.vue
src/layout/icon.vue
src/layout/menu.vue
src/views/dashboard/index.vue
src/views/user/edit.vue
src/views/user/index.vue
@@ -2,7 +2,6 @@
 /**
  * 单个图片上传公共组件
  * @module Pagination
- * @author Tengxi
  */
  
 import { scrollTo } from "@/utils/scroll";
@@ -2,7 +2,6 @@
 /**
  * 公共布局入口组件
  * @module Enter
- * @author Tengxi
  */
 import { onMounted, reactive, computed } from "vue";
 import Header from "./header.vue";
@@ -2,7 +2,6 @@
 /**
  * 公共布局头部组件
  * @module Header
- * @author Tengxi
  */
 import { getCurrentInstance, onMounted, reactive, computed } from "vue";
 import * as store from "@/pinia/index";
+<script setup lang="ts">
+/**
+ * 公共布局入口组件
+ * @module Enter
+ */
+import { onMounted, reactive, computed } from "vue";
+import {
+  HomeFilled,
+  Shop,
+  List,
+  Tools,
+  PhoneFilled,
+  Avatar,
+  Menu as IconMenu,
+} from "@element-plus/icons-vue";
+/**
+ * @description 组件属性
+ * @prop {number} keyId 一级菜单id
+ */
+interface Props {
+  keyId: number;
+}
+const props = withDefaults(defineProps<Props>(), {
+  keyId: 0,
+});
+</script>
+
+<template>
+  <el-icon>
+    <IconMenu v-if="keyId === -1" />
+    <HomeFilled v-else-if="keyId === 1000" />
+    <Tools v-else-if="keyId === 2000" />
+    <Shop v-else-if="keyId === 3000" />
+    <Avatar v-else-if="keyId === 4000" />
+    <PhoneFilled v-else-if="keyId === 5000" />
+    <List v-else />
+  </el-icon>
+</template>
@@ -2,18 +2,11 @@
 /**
  * 公共布局侧导航
  * @module Menu
- * @author Tengxi
  */
 import { ref, computed, onMounted, reactive } from "vue";
 import * as store from "@/pinia/index";
 import styles from "@/style/global.module.scss";
-// TIP 使用element plus ICON
-import {
-  Location,
-  Document,
-  Menu as IconMenu,
-  Setting,
-} from "@element-plus/icons-vue";
+import MenuIcon from './icon.vue'
 // TIP 获取scss样式变量
 let styleData = computed(() => {
   return styles;
@@ -41,14 +34,20 @@ onMounted(() =&gt; {
       :router="true"
       :collapse-transition="false"
       :collapse="asyncData.isCollapse"
-    >
+    > 
+      <el-menu-item index="/">
+        <template #title>
+          <MenuIcon :keyId="-1"></MenuIcon>
+          <span>首页</span>
+        </template>
+      </el-menu-item>
       <el-sub-menu
         :index="index + ''"
         v-for="(item, index) in asyncData.menuData"
         :key="index"
       >
         <template #title>
-          <el-icon><location /></el-icon>
+          <MenuIcon :keyId="~~item.id"></MenuIcon>
           <span>{{ item.name }}</span>
         </template>
         <el-menu-item-group v-for="(ele, i) in item.menuList" :key="i">
 <script setup lang="ts">
 import {ref} from 'vue'
+import {propertyList } from '@/api/tengxi'
 import router from '@/router'
 const title = ref(import.meta.env.VITE_APP_TITLE).value
+propertyList().then(res => {
+  console.log(res)
+}).catch(error => {
+  console.log(error)
+})
 console.log(router.getRoutes())
 </script>
  
@@ -28,7 +28,8 @@ let form = reactive({
   communityList: [],
 });
 let asyncData = reactive({
-  userInfo: null
+  userInfo: null,
+  userType: null
 })
 const ruleFormRef = ref<InstanceType<typeof ElForm>>();
 /**
@@ -164,7 +165,9 @@ onMounted(() =&gt; {
   asyncData.userInfo = store.family.loginStore().id
   asyncData.userType = store.family.loginStore().organizationType
   getRoleList();
-  getCommunityList();
+  if(~~asyncData.userType === 1) {
+    getCommunityList();
+  }
   form.data = useRoute().query;
   if (JSON.stringify(form.data) === "{}") {
     form.dataType = "add";
@@ -2,6 +2,7 @@
 import { reactive, ref, onMounted } from "vue";
 import { userList, userPwd, userStatus } from "@/api/user/user";
 import { parseTime } from "@/utils/tool";
+import * as store from "@/pinia";
 import Pagination from "@/components/Pagination/index.vue";
 import { ElMessageBox, ElMessage } from "element-plus";
 interface Form {
@@ -32,6 +33,9 @@ let data = reactive({
     },
   },
 });
+let asyncData = reactive({
+  userInfo: null,
+});
 /**
  * 列表
  */
@@ -142,6 +146,7 @@ enum statusEnum {
   "启用",
 }
 onMounted(() => {
+  asyncData.userInfo = store.family.loginStore().id;
   getList();
 });
 </script>
@@ -205,35 +210,44 @@ onMounted(() =&gt; {
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="scope">
-          <el-button type="text"
-            ><router-link :to="{ path: '/user/edit', query: scope.row }"
-              >编辑</router-link
-            ></el-button
-          >
-          <el-button type="text" @click="handleUpdate(scope.row, 'status')">{{
-            scope.row.status ? "禁用" : "启用"
-          }}</el-button>
-          <el-button type="text" @click="handleUpdate(scope.row, 'pwd')"
-            >初始密码</el-button
-          >
-          <el-button type="text"
-            ><router-link
-              :to="{ path: '/user/role', query: { id: scope.row.id } }"
-              >角色</router-link
-            ></el-button
-          >
-          <!-- 用户：商务管理员、机构管理员，不允许删除。 -->
-          <el-button
-            type="text"
-            @click="handleDelete(scope.row)"
-            v-show="
-              ![
-                'SUPER_ADMIN',
-                'BUSINESS_ADMIN',
-              ].includes(scope.row.roleList.map(i => i.code).join(','))
+          <!-- 超管可以做全部操作 -->
+          <template v-if="!['SUPER_ADMIN'].includes(
+                scope.row.roleList.map((i) => i.code).join(',')
+              )">
+            <el-button type="text"
+              ><router-link :to="{ path: '/user/edit', query: scope.row }"
+                >编辑</router-link
+              ></el-button
+            >
+            <el-button type="text" @click="handleUpdate(scope.row, 'status')">{{
+              scope.row.status ? "禁用" : "启用"
+            }}</el-button>
+            <el-button type="text" @click="handleUpdate(scope.row, 'pwd')"
+              >初始密码</el-button
+            >
+            <el-button type="text"
+              ><router-link
+                :to="{ path: '/user/role', query: { id: scope.row.id } }"
+                >角色</router-link
+              ></el-button
+            >
+            <el-button type="text" @click="handleDelete(scope.row)"
+              >删除</el-button
+            >
+          </template>
+          <!-- 物业管理员（机构管理员）、商务管理员只可以改密码 -->
+          <!-- 其他角色用户不可以做任何操作 以上均通过角色的code判断 -->
+          <template
+            v-if="
+              !['PROPERTY_ADMIN', 'BUSINESS_ADMIN'].includes(
+                scope.row.roleList.map((i) => i.code).join(',')
+              )
             "
-            >删除</el-button
           >
+            <el-button type="text" @click="handleUpdate(scope.row, 'pwd')"
+              >初始密码</el-button
+            >
+          </template>
         </template>
       </el-table-column>
     </el-table>