diff --git a/src/images/aio/agv_6.png b/src/images/aio/agv_6.png new file mode 100644 index 0000000..f7fa008 Binary files /dev/null and b/src/images/aio/agv_6.png differ diff --git a/src/images/bg.png b/src/images/bg.png deleted file mode 100644 index 6de9a91..0000000 Binary files a/src/images/bg.png and /dev/null differ diff --git a/src/pages/modules/vehicleinformation/index.vue b/src/pages/modules/vehicleinformation/index.vue index ea5aed2..9b5b2ae 100644 --- a/src/pages/modules/vehicleinformation/index.vue +++ b/src/pages/modules/vehicleinformation/index.vue @@ -22,13 +22,9 @@ export default { index: '1', router: '/vehiclestatus' }, { - label: '传感器状态', + label: '车辆控制', index: '2', - router: '/sensorstatus' - }, { - label: 'AGV', - index: '3', - router: '/agvstatus' + router: '/vehiclecontrol' }] } } diff --git a/src/pages/modules/vehicleinformation/vehiclecontrol.vue b/src/pages/modules/vehicleinformation/vehiclecontrol.vue new file mode 100644 index 0000000..0c6aa12 --- /dev/null +++ b/src/pages/modules/vehicleinformation/vehiclecontrol.vue @@ -0,0 +1,100 @@ + + + diff --git a/src/pages/modules/vehicleinformation/vehiclestatus.vue b/src/pages/modules/vehicleinformation/vehiclestatus.vue index c10a717..a3f6e87 100644 --- a/src/pages/modules/vehicleinformation/vehiclestatus.vue +++ b/src/pages/modules/vehicleinformation/vehiclestatus.vue @@ -1,11 +1,78 @@ diff --git a/src/router/index.js b/src/router/index.js index bdc0168..4aa7a8d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -20,6 +20,7 @@ const ErrorDeal = r => require.ensure([], () => r(require('@page/modules/errorma const VehicleInformation = r => require.ensure([], () => r(require('@page/modules/vehicleinformation/index.vue')), 'modules') const VehicleStatus = r => require.ensure([], () => r(require('@page/modules/vehicleinformation/vehiclestatus.vue')), 'modules') +const VehicleControl = r => require.ensure([], () => r(require('@page/modules/vehicleinformation/vehiclecontrol.vue')), 'modules') const SensorStatus = r => require.ensure([], () => r(require('@page/modules/vehicleinformation/sensorstatus.vue')), 'modules') const AgvStatus = r => require.ensure([], () => r(require('@page/modules/vehicleinformation/agvstatus.vue')), 'modules') @@ -107,6 +108,9 @@ export default new Router({ children: [{ path: '/vehiclestatus', component: VehicleStatus + }, { + path: '/vehiclecontrol', + component: VehicleControl }, { path: '/sensorstatus', component: SensorStatus diff --git a/src/style/common.styl b/src/style/common.styl index 3cab003..594ffc2 100644 --- a/src/style/common.styl +++ b/src/style/common.styl @@ -414,3 +414,112 @@ font-size: 14px .tree-node__children overflow hidden + +// 车辆信息 +.content_wrap + _wh(100%, 100%) + overflow-y auto +.state_wrap + width 100% + _fj(, flex-start) + margin-bottom 20px +.state_tip + _wh(200px, 100px) + _fj(center) + _font(28px, 40px, #ffffff,,center) + border 1px solid $red + background-color #ffc3a7 + border-radius 16px + margin-right 70px + overflow hidden +.state_content + width calc(100% - 270px) + _fj(flex-start) + flex-wrap wrap +.state_item_1 + _wh(260px, 100px) + _fj(center) + border 1.6px solid #54C0B3 + background-color #fff + _font(32px,45px,#54C0B3,,center) + border-radius 16px +.state_item_2 + _wh(284px, 100px) + _fj(center) + border 12px solid #DFE1E6 + background-color #fff + border-radius 16px + margin-bottom 24px + margin-right 24px +.state_item_2_dot + display block + _wh(32px,32px) + background-color #00C852 + border-radius 50% + margin-right 24px +.state_item_2_txt + display block + _font(32px,45px,#696969,,) +.state_item_3 + _wh(310px, 100px) + _fj(flex-start) + border 1.6px solid #8B90A6 + background-color #fff + border-radius 16px + margin-bottom 24px + margin-right 24px + padding 10px 20px +.state_item_3_txt1 + display block + _font(32px,45px,#696969,,) + margin-right 12px +.state_item_3_txt2 + display block + _font(32px,45px,#FA6400,,) +.state_item_switch + display: inline-flex; + align-items: center; + position: relative; + line-height: 50px; + height: 50px; + vertical-align: middle; +.switch__input + position: absolute; + width: 0; + height: 0; + opacity: 0; + margin: 0; +.switch_core + margin: 0; + display: inline-block; + position: relative; + width: 100px; + height: 50px; + border: 1px solid #dcdfe6; + outline: none; + border-radius: 25px; + box-sizing: border-box; + background: #dcdfe6; + cursor: pointer; + transition: border-color .3s,background-color .3s; + vertical-align: middle; + border-color: rgb(255, 73, 73); + background-color: rgb(255, 73, 73); + &::after + content: ""; + position: absolute; + top: 1px; + left: 1px; + border-radius: 100%; + transition: all .3s; + width: 47px; + height: 47px; + background-color: #fff; +.is-checked + .switch_core + width: 100px; + border-color: rgb(19, 206, 102); + background-color: rgb(19, 206, 102); + &::after + left: 100%; + margin-left: -49px; \ No newline at end of file