diff --git a/src/api/jmap/mapdraft.js b/src/api/jmap/mapdraft.js
index 5f6529e7e..345f3a2dd 100644
--- a/src/api/jmap/mapdraft.js
+++ b/src/api/jmap/mapdraft.js
@@ -133,6 +133,25 @@ export function listRoutingData(mapId, params) {
});
}
+/** 分页查询公共的交路数据(新版)*/
+export function listPublicRoutingData(mapId, params) {
+ return request({
+ // url: `/api/mapBuild/${mapId}/routingData`,
+ url: `/api/runPlan/userData/${mapId}/default/routing/page`,
+ method: 'get',
+ params: params
+ });
+}
+
+/** 用户拉取公共的交路数据(新版)*/
+export function pullPublicRoutingData(mapId, data) {
+ return request({
+ url: `/api/runPlan/userData/${mapId}/default/routing/pull`,
+ method: 'put',
+ data: data
+ });
+}
+
/** 创建交路(新版)*/
export function addRoutingData(data) {
return request({
diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue
index e25f33dae..b3938ca95 100644
--- a/src/components/QueryListPage/QueryListPage.vue
+++ b/src/components/QueryListPage/QueryListPage.vue
@@ -165,14 +165,6 @@
-
- {{ $t('global.selectAdd') }}
-
+
+ {{ queryList.selectCheckText?queryList.selectCheckText:$t('global.selectAdd') }}
+
@@ -517,12 +518,12 @@ export default {
},
onRowClick(row) {
this.choose = row;
- },
- onReset() {
- if (this.$refs.queryForm) {
- this.$refs.queryForm.doClean();
- }
- },
+ },
+ onReset() {
+ if (this.$refs.queryForm) {
+ this.$refs.queryForm.doClean();
+ }
+ },
currentChoose() {
return this.choose;
},
@@ -568,7 +569,7 @@ export default {
delete self.queryData[self.sortBy];
self.refresh(true);
}
- }
+ }
}
};
@@ -594,4 +595,8 @@ export default {
z-index: 100;
}
}
+.defaultCheckClass{
+ margin-top: 8px;
+ margin-left: 8px;
+}
diff --git a/src/views/planMonitor/components/routingoperate/importRouteOperate.vue b/src/views/planMonitor/components/routingoperate/importRouteOperate.vue
new file mode 100644
index 000000000..947a1ed24
--- /dev/null
+++ b/src/views/planMonitor/components/routingoperate/importRouteOperate.vue
@@ -0,0 +1,267 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/planMonitor/components/routingoperate/routeConfig.vue b/src/views/planMonitor/components/routingoperate/routeConfig.vue
index e2ba4b18c..5fa9ae3ca 100644
--- a/src/views/planMonitor/components/routingoperate/routeConfig.vue
+++ b/src/views/planMonitor/components/routingoperate/routeConfig.vue
@@ -1,169 +1,173 @@
-
-
- {{ $t('map.preview') }}
- {{ $t('map.newConstruction') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('map.activate') }}
-
-
-
-
-
-
-
-
-
-
- {{ $t('map.activate') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 生成经停区段
-
-
-
- {{ formatName(scope.row.stationCode) }}
-
-
-
-
- {{ formatName(scope.row.sectionCode) }}
-
-
-
-
-
- {{ $t('map.remove') }}
-
-
-
-
-
- 车站:
-
-
-
- {{ $t('map.activate') }}
-
-
- 区段:
-
-
-
- {{ $t('map.activate') }}
-
- {{ $t('map.add') }}
-
-
-
-
-
- {{ $t('map.save') }}
-
- {{ $t('map.updata') }}
-
-
-
-
-
+
+
+ {{ $t('map.preview') }}
+ {{ $t('map.newConstruction') }}
+ 导入公共交路
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('map.activate') }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t('map.activate') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 生成经停区段
+
+
+
+ {{ formatName(scope.row.stationCode) }}
+
+
+
+
+ {{ formatName(scope.row.sectionCode) }}
+
+
+
+
+
+ {{ $t('map.remove') }}
+
+
+
+
+
+ 车站:
+
+
+
+ {{ $t('map.activate') }}
+
+
+ 区段:
+
+
+
+ {{ $t('map.activate') }}
+
+ {{ $t('map.add') }}
+
+
+
+
+
+
+ {{ $t('map.save') }}
+
+ {{ $t('map.updata') }}
+
+
+
+
+
+
+