From 58698f1ca30c4fcdf74cd32d7ccac809eca696f3 Mon Sep 17 00:00:00 2001
From: yxw <17074267@qq.com>
Date: Fri, 24 Nov 2023 12:07:54 +0800
Subject: [PATCH] fix

---
 system.html | 94 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 57 insertions(+), 37 deletions(-)

diff --git a/system.html b/system.html
index 88fec20..bc17adb 100644
--- a/system.html
+++ b/system.html
@@ -96,9 +96,11 @@
                         <div class="mb-3 row">
                             <label for="inputPassword" class="col-sm-4 col-form-label">Fimware Upgrade</label>
                             <div class="col-sm-8 d-flex">
-
-                                <input type="text" id="fileName" class="form-control" />
-                                <input type="file" id="uploadFile" style="display: none;" accept=".bin">
+                                <form action="http://192.168.0.116/cgi-bin/upload.cgi" id="formTransfer" method="post"
+                                    enctype="multipart/form-data">
+                                    <input type="text" id="fileName" class="form-control" />
+                                    <input type="file" id="uploadFile" style="display: none;" accept=".bin">
+                                </form>
                                 <button id="selectFile" class="btn button btn-dark border border-black">Browser</button>
                                 <button type="button" id="upgrade"
                                     class="btn button btn-dark border border-black ms-4">Load</button>
@@ -141,8 +143,8 @@
                             console.log('返回数据', typeof (res), res)
                             if (res.success) {
                                 data = res.content
-                                
-                                window.location.href='login.html'
+
+                                window.location.href = 'login.html'
                             }
                             else {
                                 alert(res.message)
@@ -163,45 +165,63 @@
             });
 
             $("#upgrade").on("click", function () {
-                console.log($('#uploadFile')[0].files[0])
-                console.log($('#uploadFile')[0].files[0].name)
-                console.log($('#uploadFile')[0].files[0].size)
-                let url = 'http://192.168.0.116/cgi-bin/test.cgi';
-                var filenum = parseInt($('#uploadFile')[0].files[0].size)
-                var formData = new FormData();
-                formData.append('action', 'upgrade')
-                formData.append('name', $('#uploadFile')[0].files[0].name)
-                formData.append('file', $('#uploadFile')[0].files[0])
-                formData.append('size', filenum)
 
-                if (filenum > 8388608) {
-                    alert("file to big!file is less than 8M!");
-                    return;
-                }
+                let name = $('#uploadFile')[0].files[0].name
+                let size = parseInt($('#uploadFile')[0].files[0].size)
+                $("#formTransfer").ajaxSubmit({
+                    uploadProgress: function (event, position, total, percentComplete) {
 
-                $.ajax({
-                    type: 'POST',
-                    url: url,
-                    data: formData,
-                    dataType: 'json',
-                    type: 'POST',
-                    async: false,
-                    processData: false, // 使数据不做处理
-                    contentType: false, // 不要设置Content-Type请求头
-                    success: function (res) {
-                        if (res.success) {
-                            data = res.content
-                            window.location.reload(true);
+                        if (size > 8388608) {
+                            alert("file to big!file is less than 8M!");
+                            return;
                         }
-                        else {
-                            console.log(res.message)
-                            alert(res.message)
+
+                        var percentVal = percentComplete + '%'; //获得进度
+                        console.log(percentVal);
+                        if (percentVal == "100%") {
+                            console.log("upload success!");
+
+                            let url = 'http://192.168.0.116/cgi-bin/test.cgi';
+                            let postData = {
+                                action: 'upgrade',
+                                name: name,
+                                size: size,
+                            }
+
+                            $.ajax({
+                                type: 'POST',
+                                url: url,
+                                data: formData,
+                                dataType: 'json',
+                                type: 'POST',
+                                async: false,
+                                processData: false, // 使数据不做处理
+                                contentType: false, // 不要设置Content-Type请求头
+                                success: function (res) {
+                                    if (res.success) {
+                                        data = res.content
+                                        window.location.reload(true);
+                                    }
+                                    else {
+                                        console.log(res.message)
+                                        alert(res.message)
+                                    }
+                                },
+                                error: function (res) {
+                                    console.log(res)
+                                }
+                            })
                         }
                     },
-                    error: function (res) {
-                        console.log(res)
+                    success: function (data) {
+
+                    },
+                    error: function (xhr) {
+                        console.log('upload error')
                     }
                 })
+
+
             })
         })