Merge branch 'dev' of http://bj.gitlab.cnlive.com/cnlive_project/cnlive-community-web-vue into dev

张红振
2 parents f5e48684 34615b13
Showing 13 changed files with 613 additions and 47 deletions
src/api/notify/index.ts
src/api/user/user/index.ts
src/layout/header.vue
src/pinia/modules/login.ts
src/router/index.ts
src/router/modules/notify.ts
src/views/dashboard/index.vue
src/views/notify/edit.vue
src/views/notify/index.vue
src/views/property/edit.vue
src/views/property/index.vue
src/views/system/log.vue
src/views/user/edit.vue
+import request from '../request'
+import { deleteEmptyParam } from '@/utils/tool'
+
+/**
+ * @description 公告列表
+ * @function notifyList
+ */
+export const notifyList = async ( params: any ) => {
+  let res: any = await request.get( '/notify/list', deleteEmptyParam(params) )
+  return res
+}
+
+/**
+ * @description 公告详情
+ * @function notifyDetail
+ */
+ export const notifyDetail = async ( params: any ) => {
+  let res: any = await request.get( '/notify/getNotify', {params} )
+  return res
+}
+
+/**
+ * @description 新增公告
+ * @function notifyAdd
+ */
+export function notifyAdd (data: any) {
+  return request({
+    method: 'post',
+    url: '/notify/add',
+    data: data
+  })
+}
+
+/**
+ * @description 删除公告
+ * @function notifyDelete
+ */
+export function notifyDelete (params: any) {
+  return request({
+    method: 'delete',
+    url: '/notify/deleteNotify',
+    params: params
+  })
+}
 \ No newline at end of file
 import request from '../../request'
-import {formDataWrapper} from '@/utils/tool'
+import { formDataWrapper, deleteEmptyParam } from '@/utils/tool'
  
 /**
  * @description 用户列表
@@ -9,7 +9,7 @@ export const userList = async ( params: any ) =&gt; {
   let res: any = await request({
     url: '/user/list',
     method: 'get',
-    params: params
+    params: deleteEmptyParam(params)
   })
   return res
 }
@@ -70,11 +70,9 @@ onMounted(() =&gt; {
     <!-- TIP 控制菜单collapse的按钮结束 -->
     <!-- TIP 功能键 -->
     <div class="right-buttons">
-      <el-button type="text">站内消息</el-button>
       <el-button type="text"><router-link to="/">首页</router-link></el-button>
-      <el-button type="text">帮助</el-button>
       <el-button type="text"
-        >当前用户：<b>{{ asyncData.userInfo }}</b></el-button
+        >当前用户：<b>{{ asyncData.userInfo? asyncData.userInfo: '超级管理员' }}</b></el-button
       >
       <el-button type="text" @click="handleLogout">退出</el-button>
     </div>
@@ -3,12 +3,15 @@ import { logout } from &#39;@/api/user/login&#39;;
 import { ElMessage } from "element-plus";
 interface LoginUser {
   token: string,
-  organizationId: number,
-  id: number,
+  organizationId?: number,
+  id?: number,
   userName: string,
-  organizationType: number | null,
+  organizationType?: number | null,
   organizationName: string,
-  organizationLogo: string
+  organizationLogo: string,
+  oId?: number,
+  userId?: number,
+  oType?: number
 }
 const id: string = 'login'
 const state: Function = () => ({
@@ -53,11 +56,11 @@ const getters = {
 const actions = {
   setUserInfo(obj: LoginUser) {
     this.token = obj.token
-    this.organizationId = obj.organizationId
-    this.id = obj.id
+    this.organizationId = obj.organizationId? obj.organizationId: obj.oId
+    this.id = obj.id? obj.id: obj.userId
     this.userName = obj.userName
     this.organizationName = obj.organizationName
-    this.organizationType = obj.organizationType
+    this.organizationType = obj.organizationType? obj.organizationType: obj.oType
     this.organizationLogo = obj.organizationLogo
   },
   removeToken(msg: string | null) {
 import { createRouter, createWebHashHistory } from 'vue-router'
+import Notify from './modules/notify'
 import System from './modules/system'
 import Permission from './modules/permission'
 import Role from "./modules/role" 
@@ -9,6 +10,11 @@ import OwnerManagement from &quot;./modules/ownerManagement&quot;
 import Housekeeper from "./modules/housekeeper"
 import Layout from '@/layout/enter.vue'
 const routes: Array<any> = [
+  {
+    path: '/login',
+    name: 'Login',
+    component: () => import(/* webpackChunkName: "About" */ '@/views/user/login.vue')
+  },
   { path: '/', redirect: { path: '/dashboard' } },
   {
     path: '/',
@@ -21,6 +27,7 @@ const routes: Array&lt;any&gt; = [
       meta: { title: '欢迎访问' }
     }]
   },
