-
+
@@ -83,7 +83,6 @@ export default {
minimize:true,
bottom:15,
recordSending:false,
- currentCoversition:{},
memberListCoversition:{},
seconds:0,
inter:null,
@@ -132,6 +131,9 @@ export default {
const objectBottom = parseInt(object.style.bottom) || 0;
this.bottom = this.bottom + object.offsetHeight + objectBottom;
}
+ },
+ 'userRole':function(val) {
+ this.isHasCoversition = false;
}
},
@@ -159,7 +161,7 @@ export default {
},
setCurrentCoversition(coversition) {
if (coversition && coversition.id) {
- this.currentCoversition = coversition;
+ // this.currentCoversition = coversition;
this.headerTitle = coversition.name;
} else {
this.headerTitle = '';
@@ -175,9 +177,9 @@ export default {
},
quitCoversition() {
this.quitLoading = true;
- quitCoversition(this.group, this.currentCoversition.id).then(res=>{
+ quitCoversition(this.group, this.memberListCoversition.id).then(res=>{
this.quitLoading = false;
- this.currentCoversition = {all:undefined, id:null};
+ this.memberListCoversition = {all:undefined, id:null};
this.$refs.chatCoversitionList.initPage(true);
this.isHasCoversition = false;
}).catch(error=>{
@@ -191,7 +193,7 @@ export default {
addCoversition({data, headerTitle}) {
this.$refs.chatCoversitionList.addCoversition(data, headerTitle);
this.isHasCoversition = true;
- this.currentCoversition = {id:data.id, all:data.all};
+ // this.currentCoversition = {id:data.id, all:data.all};
this.memberListCoversition = {id:data.id, all:data.all};
this.headerTitle = headerTitle;
},
@@ -290,7 +292,7 @@ export default {
const blob = that.recorders.getBlob();
const fd = new FormData();
fd.append('file', blob);
- uploadAudioFileNew(that.group, that.form.language, that.form.sex, that.currentCoversition.id, fd)
+ uploadAudioFileNew(that.group, that.form.language, that.form.sex, that.memberListCoversition.id, fd)
.then((data) => {
})
.catch(error => {
diff --git a/src/views/newMap/displayNew/chatView/chatCoversitionList.vue b/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
index 04f3dfc30..91b3f9b6b 100644
--- a/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
+++ b/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
@@ -31,6 +31,9 @@ export default {
'userRole':function(val) {
this.initPage(true);
}
+ // '$store.state.scriptRecord.updateRoleStatus':function(val) {
+ // this.initPage(true);
+ // }
},
mounted() {
},
diff --git a/src/views/newMap/displayNew/chatView/chatMemberList.vue b/src/views/newMap/displayNew/chatView/chatMemberList.vue
index a58adb699..b191b744e 100644
--- a/src/views/newMap/displayNew/chatView/chatMemberList.vue
+++ b/src/views/newMap/displayNew/chatView/chatMemberList.vue
@@ -49,6 +49,9 @@ export default {
if (val) {
this.getSimulationMembers();
}
+ },
+ '$store.state.scriptRecord.updateRoleStatus':function(val) {
+ this.getSimulationMembers();
}
},
mounted() {
diff --git a/src/views/newMap/displayNew/menuScript.vue b/src/views/newMap/displayNew/menuScript.vue
index 5cb240510..65a3ea535 100644
--- a/src/views/newMap/displayNew/menuScript.vue
+++ b/src/views/newMap/displayNew/menuScript.vue
@@ -88,7 +88,7 @@ export default {
} else if (this.$store.state.training.prdType == null) {
return '';
} else {
- return 'AUDIENCE';
+ return this.$store.state.scriptRecord.userRole ? this.$store.state.scriptRecord.userRole : 'AUDIENCE';
}
}
},
diff --git a/src/views/scriptManage/display/tipScriptRecordNew.vue b/src/views/scriptManage/display/tipScriptRecordNew.vue
index 1056d28e4..d1195f505 100644
--- a/src/views/scriptManage/display/tipScriptRecordNew.vue
+++ b/src/views/scriptManage/display/tipScriptRecordNew.vue
@@ -98,6 +98,7 @@ export default {
beforeDestroy() {
this.clearAutoSave();
this.$store.dispatch('scriptRecord/updateBgSet', false);
+ this.$store.dispatch('scriptRecord/updateRole', null);
},
mounted() {
this.initData();
@@ -149,6 +150,11 @@ export default {
}
}
this.$store.dispatch('training/setPrdType', prdType);
+ ConstConfig.ConstSelect.roleTypeNew.forEach(each=>{
+ if (each.label == memberInfo.role) {
+ this.$store.dispatch('scriptRecord/updateRole', each.value);
+ }
+ });
}).catch(()=>{
this.$messageBox('切换角色失败');
});
diff --git a/src/views/scriptManage/scriptRecord/getActionNew.vue b/src/views/scriptManage/scriptRecord/getActionNew.vue
index 309828f73..f3ada43a4 100644
--- a/src/views/scriptManage/scriptRecord/getActionNew.vue
+++ b/src/views/scriptManage/scriptRecord/getActionNew.vue
@@ -10,6 +10,7 @@
{{ actionInfo.memberName }}
邀请
{{ actionInfo.targetName }}
+
开始会话
{{ actionInfo.memberName }}
@@ -110,7 +111,6 @@ export default {
return lastData;
},
covertData(memberVOList, element) {
- debugger;
const member = memberVOList.find(elem=>{ return elem.id == element.memberId; });
const memberName = member.name;
switch (element.type) {
From 4e36c7b45653ec6022cd5a49578985c83e858a8c Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 23 Jun 2020 09:26:58 +0800
Subject: [PATCH 30/31] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/map.js | 4 +--
src/jmapNew/mouseController.js | 4 +--
src/jmapNew/shape/Signal/index.js | 12 +++++++++
src/jmapNew/shape/Train/index.js | 4 +--
.../theme/components/utils/menuOperate.js | 8 +++++-
.../ningbo_01/menus/dialog/alxeEffective.vue | 5 +---
.../theme/ningbo_01/menus/dialog/setFault.vue | 2 +-
.../newMapdraft/mapoperate/config/list.vue | 25 +++----------------
8 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 7fb82e824..1e6e68458 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -11,7 +11,7 @@ import { selectLineCode } from './config/deviceStyle';
import { deviceFactory, createBoundingRect, calculateDCenter } from './utils/parser';
import { deepAssign } from '@/utils/index';
import store from '@/store/index_APP_TARGET';
-import Vue from 'vue';
+import { loadPropConvert } from './theme/factory';
const renderer = 'canvas';
const devicePixelRatio = 1;
@@ -179,7 +179,7 @@ class Jlmap {
}
}
}
- const screenSplit = opts.list.length ? opts.list : Vue.prototype.$theme.loadPropConvert(store.state.map.map.skinVO.code).screenSplit;
+ const screenSplit = opts.list.length ? opts.list : loadPropConvert(store.state.map.map.skinVO.code).screenSplit;
const splitList = JSON.parse(JSON.stringify(screenSplit));
const num = screenSplit.length + 1;
const offsetY = (opts.height - 100) / num; // 高度差
diff --git a/src/jmapNew/mouseController.js b/src/jmapNew/mouseController.js
index de4a2928d..eb18bcbd7 100644
--- a/src/jmapNew/mouseController.js
+++ b/src/jmapNew/mouseController.js
@@ -174,7 +174,7 @@ class MouseController extends Eventful {
moveEvent(e) {
const newEm = new EventModel(e);
- const trainDetails = store.state.map.trainDetails;
+ const trainDetails = store.state.map.trainDetails; // 获取当前拿到train详情 对比 移除
if (trainDetails) {
if (newEm.deviceType != deviceType.Train || trainDetails.code != newEm.deviceCode) {
var instance = (this.$jmap.getDeviceByCode(trainDetails.code) || {} ).instance;
@@ -285,7 +285,7 @@ class MouseController extends Eventful {
}
});
this.deviceList = includeDeviceList;
- store.dispatch('map/setSeclectDeviceList', this.deviceList);
+ store.dispatch('map/setSeclectDeviceList', this.deviceList); // 给store设置框选的 model
}
// 生成包围盒对象坐标
createFakeBoundingRect(instance) {
diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js
index e58f575a2..9cabd52e6 100644
--- a/src/jmapNew/shape/Signal/index.js
+++ b/src/jmapNew/shape/Signal/index.js
@@ -36,6 +36,12 @@ class Signal extends Group {
y: 0
};
}
+ if (!model.positionPoint.x) {
+ model.positionPoint.x = 0;
+ }
+ if (!model.positionPoint.y) {
+ model.positionPoint.y = 0;
+ }
this.cbtcStatus = '';
this.create();
this.createMouseEvent();
@@ -53,6 +59,12 @@ class Signal extends Group {
const drict = this.model.right ? 1 : -1; // 朝向 左:右
const posit = this.model.positionType == '01' ? -1 : 1; // 位置 上:下
+ model.position.x = Number(model.position.x);
+ model.position.y = Number(model.position.y);
+ model.positionPoint.x = Number(model.positionPoint.x);
+ model.positionPoint.y = Number(model.positionPoint.y);
+ model.namePosition.x = Number(model.namePosition.x);
+ model.namePosition.y = Number(model.namePosition.y);
// 信号机高柱矮柱 (信号机底座)
this.sigPost = new ESigPost({
zlevel: this.zlevel,
diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index d87469e5a..ce12503eb 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -214,7 +214,7 @@ export default class Train extends Group {
setDirectionType(right, flag) {
if (this.style.Train.trainStatusStyle.directionType.length > 0) {
this.style.Train.trainStatusStyle.directionType.forEach((item) => {
- if (right === item.type) {
+ if (right == item.type) {
let lineLShow = item.lineLShow;
let arrowLShow = item.arrowLShow;
let lineRShow = item.lineRShow;
@@ -238,7 +238,7 @@ export default class Train extends Group {
setDirectionStopType(right) {
if (this.style.Train.trainStatusStyle.directionStopType.length > 0) {
this.style.Train.trainStatusStyle.directionStopType.forEach((item) => {
- if (right === item.type) {
+ if (right == item.type) {
if (this.style.Train.trainHead.directionStopType == 'special') {
this.trainL && this.trainL.setArrowShow(item.lineLShow);
this.trainR && this.trainR.setArrowShow(item.lineRShow);
diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index 9448884b8..b3b834b51 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -400,6 +400,13 @@ export const menuOperate = {
};
+/**
+ * 发送请求参数
+ * @param {*} operate
+ * @param {*} paramList 请求参数
+ * @param {*} over 0为首次操作，1为中间操作，2为最后操作，3为直接一次性操作
+ * @param {*} val 教学模式val 校验模式判断
+ */
export function commitOperate(operate, paramList, over, val) {
const step = {
start: true,
@@ -408,7 +415,6 @@ export function commitOperate(operate, paramList, over, val) {
};
if (val) { step.val = val; }
step.param = paramList;
- // over 0为首次操作，1为中间操作，2为最后操作，3为直接一次性操作
if (over == 0 || over == 3) {
const codeList = Object.values(paramList);
step.code = codeList[0];
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
index c8fe65d30..37e5e560b 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
@@ -179,10 +179,7 @@ export default {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
title() {
- if ( this.operation == OperationEvent.Section.alxeEffective.menu.operation || this.operation == OperationEvent.Switch.alxeEffective.menu.operation ) {
- return '确认计轴恢复工作';
- }
- return '';
+ return '确认计轴恢复工作';
}
},
watch: {
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/setFault.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/setFault.vue
index 2d8914afc..93b1e6f44 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/setFault.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/setFault.vue
@@ -35,7 +35,7 @@
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
export default {
diff --git a/src/views/newMap/newMapdraft/mapoperate/config/list.vue b/src/views/newMap/newMapdraft/mapoperate/config/list.vue
index 36130d4a6..034167b6f 100644
--- a/src/views/newMap/newMapdraft/mapoperate/config/list.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/config/list.vue
@@ -1,8 +1,8 @@
-
-
{{ items.name }}
+