diff --git a/src/config/getData.js b/src/config/getData.js index d6df314..44a2bd7 100644 --- a/src/config/getData.js +++ b/src/config/getData.js @@ -46,4 +46,6 @@ export const rebootVehicle = () => get('vehicle/rebootVehicle', {}) // 同步地图 export const synchronizedMap = () => post('mapInfo/synchronizedMap', {}) // 错误 -export const queryErrorDataByCode = (code) => post('anomalyInfo/queryErrorDataByCode?code=' + code, {}) \ No newline at end of file +export const queryErrorDataByCode = (code) => post('anomalyInfo/queryErrorDataByCode?code=' + code, {}) +// 叉间状态 +export const backIoStatus = (type) => post('vehicle/backIoStatus?backIoStatus=' + type, {}) \ No newline at end of file diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index 9f1978e..1307fa8 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -106,5 +106,9 @@ module.exports = { Aresuremap: 'Are you sure to synchronize the map?', Mapbeencancel: 'Map synchronization has been cancelled', Aresureshutrestart: 'Are you sure you want to shut down and restart?', - shutrestartcancel: 'The operation of shutting down and restarting has been cancelled.' + shutrestartcancel: 'The operation of shutting down and restarting has been cancelled.', + Systemsettings: 'System settings', + Control: 'Control', + Workshopstatus: 'Workshop status', + Syncsuccessfully: 'Sync successfully' } diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js index d68eefa..df067d2 100644 --- a/src/i18n/langs/zh.js +++ b/src/i18n/langs/zh.js @@ -84,7 +84,7 @@ module.exports = { driverTxt2: '移动到工位点时,点击打点按钮记录当前车辆所在位置为工位点。', driverTxt3: '完成建图,点击结束建图按钮,等待地图自动生成。', carbuildingmap: '小车正在建图中', - errorbuildingredone: '图', + errorbuildingredone: '建图过程中出现错误,需要重新进行建图。', sureendbuilding: '确定是否结束建图?', endbuildingcancel: '已取消结束建图', errorendbuilding: '结束建图出现错误', @@ -106,5 +106,9 @@ module.exports = { Aresuremap: '是否确定同步地图?', Mapbeencancel: '已取消同步地图', Aresureshutrestart: '是否确定关机重启?', - shutrestartcancel: '已取消关机重启' + shutrestartcancel: '已取消关机重启', + Systemsettings: '系统设置', + Control: '控制', + Workshopstatus: '叉间状态', + Syncsuccessfully: '同步成功' } diff --git a/src/images/new/RF5.png b/src/images/new/RF5.png new file mode 100644 index 0000000..cd2d983 Binary files /dev/null and b/src/images/new/RF5.png differ diff --git a/src/images/new/RF6.png b/src/images/new/RF6.png new file mode 100644 index 0000000..d6ee2ff Binary files /dev/null and b/src/images/new/RF6.png differ diff --git a/src/images/new/state_title_bg.png b/src/images/new/state_title_bg.png new file mode 100644 index 0000000..a720ffe Binary files /dev/null and b/src/images/new/state_title_bg.png differ diff --git a/src/pages/modules/building.vue b/src/pages/modules/building.vue index 02cc831..346ffb3 100644 --- a/src/pages/modules/building.vue +++ b/src/pages/modules/building.vue @@ -49,7 +49,7 @@ @@ -202,6 +234,60 @@ export default { width .72rem height .71rem background center / 100% auto url(../../images/new/reset.png) no-repeat +.contorl_title + width 2rem + height .4rem + padding-left .4rem + font-size .24rem + color #fff + line-height .4rem + margin-bottom .2rem + background center / 100% 100% url(../../images/new/state_title_bg.png) no-repeat +.agv_button + min-width .9rem + height .9rem + padding: 0.05rem; + font-size: .16rem; + color: #fff; + border 1px solid #3D93F0 + background linear-gradient(0deg, #3483DA, #1E59CD) + img + width .5rem + height .5rem + +.agv_button + margin-left .2rem +.contorl_box + padding 0 .4rem + margin-bottom .2rem +.contorl_title_2 + font-size: .2rem; + line-height: .4rem; + color: #fff; + padding-right: 0.1rem; +.switch_button + position relative + width .9rem + height .4rem + border 1px solid #357ED1 + background linear-gradient(0deg, #286495, #0F294D) + box-sizing border-box + input[type="checkbox"] + position absolute + width 100% + height 100% + opacity: 0; + margin: 0; +.switch_on_off + position absolute + width .4rem + height 100% + left 0 + background #4380AF +.switch_button_on + border-color #3D93F0 + background linear-gradient(0deg, #3483DA, #1E59CD) + .switch_on_off + background #A2FAFE .enClass .el-tabs__item font-size .2rem diff --git a/src/vuex/modules/data.js b/src/vuex/modules/data.js index 1cb6679..92db8f1 100644 --- a/src/vuex/modules/data.js +++ b/src/vuex/modules/data.js @@ -3,13 +3,15 @@ import * as types from '../types' const state = { carPosition: {x: '', y: '', angle: ''}, isTop: false, - errorData: [] + errorData: [], + backIoStatus: false } const getters = { carPosition: state => state.carPosition, isTop: state => state.isTop, - errorData: state => state.errorData + errorData: state => state.errorData, + backIoStatus: state => state.backIoStatus } const actions = { @@ -32,6 +34,9 @@ const mutations = { if (Object.prototype.hasOwnProperty.call(data, 'errorData')) { state.errorData = data.errorData } + if (Object.prototype.hasOwnProperty.call(data, 'back_io_status')) { + state.backIoStatus = data.back_io_status + } } }