diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/InstitutionController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/InstitutionController.php
new file mode 100644
index 0000000..f0fa2f2
--- /dev/null
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/InstitutionController.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Http\Controllers\API\Admin\YeWu;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class InstitutionController extends Controller
+{
+    //获取体检机构总列表
+    public function GetList()
+    {
+        $page = request('page');
+        $pagesize = request('pageSize');
+        $searchInfo = request('searchInfo');
+        $list = DB::table('medical_institution as a');
+        $list = $list->leftJoin('users as b', 'a.link_user_id', '=', 'b.id');
+        $count = $list->count();
+        $list = $list->select('a.*', 'b.username');
+        $list=$list->orderBy('id', 'desc')->skip(($page-1)*$pagesize)->take($pagesize)->get();
+
+        return \Yz::Return(true, '', ['list' => $list, 'count' => $count]);
+    }
+    //保存机构设置
+    public function SavdSeting()
+    {
+        $SetingInfo= request('SetingInfo');
+        if(isset($SetingInfo['institution_id'])){
+            //更新机构表预约状态
+            DB::table('medical_institution')->where(['id'=>$SetingInfo['institution_id']])->update([
+               'enable_yuyue'=> $SetingInfo['enable_yuyue'],
+               'enable_laonianren_mf'=> $SetingInfo['enable_laonianren_mf'],
+               'enable_jiankangzheng_mf'=> $SetingInfo['enable_jiankangzheng_mf'],
+            ]);
+            DB::beginTransaction();
+            $saveStatus=false;
+            try {
+                //查询是否有此机构的设置信息，如果有，先删除再添加（因为设置项有可能会变，所以直接删除再添加）
+                $cha=DB::table('institution_seting')->where(['institution_id'=>$SetingInfo['institution_id']])->first();
+                if(!!$cha){
+                    DB::table('institution_seting')->where(['institution_id'=>$SetingInfo['institution_id']])->delete();
+                }
+                $i1_count=0;
+                $i2_count=0;
+                //添加设置
+                foreach ($SetingInfo['laonianren_mf']['fenlei'] as $key=>$item){
+                   $i1= DB::table('institution_seting')->insert([
+                        'institution_id'=>$SetingInfo['institution_id'],
+                        'big_check_type'=>"老年人免费体检",
+                        'small_check_type'=>$item['name'],
+                        'bind_check_type'=>$item['bind_check_type'],
+                        'bind_unit_id'=>$item['bind_unit_id'],
+                        'bind_group_id'=>$item['bind_group_id'],
+                        'bind_batch_id'=>$item['bind_batch_id'],
+                        'enable_yuyue'=>$item['enable_yuyue'],
+                    ]);
+                   if($i1) $i1_count++;
+                }
+
+                foreach ($SetingInfo['jiankangzheng_mf']['fenlei'] as $key=>$item){
+                    $i2=  DB::table('institution_seting')->insert([
+                        'institution_id'=>$SetingInfo['institution_id'],
+                        'big_check_type'=>"健康证免费体检",
+                        'small_check_type'=>$item['name'],
+                        'bind_check_type'=>$item['bind_check_type'],
+                        'bind_unit_id'=>$item['bind_unit_id'],
+                        'bind_group_id'=>$item['bind_group_id'],
+                        'bind_batch_id'=>$item['bind_batch_id'],
+                        'enable_yuyue'=>$item['enable_yuyue'],
+                    ]);
+                    if($i2) $i2_count++;
+                }
+
+                if(count($SetingInfo['laonianren_mf']['fenlei'])== $i1_count and count($SetingInfo['jiankangzheng_mf']['fenlei'])== $i2_count){
+                    DB::commit();
+                    return \Yz::Return(true,'操作完成',[]);
+                }else{
+                    DB::rollback();
+                    return \Yz::Return(false,'操作失败');
+                }
+            } catch (\Exception $e) {
+
+                DB::rollback();
+                return \Yz::Return(false,'操作异常'.$e);
+            }
+
+
+
+        }else{
+            return \Yz::echoError1('参数缺失');
+        }
+    }
+    public function GetSetingDetail()
+    {
+        $institution_id= request('institution_id');
+        $seting=DB::table('institution_seting')->where(['institution_id'=>$institution_id])->get();
+        $info=DB::table('medical_institution')->where(['id'=>$institution_id])->get();
+
+        return \Yz::Return(true,'查询成功',['info'=>$info,'seting'=>$seting]);
+
+    }
+}
diff --git a/Laravel/app/Http/Controllers/API/DxAppController.php b/Laravel/app/Http/Controllers/API/DxAppController.php
index a40bf59..19247cc 100644
--- a/Laravel/app/Http/Controllers/API/DxAppController.php
+++ b/Laravel/app/Http/Controllers/API/DxAppController.php
@@ -10,7 +10,7 @@ class DxAppController extends Controller
     //大兴app根据userid查询用户信息
     public function getUserInfo(){
         $userId=request('userId');
-        $base_url="http://223.71.106.241:8097";
+        $base_url="http://114.242.58.53:8782";
         $url =$base_url.'/family/api/getUserFamilyDataList?userId='.$userId;
         $encryptStr=self::post($url,'');
         $r_data=json_decode($encryptStr, true);
diff --git a/Laravel/app/Http/Controllers/API/mH5/IndustryController.php b/Laravel/app/Http/Controllers/API/mH5/IndustryController.php
index 5bb8bba..2702992 100644
--- a/Laravel/app/Http/Controllers/API/mH5/IndustryController.php
+++ b/Laravel/app/Http/Controllers/API/mH5/IndustryController.php
@@ -12,7 +12,17 @@ class IndustryController extends Controller
     //获取行业列表
     public function GetIndustry()
     {
-        $list=DB::table('industry')->get();
+        $institution_id=request('institution_id');
+        $alllist=DB::table('industry')->get();
+        $enablelist=DB::table('institution_seting')->where(['institution_id'=>$institution_id])->get();
+        $list=[];
+        foreach ($alllist as $key=>$item){
+            foreach ($enablelist as $K=>$it){
+                if($item->name == $it->small_check_type  and  $it->enable_yuyue==1){
+                    $list[]=$item;
+                }
+            }
+        }
         return \Yz::Return(true,'查询成功',$list);
     }
 }
