Merge branch 'sqy_dev' into 'main'

fix:改写通知管理，优化代码，修改bug

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

 import { BasicPageParams } from '/@/api/model/baseModel';
 
 export type NoticeQueryParam = BasicPageParams & NoticeParams;
-
+export type NoticeUserParam = BasicPageParams & NoticeUserParams;
 export type NoticeParams = {
   orderFiled?: string;
   id?: string;
 };
 
+export type NoticeUserParams = {
+  noticeId?: string;
+};
 export type NoticeByIdParams = {
   id: string;
 };

 import { defHttp } from '/@/utils/http/axios';
 import {
   NoticeQueryParam,
+  NoticeUserParam,
   NotifyAddDraftModel,
   NotifyAddreLeaseModel,
 } from '/@/api/stationnotification/model/stationnotifyModel';
@@ -129,12 +130,10 @@ export const notifyOrganizationGetApi = () => {
   });
 };
 
-export const getNotifyDetailPage = (id: string) => {
-  console.log(id, '-----------------');
-  return (params) => {
-    return defHttp.get({
-      url: `${NotifyManagerApi.NOTICE_GET_PAGE_URL}/${id}`,
-      params,
-    });
-  };
+// 获取通知管理的查看表格数据
+export const getNotifyDetailPage = (params: NoticeUserParam) => {
+  return defHttp.get({
+    url: NotifyManagerApi.NOTICE_GET_PAGE_URL + '/' + params.noticeId,
+    params,
+  });
 };

@@ -64,7 +64,10 @@ export const saveOrUpdateOrganization = (params?: OrganizationListItem, isUpdate
  * @param ids 删除的ID
  */
 export const delOrganization = (ids: string[]) =>
-  defHttp.delete({ url: Api.BaseOrganization, data: ids });
+  defHttp.delete({
+    url: Api.BaseOrganization,
+    data: ids,
+  });
 
 export const getMenuList = (params?: MenuParams) =>
   defHttp.get<MenuListGetResultModel>({ url: Api.MenuList, params });

@@ -35,6 +35,7 @@
     :maskClosable="false"
     title="请您修改初始密码"
     :helpMessage="['请您修改初始密码']"
+    :keyboard="false"
   >
     <PasswordDialog />
   </BasicModal>

-<template>
-  <div>
-    <PageWrapper title="我的通知详情">
-      <Description @register="register1" class="mt-4" />
-    </PageWrapper>
-  </div>
-</template>
-<script lang="ts">
-  import { defineComponent, watch, ref } from 'vue';
-  import { Description, DescItem, useDescription } from '/@/components/Description/index';
-  import { PageWrapper } from '/@/components/Page';
-
-  const schema: DescItem[] = [
-    {
-      field: 'creator',
-      label: '创建者',
-    },
-    {
-      field: 'createTime',
-      label: '创建时间',
-    },
-    {
-      field: 'title',
-      label: '标题',
-    },
-    {
-      field: 'updateTime',
-      label: '更新时间',
-    },
-    {
-      field: 'senderName',
-      label: '发送者',
-    },
-    {
-      field: 'readDate',
-      label: '阅读时间',
-    },
-    {
-      field: 'readStatus',
-      label: '阅读状态',
-      render: (_, data) => {
-        return data.readStatus === 0 ? '草稿' : data.readStatus === 1 ? '已读' : '其他';
-      },
-    },
-    {
-      field: 'type',
-      label: '类型',
-      render: (_, data) => {
-        return data.type === 'NOTICE'
-          ? '公告'
-          : data.type === 'MEETING'
-          ? '会议'
-          : data.type === 'OTHER'
-          ? '其他'
-          : '';
-      },
-    },
-    {
-      field: 'updater',
-      label: '更新者',
-    },
-  ];
-  export default defineComponent({
-    components: { Description, PageWrapper },
-    props: {
-      emitChildData: {
-        type: Object,
-      },
-    },
-    setup(props) {
-      let useDescriptionData: any = ref(null);
-      watch(
-        () => props.emitChildData,
-        async (newV) => {
-          useDescriptionData.value = newV;
-        }
-      );
-      const [register1] = useDescription({
-        title: '通知详情',
-        bordered: false,
-        data: useDescriptionData,
-        schema: schema,
-      });
-
-      return { register1 };
-    },
-  });
-</script>

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { Tag } from 'ant-design-vue';
+import { DescItem } from '/@/components/Description/index';
+
 import { h } from 'vue';
 
 export const columns: BasicColumn[] = [
@@ -8,7 +10,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'title',
     width: 200,
     format: (text: string, record: Recordable) => {
-      return record.title ? record.title : '无';
+      return record.sysNotice.title ?? '无';
     },
   },
   {
@@ -16,11 +18,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'type',
     width: 200,
     format: (text: string, record: Recordable) => {
-      return record.type === 'NOTICE'
+      return record.sysNotice.type === 'NOTICE'
         ? '公告'
-        : record.type === 'MEETING'
+        : record.sysNotice.type === 'MEETING'
         ? '会议'
-        : record.type === 'OTHER'
+        : record.sysNotice.type === 'OTHER'
         ? '其他'
         : '无';
     },
@@ -30,7 +32,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'senderName',
     width: 200,
     format: (text: string, record: Recordable) => {
-      return record.senderName ? record.senderName : '无';
+      return record.sysNotice.senderName ?? '无';
     },
   },
   {
@@ -47,7 +49,7 @@ export const columns: BasicColumn[] = [
       const enable = status == 0 ? '未读' : status == 1 ? '已读' : '其他';
       const color = enable == '未读' ? 'green' : enable == '已读' ? 'yellow' : 'red';
       const text = enable == '未读' ? '未读' : enable == '已读' ? '已读' : '其他';
-      return h(Tag, { color: color }, () => text);
+      return h(Tag, { color }, () => text);
     },
   },
 ];
@@ -76,3 +78,27 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
 ];
