From 2cc425f64b679c7bf4da222ad51db9ceddaca186 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Fri, 15 Dec 2023 16:49:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BD=A6=E8=BE=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en.js | 1 + src/i18n/langs/zh.js | 1 + src/images/new/state_btn_yellow.png | Bin 0 -> 3612 bytes src/pages/modules/login/login.vue | 5 +++-- .../vehicleinformation/vehiclecontrol.vue | 4 ++-- .../vehicleinformation/vehiclestatus.vue | 5 ++++- src/vuex/modules/com.js | 16 ++++++++++++++++ src/vuex/types.js | 1 + 8 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 src/images/new/state_btn_yellow.png diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index 68cf1ad..401bf98 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -101,6 +101,7 @@ module.exports = { resetbutton: 'Reset Button', obstacleavoidanceparking: 'Obstacle Avoidance Parking', safetyedgesensor: 'Safety Edge Sensor', + sensorinducedparking: 'Sensor Induced Parking', run: 'Run', abnormal: 'Abnormal' }, diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js index d30051d..348cf65 100644 --- a/src/i18n/langs/zh.js +++ b/src/i18n/langs/zh.js @@ -101,6 +101,7 @@ module.exports = { resetbutton: '复位按钮', obstacleavoidanceparking: '避障停车', safetyedgesensor: '安全触边', + sensorinducedparking: '传感器停车', run: '运行', abnormal: '异常' }, diff --git a/src/images/new/state_btn_yellow.png b/src/images/new/state_btn_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..adfeb885a4883f6226ebdbb834c51cd81893cc9d GIT binary patch literal 3612 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 irJreq@~iM~1^*9QDTmbeE~MfB0000
{{ $t('vehiclecontrol.updatestatus') }}:
-
{{$i18n.locale === 'en-us' ? status.en_UpdateStatus_name : status.zh_UpdateStatus_name }}
+
{{$i18n.locale === 'en-us' ? status.en_UpdateStatus_name : status.zh_UpdateStatus_name }}
@@ -279,7 +279,7 @@ export default { padding-left 66px background left center url(../../../images/new/state_btn.png) no-repeat .state_item_val_disabled - background-image url(../../../images/new/state_btn_disable.png) + background-image url(../../../images/new/state_btn_yellow.png) .agv_wrap width 100% _fj() diff --git a/src/pages/modules/vehicleinformation/vehiclestatus.vue b/src/pages/modules/vehicleinformation/vehiclestatus.vue index ccf19f1..9d75d63 100644 --- a/src/pages/modules/vehicleinformation/vehiclestatus.vue +++ b/src/pages/modules/vehicleinformation/vehiclestatus.vue @@ -75,7 +75,7 @@
{{ $t('vehiclestatus.vehiclestatus') }}:
-
{{$i18n.locale === 'en-us' ? result.en_vehicle_status : result.zh_vehicle_status}}
+
{{$i18n.locale === 'en-us' ? result.en_vehicle_status : result.zh_vehicle_status}}
{{ $t('vehiclestatus.workingstatus') }}:
@@ -91,6 +91,7 @@
{{ $t('vehiclestatus.resetbutton') }}
{{ $t('vehiclestatus.obstacleavoidanceparking') }}
{{ $t('vehiclestatus.safetyedgesensor') }}
+
{{ $t('vehiclestatus.sensorinducedparking') }}
@@ -225,6 +226,8 @@ export default { background left center url(../../../images/new/state_btn.png) no-repeat .state_item_val_disabled background-image url(../../../images/new/state_btn_disable.png) +.state_item_val_disabled_1 + background-image url(../../../images/new/state_btn_yellow.png) .enClass .agv_item_wrap &:nth-child(1), &:nth-child(5) diff --git a/src/vuex/modules/com.js b/src/vuex/modules/com.js index 8da4c24..b99655e 100644 --- a/src/vuex/modules/com.js +++ b/src/vuex/modules/com.js @@ -3,9 +3,13 @@ import { getStore, setStore } from '@config/utils.js' const baseUrl = process.env.NODE_ENV === 'development' ? 'http://43.139.166.161:8018' : 'http://localhost:8018' const setTime = '1000' +const username = 'admin' +const password = '123456' const state = { baseUrl: getStore('baseUrl') || baseUrl, setTime: getStore('setTime') || setTime, + defaultUsername: getStore('defaultUsername') || username, + defaultPassword: getStore('defaultPassword') || password, loading: false, showToast: false, showAlert: false, @@ -18,6 +22,8 @@ const state = { const getters = { baseUrl: state => state.baseUrl, setTime: state => state.setTime, + defaultUsername: state => state.defaultUsername, + defaultPassword: state => state.defaultPassword, loading: state => state.loading, showToast: state => state.showToast, showAlert: state => state.showAlert @@ -29,6 +35,11 @@ const actions = { setStore('setTime', res.setTime) commit(types.COM_CONFIG, res) }, + setLoginInfo ({commit}, res) { + setStore('defaultUsername', res.username) + setStore('defaultPassword', res.password) + commit(types.COM_LOGIN_INFO, res) + }, setLoadingState ({ commit }, status) { commit(types.COM_LOADING_STATUS, status) }, @@ -58,6 +69,11 @@ const mutations = { state.setTime = res.setTime }, + [types.COM_LOGIN_INFO] (state, res) { + state.defaultUsername = res.username + state.defaultPassword = res.password + }, + [types.COM_LOADING_STATUS] (state, status) { state.loading = status }, diff --git a/src/vuex/types.js b/src/vuex/types.js index e578040..88066cb 100644 --- a/src/vuex/types.js +++ b/src/vuex/types.js @@ -7,6 +7,7 @@ export const COM_SHOW_FAIL = 'COM_SHOW_FAIL' // 显示失败toast export const COM_TOAST_MSG = 'COM_TOAST_MSG' // 显示toast文字 export const COM_SHOW_ALERT = 'COM_SHOW_ALERT' export const COM_ALERT_MSG = 'COM_ALERT_MSG' +export const COM_LOGIN_INFO = 'COM_LOGIN_INFO' // 用户 export const SET_USER_INFO = 'SET_USER_INFO'