src/pages/internalEvaluation/configuration/InterfacePage.tsx

@@ -233,36 +233,36 @@ const InterfacePage: FC = () => {
       }
     },
     {
-      title: '参数获取类型',
-      dataIndex: 'paramRetrievalTypeCode',
+      title: '是否为报文头',
+      dataIndex: 'isHeader',
       hideInTable: false,
       search: false,
-      valueType: 'select',
-      request: () => fetchDict('PARAM_GET_TYPE'),
+      valueType: 'radio',
+      valueEnum: {
+        true: {text: '是'},
+        false: {text: '否'},
+      },
       formItemProps: {
         rules: [
           {
             required: true,
-            message: '请选择参数获取类型'
+            message: '请选择'
           }
         ]
       }
     },
     {
-      title: '是否为报文头',
-      dataIndex: 'isHeader',
+      title: '参数获取类型',
+      dataIndex: 'paramRetrievalTypeCode',
       hideInTable: false,
       search: false,
-      valueType: 'radio',
-      valueEnum: {
-        true: {text: '是'},
-        false: {text: '否'},
-      },
+      valueType: 'select',
+      request: () => fetchDict('PARAM_GET_TYPE'),
       formItemProps: {
         rules: [
           {
             required: true,
-            message: '请选择'
+            message: '请选择参数获取类型'
           }
         ]
       }
@@ -364,7 +364,7 @@ const InterfacePage: FC = () => {
         >
           <SDAreaTtile title={"基本信息"}/>
           {/*<SDFormText name="id" label="id" disabled={true} width={'md'}/>*/}
-          <SDFormText name="interfaceNo" label="接口编号" width={'md'} required={true}/>
+          <SDFormText name="interfaceNo" readonlyCond="update" label="接口编号" width={'md'} required={true}/>
           <SDFormText name="interfaceName" label="接口名称" width={'md'} required={true}/>
           <SDFormDict name="reqMethod" label="请求方式" dictKey={'INTERFACE_REQUEST_TYPE'} required={true}
                       width={'md'}/>

src/pages/internalEvaluation/configuration/RulePage.tsx

@@ -90,6 +90,14 @@ const RulePage: FC = () => {
       dataIndex: 'ruleName',
       hideInTable: false,
     },
+    {
+      title: '数据来源',
+      dataIndex: 'ruleDataSour',
+      hideInTable: false,
+      valueType:'select',
+      search: true,
+      request:()=> fetchDict('DATASOURCE')
+    },
     {
       title: '规则阈值',
       dataIndex: 'ruleThreshold',
@@ -358,6 +366,7 @@ const RulePage: FC = () => {
         <SDAreaTtile title={"基本信息"}/>
         <SDFormText label="规则编号" name="ruleNo" required={true}  width={'md'} readonlyCond={"update"}/>
         <SDFormText label="规则名称" name="ruleName"  width={'md'} required={true}/>
+        <SDFormDict label="数据来源" name="ruleDataSour"  width={'md'} required={true} dictKey={'DATASOURCE'} />
         <SDFormText label="规则模板" type={'textarea'} name="ruleTemplate" />
         <SDFormText label="模板说明" type={'textarea'} name="templateDesc" />
         <SDFormDict label="规则结果" name="ruleResult"  width={'md'} required={true} dictKey={'RULE_RESULT_TYPE'} />

src/pages/internalEvaluation/configuration/datasetconfig.tsx

@@ -27,11 +27,11 @@ const datasetconfig : React.FC<widowRush> = (prop:widowRush) => {
 
     // 页面数据
     var formDataList = new Array<DataSetConfigModel>;
- 
+
     useEffect(() => {
 
       }, []);
-    
+
     // 修改查询查询
     const selectData = async (formdata : DataSetConfigModel) => {
       const data = await selectDetailData(formdata);
@@ -39,13 +39,13 @@ const datasetconfig : React.FC<widowRush> = (prop:widowRush) => {
      }
 
     // 删除
-    const delRows =async(record:any)=>{ 
+    const delRows =async(record:any)=>{
        baseFun.confirm('确认删除？',async() =>{
         await deleteRows(record);
         baseFun.info("删除成功");
         closeAndRefresh();
        });
-       
+
      }
 
     //关闭窗口刷新父页面
@@ -55,7 +55,7 @@ const datasetconfig : React.FC<widowRush> = (prop:widowRush) => {
 
   // 插入或者更新数据
   const handleSave = async(data: DataSetConfigModel,) => {
-    
+
     if (editType == 'update' ) {
        await updateExistData(data);
        closeAndRefresh();
@@ -66,16 +66,16 @@ const datasetconfig : React.FC<widowRush> = (prop:widowRush) => {
     }
     setDetailVisible(false);
   }
-     
+
     // 数据项配置页面展示元素
     const columns: ProColumns<DataSetConfigModel>[] = [
         {
-          title: '数据集编号', 
+          title: '数据集编号',
           dataIndex: 'dataSetNo',
           hideInTable: false,
         },
         {
-          title: '数据集名称', 
+          title: '数据集名称',
           dataIndex: 'dataSetName',
           search: false,
           hideInTable: false,
@@ -90,7 +90,7 @@ const datasetconfig : React.FC<widowRush> = (prop:widowRush) => {
               icon={<WomanOutlined />}
               successMessage=""
               onClick={
-                ()=>{ 
+                ()=>{
                 selectData(record);
                 setDetailVisible(true);
                 setEditType('update')
@@ -106,12 +106,12 @@ const datasetconfig : React.FC<widowRush> = (prop:widowRush) => {
           >
             删除
           </SDOperate>,
-           
+
           ],
         },
 
       ];
-    
+
     return (
         <SDPage>
         <SDTable
@@ -143,7 +143,7 @@ const datasetconfig : React.FC<widowRush> = (prop:widowRush) => {
          />
 
         {detailVisible && (
-        <SDModalForm          
+        <SDModalForm
           title={'详细信息'}
           editType={editType}
           params={currentRow}
@@ -178,12 +178,13 @@ const datasetconfig : React.FC<widowRush> = (prop:widowRush) => {
             }
           }
         ]} label="数据集编号"/>
-            <SDFormText name="dataSetName" rules={[{validator:validateFun.chineseRex,message:'请输入中文'}]} label="数据集名称"/>
+          {/*rules={[{validator:validateFun.chineseRex,message:'请输入中文'}]}*/}
+            <SDFormText name="dataSetName" required={true}  label="数据集名称"/>
             <SDFormDict dictKey="@selectDataSource" name="dataSourcesNos" rules={[{required:true}]} multiple={true} label="数据源编号"/>
         </SDModalForm>
       )}
         </SDPage>
-        
+
     );
 }
-export default datasetconfig;
+export default datasetconfig;

src/pages/internalEvaluation/configuration/datasources.tsx

@@ -190,7 +190,7 @@ const datasources: React.FC<widowRush> = (prop: widowRush) => {
       hideInTable: false,
       formItemProps: {
         rules: [
-          {validator: validateFun.chineseRex, message: '请输入中文'},
+          {required: true, message: '必填项，请输入'},
         ]
       }
     },
@@ -207,7 +207,7 @@ const datasources: React.FC<widowRush> = (prop: widowRush) => {
       hideInTable: false,
       formItemProps: {
         rules: [
-          {validator: validateFun.chineseRex, message: '请输入中文'},
+          {required: true, message: '必填项，请输入'},
         ]
       }
     },
@@ -293,7 +293,7 @@ const datasources: React.FC<widowRush> = (prop: widowRush) => {
       hideInTable: false,
       formItemProps: {
         rules: [
-          {validator: validateFun.chineseRex, message: '请输入中文'},
+          {required: true, message: '必填项，请输入'},
         ]
       }
     },
@@ -398,6 +398,7 @@ const datasources: React.FC<widowRush> = (prop: widowRush) => {
             onClick={() => {
               setEditType('create');
               setDetailVisible(true);
+              setTypeStatus(0);
               setInputParamList([]);
               setQueryLogicList([]);
               setDataItemConfigList([]);
@@ -431,6 +432,7 @@ const datasources: React.FC<widowRush> = (prop: widowRush) => {
           visible={detailVisible}
           onVisibleChange={() => {
             setDetailVisible(false)
+            setTypeStatus(0)
           }}
           footer={[
             <SDSubmitButton editType={editType} formRef={formRef} doSubmit={handleSave}>保存</SDSubmitButton>,
@@ -462,8 +464,8 @@ const datasources: React.FC<widowRush> = (prop: widowRush) => {
               }
             }
           ]} label="数据来源编号" readonlyCond="update"/>
-          <SDFormText name="dataSourcesName"
-                      rules={[{validator: validateFun.chineseRex, message: '请输入中文'}]} label="数据来源名称"/>
+          <SDFormText name="dataSourcesName" required={true}
+                      /*rules={[{validator: validateFun.chineseRex, message: '请输入中文'}]}*/ label="数据来源名称"/>
           <SDFormDict dictKey="DATASOURCETYPE" name="dataSourcesType" rules={[{required: true}]} label="数据来源类型"/>
           { typeStatus === 2 &&  <SDFormDict dictKey="@selectInterFaceData" name="requestInterface" rules={[{required: true}]}
                       label="数据源（请求接口）"/> }

src/pages/internalEvaluation/configuration/indexconfig.tsx

@@ -5,7 +5,7 @@ import { SDPage,SDFormText,SDModalForm,SDTable,SDButton,SDSubmitButton,EditType,
 import type { IndexConfigModel, IndexSourceModel } from '@/services/internalEvaluation/configuration/indexconfig';
 import { WomanOutlined } from "@ant-design/icons";
 import { ProductProps } from "@/sundataImport";
-import { deleteRows, getDataList, selectDetailData, updateExistData, createData } from "@/services/internalEvaluation/configuration/indexconfig";
+import { deleteRows, getDataList, selectDetailData, updateExistData, createData ,isNotExist} from "@/services/internalEvaluation/configuration/indexconfig";
 import { countChineseChars, firstCharIsNotNumber } from "../utils/rwacheckutils";
 import { useModel } from '@umijs/max';
 
@@ -167,6 +167,7 @@ const indexconfig : React.FC<widowRush> = (prop:widowRush) => {
            editable: () => {
             return selectType1;
            },
+          render : value => !selectType2 ? value:''
         },
         {
           title: '数据集编号',
@@ -182,6 +183,7 @@ const indexconfig : React.FC<widowRush> = (prop:widowRush) => {
            editable: () => {
             return selectType2;
            },
+          render : v => !selectType1 ? v :''
         },
         {
           title: '操作',
@@ -259,24 +261,34 @@ const indexconfig : React.FC<widowRush> = (prop:widowRush) => {
           formRef={formRef}
         >
             <SDAreaTtile title='指标配置信息'/>
-            <SDFormText name="indexNo"  readonlyCond="update"
-            rules={[
-              { required: true, message: '请输入编号' },
-              {
-                validator:validateFun.account
-              },
-              {
-                validator: (_rule, value, callback)=> {
-                  if (firstCharIsNotNumber(value)>0) {
-                    callback('编号不能以数字开头');
-                  } else {
-                    callback();
-                  }
-    
-                }
-              }]}  label="指标编号"/>
+          <SDFormText name="indexNo" readonlyCond="update"
+                      rules={[
+                        {required: true, message: '请输入编号'},
+                        {
+                          validator: validateFun.account
+                        },
+                        {
+                          validator: (_rule, value, callback) => {
+                            if (firstCharIsNotNumber(value) > 0) {
+                              callback('编号不能以数字开头');
+                            } else {
+                              callback();
+                            }
+
+                          }
+                        }]}
+                      bgValidater={
+                        (indexNo: string) => isNotExist({
+                          indexNo: indexNo,
+                          indexName: "",
+                          indexLogic: ""
+                        })
+                      }
+                      label="指标编号"/>
             <SDFormText name="indexName"  label="指标名称"/>
             <SDFormText type="textarea" name="indexLogic"  label="指标逻辑"/>
+            <SDFormDict name="defaultValueType" required={true} label={'默认值类型'} dictKey={"DEFAULTVALUETYPE"}/>
+            <SDFormText name="defaultValue"  label="默认值" required={true}/>
 
             <SDAreaTtile title='数据来源'/>
             <EditableProTable<IndexSourceModel>
@@ -286,6 +298,14 @@ const indexconfig : React.FC<widowRush> = (prop:widowRush) => {
              dataSource={indexSourceList}
              onValuesChange={ (values,record)=> {
               if (undefined === record) {
+                values.forEach((item)=>{
+                  if (item.dataSourceType === "INDEX") {
+                    item.dataSetNo = "";
+                  }
+                  if (item.dataSourceType === "DATASET") {
+                    item.otherIndexNo = "";
+                  }
+                })
                 setIndexSourceList([...values]);
               }
               if ( record.dataSourceType) {

src/pages/internalEvaluation/configuration/indexlistconfig.tsx

@@ -29,11 +29,11 @@ const indexlistconfig : React.FC<widowRush> = (prop:widowRush) => {
 
     // 页面数据
     var formDataList = new Array<IndexListModel>;
- 
+
     useEffect(() => {
 
       }, []);
-    
+
     // 修改查询查询
     const selectData = async (formdata : IndexListModel) => {
       const data = await selectDetailData(formdata);
@@ -41,13 +41,13 @@ const indexlistconfig : React.FC<widowRush> = (prop:widowRush) => {
      }
 
     // 删除
-    const delRows =async(record:any)=>{ 
+    const delRows =async(record:any)=>{
        baseFun.confirm('确认删除？',async() =>{
         await deleteRows(record);
         baseFun.info("删除成功");
         closeAndRefresh();
        });
-       
+
      }
 
     //关闭窗口刷新父页面
@@ -68,16 +68,16 @@ const indexlistconfig : React.FC<widowRush> = (prop:widowRush) => {
     }
     setDetailVisible(false);
   }
-     
+
     // 页面展示元素
     const columns: ProColumns<IndexListModel>[] = [
       {
-        title: '指标清单编号', 
+        title: '指标清单编号',
         dataIndex: 'indexListNo',
         hideInTable:false
       },
       {
-        title: '指标清单名称', 
+        title: '指标清单名称',
         dataIndex: 'indexListName',
         hideInTable:false
       },
@@ -91,7 +91,7 @@ const indexlistconfig : React.FC<widowRush> = (prop:widowRush) => {
             icon={<WomanOutlined />}
             successMessage=""
             onClick={
-              ()=>{ 
+              ()=>{
               selectData(record);
               setDetailVisible(true);
               setEditType('update');
@@ -107,12 +107,12 @@ const indexlistconfig : React.FC<widowRush> = (prop:widowRush) => {
         >
           删除
         </SDOperate>,
-         
+
         ],
       },
     ];
 
-    
+
     return (
         <SDPage>
         <SDTable
@@ -129,7 +129,7 @@ const indexlistconfig : React.FC<widowRush> = (prop:widowRush) => {
          toolBarRender={(_: any, { selectedRows }: any) => [
           <SDButton
           successMessage=""
-          onClick={()=>{    
+          onClick={()=>{
             setEditType('create');
             setDetailVisible(true);
           }}
@@ -144,7 +144,7 @@ const indexlistconfig : React.FC<widowRush> = (prop:widowRush) => {
          />
 
         {detailVisible && (
-        <SDModalForm          
+        <SDModalForm
           title={'详细信息'}
           editType={editType}
           params={currentRow}
@@ -163,26 +163,28 @@ const indexlistconfig : React.FC<widowRush> = (prop:widowRush) => {
           formRef={formRef}
         >
             <SDAreaTtile title='指标清单'/>
-            <SDFormText name="indexListNo" readonlyCond="update" rules={[ { required: true, message: '请输入编号' },
-              {
-                validator:validateFun.account
-              },
-              {
-                validator: (_rule, value, callback)=> {
-                  if (firstCharIsNotNumber(value)>0) {
-                    callback('编号不能以数字开头');
-                  } else {
-                    callback();
-                  }
-    
-                }
-              }]} label="指标清单编号"/>
-            <SDFormText name="indexListName" required={true} rules={[{validator:validateFun.chineseRex,message:'请输入中文'}]} label="指标清单名称"/>
+          <SDFormText name="indexListNo" readonlyCond="update" required={true}
+                      rules={[{required: true, message: '请输入编号'},
+                        {
+                          validator: validateFun.account
+                        },
+                        {
+                          validator: (_rule, value, callback) => {
+                            if (firstCharIsNotNumber(value) > 0) {
+                              callback('编号不能以数字开头');
+                            } else {
+                              callback();
+                            }
+
+                          }
+                        }]} label="指标清单编号"/>
+          {/*rules={[{validator:validateFun.chineseRex,message:'请输入中文'}]}*/}
+            <SDFormText name="indexListName" required={true}  label="指标清单名称"/>
             <SDFormDict dictKey="@selectAllIndexToDict" name="indexNos" multiple={true} rules={[{required:true}]} label="指标"/>
         </SDModalForm>
       )}
         </SDPage>
-        
+
     );
 }
-export default indexlistconfig;
+export default indexlistconfig;

src/pages/internalEvaluation/configuration/modelconfig.tsx

@@ -31,11 +31,11 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
 
     // 页面数据
     var formDataList = new Array<ModelConfigModel>;
- 
+
     useEffect(() => {
 
       }, []);
-    
+
     // 修改查询查询
     const selectData = async (formdata : ModelConfigModel) => {
       const data = await selectDetailData(formdata);
@@ -45,13 +45,13 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
      }
 
     // 删除
-    const delRows =async(record:any)=>{ 
+    const delRows =async(record:any)=>{
        baseFun.confirm('确认删除？',async() =>{
         await deleteRows(record);
         baseFun.info("删除成功");
         closeAndRefresh();
        });
-       
+
      }
 
     //关闭窗口刷新父页面
@@ -74,41 +74,41 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
     }
     setDetailVisible(false);
   }
-     
+
     // 页面展示元素
     const columns: ProColumns<ModelConfigModel>[] = [
         {
-          title: '模型名称', 
+          title: '模型名称',
           dataIndex: 'modelName',
           hideInTable: false,
         },
         {
-          title: '模型编号', 
+          title: '模型编号',
           dataIndex: 'modelNo',
           search: false,
           hideInTable: false,
           valueType:'switch'
         },
         {
-          title: '模型所属产品', 
+          title: '模型所属产品',
           dataIndex: 'modelProduct',
           search: false,
           hideInTable: false,
         },
         {
-          title: '模型类型', 
+          title: '模型类型',
           dataIndex: 'modelType',
           search: false,
           hideInTable: false,
         },
         {
-          title: '模型说明', 
+          title: '模型说明',
           dataIndex: 'modelDescribe',
           search: false,
           hideInTable: false,
         },
         {
-          title: '结果公式', 
+          title: '结果公式',
           dataIndex: 'resultFormula',
           search: false,
           hideInTable: false,
@@ -124,7 +124,7 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
               icon={<WomanOutlined />}
               successMessage=""
               onClick={
-                ()=>{ 
+                ()=>{
                 selectData(record);
                 setDetailVisible(true);
                 setEditType('update');
@@ -140,7 +140,7 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
           >
             删除
           </SDOperate>,
-           
+
           ],
         },
 
@@ -150,13 +150,13 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
     // 输入参数页面展示元素
     const targetListColumns: ProColumns<TargetListModel>[] = [
       {
-        title: '指标清单编号', 
+        title: '指标清单编号',
         dataIndex: 'indexListNo',
         search: false,
         hideInTable:true
       },
       {
-        title: '指标', 
+        title: '指标',
         dataIndex: 'indexNo',
         search: false,
         request:()=>fetchDict('@selectAllIndexToDict'),
@@ -165,7 +165,7 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
         },
       },
       {
-        title: '指标来源', 
+        title: '指标来源',
         dataIndex: 'indexSource',
         hideInTable: false,
         request:()=>fetchDict('INDEXLISTSOURCETYPE'),
@@ -174,13 +174,13 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
       },
       },
       {
-        title: '指标说明', 
+        title: '指标说明',
         dataIndex: 'indexDescribe',
         search: false,
         hideInTable: false,
       },
       {
-        title: '指标分档', 
+        title: '指标分档',
         dataIndex: 'indexGrade',
         search: false,
         hideInTable: false,
@@ -194,7 +194,7 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
         // ],
       },
       // {
-      //   title: '指标分值', 
+      //   title: '指标分值',
       //   dataIndex: 'indexScore',
       //   search: false,
       //   hideInTable: false,
@@ -227,24 +227,24 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
     // 模型分档展示元素
     const modelGradeColumns: ProColumns<ModelGradeModel>[] = [
       {
-        title: '模型分档编号', 
+        title: '模型分档编号',
         dataIndex: 'modelGradeNo',
         search: false,
         hideInTable: true,
       },
       {
-        title: '等级', 
+        title: '等级',
         dataIndex: 'grade',
         hideInTable: false,
       },
       {
-        title: '等级说明', 
+        title: '等级说明',
         dataIndex: 'gradeDescription',
         search: false,
         hideInTable: false,
       },
       {
-        title: '分档', 
+        title: '分档',
         dataIndex: 'grading',
         search: false,
         hideInTable: false,
@@ -277,26 +277,26 @@ const modelconfig : React.FC<widowRush> = (prop:widowRush) => {
     // 输入参数页面展示元素
 const indexGradingColumns: ProColumns<IndexGradingModel>[] = [
   {
-    title: '指标分档编号', 
+    title: '指标分档编号',
     dataIndex: 'indexGradingNo',
     search: false,
     hideInTable: true,
   },
   {
-    title: '分档区间', 
+    title: '分档区间',
     dataIndex: 'gradingRange',
     search: false,
     hideInTable: false,
   },
   {
-    title: '指标分档', 
+    title: '指标分档',
     dataIndex: 'indexGrading',
     search: false,
     hideInTable: false,
   },
 
 ]
-    
+
     return (
         <SDPage>
         <SDTable
@@ -313,7 +313,7 @@ const indexGradingColumns: ProColumns<IndexGradingModel>[] = [
          toolBarRender={(_: any, { selectedRows }: any) => [
           <SDButton
           successMessage=""
-          onClick={()=>{    
+          onClick={()=>{
             setEditType('create');
             setDetailVisible(true);
             setTargetList([]);
@@ -330,7 +330,7 @@ const indexGradingColumns: ProColumns<IndexGradingModel>[] = [
          />
 
         {detailVisible && (
-        <SDModalForm          
+        <SDModalForm
           title={'详细信息'}
           editType={editType}
           params={currentRow}
@@ -349,7 +349,8 @@ const indexGradingColumns: ProColumns<IndexGradingModel>[] = [
           formRef={formRef}
         >
             <SDAreaTtile title='模型配置'/>
-            <SDFormText name="modelName"  readonlyCond="update" required={true} rules={[{validator:validateFun.chineseRex,message:'请输入中文'}]} label="模型名称"/>
+          {/*rules={[{validator:validateFun.chineseRex,message:'请输入中文'}]}*/}
+            <SDFormText name="modelName"  readonlyCond="update" required={true}  label="模型名称"/>
             <SDFormText name="modelNo" rules={[{required:true},{validator:validateFun.number,message:'请输入数字'}]} label="模型编号"/>
             <SDFormDict dictKey="org" name="modelProduct" rules={[{required:true}]} label="模型所属产品"/>
             <SDFormText name="modelType"  label="模型类型"/>
@@ -369,10 +370,10 @@ const indexGradingColumns: ProColumns<IndexGradingModel>[] = [
               {
                 position:'bottom',
                 record: () => {
-                  return ({ 
+                  return ({
                     indexListNo: (Math.random() * 1000000).toFixed(0),
                    })
-                  
+
                 }
               }
              }
@@ -398,7 +399,7 @@ const indexGradingColumns: ProColumns<IndexGradingModel>[] = [
         </SDModalForm>
       )}
         </SDPage>
-        
+
     );
 }
-export default modelconfig;
+export default modelconfig;

src/pages/internalEvaluation/configuration/riskcontrolstrategy.tsx

@@ -32,11 +32,11 @@ const riskcontrolstrategy : React.FC<widowRush> = (prop:widowRush) => {
 
     // 页面数据
     var formDataList = new Array<RiskControlStrategyModel>;
- 
+
     useEffect(() => {
 
       }, []);
-    
+
     // 修改查询查询
     const selectData = async (formdata : RiskControlStrategyModel) => {
       const data = await selectDetailData(formdata);
@@ -44,13 +44,13 @@ const riskcontrolstrategy : React.FC<widowRush> = (prop:widowRush) => {
      }
 
     // 删除
-    const delRows =async(record:any)=>{ 
+    const delRows =async(record:any)=>{
        baseFun.confirm('确认删除？',async() =>{
         await deleteRows(record);
         baseFun.info("删除成功");
         closeAndRefresh();
        });
-       
+
      }
 
     //关闭窗口刷新父页面
@@ -75,23 +75,25 @@ const riskcontrolstrategy : React.FC<widowRush> = (prop:widowRush) => {
   const startCalcUnit = async() => {
     const riskCtrlNo =  calcformRef.current?.getFieldValue('riskCtrlNo');
     const paramJsonStr =  calcformRef.current?.getFieldValue('paramJsonStr');
-    await startBackCalcUnit(riskCtrlNo,paramJsonStr);
+    calcformRef.current?.setFieldValue("responseData","");
+    const data = await startBackCalcUnit(riskCtrlNo,paramJsonStr);
+    calcformRef.current?.setFieldValue("responseData",JSON.stringify(data,null,4));
   }
-     
+
     // 页面展示元素
     const columns: ProColumns<RiskControlStrategyModel>[] = [
       {
-        title: '风控策略编号', 
+        title: '风控策略编号',
         dataIndex: 'riskControlStrategyNo',
         hideInTable:false
       },
       {
-        title: '风控策略名称', 
+        title: '风控策略名称',
         dataIndex: 'riskControlStrategyName',
         hideInTable:false
       },
     //   {
-    //     title: '指标清单', 
+    //     title: '指标清单',
     //     dataIndex: 'indexListNo',
     //     search: false,
     //     request:()=>fetchDict('@selectAllIndexToDict'),
@@ -100,7 +102,7 @@ const riskcontrolstrategy : React.FC<widowRush> = (prop:widowRush) => {
     //     },
     //   },
     //   {
-    //     title: '规则集', 
+    //     title: '规则集',
     //     dataIndex: 'rulesNo',
     //     search: false,
     //     request:()=>fetchDict('@selectRulesToDictContent'),
@@ -118,7 +120,7 @@ const riskcontrolstrategy : React.FC<widowRush> = (prop:widowRush) => {
             icon={<WomanOutlined />}
             successMessage=""
             onClick={
-              ()=>{ 
+              ()=>{
               selectData(record);
               setDetailVisible(true);
               setEditType('update');
@@ -150,7 +152,7 @@ const riskcontrolstrategy : React.FC<widowRush> = (prop:widowRush) => {
       },
     ];
 
-    
+
     return (
         <SDPage>
         <SDTable
@@ -167,7 +169,7 @@ const riskcontrolstrategy : React.FC<widowRush> = (prop:widowRush) => {
          toolBarRender={(_: any, { selectedRows }: any) => [
           <SDButton
           successMessage=""
-          onClick={()=>{    
+          onClick={()=>{
             setEditType('create');
             setDetailVisible(true);
           }}
@@ -182,7 +184,7 @@ const riskcontrolstrategy : React.FC<widowRush> = (prop:widowRush) => {
          />
 
         {detailVisible && (
-        <SDModalForm          
+        <SDModalForm
           title={'详细信息'}
           editType={editType}
           visible={detailVisible}
@@ -201,21 +203,23 @@ const riskcontrolstrategy : React.FC<widowRush> = (prop:widowRush) => {
           formRef={formRef}
         >
             <SDAreaTtile title='指标清单'/>
-            <SDFormText name="riskControlStrategyNo"  readonlyCond="update"  rules={[ { required: true, message: '请输入编号' },
-              {
-                validator:validateFun.account
-              },
-              {
-                validator: (_rule, value, callback)=> {
-                  if (firstCharIsNotNumber(value)>0) {
-                    callback('编号不能以数字开头');
-                  } else {
-                    callback();
-                  }
-    
-                }
-              }]} label="风控策略编号"/>
-            <SDFormText name="riskControlStrategyName" required={true} rules={[{validator:validateFun.chineseRex,message:'请输入中文'}]} label="风控策略名称"/>
+          <SDFormText name="riskControlStrategyNo" readonlyCond="update" required={true}
+                      rules={[{required: true, message: '请输入编号'},
+                        {
+                          validator: validateFun.account
+                        },
+                        {
+                          validator: (_rule, value, callback) => {
+                            if (firstCharIsNotNumber(value) > 0) {
+                              callback('编号不能以数字开头');
+                            } else {
+                              callback();
+                            }
+
+                          }
+                        }]} label="风控策略编号"/>
+          {/* rules={[{validator:validateFun.chineseRex,message:'请输入中文'}]} */}
+            <SDFormText name="riskControlStrategyName" required={true}  label="风控策略名称"/>
             <SDFormText name="riskControlStrategyDescribe" type="textarea"  label="风控策略描述"/>
             <SDFormDict dictKey="@selectAllIndexListToDict" name="indexListNos" multiple={true} rules={[{required:true}]} label="指标清单"/>
             <SDFormDict dictKey="@selectRulesToDictContent" name="rulesNos" multiple={true} rules={[{required:true}]} label="规则集"/>
@@ -224,13 +228,13 @@ const riskcontrolstrategy : React.FC<widowRush> = (prop:widowRush) => {
 
 
 {startCalcdVisible && (
-        <SDModalForm          
+        <SDModalForm
           title={'详细信息'}
           editType={calcEditType}
           visible={startCalcdVisible}
           params={currentRow}
           onVisibleChange={() => {setStartCalcdVisible(false);
-            
+
           }}
           initialValues={{riskCtrlNo:currentRow?currentRow.riskControlStrategyNo:''}}
           footer={[
@@ -244,16 +248,17 @@ const riskcontrolstrategy : React.FC<widowRush> = (prop:widowRush) => {
           ]}
           tableRef={actionRef}
           formRef={calcformRef}
-        >   
+        >
             <SDFormText name="riskCtrlNo"  readonlyCond="both" label="风控策略编号"/>
-            <SDFormText name="paramJsonStr" type="textarea"  label="参数(json格式)"/>
+            <SDFormText name="paramJsonStr" type="textarea" placeholder={"例：{\"ipAddr\":\"127.0.0.1\"}"}  label="参数(json格式)"/>
+            <SDFormText name="responseData" type="textarea"  label="返回的数据"/>
             </SDModalForm>
       )}
 
 
 
         </SDPage>
-        
+
     );
 }
-export default riskcontrolstrategy;
+export default riskcontrolstrategy;

src/services/internalEvaluation/configuration/Rule.ts

@@ -47,6 +47,11 @@ export type RuleModel = {
    */
   rulesNo : string,
 
+  /**
+   * 数据来源
+   */
+  rulesDataSour : string,
+
 } & BasePageModel;
 
 

src/services/internalEvaluation/configuration/indexconfig.ts

@@ -8,6 +8,10 @@ export type IndexConfigModel = {
     indexName?: string;
     // 指标逻辑
     indexLogic?: string;
+    // 默认值
+    defaultValue?: string;
+    // 默认值类型
+    defaultValueType?: string;
     // 数据来源
     indexDataSource?: IndexSourceModel[];
   } & BasePageModel;
@@ -50,4 +54,8 @@ export async function selectDetailData(body: any) {
     return baseFun.request<IndexConfigModel>('/api/internalevaluation/configuration/IndexConfigAction/selectDetailData.do',{data: body});
   }
 
-  
+  /** 查询主键是否重复 POST*/
+  export async function isNotExist(body:IndexConfigModel) {
+    return baseFun.request<any>('/api/internalevaluation/configuration/IndexConfigAction/isNotExist.do',{data: body});
+  }
+

src/services/internalEvaluation/configuration/riskcontrolstrategy.ts

@@ -52,7 +52,6 @@ export async function selectDetailData(body: any) {
 
     /** 启动计算 POST*/
 export async function startBackCalcUnit(riskCtrlNo:string,paramJsonStr:string) {
-  return baseFun.request<RiskControlStrategyModel>('/api/internalevaluation/configuration/RiskControlStrategyAction/testRiskCtrl.do',{data:{riskCtrlNo,paramJsonStr}});
+  return baseFun.request<any>('/api/internalevaluation/configuration/RiskControlStrategyAction/testRiskCtrl.do',{data:{riskCtrlNo,paramJsonStr}});
 }
 
-