diff --git a/inventory_check/static/js/script.js b/inventory_check/static/js/script.js index 18ab8c7..258cecc 100644 --- a/inventory_check/static/js/script.js +++ b/inventory_check/static/js/script.js @@ -44,3 +44,8 @@ function checknext() { .catch(error => console.error('Error:', error)); } + +function backtoroot(msg="已完成,返回") { + alert(msg); + location.href="index.html"; +} \ No newline at end of file diff --git a/inventory_check/templates/after.html b/inventory_check/templates/after.html new file mode 100644 index 0000000..4e90c76 --- /dev/null +++ b/inventory_check/templates/after.html @@ -0,0 +1,4 @@ +{% extends 'base.html' %} + \ No newline at end of file diff --git a/inventory_check/views.py b/inventory_check/views.py index dfde9da..744e8dd 100644 --- a/inventory_check/views.py +++ b/inventory_check/views.py @@ -22,15 +22,7 @@ def index(): def check(): inventory = Inventory.query.filter_by(checked=False).first() if not inventory: - js_code = ''' - - ''' - response = make_response(js_code) - response.headers['Content-Type'] = 'application/javascript' - return response + return render_template('after.html',msg="未导入或已盘完") return render_template('check.html',inventory=inventory) @app.route('/get_inventory', methods=['POST']) @@ -97,15 +89,7 @@ def import_file(): file_path = 'data.xlsx' file.save(file_path) import_from_xlsx(file_path) - js_code = ''' - - ''' - response = make_response(js_code) - response.headers['Content-Type'] = 'application/javascript' - return response + return render_template('after.html',msg="成功") return redirect(url_for('upload_form'))