+
+export const DescDetailSchema: DescItem[] = [
+  {
+    field: 'sysNotice.senderName',
+    label: '发送者',
+  },
+  {
+    field: 'sysNotice.senderDate',
+    label: '发送时间',
+  },
+  {
+    field: 'sysNotice.type',
+    label: '类型',
+    render: (text) => {
+      return text === 'NOTICE'
+        ? '公告'
+        : text === 'MEETING'
+        ? '会议'
+        : text === 'OTHER'
+        ? '其他'
+        : '';
+    },
+  },
+];

 <template>
   <div>
-    <BasicTable
-      :rowSelection="{ type: 'checkbox' }"
-      @selection-change="useSelectionChange"
-      @register="registerTable"
-    >
+    <BasicTable @register="registerTable">
       <template #action="{ record }">
         <TableAction
           :actions="[
             {
               label: '查看',
+              tooltip: '查看',
               icon: 'clarity:note-edit-line',
               onClick: handleView.bind(null, record),
             },
@@ -26,26 +23,19 @@
   import { useDrawer } from '/@/components/Drawer';
   import NotifyDetailDrawer from './useDrawer.vue';
   import { columns, searchFormSchema } from './config.d';
-  // import { useMessage } from '/@/hooks/web/useMessage';
-  // ,notifyMyGetDetailApi,notifyMyGetrPageApi,notifyMyGetrReadApi
   import { notifyMyGetrPageApi } from '/@/api/stationnotification/stationnotifyApi';