diff --git a/Laravel/app/Http/Controllers/API/mH5/OrganizationController.php b/Laravel/app/Http/Controllers/API/mH5/OrganizationController.php
index 35dbd99..28eec28 100644
--- a/Laravel/app/Http/Controllers/API/mH5/OrganizationController.php
+++ b/Laravel/app/Http/Controllers/API/mH5/OrganizationController.php
@@ -10,8 +10,9 @@ class OrganizationController extends Controller
 {
     //获取正常状态的体检机构
     public function GetEnableList(){
+        $yuyue_type=request('yuyue_type');
         $s=app()->make(OrganizationService::class);
-        return $s->GetList(['type'=>'enable']);
+        return $s->GetList(['type'=>'enable','yuyue_type'=>$yuyue_type]);
     }
     //获取单独体检机构可预约日历时间表
     public function GetEnableCalendar(){
diff --git a/Laravel/app/Http/Controllers/API/mH5/PersonController.php b/Laravel/app/Http/Controllers/API/mH5/PersonController.php
index 07b32d7..4c5e90a 100644
--- a/Laravel/app/Http/Controllers/API/mH5/PersonController.php
+++ b/Laravel/app/Http/Controllers/API/mH5/PersonController.php
@@ -6,6 +6,9 @@ use App\Http\Controllers\Controller;
 use App\Services\mH5\PersonService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use GuzzleHttp\Client;
+use Illuminate\Support\Facades\Storage;
+
 class PersonController extends Controller
 {
     //注册
@@ -24,23 +27,82 @@ class PersonController extends Controller
     //获取用户体检详情和pdf
     public function GetPersonReportDetail(){
         $sfz =request('sfz');
+        //HSM加密
+        $HSM_sfz =\App\Lib\HSM::HsmEncrypt($sfz);
+        if($HSM_sfz['status']!=true){
+            return \Yz::echoError1('调用HSM加密失败');
+        }
+        $sfz=$HSM_sfz['data'];
         $info=DB::table('examination_records')->where(['id_card_num'=>$sfz]) ->orderBy('id', 'desc')->first();
         if($info){
+            $info->pdfs=count(json_decode($info->pdfs, true));
             $item=DB::table('report_result_item')
                 ->where(['examination_id'=>$info->id])
                 ->select(['item_name','item_result','flag'])->get();
             $info->items=$item;
+            if(strlen($info->id_card_num)>30){
+                //HSM解密
+                $HSM_sfz =\App\Lib\HSM::HsmDecrypt($info->id_card_num);
+                if($HSM_sfz['status']!=true){
+                    return \Yz::echoError1('调用HSM加密失败');
+                }
+                $info->id_card_num=$HSM_sfz['data'];
+            }
+
+
             return \Yz::Return(true,'',['info'=>$info]);
         }else{
             return \Yz::echoError1('未找到相关体检信息');
         }
 
     }
+    //修改H5获取用户pdf方式，改为根据体检提供的pdf链接地址获取pdf
+    public function GetPersonPdfDetailByLink()
+    {
+        $recordid =request('recordid');
+        $pdf_num =request('pdf_num');
+        $query=DB::table('examination_records')->where(['id'=>$recordid])->first();
+        if(!$query) return \Yz::echoError1('未找到对应体检记录');
+        $pdfs=json_decode($query->pdfs, true);
+        $pdfurl=$pdfs[$pdf_num];
+        // 使用 GuzzleHttp 获取第三方 PDF 地址的内容
+        $client = new Client();
+        $response = $client->get($pdfurl);
+
+        return  response($response->getBody());
+//        return response($response->getBody()->getContents(), 200)
+//            ->header('Content-Type', 'application/pdf')
+//            ->header('Content-Disposition', 'inline; filename="sample.pdf"');
+//        $date = date("Ymd");
+//        $filename = 'pdf_' . time() . '.pdf';
+//        Storage::disk('public')->put('/pdf/'.$date.'/'."a.pdf", $response->getBody());
+//
+//        return \Yz::Return(true,'获取成功',['fileurl' =>'/storage/pdf/'.$date.'/'.$filename]);
+
+
+    }
+
     //用户扫码跳转输入身份证和电话 查询用户体检详情和pdf
     public function H5GetPersonReportDetail(){
         $get_info =request('info');
         if(!isset($get_info['sfz'])) return \Yz::echoError1('身份证不能为空');
         if(!isset($get_info['tel'])) return \Yz::echoError1('电话不能为空');
+
+        //HSM加密
+        $HSM_sfz =\App\Lib\HSM::HsmEncrypt($get_info['sfz']);
+        if($HSM_sfz['status']!=true){
+            return \Yz::echoError1('调用HSM加密失败');
+        }
+        $get_info['sfz']=$HSM_sfz['data'];
+        if(isset($get_info['tel'])){
+            $HSM_tel =\App\Lib\HSM::HsmEncrypt($get_info['tel']);
+            if($HSM_tel['status']!=true){
+                return \Yz::echoError1('调用HSM加密失败');
+            }
+            $get_info['tel']=$HSM_tel['data'];
+        }
+
+
         $info=DB::table('examination_records')->where(['id_card_num'=>$get_info['sfz'],'tel'=>$get_info['tel']]) ->orderBy('id', 'desc')->first();
         if($info){
             $item=DB::table('report_result_item')
diff --git a/Laravel/app/Http/Middleware/Log.php b/Laravel/app/Http/Middleware/Log.php
index 6e515d0..c8ff022 100644
--- a/Laravel/app/Http/Middleware/Log.php
+++ b/Laravel/app/Http/Middleware/Log.php
@@ -20,6 +20,9 @@ class Log
         $insert_id=0;
         $insert_id=self::requestLog($request,$insert_id);  //记录请求时日志，不含返回信息
         $response = $next($request);
+        if($request->getPathInfo()=='/api/v1/mH5/GetPersonPdfDetailByLink'){
+            return $response;
+        }
 
         $content = $response->getContent();
         $data = json_decode($content, true); // 解码响应内容为关联数组
@@ -29,11 +32,12 @@ class Log
         $data['code'] = $response->getStatusCode();
         $modifiedContent = json_encode($data); // 编码修改后的关联数组为 JSON 字符串
         $response->setContent($modifiedContent);
+
         if(env('REQUEST_LOG') and    $response->getStatusCode()==200){   //如果返回状态为200进行log
 
             $ip=self::getTrustedProxiesIp();  //真实ip
             $request_header=$request->header(); //请求头
-            //  dd($response);
+              //dd($response);
             $response_data = $response->getData();  //返回data,json格式
             $post_data=$request->post(); //post请求数据
             $get_data=$request->query(); //get请求
diff --git a/Laravel/app/Services/mH5/OrganizationService.php b/Laravel/app/Services/mH5/OrganizationService.php
index e34ea86..d7f1985 100644
--- a/Laravel/app/Services/mH5/OrganizationService.php
+++ b/Laravel/app/Services/mH5/OrganizationService.php
@@ -8,12 +8,17 @@ class OrganizationService
             //如果查询可用机构列表则数组 ‘type’字段传 ‘enable’,查全部 则传 ‘all’
             $result=array();
             if($arr['type']){
+                $list=DB::table('medical_institution');
                 if ($arr['type']=='enable'){
-                    $list=DB::table('medical_institution')->where(['status'=>1])->get();
+                    $list=$list->where(['status'=>1]);
                 }
                 if ($arr['type']=='all'){
-                    $list=DB::table('medical_institution')->whereIn('status',[0,1])->get();
+                    $list=$list->whereIn('status',[0,1]);
                 }
+                if($arr['yuyue_type']=='jiankangzheng_mf'){
+                    $list= $list->where(['enable_yuyue'=>1,'enable_jiankangzheng_mf'=>1]);
+                }
+                $list= $list->get();
                 if(count($list)>0){
                     $result['status']=true;
                     $result['list']=$list;
@@ -95,6 +100,9 @@ class OrganizationService
                 return \Yz::Return(false,'当前时间段预约已满');
             }
 
+            //获取体检机构编号sn
+            $jgINfo=DB::table('medical_institution')->where('id',$info['org_id'])->first();
+
             $Hmac=\App\Lib\HSM::Hmac($cha_info[0]->name.$cha_info[0]->id_card_num.$info['org_id']);
             if($Hmac['status']!=true){
                 return \Yz::echoError1('HMAC摘要失败');
@@ -113,9 +121,11 @@ class OrganizationService
                         'openid'=>$openid,
                         'date'=>$q_date[0]->date,
                         'time'=>$q_date[0]->time,
+                        'fee_type'=>0,
                         'doc_type_id'=>$info['doc_id'],
                         'doc_type_name'=>$info['doc_name'],
                         'org_id'=>$info['org_id'],
+                        'org_code'=>$jgINfo->sn,
                         'status'=>1,
                         'hmac'=>$Hmac['data'],
                     ]
diff --git a/Laravel/app/Services/mH5/PersonService.php b/Laravel/app/Services/mH5/PersonService.php
index 81471fc..33591f6 100644
--- a/Laravel/app/Services/mH5/PersonService.php
+++ b/Laravel/app/Services/mH5/PersonService.php
@@ -62,6 +62,7 @@ class PersonService
         $id_num='';
 
         if(isset($arr['group']) and $arr['group']=='mH5user'){  //如果是本地项目请求（非对外接口）
+
             $openid=$arr['openid'];
             $c=DB::table('persons')->select(['id_card_num'])->where(['openid'=>$openid,'status'=>1])->get();
             if(count($c)>0){
@@ -69,6 +70,7 @@ class PersonService
             }else{
                 $result['status']=false;
                 $result['msg']='未找到有效用户';
+                return  $result;
             }
         }else{ //对外接口，直接获取证件IdNum
             $id_num=$arr['id_num'];
@@ -112,6 +114,30 @@ class PersonService
         $cha = DB::select("SELECT a.*,b.sex,b.tel,b.status,c.org_name from  appointment_record as a INNER JOIN
     persons as b on a.person_id=b.id INNER JOIN medical_institution as c on a.org_id=c.id   where a.id_card_num=?
     and a.status=1",[$arr['id_num']]);
+
+
+        if(count($cha)>0){
+            $cha[0]->bind_check_type=null;
+            $cha[0]->bind_unit_id=null;
+            $cha[0]->bind_group_id=null;
+            $cha[0]->bind_batch_id=null;
+            $cha[0]->start_time=substr($cha[0]->time, 0,5);
+            $cha[0]->end_time=substr($cha[0]->time,-5);
+            $org_seting=DB::table('institution_seting')->where(['institution_id'=>$cha[0]->org_id,'small_check_type'=>$cha[0]->doc_type_name])->first();
+            if(!!$org_seting){
+                $cha[0]->bind_check_type=$org_seting->bind_check_type;
+                $cha[0]->bind_unit_id=$org_seting->bind_unit_id;
+                $cha[0]->bind_group_id=$org_seting->bind_group_id;
+                $cha[0]->bind_batch_id=$org_seting->bind_batch_id;
+            }
+            $cha_img =DB::table('appointment_img')->where('appointment_record_id',$cha[0]->id)->get();
+           //env('APP_URL')
+            foreach ($cha_img as $key=>$item){
+                $cha_img[$key]->imgurl=env('APP_URL').$item->imgurl;
+            }
+            $cha[0]->imgs=$cha_img;
+        }
+
         if(!count($cha)>0) return \Yz::echoError1("未找到预约记录");
         return \Yz::Return(true,'',$cha);
     }
diff --git a/Laravel/public/images/food.png b/Laravel/public/images/food.png
new file mode 100644
index 0000000..e18cb1b
Binary files /dev/null and b/Laravel/public/images/food.png differ
diff --git a/Laravel/public/images/gonggong.png b/Laravel/public/images/gonggong.png
new file mode 100644
index 0000000..1ca090e
Binary files /dev/null and b/Laravel/public/images/gonggong.png differ
diff --git a/Laravel/public/images/huazhuangpin.png b/Laravel/public/images/huazhuangpin.png
new file mode 100644
index 0000000..c05dae1
Binary files /dev/null and b/Laravel/public/images/huazhuangpin.png differ
diff --git a/Laravel/public/images/xiaodu.png b/Laravel/public/images/xiaodu.png
new file mode 100644
index 0000000..3317346
Binary files /dev/null and b/Laravel/public/images/xiaodu.png differ
diff --git a/Laravel/public/images/yinyongshui.png b/Laravel/public/images/yinyongshui.png
new file mode 100644
index 0000000..18bec66
Binary files /dev/null and b/Laravel/public/images/yinyongshui.png differ
diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php
index 36ccf0a..86539aa 100644
--- a/Laravel/routes/api.php
+++ b/Laravel/routes/api.php
@@ -53,6 +53,9 @@ Route::group(['middleware'=>['checktoken','log'],'prefix'=>'v1'],function () {
     Route::post('admin/XTSignBindUser','App\Http\Controllers\API\XTSignController@bindUser');//admin后台用户绑定协同签名useid
     Route::post('admin/UkeyBindUser','App\Http\Controllers\API\UkeyController@Bind');//admin后台用户绑定协同签名useid
     Route::post('admin/AppointmentCount','App\Http\Controllers\API\Admin\YeWu\AppointmentController@AppointmentCount');  //admin后台预约统计
+    Route::post('admin/InstitutionGetList','App\Http\Controllers\API\Admin\YeWu\InstitutionController@GetList');//获取体检机构列表
+    Route::post('admin/InstitutionSavdSeting','App\Http\Controllers\API\Admin\YeWu\InstitutionController@SavdSeting');//保存机构设置
+    Route::post('admin/InstitutionGetSetingDetail','App\Http\Controllers\API\Admin\YeWu\InstitutionController@GetSetingDetail');//获取机构设置详情
 });
 
 
@@ -69,6 +72,7 @@ Route::group(['middleware'=>['checktoken','log'],'prefix'=>'v1/mH5'],function ()
     Route::post('UpFileBase64','App\Http\Controllers\API\UpLoadController@UpFileBase64');//上传文件base64
     Route::post('GetPersonReportDetail','App\Http\Controllers\API\mH5\PersonController@GetPersonReportDetail');//获取用户pdf
     Route::post('GetIndustryList','App\Http\Controllers\API\mH5\IndustryController@GetIndustry');
+    Route::post('GetPersonPdfDetailByLink','App\Http\Controllers\API\mH5\PersonController@GetPersonPdfDetailByLink');//根据链接获取体检那边的pdf
 });
 
 
diff --git a/el-admin/src/api/api.js b/el-admin/src/api/api.js
index 2d6c85e..173109f 100644
--- a/el-admin/src/api/api.js
+++ b/el-admin/src/api/api.js
@@ -136,4 +136,16 @@ export const GetLogTableName =   (data={}) =>  {
 //预约登记统计
 export const AppointmentCount =   (data={}) =>  {
 	return 	axios({url:import.meta.env.VITE_APP_API+'v1/admin/AppointmentCount',data:data})
+}
+//机构管理获取列表
+export const InstitutionGetList =   (data={}) =>  {
+	return 	axios({url:import.meta.env.VITE_APP_API+'v1/admin/InstitutionGetList',data:data})
+}
+//保存机构设置
+export const InstitutionSavdSeting =   (data={}) =>  {
+	return 	axios({url:import.meta.env.VITE_APP_API+'v1/admin/InstitutionSavdSeting',data:data})
+}
+//获取机构设置详情
+export const InstitutionGetSetingDetail =   (data={}) =>  {
+	return 	axios({url:import.meta.env.VITE_APP_API+'v1/admin/InstitutionGetSetingDetail',data:data})
 }
\ No newline at end of file
diff --git a/el-admin/src/router/index.js b/el-admin/src/router/index.js
index c40d34d..d6fa830 100644
--- a/el-admin/src/router/index.js
+++ b/el-admin/src/router/index.js
@@ -64,6 +64,13 @@ const router = createRouter({
 				meta: {
 					title: '系统日志'
 				}
+			} ,{
+				path: '/systemMngr/InstitutionMngr',
+				name: 'SystemInstitutionMngr',
+				component: () => import('../views/SystemMngr/Institution/InstitutionMngr.vue'),
+				meta: {
+					title: '机构管理'
+				}
 			},{
 				path: '/healthCalendar',
 				name: 'HealthCalendar',
diff --git a/el-admin/src/views/SystemMngr/Institution/InstitutionMngr.vue b/el-admin/src/views/SystemMngr/Institution/InstitutionMngr.vue
new file mode 100644
index 0000000..cb16caf
--- /dev/null
+++ b/el-admin/src/views/SystemMngr/Institution/InstitutionMngr.vue
@@ -0,0 +1,290 @@
+<template>
+	<div>
+		<el-table :data="tableData" style="width: 100%;" row-key="id" v-loading="loading">
+			<el-table-column prop="id" label="Id" width="80" />
+			<el-table-column prop="org_name" label="名称" />
+			<el-table-column prop="sn" label="Code" />
+			<el-table-column prop="username" label="关联的账号" />
+			<el-table-column prop="enable_yuyue" label="是否开启预约">
+				<template #default="scope">
+					<el-tag v-if="scope.row.enable_yuyue == 1" class="ml-2" type="success">正常</el-tag>
+					<el-tag v-if="scope.row.enable_yuyue == 0" class="ml-2" type="danger">停用</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column prop="enable_laonianren_mf" label="开启老年人免费预约">
+				<template #default="scope">
+					<el-tag v-if="scope.row.enable_laonianren_mf == 1" class="ml-2" type="success">正常</el-tag>
+					<el-tag v-if="scope.row.enable_laonianren_mf == 0" class="ml-2" type="danger">停用</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column prop="enable_jiankangzheng_mf" label="开启健康证免费预约">
+				<template #default="scope">
+					<el-tag v-if="scope.row.enable_jiankangzheng_mf == 1" class="ml-2" type="success">正常</el-tag>
+					<el-tag v-if="scope.row.enable_jiankangzheng_mf == 0" class="ml-2" type="danger">停用</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column prop="status" label="状态">
+				<template #default="scope">
+					<el-tag v-if="scope.row.status == 1" class="ml-2" type="success">正常</el-tag>
+					<el-tag v-if="scope.row.status == 0" class="ml-2" type="danger">停用</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="操作">
+				<template #default="scope">
+					<el-button round type="primary" size="small" @click="seting(scope.row.id)">配置</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+
+		<div class="page">
+			<el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize"
+				:page-sizes="[15, 50, 100, 200]" layout="total,sizes, prev, pager, next" :total="total"
+				@size-change="PageSizeChange" @current-change="PageCurrentChange" />
+		</div>
+		<el-dialog v-model="dialogVisible" title="机构配置" width="50%">
+			<el-form :model="SetingInfo" v-loading="loading" label-width="150px">
+				<el-form-item label="是否开启预约">
+					<el-switch v-model="SetingInfo.enable_yuyue" size="large" active-text="开启" inactive-text="关闭"
+						:active-value="1" :inactive-value="0" /> （开启后，此机构才能进行预约）
+				</el-form-item>
+				<el-form-item label="老年人免费体检">
+					<div class="bigClassDiv">
+						<el-switch v-model="SetingInfo.enable_laonianren_mf" size="large" active-text="开启"
+							inactive-text="关闭" :active-value="1" :inactive-value="0" />
+						<div v-if="SetingInfo.enable_laonianren_mf===1">
+							<div v-for="(item,index) in SetingInfo.laonianren_mf.fenlei" :key="index">
+								<div>分类：{{item.name}}</div>
+								<el-form-item class="bindinput" label="绑定体检类型:">
+									<el-input v-model="SetingInfo.laonianren_mf.fenlei[index].bind_check_type" />
+								</el-form-item>
+								<el-form-item class="bindinput" label="绑定单位id:">
+									<el-input v-model="SetingInfo.laonianren_mf.fenlei[index].bind_unit_id" />
+								</el-form-item>
+								<el-form-item class="bindinput" label="绑定分组id:">
+									<el-input v-model="SetingInfo.laonianren_mf.fenlei[index].bind_group_id" />
+								</el-form-item>
+								<el-form-item class="bindinput" label="绑定批次id:">
+									<el-input v-model="SetingInfo.laonianren_mf.fenlei[index].bind_batch_id" />
+								</el-form-item>
+							</div>
+						</div>
+
+
+					</div>
+				</el-form-item>
+				<el-form-item label="健康证免费体检">
+					<div class="bigClassDiv">
+						<el-switch v-model="SetingInfo.enable_jiankangzheng_mf" size="large" active-text="开启"
+							inactive-text="关闭" :active-value="1" :inactive-value="0" />
+						<div v-if="SetingInfo.enable_jiankangzheng_mf===1">
+							<div style="margin-top: 20px;" v-for="(item,index) in SetingInfo.jiankangzheng_mf.fenlei"
+								:key="index">
+								<div>分类：{{item.name}}
+									<el-switch style="margin-left: 20px;"
+										v-model="SetingInfo.jiankangzheng_mf.fenlei[index].enable_yuyue" size="large"
+										active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" />
+								</div>
+								<div v-show="SetingInfo.jiankangzheng_mf.fenlei[index].enable_yuyue===1">
+									<el-form-item class="bindinput" label="绑定体检类型:">
+										<el-input v-model="SetingInfo.jiankangzheng_mf.fenlei[index].bind_check_type" />
+									</el-form-item>
+									<el-form-item class="bindinput" label="绑定单位id:">
+										<el-input v-model="SetingInfo.jiankangzheng_mf.fenlei[index].bind_unit_id" />
+									</el-form-item>
+									<el-form-item class="bindinput" label="绑定分组id:">
+										<el-input v-model="SetingInfo.jiankangzheng_mf.fenlei[index].bind_group_id" />
+									</el-form-item>
+									<el-form-item class="bindinput" label="绑定批次id:">
+										<el-input v-model="SetingInfo.jiankangzheng_mf.fenlei[index].bind_batch_id" />
+									</el-form-item>
+								</div>
+
+							</div>
+						</div>
+
+					</div>
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="dialogVisible = false">取消</el-button>
+					<el-button type="primary" @click="Save">
+						确定
+					</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted
+	} from 'vue'
+	import {
+		ElMessage
+	} from 'element-plus'
+	import {
+		InstitutionGetList,
+		InstitutionSavdSeting,
+		InstitutionGetSetingDetail
+	} from '@/api/api.js'
+
+
+	let loading = ref(false)
+	let tableData = ref([])
+	let currentPage = ref(1) //当前页码
+	let pageSize = ref(15) //每页数量
+	let total = 0 //总数量
+	const PageSizeChange = (e) => { // 修改每页数量
+		pageSize.value = e
+		GetList()
+	}
+	const PageCurrentChange = (e) => { //切换页码
+		currentPage.value = e
+		GetList()
+	}
+
+	let searchInfo = ref({
+
+	})
+
+	const GetList = () => {
+		loading.value = true
+		InstitutionGetList({
+			page: currentPage.value,
+			pageSize: pageSize.value,
+			searchInfo: searchInfo.value
+		}).then(res => {
+			loading.value = false
+			if (res.status) {
+				tableData.value = res.data.list
+
+				total = res.data.count
+			} else {
+				ElMessage.error(res.msg)
+			}
+		})
+	}
+	let dialogVisible = ref(false);
+	let SetingInfo = ref({
+		institution_id: 0,
+		enable_yuyue: 0,
+		enable_laonianren_mf: 0,
+		enable_jiankangzheng_mf: 0,
+		laonianren_mf: {
+			fenlei: [{
+				enable_yuyue: 1,
+				name: '全部',
+				bind_check_type: '',
+				bind_unit_id: '',
+				bind_group_id: '',
+				bind_batch_id:''
+			}]
+		},
+		jiankangzheng_mf: {
+			fenlei: [{
+				enable_yuyue: 0,
+				name: '食品类',
+				bind_check_type: '',
+				bind_unit_id: '',
+				bind_group_id: '',
+				bind_batch_id:''
+			}, {
+				enable_yuyue: 0,
+				name: '化妆品类',
+				bind_check_type: '',
+				bind_unit_id: '',
+				bind_group_id: '',
+				bind_batch_id:''
+			}, {
+				enable_yuyue: 0,
+				name: '公共场所类',
+				bind_check_type: '',
+				bind_unit_id: '',
+				bind_group_id: '',
+				bind_batch_id:''
+			}, {
+				enable_yuyue: 0,
+				name: '生活饮用水类',
+				bind_check_type: '',
+				bind_unit_id: '',
+				bind_group_id: '',
+				bind_batch_id:''
+			}, {
+				enable_yuyue: 0,
+				name: '消毒产品生产类',
+				bind_check_type: '',
+				bind_unit_id: '',
+				bind_group_id: '',
+				bind_batch_id:''
+			}]
+		},
+	})
+	const seting = (id) => {
+		dialogVisible.value = true
+		SetingInfo.value.institution_id = id
+		GetDetail()
+	}
+	const Save = () => {
+		loading.value = true
+		console.log(SetingInfo.value);
+		InstitutionSavdSeting({
+			SetingInfo: SetingInfo.value
+		}).then(res => {
+			loading.value = false
+			if (res.status) {
+				dialogVisible.value = false
+				GetList()
+			} else {
+				ElMessage.error(res.msg)
+			}
+		})
+	}
+	const GetDetail = () => {
+		loading.value = true
+		InstitutionGetSetingDetail({
+			institution_id: SetingInfo.value.institution_id
+		}).then(res => {
+			loading.value = false
+			if (res.status) {
+				SetingInfo.value.enable_yuyue = res.data.info[0].enable_yuyue
+				SetingInfo.value.enable_laonianren_mf = res.data.info[0].enable_laonianren_mf
+				SetingInfo.value.enable_jiankangzheng_mf = res.data.info[0].enable_jiankangzheng_mf
+				if(res.data.seting.length>0){
+					SetingInfo.value.laonianren_mf.fenlei = []
+					SetingInfo.value.jiankangzheng_mf.fenlei = []
+				}
+				
+				res.data.seting.forEach(function(v, i) {
+					if (v.big_check_type == '老年人免费体检') {
+						v.name = v.small_check_type
+						SetingInfo.value.laonianren_mf.fenlei.push(v);
+					}
+					if (v.big_check_type == "健康证免费体检") {
+						v.name = v.small_check_type
+						SetingInfo.value.jiankangzheng_mf.fenlei.push(v);
+					}
+				})
+			} else {
+				ElMessage.error(res.msg)
+			}
+		})
+	}
+	onMounted(() => {
+		GetList()
+	})
+</script>
+
+<style scoped>
+	.page {
+		display: flex;
+		justify-content: flex-end;
+		margin-top: 10px;
+	}
+
+	.bindinput {
+		margin-top: 8px;
+	}
+</style>
\ No newline at end of file
diff --git a/mH5/.env.production b/mH5/.env.production
index 8726ebf..da99997 100644
--- a/mH5/.env.production
+++ b/mH5/.env.production
@@ -1,5 +1,5 @@
 ENV = 'production'
-VITE_APP_API = 'http://223.71.106.251:33581/common/la/public/api/'
-VITE_APP_WXCODE_URL = 'http://223.71.106.251:33581/common/la/public/wxLogin/production'
-VITE_APP_FILE_URL= 'http://223.71.106.251:33581/common/la/public/'
-VITE_APPID = "wx526430047d34c85c"
+VITE_APP_API = 'http://223.71.106.251:82/common/la/public/api/'
+VITE_APP_WXCODE_URL = 'http://223.71.106.251:82/common/la/public/wxLogin/production'
+VITE_APP_FILE_URL= 'http://223.71.106.251:82/common/la/public/'
+VITE_APPID = "wx526430047d34c85c"
\ No newline at end of file
diff --git a/mH5/package-lock.json b/mH5/package-lock.json
index 0505d33..3cd39a2 100644
--- a/mH5/package-lock.json
+++ b/mH5/package-lock.json
@@ -9,11 +9,11 @@
       "version": "0.0.0",
       "dependencies": {
         "axios": "^1.5.1",
-        "pdfjs-dist": "^4.0.269",
         "pinia": "^2.1.6",
         "vant": "^4.7.0",
         "vue": "^3.3.4",
-        "vue-router": "^4.2.4"
+        "vue-router": "^4.2.4",
+        "vue3-pdf-app": "^1.0.3"
       },
       "devDependencies": {
         "@rushstack/eslint-patch": "^1.3.3",
@@ -554,26 +554,6 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@mapbox/node-pre-gyp": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
-      "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
-      "optional": true,
-      "dependencies": {
-        "detect-libc": "^2.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "make-dir": "^3.1.0",
-        "node-fetch": "^2.6.7",
-        "nopt": "^5.0.0",
-        "npmlog": "^5.0.1",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.5",
-        "tar": "^6.1.11"
-      },
-      "bin": {
-        "node-pre-gyp": "bin/node-pre-gyp"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -992,12 +972,6 @@
       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
       "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="
     },
-    "node_modules/abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "optional": true
-    },
     "node_modules/acorn": {
       "version": "8.11.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
@@ -1019,18 +993,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "optional": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
     "node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -1051,7 +1013,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -1071,25 +1033,6 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/aproba": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
-      "optional": true
-    },
-    "node_modules/are-we-there-yet": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
-      "optional": true,
-      "dependencies": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -1115,7 +1058,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/big-integer": {
       "version": "1.6.51",
@@ -1148,7 +1091,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -1198,21 +1141,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/canvas": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
-      "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
-      "hasInstallScript": true,
-      "optional": true,
-      "dependencies": {
-        "@mapbox/node-pre-gyp": "^1.0.0",
-        "nan": "^2.17.0",
-        "simple-get": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -1229,15 +1157,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "optional": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -1256,15 +1175,6 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "optional": true,
-      "bin": {
-        "color-support": "bin.js"
-      }
-    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -1288,13 +1198,7 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "devOptional": true
-    },
-    "node_modules/console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
-      "optional": true
+      "dev": true
     },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
@@ -1331,7 +1235,7 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -1344,18 +1248,6 @@
         }
       }
     },
-    "node_modules/decompress-response": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-      "optional": true,
-      "dependencies": {
-        "mimic-response": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -1416,21 +1308,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
-      "optional": true
-    },
-    "node_modules/detect-libc": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz",
-      "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -1443,12 +1320,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "optional": true
-    },
     "node_modules/esbuild": {
       "version": "0.18.20",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
@@ -1969,35 +1840,11 @@
         "node": ">= 6"
       }
     },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "optional": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/fs-minipass/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "optional": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
@@ -2013,26 +1860,6 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/gauge": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
-      "optional": true,
-      "dependencies": {
-        "aproba": "^1.0.3 || ^2.0.0",
-        "color-support": "^1.1.2",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.1",
-        "object-assign": "^4.1.1",
-        "signal-exit": "^3.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wide-align": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -2049,7 +1876,7 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -2107,25 +1934,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
-      "optional": true
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "optional": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/human-signals": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
@@ -2173,7 +1981,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -2183,7 +1991,7 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/is-docker": {
       "version": "3.0.0",
@@ -2209,15 +2017,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -2394,7 +2193,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -2413,30 +2212,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "optional": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "optional": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -2493,23 +2268,11 @@
         "node": ">=6"
       }
     },
-    "node_modules/mimic-response": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -2517,63 +2280,11 @@
         "node": "*"
       }
     },
