Merge branch 'master' of ssh://111.61.77.35:15/fengchaopeng/laravelzh

app/Http/Controllers/AlarmOrderController.php

@@ -20,12 +20,32 @@ class AlarmOrderController extends Controller
     public function index(Request $request)
     {
         $where = [];
+        $whereBetween = [0, date('Y-m-d H:i:s')];
         $limit = 20;
+        if($request->input('limit') > 0) {
+            $limit = $request->input('limit');
+        }
         $offset = $limit * ($request->input('page') - 1);
         if($request->input('isuser') == 'user'){
 
             $where[] = ['u.id','=',Auth::id()];
         }
+        if($request->input('order_num')) {
+            $where[] = ['alarm_order.order_num' , '=', $request->input('order_num')];
+        }
+        if($request->input('deviceNum')) {
+            $where[] = ['r.devicenumber' , '=', $request->input('deviceNum')];
+        }
+        if($request->input('state') != 99) {
+            $where[] = ['alarm_order.state' , '=', $request->input('state')];
+        }
+        if($request->input('user_id')) {
+            $where[] = ['alarm_order.user_id' , '=', $request->input('user_id')];
+        }
+        if($request->input('timeRange') != "null") {
+            $times = explode(',', $request->input('timeRange'));
+            $whereBetween = [$times[0], $times[1]];
+        }
         $orders = AlarmOrder::selectRaw('
             FROM_UNIXTIME(r.starttime) AS start_time,
             FROM_UNIXTIME(r.endtime) AS end_time,
@@ -42,9 +62,18 @@ class AlarmOrderController extends Controller
             ->leftjoin('device_type AS t', 'r.policestatus', '=', 't.tid')
             ->offset($offset)
             ->where($where)
+            ->whereBetween('alarm_order.created_at',$whereBetween)
             ->limit($limit)
             ->get()->toArray();
-        return $this->jsonSuccessData($orders);
+        $count = AlarmOrder::leftjoin('reportpolice AS r', 'r.id', '=', 'alarm_order.reportpolice_id')
+            ->whereBetween('alarm_order.created_at',$whereBetween)
+            ->where($where)->count();
+        $meta = [
+            'count' => $count,
+            'current_page' => $request->input('page'),
+            'limit' => $limit
+        ];
+        return $this->jsonSuccessData(compact('orders', 'meta'));
 
     }
 
@@ -64,10 +93,18 @@ class AlarmOrderController extends Controller
 
         DB::beginTransaction();
         try {
+            // 获取device_id
+            $device = DB::table('device')
+                ->select('id')
+                ->where('devicenum', $request->input('device_num'))
+                ->first();
+            if(!$device) {
+                return $this->jsonErrorData(500, '设备编号不存在！');
+            }
             $order = new AlarmOrder();
             $insertId = $order->insertGetId([
                 'order_num' => $orderNum,
-                'device_id' => $request->input('device_id'),
+                'device_id' => $device->id,
                 'user_id' => $request->input('user_id'),
                 'reportpolice_id' => $reportpolice_id,
                 'created_at' => Carbon::now(),
@@ -82,13 +119,13 @@ class AlarmOrderController extends Controller
             DB::commit();
         } catch (QueryException $exception) {
             DB::rollBack();
-            return $this->jsonErrorData('工单创建失败');
+            return $this->jsonErrorData(500,'工单创建失败');
         }
 
         if($insertId) {
             return $this->jsonSuccessData('已生成工单！');
         }else{
-            return $this->jsonErrorData('工单创建失败');
+            return $this->jsonErrorData(500, '工单创建失败');
         }
     }
 
@@ -119,6 +156,8 @@ class AlarmOrderController extends Controller
             s.status_name
             ')
             ->first();
+        // 工单进度
+        $order['step'] = AlarmOrderSchedule::where('alarm_order_id', '=', $request->input('id'))->get();
        return $this->jsonSuccessData($order);
     }
 
@@ -173,6 +212,27 @@ class AlarmOrderController extends Controller
             return $this->jsonErrorData(500, '删除工单失败！');
         }
     }
