diff --git a/src/assets/icon/favicon_hhzy.png b/src/assets/icon/favicon_hhzy.png index 42f682a29..5fd6d6d7c 100644 Binary files a/src/assets/icon/favicon_hhzy.png and b/src/assets/icon/favicon_hhzy.png differ diff --git a/src/store/modules/training.js b/src/store/modules/training.js index 86c4e857b..e9957519c 100644 --- a/src/store/modules/training.js +++ b/src/store/modules/training.js @@ -183,6 +183,7 @@ const training = { state.operate = operate; }, setInitTime: (state, initTime) => { + console.log(initTime) state.initTime = initTime; }, setPrdType: (state, prdType) => { diff --git a/src/views/newMap/displayNew/demon/setTime.vue b/src/views/newMap/displayNew/demon/setTime.vue index 98a203d86..73fc876cb 100644 --- a/src/views/newMap/displayNew/demon/setTime.vue +++ b/src/views/newMap/displayNew/demon/setTime.vue @@ -74,6 +74,7 @@ export default { }, methods: { doShow() { + console.log(this.$store.state.training.initTime) this.formModel.initTime = new Date(this.$store.state.training.initTime || null); this.handleChange(this.formModel.initTime); this.show = true; @@ -92,6 +93,7 @@ export default { }, handleSure() { this.$refs.form.validate((valid) => { + debugger if (valid) { this.status = true; const model = { diff --git a/src/views/pis/index.vue b/src/views/pis/index.vue index a622d83a3..2c4319ea4 100644 --- a/src/views/pis/index.vue +++ b/src/views/pis/index.vue @@ -121,11 +121,17 @@ export default { this.date = timestampFormat('YYYY年MM月DD日', val) }, '$store.state.socket.standPisState': function(val) { - this.standPisState = val - console.log(this.standPisState) + this.standPisState.stationName = val.stationName + this.standPisState.firstTrainRemain = val.firstTrainRemain + this.standPisState.firstEndStationName = val.firstEndStationName + this.standPisState.secondTrainRemain = val.secondTrainRemain + this.standPisState.secondEndStationName = val.secondEndStationName + if (val.text) this.standPisState.text = val.text }, '$store.state.socket.onboardPisState': function(val) { - this.onboardPisState = val + this.onboardPisState.stationName = val.stationName + this.onboardPisState.endStationName = val.endStationName + this.onboardPisState.parking = val.parking }, }, data() { @@ -141,7 +147,7 @@ export default { firstEndStationName: '', secondTrainRemain: undefined, secondEndStationName: '', - text: '', + text: '党的十八大提出,倡导富强、民主、文明、和谐,倡导自由、平等、公正、法治,倡导爱国、敬业、诚信、友善,积极培育和践行社会主义核心价值观。富强、民主、文明、和谐是国家层面的价值目标,自由、平等、公正、法治是社会层面的价值取向,爱国、敬业、诚信、友善是公民个人层面的价值准则,这24个字是社会主义核心价值观的基本内容。', }, onboardPisState: { groupNumber: '', @@ -149,7 +155,7 @@ export default { endStationName: '', parking: 0, text: - '党的十八大提出,倡导富强、民主、文明、和谐,倡导自由、平等、公正、法治,倡导爱国、敬业、诚信、友善,积极培育和践行社会主义核心价值观。富强、民主、文明、和谐是国家层面的价值目标,自由、平等、公正、法治是社会层面的价值取向,爱国、敬业、诚信、友善是公民个人层面的价值准则,这24个字是社会主义核心价值观的基本内容。', + '今日天气:晴,最低气温15℃,最高气温22℃,风向风力:东北风3级,空气质量:良好', }, standPisImgUrl: `${this.$store.state.user.resourcesUrl}/PICTURE/2022-08-01/standPis.png`, onboardPisImgUrl: `${this.$store.state.user.resourcesUrl}/PICTURE/2022-08-01/onboardPis.png`, @@ -229,8 +235,6 @@ export default { .logo { & > img { height: 110px; - border: 1px solid #e50014; - border-radius: 50%; } } } @@ -331,14 +335,12 @@ export default { background: linear-gradient(90deg, #3e4e69, #586baa, #3e4e69); padding: 20px; .logo { - height: 12%; + height: 12%; display: flex; justify-content: center; & > img { height: 100%; - transform: translateY(-8px); - border: 1px solid #e50014; - border-radius: 50%; + transform: translateY(-10px); } } .info {