-    "node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "optional": true,
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "optional": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "optional": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "devOptional": true
-    },
-    "node_modules/nan": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
-      "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==",
-      "optional": true
+      "dev": true
     },
     "node_modules/nanoid": {
       "version": "3.3.6",
@@ -2598,41 +2309,6 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
-    "node_modules/node-fetch": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-      "optional": true,
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "optional": true,
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
@@ -2645,18 +2321,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/npmlog": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
-      "optional": true,
-      "dependencies": {
-        "are-we-there-yet": "^2.0.0",
-        "console-control-strings": "^1.1.0",
-        "gauge": "^3.0.0",
-        "set-blocking": "^2.0.0"
-      }
-    },
     "node_modules/nth-check": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
@@ -2669,20 +2333,11 @@
         "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "wrappy": "1"
       }
@@ -2792,7 +2447,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2806,27 +2461,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/path2d-polyfill": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path2d-polyfill/-/path2d-polyfill-2.0.1.tgz",
-      "integrity": "sha512-ad/3bsalbbWhmBo0D6FZ4RNMwsLsPpL6gnvhuSaU5Vm7b06Kr5ubSltQQ0T7YKsiJQO+g22zJ4dJKNTXIyOXtA==",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pdfjs-dist": {
-      "version": "4.0.269",
-      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-4.0.269.tgz",
-      "integrity": "sha512-jjWO56tcOjnmPqDf8PmXDeZ781AGvpHMYI3HhNtaFKTRXXPaD1ArSrhVe38/XsrIQJ0onISCND/vuXaWJkiDWw==",
-      "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "canvas": "^2.11.2",
-        "path2d-polyfill": "^2.0.1"
-      }
-    },
     "node_modules/picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -2979,20 +2613,6 @@
         }
       ]
     },
