debug

杨泽宇
1 parent 2c5bc8de
Showing 4 changed files with 54 additions and 29 deletions
README.md
src/views/dashboard/index.vue
src/views/permission/edit.vue
src/views/user/edit.vue
@@ -6,6 +6,7 @@ cnlive-community-web-vue 中国网+智慧社区平台
 + 技术栈
    * vue3.x (vite)
    * node v12.0.0+ 
+   * vite v2.7.0+
    * element-plus v1.0.0+
  
 ## 项目特点
@@ -27,15 +28,17 @@ cnlive-community-web-vue 中国网+智慧社区平台
 + 测试：
    + test.community.api.cnlive.com
    + test.community.web.cnlive.com
+
+## 测试账号(超管)
+   * 账号 123
+   * 密码 cmnt123
+
+## 发布方式
    + 服务器地址：120.92.119.11
    + 服务器项目位置：cd /cnlive/cnlive-community-web-vue
    + 账号：root
    + 密码：du=K0dB1z
  
-## 测试账号
-
-## 发布方式
-
 ## 试用地址
    * [测试环境](http://testweb.community.cnlive.com/#/dashboard "测试环境")
  
@@ -73,9 +76,15 @@ cnlive-community-web-vue 中国网+智慧社区平台
      * validate.ts 格式验证方法
      * scroll.ts 页面滚动
   * views 业务逻辑页面
+     * community 小区管理
      * dashboard 欢迎页
-     * user 用户管理 包含登录注册
      * error 错误提示页面 如404页
+     * ownerManagement 业主管理
+     * permission 权限管理
+     * property 物业管理
+     * role 角色管理
+     * system 系统设置
+     * user 用户管理 包含登录注册
 * .env.development 本地开发环境配置
 * .env.production 线上部署正式环境配置
 * .env.staging 线上部署测试环境配置
 <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>
  
@@ -80,6 +80,9 @@ onMounted(() =&gt; {
   form.dataType = useRoute().query.dataType;
   if (form.dataType === "add") {
     form.data.parentId = useRoute().query.id;
+    if(useRoute().query.type.toString() === '1') {
+      form.data.type = '2'
+    }
   } else {
     Object.keys(form.data).map((key) => {
       form.data[key] = useRoute().query[key];
@@ -141,7 +144,7 @@ onMounted(() =&gt; {
           />
         </el-form-item>
         <!-- 不支持创建一级菜单，编辑的时候不可以修改菜单类型 -->
-        <!-- 一级菜单下只能创建二级菜单 -->
+        <!-- 一级菜单下只能创建二级菜单，这时候默认选中 -->
         <!-- 二级菜单可以创建三级菜单或者按钮 -->
         <!-- 三级菜单只能创建按钮 -->
         <el-form-item label="权限类型" prop="type" style="width: 100%">
 <script setup lang="ts">
 import { reactive, ref, getCurrentInstance, onMounted } from "vue";
-import { userAdd } from "@/api/user/user";
+import { userEdit, userAdd } from "@/api/user/user";
 import { roleList } from "@/api/user/role";
 import { getTableList } from "@/api/community/residence";
 import { useRoute } from "vue-router";
@@ -17,14 +17,14 @@ let form = reactive({
     cellphone: "",
     password: "",
     roleIds: "",
-    cIds: "",
+    neighborhoodIds: "",
     userId: "",
   },
   dataType: "",
   roles: [],
   communities: [],
   checkList: [],
-  communityList: []
+  communityList: [],
 });
 const ruleFormRef = ref<InstanceType<typeof ElForm>>();
 /**
@@ -81,6 +81,7 @@ const rules = reactive({
 const resetForm = (formEl: InstanceType<typeof ElForm> | undefined) => {
   if (!formEl) return;
   form.checkList = [];
+  form.communityList = [];
   formEl.resetFields();
 };
 /**
@@ -88,18 +89,30 @@ const resetForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
  */
 const submitForm = (formEl: InstanceType<typeof ElForm> | undefined) => {
   if (!formEl) return;
-  formEl.validate((valid) => {
+  formEl.validate(async (valid) => {
     if (valid) {
-      userAdd(form.data)
-        .then((res) => {
-          if (res) {
-            globalProperties.$message.success("操作成功");
-            history.go(-1);
-          }
-        })
-        .catch((error) => {
-          console.log(error);
-        });
+      let res;
+      try {
+        // 用户编辑和用户增加的接口不一样！参数也不一样！
+        if (form.dataType === "add") {
+          res = await userAdd(form.data);
+        } else if (form.dataType === "edit") {
+          res = await userEdit({
+            cellphone: form.data.cellphone,
+            password: form.data.password,
+            roleIds: form.data.roleIds,
+            userId: form.data.id,
+            userName: form.data.userName
+          });
+        }
+      } catch (e) {
+        console.log(e);
+      } finally {
+        if (res?.data) {
+          globalProperties.$message.success("操作成功");
+          history.go(-1);
+        }
+      }
     } else {
       globalProperties.$message.error("请检查表单格式");
       return false;
@@ -151,7 +164,8 @@ onMounted(() =&gt; {
     form.dataType = "add";
   } else {
     form.dataType = "edit";
-    form.checkList = form.data.roleIds.split(",").map((v) => v / 1);
+    form.checkList = form.data.roleIds? form.data.roleIds?.split(",").map((v) => v / 1): []
+    form.communityList = form.data.neighborhoodIds? form.data.neighborhoodIds.split(",").map((v) => v / 1): []
   }
 });
 </script>
@@ -183,7 +197,12 @@ onMounted(() =&gt; {
             maxlength="15"
           />
         </el-form-item>
-        <el-form-item label="密码" prop="password" style="width: 100%">
+        <el-form-item
+          label="密码"
+          prop="password"
+          style="width: 100%"
+          v-show="form.dataType === 'add'"
+        >
           <el-input
             v-model.trim="form.data.password"
             placeholder="请填写密码"
@@ -206,7 +225,7 @@ onMounted(() =&gt; {
         <el-form-item label="小区" style="width: 100%">
           <el-checkbox-group
             v-model="form.communityList"
-            @change="(data) => (form.data.cIds = data.join(','))"
+            @change="(data) => (form.data.neighborhoodIds = data.join(','))"
           >
             <el-checkbox
               v-for="(item, index) in form.communities"