diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index fad4be2..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "workbench.colorCustomizations": { - "activityBar.background": "#092574", - "titleBar.activeBackground": "#0C34A2", - "titleBar.activeForeground": "#F9FAFF" - } -} \ No newline at end of file diff --git a/src/.vscode/settings.json b/src/.vscode/settings.json deleted file mode 100644 index aef8443..0000000 --- a/src/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "liveServer.settings.port": 5501 -} \ No newline at end of file diff --git a/src/Admin/admin.html b/src/Admin/admin.html index a3a0d1e..0bf6149 100644 --- a/src/Admin/admin.html +++ b/src/Admin/admin.html @@ -18,6 +18,9 @@ 预设一 预设二 预设三 + 预设四 + 预设五 + 预设六
@@ -51,9 +54,9 @@ time: time.value }).then(res=>{ console.log("发送input成功") - axios.post('http://127.0.0.1:8000/start').then(res=>{ - console.log("开启成功") - }) + // axios.post('http://127.0.0.1:8000/start').then(res=>{ + // console.log("开启成功") + // }) }) } function GetPreSet(num){ diff --git a/src/Admin/node_modules/xy-ui/.gitignore b/src/Admin/node_modules/xy-ui/.gitignore deleted file mode 100644 index 3e9809c..0000000 --- a/src/Admin/node_modules/xy-ui/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# node.js -# -node_modules/ -npm-debug.log - diff --git a/src/Admin/node_modules/xy-ui/.vscode/settings.json b/src/Admin/node_modules/xy-ui/.vscode/settings.json deleted file mode 100644 index 155422b..0000000 --- a/src/Admin/node_modules/xy-ui/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "liveServer.settings.port": 5503 -} \ No newline at end of file diff --git a/src/Admin/node_modules/xy-ui/docs/.nojekyll b/src/Admin/node_modules/xy-ui/docs/.nojekyll deleted file mode 100644 index e69de29..0000000 diff --git a/src/Charts/try.html b/src/Charts/try.html index 89225f7..cd66356 100644 --- a/src/Charts/try.html +++ b/src/Charts/try.html @@ -79,7 +79,7 @@ -
剩余时间为：{{time}}
+
投票剩余时间为：{{time}}
@@ -102,7 +102,7 @@ var that = this function createTips() { var ele = document.getElementById("time"); - ele.innerHTML = "时间到!" + ele.innerHTML = "投票截止!" } function changeTime() { @@ -121,6 +121,9 @@ this.time = res.data.time this.setTime() }) + axios.post('http://127.0.0.1:8000/start').then(res=>{ + console.log("开启成功") + }) } }) diff --git a/src/Data/__pycache__/New_pc_1.cpython-310.pyc b/src/Data/__pycache__/New_pc_1.cpython-310.pyc index 14e5094..faf7958 100644 Binary files a/src/Data/__pycache__/New_pc_1.cpython-310.pyc and b/src/Data/__pycache__/New_pc_1.cpython-310.pyc differ diff --git a/src/Data/__pycache__/New_pc_1.cpython-311.pyc b/src/Data/__pycache__/New_pc_1.cpython-311.pyc new file mode 100644 index 0000000..d871365 Binary files /dev/null and b/src/Data/__pycache__/New_pc_1.cpython-311.pyc differ diff --git a/src/Data/history.csv b/src/Data/history.csv index e69de29..9925af3 100644 --- a/src/Data/history.csv +++ b/src/Data/history.csv @@ -0,0 +1 @@ +question,A,B,C,D,E diff --git a/src/Data/main.py b/src/Data/main.py index f0a9c13..d0d8bc8 100644 --- a/src/Data/main.py +++ b/src/Data/main.py @@ -27,7 +27,7 @@ class PresetIndex(BaseModel): #定义全局所要用的变量 -danmu=Spider(7734200) +danmu=Spider(24471267) ifStop=True data = list() options = dict() diff --git a/src/Data/preset.csv b/src/Data/preset.csv index 977a45c..c34ac99 100644 --- a/src/Data/preset.csv +++ b/src/Data/preset.csv @@ -1,3 +1,7 @@ question,A,B,C,D,E,time -团子去找谁问问呢？,1,2,3,4,30,30 -团子哭哭？,width,hahahah,weew,wee,werwe,30 \ No newline at end of file +是否起床,立刻起床,再睡五分钟,,,,30 +早上去哪个食堂吃饭,二食堂,七食堂,八食堂,,,30 +怎么去教室,步行,骑自行车,骑电瓶车,主题巴士,,30 +高数答案,选择A,选择B,,,,30 +午饭吃什么,去后湖吃饭,让舍友带饭,食堂用餐,,,30 +校园活动,做志愿者,打羽毛球,去图书馆阅读书籍,,,30