diff --git a/README.md b/README.md index 47a8b66..2324189 100644 --- a/README.md +++ b/README.md @@ -31,4 +31,5 @@ For a detailed explanation on how things work, check out the [guide](http://vuej # 注意事项 + 屏幕分辨率为1920 * 1080 -+ 打包需要在.gitignore文件中删除（不能注释） ‘/static/Magic4/’ 再打包，打包完再恢复 \ No newline at end of file ++ 打包需要在.gitignore文件中删除（不能注释） ‘/static/Magic4/’ 再打包，打包完再恢复 ++ 线上服务地址：http://47.98.105.245:8018 \ No newline at end of file diff --git a/src/components/time.vue b/src/components/time.vue index cbfce81..e9726ae 100644 --- a/src/components/time.vue +++ b/src/components/time.vue @@ -100,11 +100,11 @@ export default { height 77px .date-wraper width 111px - _font(25px, 19px, #B4C1D8,,right) + _font(25px, 19px, #e1e9f4,,right) font-family SourceHanSansCN-Regular .time-wraper width 111px - _font(16px, 13px, #B4C1D8,,right) + _font(16px, 13px, #e1e9f4,,right) margin-top 10px font-family SourceHanSansCN-Regular diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index 2148487..6a0d5cf 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -122,6 +122,7 @@ module.exports = { skipthestart: 'Skip The Start', initializecoordinate: 'Initialize Coordinate', fullscreen: 'Full Screen', + exitfullscreen: 'Exit Full Screen', quit: 'Quit', poweroff: 'Power Off', softwarerestart: 'Software Restart', diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js index 1906bac..1c586b5 100644 --- a/src/i18n/langs/zh.js +++ b/src/i18n/langs/zh.js @@ -122,6 +122,7 @@ module.exports = { skipthestart: '跳过起点', initializecoordinate: '初始化坐标', fullscreen: '全屏', + exitfullscreen: '退出全屏', quit: '退出', poweroff: '关机', softwarerestart: '软启动', diff --git a/src/images/new-1/arrow_up.png b/src/images/new-1/arrow_up.png new file mode 100644 index 0000000..38c3334 Binary files /dev/null and b/src/images/new-1/arrow_up.png differ diff --git a/src/images/new-1/bg-con-l.png b/src/images/new-1/bg-con-l.png new file mode 100644 index 0000000..0a9bac2 Binary files /dev/null and b/src/images/new-1/bg-con-l.png differ diff --git a/src/images/new-1/bg-con.png b/src/images/new-1/bg-con.png new file mode 100755 index 0000000..ebb15a9 Binary files /dev/null and b/src/images/new-1/bg-con.png differ diff --git a/src/images/new-1/bg-head-tb-in.png b/src/images/new-1/bg-head-tb-in.png new file mode 100644 index 0000000..5e86129 Binary files /dev/null and b/src/images/new-1/bg-head-tb-in.png differ diff --git a/src/images/new-1/bg-home-btm.png b/src/images/new-1/bg-home-btm.png new file mode 100644 index 0000000..d4157fe Binary files /dev/null and b/src/images/new-1/bg-home-btm.png differ diff --git a/src/images/new-1/bg-home-r1.png b/src/images/new-1/bg-home-r1.png new file mode 100644 index 0000000..b0d46cd Binary files /dev/null and b/src/images/new-1/bg-home-r1.png differ diff --git a/src/images/new-1/bg-home-r2.png b/src/images/new-1/bg-home-r2.png new file mode 100644 index 0000000..1a1e032 Binary files /dev/null and b/src/images/new-1/bg-home-r2.png differ diff --git a/src/images/new-1/bg-home-r3.png b/src/images/new-1/bg-home-r3.png new file mode 100644 index 0000000..e08f95f Binary files /dev/null and b/src/images/new-1/bg-home-r3.png differ diff --git a/src/images/new-1/bg-home-r4.png b/src/images/new-1/bg-home-r4.png new file mode 100644 index 0000000..5cd94cd Binary files /dev/null and b/src/images/new-1/bg-home-r4.png differ diff --git a/src/images/new-1/bg-home-tip.png b/src/images/new-1/bg-home-tip.png new file mode 100644 index 0000000..e101e09 Binary files /dev/null and b/src/images/new-1/bg-home-tip.png differ diff --git a/src/images/new-1/bg-task-r1.png b/src/images/new-1/bg-task-r1.png new file mode 100644 index 0000000..9b4c0ef Binary files /dev/null and b/src/images/new-1/bg-task-r1.png differ diff --git a/src/images/new-1/bg-task-r2.png b/src/images/new-1/bg-task-r2.png new file mode 100644 index 0000000..cdc7a8b Binary files /dev/null and b/src/images/new-1/bg-task-r2.png differ diff --git a/src/images/new-1/bg-title-l.png b/src/images/new-1/bg-title-l.png new file mode 100644 index 0000000..a2a5616 Binary files /dev/null and b/src/images/new-1/bg-title-l.png differ diff --git a/src/images/new-1/bg-title.png b/src/images/new-1/bg-title.png new file mode 100755 index 0000000..fd8e982 Binary files /dev/null and b/src/images/new-1/bg-title.png differ diff --git a/src/images/new-1/bg.png b/src/images/new-1/bg.png new file mode 100644 index 0000000..6fa4f39 Binary files /dev/null and b/src/images/new-1/bg.png differ diff --git a/src/images/new-1/bg1.png b/src/images/new-1/bg1.png new file mode 100644 index 0000000..3ab6c05 Binary files /dev/null and b/src/images/new-1/bg1.png differ diff --git a/src/images/new-1/bg2.png b/src/images/new-1/bg2.png new file mode 100644 index 0000000..3ef88d9 Binary files /dev/null and b/src/images/new-1/bg2.png differ diff --git a/src/images/new-1/bg_1.png b/src/images/new-1/bg_1.png new file mode 100644 index 0000000..0532efa Binary files /dev/null and b/src/images/new-1/bg_1.png differ diff --git a/src/images/new-1/bottom_bg.png b/src/images/new-1/bottom_bg.png new file mode 100644 index 0000000..28aaf7b Binary files /dev/null and b/src/images/new-1/bottom_bg.png differ diff --git a/src/images/new-1/btn-blue.png b/src/images/new-1/btn-blue.png new file mode 100644 index 0000000..7f3263b Binary files /dev/null and b/src/images/new-1/btn-blue.png differ diff --git a/src/images/new-1/btn-red.png b/src/images/new-1/btn-red.png new file mode 100644 index 0000000..cec447c Binary files /dev/null and b/src/images/new-1/btn-red.png differ diff --git a/src/images/new-1/button.png b/src/images/new-1/button.png new file mode 100755 index 0000000..5f7fa2e Binary files /dev/null and b/src/images/new-1/button.png differ diff --git a/src/images/new-1/button_disabled.png b/src/images/new-1/button_disabled.png new file mode 100644 index 0000000..cec447c Binary files /dev/null and b/src/images/new-1/button_disabled.png differ diff --git a/src/images/new-1/car-home.png b/src/images/new-1/car-home.png new file mode 100644 index 0000000..c7a88e4 Binary files /dev/null and b/src/images/new-1/car-home.png differ diff --git a/src/images/new-1/car-home2.png b/src/images/new-1/car-home2.png new file mode 100644 index 0000000..562d497 Binary files /dev/null and b/src/images/new-1/car-home2.png differ diff --git a/src/images/new-1/elec.png b/src/images/new-1/elec.png new file mode 100644 index 0000000..33f8488 Binary files /dev/null and b/src/images/new-1/elec.png differ diff --git a/src/images/new-1/elec_bg.png b/src/images/new-1/elec_bg.png new file mode 100644 index 0000000..a1b0019 Binary files /dev/null and b/src/images/new-1/elec_bg.png differ diff --git a/src/images/new-1/grid_bg.png b/src/images/new-1/grid_bg.png new file mode 100644 index 0000000..29ca869 Binary files /dev/null and b/src/images/new-1/grid_bg.png differ diff --git a/src/images/new-1/header_bg.png b/src/images/new-1/header_bg.png new file mode 100644 index 0000000..948b266 Binary files /dev/null and b/src/images/new-1/header_bg.png differ diff --git a/src/images/new-1/hud_left.png b/src/images/new-1/hud_left.png new file mode 100644 index 0000000..30b9169 Binary files /dev/null and b/src/images/new-1/hud_left.png differ diff --git a/src/images/new-1/hud_right.png b/src/images/new-1/hud_right.png new file mode 100644 index 0000000..3467fdc Binary files /dev/null and b/src/images/new-1/hud_right.png differ diff --git a/src/images/new-1/icon-check1.png b/src/images/new-1/icon-check1.png new file mode 100644 index 0000000..8ecc53f Binary files /dev/null and b/src/images/new-1/icon-check1.png differ diff --git a/src/images/new-1/icon-check2.png b/src/images/new-1/icon-check2.png new file mode 100644 index 0000000..49023dc Binary files /dev/null and b/src/images/new-1/icon-check2.png differ diff --git a/src/images/new-1/icon-error1.png b/src/images/new-1/icon-error1.png new file mode 100644 index 0000000..ccf478a Binary files /dev/null and b/src/images/new-1/icon-error1.png differ diff --git a/src/images/new-1/icon-error2.png b/src/images/new-1/icon-error2.png new file mode 100644 index 0000000..93a1087 Binary files /dev/null and b/src/images/new-1/icon-error2.png differ diff --git a/src/images/new-1/line_1.png b/src/images/new-1/line_1.png new file mode 100644 index 0000000..5968d4d Binary files /dev/null and b/src/images/new-1/line_1.png differ diff --git a/src/images/new-1/line_2.png b/src/images/new-1/line_2.png new file mode 100644 index 0000000..d45efeb Binary files /dev/null and b/src/images/new-1/line_2.png differ diff --git a/src/images/new-1/login_bg.png b/src/images/new-1/login_bg.png new file mode 100644 index 0000000..272fb18 Binary files /dev/null and b/src/images/new-1/login_bg.png differ diff --git a/src/images/new-1/login_dy.png b/src/images/new-1/login_dy.png new file mode 100755 index 0000000..7ea8d3a Binary files /dev/null and b/src/images/new-1/login_dy.png differ diff --git a/src/images/new-1/login_header_bg.png b/src/images/new-1/login_header_bg.png new file mode 100755 index 0000000..f450f48 Binary files /dev/null and b/src/images/new-1/login_header_bg.png differ diff --git a/src/images/new-1/login_nav_bg.png b/src/images/new-1/login_nav_bg.png new file mode 100755 index 0000000..5e316d1 Binary files /dev/null and b/src/images/new-1/login_nav_bg.png differ diff --git a/src/images/new-1/login_tab.png b/src/images/new-1/login_tab.png new file mode 100755 index 0000000..e4db549 Binary files /dev/null and b/src/images/new-1/login_tab.png differ diff --git a/src/images/new-1/login_w_bg.png b/src/images/new-1/login_w_bg.png new file mode 100755 index 0000000..a4e6e4e Binary files /dev/null and b/src/images/new-1/login_w_bg.png differ diff --git a/src/images/new-1/logo.png b/src/images/new-1/logo.png new file mode 100644 index 0000000..7e04818 Binary files /dev/null and b/src/images/new-1/logo.png differ diff --git a/src/images/new-1/modal_bg.png b/src/images/new-1/modal_bg.png new file mode 100644 index 0000000..cde6ed3 Binary files /dev/null and b/src/images/new-1/modal_bg.png differ diff --git a/src/images/new-1/nav_bg.png b/src/images/new-1/nav_bg.png new file mode 100644 index 0000000..0d7b52a Binary files /dev/null and b/src/images/new-1/nav_bg.png differ diff --git a/src/images/new-1/qr_load.png b/src/images/new-1/qr_load.png new file mode 100644 index 0000000..90decf4 Binary files /dev/null and b/src/images/new-1/qr_load.png differ diff --git a/src/images/new-1/radio_bg.png b/src/images/new-1/radio_bg.png new file mode 100644 index 0000000..98b151b Binary files /dev/null and b/src/images/new-1/radio_bg.png differ diff --git a/src/images/new-1/radio_bg_checked.png b/src/images/new-1/radio_bg_checked.png new file mode 100644 index 0000000..bbd612b Binary files /dev/null and b/src/images/new-1/radio_bg_checked.png differ diff --git a/src/images/new-1/sidebar_active_bg.png b/src/images/new-1/sidebar_active_bg.png new file mode 100644 index 0000000..f002b06 Binary files /dev/null and b/src/images/new-1/sidebar_active_bg.png differ diff --git a/src/images/new-1/sidebar_bg.png b/src/images/new-1/sidebar_bg.png new file mode 100644 index 0000000..54833ab Binary files /dev/null and b/src/images/new-1/sidebar_bg.png differ diff --git a/src/images/new-1/state-item_bg.png b/src/images/new-1/state-item_bg.png new file mode 100644 index 0000000..5900054 Binary files /dev/null and b/src/images/new-1/state-item_bg.png differ diff --git a/src/images/new-1/state_btn.png b/src/images/new-1/state_btn.png new file mode 100644 index 0000000..a9f46a8 Binary files /dev/null and b/src/images/new-1/state_btn.png differ diff --git a/src/images/new-1/state_btn_disable.png b/src/images/new-1/state_btn_disable.png new file mode 100644 index 0000000..30e6ab1 Binary files /dev/null and b/src/images/new-1/state_btn_disable.png differ diff --git a/src/images/new-1/state_btn_yellow.png b/src/images/new-1/state_btn_yellow.png new file mode 100644 index 0000000..adfeb88 Binary files /dev/null and b/src/images/new-1/state_btn_yellow.png differ diff --git a/src/images/new-1/state_title_bg.png b/src/images/new-1/state_title_bg.png new file mode 100644 index 0000000..706dc0f Binary files /dev/null and b/src/images/new-1/state_title_bg.png differ diff --git a/src/images/new-1/switch_1.png b/src/images/new-1/switch_1.png new file mode 100644 index 0000000..d713302 Binary files /dev/null and b/src/images/new-1/switch_1.png differ diff --git a/src/images/new-1/switch_2.png b/src/images/new-1/switch_2.png new file mode 100644 index 0000000..9701902 Binary files /dev/null and b/src/images/new-1/switch_2.png differ diff --git a/src/images/new-1/switch_3.png b/src/images/new-1/switch_3.png new file mode 100644 index 0000000..0d78038 Binary files /dev/null and b/src/images/new-1/switch_3.png differ diff --git a/src/images/new-1/switch_4.png b/src/images/new-1/switch_4.png new file mode 100644 index 0000000..16589a9 Binary files /dev/null and b/src/images/new-1/switch_4.png differ diff --git a/src/images/new-1/switch_5.png b/src/images/new-1/switch_5.png new file mode 100644 index 0000000..cd29c47 Binary files /dev/null and b/src/images/new-1/switch_5.png differ diff --git a/src/images/new-1/switch_6.png b/src/images/new-1/switch_6.png new file mode 100644 index 0000000..27e845a Binary files /dev/null and b/src/images/new-1/switch_6.png differ diff --git a/src/images/new-1/switch_7.png b/src/images/new-1/switch_7.png new file mode 100644 index 0000000..f75bfec Binary files /dev/null and b/src/images/new-1/switch_7.png differ diff --git a/src/images/new-1/switch_8.png b/src/images/new-1/switch_8.png new file mode 100644 index 0000000..9b442fe Binary files /dev/null and b/src/images/new-1/switch_8.png differ diff --git a/src/images/new-1/switch_bg_off.png b/src/images/new-1/switch_bg_off.png new file mode 100644 index 0000000..fedb944 Binary files /dev/null and b/src/images/new-1/switch_bg_off.png differ diff --git a/src/images/new-1/switch_bg_on.png b/src/images/new-1/switch_bg_on.png new file mode 100644 index 0000000..fccc8a2 Binary files /dev/null and b/src/images/new-1/switch_bg_on.png differ diff --git a/src/images/new-1/switch_off.png b/src/images/new-1/switch_off.png new file mode 100644 index 0000000..22bc45e Binary files /dev/null and b/src/images/new-1/switch_off.png differ diff --git a/src/images/new-1/switch_on.png b/src/images/new-1/switch_on.png new file mode 100644 index 0000000..a954df5 Binary files /dev/null and b/src/images/new-1/switch_on.png differ diff --git a/src/images/new-1/tab_bg.png b/src/images/new-1/tab_bg.png new file mode 100755 index 0000000..f9c8c7b Binary files /dev/null and b/src/images/new-1/tab_bg.png differ diff --git a/src/images/new-1/tab_bg_active.png b/src/images/new-1/tab_bg_active.png new file mode 100755 index 0000000..68c2934 Binary files /dev/null and b/src/images/new-1/tab_bg_active.png differ diff --git a/src/images/new-1/th_bg.png b/src/images/new-1/th_bg.png new file mode 100644 index 0000000..b78a600 Binary files /dev/null and b/src/images/new-1/th_bg.png differ diff --git a/src/images/new-1/user_icon.png b/src/images/new-1/user_icon.png new file mode 100644 index 0000000..3ad6e2b Binary files /dev/null and b/src/images/new-1/user_icon.png differ diff --git a/src/images/new/arrow_up.png b/src/images/new/arrow_up.png index 38c3334..890baa5 100644 Binary files a/src/images/new/arrow_up.png and b/src/images/new/arrow_up.png differ diff --git a/src/images/new/bg-con-l.png b/src/images/new/bg-con-l.png index 0a9bac2..8876728 100644 Binary files a/src/images/new/bg-con-l.png and b/src/images/new/bg-con-l.png differ diff --git a/src/images/new/bg-con.png b/src/images/new/bg-con.png old mode 100755 new mode 100644 index ebb15a9..5a73456 Binary files a/src/images/new/bg-con.png and b/src/images/new/bg-con.png differ diff --git a/src/images/new/bg-head-tb-in.png b/src/images/new/bg-head-tb-in.png index 5e86129..606d3e9 100644 Binary files a/src/images/new/bg-head-tb-in.png and b/src/images/new/bg-head-tb-in.png differ diff --git a/src/images/new/bg-home-btm.png b/src/images/new/bg-home-btm.png index d4157fe..0de54e5 100644 Binary files a/src/images/new/bg-home-btm.png and b/src/images/new/bg-home-btm.png differ diff --git a/src/images/new/bg-home-r1.png b/src/images/new/bg-home-r1.png index b0d46cd..f8aa019 100644 Binary files a/src/images/new/bg-home-r1.png and b/src/images/new/bg-home-r1.png differ diff --git a/src/images/new/bg-home-r2.png b/src/images/new/bg-home-r2.png index 1a1e032..4af9193 100644 Binary files a/src/images/new/bg-home-r2.png and b/src/images/new/bg-home-r2.png differ diff --git a/src/images/new/bg-home-r3.png b/src/images/new/bg-home-r3.png index e08f95f..29502e4 100644 Binary files a/src/images/new/bg-home-r3.png and b/src/images/new/bg-home-r3.png differ diff --git a/src/images/new/bg-home-r4.png b/src/images/new/bg-home-r4.png index 5cd94cd..4ce01bb 100644 Binary files a/src/images/new/bg-home-r4.png and b/src/images/new/bg-home-r4.png differ diff --git a/src/images/new/bg-home-tip.png b/src/images/new/bg-home-tip.png index e101e09..9732e90 100644 Binary files a/src/images/new/bg-home-tip.png and b/src/images/new/bg-home-tip.png differ diff --git a/src/images/new/bg-task-r1.png b/src/images/new/bg-task-r1.png index 9b4c0ef..99b36ec 100644 Binary files a/src/images/new/bg-task-r1.png and b/src/images/new/bg-task-r1.png differ diff --git a/src/images/new/bg-task-r2.png b/src/images/new/bg-task-r2.png index cdc7a8b..4aba5de 100644 Binary files a/src/images/new/bg-task-r2.png and b/src/images/new/bg-task-r2.png differ diff --git a/src/images/new/bg-title-l.png b/src/images/new/bg-title-l.png index a2a5616..9369e0f 100644 Binary files a/src/images/new/bg-title-l.png and b/src/images/new/bg-title-l.png differ diff --git a/src/images/new/bg-title.png b/src/images/new/bg-title.png old mode 100755 new mode 100644 index fd8e982..5ed1c78 Binary files a/src/images/new/bg-title.png and b/src/images/new/bg-title.png differ diff --git a/src/images/new/bg.png b/src/images/new/bg.png index 6fa4f39..f810e61 100644 Binary files a/src/images/new/bg.png and b/src/images/new/bg.png differ diff --git a/src/images/new/bg1.png b/src/images/new/bg1.png index 3ab6c05..93cbbd8 100644 Binary files a/src/images/new/bg1.png and b/src/images/new/bg1.png differ diff --git a/src/images/new/bg2.png b/src/images/new/bg2.png index 3ef88d9..1d32cf4 100644 Binary files a/src/images/new/bg2.png and b/src/images/new/bg2.png differ diff --git a/src/images/new/bg_1.png b/src/images/new/bg_1.png index 0532efa..4fd0f44 100644 Binary files a/src/images/new/bg_1.png and b/src/images/new/bg_1.png differ diff --git a/src/images/new/bottom_bg.png b/src/images/new/bottom_bg.png index 28aaf7b..60ec14d 100644 Binary files a/src/images/new/bottom_bg.png and b/src/images/new/bottom_bg.png differ diff --git a/src/images/new/btn-blue.png b/src/images/new/btn-blue.png index 7f3263b..33f19bf 100644 Binary files a/src/images/new/btn-blue.png and b/src/images/new/btn-blue.png differ diff --git a/src/images/new/btn-red.png b/src/images/new/btn-red.png index cec447c..85f07bd 100644 Binary files a/src/images/new/btn-red.png and b/src/images/new/btn-red.png differ diff --git a/src/images/new/button.png b/src/images/new/button.png old mode 100755 new mode 100644 index 5f7fa2e..60f54f4 Binary files a/src/images/new/button.png and b/src/images/new/button.png differ diff --git a/src/images/new/button_disabled.png b/src/images/new/button_disabled.png index cec447c..5db8165 100644 Binary files a/src/images/new/button_disabled.png and b/src/images/new/button_disabled.png differ diff --git a/src/images/new/car-home.png b/src/images/new/car-home.png index c7a88e4..8699155 100644 Binary files a/src/images/new/car-home.png and b/src/images/new/car-home.png differ diff --git a/src/images/new/car-home2.png b/src/images/new/car-home2.png index 562d497..d1e3b53 100644 Binary files a/src/images/new/car-home2.png and b/src/images/new/car-home2.png differ diff --git a/src/images/new/elec.png b/src/images/new/elec.png index 33f8488..6c52e38 100644 Binary files a/src/images/new/elec.png and b/src/images/new/elec.png differ diff --git a/src/images/new/elec_bg.png b/src/images/new/elec_bg.png index a1b0019..eeea12a 100644 Binary files a/src/images/new/elec_bg.png and b/src/images/new/elec_bg.png differ diff --git a/src/images/new/grid_bg.png b/src/images/new/grid_bg.png index 29ca869..85db371 100644 Binary files a/src/images/new/grid_bg.png and b/src/images/new/grid_bg.png differ diff --git a/src/images/new/header_bg.png b/src/images/new/header_bg.png index 948b266..a24d34a 100644 Binary files a/src/images/new/header_bg.png and b/src/images/new/header_bg.png differ diff --git a/src/images/new/hud_left.png b/src/images/new/hud_left.png index 30b9169..f5bfa22 100644 Binary files a/src/images/new/hud_left.png and b/src/images/new/hud_left.png differ diff --git a/src/images/new/hud_right.png b/src/images/new/hud_right.png index 3467fdc..ab9ee24 100644 Binary files a/src/images/new/hud_right.png and b/src/images/new/hud_right.png differ diff --git a/src/images/new/icon-check1.png b/src/images/new/icon-check1.png index 8ecc53f..0895ae4 100644 Binary files a/src/images/new/icon-check1.png and b/src/images/new/icon-check1.png differ diff --git a/src/images/new/icon-check2.png b/src/images/new/icon-check2.png index 49023dc..91e94ca 100644 Binary files a/src/images/new/icon-check2.png and b/src/images/new/icon-check2.png differ diff --git a/src/images/new/icon-error1.png b/src/images/new/icon-error1.png index ccf478a..f12266f 100644 Binary files a/src/images/new/icon-error1.png and b/src/images/new/icon-error1.png differ diff --git a/src/images/new/icon-error2.png b/src/images/new/icon-error2.png index 93a1087..dbb1890 100644 Binary files a/src/images/new/icon-error2.png and b/src/images/new/icon-error2.png differ diff --git a/src/images/new/line_1.png b/src/images/new/line_1.png index 5968d4d..cfca5d3 100644 Binary files a/src/images/new/line_1.png and b/src/images/new/line_1.png differ diff --git a/src/images/new/line_2.png b/src/images/new/line_2.png index d45efeb..320c3b6 100644 Binary files a/src/images/new/line_2.png and b/src/images/new/line_2.png differ diff --git a/src/images/new/login_bg.png b/src/images/new/login_bg.png index 272fb18..91d7b69 100644 Binary files a/src/images/new/login_bg.png and b/src/images/new/login_bg.png differ diff --git a/src/images/new/login_dy.png b/src/images/new/login_dy.png old mode 100755 new mode 100644 index 7ea8d3a..514d3ce Binary files a/src/images/new/login_dy.png and b/src/images/new/login_dy.png differ diff --git a/src/images/new/login_header_bg.png b/src/images/new/login_header_bg.png old mode 100755 new mode 100644 index f450f48..db2e6c4 Binary files a/src/images/new/login_header_bg.png and b/src/images/new/login_header_bg.png differ diff --git a/src/images/new/login_nav_bg.png b/src/images/new/login_nav_bg.png old mode 100755 new mode 100644 index 5e316d1..8885ba4 Binary files a/src/images/new/login_nav_bg.png and b/src/images/new/login_nav_bg.png differ diff --git a/src/images/new/login_tab.png b/src/images/new/login_tab.png old mode 100755 new mode 100644 index e4db549..b5317d8 Binary files a/src/images/new/login_tab.png and b/src/images/new/login_tab.png differ diff --git a/src/images/new/login_w_bg.png b/src/images/new/login_w_bg.png old mode 100755 new mode 100644 index a4e6e4e..8038375 Binary files a/src/images/new/login_w_bg.png and b/src/images/new/login_w_bg.png differ diff --git a/src/images/new/logo.png b/src/images/new/logo.png index 7e04818..509e6a3 100644 Binary files a/src/images/new/logo.png and b/src/images/new/logo.png differ diff --git a/src/images/new/modal_bg.png b/src/images/new/modal_bg.png index cde6ed3..47822cb 100644 Binary files a/src/images/new/modal_bg.png and b/src/images/new/modal_bg.png differ diff --git a/src/images/new/nav_bg.png b/src/images/new/nav_bg.png index 0d7b52a..f02f91a 100644 Binary files a/src/images/new/nav_bg.png and b/src/images/new/nav_bg.png differ diff --git a/src/images/new/radio_bg.png b/src/images/new/radio_bg.png index 98b151b..b73b056 100644 Binary files a/src/images/new/radio_bg.png and b/src/images/new/radio_bg.png differ diff --git a/src/images/new/radio_bg_checked.png b/src/images/new/radio_bg_checked.png index bbd612b..0ce8e17 100644 Binary files a/src/images/new/radio_bg_checked.png and b/src/images/new/radio_bg_checked.png differ diff --git a/src/images/new/sidebar_active_bg.png b/src/images/new/sidebar_active_bg.png index f002b06..ae2ca88 100644 Binary files a/src/images/new/sidebar_active_bg.png and b/src/images/new/sidebar_active_bg.png differ diff --git a/src/images/new/sidebar_bg.png b/src/images/new/sidebar_bg.png index 54833ab..43bf2c2 100644 Binary files a/src/images/new/sidebar_bg.png and b/src/images/new/sidebar_bg.png differ diff --git a/src/images/new/state-item_bg.png b/src/images/new/state-item_bg.png index 5900054..ebd1ba5 100644 Binary files a/src/images/new/state-item_bg.png and b/src/images/new/state-item_bg.png differ diff --git a/src/images/new/state_btn.png b/src/images/new/state_btn.png index a9f46a8..e66c886 100644 Binary files a/src/images/new/state_btn.png and b/src/images/new/state_btn.png differ diff --git a/src/images/new/state_btn_disable.png b/src/images/new/state_btn_disable.png index 30e6ab1..195f8a5 100644 Binary files a/src/images/new/state_btn_disable.png and b/src/images/new/state_btn_disable.png differ diff --git a/src/images/new/state_btn_yellow.png b/src/images/new/state_btn_yellow.png index adfeb88..b84e943 100644 Binary files a/src/images/new/state_btn_yellow.png and b/src/images/new/state_btn_yellow.png differ diff --git a/src/images/new/state_title_bg.png b/src/images/new/state_title_bg.png index 706dc0f..a720ffe 100644 Binary files a/src/images/new/state_title_bg.png and b/src/images/new/state_title_bg.png differ diff --git a/src/images/new/switch_1.png b/src/images/new/switch_1.png index d713302..3a5fe96 100644 Binary files a/src/images/new/switch_1.png and b/src/images/new/switch_1.png differ diff --git a/src/images/new/switch_2.png b/src/images/new/switch_2.png index 9701902..64aac63 100644 Binary files a/src/images/new/switch_2.png and b/src/images/new/switch_2.png differ diff --git a/src/images/new/switch_3.png b/src/images/new/switch_3.png index 0d78038..c18494a 100644 Binary files a/src/images/new/switch_3.png and b/src/images/new/switch_3.png differ diff --git a/src/images/new/switch_4.png b/src/images/new/switch_4.png index 16589a9..cd92364 100644 Binary files a/src/images/new/switch_4.png and b/src/images/new/switch_4.png differ diff --git a/src/images/new/switch_5.png b/src/images/new/switch_5.png index cd29c47..c7d2036 100644 Binary files a/src/images/new/switch_5.png and b/src/images/new/switch_5.png differ diff --git a/src/images/new/switch_6.png b/src/images/new/switch_6.png index 27e845a..c360dad 100644 Binary files a/src/images/new/switch_6.png and b/src/images/new/switch_6.png differ diff --git a/src/images/new/switch_7.png b/src/images/new/switch_7.png index f75bfec..1c931e7 100644 Binary files a/src/images/new/switch_7.png and b/src/images/new/switch_7.png differ diff --git a/src/images/new/switch_8.png b/src/images/new/switch_8.png index 9b442fe..63ce325 100644 Binary files a/src/images/new/switch_8.png and b/src/images/new/switch_8.png differ diff --git a/src/images/new/switch_9.png b/src/images/new/switch_9.png new file mode 100644 index 0000000..c18494a Binary files /dev/null and b/src/images/new/switch_9.png differ diff --git a/src/images/new/switch_bg_off.png b/src/images/new/switch_bg_off.png index fedb944..df81f76 100644 Binary files a/src/images/new/switch_bg_off.png and b/src/images/new/switch_bg_off.png differ diff --git a/src/images/new/switch_bg_on.png b/src/images/new/switch_bg_on.png index fccc8a2..019dc26 100644 Binary files a/src/images/new/switch_bg_on.png and b/src/images/new/switch_bg_on.png differ diff --git a/src/images/new/switch_off.png b/src/images/new/switch_off.png index 22bc45e..f2b9fe8 100644 Binary files a/src/images/new/switch_off.png and b/src/images/new/switch_off.png differ diff --git a/src/images/new/switch_on.png b/src/images/new/switch_on.png index a954df5..fbbdce6 100644 Binary files a/src/images/new/switch_on.png and b/src/images/new/switch_on.png differ diff --git a/src/images/new/tab_bg.png b/src/images/new/tab_bg.png old mode 100755 new mode 100644 index f9c8c7b..24c6579 Binary files a/src/images/new/tab_bg.png and b/src/images/new/tab_bg.png differ diff --git a/src/images/new/tab_bg_active.png b/src/images/new/tab_bg_active.png old mode 100755 new mode 100644 index 68c2934..8b98775 Binary files a/src/images/new/tab_bg_active.png and b/src/images/new/tab_bg_active.png differ diff --git a/src/images/new/th_bg.png b/src/images/new/th_bg.png index b78a600..3019187 100644 Binary files a/src/images/new/th_bg.png and b/src/images/new/th_bg.png differ diff --git a/src/images/new/user_icon.png b/src/images/new/user_icon.png index 3ad6e2b..2e1a803 100644 Binary files a/src/images/new/user_icon.png and b/src/images/new/user_icon.png differ diff --git a/src/pages/modules/home/home.1.vue b/src/pages/modules/home/home.1.vue index 68c87df..dcb19f5 100644 --- a/src/pages/modules/home/home.1.vue +++ b/src/pages/modules/home/home.1.vue @@ -166,7 +166,7 @@ export default { width 652px height 697px font-size 36px - color #B4C1D8 + color #e1e9f4 background center / 100% 100% url(../../../images/new/bg-home-r2.png) no-repeat position relative top -10px @@ -183,7 +183,7 @@ export default { .txt01 float left display inline-block - color #3CC1FF + color #58e9ff margin-left 34px width 330px line-height 36px @@ -202,7 +202,7 @@ export default { .txt float left display inline-block - color #3CC1FF + color #58e9ff margin-left 34px font-size 30px .infoli3 @@ -216,7 +216,7 @@ export default { .txt float left display inline-block - color #3CC1FF + color #58e9ff margin-left 34px font-size 30px .speed-bg diff --git a/src/pages/modules/home/home.vue b/src/pages/modules/home/home.vue index 9159286..45a86fb 100644 --- a/src/pages/modules/home/home.vue +++ b/src/pages/modules/home/home.vue @@ -189,7 +189,7 @@ export default { width 752px height 697px font-size 36px - color #B4C1D8 + color #e1e9f4 background center / 100% 100% url(../../../images/new/bg-home-r2.png) no-repeat position relative top -10px @@ -207,7 +207,7 @@ export default { .txt01 float left display inline-block - color #3CC1FF + color #58e9ff // margin-left 34px width 330px // line-height 36px @@ -230,7 +230,7 @@ export default { width 330px padding-top 15px .txt02 - color #3CC1FF + color #58e9ff // margin-left 34px height 29px line-height 29px @@ -253,7 +253,7 @@ export default { .txt float left display inline-block - color #3CC1FF + color #58e9ff // margin-left 34px font-size 30px .infoli3 @@ -267,7 +267,7 @@ export default { .txt float left display inline-block - color #3CC1FF + color #58e9ff // margin-left 34px font-size 30px .speed-bg diff --git a/src/pages/modules/systemmanage/developer.vue b/src/pages/modules/systemmanage/developer.vue index 64ed9da..a179bf8 100644 --- a/src/pages/modules/systemmanage/developer.vue +++ b/src/pages/modules/systemmanage/developer.vue @@ -178,7 +178,7 @@ export default { &:first-child margin-left -1px .is_active - color: #3CC1FF; + color: #58e9ff; background center / 100% 100% url(../../../images/new/tab_bg_active.png) no-repeat .tabs_content _wh(100%, 100%) diff --git a/src/pages/modules/systemmanage/remote.vue b/src/pages/modules/systemmanage/remote.vue index b09d1e1..14782d9 100644 --- a/src/pages/modules/systemmanage/remote.vue +++ b/src/pages/modules/systemmanage/remote.vue @@ -80,7 +80,7 @@ export default { margin-bottom 70px .veh_item_label width 530px - _font(36px, 56px, #B4C1D8, 500, right) + _font(36px, 56px, #e1e9f4, 500, right) font-family: SourceHanSansCN-Medium; .veh_item_val width calc(100% - 530px) diff --git a/src/pages/modules/taskmanage/CarryPoint.vue b/src/pages/modules/taskmanage/CarryPoint.vue index 26ca8f6..9c4efe9 100644 --- a/src/pages/modules/taskmanage/CarryPoint.vue +++ b/src/pages/modules/taskmanage/CarryPoint.vue @@ -296,7 +296,7 @@ export default { width 248px height 134px line-height 134px - color #B4C1D8 + color #e1e9f4 font-size 26px text-align center margin-right 3px @@ -304,7 +304,7 @@ export default { background center / 100% 100% url(../../../images/new/bg2.png) no-repeat .statusbg box-sizing border-box - color #3CC1FF + color #58e9ff background center / 100% 100% url(../../../images/new/bg1.png) no-repeat !important .box2 position fixed diff --git a/src/pages/modules/vehicleinformation/vehiclecontrol.vue b/src/pages/modules/vehicleinformation/vehiclecontrol.vue index c3b5459..10c45ec 100644 --- a/src/pages/modules/vehicleinformation/vehiclecontrol.vue +++ b/src/pages/modules/vehicleinformation/vehiclecontrol.vue @@ -28,7 +28,9 @@ - + + + @@ -132,7 +134,9 @@ export default { switch3: '', switch4: '', switch5: '', - disabled: false + disabled: false, + isFullScreen: document.fullscreenElement + } }, created () { @@ -254,6 +258,15 @@ export default { } else { this.toast(res.desc) } + }, + // 切换全屏 + requestFullscreen () { + if (this.isFullScreen) { + document.exitFullscreen() + } else { + document.documentElement.requestFullscreen() + } + this.isFullScreen = !this.isFullScreen } } } @@ -270,7 +283,7 @@ export default { _fj(flex-start) .state_item_label width 196px - _font(36px, 56px, #B4C1D8, 500,) + _font(36px, 56px, #e1e9f4, 500,) font-family: SourceHanSansCN-Medium; .state_item_val width calc(100% - 196px) @@ -304,6 +317,8 @@ export default { background center url(../../../images/new/switch_7.png) no-repeat .switch_item_8 background center url(../../../images/new/switch_8.png) no-repeat +.switch_item_9 + background center url(../../../images/new/switch_9.png) no-repeat .control_wrap width 100% _fj(flex-start, flex-start) @@ -314,7 +329,7 @@ export default { _fj(flex-start, flex-start) .control_label width 190px - _font(36px, 88px, #B4C1D8, 500,) + _font(36px, 88px, #e1e9f4, 500,) font-family: SourceHanSansCN-Medium; .content_wrap_inner _fj() diff --git a/src/pages/modules/vehicleinformation/vehiclestatus.vue b/src/pages/modules/vehicleinformation/vehiclestatus.vue index 4cbbd52..1f75fd7 100644 --- a/src/pages/modules/vehicleinformation/vehiclestatus.vue +++ b/src/pages/modules/vehicleinformation/vehiclestatus.vue @@ -171,11 +171,11 @@ export default { .veh_item_label width 180px _fj() - _font(36px, 56px, #B4C1D8, 500, right) + _font(36px, 56px, #e1e9f4, 500, right) font-family: SourceHanSansCN-Medium; .agv_item_label_txt width calc(100% - 15px) - _font(36px, 56px, #B4C1D8, 500, right) + _font(36px, 56px, #e1e9f4, 500, right) font-family: SourceHanSansCN-Medium; text-align:justify; text-align-last: justify; @@ -185,11 +185,11 @@ export default { font-size 28px .agv_item_label_m width 15px - _font(36px, 56px, #B4C1D8, 500, right) + _font(36px, 56px, #e1e9f4, 500, right) .agv_item_val width calc(100% - 180px) padding 0 20px - _font(36px, 56px, #3CC1FF, 500, left) + _font(36px, 56px, #58e9ff, 500, left) font-family: SourceHanSansCN-Medium; white-space: nowrap .agv_item_val_1 @@ -224,7 +224,7 @@ export default { _fj(flex-start, flex-start) .state_item_label width 250px - _font(36px, 56px, #B4C1D8, 500, right) + _font(36px, 56px, #e1e9f4, 500, right) font-family: SourceHanSansCN-Medium; .state_item_val_wrap width calc(100% - 250px) diff --git a/src/pages/shells/index/index.vue b/src/pages/shells/index/index.vue index 23e6629..46d2a69 100644 --- a/src/pages/shells/index/index.vue +++ b/src/pages/shells/index/index.vue @@ -514,7 +514,7 @@ export default { _font(30px, 80px, #fff,,) padding 0 20px &:first-child - color #3CC1FF + color #58e9ff .popper__arrow position absolute width: 0; diff --git a/src/style/common.styl b/src/style/common.styl index 1233153..4239bdf 100644 --- a/src/style/common.styl +++ b/src/style/common.styl @@ -158,7 +158,7 @@ line-height: 30px; white-space: nowrap; cursor: pointer; - color: #3CC1FF; + color: #58e9ff; background transparent -webkit-appearance: none; text-align: center; @@ -177,7 +177,7 @@ .mgr margin-right 10px .button--primary - color: #3CC1FF; + color: #58e9ff; .button--info color: #fff; .modal @@ -324,7 +324,7 @@ .icon_radio_checked background center / 100% 100% url(../images/new/radio_bg_checked.png) no-repeat .radio__label_checked - color #3CC1FF + color #58e9ff .radio__original opacity: 0; outline: none;