some

config/routes.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-03 14:28:27
- * @LastEditTime: 2021-10-20 14:47:18
+ * @LastEditTime: 2021-10-27 14:00:29
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/config/routes.ts
@@ -112,12 +112,12 @@ export default [
         icon: 'smile',
         component: './KeepImprove/qualityRating/index',
       },
-      {
-        path: '/KeepImprove/questionGatherAndRevise',
-        name: '问题汇总与整改',
-        icon: 'smile',
-        component: './KeepImprove/questionGatherAndRevise/index',
-      },
+      // {
+      //   path: '/KeepImprove/questionGatherAndRevise',
+      //   name: '问题汇总与整改',
+      //   icon: 'smile',
+      //   component: './KeepImprove/questionGatherAndRevise/index',
+      // },
       {
         path: '/KeepImprove/departmentIssueRank',
         name: '单位问题排名',
@@ -136,6 +136,12 @@ export default [
         icon: 'smile',
         component: './KeepImprove/questionGather/index',
       },
+      {
+        path: '/KeepImprove/indexNumGather',
+        name: '指标汇总',
+        icon: 'smile',
+        component: './KeepImprove/indexNumGather/index',
+      },
     ],
   },
   {

src/app.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-03 14:28:27
- * @LastEditTime: 2021-10-20 14:11:06
+ * @LastEditTime: 2021-10-27 13:55:18
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/app.tsx

src/pages/GradeHospitalAccreditation/accreditationDetail/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-06 09:07:56
- * @LastEditTime: 2021-10-11 10:36:20
+ * @LastEditTime: 2021-10-27 11:45:54
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/GradeHospitalAccreditation/accreditationDetail/index.tsx
@@ -11,7 +11,7 @@
 
 
 import React, { useState, useEffect, useRef } from 'react'
-import { Divider, Button } from 'antd'
+import { Divider } from 'antd'
 import MccsProFormText from '@/components/antdProOverwrite/MccsProFormText/index';
 import { MccsModalContext, MccsModal } from '@/components/MccsModal/index';
 import MccsPageContainer from '@/components/MccsPageContainer/index'

src/pages/GradeHospitalAccreditation/articleManagement/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-14 10:22:09
- * @LastEditTime: 2021-10-22 10:17:25
+ * @LastEditTime: 2021-10-27 14:47:58
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/GradeHospitalAccreditation/articleManagement/index.tsx
@@ -20,7 +20,7 @@ import MccsDrawerForm from '@/components/MccsDrawerForm/index';
 import MccsClickableTabs from '@/components/MccsClickableTabs/index';
 import MccsUpload from '@/components/MccsUpload/index';
 import { MccsModal } from '@/components/MccsModal';
-import type { ProFormInstance } from '@ant-design/pro-form';
+import type { ProFormInstance, } from '@ant-design/pro-form';
 
 
 
@@ -135,9 +135,11 @@ const ArticleManagement: React.FC<ArticleManagementProps> = (props) => {
     const [articleSettingFormInit, setArticleSettingFormInit] = useState<{}>({});  //条文设置表单回显默认值
 
     const onSelectHandle = (data: MccsFileTree.childTree) => {
+        //左侧树节点点击回调
         setCurrentActivedTree(data);
         //重新获取数据
         tableRef?.current?.getTableRef().current?.reload();
+        restModelData.setTabKey('1');
     }
 
     const batchSelfAssessment = (rowkeys: number[] | string[]) => {
@@ -216,7 +218,7 @@ const ArticleManagement: React.FC<ArticleManagementProps> = (props) => {
 
     const uploadLedgerChangeHandle = (tabData: any) => {
         //台账上传类型选择回调
-        console.log({ tabData });
+       
     }
 
 
@@ -292,6 +294,22 @@ const ArticleManagement: React.FC<ArticleManagementProps> = (props) => {
                                 data={restModelData.uploadLedgerTypeList}
                             />
                         </Form.Item>
+                        {/* <ProFormDependency name={['tab']}>
+                              {
+                                  ({tab})=>{
+                                    return tab&&tab.value.label == '制度'&&(
+                                        <ProFormSelect
+                                        name="publicCateId"
+                                        label="制度下类型"
+                                        width='md'
+                                        request={async ()=> await restModelData.getSelectableRuleChilds(tab.value.value)}
+                                        placeholder="请选择"
+                                        rules={[{ required: true, message: '请选择!' }]}
+                                      />
+                                    )
+                                  }
+                              }
+                        </ProFormDependency> */}
                         <Form.Item name='files' rules={[
                             {
                                 required: true,
@@ -456,7 +474,7 @@ const ArticleManagement: React.FC<ArticleManagementProps> = (props) => {
                                 {
                                     isModeTwo && (
                                         <div style={{ marginTop: 5 }}>
-                                            <Tabs defaultActiveKey="1" centered size='large' onChange={(key) => restModelData.setTabKey(key)}>
+                                            <Tabs  activeKey={`${restModelData.tabKey}`} centered size='large' onChange={(key) => restModelData.setTabKey(key)}>
                                                 <TabPane tab="台账记录" key="1">
                                                     <div className='articleSetBtn'>
                                                         <span onClick={() => upLoadFileHandle()}>上传文件</span>

src/pages/GradeHospitalAccreditation/articleManagement/model.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-14 10:46:45
- * @LastEditTime: 2021-10-22 11:12:18
+ * @LastEditTime: 2021-10-27 14:28:07
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/GradeHospitalAccreditation/articleManagement/model.ts
@@ -9,7 +9,7 @@
 
 import { useState, useEffect } from 'react';
 import { getTreeFileTableData,getDepartmentList,settingArticle,batchSettingArticle,getSelfEvaluation,
-  uploadFilePost,selfEvolutionCommit,delHistoryRecods,getUploadLedgerSelectableType,getCurrentHospSelfScore,
+  uploadFilePost,selfEvolutionCommit,delHistoryRecods,getUploadLedgerSelectableType,getCurrentHospSelfScore,getRuleChildrens,
 } from './server';
 import {getTreeList} from '@/pages/GradeHospitalAccreditation/accreditationDetail/service';
 import {getScoreLevelData,getAccreditationTypeData} from '@/pages/PlatformMana/generalSetting/serve';
@@ -219,23 +219,24 @@ const articleManagement = () => {
         if(leafData){
           // console.log({'上传表单':values});
           try{
-            const {files:{fileList=[]},tab} = values;
+            const {files:{fileList=[]},tab,publicCateId} = values;
             const {id,accountType} = leafData;
             let formData = new FormData();
             
             formData.append('file',fileList[0]?.originFileObj);
             formData.append('id',id.toString());
             formData.append('categoryType',accountType);
+            formData.append('publicCateId',publicCateId);
         
             if(uploadFormInitValue&&JSON.stringify(uploadFormInitValue) != '{}'){
                  //重新上传不允许修改类型
                  const {tab} = uploadFormInitValue;
                  formData.append('accountType',tab.label);
-                 formData.append('accountName',tab.value.value);
+                 formData.append('accountName',tab.value.label);
 
             }else{
               formData.append('accountType',tab.label);
-              formData.append('accountName',tab.value.value);
+              formData.append('accountName',tab.value.label);
             }
             
             
@@ -318,11 +319,11 @@ const articleManagement = () => {
         //台账类型
         const data = await getUploadLedgerSelectableType();
         if(data){
-          const tempArr = data.map((t:{levelNumber:string,generalNameList:string[]})=>{
+          const tempArr = data.map((t:API.RuleChildsItemType)=>{
             const tempList = t.generalNameList.map(a=>{
                    return {
-                       label:a,
-                       value:a
+                       label:a.generalName,
+                       value:a.id
                    }
             });
             return {label:t.levelNumber,list:tempList}
@@ -340,10 +341,17 @@ const articleManagement = () => {
   const getSelectableSelfScoreList = async ()=>{
     //获取自评可选列表
     const resp = await getScoreLevelData();
-    const list = resp.map((t:any)=>({label:t.levelNumber,value:t.levelNumber}));
+    const listFilted = resp.filter((t:any)=>t.configStatus != 0);
+    const list = listFilted.map((t:any)=>({label:t.levelNumber,value:t.levelNumber}));
     setTargetScores(list);
   }
 
+  const getSelectableRuleChilds = async (id:number)=>{
+     //获取台账上传时可选下拉类型
+     const resp = await getRuleChildrens(id);
+     return resp.map((t:{id:number,name:string})=>({label:t.name,value:t.id}));
+  }
+
 
   useEffect(() => {
     if (currentActivedTree) {
@@ -501,6 +509,7 @@ const articleManagement = () => {
     setReloadRightContent,
     setModuleMode,
     moduleMode,
+    tabKey,
     setTabKey,
     selfEvaluationRecords,
     modalVisible,
@@ -517,7 +526,8 @@ const articleManagement = () => {
     uploadLedgerTypeList,
     setUploadLedgerTypeList,
     currentHospSelfScoreAndOthers,
-    getCurrentHospScore
+    getCurrentHospScore,
+    getSelectableRuleChilds,
   };
 };
 

src/pages/GradeHospitalAccreditation/articleManagement/server.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-14 10:22:20
- * @LastEditTime: 2021-10-11 11:05:39
+ * @LastEditTime: 2021-10-26 10:55:45
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/GradeHospitalAccreditation/articleManagement/server.ts
@@ -76,6 +76,17 @@ export const getSelfEvaluation  = async (ruleId:string|number)=>{
 
 }
 
+//获取制度下的子节点
+
+export const getRuleChildrens  = async (id:number)=>{
+  
+    return request('/api/pfm/publicResource/getPublicCateChildren', {
+        method: 'GET',
+        params:{id:id}
+    });
+
+}
+
 //上传台账
 
 

src/pages/GradeHospitalAccreditation/articleManagement/typings.d.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-14 10:22:42
- * @LastEditTime: 2021-09-30 10:26:03
+ * @LastEditTime: 2021-10-26 11:25:02
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/GradeHospitalAccreditation/articleManagement/typings.d.ts
@@ -108,6 +108,12 @@ declare namespace API {
     userName:string
   }
 
+
+  type RuleChildsItemType = {
+        levelNumber:string,
+        generalNameList:{id:number,generalName:string}[]
+  }
+
 }
 
 

src/pages/GradeHospitalAccreditation/ledgerUpload/model.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-14 10:46:45
- * @LastEditTime: 2021-10-22 11:09:47
+ * @LastEditTime: 2021-10-27 14:29:05
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/GradeHospitalAccreditation/articleManagement/model.ts
@@ -116,7 +116,8 @@ const ledgerUpload = () => {
   const getSelectableSelfScoreList = async ()=>{
       //获取自评可选列表
       const resp = await getScoreLevelData();
-      const list = resp.map((t:any)=>({label:t.levelNumber,value:t.levelNumber}));
+      const listFilted = resp.filter((t:any)=>t.configStatus != 0);
+      const list = listFilted.map((t:any)=>({label:t.levelNumber,value:t.levelNumber}));
       setTargetScores(list);
   }
 

src/pages/KeepImprove/departmentIssueRank/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-28 13:57:19
- * @LastEditTime: 2021-09-28 16:33:57
+ * @LastEditTime: 2021-10-27 13:49:31
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/KeepImprove/questionGatherAndRevise/index.tsx
@@ -19,7 +19,7 @@ type QuestionGatherAndReviseProps = {}
 const QuestionGatherAndRevise:React.FC<QuestionGatherAndReviseProps> = ()=>{
     return (
         <MccsPageContainer>
-            <iframe  id="reportFrame" src="http://8.136.135.180:8081/webroot/ReportServer?formlet=PFM/test/单位问题排名.frm" width="100%" height="800px">
+            <iframe  id="reportFrame" src="http://121.43.139.179:9300/webroot/ReportServer?formlet=dongyang/单位问题排名.frm" width="100%" height="800px">
             </iframe>
         </MccsPageContainer>
     )

src/pages/KeepImprove/departmentScoreRank/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-28 13:57:19
- * @LastEditTime: 2021-09-28 16:41:55
+ * @LastEditTime: 2021-10-27 13:50:05
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/KeepImprove/questionGatherAndRevise/index.tsx
@@ -19,7 +19,7 @@ type QuestionGatherAndReviseProps = {}
 const QuestionGatherAndRevise:React.FC<QuestionGatherAndReviseProps> = ()=>{
     return (
         <MccsPageContainer>
-            <iframe  id="reportFrame" src="http://8.136.135.180:8081/webroot/ReportServer?formlet=PFM/test/单位得分排名.frm" width="100%" height="800px">
+            <iframe  id="reportFrame" src="http://121.43.139.179:9300/webroot/ReportServer?formlet=dongyang/单位得分情况.frm" width="100%" height="800px">
             </iframe>
         </MccsPageContainer>
     )

src/pages/KeepImprove/indexNumGather/index.less

@@ -0,0 +1,6 @@
+
+
+
+#reportFrame {
+    border: none;
+}

src/pages/KeepImprove/indexNumGather/index.tsx

@@ -0,0 +1,29 @@
+/*
+ * @Author: your name
+ * @Date: 2021-09-28 13:57:19
+ * @LastEditTime: 2021-10-27 13:51:21
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: /MedicalWisdomCheckSys/src/pages/KeepImprove/questionGatherAndRevise/index.tsx
+ */
+
+
+import React from 'react'
+import MccsPageContainer from '@/components/MccsPageContainer/index';
+
+import './index.less';
+
+
+type QuestionGatherAndReviseProps = {}
+
+const QuestionGatherAndRevise:React.FC<QuestionGatherAndReviseProps> = ()=>{
+    return (
+        <MccsPageContainer>
+            <iframe  id="reportFrame" src="http://121.43.139.179:9300/webroot/ReportServer?formlet=dongyang/%E6%8C%87%E6%A0%87%E6%B1%87%E6%80%BB.frm" width="100%" height="800px">
+            </iframe>
+        </MccsPageContainer>
+    )
+}
+
+export default QuestionGatherAndRevise
+

src/pages/KeepImprove/questionGather/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-28 13:57:19
- * @LastEditTime: 2021-10-20 14:48:41
+ * @LastEditTime: 2021-10-27 13:48:34
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/KeepImprove/questionGatherAndRevise/index.tsx
@@ -19,7 +19,7 @@ type QuestionGatherAndReviseProps = {}
 const QuestionGatherAndRevise:React.FC<QuestionGatherAndReviseProps> = ()=>{
     return (
         <MccsPageContainer>
-            <iframe  id="reportFrame" src="http://8.136.135.180:8081/webroot/ReportServer?formlet=PFM/test/问题汇总.frm" width="100%" height="800px">
+            <iframe  id="reportFrame" src="http://121.43.139.179:9300/webroot/ReportServer?formlet=dongyang/问题汇总.frm" width="100%" height="800px">
             </iframe>
         </MccsPageContainer>
     )