update

model/mysql.js

@@ -15,7 +15,7 @@ us.mysqlconnection = function (host, database) {
             user: "root", //用户名
             password: "cocorobo", //密码
             database: database, //数据库名称
-            port: 3306 //端口 20007
+            port: 20007 //端口 20007
         }); //连接超时和错误从连
     }
     //connectionLimit: 1000, 

public/index.html

@@ -1362,12 +1362,12 @@
             }
         }
         function styleHide() {
+            selectedCompetitionId = 2
             document.getElementById('registerBtn').click();
             document.getElementById('downloadBtn').style.display = 'none';
             // document.getElementById('registerBtn1').style.display = 'none';
             document.getElementById('prevToStep1').style.display = 'none';
             addContestant()
-            selectedCompetitionId = 2
             updateGroupSelect(selectedCompetitionId);
             // 切换到步骤2
             document.getElementById('step1').classList.remove('active');
@@ -1383,16 +1383,14 @@
             // updateGroupSelect("1")
             if (urlSearch.slice(1) == "baoan") {
                 styleHide()
-                document.getElementsByTagName("nav")[0].innerHTML = `<div class="event-name">宝安区智能体应用赛</div>`
             } else if (urlSearch.slice(1) == "guangming") {
                 styleHide()
-                document.getElementsByTagName("nav")[0].innerHTML = `<div class="event-name">光明确智能体应用赛</div>`
             } else if (urlSearch.slice(1) == "pingshan") {
                 styleHide()
-                document.getElementsByTagName("nav")[0].innerHTML = `<div class="event-name">坪山区智能体应用赛</div>`
             } else if (urlSearch.slice(1) == "longhua") {
                 styleHide()
-                document.getElementsByTagName("nav")[0].innerHTML = `<div class="event-name">龙华区智能体应用赛</div>`
+            }else if (urlSearch.slice(1) == "nanshan") {
+                styleHide()
             }
         }
     </script>

routes/router.js

@@ -1,9 +1,9 @@
 var express = require('express');
 var router = express.Router();
 var mysql = require('../model/mysql');
-const _mysqluser = ["172.16.12.5", "registration"]; //用戶數據庫信息
+// const _mysqluser = ["172.16.12.5", "registration"]; //用戶數據庫信息
 
-// const _mysqluser = ["183.36.25.93", "registration"]; //本地测试用戶數據庫信息
+const _mysqluser = ["183.36.25.93", "registration"]; //本地测试用戶數據庫信息
 const crypto = require('crypto');
 const XLSX = require('xlsx');
 
@@ -12,78 +12,38 @@ router.route('/user').post(async function (req, res) {
     const uuid = crypto.randomUUID();
 
     let userData = JSON.parse(reqData.user);
-    await mysql.usselect([_mysqluser[0], _mysqluser[1], "select_registration_user", reqData.idCard], async function (r) {
-        console.log(r[0] && r[0], r[0].some(item => item['type'] == Number(reqData.type)));
-        if (r[0] && r[0].some(item => item['type'] == Number(reqData.type))) {
-            res.send({ status: 'error', message: '选手报名失败，选手身份证号已存在' });
-        } else {
-            // const insertUserPromises = userData.map(item => {
-            //     return new Promise((resolve, reject) => {
-            //         const userList = [];
-            //         userList.unshift(_mysqluser[0], _mysqluser[1], "insert_registration_users", item.name, item.gender, item.ethnicity, item.birthdate, item.email, item.id_number, item.group, item.grade, item.school, item.schoolRegion, item.phone, uuid);
-            //         mysql.usselect(userList, function (data) {
-            //             // 可以根据 data 判断是否插入成功
-            //             console.log("insert_registration_users", data);
-            //             if (data != 0) {
-            //                 resolve(data);
-            //             } else {
-            //                 reject(data);
-            //             }
-            //         });
-            //     });
-            // });
-            // signUpData.unshift(_mysqluser[0], _mysqluser[1], "insert_registrations", reqData.uploadUrl, "", reqData.type, reqData.idCard);
-            // Promise.all(insertUserPromises).then(() => {
-            //     // 所有用户插入完成后再插入报名数据
-            //     mysql.usselect(signUpData, function (data) {
-            //         if (data != 0) {
-            //             res.send({ status: 'ok', message: '选手报名成功' });
-            //         } else {
-            //             res.send({ status: 'error', message: '选手报名失败' });
-            //         }
-            //     });
-            // }).catch(error => {
-            //     console.error("error", error);
-            //     res.send({ status: 'error', message: '选手报名失败，选手身份证号已存在' });
-            // });
-
-
-            for (const item of userData) {
-                const userList = [_mysqluser[0], _mysqluser[1], "insert_registration_users", item.name, item.gender, item.ethnicity, item.birthdate, item.email, item.id_number, item.group, item.grade, item.school, item.schoolRegion, item.phone, uuid,reqData.type,reqData.area]
-                await new Promise((resolve, reject) => {
-                    mysql.usselect(userList, function (data) {
-                        // 可以根据 data 判断是否插入成功
-                        console.log("insert_registration_users", data);
-                        if (data != 0) {
-                            resolve(data);
-                        } else {
-                            res.send({ status: 'error', message: '选手报名失败' });
-                            reject(data);
-                        }
-                    });
-                });
-
-            }
-
-            const signUpData = [_mysqluser[0], _mysqluser[1], "insert_registrations", reqData.uploadUrl, "", reqData.type, reqData.idCard]
-            mysql.usselect(signUpData, function (data) {
+    for (const item of userData) {
+        const userList = [_mysqluser[0], _mysqluser[1], "insert_registration_users", item.name, item.gender, item.ethnicity, item.birthdate, item.email, item.id_number, item.group, item.grade, item.school, item.schoolRegion, item.phone, uuid, Number(reqData.type), reqData.area]
+        await new Promise((resolve, reject) => {
+            mysql.usselect(userList, function (data) {
+                // 可以根据 data 判断是否插入成功
+                console.log("insert_registration_users", data);
                 if (data != 0) {
-                    res.send({ status: 'ok', message: '选手报名成功' });
+                    resolve(data);
                 } else {
                     res.send({ status: 'error', message: '选手报名失败' });
+                    reject(data);
                 }
             });
+        });
 
-            
-        }
-    })
-
+    }
 
+    const signUpData = [_mysqluser[0], _mysqluser[1], "insert_registrations", reqData.uploadUrl, "", Number(reqData.type), reqData.idCard]
+    console.log(signUpData);
+    mysql.usselect(signUpData, function (data) {
+        console.log("insert_registrations", data);
+        if (data != 0) {
+            res.send({ status: 'ok', message: '选手报名成功' });
+        } else {
+            res.send({ status: 'error', message: '选手报名失败' });
+        }
+    });
 });
 
 router.route('/update').post(async function (req, res) {
-    const { url, id_number,type } = req.body;
-    const queryList = [_mysqluser[0], _mysqluser[1], "update_registration", url, id_number,type];
+    const { url, id_number, type } = req.body;
+    const queryList = [_mysqluser[0], _mysqluser[1], "update_registration", url, id_number, Number(type)];
     mysql.usselect(queryList, function (data) {
         console.log(data);
         if (data == 1) {