diff --git a/admin/src/views/device/detail.vue b/admin/src/views/device/detail.vue index 2d6be683..0d0159d5 100644 --- a/admin/src/views/device/detail.vue +++ b/admin/src/views/device/detail.vue @@ -75,7 +75,11 @@ - + @@ -138,6 +142,7 @@ const getDetails = async () => { deviceData.device.product_id = res.product_id == null ? '' : res.product_id deviceData.device.product_name = res.product_name == null ? '' : res.product_name deviceData.monitor_item = res.monitor_item + deviceData.device.video_url = res.video_url }) .catch((err: any) => { console.log('err', err) diff --git a/admin/src/views/device/edit.vue b/admin/src/views/device/edit.vue index b503fa87..add3e7c6 100644 --- a/admin/src/views/device/edit.vue +++ b/admin/src/views/device/edit.vue @@ -70,6 +70,9 @@ :value="item.value" /> + + + @@ -136,6 +139,7 @@ const formData = reactive({ product_id: '', code: '', name: '', + video_url: '', type: '', monitor_item: '', status: '', @@ -171,11 +175,6 @@ const formRules = reactive({ message: '请选择设备类型', trigger: ['blur'] }], - monitor_item: [{ - required: true, - message: '请选择设备监测项', - trigger: ['blur'] - }], status: [{ required: true, message: '请选择设备状态', diff --git a/app/adminapi/logic/device/DeviceLogic.php b/app/adminapi/logic/device/DeviceLogic.php index bd3b50ac..09a4bdd8 100644 --- a/app/adminapi/logic/device/DeviceLogic.php +++ b/app/adminapi/logic/device/DeviceLogic.php @@ -51,6 +51,7 @@ class DeviceLogic extends BaseLogic 'name' => $params['name'], 'type' => $params['type'], 'monitor_item' => $params['monitor_item'], + 'video_url' => $params['video_url'], 'status' => $params['status'], 'is_online' => $params['is_online'], 'is_bind' => $params['is_bind'], @@ -94,6 +95,7 @@ class DeviceLogic extends BaseLogic 'name' => $params['name'], 'type' => $params['type'], 'monitor_item' => $params['monitor_item'], + 'video_url' => $params['video_url'], 'status' => $params['status'], 'is_online' => $params['is_online'], 'is_bind' => $params['is_bind'],