数据源和指标修改

config/config.ts

@@ -22,6 +22,10 @@ export default defineConfig({
     ]
   },
 
+  targets: {
+    chrome: 86,
+  },
+
   // 显示标签页
   keepalive: [/./],
   tabsLayout: {
@@ -101,16 +105,20 @@ export default defineConfig({
     { path: '/internalEvaluation/RulePage', component: './internalEvaluation/configuration/RulePage' },
     { path: '/internalEvaluation/indexlistconfig', component: './internalEvaluation/configuration/indexlistconfig' },
     { path: '/internalEvaluation/riskcontrolstrategy', component: './internalEvaluation/configuration/riskcontrolstrategy' },
+
+    // 统计报表
+    { path: '/internalEvaluation/preloan/irbfcreditrecord', component: './internalEvaluation/statisticalreport/preloan/irbfcreditrecord' },
     
   ],
-  /**
+
   proxy: {
     '/api/': {
-      target: 'http://192.168.1.176:8080',
+      target: 'http://localhost:8080',
       changeOrigin: true,
       pathRewrite: { '^/api': '' },
     },
   },
+    /**
   // 需要自动生成代码时再放开，否则不启动后台服务时会报错
   openAPI: [
     {

src/pages/internalEvaluation/configuration/datasources.tsx

@@ -465,7 +465,7 @@ const datasources: React.FC<widowRush> = (prop: widowRush) => {
           <SDFormText name="dataSourcesName"
                       rules={[{validator: validateFun.chineseRex, message: '请输入中文'}]} label="数据来源名称"/>
           <SDFormDict dictKey="DATASOURCETYPE" name="dataSourcesType" rules={[{required: true}]} label="数据来源类型"/>
-          { typeStatus === 2 &&  <SDFormDict dictKey="@selectInterFaceData" name="requestInterfaces" rules={[{required: true}]}
+          { typeStatus === 2 &&  <SDFormDict dictKey="@selectInterFaceData" name="requestInterface" rules={[{required: true}]}
                       label="数据源（请求接口）"/> }
 
           {typeStatus === 2 && <>

src/pages/internalEvaluation/configuration/indexconfig.tsx

@@ -83,13 +83,12 @@ const indexconfig : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '指标名称',
           dataIndex: 'indexName',
-          search: false,
           hideInTable: false,
-          formItemProps:{
-            rules:[
-              {validator:validateFun.chineseRex,message:'请输入中文'},
-            ]
-          }
+          // formItemProps:{
+          //   rules:[
+          //     {validator:validateFun.chineseRex,message:'请输入中文'},
+          //   ]
+          // }
         },
         {
           title: '指标逻辑',

src/pages/internalEvaluation/configuration/modelconfig.tsx

@@ -2,11 +2,12 @@ import React, { useEffect, useRef, useState } from "react";
 import { type ProColumns, type ActionType, type ProFormInstance, EditableProTable } from '@ant-design/pro-components';
 import type {FormInstance} from 'antd'
 import { SDPage,SDFormText,SDModalForm,SDTable,SDButton,SDSubmitButton,EditType, SDAreaTtile, SDOperate, baseFun, validateFun, SDFormDict, } from "@sundata/ui-frame";
-import type { ModelConfigModel, TargetListModel, ModelGradeModel } from '@/services/internalEvaluation/configuration/modelconfig';
+import type { ModelConfigModel, TargetListModel, ModelGradeModel, IndexGradingModel } from '@/services/internalEvaluation/configuration/modelconfig';
 import { WomanOutlined } from "@ant-design/icons";
 import { ProductProps } from "@/sundataImport";
 import { deleteRows, getDataList, selectDetailData, updateExistData, createData } from "@/services/internalEvaluation/configuration/modelconfig";
 import { countChineseChars } from "../utils/rwacheckutils";
+import { useModel } from '@umijs/max';
 
 type widowRush = {
   onCancel:  () => void;
@@ -26,6 +27,7 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
     const templateRef = useRef<FormInstance<any>>();
     const [targetList, setTargetList] = useState<TargetListModel[]>();
     const [modelGradList, setModelGradList] = useState<ModelGradeModel[]>();
+    const { fetchDict } = useModel('dict');
 
     // 页面数据
     var formDataList = new Array<ModelConfigModel>;
@@ -157,11 +159,19 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
         title: '指标', 
         dataIndex: 'indexNo',
         search: false,
+        request:()=>fetchDict('@selectAllIndexToDict'),
+          fieldProps: {
+             treeDefaultExpandAll: true,
+        },
       },
       {
         title: '指标来源', 
         dataIndex: 'indexSource',
         hideInTable: false,
+        request:()=>fetchDict('INDEXLISTSOURCETYPE'),
+        fieldProps: {
+           treeDefaultExpandAll: true,
+      },
       },
       {
         title: '指标说明', 
@@ -174,13 +184,21 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
         dataIndex: 'indexGrade',
         search: false,
         hideInTable: false,
+        // children: [
+        //   {
+        //       title: '分档区间',
+        //       dataIndex: 'sumBalance',
+        //       search: false,
+        //   },
+        //   { title: '指标分值', dataIndex: 'monthaverageBalance',search: false, },
+        // ],
       },
-      {
-        title: '指标分值', 
-        dataIndex: 'indexScore',
-        search: false,
-        hideInTable: false,
-      },
+      // {
+      //   title: '指标分值', 
+      //   dataIndex: 'indexScore',
+      //   search: false,
+      //   hideInTable: false,
+      // },
       {
         title: '操作',
         valueType: 'option',
@@ -256,6 +274,28 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
       },
     ];
 
+    // 输入参数页面展示元素
+const indexGradingColumns: ProColumns<IndexGradingModel>[] = [
+  {
+    title: '指标分档编号', 
+    dataIndex: 'indexGradingNo',
+    search: false,
+    hideInTable: true,
+  },
+  {
+    title: '分档区间', 
+    dataIndex: 'gradingRange',
+    search: false,
+    hideInTable: false,
+  },
+  {
+    title: '指标分档', 
+    dataIndex: 'indexGrading',
+    search: false,
+    hideInTable: false,
+  },
+
+]
     
     return (
         <SDPage>
@@ -314,7 +354,7 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
             <SDFormDict dictKey="org" name="modelProduct" rules={[{required:true}]} label="模型所属产品"/>
             <SDFormText name="modelType"  label="模型类型"/>
             <SDFormText name="modelDescribe" label="模型说明"/>
-            <SDFormText name="resultFormula" label="结果公式"/>
+            <SDFormText type="textarea" name="resultFormula" label="结果公式"/>
             <SDAreaTtile title='指标清单'/>
             <EditableProTable<TargetListModel>
              rowKey="indexListNo"

src/pages/rf-eng/rfDefine/compnents/index_new.tsx

@@ -26,15 +26,15 @@ const Index_new: React.FC<Index_newProps> = (props)=> {
 		for(let i = 0; i < data.length; i++) {
 			if(rData===undefined || rData==='' || rData===null || rData.length==0){ // || rData===[]){ 有编译错误，永远不可能相等
 				d = {
-                    nounid: data[i]['NOUNITEM'],		
-                    nounname: data[i]['NOUNNAME'],
-                    nounvalue: data[i]['NOUNVALUE'],
+                    nounid: data[i]['nounitem'],		
+                    nounname: data[i]['nounname'],
+                    nounvalue: data[i]['nounvalue'],
 				}
 			}else{
 				d = {
-                    nounid: data[i]['NOUNITEM'],
-                    nounname: data[i]['NOUNNAME'],
-                    nounvalue: data[i]['NOUNVALUE'],
+                    nounid: data[i]['nounitem'],
+                    nounname: data[i]['nounname'],
+                    nounvalue: data[i]['nounvalue'],
                     gradeScore:rData[i]['gradeScore'],
                     gradeLevel:rData[i]['gradeLevel'],
                     gradePercent:rData[i]['gradePercent']

src/services/internalEvaluation/configuration/modelconfig.ts

@@ -28,13 +28,20 @@ export type ModelConfigModel = {
     // 模型编号
     modelNo?: string;
     // 指标
-    indexNo: string;
+    indexNo?: string;
     // 指标来源
     indexSource?: string;
     // 指标说明
     indexDescribe?: string;
-    // 指标分档
-    indexGrade?: string;
+
+  } & BasePageModel;
+
+  // 指标分档
+  export type IndexGradingModel = {
+    // 指标分档编号
+    indexGradingNo?: string;
+    // 分档区间
+    gradingRange: string;
     // 指标分值
     indexScore?: string;
   } & BasePageModel;