-    "node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "optional": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -3016,7 +2636,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -3104,31 +2724,11 @@
         "queue-microtask": "^1.2.2"
       }
     },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "optional": true
-    },
     "node_modules/semver": {
       "version": "7.5.4",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
       "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -3139,12 +2739,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "optional": true
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -3170,38 +2764,7 @@
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "devOptional": true
-    },
-    "node_modules/simple-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "optional": true
-    },
-    "node_modules/simple-get": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
-      "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
-      "optional": true,
-      "dependencies": {
-        "decompress-response": "^4.2.0",
-        "once": "^1.3.1",
-        "simple-concat": "^1.0.0"
-      }
+      "dev": true
     },
     "node_modules/source-map": {
       "version": "0.6.1",
@@ -3234,34 +2797,11 @@
         "source-map": "^0.6.0"
       }
     },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "optional": true,
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "optional": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -3318,23 +2858,6 @@
         "url": "https://opencollective.com/unts"
       }
     },
-    "node_modules/tar": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
-      "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",
-      "optional": true,
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^5.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/terser": {
       "version": "5.24.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz",
@@ -3385,12 +2908,6 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "optional": true
-    },
     "node_modules/tslib": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
@@ -3443,7 +2960,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/uuid": {
       "version": "9.0.1",
@@ -3615,20 +3132,12 @@
         "vue": "^3.2.0"
       }
     },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "optional": true
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "optional": true,
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
+    "node_modules/vue3-pdf-app": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/vue3-pdf-app/-/vue3-pdf-app-1.0.3.tgz",
+      "integrity": "sha512-qegWTIF4wYKiocZ3KreB70wRXhqSdXWbdERDyyKzT7d5PbjKbS9tD6vaKkCqh3PzTM84NyKPYrQ3iuwJb60YPQ==",
+      "peerDependencies": {
+        "vue": "^3.0.0"
       }
     },
     "node_modules/which": {
@@ -3646,20 +3155,11 @@
         "node": ">= 8"
       }
     },
