From dad52de123c99f01198fbab836558bb8dd5dd7fb Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 25 Nov 2020 10:28:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=9C=B0=E5=9B=BE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=BC=96=E8=BE=91=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/jmap/map.js                    |  8 +++++++-
 src/views/publish/publishMap/draft.vue | 20 ++++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js
index e435894cc..3ce4c0795 100644
--- a/src/api/jmap/map.js
+++ b/src/api/jmap/map.js
@@ -250,4 +250,10 @@ export function getPassengerHistoryList(group) {
         method: 'get'
     });
 }
-
+/** 查询地图数据版本list */
+export function getVersionList(mapId) {
+    return request({
+        url: `/api/map/${mapId}/dataVersions`,
+        method: 'get'
+    });
+}
diff --git a/src/views/publish/publishMap/draft.vue b/src/views/publish/publishMap/draft.vue
index 7f0df3768..c6ba1019f 100644
--- a/src/views/publish/publishMap/draft.vue
+++ b/src/views/publish/publishMap/draft.vue
@@ -11,6 +11,7 @@
 </template>
 
 <script>
+import { getVersionList } from '@/api/jmap/map';
 export default {
     name: 'PublishMapDraft',
     props: {
@@ -20,11 +21,13 @@ export default {
             dialogVisible: false,
             cityList: [],
             lineCodeList: [],
+            versionList: [],
             formModel: {
                 mapId: '',
                 cityCode: '',
                 name: '',
-                lineCode: ''
+                lineCode: '',
+                version: ''
             }
         };
     },
@@ -35,7 +38,8 @@ export default {
                 items: [
                     { prop: 'name', label: this.$t('publish.mapName'), type: 'text', required: true },
                     { prop: 'cityCode', label: this.$t('publish.city'), type: 'select', required: true, options: this.cityList },
-                    { prop: 'lineCode', label: '线路类型', type: 'select', required: true, options: this.lineCodeList }
+                    { prop: 'lineCode', label: '线路类型', type: 'select', required: true, options: this.lineCodeList },
+                    { prop: 'version', label: '数据版本', type: 'select', required: true, options: this.versionList}
                 ]
             };
             return form;
@@ -51,6 +55,9 @@ export default {
                 ],
                 lineCode: [
                     { required: true, message: '请选择线路类型', trigger: 'change' }
+                ],
+                version: [
+                    { required: true, message: '请选择数据版本', trigger: 'change'}
                 ]
             };
             return crules;
@@ -64,7 +71,16 @@ export default {
             this.cityList = cityList;
             this.lineCodeList = lineCodeList;
             this.formModel.cityCode = row.cityCode;
+            this.formModel.version = row.version + '';
             this.dialogVisible = true;
+            this.versionList = [];
+            getVersionList(row.id).then(resp => {
+                (resp.data || []).forEach(item => {
+                    this.versionList.push({label: item, value: item});
+                });
+            }).catch(error => {
+                this.$message.error('获取数据版本列表失败！');
+            });
         },
         doCreate() {
             const self = this;