+  Notify,
   System,
   Permission,
   Role,
@@ -30,11 +37,6 @@ const routes: Array&lt;any&gt; = [
   OwnerManagement,
   Housekeeper,
   {
-    path: '/login',
-    name: 'Login',
-    component: () => import(/* webpackChunkName: "About" */ '@/views/user/login.vue')
-  },
-  {
     path: '/404',
     name: 'Error',
     component: () => import(/* webpackChunkName: "Error" */ '@/views/error/404.vue'),
+import Layout from '@/layout/enter.vue'
+const notify = {
+  path: '/',
+  component: Layout,
+  name: 'Notify',
+  children: [{
+    path: 'notify',
+    name: 'notify',
+    component: () => import('@/views/notify/index.vue'),
+    meta: { title: '公告管理' }
+  }, {
+    path: '/notify/edit',
+    name: 'notifyEdit',
+    component: () => import('@/views/notify/edit.vue'),
+    meta: { title: '公告编辑' }
+  }]
+}
+
+export default notify
 <script setup lang="ts">
-import {ref} from 'vue'
-import {propertyList } from '@/api/property'
-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())
+import { ref } from "vue";
+import { propertyList } from "@/api/property";
+import router from "@/router";
+import * as store from "@/pinia/index";
+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>
  
 <template>
   <div class="dashboard-container">
     <div class="dashboard-logo"></div>
-    <h1>欢迎访问 -- {{title}}</h1>
+    <h1>欢迎访问 -- {{ title }}</h1>
+    <!-- {{ store.family }}
+    {{ store.family.menuStore() }}
+    {{ store.family.menuStore().menuList }} -->
   </div>
 </template>
  
@@ -27,11 +33,11 @@ console.log(router.getRoutes())
     text-align: center;
   }
   &-logo {
-    width: 200px; 
-    height: 200px; 
+    width: 200px;
+    height: 200px;
     margin: 0 auto;
-    background-color: pink; 
-    background-image: url('@/assets/logo.png');
+    background-color: pink;
+    background-image: url("@/assets/logo.png");
     background-repeat: no-repeat;
     background-size: contain;
     background-position: 0;
+<script setup lang="ts">
+import { reactive, ref, getCurrentInstance, onMounted } from "vue";
+import { notifyAdd, notifyDetail } from "@/api/notify";
+import { getTableList } from "@/api/community/residence";
+import { useRoute } from "vue-router";
+import { back } from "@/utils/tool";
+import * as store from "@/pinia/index";
+import { ElMessageBox } from "element-plus";
+import type { ElForm } from "element-plus";
+let form = reactive({
+  data: {
+    title: "",
+    status: null,
+    oId: store?.family?.loginStore()?.organizationId,
+    neighborHoodId: null,
+    neighborHoodName: "",
+    id: null,
+    content: "",
+    buildingIds: "",
+  },
+  dataType: "",
+  neighborhoods: [],
+});
+const ruleFormRef = ref<InstanceType<typeof ElForm>>();
+let instance: ComponentInternalInstance | null = getCurrentInstance();
+/**
+ * 表单验证规则
+ */
+const rules = reactive({
+  title: [
+    {
+      required: true,
+      message: "请填写公告标题",
+      trigger: "change",
+    },
+  ],
+  content: [
+    {
+      required: true,
+      message: "请填写公告内容",
+      trigger: "change",
+    },
+  ],
+});
+/**
+ * 表单重置
+ */
+const resetForm = (formEl: InstanceType<typeof ElForm> | undefined) => {
+  if (!formEl) return;
+  formEl.resetFields();
+};
+/**
+ * 表单提交
+ */
+const submitForm = (
+  formEl: InstanceType<typeof ElForm> | undefined,
+  type: number
+) => {
+  if (!formEl) return;
+  formEl.validate(async (valid) => {
+    if (valid) {
+      form.data.status = type;
+      if (type) {
+        ElMessageBox.confirm(
+          "是否确定发布?（确认发布后将不可进行修改）",
+          "提示",
+          {
+            confirmButtonText: "确认",
+            cancelButtonText: "取消",
+            type: "warning",
+          }
+        )
+          .then((res) => {
+            postApi(type);
+          })
+          .catch((error) => {
+            console.log(error);
+          });
+      } else {
+        postApi(type);
+      }
+    } else {
+      instance?.proxy?.$message.error("请检查表单格式");
+      return false;
+    }
+  });
+};
+/**
+ * 表单提交接口
+ * @param {number} type 1发布 0存草稿
+ */
+const postApi = async (type: number) => {
+  notifyAdd(form.data)
+    .then((res) => {
+      if (res) {
+        instance?.proxy?.$message.success(type ? "发布成功" : "已存为草稿");
+        history.go(-1);
+      }
+    })
+    .catch((error) => {
+      console.log(error);
+    });
+};
+/**
+ * 选小区，给小区名赋值
+ * @param {number | null} data 选中的小区id
+ */
+const handleNeighborhoodChange = async (data: number | null) => {
+  form.data.neighborHoodName = form.neighborhoods.find((i) => i.id === data)[
+    "name"
+  ];
+};
+/**
+ * 小区列表
+ * @param {number | null} pageSize 一次请求多少条数据
+ */
+const getNeighborhoods = async (pageSize: number = 20) => {
+  try {
+    const res = await getTableList({
+      page: 1,
+      type: 0,
+      pageSize: pageSize,
+    });
+    form.neighborhoods = res?.data?.data?.list;
+    if (res?.data?.data?.total > pageSize) {
+      getNeighborhoods(res?.data?.data?.total);
+    }
+  } catch (e) {
+    console.log(e);
+  }
+};
+onMounted(() => {
+  getNeighborhoods();
+  if (JSON.stringify(useRoute().query) === "{}") {
+    form.dataType = "add";
+  } else {
+    form.dataType = useRoute().query.dataType;
+    form.data = useRoute().query;
+    form.data.neighborHoodId = ~~useRoute().query.neighborHoodId;
+  }
+});
+</script>
+
+<template>
+  <div class="page-container">
+    <el-card class="form_card" style="max-width: 1303px">
+      <h1 v-show="form.dataType === 'add'">新增公告</h1>
+      <h1 v-show="form.dataType === 'edit'">编辑公告</h1>
+      <h1 v-show="form.dataType === 'detail'">公告详情</h1>
+      <el-form
+        :inline="true"
+        :model="form.data"
+        :rules="rules"
+        ref="ruleFormRef"
+        label-width="120px"
+        class="card-form"
+        :disabled="form.dataType === 'detail'"
+      >
+        <el-form-item label="小区" prop="neighborHoodId" style="width: 100%">
+          <el-select
+            v-model="form.data.neighborHoodId"
+            placeholder="请选择小区"
+            @change="handleNeighborhoodChange"
+          >
+            <el-option
+              :label="item.name"
+              :value="item.id"
+              v-for="(item, index) in form.neighborhoods"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="公告标题" prop="title" style="width: 100%">
+          <el-input
+            v-model.trim="form.data.title"
+            placeholder="请填写公告标题"
+            maxlength="32"
+          />
+        </el-form-item>
+        <el-form-item label="公告内容" prop="content" style="width: 100%">
+          <el-input
+            type="textarea"
+            v-model.trim="form.data.content"
+            placeholder="富文本组件整理中，后续会替换，先用文本框走流程"
+            maxlength="1500"
+            show-word-limit
+          />
+        </el-form-item>
+        <el-form-item style="width: 100%" v-show="form.dataType !== 'detail'">
+          <el-button type="primary" @click="submitForm(ruleFormRef, 1)"
+            >发布</el-button
+          >
+          <el-button type="primary" @click="submitForm(ruleFormRef, 0)"
+            >存为草稿</el-button
+          >
+          <el-button
+            type="info"
+            @click="resetForm(ruleFormRef)"
+            v-show="form.dataType === 'add'"
+            >取消</el-button
+          >
+          <el-button type="info" @click="back">返回</el-button>
+        </el-form-item>
+      </el-form>
+      <!-- 查看详情时表单不能编辑，禁用表单会把按钮也禁用掉，所以单列出来一个返回按钮 -->
+      <el-button type="info" @click="back" v-if="form.dataType === 'detail'"
+        >返回</el-button
+      >
+    </el-card>
+  </div>
+</template>
+<script setup lang="ts">
+import { reactive, ref, onMounted } from "vue";
+import { notifyList, notifyDelete } from "@/api/notify";
+import { parseTime } from "@/utils/tool";
+import Pagination from "@/components/Pagination/index.vue";
+import { ElMessageBox, ElMessage } from "element-plus";
+import type { ElTable } from "element-plus";
+interface Form {
+  page: number;
+  pageSize: number;
+  startTime: string;
+  endTime: string;
+}
+interface Params {
+  total: number;
+  query: Form;
+}
+interface Data {
+  loading: boolean;
+  list: any[] | null;
+  params: Params;
+}
+const multipleTableRef = ref<InstanceType<typeof ElTable>>();
+let multipleSelection = ref<any[]>([]);
+const value1 = ref([]);
+let data = reactive({
+  list: [],
+  loading: false,
+  params: {
+    total: 0,
+    query: {
+      page: 1,
+      pageSize: 10,
+      startTime: "",
+      endTime: "",
+    },
+  },
+});
+/**
+ * 状态值
+ * @enum {number}
+ */
+enum statusEnum {
+  "草稿" = 0,
+  "已发布",
+}
+/**
+ * 列表
+ */
+const getList = async () => {
+  data.loading = true;
+  try {
+    const res = await notifyList(data.params.query);
+    data.list = res?.data?.data?.list;
+    data.params.total = res?.data?.data?.total;
+  } catch (e) {
+    console.log(e);
+  } finally {
+    data.loading = false;
+  }
+};
+/**
+ * 分页回调
+ * @param {number} page 当前页码
+ * @param {number} size 每页内容条数
+ */
+const handlePageChange = (page, size) => {
+  data.params.query.page = page;
+  data.params.query.pageSize = size;
+  getList();
+};
+/**
+ * 查询
+ */
+const handleSearch = () => {
+  getList();
+};
+/**
+ * 表格选中响应
+ * @param {array} data 选中的一条数据
+ */
+const handleSelectionChange = (data: array) => {
+  multipleSelection.value = data;
+};
+/**
+ * 时间组件回调
+ * @param {array} value [开始时间, 结束时间]
+ */
+const handleTimeChange = (value: array) => {
+  console.log(value);
+  data.params.query.startTime = value ? value[0] : "";
+  data.params.query.endTime = value ? value[1] : "";
+  getList();
+};
+/**
+ * 表格每一行是否可选中
+ * @param {array} row 每一行数据对象
+ */
+const isSelectable = (row: any) => {
+  return row.status === 0;
+};
+/**
+ * 删除
+ * @param {object} obj 要删除的数据对象
+ */
+const handleDelete = (obj: any) => {
+  ElMessageBox.confirm("确认删除吗?", "警告", {
+    confirmButtonText: "确认",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(async () => {
+      try {
+        let res = await notifyDelete({
+          ids: obj.id,
+        });
+        if (res?.data) {
+          ElMessage({
+            type: "success",
+            message: "操作成功",
+          });
+          getList();
+        } else {
+          ElMessage({
+            type: "error",
+            message: "操作失败",
+          });
+        }
+      } catch (e) {
+        console.log(e);
+      }
+    })
+    .catch(() => {
+      console.log("取消");
+    });
+};
+onMounted(() => {
+  getList();
+});
+</script>
+
+<template>
+  <div class="page-container">
+    <h1>公告列表</h1>
+    <el-row style="padding-bottom: 20px">
+      <el-form :inline="true" label-width="70px">
+        <el-form-item label="时间">
+          <el-date-picker
+            v-model="value1"
+            type="datetimerange"
+            range-separator="至"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="handleTimeChange"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleSearch">查询</el-button>
+          <el-button type="primary">
+            <router-link to="/notify/edit">添加公告</router-link>
+          </el-button>
+          <el-button
+            type="danger"
+            @click="
+              handleDelete({ id: multipleSelection.map((i) => i.id).join(',') })
+            "
+            :disabled="!multipleSelection.length"
+            >批量删除</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <el-table
+      :data="data.list"
+      style="width: 100%"
+      border
+      v-loading="data.loading"
+      align="center"
+      element-loading-text="拼命加载中"
+      ref="multipleTableRef"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        type="selection"
+        align="center"
+        :selectable="isSelectable"
+      />
+      <el-table-column prop="id" label="ID" align="center"></el-table-column>
+      <el-table-column
+        prop="title"
+        label="标题"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="content"
+        label="内容"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="neighborHoodName"
+        label="小区"
+        align="center"
+      ></el-table-column>
+      <el-table-column prop="status" label="状态" align="center">
+        <template #default="scope">
+          {{ statusEnum[scope.row.status] }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="发布时间" align="center">
+        <template #default="scope">
+          {{ parseTime(new Date(scope.row.createTime).getTime()) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center">
+        <!-- 已发布状态的公告不可以被修改、删除 -->
+        <template #default="scope">
+          <el-button type="text" v-show="scope.row.status === 0"
+            ><router-link
+              :to="{
+                path: '/notify/edit',
+                query: { ...scope.row, ...{ dataType: 'edit' } },
+              }"
+              >编辑</router-link
+            ></el-button
+          >
+          <el-button type="text"
+            ><router-link
+              :to="{
+                path: '/notify/edit',
+                query: { ...scope.row, ...{ dataType: 'detail' } },
+              }"
+              >详情</router-link
+            ></el-button
+          >
+          <el-button
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-show="scope.row.status === 0"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      :total="data.params.total"
+      :currentPage="data.params.query.page"
+      :pageSize="data.params.query.pageSize"
+      @pageChange="handlePageChange"
+    ></Pagination>
+  </div>
+</template>
@@ -2,6 +2,7 @@
 import { reactive, ref, getCurrentInstance, onMounted } from "vue";
 import { propertyAdd } from "@/api/property";
 import { useRoute } from "vue-router";
+import { back } from '@/utils/tool';
 import { validMobile } from "@/utils/validate";
 import type { ElForm } from "element-plus";
 const {
@@ -233,7 +234,7 @@ onMounted(() =&gt; {
           />
         </el-form-item>
         <el-form-item label="类型" prop="type" style="width: 50%">
-          <el-select v-model="form.data.type">
+          <el-select v-model="form.data.type" :disabled="form.dataType === 'edit'">
             <el-option label="物业" value="1"></el-option>
             <el-option label="公益" value="2"></el-option>
           </el-select>
@@ -245,6 +246,9 @@ onMounted(() =&gt; {
           <el-button type="info" @click="resetForm(ruleFormRef)"
             >取消</el-button
           >
+          <el-button type="info" @click="back"
+            >返回</el-button
+          >
         </el-form-item>
       </el-form>
     </el-card>
 <script setup lang="ts">
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
 import { propertyList, propertyStatus } from "@/api/property";
-import { userProxy } from '@/api/user/user';
+import { userProxy } from "@/api/user/user";
+import { menuData } from "@/api/user/login";
+import * as store from "@/pinia/index";
 import { parseTime } from "@/utils/tool";
 import Pagination from "@/components/Pagination/index.vue";
 const {
@@ -66,7 +68,7 @@ const handleSearch = () =&gt; {
 };
 /**
  * 切换状态
- * @param {object} 单条数据对象 
+ * @param {object} 单条数据对象
  */
 const handleStatus = async (obj) => {
   try {
@@ -89,20 +91,37 @@ const handleStatus = async (obj) =&gt; {
  * @param {object} 单条数据对象
  */
 const handleProxy = (obj) => {
-  userProxy({oId: obj.id}).then(res => {
-    if(res?.data) {
+  userProxy({ oId: obj.id }).then((res) => {
+    if (res?.data) {
+      console.log("代理成功的回调");
+      console.log(res.data);
       globalProperties.$message.success("代理成功");
-      setTimeout(() => {
-        location.href = '/'
-      }, 500)
+      getMenu().then(() => {
+        console.log("got menu data");
+        setTimeout(() => {
+          // location.href = '/'
+          console.log("跳");
+        }, 2000);
+      });
     } else {
       globalProperties.$message.error("代理失败");
     }
-  })
-}
+  });
+};
+/**
+ * 获取权限菜单
+ */
+const getMenu = async () => {
+  try {
+    let res = await menuData();
+    store.family.menuStore().setMenuList(res?.data?.data);
+  } catch (e) {
+    console.log(e);
+  }
+};
 /**
  * 状态值
- * @enum {number} 
+ * @enum {number}
  */
 enum statusEnum {
   "禁用" = 0,
@@ -186,7 +205,9 @@ onMounted(() =&gt; {
               >编辑</router-link
             ></el-button
           >
-          <el-button type="text" @click="handleProxy(scope.row)">代理登录</el-button>
+          <el-button type="text" @click="handleProxy(scope.row)"
+            >代理登录</el-button
+          >
           <el-button type="text" @click="handleStatus(scope.row)">{{
             scope.row.status ? "禁用" : "启用"
           }}</el-button>
@@ -151,13 +151,16 @@ onMounted(() =&gt; {
     >
       <el-table-column prop="id" label="ID" align="center"> </el-table-column>
       <el-table-column prop="ip" label="IP" align="center"> </el-table-column>
-      <el-table-column prop="type" label="类型" align="center">
-      </el-table-column>
       <el-table-column prop="model" label="模块" align="center">
       </el-table-column>
+      <el-table-column prop="type" label="类型" align="center">
+      </el-table-column>
       <el-table-column prop="themeName" label="内容" align="center">
       </el-table-column>
       <el-table-column prop="time" label="操作时间" align="center">
+        <template #default="scope">
+          {{ parseTime(new Date(scope.row.time).getTime()) }}
+        </template>
       </el-table-column>
       <el-table-column prop="userName" label="操作人" align="center">
       </el-table-column>
@@ -107,7 +107,8 @@ const submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
             password: form.data.password,
             roleIds: form.data.roleIds,
             userId: form.data.id,
-            userName: form.data.userName
+            userName: form.data.userName,
+            neighborhoodIds: form.data.neighborhoodIds
           });
         }
       } catch (e) {