-    "node_modules/wide-align": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-      "optional": true,
-      "dependencies": {
-        "string-width": "^1.0.2 || 2 || 3 || 4"
-      }
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/xml-name-validator": {
       "version": "4.0.0",
@@ -3674,7 +3174,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
@@ -3974,23 +3474,6 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "@mapbox/node-pre-gyp": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
-      "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
-      "optional": true,
-      "requires": {
-        "detect-libc": "^2.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "make-dir": "^3.1.0",
-        "node-fetch": "^2.6.7",
-        "nopt": "^5.0.0",
-        "npmlog": "^5.0.1",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.5",
-        "tar": "^6.1.11"
-      }
-    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -4270,12 +3753,6 @@
       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
       "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="
     },
-    "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "optional": true
-    },
     "acorn": {
       "version": "8.11.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
@@ -4289,15 +3766,6 @@
       "dev": true,
       "requires": {}
     },
-    "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "optional": true,
-      "requires": {
-        "debug": "4"
-      }
-    },
     "ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -4314,7 +3782,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "devOptional": true
+      "dev": true
     },
     "ansi-styles": {
       "version": "4.3.0",
@@ -4325,22 +3793,6 @@
         "color-convert": "^2.0.1"
       }
     },
-    "aproba": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
-      "optional": true
-    },
-    "are-we-there-yet": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
-      "optional": true,
-      "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^3.6.0"
-      }
-    },
     "argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -4366,7 +3818,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "devOptional": true
+      "dev": true
     },
     "big-integer": {
       "version": "1.6.51",
@@ -4393,7 +3845,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -4431,17 +3883,6 @@
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true
     },
-    "canvas": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
-      "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
-      "optional": true,
-      "requires": {
-        "@mapbox/node-pre-gyp": "^1.0.0",
-        "nan": "^2.17.0",
-        "simple-get": "^3.0.3"
-      }
-    },
     "chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -4452,12 +3893,6 @@
         "supports-color": "^7.1.0"
       }
     },
-    "chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "optional": true
-    },
     "color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -4473,12 +3908,6 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "optional": true
-    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -4499,13 +3928,7 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "devOptional": true
-    },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
-      "optional": true
+      "dev": true
     },
     "cross-spawn": {
       "version": "7.0.3",
@@ -4533,20 +3956,11 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
     },
