From b4fe295077aa1c833a05fbf69c3282f09a195fa8 Mon Sep 17 00:00:00 2001
From: tsf <460834639@qq.com>
Date: Sat, 29 Jun 2024 19:11:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/controller/Member.php | 79 +++++++++++++-----
application/admin/view/index/index.html | 5 ++
.../admin/view/member/member_list.html | 26 +++---
application/admin/view/member/user_list.html | 32 +++++---
.../view/member/user_record_briefing.html | 80 +++++++++++++++++++
application/route.php | 3 +
6 files changed, 188 insertions(+), 37 deletions(-)
create mode 100644 application/admin/view/member/user_record_briefing.html
diff --git a/application/admin/controller/Member.php b/application/admin/controller/Member.php
index 5a01353..473c625 100644
--- a/application/admin/controller/Member.php
+++ b/application/admin/controller/Member.php
@@ -10,6 +10,8 @@ use \think\Validate;
class Member extends Controller{
+ protected $db_name = ['2'=>'app_card_body_data','6'=>'app_card_skip_data','8'=>'app_card_vitalcapacity_data'];
+
################################################################账号################################################################
################################################################账号################################################################
################################################################账号################################################################
@@ -53,7 +55,11 @@ class Member extends Controller{
]);
return $this->fetch();
}
-
+ // 用户账号下角色列表
+ public function member_user_list(){
+ $data = input();
+ return $this->user_list(1,$data['id']);
+ }
// 用户账号停用
public function member_is_del(){
$data = input();
@@ -76,7 +82,7 @@ class Member extends Controller{
################################################################角色################################################################
// 角色列表
- public function user_list($page = 1){
+ public function user_list($page = 1,$id = null){
$data = input();
$pd = true;
$parameter = [];
@@ -86,27 +92,31 @@ class Member extends Controller{
unset($data['page_num']);
unset($data['tt']);
$pd = false;
- if(in_array($data['status_num'], $status)){
- $parameter['is_del'] = $data['status_num'];
+ if(array_key_exists('status_num', $data)){
+ if(in_array($data['status_num'], $status)){
+ $parameter['is_del'] = $data['status_num'];
+ }
}
- if($data['aan_id']){
- $parameter['aan_id'] = $data['aan_id'];
+ if(array_key_exists('aan_id', $data)){
+ if($data['aan_id']){
+ $parameter['aan_id'] = $data['aan_id'];
+ }
}
- if($data['nickname']){
- $parameter['nickname'] = $data['nickname'];
+ if(array_key_exists('nickname', $data)){
+ if($data['nickname']){
+ $parameter['nickname'] = $data['nickname'];
+ }
}
- if(in_array($data['gender'], $status)){
- $parameter['gender'] = $data['gender'];
+ if(array_key_exists('gender', $data)){
+ if(in_array($data['gender'], $status)){
+ $parameter['gender'] = $data['gender'];
+ }
+ }
+ }else{
+ if($id){
+ $parameter['aan_id'] = $id;
}
- // if($data['s_time']){
- // $parameter['create_time'] = ['>=',$data['s_time']];
- // }
- // if($data['e_time']){
- // $parameter['create_time'] = ['<=',$data['e_time']];
- // }
}
- // dump($parameter);
- // die;
$num = Db::table('app_user_data')->where($parameter)->count();
$member_list = Db::table('app_user_data')->where($parameter)->page("$page,10")->order('is_del,id desc')->select();
if(!$pd){
@@ -117,6 +127,33 @@ class Member extends Controller{
$this->assign([
'result' => $member_list,
'num' => $num,
+ 'aanid' => $id,
+ ]);
+ return $this->fetch();
+ }
+ // 用户行为简报
+ public function user_record_briefing(){
+ $data = input();
+ $result_card_order = Db::table('app_user_data')->where(['id'=>$data['id']])->field('id,card_order')->find();
+ $db_num = explode(',',$result_card_order['card_order']);
+ $end_result['身体数据'] = Db::table('app_card_body_data')->where(['aud_id'=>$data['id']])->order('record_time desc')->field('height_val,weight_val,record_time')->select();
+ foreach ($db_num as $key => $value) {
+ $result = Db::table('app_card_data')->where(['id'=>$value])->field('id,name')->find();
+ $result2 = Db::table($this->db_name[$value])->where(['aud_id'=>$data['id']])->order('record_time desc')->select();
+ $end_result[$result['name']] = $result2;
+ }
+ $end_result2 = [];
+ foreach ($end_result as $key => $value) {
+ array_push($end_result2,[
+ 'name' => $key,
+ 'num' => count($value),
+ 'time' => count($value)>0?$value[0]['record_time']:'已创建未测量',
+ ]);
+ }
+ // dump($end_result2);
+ // die;
+ $this->assign([
+ 'result' => $end_result2
]);
return $this->fetch();
}
@@ -141,6 +178,12 @@ class Member extends Controller{
}
}
+ ################################################################角色使用记录################################################################
+ ################################################################角色使用记录################################################################
+ ################################################################角色使用记录################################################################
+
+
+
################################################################other################################################################
################################################################other################################################################
diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html
index affc984..972282c 100644
--- a/application/admin/view/index/index.html
+++ b/application/admin/view/index/index.html
@@ -61,6 +61,11 @@
APP角色数据列表
+
+
+
+ 角色使用记录查询
+
diff --git a/application/admin/view/member/member_list.html b/application/admin/view/member/member_list.html
index f4a9eba..d33c1da 100644
--- a/application/admin/view/member/member_list.html
+++ b/application/admin/view/member/member_list.html
@@ -17,7 +17,7 @@
-