From cdae58efbef63927e1fa230b93cdeca23b6196a7 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 23 Apr 2020 17:13:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E7=89=88=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=BB=98=E5=88=B6=20=E5=88=A0=E9=99=A4=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83=E4=BB=BF=E7=9C=9F=20?= =?UTF-8?q?=E8=81=8A=E5=A4=A9=20=20=E5=8F=91=E9=80=81=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/chat.js | 9 +++++++++ src/views/newMap/jointTrainingNew/menuDemon.vue | 6 +++--- src/views/newMap/newDesignUser/mapmanage/operateMenu.vue | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/api/chat.js b/src/api/chat.js index cd18aac44..865735cf4 100644 --- a/src/api/chat.js +++ b/src/api/chat.js @@ -310,3 +310,12 @@ export function getSimulationConversationIdNew(params, group) { params: params }); } + +// 获取、微信仿真聊天接口（新版地图） +export function uploadAudioFileNew (group, lang, per, conversationId, file) { + return request({ + url: `/simulation/${group}/wx/chat?conversationId=${conversationId}&lang=${lang}&per=${per}`, + method: 'post', + data: file + }); +} diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index 8a063a459..52457d3b2 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -1,6 +1,6 @@ @@ -35,6 +35,7 @@ import MenuLimit from './menuLimit'; // import PassiveAlarm from './passiveDialog/alarm'; import PassiveContorl from './passiveDialog/control'; import MenuStationStand from './menuStationStand'; +import PopStationStand from './popStationStand'; // import PassiveTimeout from './passiveDialog/timeout'; export default { @@ -53,7 +54,8 @@ export default { MenuLimit, MenuStationStand, // PassiveAlarm, - PassiveContorl + PassiveContorl, + PopStationStand // PassiveTimeout }, props: { @@ -86,6 +88,11 @@ export default { this.$nextTick(() => { this.$store.dispatch('config/updateMenuBar'); }); + }, + methods: { + popMenuStationStand(param) { + this.$refs.popStationStand.doShow(param.position, param.type); + } } }; diff --git a/src/jmapNew/theme/xian_02/menus/menuStationStand.vue b/src/jmapNew/theme/xian_02/menus/menuStationStand.vue index b84b9a226..5471e25c8 100644 --- a/src/jmapNew/theme/xian_02/menus/menuStationStand.vue +++ b/src/jmapNew/theme/xian_02/menus/menuStationStand.vue @@ -22,26 +22,26 @@ -
站台停车
+
站台停车
 -
- 站停时间调整
站台屏蔽门信息确认
更新站台计划 +
+ 站停时间调整
站台屏蔽门信息确认
更新站台计划
-
站台屏蔽门信息
+
站台屏蔽门信息
 -
停站曲线
+
停站曲线
 -
上行方向
下行方向
+
上行方向
下行方向
 -
+
 
@@ -79,13 +79,13 @@ -
上行方向驾驶模式禁止
+
上行方向驾驶模式禁止
 -
禁止/释放 ATPM模式
禁止/释放 AM模式
+
禁止/释放 ATPM模式
禁止/释放 AM模式
 -
ATPM模式已禁止
AM模式已禁止
+
ATPM模式已禁止
AM模式已禁止
 @@ -164,8 +164,15 @@ export default { this.dialogShow = false; this.$store.dispatch('training/emitTipFresh'); }, + menuEvent(val) { + console.log('------------111111111', val, event, this.position); + this.$emit('popMenuStationStand', {position:this.position, type:val}); + event.stopPropagation(); + event.preventDefault(); + }, clickEvent(val) { - this.dialogShow = false; + this.dialogShow = true; + console.log('----------------------', val); this.$emit('popMenuStationStand', {position:this.position, type:val}); event.stopPropagation(); }, @@ -231,19 +238,25 @@ export default { border: 1px solid #6F3700; height: 100%; text-align: center; - margin: 0 0 -1px -1px + margin: 0 0 -1px -1px; + padding-bottom: 10px; + padding-top: 10px; } .center-table-cell { border-bottom: 1px solid #6F3700; border-top: 1px solid #6F3700; text-align: center; height: 100%; - margin: 0 0 -1px -1px + margin: 0 0 -1px -1px; + padding-bottom: 10px; + padding-top: 10px; } .right-table-cell { border: 1px solid #6F3700; text-align: center; height: 100%; - margin: 0 0 -1px -1px + margin: 0 0 -1px -1px; + padding-bottom: 10px; + padding-top: 10px; } diff --git a/src/jmapNew/theme/xian_02/menus/popStationStand.vue b/src/jmapNew/theme/xian_02/menus/popStationStand.vue new file mode 100644 index 000000000..ff58761eb --- /dev/null +++ b/src/jmapNew/theme/xian_02/menus/popStationStand.vue @@ -0,0 +1,255 @@ + + + diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue index c2e32b304..abf84af06 100644 --- a/src/views/publish/publishMap/index.vue +++ b/src/views/publish/publishMap/index.vue @@ -19,6 +19,7 @@ import SetProject from './project'; import CopyMap from './copy'; import LocalMap from './localMap'; import { superAdmin } from '@/router/index_APP_TARGET'; +import { ProjectList } from '@/scripts/ProjectConfig'; export default { name: 'PublishMap', @@ -77,6 +78,13 @@ export default { columnValue: (row) => { return this.$convertField(row.lineCode, this.lineCodeList, ['code', 'name']); }, tagType: (row) => { return ''; } }, + { + title: '归属项目', + prop: 'projectCode', + type: 'tag', + columnValue: (row) => { return row.project ? this.$convertField(row.projectCode.toLowerCase(), ProjectList, ['value', 'label']) : '无'; }, + tagType: (row) => { return ''; } + }, { type: 'button', title: this.$t('global.operate'), diff --git a/src/views/publish/publishMap/project.vue b/src/views/publish/publishMap/project.vue index 8f7a004ed..6f574459d 100644 --- a/src/views/publish/publishMap/project.vue +++ b/src/views/publish/publishMap/project.vue @@ -60,6 +60,8 @@ export default { this.formModel.id = row.id; this.formModel.name = row.name; this.formModel.cityCode = row.cityCode; + this.formModel.project = row.project; + this.formModel.projectCode = row.project ? row.projectCode : ''; this.options = []; ProjectList.forEach(item => { this.options.push({label: item.label, value: item.value.toUpperCase()});