[Fixed]修复无法在前端显示结果的Bug

This commit is contained in:
Zhanpeng Yang 2024-10-12 13:32:47 +08:00
parent 92124c3c43
commit a43faafe0e
2 changed files with 59 additions and 36 deletions

View File

@ -207,7 +207,7 @@ export async function POST(request) {
new Date(requestData.measureEndDatetime).getTime() new Date(requestData.measureEndDatetime).getTime()
); );
let response = {}; let inferenceResult = {};
if (spectralData === null) { if (spectralData === null) {
//如果未找到光谱数据 //如果未找到光谱数据
@ -232,15 +232,14 @@ export async function POST(request) {
//计算误差 //计算误差
let response = {};
const keys = ["Temperature", "C", "P", "S", "Mn", "Ni", "Mo", "Cr"]; const keys = ["Temperature", "C", "P", "S", "Mn", "Ni", "Mo", "Cr"];
console.log(requestData); // console.log(requestData);
for (let i = 0; i < keys.length; i++) { for (let i = 0; i < keys.length; i++) {
let key = keys[i]; let key = keys[i];
response["test" + key] = inferenceOutput[key]; inferenceResult["test" + key] = inferenceOutput[key];
response["error" + key] = inferenceOutput[key] - requestData[key]; inferenceResult["error" + key] = inferenceOutput[key] - requestData[key];
} }
// response = { // response = {
@ -251,7 +250,7 @@ export async function POST(request) {
// let furnaceUploadData = requestData; // let furnaceUploadData = requestData;
// furnaceUploadData.inferenceOutput = inferenceOutput; // furnaceUploadData.inferenceOutput = inferenceOutput;
// furnaceUploadData.inferenceErrror = inferenceErrror; // furnaceUploadData.inferenceErrror = inferenceErrror;
let furnaceUploadData = { ...requestData, ...response }; let furnaceUploadData = { ...requestData, ...inferenceResult };
furnaceUploadData.spectralData = pako.gzip(pack(spectralData)); furnaceUploadData.spectralData = pako.gzip(pack(spectralData));
furnaceUploadData.spectralDim = furnaceUploadData.spectralDim =
@ -260,12 +259,13 @@ export async function POST(request) {
1024 / (Number(process.env.SPECTRUM_BinningSpatial) + 1); 1024 / (Number(process.env.SPECTRUM_BinningSpatial) + 1);
// console.log(furnaceUploadData.spectralData.buffer.length); // console.log(furnaceUploadData.spectralData.buffer.length);
console.log(inferenceResult);
let furnaceUploadDataCompressed = pako.gzip(pack(furnaceUploadData)); let furnaceUploadDataCompressed = pako.gzip(pack(furnaceUploadData));
console.log("after", inferenceResult);
console.log( console.log(
`[server][api/upload]正在上传此炉次数据到云服务器,压缩后数据大小为${ `[server][api/upload]正在上传此炉次数据到云服务器,压缩后数据大小为${
furnaceUploadDataCompressed.length / 1024 furnaceUploadDataCompressed.length / 1024 / 1024
}KiByte` }MiByte`
); );
let uploadResponse = await fetch(process.env.FURNACE_UPLOAD_API, { let uploadResponse = await fetch(process.env.FURNACE_UPLOAD_API, {
@ -279,7 +279,7 @@ export async function POST(request) {
)}` )}`
); );
} }
// console.log(result); console.log(inferenceResult);
return NextResponse.json(response, { status: 200 }); return NextResponse.json(inferenceResult, { status: 200 });
} }

View File

@ -67,11 +67,13 @@ export default function Upload() {
}; };
const [measureStartDatetime, setMeasureStartDatetime] = useState( const [measureStartDatetime, setMeasureStartDatetime] = useState(
"2024-09-26T14:40:00" // "2024-09-26T14:40:00"
getCurrentDateTime()
); );
const [measureEndDatetime, setMeasureEndDatetime] = useState( const [measureEndDatetime, setMeasureEndDatetime] = useState(
"2024-09-26T14:29:00" // "2024-09-26T14:29:00"
getCurrentDateTime()
); );
const handleMeasureEndDatetimeChange = (event) => { const handleMeasureEndDatetimeChange = (event) => {
@ -112,10 +114,16 @@ export default function Upload() {
}); });
}; };
const [selecteMeasureType, setSelecteMeasureType] = useState("TSC"); const [measureType, setMeasureType] = useState("TSC");
const handleSelecteMeasureTypeChange = (event) => { const handleMeasureTypeChange = (event) => {
setSelecteMeasureType(event.target.value); setMeasureType(event.target.value);
};
const [uploadType, setUploadType] = useState("manual");
const handleUploadTypeChange = (event) => {
setUploadType(event.target.value);
}; };
const [stellType, setStellType] = useState(""); const [stellType, setStellType] = useState("");
@ -139,7 +147,7 @@ export default function Upload() {
furnaceNumber: furnaceNumber, furnaceNumber: furnaceNumber,
stellType: stellType, stellType: stellType,
uploadType: "manual", uploadType: uploadType,
measureStartDatetime: measureStartDatetime, measureStartDatetime: measureStartDatetime,
measureEndDatetime: measureEndDatetime, measureEndDatetime: measureEndDatetime,
Temperature: elementContent.Temperature, Temperature: elementContent.Temperature,
@ -150,7 +158,7 @@ export default function Upload() {
Ni: elementContent.Ni, Ni: elementContent.Ni,
Mo: elementContent.Mo, Mo: elementContent.Mo,
Cr: elementContent.Cr, Cr: elementContent.Cr,
selecteMeasureType: selecteMeasureType, measureType: measureType,
remark: remark, remark: remark,
}); });
}, [ }, [
@ -158,7 +166,7 @@ export default function Upload() {
measureStartDatetime, measureStartDatetime,
elementContent, elementContent,
measureEndDatetime, measureEndDatetime,
selecteMeasureType, measureType,
stellType, stellType,
remark, remark,
]); ]);
@ -204,6 +212,18 @@ export default function Upload() {
</select> </select>
</div> */} </div> */}
<div>
<label htmlFor="dropdown">请选择数据上传数据方式:</label>
<select
id="dropdown"
value={uploadType}
onChange={handleUploadTypeChange}
>
<option value="manual">手动上传</option>
<option value="test">测试数据</option>
</select>
</div>
<div> <div>
<label htmlFor="numberInput">请输入炉次号:</label> <label htmlFor="numberInput">请输入炉次号:</label>
<input <input
@ -224,6 +244,19 @@ export default function Upload() {
/> />
</div> </div>
<div>
<label htmlFor="dropdown">请选择参数测量方式:</label>
<select
id="dropdown"
value={measureType}
onChange={handleMeasureTypeChange}
>
<option value="TSC">副枪TSC</option>
<option value="TSO">副枪TSO</option>
<option value="Hand">手动</option>
</select>
</div>
<div> <div>
<label htmlFor="dateInput">请选择测温开始时间:</label> <label htmlFor="dateInput">请选择测温开始时间:</label>
<input <input
@ -262,16 +295,13 @@ export default function Upload() {
</div> </div>
<div> <div>
<label htmlFor="dropdown">请选择一个选项:</label> <label htmlFor="textInput">请输入备注:</label>
<select <input
id="dropdown" type="text"
value={selecteMeasureType} id="textInput"
onChange={handleSelecteMeasureTypeChange} value={remark}
> onChange={handleRemarkChange}
<option value="TSC">TSC</option> />
<option value="TSO">TSO</option>
<option value="Hand">Hand</option>
</select>
</div> </div>
<div className="flex items-center justify-center"> <div className="flex items-center justify-center">
@ -286,13 +316,6 @@ export default function Upload() {
{/* <button ></button> */} {/* <button ></button> */}
<div> <div>
<label htmlFor="textInput">请输入备注:</label>
<input
type="text"
id="textInput"
value={remark}
onChange={handleRemarkChange}
/>
<h2>待上传数据</h2> <h2>待上传数据</h2>
<pre> <pre>
<code>{JSON.stringify(uploadData, null, 2)}</code> <code>{JSON.stringify(uploadData, null, 2)}</code>