-
   export default defineComponent({
     name: 'Index',
     components: { BasicTable, NotifyDetailDrawer, TableAction },
     setup() {
-      let selectedRowKeys: Array<string> = [];
       const [registerDrawer, { openDrawer }] = useDrawer();
-      const [registerTable, { reload, getSelectRowKeys }] = useTable({
-        title: '',
-        clickToRowSelect: false,
+      const [registerTable, { reload }] = useTable({
         api: notifyMyGetrPageApi,
         columns,
         formConfig: {
           labelWidth: 120,
           schemas: searchFormSchema,
         },
-        rowKey: 'id',
         useSearchForm: true,
         showTableSetting: true,
         bordered: true,
@@ -55,19 +45,13 @@
           title: '操作',
           dataIndex: 'action',
           slots: { customRender: 'action' },
-          fixed: undefined,
+          fixed: 'right',
         },
       });
 
-      const useSelectionChange = () => {
-        selectedRowKeys = getSelectRowKeys();
-        console.log(selectedRowKeys);
-      };
-
       function handleView(record: Recordable) {
         openDrawer(true, {
           record,
-          isUpdate: true,
         });
       }
 
@@ -75,7 +59,6 @@
         reload();
       }
       return {
-        useSelectionChange,
         registerTable,
         registerDrawer,
         handleView,

@@ -4,109 +4,53 @@
       v-bind="$attrs"
       @register="registerDrawer"
       :showFooter="false"
-      :title="getTitle"
-      width="1000px"
+      title="通知详情"
+      width="70%"
+      @close="handleClose"
     >
-      <DetailChild :emitChildData="childData" />
-      <BasicTable :columns="columns" :dataSource="tableData">
-        <span></span>
-      </BasicTable>
+      <div v-html="DescInfo?.content"></div>
+      <Description @register="registerDesc" />
     </BasicDrawer>
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref } from 'vue';
+  import { defineComponent, ref } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import DetailChild from './child/index.vue';
+  import { Description, useDescription } from '/@/components/Description/index';
+  import { DescDetailSchema } from './config.d';
   import {
+    noticeByIdGetInfo,
     notifyMyGetrReadApi,
     notifyMyGetDetailApi,
   } from '/@/api/stationnotification/stationnotifyApi';
-  import { BasicTable } from '/@/components/Table';
-  import { BasicColumn } from '/@/components/Table/src/types/table';
-
   export default defineComponent({
-    name: 'ConfigDrawer',
-    components: { BasicDrawer, DetailChild, BasicTable },
+    name: 'MyNoticeDrawer',
+    components: { BasicDrawer, Description },
     emits: ['success', 'register'],
-    setup() {
-      const isUpdate = ref(true);
-      const childData: any = ref(null);
-      const tableData = ref([]);
-      const columns: BasicColumn[] = [
-        {
-          title: '创建时间',
-          dataIndex: 'createTime',
-        },
-        {
-          title: '阅读状态',
-          dataIndex: 'readStatus',
-          format: (_text: string, record: Recordable) => {
-            return record.readStatus === '0' ? '草稿' : record.readStatus === '1' ? '已读' : '其他';
-          },
-        },
-        {
-          title: '阅读时间',
-          dataIndex: 'readDate',
-        },
-        {
-          title: '发送者',
-          dataIndex: 'senderName',
-          format: (_text: string, record: Recordable) => {
-            return record.sysNoticeDTO.senderName;
-          },
-        },
-        {
-          title: '发送时间',
-          dataIndex: 'senderDate',
-          format: (_text: string, record: Recordable) => {
-            return record.sysNoticeDTO.senderDate;
-          },
-        },
-        {
-          title: '类型',
-          dataIndex: 'type',
-          format: (_text: string, record: Recordable) => {
-            return record.sysNoticeDTO.type === 'NOTICE'
-              ? '公告'
-              : record.sysNoticeDTO.type === 'MEETING'
-              ? '会议'
-              : record.sysNoticeDTO.type === 'OTHER'
-              ? '其他'
-              : '无';
-          },
-        },
-      ];
-      const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-        setDrawerProps({ confirmLoading: false });
-        isUpdate.value = !!data?.isUpdate;
-        if (data.record) {
-          let getData = await notifyMyGetDetailApi(data.record.id);
-          childData.value = getData;
-          let tableGet = await notifyMyGetrReadApi({
-            page: 1,
-            pageSize: 10,
-          });
-          tableData.value = tableGet.items;
-        }
-        //编辑
-        if (unref(isUpdate)) {
-        } else {
-        }
+    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 getTitle = computed(() => (!unref(isUpdate) ? '新增通知' : '查看通知'));
-      const handleCancel = () => {
-        closeDrawer();
+      const [registerDesc] = useDescription({
+        bordered: false,
+        schema: DescDetailSchema,
+        data: dataSource,
+      });
+      const handleClose = async () => {
+        console.log(dataSource.value);
+        await notifyMyGetDetailApi(dataSource.value.id);
+        emit('success');
       };
-
       return {
-        tableData,
-        columns,
-        childData,
-        handleCancel,
-        getTitle,
+        DescInfo,
+        registerDesc,
         registerDrawer,
+        handleClose,
       };
     },
   });

@@ -118,27 +118,10 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'organizationId',
-    label: '所属组织',
-    colProps: { span: 12 },
-    component: 'ApiTreeSelect',
-    componentProps: {
-      api: async () => {
-        const data = await getOrganizationList();
-        copyTransFun(data as any as any[]);
-        return data;
-      },
-      onChange: (v) => {
-        isDeptId.value = v;
-      },
-    },
-    ifShow: ({ values }) => isOrg(Reflect.get(values, 'receiverType')),
-  },
-  {
     field: 'receiverType',
     required: true,
     label: '接收者',
-    colProps: { span: 24 },
+    colProps: { span: 13 },
     component: 'Select',
     componentProps: {
       placeholder: '接收者',
@@ -159,35 +142,26 @@ export const formSchema: FormSchema[] = [
         }
       },
     },
-    // componentProps: {
-    //   api: findDictItemByCode,
-    //   params: {
-    //     dictCode: 'receiver_type',
-    //   },
-    //   labelField: 'itemText',
-    //   valueField: 'itemValue',
-    //   onChange: (v) => {
-    //     switch (v) {
-    //       case '0':
-    //         selectWhere.value = v;
-    //         break;
-    //       case '1':
-    //         selectWhere.value = v;
-    //         break;
-    //       case '2':
-    //         selectWhere.value = v;
-    //         break;
-    //       case '3':
-    //         selectWhere.value = v;
-    //         break;
-    //       default:
-    //         selectWhere.value = v;
-    //     }
-    //   },
-    // },
   },
   {
-    field: '',
+    field: 'organizationId',
+    label: '所属组织',
+    colProps: { span: 13 },
+    component: 'ApiTreeSelect',
+    componentProps: {
+      api: async () => {
+        const data = await getOrganizationList();
+        copyTransFun(data as any as any[]);
+        return data;
+      },
+      onChange: (v) => {
+        isDeptId.value = v;
+      },
+    },
+    ifShow: ({ values }) => isOrg(Reflect.get(values, 'receiverType')),
+  },
+  {
+    field: 'abc',
     component: 'Input',
     label: '',
     colProps: {
@@ -224,17 +198,18 @@ export const searchFormSchema: FormSchema[] = [
 export const detailColumns: BasicColumn[] = [
   {
     title: '接收者',
-    dataIndex: 'title2',
+    dataIndex: 'user.realName',
     width: 200,
   },
   {
     title: '阅读状态',
-    dataIndex: 'title3',
+    dataIndex: 'readStatus',
     width: 200,
+    slots: { customRender: 'readStatus' },
   },
   {
     title: '阅读时间',
-    dataIndex: 'title1',
+    dataIndex: 'readDate',
     width: 200,
   },
 ];

@@ -17,7 +17,7 @@
               icon: 'clarity:note-edit-line',
               onClick: handleView.bind(null, record),
               ifShow: (_action) => {
-                return record.status == '已发布';
+                return record.status === '已发布';
               },
             },
             {
@@ -25,7 +25,7 @@
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
               ifShow: (_action) => {
-                return record.status == '草稿';
+                return record.status === '草稿';
               },
             },
             {
@@ -46,7 +46,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, reactive, ref } from 'vue';
+  import { defineComponent, reactive } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
   import NotifyManagerDrawer from './useDrawer.vue';
@@ -59,13 +59,12 @@
     name: 'Index',
     components: { BasicTable, NotifyManagerDrawer, TableAction, tableViewChild },
     setup() {
-      let selectedRowKeys: string[] = reactive([]);
+      let selectedRowKeys = reactive<string[]>([]);
 
-      const [registerAdd, { openDrawer: openDrawerAdd }] = useDrawer();
       const [registerDrawer, { openDrawer }] = useDrawer();
+      const [registerAdd, { openDrawer: openDrawerAdd }] = useDrawer();
       const { createMessage } = useMessage();
       const [registerTable, { reload, getSelectRowKeys }] = useTable({
-        title: '',
         clickToRowSelect: false,
         api: notifyGetTableApi,
         columns,
@@ -83,7 +82,7 @@
           title: '操作',
           dataIndex: 'action',
           slots: { customRender: 'action' },
-          fixed: undefined,
+          fixed: 'right',
         },
       });
 
@@ -105,7 +104,6 @@
       const handleView = (record: Recordable) => {
         openDrawer(true, {
           record,
-          isUpdate: true,
         });
       };
       function handleEdit(record: Recordable) {

@@ -32,8 +32,6 @@
     notifyAddLeaseApi,
   } from '/@/api/stationnotification/stationnotifyApi';
   import { useMessage } from '/@/hooks/web/useMessage';
-  // import { getOrganizationList } from '/@/api/system/system';
-
   export default defineComponent({
     name: 'ConfigDrawer',
     components: { BasicDrawer, BasicForm, Button },
@@ -60,7 +58,6 @@
         isUpdate.value = !!data?.isUpdate;
         //编辑
         if (unref(isUpdate)) {
-          console.log(data.record);
           getId.value = data.record.id;
           await setFieldsValue({
             ...data.record,
@@ -115,7 +112,7 @@
           getAllEditData.pointId = pointArray.value;
           Object.assign(postAllEditData, getAllEditData);
           await notifyAddLeaseApi(postAllEditData);
-          createMessage.success('编辑成功');
+          createMessage.success('新增成功');
           closeDrawer();
           emit('success');
         }
@@ -156,7 +153,7 @@
           }
           getAllEditData.pointId = pointArray.value;
           Object.assign(postAllEditData, getAllEditData);
-          await notifyAddLeaseApi(postAllEditData);
+          await notifyAddDraftApi(postAllEditData);
           createMessage.success('编辑成功');
           closeDrawer();
           emit('success');

@@ -10,8 +10,13 @@
     >
       <div v-html="descInfo?.content"></div>
       <Description @register="registerDesc" class="mt-4" />
-
-      <BasicTable @register="registerTable" />
+      <BasicTable @register="registerTable" class="mt-4">
+        <template #readStatus="{ record }">
+          <Tag :color="record.readStatus === '0' ? 'orange' : 'green'">
+            {{ record.readStatus === '0' ? '未读' : '已读' }}
+          </Tag>
+        </template>
+      </BasicTable>
     </BasicDrawer>
   </div>
 </template>
@@ -25,6 +30,7 @@
   } from '/@/api/stationnotification/stationnotifyApi';
   import { useTable, BasicTable } from '/@/components/Table';
   import { detailColumns } from './config.d';
+  import { Tag } from 'ant-design-vue';
   const schema: DescItem[] = [
     {
       field: 'senderName',
@@ -50,38 +56,40 @@
   ];
   export default defineComponent({
     name: 'ConfigDrawer',
-    components: { BasicDrawer, Description, BasicTable },
+    components: { BasicDrawer, Description, BasicTable, Tag },
     emits: ['success', 'register'],
     setup() {
       let descInfo = ref();
-      const noticeId = ref('');
+      let noticeId;
       const [registerDrawer] = useDrawerInner(async (data) => {
-        if (data.isUpdate) {
-          let getDescInfo = await noticeByIdGetInfo(data.record.id);
-          noticeId.value = data.record.id;
-          descInfo.value = getDescInfo;
-          console.log(noticeId);
-        }
+        let getDescInfo = await noticeByIdGetInfo(data.record.id);
+        noticeId = data.record.id;
+        descInfo.value = getDescInfo;
+        reload();
+      });
+      const [registerTable, { reload }] = useTable({
+        api: getNotifyDetailPage,
+        columns: detailColumns,
+        bordered: true,
+        showTableSetting: false,
+        showIndexColumn: false,
+        immediate: false,
+        beforeFetch: getNoticeId,
       });
+      function getNoticeId(data) {
+        Reflect.set(data, 'noticeId', noticeId);
+      }
 
       const [registerDesc] = useDescription({
         bordered: true,
         data: descInfo,
-        schema: schema,
-      });
-      const [registerTable] = useTable({
-        api: getNotifyDetailPage(noticeId.value),
-        columns: detailColumns,
-        showTableSetting: false,
-        bordered: true,
-        showIndexColumn: false,
+        schema,
       });
       return {
         descInfo,
         registerDesc,
         registerTable,
         registerDrawer,
-        noticeId,
       };
     },
   });

@@ -77,7 +77,7 @@
           title: '操作',
           dataIndex: 'action',
           slots: { customRender: 'action' },
-          fixed: undefined,
+          fixed: 'right',
         },
       });
 

@@ -73,7 +73,7 @@
           title: '操作',
           dataIndex: 'action',
           slots: { customRender: 'action' },
-          fixed: undefined,
+          fixed: 'right',
         },
         beforeFetch: getDictId,
         immediate: true,

@@ -94,7 +94,6 @@
       }
 
       async function handleDelete(record: Recordable) {
-        // console.log(record);
         try {
           let ids = [record.id];
           await delOrganization(ids);