-    "decompress-response": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-      "optional": true,
-      "requires": {
-        "mimic-response": "^2.0.0"
-      }
-    },
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -4586,18 +4000,6 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
     },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
-      "optional": true
-    },
-    "detect-libc": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz",
-      "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==",
-      "optional": true
-    },
     "doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -4607,12 +4009,6 @@
         "esutils": "^2.0.2"
       }
     },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "optional": true
-    },
     "esbuild": {
       "version": "0.18.20",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
@@ -4972,31 +4368,11 @@
         "mime-types": "^2.1.12"
       }
     },
-    "fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "optional": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      },
-      "dependencies": {
-        "minipass": {
-          "version": "3.3.6",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-          "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-          "optional": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        }
-      }
-    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "devOptional": true
+      "dev": true
     },
     "fsevents": {
       "version": "2.3.3",
@@ -5005,23 +4381,6 @@
       "dev": true,
       "optional": true
     },
-    "gauge": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
-      "optional": true,
-      "requires": {
-        "aproba": "^1.0.3 || ^2.0.0",
-        "color-support": "^1.1.2",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.1",
-        "object-assign": "^4.1.1",
-        "signal-exit": "^3.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wide-align": "^1.1.2"
-      }
-    },
     "get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -5032,7 +4391,7 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -5072,22 +4431,6 @@
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true
     },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
-      "optional": true
-    },
-    "https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "optional": true,
-      "requires": {
-        "agent-base": "6",
-        "debug": "4"
-      }
-    },
     "human-signals": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
@@ -5120,7 +4463,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -5130,7 +4473,7 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "devOptional": true
+      "dev": true
     },
     "is-docker": {
       "version": "3.0.0",
@@ -5144,12 +4487,6 @@
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true
     },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "optional": true
-    },
     "is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -5280,7 +4617,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "yallist": "^4.0.0"
       }
@@ -5293,23 +4630,6 @@
         "@jridgewell/sourcemap-codec": "^1.4.15"
       }
     },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "optional": true,
-      "requires": {
-        "semver": "^6.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "optional": true
-        }
-      }
-    },
     "merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -5351,65 +4671,20 @@
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true
     },
-    "mimic-response": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
-      "optional": true
-    },
     "minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
     },
-    "minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "optional": true
-    },
-    "minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "optional": true,
-      "requires": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "dependencies": {
-        "minipass": {
-          "version": "3.3.6",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-          "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-          "optional": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        }
-      }
-    },
-    "mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "optional": true
-    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "devOptional": true
-    },
-    "nan": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
-      "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==",
-      "optional": true
+      "dev": true
     },
     "nanoid": {
       "version": "3.3.6",
@@ -5422,24 +4697,6 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
-    "node-fetch": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-      "optional": true,
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      }
-    },
-    "nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "optional": true,
-      "requires": {
-        "abbrev": "1"
-      }
-    },
     "npm-run-path": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
@@ -5449,18 +4706,6 @@
         "path-key": "^3.0.0"
       }
     },
-    "npmlog": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
-      "optional": true,
-      "requires": {
-        "are-we-there-yet": "^2.0.0",
-        "console-control-strings": "^1.1.0",
-        "gauge": "^3.0.0",
-        "set-blocking": "^2.0.0"
-      }
-    },
     "nth-check": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
@@ -5470,17 +4715,11 @@
         "boolbase": "^1.0.0"
       }
     },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "optional": true
-    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -5557,7 +4796,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "devOptional": true
+      "dev": true
     },
     "path-key": {
       "version": "3.1.1",
@@ -5565,21 +4804,6 @@
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true
     },
-    "path2d-polyfill": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path2d-polyfill/-/path2d-polyfill-2.0.1.tgz",
-      "integrity": "sha512-ad/3bsalbbWhmBo0D6FZ4RNMwsLsPpL6gnvhuSaU5Vm7b06Kr5ubSltQQ0T7YKsiJQO+g22zJ4dJKNTXIyOXtA==",
-      "optional": true
-    },
-    "pdfjs-dist": {
-      "version": "4.0.269",
-      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-4.0.269.tgz",
-      "integrity": "sha512-jjWO56tcOjnmPqDf8PmXDeZ781AGvpHMYI3HhNtaFKTRXXPaD1ArSrhVe38/XsrIQJ0onISCND/vuXaWJkiDWw==",
-      "requires": {
-        "canvas": "^2.11.2",
-        "path2d-polyfill": "^2.0.1"
-      }
-    },
     "picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -5658,17 +4882,6 @@
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true
     },
-    "readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "optional": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
     "resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -5685,7 +4898,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "glob": "^7.1.3"
       }
@@ -5736,27 +4949,15 @@
         "queue-microtask": "^1.2.2"
       }
     },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "optional": true
-    },
     "semver": {
       "version": "7.5.4",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
       "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "lru-cache": "^6.0.0"
       }
     },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "optional": true
-    },
     "shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -5776,24 +4977,7 @@
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "devOptional": true
-    },
-    "simple-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-      "optional": true
-    },
-    "simple-get": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
-      "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
-      "optional": true,
-      "requires": {
-        "decompress-response": "^4.2.0",
-        "once": "^1.3.1",
-        "simple-concat": "^1.0.0"
-      }
+      "dev": true
     },
     "source-map": {
       "version": "0.6.1",
@@ -5820,31 +5004,11 @@
         "source-map": "^0.6.0"
       }
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "optional": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "optional": true,
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      }
-    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "ansi-regex": "^5.0.1"
       }
@@ -5880,20 +5044,6 @@
         "tslib": "^2.5.0"
       }
     },
-    "tar": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
-      "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",
-      "optional": true,
-      "requires": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^5.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      }
-    },
     "terser": {
       "version": "5.24.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz",
@@ -5929,12 +5079,6 @@
         "is-number": "^7.0.0"
       }
     },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "optional": true
-    },
     "tslib": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
@@ -5975,7 +5119,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "devOptional": true
+      "dev": true
     },
     "uuid": {
       "version": "9.0.1",
@@ -6057,21 +5201,11 @@
         "@vue/devtools-api": "^6.5.0"
       }
     },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "optional": true
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "optional": true,
-      "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
+    "vue3-pdf-app": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/vue3-pdf-app/-/vue3-pdf-app-1.0.3.tgz",
+      "integrity": "sha512-qegWTIF4wYKiocZ3KreB70wRXhqSdXWbdERDyyKzT7d5PbjKbS9tD6vaKkCqh3PzTM84NyKPYrQ3iuwJb60YPQ==",
+      "requires": {}
     },
     "which": {
       "version": "2.0.2",
@@ -6082,20 +5216,11 @@
         "isexe": "^2.0.0"
       }
     },