+
+    /**
+     * 获取派单用户
+     */
+    public function getUserInfo()
+    {
+        if ($this->isadmin()) {
+            $users = DB::table('users')
+                ->select('users.id', 'users.name', 'users.username', 'users.phone_number', 'ur.name AS role_name', 'ap.area_name AS province', 'aa.area_name AS area', 'ac.area_name AS city')
+                ->leftJoin('user_roles AS ur', 'ur.id', '=', 'users.user_role_id')
+                ->leftJoin('areachina AS ap', 'ap.areaid', '=', 'users.provinceid')
+                ->leftJoin('areachina AS aa', 'aa.areaid', '=', 'users.areaid')
+                ->leftJoin('areachina AS ac', 'ac.areaid', '=', 'users.cityid')
+                ->where('users.user_role_id', '!=', 0)
+                ->get()->toArray();
+            return $this->jsonSuccessData($users);
+        } else {
+            return $this->jsonErrorData(500, '没有权限, 请联系管理员！');
+        }
+    }
+
     //获取当前订单为第几步
     public function orderin(Request $request){
         $orderid = $request->input('id');

resources/js/api/alarmOrder.js

+import request from '@/utils/request';
+
+// 列表
+export function alarmOrderList(data) {
+  var params = Object.keys(data).map(function(key) {
+    return encodeURIComponent(key) + '=' + encodeURIComponent(data[key]);
+  }).join('&');
+  return request({
+    url: '/alarm_order?' + params,
+    method: 'get',
+  });
+}
+// 新增
+export function alarmOrderStore(data) {
+  return request({
+    url: '/alarm_order',
+    method: 'post',
+    data: data,
+  });
+}
+// 更新
+export function alarmOrderUpdate(data, id) {
+  return request({
+    url: '/alarm_order/' + id,
+    method: 'patch',
+    data,
+  });
+}
+// 删除
+export function alarmOrderDestroy(id) {
+  return request({
+    url: '/alarm_order/' + id,
+    method: 'delete',
+  });
+}
+// 派单人员列表
+export function alarmOrderUsers() {
+  return request({
+    url: '/alarm_order/user',
+    method: 'get',
+  });
+}
+// 工单详情
+export function alarmOrderDetail(id) {
+  return request({
+    url: '/alarm_order/show?id=' + id,
+    method: 'get',
+  });
+}

resources/js/router/index.js

@@ -25,6 +25,7 @@ import usersRoutes from './modules/users';
 import historyRoutes from './modules/history.js';
 import monitorRoutes from './modules/monitor.js';
 import userdeviceRoutes from './modules/userdevice';
+import alarmOrderRoutes from './modules/alarm-order';
 
 /**
  * Sub-menu only appear when children.length>=1
@@ -155,6 +156,7 @@ export const asyncRoutes = [
   usersRoutes,
   adminRoutes,
   userdeviceRoutes,
+  alarmOrderRoutes,
   // {
   //   path: '/userdevice',
   //   component: Layout,

resources/js/router/modules/alarm-order.js

+import Layout from '@/layout';
+
+const alarmOrderRoutes = {
+  path: '/alarm-order',
+  component: Layout,
+  redirect: '/alarm-order/index',
+  name: 'users',
+  alwaysShow: true,
+  meta: {
+    title: '工单管理',
+    icon: 'nested',
+    permissions: ['view menu admin'],
+  },
+  children: [
+    {
+      path: 'index',
+      component: () => import('@/views/alarm-order/index'),
+      name: 'AlarmOrder',
+      meta: { title: '抢险工单', icon: 'nested', permissions: ['manage admin'] },
+    },
+  ],
+};
+export default alarmOrderRoutes;

resources/js/views/history/alarms.vue

@@ -55,14 +55,44 @@
         </template>
       </el-table-column>
       <el-table-column label="操作">
-        <template>
-          <el-button type="primary" effect="dark">生成工单</el-button>
+        <template slot-scope="scope">
+          <el-button type="primary" effect="dark" @click="orderUsers(scope.row)">生成工单</el-button>
         </template>
       </el-table-column>
     </el-table>
     <el-tooltip placement="top" content="tooltip">
       <back-to-top :custom-style="myBackToTopStyle" :visibility-height="300" :back-position="50" transition-name="fade" />
     </el-tooltip>
+    <el-dialog title="向谁派发工单？" :visible.sync="dialogFormVisible">
+      <el-table
+        ref="singleTable"
+        :data="alarmOrderUserData"
+        :highlight-current-row="true"
+        row-class-name="order-users-row"
+        style="width: 100%"
+        @row-click="handleCurrentChange"
+      >
+        <el-table-column
+          label="ID"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-radio v-model="form.alarmOrderToUserId" :label="scope.row.id">{{ scope.row.id }}</el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column property="name" label="用户名" width="150"></el-table-column>
+        <el-table-column property="username" label="账号" width="120"></el-table-column>
+        <el-table-column property="phone_number" label="手机号" width="120"></el-table-column>
+        <el-table-column property="role_name" label="角色"></el-table-column>
+        <el-table-column property="province" label="省"></el-table-column>
+        <el-table-column property="city" label="市"></el-table-column>
+        <el-table-column property="area" label="区域(县)"></el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="createAlarmOrder()">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -70,10 +100,13 @@
 import { police, history_device_type } from '@/api/device';
 import clip from '@/utils/clipboard';
 import BackToTop from '@/components/BackToTop';
+import { alarmOrderStore, alarmOrderUsers } from '@/api/alarmOrder';
 export default {
   components: { BackToTop },
   data() {
     return {
+      dialogFormVisible: false,
+      alarmOrderUserData: [],
       tableKey: 0,
       reportpolice: [],
       myBackToTopStyle: {
@@ -85,6 +118,17 @@ export default {
         'line-height': '45px', // Please keep consistent with height to center vertically
         background: '#e7eaf1', // The background color of the button
       },
+      // 报警工单数据
+      form: {
+        alarmOrderToUserId: 0,
+      },
+      formDataOrder: {
+        device_num: '',
+        reportpolice_id: 0,
+        policestatus: 0,
+        shutoff_status: 0,
+        user_id: 0,
+      },
       devicetime: '', // 时间
       devicehtime: '', // 年月
       device_type: '', // 搜索数据设备报警类型
@@ -98,6 +142,41 @@ export default {
     this.historydevicetype(); // 设备搜索所需数据
   },
   methods: {
+    // 生成工单
+    handleCurrentChange(val) {
+      console.log(val);
+      this.form.alarmOrderToUserId = val.id;
+      this.formDataOrder.user_id = this.form.alarmOrderToUserId;
+    },
+    orderUsers(data) {
+      alarmOrderUsers().then(response => {
+        if (response.code === 200) {
+          this.alarmOrderUserData = response.data;
+        }
+      }).catch(err => {
+        console.log(err);
+      });
+      this.formDataOrder.device_num = data.devicenumber;
+      this.formDataOrder.reportpolice_id = data.id;
+      this.formDataOrder.policestatus = data.policestatus;
+      this.formDataOrder.shutoff_status = data.shutoff_status;
+      this.dialogFormVisible = true;
+    },
+    createAlarmOrder() {
+      if (this.formDataOrder.user_id === 0) {
+        this.$message.error('你的工单要派发给谁呢？');
+        return;
+      }
+      alarmOrderStore(this.formDataOrder).then(response => {
+        console.log(response);
+        if (response.code === 200) {
+          this.$message.success('你的工单派发成功了！');
+          this.dialogFormVisible = false;
+        }
+      }).catch(err => {
+        console.log(err);
+      });
+    },
     shutoffStatus(id) {
       const shutoff = [];
       shutoff[0] = '初始化';
@@ -146,4 +225,7 @@ export default {
 </script>
 
 <style>
+  .order-users-row {
+    cursor: pointer;
+  }
 </style>

routes/api.php

@@ -53,8 +53,10 @@ Route::group(['middleware' => 'auth:api'], function () {
     Route::post('alarm_order', 'AlarmOrderController@store');  // 创建工单
     Route::post('alarm_order/order_ok', 'AlarmOrderController@update'); // 修改工单
     Route::delete('alarm_order/{id}', 'AlarmOrderController@destroy'); // 删除工单
+    Route::get('alarm_order/user', 'AlarmOrderController@getUserInfo'); // 获取派单人员
     Route::get('alarm_order/show', 'AlarmOrderController@show'); // 工单详情
     Route::get('alarm_order/order_in', 'AlarmOrderController@orderin'); // 获取当前订单为第几步
+
 });
 
 //上传图片路由