diff --git a/src/api/logistics/stock/index.ts b/src/api/logistics/stock/index.ts index 7fedbc2..804c6de 100644 --- a/src/api/logistics/stock/index.ts +++ b/src/api/logistics/stock/index.ts @@ -3,7 +3,7 @@ import request from '@/config/axios' // 盘点状态 VO export interface StockVO { id: number // id - lotnum: string // 盘点批次好 + batchNumber: string // 盘点批次好 orderNum: string // 工单任务号 checkNum: string // 盘点任务号 code: string // 扫描条码 diff --git a/src/api/logistics/street/index.ts b/src/api/logistics/street/index.ts index bf37014..bc8b896 100644 --- a/src/api/logistics/street/index.ts +++ b/src/api/logistics/street/index.ts @@ -80,4 +80,11 @@ export const StreetApi = { getRfidListByStreetId: async (streetId) => { return await request.get({ url: `/logistics/street/rfid/list-by-street-id?streetId=` + streetId }) }, + +// ==================== 子表（Rfid） ==================== + + // 获得Rfid列表 + getShelfCodeListByStreetId: async (streetId) => { + return await request.get({ url: `/logistics/street/shelfCode/list-by-street-id?streetId=` + streetId }) + }, } diff --git a/src/components/camera/camera.vue b/src/components/camera/camera.vue index 0ed2a73..daa0c53 100644 --- a/src/components/camera/camera.vue +++ b/src/components/camera/camera.vue @@ -3,7 +3,7 @@ - + @@ -125,7 +125,6 @@ export default { const changeResolution = (e) => { resolution.value = e.target.options[e.target.selectedIndex].text } - const start_play =async () => { // const urlIp = ref("") const resCamera = await CameraApi.getCamera(props.cameraId) diff --git a/src/components/camera/ptz.vue b/src/components/camera/ptz.vue index 55cf157..406e84b 100644 --- a/src/components/camera/ptz.vue +++ b/src/components/camera/ptz.vue @@ -99,7 +99,9 @@
@@ -151,12 +153,13 @@ import {CameraControlApi} from '@/api/cameraControl/camera' const { result_code, base_url, request_timeout } = config export default { + props: { cameraId: { default: 2 } }, - setup(props) { + setup(props, { emit }) { console.log(props.cameraId) // 定义响应式数据 const zoomSubIcon = ref('ep:zoom-out') // 替换为实际的图标名称 @@ -169,7 +172,7 @@ export default { const upIcon = ref('ep:arrow-up') // 替换为实际的图标名称 const rightUpIcon = ref('ep:top-right') // 替换为实际的图标名称 const leftIcon = ref('ep:arrow-left') // 替换为实际的图标名称 - const centerIcon = ref('ep:aim') // 替换为实际的图标名称 + const centerIcon = ref('ep:refresh') // 替换为实际的图标名称 const rightIcon = ref('ep:arrow-right') // 替换为实际的图标名称 const leftDownIcon = ref('ep:bottom-left') // 替换为实际的图标名称 const downIcon = ref('ep:arrow-down') // 替换为实际的图标名称 @@ -192,6 +195,11 @@ export default { down: 'ep:arrow-down-active', rightDown: 'ep:bottom-right-active' } + const refresh = () =>{ + + // 使用 $emit 触发事件，并传递参数 + emit('childTriggerParent') // 触发事件，不用 this + } // 定义控制方法 const handleControl = (action, state) => { @@ -227,6 +235,7 @@ export default { leftIcon, centerIcon, rightIcon, + refresh, leftDownIcon, downIcon, rightDownIcon, diff --git a/src/components/camera/ptzNotFlow.vue b/src/components/camera/ptzNotFlow.vue index 463f1ef..f3cf35c 100644 --- a/src/components/camera/ptzNotFlow.vue +++ b/src/components/camera/ptzNotFlow.vue @@ -1,196 +1,188 @@ @@ -198,7 +190,7 @@