addapi

config/db.php

@@ -9,9 +9,9 @@ return [
     /*'dsn' => 'mysql:host=app.3dxh.dev.1nww.com;dbname=cxfoot',
     'username' => 'cxfoot',
     'password' => 'bm8kB3eKddhCW83s',*/
-    'dsn' => 'mysql:host=127.0.0.1;dbname=cxfoot',
+    'dsn' => 'mysql:host=124.71.161.49;dbname=cxfoot',
-    'username' => 'root',
+    'username' => 'cxfoot',
-    'password' => 'root',
+    'password' => 'bm8kB3eKddhCW83s',
 
 
     'charset' => 'utf8mb4',

modules/api/controllers/ReportStartController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace app\modules\api\controllers;
+
+use app\models\Report;
+use app\modules\api\models\ReportForm;
+
+class ReportStartController extends \app\controllers\Controller
+{
+    /**
+     * @return array|mixed|null
+     */
+    public function actionStart()
+    {
+        $storeId = \Yii::$app->request->get('store_id', 3);
+
+        $reportForm = new ReportForm();
+
+        $data = $reportForm->getStartByStoreId($storeId);
+
+        return $this->responseHandler(['code' => 0, 'msg' => '请求成功', 'data' => $data]);
+    }
+
+    /**
+     * @return array|mixed|null
+     */
+    public function upload()
+    {
+        $leftImg = \Yii::$app->request->get('left');
+        $rightImg = \Yii::$app->request->get('right');
+        $id = \Yii::$app->request->get('id');
+
+        $reportForm = new ReportForm();
+
+        $data = $reportForm->uploadModule($id, $leftImg, $rightImg);
+
+        return $this->responseHandler($data);
+    }
+
+}

modules/api/models/ReportForm.php

@@ -115,7 +115,8 @@ class ReportForm extends ApiModel
      * @title 获取详情
      * @description 数据列表-获取详情
      */
-    public function actionGetInfo(){
+    public function actionGetInfo()
+    {
         if (empty($this->id)) {
             return $this->apiReturnError('请求错误');
         }
@@ -171,7 +172,8 @@ class ReportForm extends ApiModel
         return $this->apiReturnSuccess('ok', $res);
     }
 
-    public function getData($key=0){
+    public function getData($key = 0)
+    {
         if (empty($key)) {
             return [];
         }
@@ -198,4 +200,37 @@ class ReportForm extends ApiModel
     }
 
 
+    public function getStartByStoreId($storeId)
+    {
+        return Report::find()
+            ->orderBy(['start_at' => SORT_ASC])
+            ->where('start=1')
+            ->where('start_at>0')
+            ->select(['id'])
+            ->one()->toArray();
+    }
+
+    public function uploadModule($id, $leftImg, $rightImg)
+    {
+        $model = Report::findOne(['id' => $id]);
+
+        $json = json_decode($model->json, true);
+
+        $json['left_img'] = $leftImg;
+
+        $json['right_img'] = $rightImg;
+
+        $model->json = json_encode($json);
+
+        $model->start = 2;
+
+        $model->step = 3;
+
+        if ($model->save()) {
+            return ['code' => 0, 'msg' => '上传成功'];
+        }
+        return ['code' => 1, 'msg' => '上传失败'];
+
+    }
+
 }

modules/store/controllers/ReportController.php

@@ -94,4 +94,23 @@ class ReportController extends Controller
             'right_img' => $json_de['right_img'] ?? '',
         ]);
     }
+
+
+    public function actionStart($id = 0)
+    {
+        if (\Yii::$app->request->isAjax) {
+
+            $form = new ReportEditForm();
+            $form->model = Report::findOne([
+                'id' => $id,
+            ]);;
+
+            $data = $form->start();
+
+            return $this->responseHandler($data);
+        }
+
+    }
+
+
 }

modules/store/models/report/ReportEditForm.php

@@ -90,5 +90,14 @@ class ReportEditForm extends AdminModel
         return $this->apiReturnSuccess('上传成功');
     }
 
+    public function start()
+    {
+        $this->model->start = 1;
+
+        if (!$this->model->save()) {
+            return $this->getModelError($this->model);
+        }
+        return $this->apiReturnSuccess('上传成功');
+    }
 
 }

modules/store/models/report/ReportListForm.php

@@ -64,7 +64,7 @@ class ReportListForm extends AdminModel
         }
 
         $query = Report::find()->alias('o')
-            ->select('o.id,o.model_number,o.initial_path,o.final_path,o.pdf_path,o.step,u.real_name,u.mobile_phone,s.name as store_name,o.created_at,o.json')
+            ->select('o.id,o.model_number,o.initial_path,o.final_path,o.pdf_path,o.step,u.real_name,u.mobile_phone,s.name as store_name,o.created_at,o.json,o.start')
             ->leftJoin(['u' => User::tableName()], 'o.user_id=u.id')
             ->leftJoin(['s' => Store::tableName()], 'o.store_id=s.id')
             ->where([

modules/store/views/report/index.php

@@ -85,8 +85,17 @@ $this->params['breadcrumbs'][] = $this->title;
     <button class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit">修改模型上传</button>
     {{# }  }}
     {{# if(d.step == 3){ }}
-    <a href="https://y.inshudi.com/#/dataReporting?id={{d.id}}&time={{new Date().getTime()}}" target="_blank" class="layui-btn layui-btn-xs layui-btn-normal">查看报告</a>
+    <a href="https://y.inshudi.com/#/dataReporting?id={{d.id}}&time={{new Date().getTime()}}" target="_blank"
+       class="layui-btn layui-btn-xs layui-btn-normal">查看报告</a>
     {{# }  }}
+    {{# if(d.start == 0){  }}
+    <button class="layui-btn layui-btn-xs layui-btn-normal" lay-event="start">开始</button>
+    {{# }  }}
+
+    {{# if(d.start == 1){  }}
+    <button class="layui-btn layui-btn-xs layui-btn-normal" lay-event="">正在上传</button>
+    {{# }  }}
+
     <!--{{# if(d.user_type == 1){  }}
     <button class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit">初始模型上传</button>
     {{# }  }}
@@ -251,6 +260,35 @@ $this->params['breadcrumbs'][] = $this->title;
                 location.href = confirm_url;
                 return;
             }
+            if (lay_event == 'start') {
+                confirm_url = "<?=\Yii::$app->urlManager->createUrl(['store/report/start'])?>" + "?id=" + id;
+                $.ajax(confirm_url, {
+                    type: "POST",
+                    dataType: "json",
+                    data: {
+                        _csrf: _csrf
+                    },
+                    success: function (res) {
+                        layer.msg(res.msg, {
+                            offset: '15px'
+                            , time: 1000
+                        }, function () {
+                            location.href = window.location.href
+                        });
+                    },
+                    error: function (xhr, type, err) {
+                        layer.msg(xhr.responseText, {
+                            offset: '15px'
+                            , icon: 2
+                            , time: 1000
+                        }, function () {
+                        });
+                    }
+                })
+
+
+                return;
+            }
 
             if (confirm_url != null) {
                 layer.confirm(confirm_tip, {