Merge branch 'sqy_dev' into 'main'

fix:修改首页通知信息，修改我的通知UI，解决之前遗留的bug

See merge request huang/yun-teng-iot-front!46

@@ -89,7 +89,7 @@ export const notifyMyGetDetailApi = (id: string) => {
 };
 
 /**
- * 查询我的通知表格
+ * 查询我的通知表格分页
  * @param params pageSize page name
  */
 export const notifyMyGetrPageApi = (params?: NoticeQueryParam) => {

@@ -16,6 +16,8 @@ import {
   ChangeAccountParams,
   RoleListItem,
 } from './model/systemModel';
+import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+import { getAuthCache } from '/@/utils/auth';
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
@@ -84,10 +86,20 @@ export const getAllRoleList = async (params?: RoleParams) => {
   return defHttp.post<RoleListGetResultModel>({ url: Api.GetAllRoleList, params });
 };
 
-// 过滤角色列表----过滤掉不是PLATFORM_ADMIN的角色
-export const filterRoleList = async (params?: RoleParams) => {
-  const res = await defHttp.post<RoleListGetResultModel>({ url: Api.GetAllRoleList, params });
-  const options = res.filter((item) => item.roleType === 'PLATFORM_ADMIN');
+// 过滤角色列表----根据登录的账号所属的角色-过滤掉其他平台类型的角色
+export const filterRoleList = async () => {
+  const res = await defHttp.post<RoleListGetResultModel>({ url: Api.GetAllRoleList });
+  const userInfo: any = getAuthCache(USER_INFO_KEY);
+  const role = userInfo.roles[0];
+  const options = res.filter((item) => {
+    if (role === 'SYS_ADMIN') {
+      return item.roleType === 'PLATFORM_ADMIN';
+    } else if (role === 'PLATFORM_ADMIN') {
+      return item.roleType === 'PLATFORM_ADMIN';
+    } else {
+      return item.roleType === 'CUSTOMER_USER';
+    }
+  });
   return Promise.resolve<RoleListItem[]>(options);
 };
 

@@ -63,7 +63,7 @@
         const BMap = (window as any).BMap;
         if (!wrapEl) return;
         const map = new BMap.Map(wrapEl);
-        const point = new BMap.Point(116.14282, 35.19515);
+        const point = new BMap.Point(104.04666605565338, 30.543516387560476);
 
         map.centerAndZoom(point, 15);
         map.enableScrollWheelZoom(true);

 <template>
   <div>
-    <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
+    <PageWrapper dense contentFullHeight contentClass="flex">
       <OrganizationIdTree
         class="w-1/4 xl:w-1/5"
         @select="handleSelect"
@@ -12,7 +12,7 @@
           <a-button
             type="primary"
             color="error"
-            @click="handleDeleteOrBatchDelete.bind(null)"
+            @click="handleDeleteOrBatchDelete(null)"
             :disabled="hasBatchDelete"
           >
             批量删除
@@ -120,7 +120,7 @@
         }
       };
       // 删除或批量删除
