diff --git a/src/api/designPlatform.js b/src/api/designPlatform.js
index a81753421..eec081d7d 100644
--- a/src/api/designPlatform.js
+++ b/src/api/designPlatform.js
@@ -19,7 +19,7 @@ export function getUserMapTree(cityCode) {
/** 运行图*/
export function getRpListByUserMapId(mapId) {
return request({
- url: `/api/runPlan/draft/user/${mapId}/list`,
+ url: `/api/draftMap/runPlan/findByDraftMapId/${mapId}`,
method: 'get'
});
}
@@ -34,7 +34,7 @@ export function getMapList(cityCode) {
/** 获取用户自己的运行图详情*/
export function getRpDetailByUserMapId(planId) {
return request({
- url: `/api/runPlan/draft/user/${planId}`,
+ url: `/api/draftMap/runPlan/selectDiagramData/${planId}`,
method: 'get'
});
}
diff --git a/src/router/index.js b/src/router/index.js
index c6af8b380..f9fdb8ec9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -58,6 +58,8 @@ import ScreenMonitorHome from '@/views/screenMonitor/home';
import ScreenMonitorDetail from '@/views/screenMonitor/detail/index';
import PlanMonitorEditTool from '@/views/planMonitor/editTool/index';
+import PlanMonitorEditUserTool from '@/views/planMonitor/editTool/userindex';
+
import PlanMonitor from '@/views/planMonitor/index';
import PlanMonitorHome from '@/views/planMonitor/home';
import PlanMonitorDetail from '@/views/planMonitor/detail';
@@ -171,6 +173,7 @@ export const UrlConfig = {
plan: {
prefix: '/plan',
tool: '/plan/tool',
+ usertool: '/plan/usertool',
detail: '/plan/detail',
pay: '/plan/pay'
},
@@ -802,6 +805,13 @@ export const asyncRouter = [
}
]
},
+ {
+ path: '/plan/usertool',
+ component: PlanMonitorEditUserTool,
+ meta: {
+ },
+ hidden: true
+ },
{
path: '/plan/tool',
component: PlanMonitorEditTool,
diff --git a/src/views/planMonitor/detail.vue b/src/views/planMonitor/detail.vue
index 840c62b11..d25dc386c 100644
--- a/src/views/planMonitor/detail.vue
+++ b/src/views/planMonitor/detail.vue
@@ -255,7 +255,12 @@ export default {
this.$store.dispatch('runPlan/refresh');
} else {
const query = { skinCode: skinCode, mapId: this.$route.params.mapId, planId: planId, planName: planName };
- this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
+ if(/^\/design\/userlist/.test(this.$route.fullPath)){
+ this.$router.push({ path: `${UrlConfig.plan.usertool}`, query: query });
+ }
+ else{
+ this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
+ }
}
},
// 删除运行图
diff --git a/src/views/planMonitor/editTool/index.vue b/src/views/planMonitor/editTool/index.vue
index 0447c388f..f6f9b1a88 100644
--- a/src/views/planMonitor/editTool/index.vue
+++ b/src/views/planMonitor/editTool/index.vue
@@ -10,8 +10,8 @@
/>
-
-
+
+
@@ -42,8 +42,8 @@
import MenuBar from './menuBar';
import StatusBar from './statusBar';
import Schedule from './schedule';
-import OpenRunPlan from './menus/openRunPlan';
-import CreateEmptyPlan from './menus/createEmptyPlan';
+// import OpenRunPlan from './menus/openRunPlan';
+// import CreateEmptyPlan from './menus/createEmptyPlan';
import Parameter from './menus/parameter/index';
import OffLine from './menus/offLine';
import AddPlanningTrain from './menus/addPlanningTrain';
@@ -67,8 +67,8 @@ export default {
MenuBar,
StatusBar,
Schedule,
- OpenRunPlan,
- CreateEmptyPlan,
+ // OpenRunPlan,
+ // CreateEmptyPlan,
Parameter,
OffLine,
AddPlanningTrain,
diff --git a/src/views/planMonitor/editTool/menuBar.vue b/src/views/planMonitor/editTool/menuBar.vue
index c382e3835..31446780d 100644
--- a/src/views/planMonitor/editTool/menuBar.vue
+++ b/src/views/planMonitor/editTool/menuBar.vue
@@ -1,14 +1,14 @@