diff --git a/src/config/getData.js b/src/config/getData.js index 4675a3e..cd0c44c 100644 --- a/src/config/getData.js +++ b/src/config/getData.js @@ -54,4 +54,20 @@ export const backIoStatus = (type) => post('vehicle/setForkLegsObstacles?backIoS // 获取当前配置的休息点 export const getReturnStation = () => get('station/getReturnStation', {}) // 配置车辆返回点 -export const updateReturnStation = (id) => post('station/updateReturnStation?station_id=' + id, {}) \ No newline at end of file +export const updateReturnStation = (id) => post('station/updateReturnStation?station_id=' + id, {}) + +// 一键标定内容 +export const getCalibrationConfigInfo = () => get('calibration/getCalibrationConfigInfo', {}) +// 一键标定深度相机 +export const calibrationDepthcamera = (id) => post('calibration/calibrationDepthcamera?location=' + id, {}) +// 一键标定激光接口 +export const calibrationLaser = (id, cmd) => post('calibration/calibrationLaser', { + location: id, + cmd: cmd +}) +// 开始标定顶部相机 +export const startCalibrationCamera = (id) => post('calibration/startCalibrationCamera?location=' + id, {}) +// 结束标定顶部相机接口 +export const endCalibrationCamera = (id, params) => post('calibration/endCalibrationCamera?location=' + id + '¶ms=' + params, {}) +// 根据task_id查询对应的标定结果 +export const getCalibrationByTaskId = (id) => get('calibration/getCalibrationByTaskId?task_id=' + id, {}) \ No newline at end of file diff --git a/src/config/mork.js b/src/config/mork.js index 5929124..365b66c 100644 --- a/src/config/mork.js +++ b/src/config/mork.js @@ -891,4 +891,89 @@ export const apiLogs = () => { } ] return res +} + +export const getCalibrationConfigInfo = () => { + let res = { + message: 'ok', + data: { + depthcamera: [ + { + zh_name: '顶部前', + en_name: 'Top front', + location: '9' + }, + { + zh_name: '右前', + en_name: 'Right front', + location: '9' + } + ], + Laser: [ + { + zh_name: '顶部前', + en_name: 'Top front', + location: '9' + }, + { + zh_name: '右前', + en_name: 'Right front', + location: '9' + } + ], + camera: [ + { + zh_name: '右前', + en_name: 'Right front', + location: '9' + } + ] + } + } + return res +} + +export const calibrationDepthcamera = () => { + let res = { + "message": "操作成功!", + "data": { + "task_id": "20260107173429562" + } + } + return res +} +export const calibrationLaser = () => { + let res = { + "message": "操作成功!", + "data": { + "task_id": "20260107173429562" + } + } + return res +} +export const startCalibrationCamera = () => { + let res = { + "message": "操作成功!", + "data": { + "task_id": "20260107173429562" + } + } + return res +} +export const endCalibrationCamera = () => { + let res = { + "message": "操作成功!", + "data": { + "task_id": "20260107173429562" + } + } + return res +} + +export const getCalibrationByTaskId = () => { + let res = { + "message": "操作成功!", + "data": "1" + } + return res } \ No newline at end of file diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index 20ace28..80faee1 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -143,5 +143,20 @@ module.exports = { settings: 'Settings', entertaskchainname: 'Please enter the task chain name', taskchainnotempty: 'The task chain name cannot be empty', - taskchainname: 'Task Chain Name' + taskchainname: 'Task Chain Name', + depthcamera: 'Depth Camera', + horizontalandheightcalibration: 'Horizontal and Height Calibration', + laser: 'Laser', + calibrationorientation: 'Calibration Orientation', + calibrationposition: 'Calibration Position', + topviewcamera: 'Top - view Camera', + startcalibration: 'Start Calibration', + endcalibration: 'End Calibration', + ceilingheight: 'Ceiling Height', + collectingdata: 'Collecting Data', + calibrationtimeoutpleasereoperate: 'Calibration Timeout. Please Re - operate', + calibrationsuccessful: 'Calibration Successful', + calibrationfailed: 'Calibration Failed', + calibrationresultabnormal: 'Calibration Result Abnormal', + calibrationprogramabnormal: 'Calibration Program Abnormal' } diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js index 8cf0666..11ba88b 100644 --- a/src/i18n/langs/zh.js +++ b/src/i18n/langs/zh.js @@ -143,5 +143,20 @@ module.exports = { settings: '设置', entertaskchainname: '请输入任务链名称', taskchainnotempty: '任务链名称不能为空', - taskchainname: '任务链名称' + taskchainname: '任务链名称', + depthcamera: '深度相机', + horizontalandheightcalibration: '水平和高度标定', + laser: '激光', + calibrationorientation: '标定朝向', + calibrationposition: '标定位置', + topviewcamera: '顶视相机', + startcalibration: '开始标定', + endcalibration: '结束标定', + ceilingheight: '天花板高度', + collectingdata: '采集数据中', + calibrationtimeoutpleasereoperate: '标定超时,请重新操作', + calibrationsuccessful: '标定成功', + calibrationfailed: '标定失败', + calibrationresultabnormal: '标定结果异常', + calibrationprogramabnormal: '标定程序异常' } diff --git a/src/images/new/RF7.png b/src/images/new/RF7.png new file mode 100644 index 0000000..fa9f031 Binary files /dev/null and b/src/images/new/RF7.png differ diff --git a/src/pages/modules/calibration/index.vue b/src/pages/modules/calibration/index.vue new file mode 100644 index 0000000..1060b30 --- /dev/null +++ b/src/pages/modules/calibration/index.vue @@ -0,0 +1,412 @@ + + + + + \ No newline at end of file diff --git a/src/pages/modules/home.vue b/src/pages/modules/home.vue index e1c3049..2527a8f 100644 --- a/src/pages/modules/home.vue +++ b/src/pages/modules/home.vue @@ -2,7 +2,7 @@ @@ -22,10 +22,11 @@ export default { ...mapGetters(['userRole']), nav () { return [ - { title: '操作', zh_title: '操作', en_title: 'Operate', router: '/index/device', isVisible: true }, - { title: '建图', zh_title: '建图', en_title: 'Map - building', router: '/index/building', isVisible: this.userRole === 1 }, - { title: '地图', zh_title: '地图', en_title: 'Map', router: '/index/map', isVisible: true }, - { title: '重定位', zh_title: '重定位', en_title: 'Relocate', router: '/index/relocation', isVisible: true } + { title: '操作', zh_title: '操作', en_title: 'Operate', router: '/index/device', icon: 'RF1', isVisible: true }, + { title: '建图', zh_title: '建图', en_title: 'Map - building', router: '/index/building', icon: 'RF2', isVisible: this.userRole === 1 }, + { title: '地图', zh_title: '地图', en_title: 'Map', router: '/index/map', icon: 'RF3', isVisible: true }, + { title: '重定位', zh_title: '重定位', en_title: 'Relocate', router: '/index/relocation', icon: 'RF4', isVisible: true }, + { title: '一键标定', zh_title: '一键标定', en_title: 'One - Click Calibration', router: '/index/calibration', icon: 'RF7', isVisible: true } ] }, visibleNav () { @@ -92,26 +93,37 @@ export default { line-height 1 color #F6F9FE font-family 'YouSheBiaoTiHei' + text-align center background linear-gradient(180deg, rgba(255,255,255,1) 0%, rgba(49,190,255,0.9) 0%, rgba(239,252,254,1) 40%) -webkit-background-clip: text -webkit-text-fill-color: transparent .nav_icon + position relative width 35% padding-top 35% border-radius 50% margin-bottom 3% + img + position absolute + width 70% + top 50% + left 50% + transform translate(-50%, -50%) .nav_item_1 .nav_icon - background #217872 center center / 70% auto url(../../images/new/RF1.png) no-repeat + background linear-gradient(90deg, rgba(130, 234, 143, 60%), rgba(0, 185, 81, 80%)) .nav_item_2 .nav_icon - background #80732F center center / 70% auto url(../../images/new/RF2.png) no-repeat + background linear-gradient(90deg, rgba(255, 212, 153, 60%), rgba(255, 144, 25, 80%)) .nav_item_3 .nav_icon - background #00a9ff center center / 70% auto url(../../images/new/RF3.png) no-repeat + background linear-gradient(90deg, rgba(120, 173, 255, 60%), rgba(52, 92, 248, 80%)) .nav_item_4 .nav_icon - background #80372D center center / 70% auto url(../../images/new/RF4.png) no-repeat + background linear-gradient(90deg, rgba(255, 125, 119, 60%), rgba(255, 84, 47, 80%)) +.nav_item_5 + .nav_icon + background linear-gradient(90deg, rgba(206, 149, 255, 60%), rgba(124, 47, 255, 80%)) .enClass .nav_item_i p diff --git a/src/pages/shells/index.vue b/src/pages/shells/index.vue index e010bf9..e323f33 100644 --- a/src/pages/shells/index.vue +++ b/src/pages/shells/index.vue @@ -288,10 +288,11 @@ export default { background linear-gradient(0deg, #E64F29, rgba(230, 79, 41, 0.5)) border-color rgba(230, 79, 41, 0.7) .state-item - _wh(1rem, .3rem) + height .3rem _font(.18rem,.3rem,#fff,,center) font-family 'Adobe Heiti Std' margin-right .08rem + padding 0 .06rem background center / 100% 100% url(../../images/new/state-item_bg.png) no-repeat box-shadow inset 0px 0px 3px 2px rgb(149, 221, 253, 70%) overflow hidden @@ -340,11 +341,12 @@ export default { white-space nowrap background-color rgba(253, 246, 236, .4) .scroll-text - display inline-block - text-align center + display flex + align-items center + justify-content center animation none .icon-warning - font-size .18rem + font-size .24rem color #e6bb3c margin-right .05rem .error-tips-t diff --git a/src/router/index.js b/src/router/index.js index ecc1551..4791be0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -8,6 +8,7 @@ const Warning = r => require.ensure([], () => r(require('../pages/modules/warn/i const Building = r => require.ensure([], () => r(require('../pages/modules/build/index.vue')), 'Building') const Map = r => require.ensure([], () => r(require('../pages/modules/map/index.vue')), 'Map') const Relocation = r => require.ensure([], () => r(require('../pages/modules/relocation.vue')), 'Relocation') +const Calibration = r => require.ensure([], () => r(require('../pages/modules/calibration/index.vue')), 'Calibration') const Login = r => require.ensure([], () => r(require('../pages/modules/login/index.vue')), 'login') const IndexHub = r => require.ensure([], () => r(require('../pages/modules/hub/index.vue')), 'IndexHub') const Upload = r => require.ensure([], () => r(require('../pages/modules/hub/upload.vue')), 'Upload') @@ -41,6 +42,9 @@ const router = new VueRouter({ }, { path: 'relocation', component: Relocation + }, { + path: 'calibration', + component: Calibration }] }, {