|
@@ -65,6 +65,18 @@ $(function(){
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+ if(!allSelect) {
|
|
|
+ $('.modal').css('display', 'block');
|
|
|
+ let timer = setTimeout(() => {
|
|
|
+ $('.modal').css('display', 'none');
|
|
|
+ }, 2000);
|
|
|
+ $('.closeModal').click(function() {
|
|
|
+ $('.modal').css('display', 'none');
|
|
|
+ if(timer) {
|
|
|
+ clearTimeout(timer)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
if(allSelect) {
|
|
|
getCalcuResult(scaleList)
|
|
|
}
|
|
@@ -76,6 +88,7 @@ $(function(){
|
|
|
})
|
|
|
|
|
|
}
|
|
|
+
|
|
|
|
|
|
})
|
|
|
|
|
@@ -107,7 +120,7 @@ function renderCalcu(scaleList) {
|
|
|
|
|
|
}
|
|
|
if(scaleList.group[j].groupCalculate.isShow == 1) {
|
|
|
- str += '<div class="calcu">记分:'+ scaleList.group[j].groupCalculate.result.value +' '+ scaleList.group[j].groupCalculate.result.text +'</div>'
|
|
|
+ str += '<div class="calcu">计分:'+ scaleList.group[j].groupCalculate.result.value +' '+ scaleList.group[j].groupCalculate.result.text +'</div>'
|
|
|
|
|
|
}
|
|
|
str += '</div>'
|
|
@@ -117,7 +130,7 @@ function renderCalcu(scaleList) {
|
|
|
if(scaleList.calculate && scaleList.calculate.result) {
|
|
|
calcuStr += scaleList.calculate.result.value + ' ' + scaleList.calculate.result.text
|
|
|
}
|
|
|
- calcuStr += '</span><span class="calcuBtn">计算<span></div>'
|
|
|
+ calcuStr += '</span><span class="calcuBtn">得分<span></div>'
|
|
|
var allStr = '<div class="calcuWrapper">' + str + calcuStr + '</div>'
|
|
|
$('.content').append(allStr)
|
|
|
}
|
|
@@ -145,7 +158,7 @@ function renderCalcu(scaleList) {
|
|
|
let calcuItem = data.group.filter(function(item) {
|
|
|
return item.groupName == calcuItemName
|
|
|
})[0]
|
|
|
- $('.calcu').eq(i).html('记分:' + calcuItem.groupCalculate.result.value + ' ' + calcuItem.groupCalculate.result.text)
|
|
|
+ $('.calcu').eq(i).html('计分:' + calcuItem.groupCalculate.result.value + ' ' + calcuItem.groupCalculate.result.text)
|
|
|
}
|
|
|
}
|
|
|
$('.allCalcu').eq(0).html('总分:' + data.calculate.result.value + ' ' + data.calculate.result.text)
|