德邦

app/Http/Controllers/ControlPanelController.php

@@ -151,14 +151,14 @@ class ControlPanelController extends Controller
             $start = date('Y-m-d', strtotime($start));
         }
 
-        $machines = MeasuringMachine::query()->select('id')->get()->toArray();
-        array_unshift($machines, ['id' => 0]);
-        array_unshift($machines, ['id' => '未称重']);
+        $machines = MeasuringMachine::query()->select(['id','name'])->get()->toArray();
+        array_unshift($machines, ['id' => 0, 'name'=>'未知']);
+        array_unshift($machines, ['id' => '未称重','name'=>'未称重']);
 
         //data数据处理
         $real_data = [];
         foreach ($machines as $v){
-            $temp = [$v['id'] === 0 ? 'ID_未知' : 'ID_'.$v['id']];
+            $temp = [$v['name']];
             foreach ($data as $val){
                 array_push($temp, array_column($val, $v['id'])? array_sum( array_column($val, $v['id'])) : 0);
             }

app/Services/DbOpenService.php

@@ -78,7 +78,7 @@ class DbOpenService
         $waybill->loadMissing([
             "order.shop","owner","order.warehouse.province","order.warehouse.city","order.warehouse.county","deliveryType"
         ]);
-        $date = date('Y-m-d H:i:s');
+        $date = date('Y-m-d H:i:s', $waybill->deliver_at ? strtotime($waybill->deliver_at) : now());
         $data =  [
             'logisticID'    =>      config('api_logistic.DB.prod.sign').date("YmdHis").mt_rand(1000, 9999).$waybill->order->id,
             'custOrderNo'   =>      $waybill->order->client_code ?? '',
@@ -131,7 +131,7 @@ class DbOpenService
             ],
             'smsNotify'     => config('api_logistic.DB.prod.smsNotify'),
             'sendStartTime' => $date,
-            'sendEndTime'   => $waybill->deliver_at ?? date("Y-m-d H:i:s", strtotime('+1 day')),
+            'sendEndTime'   => date('Y-m-d ', $waybill->deliver_at ? strtotime($waybill->deliver_at) : now()).'23:59:59',
             'originalWaybillNumber' => $waybill->wms_bill_number ?? '',
             'remark'        => $waybill->dispatch_remark ?? '',
             'isOut'         => 'N',

resources/views/control/panel.blade.php

@@ -1049,7 +1049,7 @@
                         type: 'pie',
                         id: 'pie',
                         radius: '30%',
-                        center: ['50%', '25%'],
+                        center: ['50%', '32%'],
                         emphasis: {focus: 'data'},
                         label: {
                             formatter: '{b}: {@'+title+'} ({d}%)'
@@ -1072,7 +1072,7 @@
                         },
                         xAxis: {type: 'category'},
                         yAxis: {gridIndex: 0},
-                        grid: {top: '55%'},
+                        grid: {top: '60%'},
                         series: temp
                     };
                 },