-      const handleDeleteOrBatchDelete = async (record?: Recordable) => {
+      const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
         if (record) {
           try {
             await deleteAlarmContact([record.id]);

@@ -14,35 +14,43 @@
       :bodyStyle="{ padding: 0 }"
     >
       <div v-if="activeKey === 'tab1'">
-        <List item-layout="horizontal" :data-source="data">
+        <List item-layout="horizontal" :dataSource="dataSource">
           <template #renderItem="{ item }">
             <ListItem>
-              <ListItemMeta :description="item.description">
-                <template #title>
-                  <a href="https://www.antdv.com/">{{ item.title }}</a>
-                </template>
+              <ListItemMeta>
                 <template #avatar>
-                  <Avatar :src="item.avatar" />
+                  <Avatar src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" />
+                </template>
+                <template #description>
+                  <span
+                    @click="go('/stationnotification/mynotification')"
+                    class="cursor-pointer noticeTitle"
+                    >{{ item.sysNotice.title }}
+                  </span>
+                </template>
+                <template #title>
+                  <span>{{ item.user.realName }}</span>
                 </template>
               </ListItemMeta>
-              <template #extra> {{ item.date }} </template>
+              <template #extra>
+                <Time :value="item.sysNotice.senderDate" />
+              </template>
             </ListItem>
           </template>
         </List>
+        <Card hoverable title="联系我们" :bordered="false">
+          <template #cover>
+            <img :src="getQrCode" alt="" style="width: 150px; height: 150px; margin: 50px auto" />
+          </template>
+          <CardMeta>
+            <template #description>
+              <p>联系人: {{ getContacts }}</p>
+              <p>联系电话: {{ getTel }}</p>
+              <p>联系地址: {{ getAddress }} </p>
+            </template>
+          </CardMeta>
+        </Card>
       </div>
-      <div v-else>222</div>
-    </Card>
-    <Card hoverable title="联系我们" :bordered="false">
-      <template #cover>
-        <img :src="getQrCode" alt="" style="width: 150px; height: 150px; margin: 50px auto" />
-      </template>
-      <CardMeta>
-        <template #description>
-          <p>联系人: {{ getContacts }}</p>
-          <p>联系电话: {{ getTel }}</p>
-          <p>联系地址: {{ getAddress }} </p>
-        </template>
-      </CardMeta>
     </Card>
   </Card>
 </template>
@@ -52,6 +60,9 @@
   import { Card, AnchorLink, List, ListItem, ListItemMeta, Avatar, CardMeta } from 'ant-design-vue';
   import { useUserStore } from '/@/store/modules/user';
   import { getEnterPriseDetail } from '/@/api/oem';
+  import { notifyMyGetrPageApi } from '/@/api/stationnotification/stationnotifyApi';
+  import { Time } from '/@/components/Time';
+  import { useGo } from '/@/hooks/web/usePage';
   export default defineComponent({
     components: {
       Card,
@@ -60,6 +71,7 @@
       ListItem,
       ListItemMeta,
       Avatar,
+      Time,
       CardMeta,
     },
     setup() {
@@ -90,57 +102,13 @@
       const tabListTitle = [
         {
           key: 'tab1',
-          tab: '通知公告',
-        },
-        {
-          key: 'tab2',
-          tab: '系统公告',
+          tab: '我的通知',
         },
       ];
       const onTabChange = (key) => {
         activeKey.value = key;
       };
 
-      // 列表
-      interface DataItem {
-        title: string;
-        description: string;
-        avatar: string;
-        date: string;
-      }
-      const data: DataItem[] = [
-        {
-          title: '企业管理员',
-          description: '现在就来开创新的记录吧！',
-          avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-          date: '5分钟前',
-        },
-        {
-          title: '企业管理员',
-          description: '有新的告警数据需要处理,现在去查看吧',
-          avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-          date: '7小时前',
-        },
-        {
-          title: '管理员',
-          description: '有新的告警数据需要处理,现在去查看吧',
-          avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-          date: '6小时前',
-        },
-        {
-          title: '管理员',
-          description: '现在就来开创新的记录吧！',
-          avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-          date: '1小时前',
-        },
-        {
-          title: '管理员',
-          description: '现在就来开创新的记录吧！',
-          avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-          date: '7小时前',
-        },
-      ];
-
       const userStore = useUserStore();
       const getContacts = computed(() => {
         return userStore.enterPriseInfo?.contacts;
@@ -155,19 +123,32 @@
         return userStore.enterPriseInfo?.qrCode;
       });
 
+      // 通知数据
+      const dataSource = ref([]);
+      const go = useGo();
+      onMounted(async () => {
+        const res = await notifyMyGetrPageApi({ page: 1, pageSize: 5 });
+        dataSource.value = res.items;
+      });
+
       return {
         activeKey,
         tabListTitle,
         onTabChange,
-        data,
         helpDoc,
         getQrCode,
         getContacts,
         getAddress,
         getTel,
+        dataSource,
+        go,
       };
     },
   });
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+  .noticeTitle:hover {
+    border-bottom: 1px solid #ccc;
+  }
+</style>

@@ -34,7 +34,7 @@
   import { useDrawerInner } from '/@/components/Drawer';
   import { columns, searchFormSchema } from './email.data';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { deleteSmsLog, mailLogPage } from '/@/api/message/records';
+  import { deleteSmsLog, mailLogPage, deleteMailLog } from '/@/api/message/records';
   import { useModal } from '/@/components/Modal';
   import EmailDetail from '/@/views/message/records/item/EmailDetail.vue';
   export default defineComponent({
@@ -77,7 +77,7 @@
 
       function handleDelete(record: Recordable) {
         let ids = [record.id];
-        deleteSmsLog(ids).then((result) => {
+        deleteMailLog(ids).then((result) => {
           createMessage.success(result.message);
           handleSuccess();
         });

+<template>
+  <div>
+    <BasicModal
+      v-bind="$attrs"
+      @register="registerModal"
+      :showFooter="false"
+      :title="dataSource?.sysNotice?.title"
+      width="50%"
+      centered
+      :showCancelBtn="false"
+      :showOkBtn="false"
+      @cancel="handleClose"
+    >
+      <PageWrapper dense contentFullHeight contentBackground>
+        <div class="detail-notice-info">
+          <span class="mr-6"
+            ><UserOutlined class="mr-2" />发送者:{{ dataSource?.user?.realName }}</span
+          >
+          <span class="mr-6"
+            ><SolutionOutlined class="mr-2" />通知类型:{{
+              dataSource?.sysNotice?.type === 'NOTICE'
+                ? '公告'
+                : dataSource?.sysNotice?.type === 'MEETING'
+                ? '会议'
+                : dataSource?.sysNotice?.type === 'OTHER'
+                ? '其他'
+                : ''
+            }}</span
+          >
+          <span class="mr-6"
+            ><FieldTimeOutlined class="mr-2" />发送时间{{ dataSource?.sysNotice.senderDate }}</span
+          >
+        </div>
+        <p v-html="dataSource?.sysNotice?.content"></p>
+      </PageWrapper>
+    </BasicModal>
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { UserOutlined, SolutionOutlined, FieldTimeOutlined } from '@ant-design/icons-vue';
+  import { PageWrapper } from '/@/components/Page';
+  import { notifyMyGetDetailApi } from '/@/api/stationnotification/stationnotifyApi';
+  export default defineComponent({
+    name: 'MyNoticeDrawer',
+    components: { BasicModal, PageWrapper, UserOutlined, SolutionOutlined, FieldTimeOutlined },
+    emits: ['success', 'register'],
+    setup(_, { emit }) {
+      const dataSource = ref();
+      const [registerModal] = useModalInner(async (data) => {
+        dataSource.value = data.record;
+      });
+      const handleClose = async () => {
+        await notifyMyGetDetailApi(unref(dataSource).id);
+        emit('success');
+      };
+      return {
+        registerModal,
+        handleClose,
+        dataSource,
+      };
+    },
+  });
+</script>
+
+<style lang="less" scoped>
+  .detail-notice-info {
+    color: #999;
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    padding-top: 5px;
+    padding-bottom: 5px;
+  }
+</style>

@@ -7,11 +7,8 @@ import { h } from 'vue';
 export const columns: BasicColumn[] = [
   {
     title: '标题',
-    dataIndex: 'title',
+    dataIndex: 'sysNotice.title',
     width: 200,
-    format: (text: string, record: Recordable) => {
-      return record.sysNotice.title ?? '无';
-    },
   },
   {
     title: '类型',
@@ -29,15 +26,12 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '发送者',
-    dataIndex: 'senderName',
+    dataIndex: 'user.realName',
     width: 200,
-    format: (text: string, record: Recordable) => {
-      return record.sysNotice.senderName ?? '无';
-    },
   },
   {
     title: '发送时间',
-    dataIndex: 'createTime',
+    dataIndex: 'sysNotice.senderDate',
     width: 200,
   },
   {

@@ -14,21 +14,21 @@
         />
       </template>
     </BasicTable>
-    <NotifyDetailDrawer @register="registerDrawer" @success="handleSuccess" />
+    <CatNoticeModal @register="registerModal" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts">
   import { defineComponent } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useDrawer } from '/@/components/Drawer';
-  import NotifyDetailDrawer from './useDrawer.vue';
+  import { useModal } from '/@/components/Modal';
+  import CatNoticeModal from './CatNoticeModal.vue';
   import { columns, searchFormSchema } from './config.d';
   import { notifyMyGetrPageApi } from '/@/api/stationnotification/stationnotifyApi';
   export default defineComponent({
     name: 'LoginForm',
-    components: { BasicTable, NotifyDetailDrawer, TableAction },
+    components: { BasicTable, CatNoticeModal, TableAction },
     setup() {
-      const [registerDrawer, { openDrawer }] = useDrawer();
+      const [registerModal, { openModal }] = useModal();
       const [registerTable, { reload }] = useTable({
         api: notifyMyGetrPageApi,
         columns,
@@ -50,7 +50,7 @@
       });
 
       function handleView(record: Recordable) {
-        openDrawer(true, {
+        openModal(true, {
           record,
         });
       }
@@ -60,7 +60,7 @@
       }
       return {
         registerTable,
-        registerDrawer,
+        registerModal,
         handleView,
         handleSuccess,
       };

-<template>
-  <div>
-    <BasicDrawer
-      v-bind="$attrs"
-      @register="registerDrawer"
-      :showFooter="false"
-      title="通知详情"
-      width="70%"
-      @close="handleClose"
-    >
-      <div v-html="DescInfo?.content"></div>
-      <Description @register="registerDesc" />
-    </BasicDrawer>
-  </div>
-</template>
-<script lang="ts">
-  import { defineComponent, ref } from 'vue';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { Description, useDescription } from '/@/components/Description/index';
-  import { DescDetailSchema } from './config.d';
-  import {
-    noticeByIdGetInfo,
-    notifyMyGetDetailApi,
-  } from '/@/api/stationnotification/stationnotifyApi';
-  export default defineComponent({
-    name: 'MyNoticeDrawer',
-    components: { BasicDrawer, Description },
-    emits: ['success', 'register'],
-    setup(_, { emit }) {
-      const dataSource = ref();
-      let DescInfo = ref();
-      const [registerDrawer] = useDrawerInner(async (data) => {
-        dataSource.value = data.record;
-        const id = data.record.noticeId;
-        let getDescInfo = await noticeByIdGetInfo(id);
-        DescInfo.value = getDescInfo;
-      });
-      const [registerDesc] = useDescription({
-        bordered: false,
-        schema: DescDetailSchema,
-        data: dataSource,
-      });
-      const handleClose = async () => {
-        await notifyMyGetDetailApi(dataSource.value.id);
-        emit('success');
-      };
-      return {
-        DescInfo,
-        registerDesc,
-        registerDrawer,
-        handleClose,
-      };
-    },
-  });
-</script>

 <template>
   <div>
-    <BasicTable
-      :rowSelection="{ type: 'checkbox' }"
-      @selection-change="useSelectionChange"
-      @register="registerTable"
-    >
+    <BasicTable @register="registerTable">
       <template #toolbar>
         <a-button type="primary" @click="handleAdd"> 新增 </a-button>
-        <a-button color="error" @click="handleToolbarDel"> 删除 </a-button>
+        <a-button color="error" @click="handleToolbarDel" :disabled="hasBatchDelete">
+          批量删除
+        </a-button>
       </template>
       <template #action="{ record }">
         <TableAction
@@ -46,7 +44,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, reactive } from 'vue';
+  import { defineComponent, computed, unref, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
   import NotifyManagerDrawer from './useDrawer.vue';
@@ -56,15 +54,27 @@
   import { notifyGetTableApi, notifyDeleteApi } from '/@/api/stationnotification/stationnotifyApi';
 
   export default defineComponent({
-    name: 'Index',
+    name: 'Notificationmannager',
     components: { BasicTable, NotifyManagerDrawer, TableAction, tableViewChild },
     setup() {
-      let selectedRowKeys = reactive<string[]>([]);
-
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [registerAdd, { openDrawer: openDrawerAdd }] = useDrawer();
       const { createMessage } = useMessage();
-      const [registerTable, { reload, getSelectRowKeys }] = useTable({
+      // 批量删除
+      const selectedRowIds = ref<string[]>([]);
+      const hasBatchDelete = computed(() => unref(selectedRowIds).length <= 0);
+      const onSelectRowChange = (selectedRowKeys: string[]) => {
+        selectedRowIds.value = selectedRowKeys;
+        console.log(selectedRowKeys);
+      };
+      async function handleToolbarDel() {
+        await notifyDeleteApi(selectedRowIds.value);
+        createMessage.success('批量删除成功');
+        selectedRowIds.value = [];
+        reload();
+      }
+
+      const [registerTable, { reload }] = useTable({
         clickToRowSelect: false,
         api: notifyGetTableApi,
         columns,
@@ -72,6 +82,10 @@
           labelWidth: 120,
           schemas: searchFormSchema,
         },
+        rowSelection: {
+          onChange: onSelectRowChange,
+          type: 'checkbox',
+        },
         rowKey: 'id',
         useSearchForm: true,
         showTableSetting: true,
@@ -92,15 +106,6 @@
         });
       }
 
-      const useSelectionChange = () => {
-        selectedRowKeys = getSelectRowKeys();
-      };
-
-      async function handleToolbarDel() {
-        await notifyDeleteApi(selectedRowKeys);
-        createMessage.success('删除成功');
-        reload();
-      }
       const handleView = (record: Recordable) => {
         openDrawer(true, {
           record,
@@ -122,9 +127,9 @@
         reload();
       }
       return {
+        hasBatchDelete,
         handleView,
         registerAdd,
-        useSelectionChange,
         registerTable,
         registerDrawer,
         handleAdd,
@@ -132,6 +137,7 @@
         handleEdit,
         handleDelete,
         handleSuccess,
+        onSelectRowChange,
       };
     },
   });

@@ -37,22 +37,22 @@
       label: '发送者',
     },
     {
-      field: 'senderDate',
-      label: '发送时间',
-    },
-    {
       field: 'type',
       label: '类型:',
-      render: (_, data) => {
-        return data.type === 'NOTICE'
+      render: (_, { type }) => {
+        return type === 'NOTICE'
           ? '公告'
-          : data.type === 'MEETING'
+          : type === 'MEETING'
           ? '会议'
-          : data.type === 'OTHER'
+          : type === 'OTHER'
           ? '其他'
           : '';
       },
     },
+    {
+      field: 'senderDate',
+      label: '发送时间',
+    },
   ];
   export default defineComponent({
     name: 'ConfigDrawer',

@@ -90,7 +90,7 @@
 
   const formData = reactive({
     account: 'sysadmin',
-    password: 'password',
+    password: 'Sysadmin@123',
   });
 
   const { validForm } = useFormValid(formRef);