From 96452b8dde178ac282b36da8ca4af6cc6a02f3a2 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 1 Nov 2019 17:08:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en/publish.js                  |  3 ++-
 src/i18n/langs/zh/publish.js                  |  3 ++-
 src/views/publish/publishMap/index.vue        |  2 +-
 src/views/publish/publishMap/list.vue         |  1 -
 .../runPlanCommon/chooseTemplatePlan.vue      | 19 ++++++++++---------
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/i18n/langs/en/publish.js b/src/i18n/langs/en/publish.js
index 424d202db..46e8819cc 100644
--- a/src/i18n/langs/en/publish.js
+++ b/src/i18n/langs/en/publish.js
@@ -119,5 +119,6 @@ export default {
     theBelongsProjectCannotBeEmpty: 'The belongs project cannot be empty',
     pleaseSelectTheBelongsProject: 'Please select the belongs project',
     copyMapAs: 'Copy map as',
-    whetherToCopyData: 'Whether to copy data'
+    whetherToCopyData: 'Whether to copy data',
+    copy:'Copy'
 };
diff --git a/src/i18n/langs/zh/publish.js b/src/i18n/langs/zh/publish.js
index 645ea2f94..5ab75fe4e 100644
--- a/src/i18n/langs/zh/publish.js
+++ b/src/i18n/langs/zh/publish.js
@@ -123,5 +123,6 @@ export default {
     theBelongsProjectCannotBeEmpty: '所属项目不能为空',
     pleaseSelectTheBelongsProject: '请选择归属项目',
     copyMapAs: '复制地图为',
-    whetherToCopyData: '是否复制数据'
+    whetherToCopyData: '是否复制数据',
+    copy:'复制'
 };
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index f7e2a093d..700c46465 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -122,7 +122,7 @@ export default {
                                 handleClick: this.handleSetProject
                             },
                             {
-                                name: '复制',
+                                name: this.$t('publish.copy'),
                                 handleClick: this.handleCopy
                             }
                         ]
diff --git a/src/views/publish/publishMap/list.vue b/src/views/publish/publishMap/list.vue
index e8de4f0d7..47914efc8 100644
--- a/src/views/publish/publishMap/list.vue
+++ b/src/views/publish/publishMap/list.vue
@@ -17,7 +17,6 @@ export default {
     data() {
         return {
             cityList: [],
-            skinCodeList: [],
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
diff --git a/src/views/publish/runPlanCommon/chooseTemplatePlan.vue b/src/views/publish/runPlanCommon/chooseTemplatePlan.vue
index 1216da8f6..3d9c51364 100644
--- a/src/views/publish/runPlanCommon/chooseTemplatePlan.vue
+++ b/src/views/publish/runPlanCommon/chooseTemplatePlan.vue
@@ -10,7 +10,7 @@
 
 <script>
 import { runPlanTemplateList } from '@/api/runplan';
-import { getSkinCodeList } from '@/api/management/mapskin';
+import { listPublishMap } from '@/api/jmap/map';
 
 export default {
     name: 'ChooseTemplatePlan',
@@ -18,7 +18,7 @@ export default {
         return {
             dialogShow: false,
             loading: false,
-            skinCodeList: [],
+            mapIdList: [],
             model: {},
             pagerConfig: {
                 pageSize: 'pageSize',
@@ -44,11 +44,11 @@ export default {
                         prop: 'name'
                     },
                     {
-                        title: this.$t('publish.skinType'),
-                        prop: 'skinCode',
+                        title: this.$t('publish.mapName'),
+                        prop: 'mapId',
                         type: 'tag',
                         columnValue: (row) => {
-                            return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
+                            return this.$convertField(row.mapId, this.mapIdList, ['id', 'name']);
                         },
                         tagType: (row) => { return 'success'; }
                     }
@@ -65,9 +65,10 @@ export default {
     },
     methods: {
         loadInitData() {
-            this.skinCodeList = [];
-            getSkinCodeList().then(response => {
-                this.skinCodeList = response.data;
+            this.mapIdList = [];
+
+            listPublishMap().then(response => {
+                this.mapIdList = response.data;
             });
         },
         doShow(model) {
@@ -80,7 +81,7 @@ export default {
             this.dialogShow = false;
         },
         queryFunction(params) {
-            params['skinCode'] = this.model.skinCode || '';
+            params['mapId'] = this.model.mapId || '';
             return runPlanTemplateList(params);
         },
         handleConfirm() {

From c361b639ad829b16e309cba1942816ea63d915d4 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 1 Nov 2019 17:30:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en/global.js | 5 ++++-
 src/i18n/langs/zh/global.js | 5 ++++-
 src/layout/index.vue        | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/i18n/langs/en/global.js b/src/i18n/langs/en/global.js
index b525c5b3c..2abe53ab3 100644
--- a/src/i18n/langs/en/global.js
+++ b/src/i18n/langs/en/global.js
@@ -193,5 +193,8 @@ export default {
     macao: 'Macao',
     singapore: 'Singapore',
     taiwan: 'taiwan',
-    america: 'America'
+    america: 'America',
+    companyInfo:'Beijing Jiulian Technology Co., Ltd',
+    companyTel:'Tel: +86 13289398171',
+    companyICP:'Copyright ©2018 Beijing Jiulian Technology Co., Ltd ICP: 18028522'
 };
diff --git a/src/i18n/langs/zh/global.js b/src/i18n/langs/zh/global.js
index 09cc288d3..7bd301538 100644
--- a/src/i18n/langs/zh/global.js
+++ b/src/i18n/langs/zh/global.js
@@ -193,5 +193,8 @@ export default {
     macao: '澳门',
     singapore: '新加坡',
     taiwan: '台湾',
-    america: '美国'
+    america: '美国',
+    companyInfo:'北京玖琏科技有限公司',
+    companyTel:'联系电话: 13289398171',
+    companyICP:'Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号'
 };
diff --git a/src/layout/index.vue b/src/layout/index.vue
index e000a9f11..78a8f6680 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -10,8 +10,8 @@
         <!-- </el-scrollbar> -->
       </section>
       <el-footer class="footers" style="height:30px;">
-        <div style="font-size:14px;float:left;">北京玖琏科技有限公司 &nbsp;联系电话: 13289398171 </div>
-        <div style="font-size:14px;float:right;">Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号</div>
+        <div style="font-size:14px;float:left;">{{ $t('global.companyInfo') }} &nbsp;{{ $t('global.companyTel') }}</div>
+        <div style="font-size:14px;float:right;">{{ $t('global.companyICP') }}</div>
       </el-footer>
     </div>
   </div>