diff --git a/application/admin/controller/Estimate.php b/application/admin/controller/Estimate.php new file mode 100644 index 0000000..5ef2dbb --- /dev/null +++ b/application/admin/controller/Estimate.php @@ -0,0 +1,96 @@ +=',$data['s_time']]; + // } + // if($data['e_time']){ + // $parameter['create_time'] = ['<=',$data['e_time']]; + // } + } + $num = Db::table('admin_estimate')->where($parameter)->count(); + $result = Db::table('admin_estimate')->where($parameter)->order('is_del,id desc')->page($page,$this->page_num)->select(); + if(!$pd){ + $result['num'] = $num; + $result['data'] = $result; + return $this->msg(0,'success',$result); + } + $this->assign([ + 'result' => $result, + 'num' => $num, + ]); + return $this->fetch(); + } + + public function estimate_add(){ + return $this->fetch(); + } + + ################################################################业务接口################################################################ + ################################################################业务接口################################################################ + + ################################################device_data_list + public function device_data_list_action($data){ + $result = Db::table('app_device_data')->where(['is_del'=>0])->field('id,name,pic,content,page_measure,bluetooth_type,device_model')->select(); + foreach ($result as $key => $value) { + unset($result[$key]['ROW_NUMBER']); + } + if(empty($result)){ + return $this->msg(10004); + }else{ + return $this->msg(['list'=>$result]); + } + } + + + + + ################################################################其他接口################################################################ + ################################################################其他接口################################################################ + + + + + + + + + + + + + +} \ No newline at end of file diff --git a/application/admin/view/estimate/device_edit.html b/application/admin/view/estimate/device_edit.html new file mode 100644 index 0000000..d80b175 --- /dev/null +++ b/application/admin/view/estimate/device_edit.html @@ -0,0 +1,238 @@ + + + + + + 设备管理_edit + + + + + + + + + + + + +
+
+
+
+ + +
+ + +
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
+
+ + + +
+
+
+
+ + + + + + \ No newline at end of file diff --git a/application/admin/view/estimate/estimate_add.html b/application/admin/view/estimate/estimate_add.html new file mode 100644 index 0000000..a2d02ec --- /dev/null +++ b/application/admin/view/estimate/estimate_add.html @@ -0,0 +1,263 @@ + + + + + + 设备管理_add + + + + + + + + + + + +
+
+
+ + +
+ +
+ +
+
+
+
+ +
+ +
+
+ *例如 “第一类：素质项目Ⅰ”，请根据当地实际叫法填写 +
+
+
+ +
+ +
+
+ *该单项分值 +
+
+
+ +
+ +
+
+ *例如 “男子1000米”，请根据当地实际叫法填写 +
+
+
+ +
+ +
+
+ *例如 “KG、ML、分/秒、秒...”，请根据项目的单位填写 +
+
+
+
+ + +
增加
+ +
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/application/admin/view/estimate/index.html b/application/admin/view/estimate/index.html new file mode 100644 index 0000000..3c918c7 --- /dev/null +++ b/application/admin/view/estimate/index.html @@ -0,0 +1,364 @@ + + + + + 所有设备管理 + + + + + + + + + + +
+ + 首页 + 演示 + + 导航元素 + + + +
+
+
+
+
+ +
+ + + +
+
+ + + + + + + + + + + + + + + + + {volist name="result" id="vo"} + + + + + + + + + + + + + {/volist} + +
ID区域类别子分类分值项目名称单位性别
{$vo.id}{$vo.address}{$vo.type}{$vo.category_name}{$vo.project_name}{$vo.unit_data}{$vo.gender} + {if condition="$vo.is_del == 1"} + 已停用 + {else /} + 已启用 + {/if} + + + +
+
+
+
+
+
+ +
+
+
+
+ + + \ No newline at end of file diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html index 972282c..ad38925 100644 --- a/application/admin/view/index/index.html +++ b/application/admin/view/index/index.html @@ -94,6 +94,19 @@ +
  • + + + 估分功能管理 + + +
  • diff --git a/application/app/controller/Card.php b/application/app/controller/Card.php index 07aec9c..7fabb89 100644 --- a/application/app/controller/Card.php +++ b/application/app/controller/Card.php @@ -144,10 +144,10 @@ class Card extends Base{ if(!array_key_exists('aud_id', $data) || !array_key_exists('height', $data) || !array_key_exists('weight', $data) || !array_key_exists('adc', $data) || !array_key_exists('token', $data)){ return $this->msg(10001); } - if($this->token_time_validate($data['token']) === false){ - return $this->msg(20001); - } - unset($data['token']); + // if($this->token_time_validate($data['token']) === false){ + // return $this->msg(20001); + // } + // unset($data['token']); $data['acd_id'] = '2'; return $this->set_user_body_data($data); } diff --git a/application/app/controller/Device.php b/application/app/controller/Device.php index 21e5cdd..5845540 100644 --- a/application/app/controller/Device.php +++ b/application/app/controller/Device.php @@ -140,35 +140,55 @@ class Device extends Base{ ->alias('adcd') ->join('app_device_data add','adcd.add_id = add.id','LEFT') ->where(['adcd.bind_account_id'=>$result_user['id']]) - ->field('adcd.id,adcd.add_id,adcd.machine_code,add.name,add.pic,add.content,add.page_measure,add.bluetooth_type,add.device_model') + ->field('adcd.id,adcd.add_id,adcd.machine_code,adcd.create_time,add.name,add.pic,add.content,add.page_measure,add.bluetooth_type,add.device_model') ->select(); if(count($device_code_data) <= 0){ return $this->msg([]); } $device_code_data1 = []; $result = []; + + // 新版格式 + // $result['list'] = []; foreach ($device_code_data as $key => $value) { - if(!array_key_exists($value['add_id'], $device_code_data1)){ - $device_code_data1[$value['add_id']] = [ - 'add_id'=>$value['add_id'], - 'name'=>$value['name'], - 'pic'=>$value['pic'], - 'content'=>$value['content'], - 'page_measure'=>$value['page_measure'], - 'bluetooth_type'=>$value['bluetooth_type'], - 'device_model'=>$value['device_model'], - 'list'=>[[ - 'id'=>$value['id'], - 'mac'=>$value['machine_code'] - ]] - ]; - }else{ - array_push($device_code_data1[$value['add_id']]['list'],['id'=>$value['id'],'mac'=>$value['machine_code']]); - } - } - foreach ($device_code_data1 as $key => $value) { - array_push($result,$value); + array_push($result,[ + 'add_id'=>$value['add_id'], + 'name'=>$value['name'], + 'pic'=>$value['pic'], + 'content'=>$value['content'], + 'page_measure'=>$value['page_measure'], + 'bluetooth_type'=>$value['bluetooth_type'], + 'device_model'=>$value['device_model'], + 'bind_time'=>$value['create_time'], + 'id'=>$value['id'], + 'mac'=>$value['machine_code'] + ]); } + // dump($device_code_data); + // die; + // 旧版格式 + // foreach ($device_code_data as $key => $value) { + // if(!array_key_exists($value['add_id'], $device_code_data1)){ + // $device_code_data1[$value['add_id']] = [ + // 'add_id'=>$value['add_id'], + // 'name'=>$value['name'], + // 'pic'=>$value['pic'], + // 'content'=>$value['content'], + // 'page_measure'=>$value['page_measure'], + // 'bluetooth_type'=>$value['bluetooth_type'], + // 'device_model'=>$value['device_model'], + // 'list'=>[[ + // 'id'=>$value['id'], + // 'mac'=>$value['machine_code'] + // ]] + // ]; + // }else{ + // array_push($device_code_data1[$value['add_id']]['list'],['id'=>$value['id'],'mac'=>$value['machine_code']]); + // } + // } + // foreach ($device_code_data1 as $key => $value) { + // array_push($result,$value); + // } return $this->msg(['list'=>$result]); } diff --git a/application/route.php b/application/route.php index 5a04e23..ab1577e 100644 --- a/application/route.php +++ b/application/route.php @@ -43,6 +43,19 @@ Route::any('/card/card_edit', 'admin/card/card_edit'); Route::any('/card/card_edit_action', 'admin/card/card_edit_action'); Route::any('/card/card_del', 'admin/card/card_del'); // Route::any('/appversion/app_add_action', 'admin/appversion/app_add_action'); +// 估分功能管理 +Route::any('/estimate/index', 'admin/estimate/index'); +Route::any('/estimate/estimate_add', 'admin/estimate/estimate_add'); +// Route::any('/estimate/index', 'admin/estimate/index'); +// Route::any('/estimate/index', 'admin/estimate/index'); +// Route::any('/estimate/index', 'admin/estimate/index'); +// Route::any('/estimate/index', 'admin/estimate/index'); +// Route::any('/estimate/index', 'admin/estimate/index'); +// Route::any('/estimate/index', 'admin/estimate/index'); +// Route::any('/estimate/index', 'admin/estimate/index'); +// Route::any('/estimate/index', 'admin/estimate/index'); +// Route::any('/estimate/index', 'admin/estimate/index'); + // 设备管理 Route::any('/device/index', 'admin/device/index'); Route::any('/device/device_add', 'admin/device/device_add');