Merge branch 'ft-dev' into 'main'

feat:通知增加查看功能

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

 # Whether to open mock
-VITE_USE_MOCK = true
+# VITE_USE_MOCK = true
 
 # public path
 VITE_PUBLIC_PATH = /
 
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
-VITE_PROXY = [["/api","http://192.168.10.116:8082/api"],["/upload","http://192.168.10.116:3300/upload"]]
+VITE_PROXY = [["/api","http://192.168.10.117:8082/api"],["/upload","http://192.168.10.116:3300/upload"]]
 # VITE_PROXY=[["/api","https://vvbin.cn/test"]]
 
 # Delete console

@@ -26,10 +26,9 @@ enum NotifyManagerApi {
 //  * 获取详情
 //  * @param
 //  */
-export const screenLinkPageByDeptIdGetDevice = (params: NoticeByIdParams) => {
+export const noticeByIdGetInfo = (id: string) => {
   return defHttp.get({
-    url: NotifyManagerApi.NOTICE_GET_DETAIL_URL,
-    params,
+    url: `${NotifyManagerApi.NOTICE_GET_DETAIL_URL}/${id}`,
   });
 };
 

@@ -10,34 +10,49 @@
 
   const schema: DescItem[] = [
     {
+      field: 'creator',
+      label: '创建者',
+    },
+    {
       field: 'title',
       label: '标题',
     },
     {
-      field: 'content',
-      label: '内容',
+      field: 'updateTime',
+      label: '更新时间',
     },
     {
       field: 'senderName',
       label: '发送者',
     },
     {
-      field: 'createTime',
-      label: '发送时间',
+      field: 'readDate',
+      label: '阅读时间',
+    },
+    {
+      field: 'readStatus',
+      label: '阅读状态',
+      render: (_, data) => {
+        return data.readStatus === 0 ? '草稿' : data.readStatus === 1 ? '已读' : '其他';
+      },
     },
     {
       field: 'type',
       label: '类型',
       render: (_, data) => {
-        return data.type === 'MEETING'
+        return data.type === 'NOTICE'
           ? '公告'
-          : data.type === 'MEETING1'
+          : data.type === 'MEETING'
           ? '会议'
-          : data.type === 'MEETING2'
+          : data.type === 'OTHER'
           ? '其他'
           : '';
       },
     },
+    {
+      field: 'updater',
+      label: '更新者',
+    },
   ];
   export default defineComponent({
     components: { Description, PageWrapper },

@@ -54,7 +54,7 @@ export const columns: BasicColumn[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'orderField',
+    field: 'type',
     label: '',
     colProps: { span: 8 },
     component: 'Select',

@@ -4,36 +4,78 @@
     @register="registerDrawer"
     :showFooter="false"
     :title="getTitle"
-    width="800px"
+    width="1000px"
   >
     <DetailChild :emitChildData="childData" />
+    <BasicTable :columns="columns" :dataSource="tableData">
+      <span></span>
+    </BasicTable>
   </BasicDrawer>
 </template>
 <script lang="ts">
   import { defineComponent, ref, computed, unref } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import DetailChild from './child/index.vue';
-  import { notifyMyGetDetailApi } from '/@/api/stationnotification/stationnotifyApi';
-
-  // import { useMessage } from '/@/hooks/web/useMessage';
+  import {
+    notifyMyGetrReadApi,
+    notifyMyGetDetailApi,
+  } from '/@/api/stationnotification/stationnotifyApi';
+  import { BasicTable } from '/@/components/Table';
 
   export default defineComponent({
     name: 'ConfigDrawer',
-    components: { BasicDrawer, DetailChild },
+    components: { BasicDrawer, DetailChild, BasicTable },
     emits: ['success', 'register'],
     setup() {
-      // const { createMessage } = useMessage();
       const isUpdate = ref(true);
-      let childData: any = ref(null);
+      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',
+        },
+        {
+          title: '类型',
+          dataIndex: 'type',
+          render: (_, data) => {
+            return data.type === 'NOTICE'
+              ? '公告'
+              : data.type === 'MEETING'
+              ? '会议'
+              : data.type === 'OTHER'
+              ? '其他'
+              : '';
+          },
+        },
+      ];
+      // const { createMessage } = useMessage();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
-        console.log(data.record);
         if (data.record) {
-          // console.log(data.record.id);
           let getData = await notifyMyGetDetailApi(data.record.id);
           childData.value = getData;
-          // createMessage.success()
+          let tableGet = await notifyMyGetrReadApi({
+            page: 1,
+            pageSize: 10,
+          });
+          tableData.value = tableGet.items;
         }
         //编辑
         if (unref(isUpdate)) {
@@ -47,6 +89,8 @@
       };
 
       return {
+        tableData,
+        columns,
         childData,
         handleCancel,
         getTitle,

@@ -163,7 +163,7 @@ export const formSchema: FormSchema[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'orderField',
+    field: 'type',
     label: '',
     colProps: { span: 8 },
     component: 'Select',

@@ -16,17 +16,17 @@
               label: '查看',
               icon: 'clarity:note-edit-line',
               onClick: handleView.bind(null, record),
-              // ifShow: (_action) => {
-              //   return record.status == '已发布';
-              // },
+              ifShow: (_action) => {
+                return record.status == '已发布';
+              },
             },
             {
               label: '编辑',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
-              // ifShow: (_action) => {
-              //   return record.status == '草稿';
-              // },
+              ifShow: (_action) => {
+                return record.status == '草稿';
+              },
             },
             {
               label: '删除',

@@ -86,20 +86,27 @@
           Object.assign(getAllData, values);
           isJudgeWherePoint.value.forEach((f) => {
             if (f == 0) {
-              pointArray.value = [];
+              if (pointArray.value.length == 0) {
+                pointArray.value = [];
+              }
             } else if (f == 1) {
               //组织
-              pointArray.value.push(getAllData.organizationId);
+              if (pointArray.value.length == 0) {
+                pointArray.value.push(getAllData.organizationId);
+              }
             } else if (f == 2) {
               //部门
               let findDeptId = newArray.value.find((f) => {
                 return f == isJudgeWherePoint.value[4];
               });
-              console.log(findDeptId);
-              pointArray.value.push(findDeptId);
+              if (pointArray.value.length == 0) {
+                pointArray.value.push(findDeptId);
+              }
             } else if (f == 3) {
               //个人
-              pointArray.value = [3];
+              if (pointArray.value.length == 0) {
+                pointArray.value = [3];
+              }
             }
           });
           getAllData.pointId = pointArray.value;
@@ -109,8 +116,8 @@
           emit('success');
           resetFields();
           setTimeout(() => {
-            pointArray.value = [];
-            isJudgeWherePoint.value = [];
+            pointArray.value.length = 0;
+            isJudgeWherePoint.value.length = 0;
           }, 1000);
         }
         if (unref(isUpdate)) {
@@ -128,19 +135,27 @@
           Object.assign(getAllData, values);
           isJudgeWherePoint.value.forEach((f) => {
             if (f == 0) {
-              pointArray.value = [];
+              if (pointArray.value.length == 0) {
+                pointArray.value = [];
+              }
             } else if (f == 1) {
               //组织
-              pointArray.value.push(getAllData.organizationId);
+              if (pointArray.value.length == 0) {
+                pointArray.value.push(getAllData.organizationId);
+              }
             } else if (f == 2) {
               //部门
               let findDeptId = newArray.value.find((f) => {
                 return f == isJudgeWherePoint.value[4];
               });
-              pointArray.value.push(findDeptId);
+              if (pointArray.value.length == 0) {
+                pointArray.value.push(findDeptId);
+              }
             } else if (f == 3) {
               //个人
-              pointArray.value = [3];
+              if (pointArray.value.length == 0) {
+                pointArray.value = [3];
+              }
             }
           });
           getAllData.pointId = pointArray.value;

@@ -6,20 +6,17 @@
     :title="getTitle"
     width="800px"
   >
-    <PageWrapper title="我的通知详情">
+    <PageWrapper title="站内通知详情">
       <Description @register="register1" class="mt-4" />
     </PageWrapper>
-    <BasicTable :columns="columns" :dataSource="tableData">
-      <span></span>
-    </BasicTable>
   </BasicDrawer>
 </template>
 <script lang="ts">
   import { defineComponent, ref, computed, unref } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { BasicTable } from '/@/components/Table';
   import { Description, DescItem, useDescription } from '/@/components/Description/index';
   import { PageWrapper } from '/@/components/Page';
+  import { noticeByIdGetInfo } from '/@/api/stationnotification/stationnotifyApi';
 
   const schema: DescItem[] = [
     {
@@ -51,46 +48,47 @@
           : '';
       },
     },
+    {
+      field: 'status',
+      label: '状态',
+    },
+    {
+      field: 'updateTime',
+      label: '更新时间',
+    },
+    {
+      field: 'receiverType',
+      label: '接收类型',
+    },
+    {
+      field: 'createTime',
+      label: '创建时间',
+    },
   ];
-
   export default defineComponent({
     name: 'ConfigDrawer',
-    components: { BasicDrawer, BasicTable, Description, PageWrapper },
+    components: { BasicDrawer, Description, PageWrapper },
     emits: ['success', 'register'],
     setup() {
-      let tableData: [] = ref([]);
-      const columns: BasicColumn[] = [
-        {
-          title: '接收者',
-          dataIndex: 'senderName',
-        },
-        {
-          title: '阅读状态',
-          dataIndex: 'status',
-        },
-        {
-          title: '阅读时间',
-          dataIndex: 'createTime',
-        },
-      ];
+      let descInfo = ref(null);
       const isUpdate = ref(true);
+
       const [registerDrawer, { setDrawerProps }] = useDrawerInner(async (data) => {
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
-        tableData.value.push(data.record);
+        let getDescInfo = await noticeByIdGetInfo(data.record.id);
+        descInfo.value = getDescInfo;
       });
       const getTitle = computed(() => (!unref(isUpdate) ? '查看通知' : '查看通知'));
       const [register1] = useDescription({
         title: '详情',
         bordered: false,
-        data: tableData,
+        data: descInfo,
         schema: schema,
       });
       return {
         register1,
-        tableData,
         getTitle,
-        columns,
         registerDrawer,
       };
     },

@@ -13,17 +13,19 @@
           v-model:value="model[field]"
           :treeData="treeData"
           :replaceFields="{ title: 'menuName' }"
-          :checked-keys="roleMenus"
+          :checkedkeys="roleMenus"
           checkable
           toolbar
+          ref="tree"
           title="菜单分配"
+          @check="handleCheckClick"
         />
       </template>
     </BasicForm>
   </BasicDrawer>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref } from 'vue';
+  import { defineComponent, ref, computed, unref, getCurrentInstance } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './role.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
@@ -44,10 +46,13 @@
     components: { BasicDrawer, BasicForm, BasicTree },
     emits: ['success', 'register'],
     setup(_, { emit }) {
+      const { proxy } = getCurrentInstance();
+
       const isUpdate = ref(true);
       const treeData = ref<TreeItem[]>([]);
       const roleMenus = ref<string[]>([]);
       const roleId = ref('');
+      const allCheckedKeys = ref<string[]>([]);
 
       const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
         labelWidth: 90,
@@ -66,6 +71,16 @@
         });
       }
 
+      /**
+       * 根据角色id获取所有的菜单ids----里面包含父级id---会造成回显数据时
+       * 存在父级id则默认勾选所有子级id
+       */
+      function useChildrenIdsRemoveParentId(str, arr) {
+        let index = arr.indexOf(str);
+        arr.splice(index, 1);
+        return arr;
+      }
+
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         resetFields();
         roleId.value = '';
@@ -86,16 +101,35 @@
           });
           treeData.value = treeValues;
         }
-        if (data.record) {
-          roleMenus.value = await getMenusIdsByRoleId(data.record.id);
-          roleId.value = data.record.id;
-        }
-        isUpdate.value = !!data?.isUpdate;
         if (unref(isUpdate)) {
+          if (data.record) {
+            //通过角色id去获取角色对应的菜单的ids
+            roleMenus.value = await getMenusIdsByRoleId(data.record.id);
+            treeData.value.map((m) => {
+              roleMenus.value.map((m1) => {
+                if (m.key === m1) {
+                  proxy.useChildrenIdsRemoveParentId(m1, roleMenus.value);
+                }
+              });
+            });
+            proxy.$refs.tree.setCheckedKeys(roleMenus.value);
+            roleId.value = data.record.id;
+          }
           setFieldsValue({
             ...data.record,
           });
         }
+
+        // if (data.record) {
+        //   roleMenus.value = await getMenusIdsByRoleId(data.record.id);
+        //   roleId.value = data.record.id;
+        // }
+        // isUpdate.value = !!data?.isUpdate;
+        // if (unref(isUpdate)) {
+        //   setFieldsValue({
+        //     ...data.record,
+        //   });
+        // }
       });
 
       const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
@@ -110,7 +144,7 @@
             remark: values.remark,
             status: values.status,
             roleType: RoleEnum.ROLE_TENANT_ADMIN,
-            menu: [...values.menu],
+            menu: allCheckedKeys.value as string[],
           };
           console.log(req, '请求参数');
           saveOrUpdateRoleInfoWithMenu(req).then(() => {
@@ -121,8 +155,25 @@
           setDrawerProps({ confirmLoading: false });
         }
       }
+      // Tree check事件
+      const handleCheckClick = (_, e) => {
+        allCheckedKeys.value = [];
+        let nodes = e.checkedNodes;
+        let halfKeys = e.halfCheckedKeys;
+        nodes.map((node) => {
+          if (node.key != halfKeys[0] && halfKeys.length == []) {
+            allCheckedKeys.value.push(node.key);
+          } else {
+            allCheckedKeys.value.push(node.key);
+          }
+        });
+        allCheckedKeys.value.push(...halfKeys);
+      };
 
       return {
+        allCheckedKeys,
+        useChildrenIdsRemoveParentId,
+        handleCheckClick,
         registerDrawer,
         registerForm,
         getTitle,