-    "wide-align": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-      "optional": true,
-      "requires": {
-        "string-width": "^1.0.2 || 2 || 3 || 4"
-      }
-    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "devOptional": true
+      "dev": true
     },
     "xml-name-validator": {
       "version": "4.0.0",
@@ -6107,7 +5232,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "devOptional": true
+      "dev": true
     },
     "yocto-queue": {
       "version": "0.1.0",
diff --git a/mH5/package.json b/mH5/package.json
index dc0403d..b9e76c4 100644
--- a/mH5/package.json
+++ b/mH5/package.json
@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "axios": "^1.5.1",
-    "pdfjs-dist": "^4.0.269",
     "pinia": "^2.1.6",
     "vant": "^4.7.0",
     "vue": "^3.3.4",
-    "vue-router": "^4.2.4"
+    "vue-router": "^4.2.4",
+    "vue3-pdf-app": "^1.0.3"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.3.3",
diff --git a/mH5/src/api/api.js b/mH5/src/api/api.js
index c09d13c..c6f7ed3 100644
--- a/mH5/src/api/api.js
+++ b/mH5/src/api/api.js
@@ -56,4 +56,9 @@ export const AppGetUserInfo =   (data) =>  {
 //获取行业列表
 export const GetIndustryList =   (data) =>  {
     	return 	axios({url:import.meta.env.VITE_APP_API+'v1/mH5/GetIndustryList',data:data})
+}
+
+//根据链接获取体检那边的pdf
+export const GetPersonPdfDetailByLink =   (data) =>  {
+    	return 	axios({url:import.meta.env.VITE_APP_API+'v1/mH5/GetPersonPdfDetailByLink',data:data,responseType: 'blob'})
 }
\ No newline at end of file
diff --git a/mH5/src/router/index.js b/mH5/src/router/index.js
index a966f57..a358221 100644
--- a/mH5/src/router/index.js
+++ b/mH5/src/router/index.js
@@ -56,6 +56,10 @@ const router = createRouter({
 		path: '/uploadFiles',
 		name: 'UploadFiles',
 		component: () => import('../views/UploadFiles.vue')
+	},{
+		path: '/uploadFilesNoApp',
+		name: 'UploadFilesNoApp',
+		component: () => import('../views/UploadFilesNoApp.vue')
 	},{
 		path: '/previewReport',
 		name: 'PreviewReport',
diff --git a/mH5/src/tools/axios.js b/mH5/src/tools/axios.js
index 422b099..09ae911 100644
--- a/mH5/src/tools/axios.js
+++ b/mH5/src/tools/axios.js
@@ -14,10 +14,10 @@ axios.interceptors.request.use(
 		// config.data = {
 		//     originalData: originalRequest.data ,// 携带原来请求的参数
 		// 	originalUrl: originalRequest.url ,// 携带原来请求的参数
-		
+
 		//   };
 		// config.url = 'http://daxing-middle/redirect_api'; // 将请求重定向到同一个接口
-		
+
 		return config
 	},
 	err => {
@@ -28,7 +28,10 @@ axios.interceptors.request.use(
 axios.interceptors.response.use(
 	async response => {
 			const res = response.data
-      //    console.log(response)
+
+			if (res instanceof Blob) {
+				return res
+			}
 			if (res.code !== 200) {
 				if (res.code == 10001) { //token验证出错
 					window.location.href = "./#/login"
@@ -124,4 +127,4 @@ function TokenRefresh() {
 
 }
 
-export  default axios
\ No newline at end of file
+export default axios
\ No newline at end of file
diff --git a/mH5/src/views/HealthCertificate.vue b/mH5/src/views/HealthCertificate.vue
index 927db67..d4adeeb 100644
--- a/mH5/src/views/HealthCertificate.vue
+++ b/mH5/src/views/HealthCertificate.vue
@@ -8,13 +8,13 @@
 					<div class="left_xia">
 						<div>类型：{{reportinfo.industry_type}}</div>
 						<div>日期：{{reportinfo.tijian_time.substring(0,10)}}</div>
-						<div>编号：1235454546</div>
+						<!-- <div>编号：1235454546</div> -->
 					</div>
 				</div>
 				<div class="right">
 					<div class="right_shang">
 						<div class="erweima">
-							<img src="@/assets/image/erweima.jpg">
+							<!-- <img src="@/assets/image/erweima.jpg"> -->
 						</div>
 						<div class="userinfo">
 							<div class="name">{{reportinfo.name}}<span class="sex" v-if="reportinfo.sex==1">(男)</span><span class="sex" v-if="reportinfo.sex==2">(女)</span></div>
@@ -31,7 +31,7 @@
 							<tr v-for="(item,index) in reportinfo.items">
 								<td>{{item.item_name}}</td>
 								<td>合格</td>
-								<td>2022-05-01</td>
+								<td>-</td>
 							</tr>
 							 
 						</table>
@@ -41,7 +41,7 @@
 			<div class="bottom">22</div>
 		</div>
 		<div class="zhang">
-			<img src="@/assets/image/zhang.png">
+			<!-- <img src="@/assets/image/zhang.png"> -->
 		</div>
 	</div>
 </template>
diff --git a/mH5/src/views/PreviewReport.vue b/mH5/src/views/PreviewReport.vue
index c559942..6fda77c 100644
--- a/mH5/src/views/PreviewReport.vue
+++ b/mH5/src/views/PreviewReport.vue
@@ -1,24 +1,79 @@
 <template>
 	<div>
-		
+		<vue-pdf-app style="height: 100vh; width: 100vw" :pdf="pdfData"></vue-pdf-app>
 	</div>
 </template>
 
 <script setup>
-	import { ref, onMounted } from 'vue';
+	import {
+		ref,
+		reactive,
+		nextTick,
+		onMounted
+	} from 'vue';
+	import {
+		GetPersonPdfDetailByLink
+	} from "@/api/api.js";
+	import {
+		useRoute,
+		useRouter
+	} from "vue-router"
+	import {
+		showToast,
+		showDialog
+	} from 'vant';
+	// pdf
+	import VuePdfApp from "vue3-pdf-app";
+	import "vue3-pdf-app/dist/icons/main.css";
 
- 	import { useRoute,useRouter  } from "vue-router"
 	const route = useRoute()
 	const router = useRouter()
-	let tijian_file =import.meta.env.VITE_APP_FILE_URL+ route.query.tijian_num  //获取到体检流水号
-	 console.log(tijian_file)
-onMounted(()=>{
-
-	  window.location.href=tijian_file
-	 
-	    
-	 
-})
+	let loading = ref(false);
+	let pdf_num = route.query.pdf_num //获取到pdf array的key
+	let recordid = route.query.recordid
+
+
+
+	let pdfData = ref(null);
+
+	let filePath = ref(
+		'https://bgdq-api.sixinyun.com/storage/assets/upload/pdf/2306070013/3309d209-1e10-4475-a1ac-bf437e748feb.pdf');
+
+
+	const getPdf = () => {
+		loading.value = true
+		GetPersonPdfDetailByLink({
+			recordid: recordid,
+			pdf_num: pdf_num
+		}).then(res => {
+			loading.value = false
+
+			console.log(res)
+
+			// const blob = new Blob([res], { type: 'application/pdf;charset=UTF-8' }); // 根据实际图片类型调整
+			//     const imageUrl =  URL.createObjectURL(blob);
+
+			// 	 pdfData.value=imageUrl
+			const binaryData = []
+			binaryData.push(res) //res就是pdf流文件
+			//获取blob链接
+			pdfData.value = window.URL.createObjectURL(new Blob(binaryData, {
+				type: 'application/pdf'
+			}))
+
+
+
+
+		})
+	}
+
+	onMounted(() => {
+		getPdf()
+		//  window.location.href=tijian_file
+
+
+
+	})
 </script>
 
 <style>
diff --git a/mH5/src/views/SelectIndustry.vue b/mH5/src/views/SelectIndustry.vue
index 4ebe3a4..b1a1609 100644
--- a/mH5/src/views/SelectIndustry.vue
+++ b/mH5/src/views/SelectIndustry.vue
@@ -1,9 +1,9 @@
 <template>
 	<div class="DocumentSubmit">
 		<van-steps active="0" active-icon="checked" active-color="#33cdc9">
-		  <van-step>类型选择</van-step>
-		  <van-step>选择日期</van-step>
-		  <van-step>预约完成</van-step>
+			<van-step>类型选择</van-step>
+			<van-step>选择日期</van-step>
+			<van-step>预约完成</van-step>
 		</van-steps>
 		<div class="head">
 			请选择您的从业场所
@@ -12,17 +12,18 @@
 			选择您所在的行业类型
 		</div>
 		<van-radio-group v-model="type" class="radioGroup">
-		
-			<div v-for=" item in DocInfo" :key="item.id" class="item" :class="type==item.id?'active':''" @click="check(item.id,item.name)">
-				<div class="logo"><img  :src="item.img"/></div>
+
+			<div v-for=" (item,index) in DocInfo" :key="item.id" class="item" :class="type==item.id?'active':''"
+				@click="check(item.id,item.name,index)">
+				<div class="logo"><img :src="BaseUrl+item.img" /></div>
 				<div class="name">
-					
-				 <van-radio checked-color="#33cdc9" :name="item.id" style="margin-right: 10px;"></van-radio>
-				 {{item.name}} 
+
+					<van-radio checked-color="#33cdc9" :name="item.id" style="margin-right: 10px;"></van-radio>
+					{{item.name}}
 				</div>
 			</div>
 		</van-radio-group>
-		<van-button v-if="type" type="primary" class="button" round   @click="to()">下一步</van-button>
+		<van-button v-if="type" type="primary" class="button" round @click="to()">下一步</van-button>
 
 	</div>
 </template>
@@ -37,56 +38,63 @@
 		GetIndustryList
 	} from "@/api/api.js";
 	import {
-		ref,onMounted
+		ref,
+		onMounted
 	} from 'vue';
 
 	import {
 		showDialog
 	} from 'vant';
-	import {useRouter} from "vue-router"
+	import {
+		useRouter
+	} from "vue-router"
 	import {
 		usePiniaStore
 	} from '@/stores/index.js'
-	const pinia=usePiniaStore()
+	const pinia = usePiniaStore()
 	const router = useRouter();
 	console.log(pinia.yuyue_info)
 
-	let type=ref('')
-	let DocInfo=ref([])
+	let type = ref('')
+	let DocInfo = ref([])
+	let BaseUrl = import.meta.env.VITE_APP_FILE_URL
+	
+	let info = pinia.yuyue_info
+	const check = (id, label,index) => {
 
-	const check=(id,label)=>{
-		let info = pinia.yuyue_info
-		info.doc_id=id
-		info.doc_name=label
+		info.doc_id = id
+		info.doc_name = label
 		pinia.ChangeYuYueInfo(info)
 		console.log(pinia.yuyue_info)
-		
-		type.value=id
+
+		type.value = id
 		showDialog({
-		  title:DocInfo.value[id-1].label,
-		  message:DocInfo.value[id-1].content,
-		  messageAlign:'left',
-		  confirmButtonText:'我已经知晓',
-		  theme: 'round-button',
-		  confirmButtonColor:"#33cdc9"
+			title: DocInfo.value[index].name,
+			message: DocInfo.value[index].content,
+			messageAlign: 'left',
+			confirmButtonText: '我已经知晓',
+			theme: 'round-button',
+			confirmButtonColor: "#33cdc9"
 		}).then(() => {
-		   
+
 		});
 	}
-	let loading=ref(false)
-	const to=()=>{
-	//	router.push('/selectDate')
-	router.push('/uploadFiles')
+	let loading = ref(false)
+	const to = () => {
+		//	router.push('/selectDate')
+		router.push('/uploadFiles')
 	}
-	onMounted(()=>{
-		loading.value=true
-		GetIndustryList().then(res => {
-			loading.value=false
+	onMounted(() => {
+		loading.value = true
+		GetIndustryList({
+			institution_id:info.org_id
+		}).then(res => {
+			loading.value = false
 			if (res.status == true) {
-			 DocInfo.value=res.data
-			 DocInfo.value.forEach((v,i)=>{
-				 DocInfo.value[i].content=v.content.replace(/\\n/g, '\n');
-			 })
+				DocInfo.value = res.data
+				DocInfo.value.forEach((v, i) => {
+					DocInfo.value[i].content = v.content.replace(/\\n/g, '\n');
+				})
 			} else {
 				showToast(res.msg);
 			}
@@ -95,7 +103,7 @@
 </script>
 
 <style scoped>
-	.DocumentSubmit{
+	.DocumentSubmit {
 		height: 100vh;
 		background-image: url('../assets/image/r_head2.jpg');
 		background-size: 50vw;
@@ -103,13 +111,15 @@
 		background-position: 100% 100%;
 		padding: 20px;
 	}
-	.head{
+
+	.head {
 		font-size: 24px;
 		font-weight: 700;
 		color: #175e5c;
 		padding-top: 20px;
 	}
-	.item{
+
+	.item {
 		display: flex;
 		border: 1px solid #c7f3f6;
 		border-radius: 10px;
@@ -117,22 +127,26 @@
 		background: linear-gradient(to right, #aee3f1, #fff);
 		margin-top: 15px;
 	}
-	.active{
+
+	.active {
 		border: 2px solid #33cdc9;
 	}
-	.item .logo{
+
+	.item .logo {
 		width: 30%;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
+
 	}
-	.item .logo img{
-		height:60px ;
+
+	.item .logo img {
+		height: 60px;
 		position: relative;
 		border-radius: 50%;
 	}
-	.item .name{
+
+	.item .name {
 		width: 70%;
 		display: flex;
 		align-items: center;
@@ -142,7 +156,8 @@
 		font-weight: 700;
 		color: #414141;
 	}
-	.button{
+
+	.button {
 		width: calc(100vw - 40px);
 		background-color: #33cdc9;
 		border: 0px;
@@ -150,22 +165,23 @@
 		bottom: 20px;
 		border: 3px solid #fff;
 	}
-	.radioGroup{
-	 
- 
-	}
+
+	.radioGroup {}
 </style>
 <style>
 	.van-step__title {
-	  font-size: 16px !important;
+		font-size: 16px !important;
 	}
-	.van-step__icon{
-	  font-size: 20px !important;
+
+	.van-step__icon {
+		font-size: 20px !important;
 	}
+
 	.van-step__circle-container {
-		top:35px !important;
+		top: 35px !important;
 	}
-	.van-step__line{
-		top:35px !important;
+
+	.van-step__line {
+		top: 35px !important;
 	}
 </style>
\ No newline at end of file
diff --git a/mH5/src/views/SelectOrganization.vue b/mH5/src/views/SelectOrganization.vue
index e9b32d2..d6be76a 100644
--- a/mH5/src/views/SelectOrganization.vue
+++ b/mH5/src/views/SelectOrganization.vue
@@ -73,7 +73,7 @@
 	}
 	const getList = () => {
 		loading.value = true
-		GetOrgEnableList().then(res => {
+		GetOrgEnableList({yuyue_type:'jiankangzheng_mf'}).then(res => {
 			loading.value = false
 			if (res.status) {
 				orgList.value = res.list
diff --git a/mH5/src/views/ShowReport.vue b/mH5/src/views/ShowReport.vue
index abee48c..9e5a969 100644
--- a/mH5/src/views/ShowReport.vue
+++ b/mH5/src/views/ShowReport.vue
@@ -36,6 +36,13 @@
             </van-row>
 
         </div>
+		<van-popup v-model:show="showPicker" round position="bottom">
+		  <van-picker
+		    :columns="columns"
+		    @cancel="showPicker = false"
+		    @confirm="selectPDF"
+		  />
+		</van-popup>
     </div>
 </template>
 <script setup>
@@ -91,6 +98,14 @@ const getDetail=()=>{
 		 loading.value=false
 			if (res.status) {
 				 reportinfo.value=res.data.info
+				 for(var i=0;i<reportinfo.value.pdfs;i++){
+					 let ii=0;
+					 ii=i+1;
+					 console.log(999)
+					columns.value.push({text:'报告'+ii,value:i}); 
+				 }
+					 
+				 console.log(columns.value);
 			} else {
 				showToast(res.msg);
 			}
@@ -99,10 +114,25 @@ const getDetail=()=>{
 }
 //跳转查看报告
 const previewReport=()=>{
-	console.log(reportinfo.value)
-	if(reportinfo.value.report_file !=undefined &&   reportinfo.value.report_file.length>2){
-		//router.push('/previewReport?tijian_num='+reportinfo.value.report_file)
-		  window.location.href=import.meta.env.VITE_APP_FILE_URL+  reportinfo.value.report_file
+	// if(reportinfo.value.report_file !=undefined &&   reportinfo.value.report_file.length>2){
+	// 	//router.push('/previewReport?tijian_num='+reportinfo.value.report_file)
+	// 	  window.location.href=import.meta.env.VITE_APP_FILE_URL+  reportinfo.value.report_file
+	// }else{
+	// 	showDialog({
+	// 		title: '通知',
+	// 		message: "暂无报告可查询",
+	// 		messageAlign: 'left',
+	// 		confirmButtonText: '好的',
+	// 		theme: 'round-button',
+	// 		confirmButtonColor: "#33cdc9"
+	// 	}).then(() => {
+		
+	// 	});
+	// }
+	if(reportinfo.value.pdfs>0){
+		showPicker.value=true;
+		
+		
 	}else{
 		showDialog({
 			title: '通知',
@@ -115,7 +145,6 @@ const previewReport=()=>{
 		
 		});
 	}
-	
 }
 const gotoHealthCertificate=()=>{
 	if(reportinfo.value.result_status==1){
@@ -124,6 +153,14 @@ const gotoHealthCertificate=()=>{
 		showToast('暂无对应此次体检结果的健康证');
 	}
 }
+let showPicker=ref(false);
+let columns = ref([])
+const selectPDF=({ selectedOptions })=>{
+	 showPicker.value = false;
+	console.log(selectedOptions[0].value) ;
+	
+	router.push('/previewReport?recordid='+reportinfo.value.id+'&pdf_num='+selectedOptions[0].value)
+}
 onMounted(()=>{
 	getDetail() 
 })
diff --git a/mH5/src/views/UploadFiles - 副本.vue b/mH5/src/views/UploadFilesNoApp.vue
similarity index 94%
rename from mH5/src/views/UploadFiles - 副本.vue
rename to mH5/src/views/UploadFilesNoApp.vue
index cec8326..117cb67 100644
--- a/mH5/src/views/UploadFiles - 副本.vue	
+++ b/mH5/src/views/UploadFilesNoApp.vue
@@ -16,9 +16,9 @@
 			</div>
 			<van-uploader :ref="`uploader${index}`" accept="" :name="index" :key="index" :after-read="afterRead"
 				v-model="needinfo.fileList[index].fileurl" preview-size="2.5rem" multiple>
-				<!-- <van-button icon="plus" plain size="small"  type="primary">上传文件</van-button> -->
+				<van-button icon="plus" plain size="small"  type="primary">上传文件</van-button>
 			</van-uploader>
-			<van-button icon="plus" plain size="small" @click="callAPP(index)" type="primary">上传文件</van-button>
+			<!-- <van-button icon="plus" plain size="small" @click="callAPP(index)" type="primary">上传文件</van-button> -->
 
 		</div>
 		<van-button type="primary" class="button" round @click="to()">下一步</van-button>