Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add files via upload #2

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .vscode/settings.json

This file was deleted.

3 changes: 0 additions & 3 deletions src/.vscode/settings.json

This file was deleted.

9 changes: 6 additions & 3 deletions src/Admin/admin.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
<xy-option value="1">预设一</xy-option>
<xy-option value="2">预设二</xy-option>
<xy-option value="3">预设三</xy-option>
<xy-option value="4">预设四</xy-option>
<xy-option value="5">预设五</xy-option>
<xy-option value="6">预设六</xy-option>
</xy-select>
<div class="form">
<xy-input id="question" label="问题" block></xy-input>
Expand Down Expand Up @@ -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){
Expand Down
5 changes: 0 additions & 5 deletions src/Admin/node_modules/xy-ui/.gitignore

This file was deleted.

3 changes: 0 additions & 3 deletions src/Admin/node_modules/xy-ui/.vscode/settings.json

This file was deleted.

Empty file.
7 changes: 5 additions & 2 deletions src/Charts/try.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
</head>

<body>
<div id="time">剩余时间为:{{time}}</div>
<div id="time">投票剩余时间为:{{time}}</div>
<div id="app">
<div class="progress-bar" v-for="(option, index) in options" :key="index">
<div class="progress-bar-background">
Expand All @@ -102,7 +102,7 @@
var that = this
function createTips() {
var ele = document.getElementById("time");
ele.innerHTML = "时间到!"
ele.innerHTML = "投票截止!"
}

function changeTime() {
Expand All @@ -121,6 +121,9 @@
this.time = res.data.time
this.setTime()
})
axios.post('http://127.0.0.1:8000/start').then(res=>{
console.log("开启成功")
})
}
})

Expand Down
Binary file modified src/Data/__pycache__/New_pc_1.cpython-310.pyc
Binary file not shown.
Binary file added src/Data/__pycache__/New_pc_1.cpython-311.pyc
Binary file not shown.
1 change: 1 addition & 0 deletions src/Data/history.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
question,A,B,C,D,E
2 changes: 1 addition & 1 deletion src/Data/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class PresetIndex(BaseModel):


#定义全局所要用的变量
danmu=Spider(7734200)
danmu=Spider(24471267)
ifStop=True
data = list()
options = dict()
Expand Down
8 changes: 6 additions & 2 deletions src/Data/preset.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
question,A,B,C,D,E,time
团子去找谁问问呢?,1,2,3,4,30,30
团子哭哭?,width,hahahah,weew,wee,werwe,30
是否起床,立刻起床,再睡五分钟,,,,30
早上去哪个食堂吃饭,二食堂,七食堂,八食堂,,,30
怎么去教室,步行,骑自行车,骑电瓶车,主题巴士,,30
高数答案,选择A,选择B,,,,30
午饭吃什么,去后湖吃饭,让舍友带饭,食堂用餐,,,30
校园活动,做志愿者,打羽毛球,去图书馆阅读书籍,,,30