diff --git a/src/api/simulation.js b/src/api/simulation.js
index c5c494182..f01605202 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -27,6 +27,14 @@ export function setFailureModeNew(data, group) {
});
}
+/** 获取仿真待触发的故障列表*/
+export function getSimulationFaultRules(group) {
+ return request({
+ url: `/simulation/${group}/faultMode/faultRule`,
+ method: 'get'
+ });
+}
+
// 创建故障规则(新版)
export function addFailureRule(data) {
return request({
@@ -345,14 +353,6 @@ export function selectScriptMembers(group, data) {
});
}
-/** 剧本开始执行(新版) */
-export function scriptExecuteNew(group) {
- return request({
- url: `/api/scriptExecute/${group}`,
- method: 'put'
- });
-}
-
/** 选择剧本演出成员角色 (新版地图)*/
export function selectScriptMembersNew(group, data) {
return request({
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index 1a57e0656..f1f22cdbc 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -14,12 +14,12 @@
{{ $t('display.schema.loadScript') }}
{{ $t('display.schema.previewRunDiagram') }}
{{ $t('display.schema.loadRunDiagram') }}
- {{ $t('display.schema.faultSetting') }}
+ 自动故障设置
{{ $t('display.schema.normalOperation') }}
- {{ $t('display.schema.faultOperation') }}
+ 故障模式
@@ -39,7 +39,7 @@ import { OperateMode } from '@/scripts/ConstDic';
// import { getStationList } from '@/api/runplan';
import { getByGroupStationList } from '@/api/jmap/map';
import {loadDraftScript, loadDraftScriptNew} from '@/api/designPlatform';
-import { getEveryDayRunPlanNew, loadScriptNew, scriptExecuteNew } from '@/api/simulation';
+import { getEveryDayRunPlanNew, loadScriptNew } from '@/api/simulation';
import Vue from 'vue';
// 右上角操作
@@ -120,6 +120,10 @@ export default {
},
isLocalStation() {
return this.$store.state.training.prdType === '01';
+ },
+ drawWay() {
+ const drawWay = this.$route.query.drawWay;
+ return drawWay && JSON.parse(drawWay);
}
},
watch: {
@@ -201,6 +205,7 @@ export default {
async selectQuest(row, id, mapLocation, roleName) {
try {
let res;
+ debugger;
if (this.isDesignPlatform) {
res = this.drawWay ? await loadDraftScriptNew(id, this.group) : await loadDraftScript(row.id, id, this.group);
} else {
@@ -212,10 +217,6 @@ export default {
const newMapLocation = {'offsetX': mapLocation.x, 'offsetY': mapLocation.y, 'scaleRate': mapLocation.scale};
Vue.prototype.$jlmap.setOptions(newMapLocation);
}
- scriptExecuteNew(this.group).then(data=>{
- }).catch(error=>{
- console.log(error);
- });
}
this.$emit('selectQuest', row);
} catch (error) {