修复最近浏览｜首页添加报告｜部分bug

src/app.tsx

@@ -237,21 +237,20 @@ export const qiankun = fetch('/config').then(() => ({
     //   name: 'microApp', // 唯一 id
     //   entry: '//localhost:8808', // 开发
     // },
-    {
-      name: 'app1', // 唯一 id
-      entry: '//120.27.235.181:8804',  //测试
-    },
-    {
-      name: 'reviewMana', // 唯一 id
-      entry: '//120.27.235.181:8807',
-      //entry: '//localhost:8804',  //本地调试
-
-
-    },
+    // {
+    //   name: 'app1', // 唯一 id
+    //   entry: '//120.27.235.181:8804',  //测试
+    // },
+    // {
+    //   name: 'reviewMana', // 唯一 id
+    //   entry: '//120.27.235.181:8807',
+    //   //entry: '//localhost:8804',  //本地调试
+    // },
     {
       name: 'budgetManaSystem', // 唯一 id
-      //entry: '//localhost:8001'
-      entry: '//120.27.235.181:5000/perform/', // 开发
+      entry: '//localhost:8001',
+      //entry: '//120.27.235.181:5000/perform/',  //开发
+      //entry: '//47.96.149.190:5000/perform/', //演示
     },
     {
       name: 'PFMBackC', // 唯一 id

src/components/topBar/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-16 09:12:37
- * @LastEditTime: 2023-03-24 16:34:14
+ * @LastEditTime: 2023-04-13 11:18:26
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/pages/index/components/topBar/index.tsx
@@ -150,7 +150,7 @@ const TopBar: React.FC<TopBarType> = (props) => {
     setIfOpenPannel(false);
     localStorage.removeItem('currentSelectedTab');
     localStorage.removeItem('selectedKeys');
-    localStorage.removeItem('visitedTabs');
+    // localStorage.removeItem('visitedTabs');
     localStorage.removeItem('openKeys');
   }
 

src/pages/index/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-10 09:33:30
- * @LastEditTime: 2022-09-08 09:06:07
+ * @LastEditTime: 2023-04-13 13:35:55
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/pages/index.tsx
@@ -10,7 +10,7 @@
 import { useModel, history, Location, Helmet } from 'umi';
 import './index.less';
 import { Skeleton, Divider } from 'antd';
-import { useState,useEffect } from 'react';
+import { useState, useEffect } from 'react';
 import avatar from '../../../public/images/avatar.png';
 import TopBar from '@/components/topBar';
 import { FastEntry, FastEntryTabType } from './components/FastEntry';
@@ -18,6 +18,7 @@ import { RecentlyVisited, RecentlyVisitedItemsType } from './components/Recently
 import { todoItem, TodoList } from './components/TodoList';
 import { getUserIndexData, todoListAct, UserInfo } from '@/service';
 import { MsgRecord } from './components/MsgRecord';
+import { getParamsManaTableData } from '../platform/setting/paramsMana/service';
 
 
 export interface IndexPageType {
@@ -38,67 +39,97 @@ const IndexPage: React.FC<IndexPageType> = ({ location }) => {
   });
 
   const [loading, setLoading] = useState(false);
-  const [userInfo,set_userInfo]  = useState<UserInfo>();
-
-  const [fastEntry,set_fastEntry] = useState<FastEntryTabType[]>([]);
-  const [recentlyVisitedList,set_recentlyVisitedList] = useState<RecentlyVisitedItemsType[]>([]);
-  const [todoList,set_todoList] = useState<todoItem[]>([]);
-  const [msgRecord,set_msgRecord] = useState([]);
-  
-
-
-
-
-  const getIndexPageDataFunc =async () => {
-        const resp = await getUserIndexData();
-        if(resp){
-          
-          set_userInfo(resp.userInfo);
-
-          const fastEntryList = resp.fastEntrance.map((item:any)=>({
-            name:item.name,
-            path:item.path,
-            menuId:item.menuId,
-            systemId:item.systemId
-          }));
-
-          set_fastEntry(fastEntryList);
-
-          set_todoList(resp.todoList.map((t:any)=>({
-            id:t.id,
-            status:1,
-            content:t.content,
-            createDate:t.createDate,
-            taskLevel:t.taskLevel,
-            
-          })));
-
-          set_msgRecord(resp.messageRecords.map((t:any)=>({
-                title:t.recordTitle,
-                date:t.createDate,
-                resolveTime:t.resolveTime,
-                isProcess:t.isProcess,
-                content:t.content
-          })));
-        }
+  const [userInfo, set_userInfo] = useState<UserInfo>();
+
+  const [fastEntry, set_fastEntry] = useState<FastEntryTabType[]>([]);
+  const [recentlyVisitedList, set_recentlyVisitedList] = useState<RecentlyVisitedItemsType[]>([]);
+  const [todoList, set_todoList] = useState<todoItem[]>([]);
+  const [msgRecord, set_msgRecord] = useState([]);
+
+  const [specialPageUrl, setspecialPageUrl] = useState<string | undefined>(undefined);
+
+  const [iframeLoading, set_iframeLoading] = useState(false);
+
+
+  const onLoadhandle = () => {
+    set_iframeLoading(false);
+  };
+
+  const getIndexPageDataFunc = async () => {
+    const resp = await getUserIndexData();
+    if (resp) {
+
+      set_userInfo(resp.userInfo);
+
+      const fastEntryList = resp.fastEntrance.map((item: any) => ({
+        name: item.name,
+        path: item.path,
+        menuId: item.menuId,
+        systemId: item.systemId
+      }));
+
+      set_fastEntry(fastEntryList);
+
+      set_todoList(resp.todoList.map((t: any) => ({
+        id: t.id,
+        status: 1,
+        content: t.content,
+        createDate: t.createDate,
+        taskLevel: t.taskLevel,
+
+      })));
+
+      set_msgRecord(resp.messageRecords.map((t: any) => ({
+        title: t.recordTitle,
+        date: t.createDate,
+        resolveTime: t.resolveTime,
+        isProcess: t.isProcess,
+        content: t.content
+      })));
+    }
   }
 
-  const todoListClickHandle = async (id:number)=>{
-        const resp = await todoListAct([id]);
-        if(resp){
-          getIndexPageDataFunc();
-        }
+  const todoListClickHandle = async (id: number) => {
+    const resp = await todoListAct([id]);
+    if (resp) {
+      getIndexPageDataFunc();
+    }
+  }
+
+  const setIframeUrl = async () => {
+
+    const resp = await getParamsManaTableData({ current: 1, pageSize: 100 });
+
+    if (resp) {
+      const needItem = resp.list.filter((a: any) => a.id == 31);
+      const userData = localStorage.getItem('userData');
+      let token = '';
+      if (userData) {
+        const { youshuToken } = JSON.parse(userData);
+        token = youshuToken
+      }
+
+      if (needItem.length > 0) {
+        setspecialPageUrl(`http://eastern1.kcim-bi.163yun.com/dash/integration/56&rid=${needItem[0].value}&toolbar=[]&hideTitle=true&hideScaleBar=false&hidePageBar=false&token=${token}`);
+      }
+    }
   }
 
-  
-  useEffect(()=>{
+
+
+  useEffect(() => {
     getIndexPageDataFunc();
     const t = localStorage.getItem('visitedTabs');
-    if(t){
+    if (t) {
       const visitedPaths = JSON.parse(t);
       set_recentlyVisitedList(visitedPaths);
     }
-  },[])
+
+    setIframeUrl();
+
+    // const url = `${spacialPage[0].url}&token=${youshuToken}`;
+
+  }, [])
 
 
   return (
@@ -118,61 +149,69 @@ const IndexPage: React.FC<IndexPageType> = ({ location }) => {
                   <div className="info">
                     <div className="name">{userInfo?.name}</div>
                     <div className="baseInfo">
-                      {`${userInfo?.gender} | ${userInfo?.title?userInfo?.title:'-'} | ${userInfo?.major?userInfo?.major:'-'}`}
+                      {`${userInfo?.gender} | ${userInfo?.title ? userInfo?.title : '-'} | ${userInfo?.major ? userInfo?.major : '-'}`}
                     </div>
                   </div>
                   <div className='staffBaseInfo'>
                     <div className='staffBaseInfoSpan'>
                       <span className='spanName'>人员工号</span>
-                      <span className='spanValue'>{userInfo?.account?userInfo?.account:'-'}</span>
+                      <span className='spanValue'>{userInfo?.account ? userInfo?.account : '-'}</span>
                     </div>
                     <Divider type="vertical" className='Divider' />
                     <div className='staffBaseInfoSpan'>
                       <span className='spanName'>人员类别</span>
-                      <span className='spanValue'>{userInfo?.jobTitle?userInfo?.jobTitle:'-'}</span>
+                      <span className='spanValue'>{userInfo?.jobTitle ? userInfo?.jobTitle : '-'}</span>
                     </div>
                     <Divider type="vertical" className='Divider' />
                     <div className='staffBaseInfoSpan'>
                       <span className='spanName'>所属科室</span>
-                      <span className='spanValue'>{userInfo?.departmentName?userInfo?.departmentName:'-'}</span>
+                      <span className='spanValue'>{userInfo?.departmentName ? userInfo?.departmentName : '-'}</span>
                     </div>
                     <Divider type="vertical" className='Divider' />
                     <div className='staffBaseInfoSpan'>
                       <span className='spanName'>进院日期</span>
-                      <span className='spanValue'>{userInfo?.entryTime?`${new Date(userInfo?.entryTime).getFullYear()}-${(new Date(userInfo?.entryTime).getMonth()+1)>10?(new Date(userInfo?.entryTime).getMonth()+1):'0'+(new Date(userInfo?.entryTime).getMonth()+1)}-${(new Date(userInfo?.entryTime).getDate())>10?(new Date(userInfo?.entryTime).getDate()):'0'+(new Date(userInfo?.entryTime).getDate())}`:'-'}</span>
+                      <span className='spanValue'>{userInfo?.entryTime ? `${new Date(userInfo?.entryTime).getFullYear()}-${(new Date(userInfo?.entryTime).getMonth() + 1) > 10 ? (new Date(userInfo?.entryTime).getMonth() + 1) : '0' + (new Date(userInfo?.entryTime).getMonth() + 1)}-${(new Date(userInfo?.entryTime).getDate()) > 10 ? (new Date(userInfo?.entryTime).getDate()) : '0' + (new Date(userInfo?.entryTime).getDate())}` : '-'}</span>
                     </div>
                   </div>
                 </div>
                 <div className="rowTwo">
 
                   <div className='medicalInfoSpan'>
-                    <div className='span'>资格证号：<span>{userInfo?.qualificationCertificateNo?userInfo?.qualificationCertificateNo:'-'}</span></div>
-                    <div className='span'>执业证号：<span>{userInfo?.practiceCertificateNo?userInfo?.practiceCertificateNo:'-'}</span></div>
+                    <div className='span'>资格证号：<span>{userInfo?.qualificationCertificateNo ? userInfo?.qualificationCertificateNo : '-'}</span></div>
+                    <div className='span'>执业证号：<span>{userInfo?.practiceCertificateNo ? userInfo?.practiceCertificateNo : '-'}</span></div>
                   </div>
                   <div className='medicalInfoSpan'>
-                    <div className='span'>医师级别：<span>{userInfo?.doctorLevel?userInfo?.doctorLevel:'-'}</span></div>
-                    <div className='span'>执业状态：<span>{userInfo?.practiceStatus?userInfo?.practiceStatus:'-'}</span></div>
+                    <div className='span'>医师级别：<span>{userInfo?.doctorLevel ? userInfo?.doctorLevel : '-'}</span></div>
+                    <div className='span'>执业状态：<span>{userInfo?.practiceStatus ? userInfo?.practiceStatus : '-'}</span></div>
                   </div>
                   <div className='medicalInfoSpan'>
-                    <div className='span'>执业科目：<span>{userInfo?.practiceCate?userInfo?.practiceCate:'-'}</span></div>
-                    <div className='span'>备注：<span>{userInfo?.remark?userInfo?.remark:'-'}</span></div>
+                    <div className='span'>执业科目：<span>{userInfo?.practiceSubject ? userInfo?.practiceSubject : '-'}</span></div>
+                    <div className='span'>备注：<span>{userInfo?.remark ? userInfo?.remark : '-'}</span></div>
                   </div>
                   <div className='medicalInfoSpan'>
-                    <div className='span'>执业类别：<span>{userInfo?.userCate?userInfo?.userCate:'-'}</span></div>
+                    <div className='span'>执业类别：<span>{userInfo?.practiceCate ? userInfo?.practiceCate : '-'}</span></div>
                   </div>
 
                 </div>
               </div>
-            </div>  
+            </div>
           </Skeleton>
         </div>
         <div className='cardTwo '>
-          <FastEntry data={fastEntry}  />
+          <FastEntry data={fastEntry} />
           <RecentlyVisited data={recentlyVisitedList} />
         </div>
         <div className='cardThree'>
-           <TodoList todoList={todoList} todoListClickHandle={todoListClickHandle} />
-           <MsgRecord list={msgRecord}/>
+          <TodoList todoList={todoList} todoListClickHandle={todoListClickHandle} />
+          <MsgRecord list={msgRecord} />
+        </div>
+        <div className='iframe'>
+          <Skeleton loading={iframeLoading} paragraph={{ rows: 50 }} active />
+          <iframe
+            onLoad={() => onLoadhandle()}
+            style={{ width: '100%', height: '600px', border: 'none' }}
+            src={specialPageUrl}
+          ></iframe>
         </div>
       </div>
 

src/pages/platform/setting/paramsMana/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-03-09 17:15:03
+ * @LastEditTime: 2023-04-13 13:18:58
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -16,7 +16,7 @@ import { ModalForm, ProFormCascader, ProFormDigit, ProFormRadio, ProFormSelect,
 import { ProColumns } from '@ant-design/pro-table';
 import { message, Popconfirm } from 'antd';
 import React, { useState } from 'react'
-import { addData, delData, editData, getData, getSysLists } from './service';
+import { addData, delData, editData,getParamsManaTableData, getSysLists } from './service';
 
 import './style.less';
 
@@ -88,7 +88,7 @@ export default function ParamsMana() {
 
 
     const getTableData = async (params: any) => {
-        const resp = await getData(params);
+        const resp = await getParamsManaTableData(params);
         set_reload(false);
         if (resp) {
             return {

src/pages/platform/setting/paramsMana/service.ts

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 16:31:27
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-03-08 16:58:00
+ * @LastEditTime: 2023-04-13 13:28:21
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/service.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -28,10 +28,12 @@ export type PubDicTypeData = {
 }
 
 
-export const getData = (params:{
+export const getParamsManaTableData = (params:{
   systemId?:number;
   hospId?:number;
   parameterName?:string;
+  current?:number,
+  pageSize?:number
 
 }) => {
   return request<{

src/pages/platform/setting/reports/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-03-03 18:04:40
- * @LastEditTime: 2023-02-27 14:16:42
+ * @LastEditTime: 2023-04-13 11:21:30
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/reports/index.tsx
@@ -16,7 +16,6 @@ export default () => {
   const [specialPageUrl, setspecialPageUrl] = useState<string | undefined>(undefined);
   const [loading, setloading] = useState(false);
 
-  console.log('reports');
 
   const onLoadhandle = () => {
     setloading(false);

src/pages/platform/setting/userManage/modal.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-12 17:11:11
- * @LastEditTime: 2023-03-24 12:31:46
+ * @LastEditTime: 2023-04-13 11:11:15
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/userManage/modal.tsx
@@ -158,7 +158,7 @@ const ActModal: React.FC<ActModalProps> = ({
       layout='vertical'
       className='ProfileModal'
       initialValues={
-        tableAct == TableActType.EDIT ? { ...currentEditUser } : {
+        tableAct == TableActType.EDIT ? { ...currentEditUser,departmentId:{label:currentEditUser?.departmentName,value:currentEditUser?.departmentId} } : {
           //设置当新增时的默认值
           major: (setSelectorData('PROFESSIONAL_TYPE')).defaultvalue,
           jobTitle: (setSelectorData('POSITION_TYPE')).defaultvalue,
@@ -177,7 +177,7 @@ const ActModal: React.FC<ActModalProps> = ({
       title={tableAct == TableActType.EDIT ? '编辑用户' : '新增用户'}
       // labelCol={{ span: 5 }}
       // wrapperCol={{ span:8 }}
-      onFinish={async (data) => onFinishHandle(data)}
+      onFinish={async (data) => onFinishHandle({...data,departmentId:data.departmentId.value,departmentName:data.departmentId.label})}
     >
 
       {
@@ -282,6 +282,7 @@ const ActModal: React.FC<ActModalProps> = ({
                       return [];
                      }}
                      fieldProps={{
+                        labelInValue:true,
                         showSearch:true
                      }}
                     placeholder="请选择"

src/pages/platform/setting/userManage/typings.d.ts

@@ -1,8 +1,8 @@
 /*
  * @Author: your name
  * @Date: 2022-01-13 11:10:58
- * @LastEditTime: 2022-01-13 11:43:54
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-04-13 11:06:48
+ * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/userManage/typings.d.ts
  */
@@ -15,6 +15,8 @@ export type TableListItem = {
   phoneNum: number;
   idCardNum: number;
   isOnService: number;
+  departmentId:string;
+  [key:string]:any
 };
 
 // export enum TableActType {

src/service/index.ts

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-06-27 15:43:25
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-01-10 13:17:20
+ * @LastEditTime: 2023-04-11 17:06:00
  * @FilePath: /KC-MiddlePlatform/src/service/index.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -33,6 +33,7 @@ export interface UserInfo {
     practiceCate:               string;
     practiceCertificateNo:      string;
     major:                      string;
+    practiceSubject:string;
 }
 
 export const getUserIndexData = async () => {