diff --git a/src/components/ai/AiHelper.tsx b/src/components/ai/AiHelper.tsx index af799d1..d10e0ca 100644 --- a/src/components/ai/AiHelper.tsx +++ b/src/components/ai/AiHelper.tsx @@ -187,6 +187,8 @@ export default function AiHelper(props: PropsType) { ping(); } ws.current.onmessage = (event) => { + // console.log('message', event); + if (event.data == 'PONE') { return; } @@ -230,7 +232,7 @@ export default function AiHelper(props: PropsType) { ), key, onClose: close, - duration: null, + // duration: null, placement: 'bottomRight', // 设置通知框显示在右下角 style: { width: 300, // 设置通知框的宽度 @@ -398,8 +400,31 @@ export default function AiHelper(props: PropsType) { messageApi, url: `/api/proj/get/${props.projId}`, onSuccess({ data }) { - // console.log('其他页面状态判断', data.generate.generateStatus); + // console.log('其他页面状态判断', data); setStatus(data.generate.generateStatus) + if (data.aiSetting.introductionStatus == 'GENERATING') { + setIsFast(true) + setIsProjIntroductionLoading(true) + setIsProjDescLoading(true) + setIsProjModArrayLoading(true) + } + if (data.aiSetting.introductionStatus == 'SUCCESS') { + setIsFast(true) + } + if (data.aiSetting.descStatus == 'GENERATING') { + setIsProjDescLoading(true) + } + if (data.aiSetting.modsStatus == 'GENERATING' ) { + setIsProjModArrayLoading(true) + // alert('模块正在生成中') + + } + if(data.aiSetting.descStatus == 'NONE'&& data.aiSetting.settingStatus == 'GENERATING'){ + setIsProjDescLoading(true) + } + if(data.aiSetting.modsStatus == 'NONE'&& data.aiSetting.settingStatus == 'GENERATING'){ + setIsProjModArrayLoading(true) + } } }) }, []) diff --git a/src/route/proj/ProjEdit.tsx b/src/route/proj/ProjEdit.tsx index 21f06f4..0ee1bd1 100644 --- a/src/route/proj/ProjEdit.tsx +++ b/src/route/proj/ProjEdit.tsx @@ -49,7 +49,7 @@ type ProjModType = { export default function ProjEdit() { // 项目状态 const [projStatus, setprojStatus] = useState('') - const [payStatus,setpayStatus] = useState('') + const [payStatus, setpayStatus] = useState('') const dispath = useDispatch() // 更新所属者表格储存至redux const upBelongArray = () => { @@ -153,7 +153,7 @@ export default function ProjEdit() { btnName: !isGenerateSuccess ? '设置' : '查看', status: data.apply.projVersion ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT, // status: data.apply.projDevCompleteDate ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT, - + handleEdit() { // if (generateStatus != GenerateStatus.SUCCESS) { if (!isGenerateSuccess) { @@ -309,6 +309,22 @@ export default function ProjEdit() { messageApi: messageApi, url: `/api/proj/get/${pathParams.projId}`, onSuccess({ data }) { + // console.log(data.aiSetting); + // 当ai生成不是成功切 材料未生成时候弹出弹出框 + // if (data.aiSetting.settingStatus !== "SUCCESS" && data.generate.generateStatus == GenerateStatus.NONE) { + // setAiHelperModalOpen(true) + // } + // 是否显示ai弹窗 + const isModal = !data.projDesc || !data.projIntroduction || data.projModCount > 0 + // const isModal = !data.projDesc || !data.projIntroduction || data.aiSetting.modsStatus == "GENERATING" + if (!isModal && data.generate.generateStatus == GenerateStatus.NONE) { + + + setAiHelperModalOpen(true) + } + if (data.aiSetting.settingStatus == 'GENERATING') { + setAiHelperModalOpen(true) + } // console.log('状态判断', data.pay.chargeAdditionals); // setShowZpi(true) const isShow = data.pay.chargeAdditionals.includes('PKG') @@ -319,6 +335,7 @@ export default function ProjEdit() { setShowZpi(false) } + // const isEdited = data.editSteps[0].editStatus == EditStepEnum.EDITED // && data.editSteps[1].editStatus == EditStepEnum.EDITED // && data.editSteps[2].editStatus == EditStepEnum.EDITED @@ -490,7 +507,7 @@ export default function ProjEdit() { }) } { - isEditStepEdited && isConfigEdited && projStatus != 'EXPIRED' && payStatus !='CORRECTION2_REFUND' ? ( + isEditStepEdited && isConfigEdited && projStatus != 'EXPIRED' && payStatus != 'CORRECTION2_REFUND' ? ( { setGenerateErrorModal(true); - console.log('反馈') + // console.log('反馈') }} /> ) : <> diff --git a/src/route/proj/ProjEditFree.tsx b/src/route/proj/ProjEditFree.tsx index 39c751e..c36ba27 100644 --- a/src/route/proj/ProjEditFree.tsx +++ b/src/route/proj/ProjEditFree.tsx @@ -399,6 +399,17 @@ export default function ProjEdit() { // if(data.projModCount >= 3){ // setCanGenerate(true) // } + // 根据状态判断是否显示ai弹窗 + const isModal = !data.projDesc || !data.projIntroduction || data.projModCount > 0 + // const isModal = !data.projDesc || !data.projIntroduction || data.aiSetting.modsStatus == "GENERATING" + if (!isModal && data.generate.generateStatus == GenerateStatus.NONE) { + + + setAiHelperModalOpen(true) + } + if (data.aiSetting.settingStatus == 'GENERATING') { + setAiHelperModalOpen(true) + } const isEdited = Boolean(data.projIntroduction) && Boolean(data.loginpage.loginpageId) == true // console.log('isEdited',isEdited); const isConfig = data.loginpage.loginpageId && data.projModCount >= 3;