IOS版最新更新(1)
This commit is contained in:
parent
7431951c89
commit
70ce8fc268
|
|
@ -53,9 +53,9 @@ class Estimate extends Base{
|
||||||
// dump($result);
|
// dump($result);
|
||||||
// die;
|
// die;
|
||||||
if(!$pd){
|
if(!$pd){
|
||||||
$result['num'] = $num;
|
// $result['num'] = $num;
|
||||||
$result['data'] = $result;
|
// $result['data'] = $result;
|
||||||
return $this->msg(0,'success',$result);
|
return $this->msg(['num'=>$num,'data'=>$result]);
|
||||||
}
|
}
|
||||||
$this->assign([
|
$this->assign([
|
||||||
'result' => $result,
|
'result' => $result,
|
||||||
|
|
@ -270,6 +270,7 @@ class Estimate extends Base{
|
||||||
'proportion'=>$value[10],
|
'proportion'=>$value[10],
|
||||||
'value'=>$value[11],
|
'value'=>$value[11],
|
||||||
'type'=>$value[12],
|
'type'=>$value[12],
|
||||||
|
'describe'=>$value[13],
|
||||||
'score'=>$value[2],
|
'score'=>$value[2],
|
||||||
];
|
];
|
||||||
$temporary_array[$gv][$value[0]][$value[1]]['list'][$value[3]]['content'] = $rule_c;
|
$temporary_array[$gv][$value[0]][$value[1]]['list'][$value[3]]['content'] = $rule_c;
|
||||||
|
|
@ -289,6 +290,7 @@ class Estimate extends Base{
|
||||||
'proportion'=>$value[10],
|
'proportion'=>$value[10],
|
||||||
'value'=>$value[11],
|
'value'=>$value[11],
|
||||||
'type'=>$value[12],
|
'type'=>$value[12],
|
||||||
|
'describe'=>$value[13],
|
||||||
'score'=>$value[2],
|
'score'=>$value[2],
|
||||||
];
|
];
|
||||||
$temporary_array[$gv][$value[0]][$value[1]]['list'][$value[3]]['content'] = $rule_c;
|
$temporary_array[$gv][$value[0]][$value[1]]['list'][$value[3]]['content'] = $rule_c;
|
||||||
|
|
@ -309,6 +311,7 @@ class Estimate extends Base{
|
||||||
'proportion'=>$value[10],
|
'proportion'=>$value[10],
|
||||||
'value'=>$value[11],
|
'value'=>$value[11],
|
||||||
'type'=>$value[12],
|
'type'=>$value[12],
|
||||||
|
'describe'=>$value[13],
|
||||||
'score'=>$value[2],
|
'score'=>$value[2],
|
||||||
];
|
];
|
||||||
$temporary_array[$gv][$value[0]][$value[1]]['list'][$value[3]]['content'] = $rule_c;
|
$temporary_array[$gv][$value[0]][$value[1]]['list'][$value[3]]['content'] = $rule_c;
|
||||||
|
|
@ -329,6 +332,7 @@ class Estimate extends Base{
|
||||||
'proportion'=>$value[10],
|
'proportion'=>$value[10],
|
||||||
'value'=>$value[11],
|
'value'=>$value[11],
|
||||||
'type'=>$value[12],
|
'type'=>$value[12],
|
||||||
|
'describe'=>$value[13],
|
||||||
'score'=>$value[2],
|
'score'=>$value[2],
|
||||||
];
|
];
|
||||||
$temporary_array[$gv][$value[0]][$value[1]]['list'][$value[3]]['content'] = $rule_c;
|
$temporary_array[$gv][$value[0]][$value[1]]['list'][$value[3]]['content'] = $rule_c;
|
||||||
|
|
|
||||||
|
|
@ -279,7 +279,7 @@
|
||||||
console.log(data)
|
console.log(data)
|
||||||
load()
|
load()
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "member_list", //请求的url地址s
|
url: "index", //请求的url地址s
|
||||||
dataType: "json", //返回格式为json
|
dataType: "json", //返回格式为json
|
||||||
async: true,//请求是否异步,默认为异步,这也是ajax重要特性
|
async: true,//请求是否异步,默认为异步,这也是ajax重要特性
|
||||||
data: data, //参数值
|
data: data, //参数值
|
||||||
|
|
@ -292,22 +292,21 @@
|
||||||
var str,str_s,str_c,str_all="";
|
var str,str_s,str_c,str_all="";
|
||||||
|
|
||||||
for (let i = 0; i < req['data']['data'].length; i++) {
|
for (let i = 0; i < req['data']['data'].length; i++) {
|
||||||
if(req['data']['data'][i]['is_del'] == 1){
|
// if(req['data']['data'][i]['is_del'] == 1){
|
||||||
str = '<span onclick="member_stop(this,\''+req['data']['data'][i]['id']+'\')" class="layui-btn layui-btn-normal layui-btn-mini layui-btn-disabled" title="停用">已停用</span>'
|
// str = '<span onclick="member_stop(this,\''+req['data']['data'][i]['id']+'\')" class="layui-btn layui-btn-normal layui-btn-mini layui-btn-disabled" title="停用">已停用</span>'
|
||||||
}else{
|
// }else{
|
||||||
str = '<span onclick="member_stop(this,\''+ req['data']['data'][i]['id'] +'\')" class="layui-btn layui-btn-normal layui-btn-mini" title="启用">已启用</span>'
|
// str = '<span onclick="member_stop(this,\''+ req['data']['data'][i]['id'] +'\')" class="layui-btn layui-btn-normal layui-btn-mini" title="启用">已启用</span>'
|
||||||
}
|
// }
|
||||||
str_c = "<tr>"+
|
str_c = "<tr>"+
|
||||||
'<td><input type="checkbox" name="id" value="'+req['data']['data'][i]['id']+'" lay-skin="primary"></td>'+
|
'<td>'+ req['data']['data'][i]['id'] +'</td>'+
|
||||||
'<td>'+req['data']['data'][i]['id']+'</td>'+
|
'<td>'+req['data']['data'][i]['province']+'-'+req['data']['data'][i]['city']+'</td>'+
|
||||||
'<td>'+req['data']['data'][i]['token']+'</td>'+
|
'<td>'+ req['data']['data'][i]['create_time'] +'</td>'+
|
||||||
'<td>'+req['data']['data'][i]['tel']+'</td>'+
|
'<td>'+ req['data']['data'][i]['update_time'] +'</td>'+
|
||||||
'<td>'+req['data']['data'][i]['email']+'</td>'+
|
'<td>'+
|
||||||
'<td>'+req['data']['data'][i]['create_time']+'</td>'+
|
'<button class="layui-btn" onclick="xadmin.open(\'查看\',\'/estimate/estimate_content_observe?id='+ req['data']['data'][i]['id'] +'\',\'100%\',\'100%\')">查看</button>'+
|
||||||
'<td class="td-status">'+
|
'<button class="layui-btn" onclick="xadmin.open(\'修改\',\'/estimate/estimate_edit?id='+ req['data']['data'][i]['id'] +'\',\'50%\',\'70%\')">修改</button>'+
|
||||||
str+
|
"</td>"+
|
||||||
'</td>'
|
"</tr>"
|
||||||
'</tr>'
|
|
||||||
str_all = str_all+str_c;
|
str_all = str_all+str_c;
|
||||||
}
|
}
|
||||||
$('#content').html(str_all);
|
$('#content').html(str_all);
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ class Base extends Controller{
|
||||||
'10007'=>'',
|
'10007'=>'',
|
||||||
'10008'=>'',
|
'10008'=>'',
|
||||||
'10009'=>'',
|
'10009'=>'',
|
||||||
'10010'=>'',
|
'10010'=>'自定义信息',
|
||||||
'20001'=>'登录失效',
|
'20001'=>'登录失效',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
@ -164,7 +164,9 @@ class Base extends Controller{
|
||||||
// 将剩余天数转换为小数月份(假设一个月为30天,进行近似计算)
|
// 将剩余天数转换为小数月份(假设一个月为30天,进行近似计算)
|
||||||
$partialMonth = $remainingDays / 30;
|
$partialMonth = $remainingDays / 30;
|
||||||
// 结果精确到小数点后两位
|
// 结果精确到小数点后两位
|
||||||
$ageInMonthsPrecise = round($ageInMonths + $partialMonth, 2);
|
// $ageInMonthsPrecise = round($ageInMonths + $partialMonth, 2);
|
||||||
|
// 整月+剩余月取整
|
||||||
|
$ageInMonthsPrecise = intval($ageInMonths + $partialMonth);
|
||||||
return $ageInMonthsPrecise;
|
return $ageInMonthsPrecise;
|
||||||
}
|
}
|
||||||
// 曲线页面-底部统计动作
|
// 曲线页面-底部统计动作
|
||||||
|
|
@ -383,11 +385,27 @@ class Base extends Controller{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public function ceshiyong(){
|
public function ceshiyong(){
|
||||||
$result = Db::query("select * from app_card_data");
|
$aa = 15;
|
||||||
dump($result);
|
$a = 1;
|
||||||
$result2 = Db::table('app_card_data')->select();
|
for ($i=0; $i < 100; $i++) {
|
||||||
dump($result2);
|
dump($aa.'======='.$aa/15*100);
|
||||||
|
$aa = $aa - $a;
|
||||||
|
if($aa < 5){
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// $aa = 15;
|
||||||
|
// $a = 1;
|
||||||
|
// for ($i=0; $i < 100; $i++) {
|
||||||
|
// dump($aa.'======='.$aa/17.5*100);
|
||||||
|
// $aa = $aa - $a;
|
||||||
|
// if($aa < 1){
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,38 +20,38 @@ class Card extends Base{
|
||||||
protected $unit_name = ['score'=>'身体得分','height'=>'身高','weight'=>'体重','bmi'=>'BMI','fat_r'=>'脂肪率','fat_w'=>'脂肪量','muscle'=>'肌肉率','muscleval'=>'肌肉量','water'=>'水分','bone'=>'骨重','protein'=>'蛋白率','proteinval'=>'蛋白量','kcal'=>'基础代谢','visceral'=>'内脏指数','sfr'=>'皮下脂肪','body_level'=>'肥胖等级','body_type'=>'身体类型'];
|
protected $unit_name = ['score'=>'身体得分','height'=>'身高','weight'=>'体重','bmi'=>'BMI','fat_r'=>'脂肪率','fat_w'=>'脂肪量','muscle'=>'肌肉率','muscleval'=>'肌肉量','water'=>'水分','bone'=>'骨重','protein'=>'蛋白率','proteinval'=>'蛋白量','kcal'=>'基础代谢','visceral'=>'内脏指数','sfr'=>'皮下脂肪','body_level'=>'肥胖等级','body_type'=>'身体类型'];
|
||||||
protected $bhw_list = [
|
protected $bhw_list = [
|
||||||
'bmi'=>[
|
'bmi'=>[
|
||||||
['min_val'=>'0','max_val'=>'','text'=>'消瘦','color'=>'#FF5656'],
|
['min_val'=>'0','max_val'=>'','text'=>'消瘦','color'=>'#FDDA6B'],
|
||||||
['min_val'=>'','max_val'=>'','text'=>'正常','color'=>'#FFAB00'],
|
['min_val'=>'','max_val'=>'','text'=>'正常','color'=>'#59D06A'],
|
||||||
['min_val'=>'','max_val'=>'','text'=>'偏重','color'=>'#5AD06D'],
|
['min_val'=>'','max_val'=>'','text'=>'偏重','color'=>'#FDAA02'],
|
||||||
['min_val'=>'','max_val'=>'50','text'=>'肥胖','color'=>'#6492F6'],
|
['min_val'=>'','max_val'=>'50','text'=>'肥胖','color'=>'#FB5755'],
|
||||||
],
|
],
|
||||||
'height'=>[
|
'height'=>[
|
||||||
['min_val'=>'0','max_val'=>'','text'=>'矮','color'=>'#ff5656'],
|
['min_val'=>'0','max_val'=>'','text'=>'矮','color'=>'#FD5759'],
|
||||||
['min_val'=>'','max_val'=>'','text'=>'偏矮','color'=>'#ffab00'],
|
['min_val'=>'','max_val'=>'','text'=>'偏矮','color'=>'#FAAD01'],
|
||||||
['min_val'=>'','max_val'=>'','text'=>'标准','color'=>'#5AD06D'],
|
['min_val'=>'','max_val'=>'','text'=>'标准','color'=>'#5BD068'],
|
||||||
['min_val'=>'','max_val'=>'','text'=>'偏高','color'=>'#6492f6'],
|
['min_val'=>'','max_val'=>'','text'=>'偏高','color'=>'#6793F4'],
|
||||||
['min_val'=>'','max_val'=>'','text'=>'高','color'=>'#3967d6'],
|
['min_val'=>'','max_val'=>'','text'=>'高','color'=>'#3D67D3'],
|
||||||
],
|
],
|
||||||
'weight'=>[
|
'weight'=>[
|
||||||
['min_val'=>'0','max_val'=>'','text'=>'低','color'=>'#ff5656'],
|
['min_val'=>'0','max_val'=>'','text'=>'低','color'=>'#F8595D'],
|
||||||
['min_val'=>'','max_val'=>'','text'=>'偏低','color'=>'#ffab00'],
|
['min_val'=>'','max_val'=>'','text'=>'偏低','color'=>'#FFAF04'],
|
||||||
['min_val'=>'','max_val'=>'','text'=>'标准','color'=>'#5AD06D'],
|
['min_val'=>'','max_val'=>'','text'=>'标准','color'=>'#59D168'],
|
||||||
['min_val'=>'','max_val'=>'','text'=>'偏高','color'=>'#6492F6'],
|
['min_val'=>'','max_val'=>'','text'=>'偏高','color'=>'#FFAF04'],
|
||||||
['min_val'=>'','max_val'=>'','text'=>'高','color'=>'#3967D6'],
|
['min_val'=>'','max_val'=>'','text'=>'高','color'=>'#F8595D'],
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
protected $standard_color = [
|
protected $standard_color = [
|
||||||
'fat_r'=>['偏低'=>'#FF5656','标准'=>'#FFAB00','偏高'=>'#5AD06D','高'=>'#6492F6'],
|
'fat_r'=>['偏低'=>'#FCDB67','标准'=>'#58D268','偏高'=>'#FCAA00','高'=>'#FD5752'],
|
||||||
'fat_w'=>['偏低'=>'#FF5656','标准'=>'#FFAB00','偏高'=>'#5AD06D','高'=>'#6492F6'],
|
'fat_w'=>['偏低'=>'#FCDB67','标准'=>'#58D268','偏高'=>'#FCAA00','高'=>'#FD5752'],
|
||||||
'muscle'=>['不足'=>'#FF5656','标准'=>'#FFAB00','优'=>'#5AD06D'],
|
'muscle'=>['不足'=>'#FFDA68','标准'=>'#59CD6F','优'=>'#3C64D4'],
|
||||||
'muscleval'=>['不足'=>'#FF5656','标准'=>'#FFAB00','优'=>'#5AD06D'],
|
'muscleval'=>['不足'=>'#FFDA68','标准'=>'#59CD6F','优'=>'#3C64D4'],
|
||||||
'water'=>['不足'=>'#FF5656','标准'=>'#FFAB00','优'=>'#5AD06D'],
|
'water'=>['不足'=>'#FED966','标准'=>'#58CF6B','优'=>'#3A68D7'],
|
||||||
'proteinval'=>['不足'=>'#FF5656','标准'=>'#FFAB00','优'=>'#5AD06D'],
|
'proteinval'=>['不足'=>'#FED966','标准'=>'#58CF6B','优'=>'#3A68D7'],
|
||||||
'bone'=>['不足'=>'#FF5656','标准'=>'#FFAB00','优'=>'#5AD06D'],
|
'bone'=>['不足'=>'#FED966','标准'=>'#58CF6B','优'=>'#3A68D7'],
|
||||||
'protein'=>['不足'=>'#FF5656','标准'=>'#FFAB00','优'=>'#5AD06D'],
|
'protein'=>['不足'=>'#FED966','标准'=>'#58CF6B','优'=>'#3A68D7'],
|
||||||
'kcal'=>['偏低'=>'#FF5656','优'=>'#5ad06d'],
|
'kcal'=>['偏低'=>'#FF5656','优'=>'#5ad06d'],
|
||||||
'visceral'=>['标准'=>'#5AD06D','警惕'=>'#6492F6','危险'=>'#3967D6'],
|
'visceral'=>['标准'=>'#55CF6C','警惕'=>'#FEAC00','危险'=>'#FB5A52'],
|
||||||
'sfr'=>['不足'=>'#FF5656','标准'=>'#FFAB00','偏高'=>'#5AD06D'],
|
'sfr'=>['不足'=>'#FCDB68','标准'=>'#59D16F','偏高'=>'#FEAB03'],
|
||||||
];
|
];
|
||||||
protected $result_end_data_mould = [
|
protected $result_end_data_mould = [
|
||||||
'name'=>'',
|
'name'=>'',
|
||||||
|
|
@ -61,6 +61,7 @@ class Card extends Base{
|
||||||
'color'=>'',
|
'color'=>'',
|
||||||
'list'=>[]
|
'list'=>[]
|
||||||
];
|
];
|
||||||
|
// 曲线参数
|
||||||
protected $card_body_curve_arr = ['height','weight','bmi','fat_r'];
|
protected $card_body_curve_arr = ['height','weight','bmi','fat_r'];
|
||||||
protected $card_body_curve_arr2 = ['身高','体重','BMI','脂肪率',];
|
protected $card_body_curve_arr2 = ['身高','体重','BMI','脂肪率',];
|
||||||
protected $card_body_curve_arr3 = ['#f7b03e','#fb7b92','#ff9f40','#3fcba7',];
|
protected $card_body_curve_arr3 = ['#f7b03e','#fb7b92','#ff9f40','#3fcba7',];
|
||||||
|
|
@ -299,7 +300,7 @@ class Card extends Base{
|
||||||
public function processing_return_data_new($data){
|
public function processing_return_data_new($data){
|
||||||
// dump($data);
|
// dump($data);
|
||||||
$result_end_data = [];
|
$result_end_data = [];
|
||||||
$month_num = $this->calculateAgeInMonthsWithPrecision($data['birthday'])*100;
|
$month_num = $this->calculateAgeInMonthsWithPrecision($data['birthday']);
|
||||||
$gender_val = $data['gender'];
|
$gender_val = $data['gender'];
|
||||||
foreach ($data as $key => $value) {
|
foreach ($data as $key => $value) {
|
||||||
if($key != 'aud_id' && $key != 'id' && $key != 'create_time' && $key != 'last_update_time' && $key != 'acd_id' && $key != 'ROW_NUMBER' && $key != 'record_time' && $key != 'gender' && $key != 'birthday'){
|
if($key != 'aud_id' && $key != 'id' && $key != 'create_time' && $key != 'last_update_time' && $key != 'acd_id' && $key != 'ROW_NUMBER' && $key != 'record_time' && $key != 'gender' && $key != 'birthday'){
|
||||||
|
|
@ -325,7 +326,7 @@ class Card extends Base{
|
||||||
$result_end_data[$key]['list'] = $this->bhw_list[$key];
|
$result_end_data[$key]['list'] = $this->bhw_list[$key];
|
||||||
if($key == 'bmi'){
|
if($key == 'bmi'){
|
||||||
// dump($month_num);
|
// dump($month_num);
|
||||||
$bhw_date = Db::table('pc_bmistand2')->where("month >= $month_num and sex = '$gender_val'")->order('month')->limit(1)->select();
|
$bhw_date = Db::table('pc_bmistand')->where("Month <= $month_num and Sex = '$gender_val'")->order('Month desc')->limit(1)->select();
|
||||||
// dump($bhw_date);
|
// dump($bhw_date);
|
||||||
if($bhw_date){
|
if($bhw_date){
|
||||||
$result_end_data[$key]['list'][0]['max_val'] = $bhw_date[0]['f1sd'];
|
$result_end_data[$key]['list'][0]['max_val'] = $bhw_date[0]['f1sd'];
|
||||||
|
|
@ -336,7 +337,7 @@ class Card extends Base{
|
||||||
$result_end_data[$key]['list'][3]['min_val'] = $bhw_date[0]['z2sd'];
|
$result_end_data[$key]['list'][3]['min_val'] = $bhw_date[0]['z2sd'];
|
||||||
}
|
}
|
||||||
}else if($key == 'height'){
|
}else if($key == 'height'){
|
||||||
$bhw_date = Db::table('pc_heightstand2')->where("month >= $month_num and sex = '$gender_val'")->order('month')->limit(1)->select();
|
$bhw_date = Db::table('pc_heightstand')->where("Month <= $month_num and Sex = '$gender_val'")->order('Month desc')->limit(1)->select();
|
||||||
if($bhw_date){
|
if($bhw_date){
|
||||||
$result_end_data[$key]['list'][0]['max_val'] = $bhw_date[0]['f2sd'];
|
$result_end_data[$key]['list'][0]['max_val'] = $bhw_date[0]['f2sd'];
|
||||||
$result_end_data[$key]['list'][1]['min_val'] = $bhw_date[0]['f2sd'];
|
$result_end_data[$key]['list'][1]['min_val'] = $bhw_date[0]['f2sd'];
|
||||||
|
|
@ -349,7 +350,7 @@ class Card extends Base{
|
||||||
$result_end_data[$key]['list'][4]['max_val'] = $bhw_date[0]['z3sd'];
|
$result_end_data[$key]['list'][4]['max_val'] = $bhw_date[0]['z3sd'];
|
||||||
}
|
}
|
||||||
}else if($key == 'weight'){
|
}else if($key == 'weight'){
|
||||||
$bhw_date = Db::table('pc_weightstand2')->where("month >= $month_num and sex = '$gender_val'")->order('month')->limit(1)->select();
|
$bhw_date = Db::table('pc_weightstand')->where("Month <= $month_num and Sex = '$gender_val'")->order('Month desc')->limit(1)->select();
|
||||||
// dump($value);
|
// dump($value);
|
||||||
// dump($bhw_date);/
|
// dump($bhw_date);/
|
||||||
if($bhw_date){
|
if($bhw_date){
|
||||||
|
|
@ -604,14 +605,14 @@ class Card extends Base{
|
||||||
public function hwb_standard($data){
|
public function hwb_standard($data){
|
||||||
|
|
||||||
$linshi_data = [];
|
$linshi_data = [];
|
||||||
$month_num = $this->calculateAgeInMonthsWithPrecision($data['birthday'])*100;
|
$month_num = $this->calculateAgeInMonthsWithPrecision($data['birthday']);
|
||||||
// dump($month_num);
|
// dump($month_num);
|
||||||
$gender_val = $data['gender'];
|
$gender_val = $data['gender'];
|
||||||
if($data['age'] < $this->age_limit){
|
if($data['age'] < $this->age_limit){
|
||||||
foreach ($data as $key => $value) {
|
foreach ($data as $key => $value) {
|
||||||
if($key =='身高'){
|
if($key =='身高'){
|
||||||
$linshi_data['身高'] = $this->bhw_list['height'];
|
$linshi_data['身高'] = $this->bhw_list['height'];
|
||||||
$bhw_date = Db::table('pc_heightstand2')->where("month >= $month_num and sex = '$gender_val'")->order('month')->limit(1)->select();
|
$bhw_date = Db::table('pc_heightstand2')->where("Month <= $month_num and Sex = '$gender_val'")->order('Month desc')->limit(1)->select();
|
||||||
if($bhw_date){
|
if($bhw_date){
|
||||||
$linshi_data['身高'][0]['max_val'] = $bhw_date[0]['f2sd'];
|
$linshi_data['身高'][0]['max_val'] = $bhw_date[0]['f2sd'];
|
||||||
$linshi_data['身高'][1]['min_val'] = $bhw_date[0]['f2sd'];
|
$linshi_data['身高'][1]['min_val'] = $bhw_date[0]['f2sd'];
|
||||||
|
|
@ -625,7 +626,7 @@ class Card extends Base{
|
||||||
}
|
}
|
||||||
}else if($key =='体重'){
|
}else if($key =='体重'){
|
||||||
$linshi_data['体重'] = $this->bhw_list['weight'];
|
$linshi_data['体重'] = $this->bhw_list['weight'];
|
||||||
$bhw_date = Db::table('pc_weightstand2')->where("month >= $month_num and sex = '$gender_val'")->order('month')->limit(1)->select();
|
$bhw_date = Db::table('pc_weightstand2')->where("Month <= $month_num and Sex = '$gender_val'")->order('Month desc')->limit(1)->select();
|
||||||
if($bhw_date){
|
if($bhw_date){
|
||||||
$linshi_data['体重'][0]['max_val'] = $bhw_date[0]['f2sd'];
|
$linshi_data['体重'][0]['max_val'] = $bhw_date[0]['f2sd'];
|
||||||
$linshi_data['体重'][1]['min_val'] = $bhw_date[0]['f2sd'];
|
$linshi_data['体重'][1]['min_val'] = $bhw_date[0]['f2sd'];
|
||||||
|
|
@ -639,7 +640,7 @@ class Card extends Base{
|
||||||
}
|
}
|
||||||
}else if($key =='BMI'){
|
}else if($key =='BMI'){
|
||||||
$linshi_data['BMI'] = $this->bhw_list['bmi'];
|
$linshi_data['BMI'] = $this->bhw_list['bmi'];
|
||||||
$bhw_date = Db::table('pc_bmistand2')->where("month >= $month_num and sex = '$gender_val'")->order('month')->limit(1)->select();
|
$bhw_date = Db::table('pc_bmistand2')->where("Month <= $month_num and Sex = '$gender_val'")->order('Month desc')->limit(1)->select();
|
||||||
// dump($bhw_date);
|
// dump($bhw_date);
|
||||||
if($bhw_date){
|
if($bhw_date){
|
||||||
$linshi_data['BMI'][0]['max_val'] = $bhw_date[0]['f1sd'];
|
$linshi_data['BMI'][0]['max_val'] = $bhw_date[0]['f1sd'];
|
||||||
|
|
|
||||||
|
|
@ -629,7 +629,7 @@ class Sportstesting extends Base{
|
||||||
return $this->sportstesting_get_region_list_action($data);
|
return $this->sportstesting_get_region_list_action($data);
|
||||||
}
|
}
|
||||||
// 获取估分最后一次数据
|
// 获取估分最后一次数据
|
||||||
public function sportstesting_get_last_data($data = ['aud_id'=>'61','token'=>'0dafb98a10995c98b5a33b7d59d986ca']){
|
public function sportstesting_get_last_data($data = ['aud_id'=>'83','token'=>'0dafb98a10995c98b5a33b7d59d986ca']){
|
||||||
if(count(input('post.')) > 0){
|
if(count(input('post.')) > 0){
|
||||||
$data = input('post.');
|
$data = input('post.');
|
||||||
}
|
}
|
||||||
|
|
@ -644,19 +644,40 @@ class Sportstesting extends Base{
|
||||||
return $this->sportstesting_get_last_data_action($data);
|
return $this->sportstesting_get_last_data_action($data);
|
||||||
}
|
}
|
||||||
// 计算并存储数据
|
// 计算并存储数据
|
||||||
public function sportstesting_set_once_data($data = ['aud_id'=>'83','parameter_data'=>'北京,北京','result_data'=>'','gender'=>'1','token'=>'caadd1be045a65f30b92aa805f1de54a']){
|
public function sportstesting_set_once_data($data = ['aud_id'=>'83','parameter_data'=>'辽宁,沈阳市','result_data'=>'','gender'=>'1','token'=>'caadd1be045a65f30b92aa805f1de54a']){
|
||||||
|
// $data = json_decode(cache('sportstesting_set_once_data'),true);
|
||||||
|
// dump($data);
|
||||||
|
|
||||||
|
// die;
|
||||||
|
// return $this->dayin_data('sportstesting_set_once_data');
|
||||||
if(count(input('post.')) > 0){
|
if(count(input('post.')) > 0){
|
||||||
$data = input('post.');
|
$data = input('post.');
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!array_key_exists('aud_id', $data) || !array_key_exists('parameter_data', $data) || !array_key_exists('result_data', $data) || !array_key_exists('gender', $data) || !array_key_exists('token', $data)){
|
if(!array_key_exists('aud_id', $data) || !array_key_exists('parameter_data', $data) || !array_key_exists('result_data', $data) || !array_key_exists('gender', $data) || !array_key_exists('token', $data)){
|
||||||
return $this->msg(10001);
|
return $this->msg(10001);
|
||||||
}
|
}
|
||||||
|
if(is_array($data['result_data']) && !empty($data['result_data'])){
|
||||||
|
// 是个数组且不为空数组
|
||||||
|
foreach ($data['result_data'] as $key => $value) {
|
||||||
|
foreach ($value['list'] as $k => $v) {
|
||||||
|
if(count($v['list']) <= 0){
|
||||||
|
return $this->msg(10010,$v['name'].'内并未选择内容');
|
||||||
|
}
|
||||||
|
if($v['is_choice'] >= 0 && count($v['list']) < $v['is_choice']){
|
||||||
|
return $this->msg(10010,$v['name'].'内并缺少选项,请选择'.$v['is_choice'].'个选项');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if($this->token_time_validate($data['token']) === false){
|
if($this->token_time_validate($data['token']) === false){
|
||||||
return $this->msg(20001);
|
return $this->msg(20001);
|
||||||
}
|
}
|
||||||
// cache('sportstesting_set_once_data',json_encode($data));
|
cache('sportstesting_set_once_data',json_encode($data));
|
||||||
// return $this->msg($data);
|
// return $this->msg($data);
|
||||||
unset($data['token']);
|
unset($data['token']);
|
||||||
|
// return $this->msg($data);
|
||||||
|
|
||||||
return $this->sportstesting_set_once_data_action2($data);
|
return $this->sportstesting_set_once_data_action2($data);
|
||||||
// return $this->sportstesting_set_once_data_action($data);
|
// return $this->sportstesting_set_once_data_action($data);
|
||||||
|
|
@ -715,16 +736,20 @@ class Sportstesting extends Base{
|
||||||
|
|
||||||
$parameter_data = explode(',',$data['address']);
|
$parameter_data = explode(',',$data['address']);
|
||||||
$gender = $data['gender'];
|
$gender = $data['gender'];
|
||||||
if(count($parameter_data) == 1){
|
// 精准查询地市规则start
|
||||||
|
// if(count($parameter_data) == 1){
|
||||||
|
// $db_condition = "province = '".$parameter_data[0]."'";
|
||||||
|
// }else if(count($parameter_data) == 2){
|
||||||
|
// $db_condition = "province = '".$parameter_data[0]."' and city = '".$parameter_data[1]."'";
|
||||||
|
// }else if(count($parameter_data) == 3){
|
||||||
|
// $db_condition = "province = ".$parameter_data[0]."' and city = '".$parameter_data[1]."' and area = '".$parameter_data[2]."'";
|
||||||
|
// }else{
|
||||||
|
// return $this->msg(10005);
|
||||||
|
// }
|
||||||
|
// 精准查询地市规则end
|
||||||
|
// 全省地市一个规则start
|
||||||
$db_condition = "province = '".$parameter_data[0]."'";
|
$db_condition = "province = '".$parameter_data[0]."'";
|
||||||
}else if(count($parameter_data) == 2){
|
// 全省地市一个规则end
|
||||||
$db_condition = "province = '".$parameter_data[0]."' and city = '".$parameter_data[1]."'";
|
|
||||||
}else if(count($parameter_data) == 3){
|
|
||||||
$db_condition = "province = ".$parameter_data[0]."' and city = '".$parameter_data[1]."' and area = '".$parameter_data[2]."'";
|
|
||||||
}else{
|
|
||||||
return $this->msg(10005);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$data = Db::table('admin_estimate')->where($db_condition)->find();
|
$data = Db::table('admin_estimate')->where($db_condition)->find();
|
||||||
$data = json_decode($data['content'],true);
|
$data = json_decode($data['content'],true);
|
||||||
|
|
@ -740,17 +765,21 @@ class Sportstesting extends Base{
|
||||||
|
|
||||||
$parameter_data = explode(',',$data['parameter_data']);
|
$parameter_data = explode(',',$data['parameter_data']);
|
||||||
$gender = $data['gender'];
|
$gender = $data['gender'];
|
||||||
if(count($parameter_data) == 1){
|
// 精准查询地市规则start
|
||||||
|
// if(count($parameter_data) == 1){
|
||||||
|
// $db_condition = "province = '".$parameter_data[0]."'";
|
||||||
|
// }else if(count($parameter_data) == 2){
|
||||||
|
// $db_condition = "province = '".$parameter_data[0]."' and city = '".$parameter_data[1]."'";
|
||||||
|
// }else if(count($parameter_data) == 3){
|
||||||
|
// $db_condition = "province = ".$parameter_data[0]."' and city = '".$parameter_data[1]."' and area = '".$parameter_data[2]."'";
|
||||||
|
// }else{
|
||||||
|
// return $this->msg(10005);
|
||||||
|
// }
|
||||||
|
// 精准查询地市规则end
|
||||||
|
// 全省地市一个规则start
|
||||||
$db_condition = "province = '".$parameter_data[0]."'";
|
$db_condition = "province = '".$parameter_data[0]."'";
|
||||||
}else if(count($parameter_data) == 2){
|
// 全省地市一个规则end
|
||||||
$db_condition = "province = '".$parameter_data[0]."' and city = '".$parameter_data[1]."'";
|
|
||||||
}else if(count($parameter_data) == 3){
|
|
||||||
$db_condition = "province = ".$parameter_data[0]."' and city = '".$parameter_data[1]."' and area = '".$parameter_data[2]."'";
|
|
||||||
}else{
|
|
||||||
return $this->msg(10005);
|
|
||||||
}
|
|
||||||
// dump($db_condition);
|
|
||||||
// die;
|
|
||||||
$result['list'] = [];
|
$result['list'] = [];
|
||||||
$result['total_score'] = 0;
|
$result['total_score'] = 0;
|
||||||
$data = Db::table('admin_estimate')->where($db_condition)->select();
|
$data = Db::table('admin_estimate')->where($db_condition)->select();
|
||||||
|
|
@ -778,8 +807,10 @@ class Sportstesting extends Base{
|
||||||
if($user_data){
|
if($user_data){
|
||||||
$address = explode(',',$user_data['address']);
|
$address = explode(',',$user_data['address']);
|
||||||
$temporary_data = json_decode($user_data['content'],true);
|
$temporary_data = json_decode($user_data['content'],true);
|
||||||
|
|
||||||
$result['list'] = $temporary_data;
|
$result['list'] = $temporary_data;
|
||||||
$result['total_score'] = $user_data['score'];
|
$result['total_score'] = $user_data['score'];
|
||||||
|
$result['max_score'] = $user_data['max_score'];
|
||||||
$result['province'] = count($address)>=1?$address[0]:'';
|
$result['province'] = count($address)>=1?$address[0]:'';
|
||||||
$result['city'] = count($address)>=2?$address[1]:'';
|
$result['city'] = count($address)>=2?$address[1]:'';
|
||||||
$result['area'] = count($address)>=3?$address[2]:'';
|
$result['area'] = count($address)>=3?$address[2]:'';
|
||||||
|
|
@ -830,6 +861,7 @@ class Sportstesting extends Base{
|
||||||
'id'=>$value['id'],
|
'id'=>$value['id'],
|
||||||
'create_time'=>$value['create_time'],
|
'create_time'=>$value['create_time'],
|
||||||
'score'=>$value['score'],
|
'score'=>$value['score'],
|
||||||
|
'max_score'=>$value['max_score'],
|
||||||
'address'=>$value['address'],
|
'address'=>$value['address'],
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
@ -851,12 +883,13 @@ class Sportstesting extends Base{
|
||||||
array_unshift($temporary_data['list'][$key]['list'][$v1k]['list'],[
|
array_unshift($temporary_data['list'][$key]['list'][$v1k]['list'],[
|
||||||
'name'=>'项目名',
|
'name'=>'项目名',
|
||||||
'value'=>'成绩',
|
'value'=>'成绩',
|
||||||
'score'=>'分值',
|
'total_score'=>'满分',
|
||||||
'proportion_value'=>'得分',
|
'proportion_value'=>'得分',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$temporary_data['score'] = $user_data['score'];
|
$temporary_data['score'] = $user_data['score'];
|
||||||
|
$temporary_data['max_score'] = $user_data['max_score'];
|
||||||
$temporary_data['address'] = $user_data['address'];
|
$temporary_data['address'] = $user_data['address'];
|
||||||
$temporary_data['create_time'] = $user_data['create_time'];
|
$temporary_data['create_time'] = $user_data['create_time'];
|
||||||
return $this->msg($temporary_data);
|
return $this->msg($temporary_data);
|
||||||
|
|
@ -864,7 +897,11 @@ class Sportstesting extends Base{
|
||||||
return $this->msg(10004);
|
return $this->msg(10004);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
################################################sportstesting_set_once_data
|
||||||
public function sportstesting_set_once_data_action2($data){
|
public function sportstesting_set_once_data_action2($data){
|
||||||
|
// $ceshi = [
|
||||||
|
|
||||||
|
// ];
|
||||||
$return_result['total_score'] = 0;
|
$return_result['total_score'] = 0;
|
||||||
$return_result['max_score'] = 0;
|
$return_result['max_score'] = 0;
|
||||||
|
|
||||||
|
|
@ -883,11 +920,11 @@ class Sportstesting extends Base{
|
||||||
$find_data = json_decode($find_data['content'],true);
|
$find_data = json_decode($find_data['content'],true);
|
||||||
$recognition_rule = $find_data[$gender];
|
$recognition_rule = $find_data[$gender];
|
||||||
// dump($recognition_rule);
|
// dump($recognition_rule);
|
||||||
// 测试用删掉s
|
// // 测试用删掉s
|
||||||
$data['result_data'] = $this->handle_default_rule_list2($find_data,$gender);
|
// $data['result_data'] = $this->handle_default_rule_list2($find_data,$gender);
|
||||||
// 测试用删掉e
|
// // 测试用删掉e
|
||||||
// dump($data);
|
// dump($data);
|
||||||
// return $this->msg($data);
|
// return $this->msg(10010);
|
||||||
foreach ($data['result_data'] as $key => $value) {
|
foreach ($data['result_data'] as $key => $value) {
|
||||||
// 遍历一级($value['key'] = 现场考试)
|
// 遍历一级($value['key'] = 现场考试)
|
||||||
// dump($value);
|
// dump($value);
|
||||||
|
|
@ -898,17 +935,19 @@ class Sportstesting extends Base{
|
||||||
// 遍历二级级($v3['name'] = 1000米跑)
|
// 遍历二级级($v3['name'] = 1000米跑)
|
||||||
$temporary_result = $this->obtaining_grades($recognition_rule[$value['key']][$v2['key']]['list'][$v3['name']]['content'],$v3);
|
$temporary_result = $this->obtaining_grades($recognition_rule[$value['key']][$v2['key']]['list'][$v3['name']]['content'],$v3);
|
||||||
$data['result_data'][$key]['list'][$k2]['list'][$k3] = $temporary_result;
|
$data['result_data'][$key]['list'][$k2]['list'][$k3] = $temporary_result;
|
||||||
|
// $data['result_data'][$key]['list'][$k2]['list'][$k3]['name'] = $temporary_result['name']."(该项满分:".$temporary_result['total_score'].")";
|
||||||
$return_result['total_score'] = bcadd($return_result['total_score'],$temporary_result['proportion_value'],2);
|
$return_result['total_score'] = bcadd($return_result['total_score'],$temporary_result['proportion_value'],2);
|
||||||
$return_result['max_score'] = bcadd($return_result['max_score'],bcmul($v3['total_score'],$v3['proportion'],2),2);
|
$return_result['max_score'] = bcadd($return_result['max_score'],bcmul($v3['total_score'],$v3['proportion'],2),2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// return $this->msg(999);
|
||||||
$return_result['list'] = $data['result_data'];
|
$return_result['list'] = $data['result_data'];
|
||||||
$user_sportstesting_set = Db::table('app_sportstesting_data')->insert([
|
$user_sportstesting_set = Db::table('app_sportstesting_data')->insert([
|
||||||
'aud_id'=>$data['aud_id'],
|
'aud_id'=>$data['aud_id'],
|
||||||
'content'=>json_encode($return_result['list']),
|
'content'=>json_encode($return_result['list']),
|
||||||
'score'=>$return_result['total_score'],
|
'score'=>$return_result['total_score'],
|
||||||
|
'max_score'=>$return_result['max_score'],
|
||||||
'create_time'=>date('Y-m-d H:i:s'),
|
'create_time'=>date('Y-m-d H:i:s'),
|
||||||
'address'=>$data['parameter_data'],
|
'address'=>$data['parameter_data'],
|
||||||
]);
|
]);
|
||||||
|
|
@ -919,7 +958,7 @@ class Sportstesting extends Base{
|
||||||
array_unshift($return_result['list'][$key]['list'][$v1k]['list'],[
|
array_unshift($return_result['list'][$key]['list'][$v1k]['list'],[
|
||||||
'name'=>'项目名',
|
'name'=>'项目名',
|
||||||
'value'=>'成绩',
|
'value'=>'成绩',
|
||||||
'score'=>'分值',
|
'total_score'=>'满分',
|
||||||
'proportion_value'=>'得分',
|
'proportion_value'=>'得分',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
@ -1050,6 +1089,7 @@ class Sportstesting extends Base{
|
||||||
'proportion_value'=>null,
|
'proportion_value'=>null,
|
||||||
'unit'=>$x_m_v['unit_data'],
|
'unit'=>$x_m_v['unit_data'],
|
||||||
'type'=>$x_m_v['type'],
|
'type'=>$x_m_v['type'],
|
||||||
|
'describe'=>$x_m_v['describe'],
|
||||||
'total_score'=>$x_m_v['score'],
|
'total_score'=>$x_m_v['score'],
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
@ -1083,6 +1123,7 @@ class Sportstesting extends Base{
|
||||||
'proportion_value'=>null,
|
'proportion_value'=>null,
|
||||||
'unit'=>$v3['unit_data'],
|
'unit'=>$v3['unit_data'],
|
||||||
'type'=>$v3['type'],
|
'type'=>$v3['type'],
|
||||||
|
'describe'=>$v3['describe'],
|
||||||
'total_score'=>$v3['score'],
|
'total_score'=>$v3['score'],
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
@ -1190,6 +1231,7 @@ class Sportstesting extends Base{
|
||||||
'proportion_value'=>null,
|
'proportion_value'=>null,
|
||||||
'unit'=>$x_m_v['unit_data'],
|
'unit'=>$x_m_v['unit_data'],
|
||||||
'type'=>$x_m_v['type'],
|
'type'=>$x_m_v['type'],
|
||||||
|
'describe'=>$x_m_v['describe'],
|
||||||
'total_score'=>$x_m_v['score'],
|
'total_score'=>$x_m_v['score'],
|
||||||
]);
|
]);
|
||||||
// dump($x_m_k);
|
// dump($x_m_k);
|
||||||
|
|
@ -1211,6 +1253,8 @@ class Sportstesting extends Base{
|
||||||
// break;
|
// break;
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
|
//循环次数
|
||||||
|
$xh_num = $s_c_v['choose_num'];
|
||||||
$num2 = array_push($result[$num-1]['list'],['name'=>$s_c_k,'key'=>$s_c_k,'is_choice'=>$s_c_v['choose_num'],'list'=>[]]);
|
$num2 = array_push($result[$num-1]['list'],['name'=>$s_c_k,'key'=>$s_c_k,'is_choice'=>$s_c_v['choose_num'],'list'=>[]]);
|
||||||
foreach ($s_c_v['list'] as $x_m_k => $x_m_v) {
|
foreach ($s_c_v['list'] as $x_m_k => $x_m_v) {
|
||||||
array_push($result[$num-1]['list'][$num2-1]['list'],[
|
array_push($result[$num-1]['list'][$num2-1]['list'],[
|
||||||
|
|
@ -1220,6 +1264,7 @@ class Sportstesting extends Base{
|
||||||
'proportion_value'=>null,
|
'proportion_value'=>null,
|
||||||
'unit'=>$x_m_v['unit_data'],
|
'unit'=>$x_m_v['unit_data'],
|
||||||
'type'=>$x_m_v['type'],
|
'type'=>$x_m_v['type'],
|
||||||
|
'describe'=>$x_m_v['describe'],
|
||||||
'total_score'=>$x_m_v['score'],
|
'total_score'=>$x_m_v['score'],
|
||||||
]);
|
]);
|
||||||
// dump($x_m_k);
|
// dump($x_m_k);
|
||||||
|
|
@ -1238,13 +1283,18 @@ class Sportstesting extends Base{
|
||||||
}else if($x_m_k == '体操双杠组合Ⅰ'){
|
}else if($x_m_k == '体操双杠组合Ⅰ'){
|
||||||
$result[$num-1]['list'][$num2-1]['list'][0]['value'] = '4';
|
$result[$num-1]['list'][$num2-1]['list'][0]['value'] = '4';
|
||||||
}
|
}
|
||||||
|
$xh_num = $xh_num -1;
|
||||||
|
if($xh_num <= 0){
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// dump($result);
|
// dump($result);
|
||||||
// die;
|
// die;
|
||||||
|
// $result = json_encode($result);
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ return [
|
||||||
'type' => 'sqlsrv',
|
'type' => 'sqlsrv',
|
||||||
// 服务器地址
|
// 服务器地址
|
||||||
'hostname' => '121.36.67.254',
|
'hostname' => '121.36.67.254',
|
||||||
|
// 'hostname' => '127.0.0.1',
|
||||||
// 数据库名
|
// 数据库名
|
||||||
'database' => 'jt_tc',
|
'database' => 'jt_tc',
|
||||||
// 用户名
|
// 用户名
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,6 @@ Route::any('/technology/index', 'admin/technology/index');
|
||||||
Route::any('/technology/web_index', 'admin/technology/web_index');
|
Route::any('/technology/web_index', 'admin/technology/web_index');
|
||||||
Route::any('/technology/privacy_index', 'admin/technology/privacy_index');
|
Route::any('/technology/privacy_index', 'admin/technology/privacy_index');
|
||||||
Route::any('/technology/set_user_opinion', 'admin/technology/set_user_opinion');
|
Route::any('/technology/set_user_opinion', 'admin/technology/set_user_opinion');
|
||||||
Route::any('/technology/ceshiyong', 'admin/technology/ceshiyong');
|
|
||||||
|
|
||||||
// // Route::get('/admin/welcome', 'admin/index/welcome');
|
// // Route::get('/admin/welcome', 'admin/index/welcome');
|
||||||
// // // APP账号角色管理
|
// // // APP账号角色管理
|
||||||
|
|
@ -215,7 +214,7 @@ Route::any('/use_test', 'admin/base/use_test');
|
||||||
// Route::any('/vitalcapacity_standard_interval', 'app/vitalcapacity/vitalcapacity_standard_interval');
|
// Route::any('/vitalcapacity_standard_interval', 'app/vitalcapacity/vitalcapacity_standard_interval');
|
||||||
|
|
||||||
|
|
||||||
Route::any('/wuyong', 'app/sportstesting/aaaaaaaaaaaaaaa');
|
Route::any('/ceshiyong', 'app/base/ceshiyong');
|
||||||
|
|
||||||
|
|
||||||
// Route::any('/app_update_file/*', 'app/sportstesting/aaaaaaaaaaaaaaa');
|
// Route::any('/app_update_file/*', 'app/sportstesting/aaaaaaaaaaaaaaa');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue