Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

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'
 };

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'
 };

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号'
 };

src/i18n/langs/zh/publish.js

@@ -123,5 +123,6 @@ export default {
     theBelongsProjectCannotBeEmpty: '所属项目不能为空',
     pleaseSelectTheBelongsProject: '请选择归属项目',
     copyMapAs: '复制地图为',
-    whetherToCopyData: '是否复制数据'
+    whetherToCopyData: '是否复制数据',
+    copy:'复制'
 };

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:left;">{{ $t('global.companyInfo') }} &nbsp;{{ $t('global.companyTel') }}</div>
-        <div style="font-size:14px;float:right;">Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号</div>
+        <div style="font-size:14px;float:right;">{{ $t('global.companyICP') }}</div>
       </el-footer>
     </div>
   </div>

src/views/publish/publishMap/index.vue

@@ -122,7 +122,7 @@ export default {
                                 handleClick: this.handleSetProject
                             },
                             {
-                                name: '复制',
+                                name: this.$t('publish.copy'),
                                 handleClick: this.handleCopy
                             }
                         ]

src/views/publish/publishMap/list.vue

@@ -17,7 +17,6 @@ export default {
     data() {
         return {
             cityList: [],
-            skinCodeList: [],
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'

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'),
+                        title: this.$t('publish.mapName'),
-                        prop: 'skinCode',
+                        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 = [];
+            this.mapIdList = [];
-            getSkinCodeList().then(response => {
+
-                this.skinCodeList = response.data;
+            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() {