update
This commit is contained in:
parent
738d8d4285
commit
8cb963c213
|
|
@ -40,7 +40,11 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="设备编码" prop="code">
|
||||
<el-form-item label="设备编码" prop="code" :rules="[{
|
||||
required: true,
|
||||
message: '请输入设备编码',
|
||||
trigger: ['blur']
|
||||
}]" v-if="formData.type ==1">
|
||||
<el-select
|
||||
v-model="formData.code"
|
||||
remote
|
||||
|
|
@ -60,10 +64,10 @@
|
|||
<!-- <el-form-item label="设备编码" prop="code">-->
|
||||
<!-- <el-input v-model="formData.code" clearable placeholder="请输入设备编码" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="硬件ICCID" prop="iccid">
|
||||
<el-form-item label="硬件ICCID" prop="iccid" v-if="formData.type ==1">
|
||||
<el-input v-model="formData.iccid" disabled placeholder="请输入ICCID" />
|
||||
</el-form-item>
|
||||
<el-form-item label="监测项" prop="monitor_item" >
|
||||
<el-form-item label="监测项" prop="monitor_item" v-if="formData.type ==1">
|
||||
<el-select class="flex-1" v-model="formData.monitor_item" multiple disabled placeholder="请选择设备监测项">
|
||||
<el-option
|
||||
v-for="(item, index) in dictData.monitor_item"
|
||||
|
|
@ -183,11 +187,6 @@ const formData = reactive({
|
|||
|
||||
// 表单验证
|
||||
const formRules = reactive<any>({
|
||||
code: [{
|
||||
required: true,
|
||||
message: '请输入设备编码',
|
||||
trigger: ['blur']
|
||||
}],
|
||||
name: [{
|
||||
required: true,
|
||||
message: '请输入设备名称',
|
||||
|
|
|
|||
|
|
@ -33,7 +33,18 @@
|
|||
<div class="mt-4">
|
||||
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column label="养殖基地" prop="farm_id" show-overflow-tooltip />
|
||||
<el-table-column label="养殖基地" prop="farm_id" show-overflow-tooltip >
|
||||
|
||||
<template #default="{ row }">
|
||||
<el-tag class="mr-2" v-if="row.farm_id != null" type="info"
|
||||
>ID: {{ row.farm_id }}</el-tag
|
||||
>
|
||||
<el-tag class="mr-2" v-if="row.farmAttr != null" type="info"
|
||||
>名称: {{ row.farmAttr.farm_name }}</el-tag
|
||||
>
|
||||
</template>
|
||||
|
||||
</el-table-column>
|
||||
<el-table-column label="栏舍名称" prop="fence_house_name" show-overflow-tooltip />
|
||||
<el-table-column label="动物类型" prop="animal_type">
|
||||
<template #default="{ row }">
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<el-table-column label="所属栏舍" width="200">
|
||||
<template #default="{ row }">
|
||||
<el-tag class="mr-2" v-if="row.fence_house_id != null" type="info">ID: {{ row.fence_house_id }}</el-tag>
|
||||
<el-tag class="mr-2" v-if="row.fenceHouse.fence_house_name != null" type="info">名称: {{ row.fenceHouse.fence_house_name}}</el-tag>
|
||||
<el-tag class="mr-2" v-if="row.fenceHouse != null" type="info">名称: {{ row.fenceHouse.fence_house_name}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="产品状态" align="center" prop="status">
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ class FenceHouseLists extends BaseAdminDataLists implements ListsSearchInterface
|
|||
public function lists(): array
|
||||
{
|
||||
return FenceHouse::where($this->searchWhere)
|
||||
->with(['farmAttr'])
|
||||
->limit($this->limitOffset, $this->limitLength)
|
||||
->order(['id' => 'desc'])
|
||||
->select()
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ class DeviceLogic extends BaseLogic
|
|||
$device = Device::create([
|
||||
'user_id' => $userId,
|
||||
'code' => $params['code'],
|
||||
'iccid' => $params['iccid'],
|
||||
'name' => $params['name'],
|
||||
'type' => $params['type'],
|
||||
'image' => $params['image'],
|
||||
|
|
@ -102,6 +103,7 @@ class DeviceLogic extends BaseLogic
|
|||
$device = Device::where('id', $params['id'])->update([
|
||||
'user_id' => $userId,
|
||||
'code' => $params['code'],
|
||||
'iccid' => $params['iccid'],
|
||||
'name' => $params['name'],
|
||||
'type' => $params['type'],
|
||||
'image' => $params['image'],
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ class DeviceValidate extends BaseValidate
|
|||
*/
|
||||
protected $rule = [
|
||||
'id' => 'require',
|
||||
'code' => 'require',
|
||||
// 'code' => 'require',
|
||||
'name' => 'require',
|
||||
'type' => 'require',
|
||||
'monitor_type' => 'require',
|
||||
|
|
|
|||
|
|
@ -34,17 +34,15 @@ class IndexController extends BaseApiController
|
|||
{
|
||||
$params = $this->request->get();
|
||||
//获取栏舍信息
|
||||
if(isset($params['fence_house_id']) && $params['fence_house_id'] !=''){
|
||||
$data = FenceHouse::where('user_id',$this->userId)->where('id',$params['fence_house_id'])->order('id desc')->findOrEmpty()->toArray();
|
||||
}else{
|
||||
$data = FenceHouse::where('user_id',$this->userId)->order('id desc')->findOrEmpty()->toArray();
|
||||
}
|
||||
|
||||
$data = FenceHouse::where('id',$params['fence_house_id'])->order('id desc')->findOrEmpty()->toArray();
|
||||
|
||||
if(empty($data)){
|
||||
return $this->success('请求成功',[]);
|
||||
}
|
||||
$product = Product::where('fence_house_id', $data['id'])->findOrEmpty()->toArray();
|
||||
$deviceIds = ProductDevice::where('product_id', $product['id'])->column('device_id');
|
||||
$device = Device::whereIn('id', $deviceIds)->where('device_type', 3)->findOrEmpty();
|
||||
$device = Device::whereIn('id', $deviceIds)->where('type', 2)->findOrEmpty();
|
||||
$data['video_url'] = $device['video_url'];
|
||||
$data['device_id'] = $device['id'];
|
||||
// 监控视频封面
|
||||
|
|
|
|||
Loading…
Reference in New Issue