郭文星 / wyc.tenyes.cn · 提交

转到一个项目

作者 郭文星
提交 53565395c1f4b98a9757157965ab2c0433b71c5b 1 个父辈 36553833

123

内嵌 并排对比
正在显示 2 个修改的文件 包含 26 行增加 和 151 行删除
@@ -164,51 +164,13 @@ @@ -164,51 +164,13 @@
164 {:build_heading(null, false)} 164 {:build_heading(null, false)}
165 <ul class="nav nav-tabs"> 165 <ul class="nav nav-tabs">
166 <li class="active"><a href="#one" data-toggle="tab">{:__('Dashboard')}</a></li> 166 <li class="active"><a href="#one" data-toggle="tab">{:__('Dashboard')}</a></li>
167 - <li><a href="#two" data-toggle="tab">{:__('Custom')}</a></li>  
168 </ul> 167 </ul>
169 </div> 168 </div>
170 <div class="panel-body"> 169 <div class="panel-body">
171 <div id="myTabContent" class="tab-content"> 170 <div id="myTabContent" class="tab-content">
172 <div class="tab-pane fade active in" id="one"> 171 <div class="tab-pane fade active in" id="one">
173 172
174 - <div class="row">  
175 - <div class="col-sm-3 col-xs-6">  
176 - <div class="sm-st clearfix">  
177 - <span class="sm-st-icon st-red"><i class="fa fa-users"></i></span>  
178 - <div class="sm-st-info">  
179 - <span>{$totaluser}</span>  
180 - {:__('Total user')}  
181 - </div>  
182 - </div>  
183 - </div>  
184 - <div class="col-sm-3 col-xs-6">  
185 - <div class="sm-st clearfix">  
186 - <span class="sm-st-icon st-violet"><i class="fa fa-magic"></i></span>  
187 - <div class="sm-st-info">  
188 - <span>{$totaladdon}</span>  
189 - {:__('Total addon')}  
190 - </div>  
191 - </div>  
192 - </div>  
193 - <div class="col-sm-3 col-xs-6">  
194 - <div class="sm-st clearfix">  
195 - <span class="sm-st-icon st-blue"><i class="fa fa-leaf"></i></span>  
196 - <div class="sm-st-info">  
197 - <span>{$attachmentnums}</span>  
198 - {:__('Total attachment')}  
199 - </div>  
200 - </div>  
201 - </div>  
202 - <div class="col-sm-3 col-xs-6">  
203 - <div class="sm-st clearfix">  
204 - <span class="sm-st-icon st-green"><i class="fa fa-user"></i></span>  
205 - <div class="sm-st-info">  
206 - <span>{$totaladmin}</span>  
207 - {:__('Total admin')}  
208 - </div>  
209 - </div>  
210 - </div>  
211 - </div> 173 +
212 174
213 <div class="row"> 175 <div class="row">
214 <div class="col-lg-8"> 176 <div class="col-lg-8">
@@ -284,120 +246,9 @@ @@ -284,120 +246,9 @@
284 </div> 246 </div>
285 </div> 247 </div>
286 248
287 - <div class="row" style="margin-top:15px;" id="statistics">  
288 -  
289 - <div class="col-lg-12">  
290 - </div>  
291 - <div class="col-xs-6 col-md-3">  
292 - <div class="panel bg-blue-gradient no-border">  
293 - <div class="panel-body">  
294 - <div class="panel-title">  
295 - <span class="label label-primary pull-right">{:__('Real time')}</span>  
296 - <h5>{:__('Working addon count')}</h5>  
297 - </div>  
298 - <div class="panel-content">  
299 - <div class="row">  
300 - <div class="col-md-12">  
301 - <h1 class="no-margins">{$totalworkingaddon}</h1>  
302 - <div class="font-bold"><i class="fa fa-magic"></i>  
303 - <small>{:__('Working addon count tips')}</small>  
304 - </div>  
305 - </div>  
306 - </div>  
307 - </div>  
308 - </div>  
309 - </div>  
310 - </div>  
311 - <div class="col-xs-6 col-md-3">  
312 - <div class="panel bg-teal-gradient no-border">  
313 - <div class="panel-body">  
314 - <div class="ibox-title">  
315 - <span class="label label-primary pull-right">{:__('Real time')}</span>  
316 - <h5>{:__('Database count')}</h5>  
317 - </div>  
318 - <div class="ibox-content">  
319 - <div class="row">  
320 - <div class="col-md-6">  
321 - <h1 class="no-margins">{$dbtablenums}</h1>  
322 - <div class="font-bold"><i class="fa fa-database"></i>  
323 - <small>{:__('Database table nums')}</small>  
324 - </div>  
325 - </div>  
326 - <div class="col-md-6">  
327 - <h1 class="no-margins">{$dbsize|format_bytes=###,'',0}</h1>  
328 - <div class="font-bold"><i class="fa fa-filter"></i>  
329 - <small>{:__('Database size')}</small>  
330 - </div>  
331 - </div>  
332 - </div>  
333 - </div>  
334 - </div>  
335 - </div>  
336 - </div>  
337 249
338 - <div class="col-xs-6 col-md-3">  
339 - <div class="panel bg-purple-gradient no-border">  
340 - <div class="panel-body">  
341 - <div class="ibox-title">  
342 - <span class="label label-primary pull-right">{:__('Real time')}</span>  
343 - <h5>{:__('Attachment count')}</h5>  
344 - </div>  
345 - <div class="ibox-content">  
346 -  
347 - <div class="row">  
348 - <div class="col-md-6">  
349 - <h1 class="no-margins">{$attachmentnums}</h1>  
350 - <div class="font-bold"><i class="fa fa-files-o"></i>  
351 - <small>{:__('Attachment nums')}</small>  
352 - </div>  
353 - </div>  
354 - <div class="col-md-6">  
355 - <h1 class="no-margins">{$attachmentsize|format_bytes=###,'',0}</h1>  
356 - <div class="font-bold"><i class="fa fa-filter"></i>  
357 - <small>{:__('Attachment size')}</small>  
358 - </div>  
359 - </div>  
360 - </div>  
361 - </div>  
362 - </div>  
363 - </div>  
364 - </div>  
365 - <div class="col-xs-6 col-md-3">  
366 - <div class="panel bg-green-gradient no-border">  
367 - <div class="panel-body">  
368 - <div class="ibox-title">  
369 - <span class="label label-primary pull-right">{:__('Real time')}</span>  
370 - <h5>{:__('Picture count')}</h5>  
371 - </div>  
372 - <div class="ibox-content">  
373 -  
374 - <div class="row">  
375 - <div class="col-md-6">  
376 - <h1 class="no-margins">{$picturenums}</h1>  
377 - <div class="font-bold"><i class="fa fa-picture-o"></i>  
378 - <small>{:__('Picture nums')}</small>  
379 - </div>  
380 - </div>  
381 - <div class="col-md-6">  
382 - <h1 class="no-margins">{$picturesize|format_bytes=###,'',0}</h1>  
383 - <div class="font-bold"><i class="fa fa-filter"></i>  
384 - <small>{:__('Picture size')}</small>  
385 - </div>  
386 - </div>  
387 - </div>  
388 - </div>  
389 - </div>  
390 - </div>  
391 - </div>  
392 - </div>  
393 - </div>  
394 - <div class="tab-pane fade" id="two">  
395 - <div class="row">  
396 - <div class="col-xs-12">  
397 - {:__('Custom zone')}  
398 - </div>  
399 - </div>  
400 </div> 250 </div>
  251 +
401 </div> 252 </div>
402 </div> 253 </div>
403 </div> 254 </div>
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 2
3 namespace app\api\controller; 3 namespace app\api\controller;
4 4
  5 +use app\api\controller\inspection\Task;
5 use app\api\controller\v1\Base; 6 use app\api\controller\v1\Base;
6 use app\common\controller\Api; 7 use app\common\controller\Api;
7 use think\Db; 8 use think\Db;
@@ -327,6 +328,7 @@ class Car extends Base @@ -327,6 +328,7 @@ class Car extends Base
327 $res['all_order']=$all_order; 328 $res['all_order']=$all_order;
328 $res['order_mon']=$order_mon; 329 $res['order_mon']=$order_mon;
329 $res['all_orderquantity']=$all_orderquantity; 330 $res['all_orderquantity']=$all_orderquantity;
  331 + $res['all_passenger']=$all_passenger;
330 $res['month_passenger']=$month_passenger; 332 $res['month_passenger']=$month_passenger;
331 }else{ 333 }else{
332 return $this->error("请求失败"); 334 return $this->error("请求失败");
@@ -783,6 +785,8 @@ class Car extends Base @@ -783,6 +785,8 @@ class Car extends Base
783 $name=$this->request->param("name");//名字 785 $name=$this->request->param("name");//名字
784 $driving_license=$this->request->param("driving_license");//行驶证 786 $driving_license=$this->request->param("driving_license");//行驶证
785 $driver_license=$this->request->param("driver_license");//驾照 787 $driver_license=$this->request->param("driver_license");//驾照
  788 + $driving_license=$this->uploadBase64($driving_license);
  789 + $driver_license=$this->uploadBase64($driver_license);
786 //判断是否已有 790 //判断是否已有
787 $isdriver=Db::name("driver")->where("user_id",$this->auth->id)->find(); 791 $isdriver=Db::name("driver")->where("user_id",$this->auth->id)->find();
788 if($isdriver){ 792 if($isdriver){
@@ -806,7 +810,27 @@ class Car extends Base @@ -806,7 +810,27 @@ class Car extends Base
806 ]); 810 ]);
807 return $this->success("请求成功",$res); 811 return $this->success("请求成功",$res);
808 } 812 }
  813 + public function uploadBase64($base64Str)
  814 + {
  815 + // 将Base64字符串转换为文件并保存
  816 + if ($base64Str) {
  817 + // 获取Base64字符串的类型
  818 + preg_match('/^data:image\/(.*);base64/', $base64Str, $match);
  819 + $ext = $match[1];
  820 + // 生成文件名
  821 + $fileName = uniqid() . '.' . $ext;
  822 + // 获取项目根目录
  823 + //$rootPath = root_path();
  824 + // 保存文件路径
  825 + $filePath = ROOT_PATH . 'public/uploads/' . $fileName;
  826 + // 保存文件
  827 + file_put_contents($filePath, base64_decode(str_replace($match[0], '', $base64Str)));
  828 + $task = new Task();
  829 + $res = $task->fileUpload($fileName);
  830 + return $res;
809 831
  832 + }
  833 + }
810 834
811 /** 835 /**
812 * 乘车须知 836 * 乘车须知