mi5pucnx4
/
arithmometerplus
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

fix bugs

Browse Source
master
ZiYi 4 years ago
parent 5b5b06daeb
commit ea960226f8
3 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File

36
create.py
Unescape View File

@ -3,18 +3,20 @@ from cfractions import Fraction
def create_number(i):
get_number = random.randint(0,int(i))
get_number = random.randint(0, int(i))
# print(get_number)
return get_number
def create_sign():
sign = ['+','-','*','÷']
sign = ['+', '-', '*', '÷']
get_sign = random.choice(sign)
# print(get_sign)
return get_sign
def create_formula(flag_num):
total = [3,5,7]
total = [3, 5, 7]
flag = random.choice(total)
# 生成算式 result数组
result = []
@ -37,19 +39,20 @@ def create_formula(flag_num):
if bracket == 1:
for i in range(length):
if result[i] == '+' or result[i] == '-':
result.insert(i-1,'(')
result.insert(i+3,')')
result.insert(i-1, '(')
result.insert(i+3, ')')
break
# print(result)
formula = str(str(result).replace("'","").replace(',','')).replace('[','').replace(']','')
formula = str(str(result).replace("'", "").replace(
',', '')).replace('[', '').replace(']', '')
# 计算
while len(result) != 1:
if '(' in result:
number_sign = result.index('(')+2
if result[number_sign] == '+':
number_num = result[number_sign - 1] + result[number_sign + 1]
result[number_sign -2] = number_num
result[number_sign - 2] = number_num
result.remove(result[number_sign - 1])
result.remove(result[number_sign - 1])
result.remove(result[number_sign - 1])
@ -67,7 +70,8 @@ def create_formula(flag_num):
if '*' in result:
number_sign = result.index('*')
# print(result)
number_num = int(float(result[number_sign - 1]) * float(result[number_sign + 1]))
number_num = int(
float(result[number_sign - 1]) * float(result[number_sign + 1]))
result[number_sign] = number_num
result.remove(result[number_sign - 1])
result.remove(result[number_sign])
@ -78,7 +82,8 @@ def create_formula(flag_num):
create_formula(flag_num)
else:
# print(result[number_sign - 1],result[number_sign + 1])
number_num = Fraction(int(result[number_sign - 1]) , int(result[number_sign + 1]))
number_num = Fraction(
int(result[number_sign - 1]), int(result[number_sign + 1]))
# print(number_num)
result[number_sign] = number_num
result.remove(result[number_sign - 1])
@ -86,20 +91,22 @@ def create_formula(flag_num):
# print('÷'+str(result))
elif '+' in result:
number_sign = result.index('+')
number_num = int(float(result[number_sign - 1]) + float(result[number_sign + 1]))
number_num = int(
float(result[number_sign - 1]) + float(result[number_sign + 1]))
result[number_sign - 1] = number_num
result.remove(result[number_sign])
result.remove(result[number_sign])
# print('+'+str(result))
elif '-' in result:
number_sign = result.index('-')
number_num = int(float(result[number_sign - 1]) - float(result[number_sign + 1]))
number_num = int(
float(result[number_sign - 1]) - float(result[number_sign + 1]))
result[number_sign - 1] = number_num
result.remove(result[number_sign])
result.remove(result[number_sign])
# print('-'+str(result))
result = str(result).replace('[','').replace(']','')
result = str(result).replace('[', '').replace(']', '')
# print('------------')
# print(result)
# print('+++++++++++++')
@ -110,8 +117,9 @@ def create_formula(flag_num):
if result[start + 1] == 0 or result[start + 1] == '0':
result = 0
else:
result = str(result)[start+1:center] + '/' + str(result)[center+1:end]
result = str(result)[start+1:center] + \
'/' + str(result)[center+1:end]
# print(result)
# print(start,center,end)
# print(formula)
return result,formula
return result, formula

5
static/css/index.css
Unescape View File

@ -24,6 +24,8 @@ h1{
width: 50%;
position: relative;
left: 25%;
border-top: 1px solid #bbcdc5;
border-left: 1px solid #bbcdc5;
box-shadow: 4px 4px 5px #888888;
}
ul{
@ -98,6 +100,9 @@ li{
height: 25px;
text-align: center;
border: #c2ccd0;
border-top: 1px solid #bbcdc5;
border-left: 1px solid #bbcdc5;
box-shadow: 4px 4px 5px #888888;
}
#info{

11
static/js/index.js
Unescape View File

@ -151,8 +151,13 @@ $(document).ready(function () {
let counts = Object.keys(res).length;
for (let i = 0; i < counts; i++) {
$("#ul").append("<li><span class='detials'>" + res[i].formula + " = " + "</span><input class='result' type='number'>" + "<span class='notice'></span></li>");
results.push(res[i].result);
$("#ul").append("<li><span class='detials'>" + res[i].formula + " = " + "</span><input class='result' type='text'>" + "<span class='notice'></span></li>");
var tmp = res[i].result;
var reg = /\s+/g;
//console.log(typeof tmp + " " + tmp);
tmp = tmp.replace(reg, "");
//results.push(res[i].result);
results.push(tmp);
}
$("#ul").slideToggle("slow");
@ -190,7 +195,7 @@ $(document).ready(function () {
if (flag_input) {
for (let i = 0; i < results.length; i++) {
console.log(inputs.eq(i).val());
if (inputs.eq(i).val() != "" && Number(inputs.eq(i).val()) == Number(results[i])) {
if (inputs.eq(i).val() != "" && inputs.eq(i).val() == results[i]) {
if (language != -1) {
notices.eq(i).text("结果正确!");
} else {

Write Preview
Loading…
Cancel
Save