Merge remote-tracking branch 'remotes/origin/dev' into test

src/i18n/langs/en/global.js

@@ -198,5 +198,6 @@ export default {
     companyTel:'Tel: +86 13289398171',
     companyICP:'Copyright ©2018 Beijing Jiulian Technology Co., Ltd ICP: 18028522',
     enterPermissionNum:'please input number',
-    enterPermissionNumInt:'number must interger'
+    enterPermissionNumInt:'number must interger',
+    perpetual: 'perpetual'
 };

src/i18n/langs/zh/global.js

@@ -198,5 +198,6 @@ export default {
     companyTel:'联系电话: 13289398171',
     companyICP:'Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号',
     enterPermissionNum:'请输入权限数量',
-    enterPermissionNumInt:'权限数量需为整数'
+    enterPermissionNumInt:'权限数量需为整数',
+    perpetual: '永久'
 };

src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue

@@ -21,7 +21,7 @@
 import { runPlanTemplateList } from '@/api/runplan';
 import { getStationList } from '@/api/runplan';
 import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
-import { listPublishMap, getPublishMapInfo } from '@/api/jmap/map';
+import { getPublishMapInfo } from '@/api/jmap/map';
 
 export default {
     name: 'ReloadTodayPlan',
@@ -29,7 +29,6 @@ export default {
         return {
             dialogShow: false,
             loading: false,
-            mapList: [],
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
@@ -52,15 +51,6 @@ export default {
                     {
                         title: '运行图名称',
                         prop: 'name'
-                    },
-                    {
-                        title: '地图名称',
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => {
-                            return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
-                        },
-                        tagType: (row) => { return 'success'; }
                     }
                 ]
             },
@@ -74,16 +64,9 @@ export default {
         }
     },
     methods: {
-        loadInitData() {
-            this.mapList = [];
-            listPublishMap().then(response => {
-                this.mapList = response.data;
-            });
-        },
         doShow() {
             this.loading = false;
             this.dialogShow = true;
-            this.loadInitData();
         },
         doClose() {
             this.dialogShow = false;

src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue

@@ -21,7 +21,7 @@
 import { runPlanTemplateList } from '@/api/runplan';
 import { getStationList } from '@/api/runplan';
 import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
-import { listPublishMap, getPublishMapInfo } from '@/api/jmap/map';
+import { getPublishMapInfo } from '@/api/jmap/map';
 
 export default {
     name: 'ReloadTodayPlan',
@@ -29,7 +29,6 @@ export default {
         return {
             dialogShow: false,
             loading: false,
-            mapList: [],
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
@@ -52,15 +51,6 @@ export default {
                     {
                         title: '运行图名称',
                         prop: 'name'
-                    },
-                    {
-                        title: '地图名称',
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => {
-                            return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
-                        },
-                        tagType: (row) => { return 'success'; }
                     }
                 ]
             },
@@ -74,16 +64,9 @@ export default {
         }
     },
     methods: {
-        loadInitData() {
-            this.mapList = [];
-            listPublishMap().then(response => {
-                this.mapList = response.data;
-            });
-        },
         doShow() {
             this.loading = false;
             this.dialogShow = true;
-            this.loadInitData();
         },
         doClose() {
             this.dialogShow = false;

src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue

@@ -21,7 +21,7 @@
 import { runPlanTemplateList } from '@/api/runplan';
 import { getStationList } from '@/api/runplan';
 import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
-import { listPublishMap, getPublishMapInfo} from '@/api/jmap/map';
+import {getPublishMapInfo} from '@/api/jmap/map';
 
 export default {
     name: 'ReloadTodayPlan',
@@ -29,7 +29,6 @@ export default {
         return {
             dialogShow: false,
             loading: false,
-            mapList: [],
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
@@ -52,15 +51,6 @@ export default {
                     {
                         title: '运行图名称',
                         prop: 'name'
-                    },
-                    {
-                        title: '地图名称',
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => {
-                            return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
-                        },
-                        tagType: (row) => { return 'success'; }
                     }
                 ]
             },
@@ -74,16 +64,9 @@ export default {
         }
     },
     methods: {
-        loadInitData() {
-            this.mapList = [];
-            listPublishMap().then(response => {
-                this.mapList = response.data;
-            });
-        },
         doShow() {
             this.loading = false;
             this.dialogShow = true;
-            this.loadInitData();
         },
         doClose() {
             this.dialogShow = false;

src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue

@@ -21,7 +21,7 @@
 import { runPlanTemplateList } from '@/api/runplan';
 import { getStationList } from '@/api/runplan';
 import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
-import { listPublishMap, getPublishMapInfo } from '@/api/jmap/map';
+import { getPublishMapInfo } from '@/api/jmap/map';
 
 export default {
     name: 'ReloadTodayPlan',
@@ -29,7 +29,6 @@ export default {
         return {
             dialogShow: false,
             loading: false,
-            mapList: [],
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
@@ -52,15 +51,6 @@ export default {
                     {
                         title: this.$t('menu.runGraphName'),
                         prop: 'name'
-                    },
-                    {
-                        title: this.$t('menu.mapName'),
-                        prop: 'mapId',
-                        type: 'tag',
-                        columnValue: (row) => {
-                            return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
-                        },
-                        tagType: (row) => { return 'success'; }
                     }
                 ]
             },
@@ -74,16 +64,9 @@ export default {
         }
     },
     methods: {
-        loadInitData() {
-            this.mapList = [];
-            listPublishMap().then(response => {
-                this.mapList = response.data;
-            });
-        },
         doShow() {
             this.loading = false;
             this.dialogShow = true;
-            this.loadInitData();
         },
         doClose() {
             this.dialogShow = false;

src/views/approval/runPlan/index.vue

@@ -136,7 +136,7 @@ export default {
         runPlanPreview(index, row) {
             previewRunPlan(row.id).then(resp => {
                 const query = {
-                    skinCode: row.skinCode, prdType: '01', group: resp.data, mapId: row.mapId, planId: row.id, from:''
+                    prdType: '01', group: resp.data, mapId: row.mapId, planId: row.id, from:''
                 };
                 this.$router.push({ path: `${UrlConfig.display}/plan`, query: query });
                 launchFullscreen();

src/views/approval/script/index.vue

@@ -135,9 +135,9 @@ export default {
             this.$refs.applyReject.doShow(row);
         },
         scriptPreview(index, row) {
-            const mapInfo = this.allMapList.find(elem=>{ return elem.id == row.mapId; });
+            // const mapInfo = this.allMapList.find(elem=>{ return elem.id == row.mapId; });
             scriptDraftRecordNotify(row.id).then(resp => {
-                const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, skinCode:mapInfo.skinCode, try:0};
+                const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0};
                 this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
                 launchFullscreen();
             }).catch(error => {

src/views/components/limits/index.vue

@@ -11,7 +11,7 @@
       <el-table-column prop="startTime" :label="`${$t('permission.startTime')}`" />
       <el-table-column prop="endTime" :label="`${$t('permission.endTime')}`">
         <template slot-scope="scope">
-          <span>{{ scope.row.endTime? scope.row.endTime: '永久' }}</span>
+          <span>{{ scope.row.endTime? scope.row.endTime: $t('global.perpetual') }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="amount" :label="$t('global.total')" />

src/views/demonstration/deomonList/index.vue

@@ -105,7 +105,7 @@ export default {
                     launchFullscreen();
                     await putJointTrainingSimulationEntrance(this.group);
                     const rest = await getPublishMapInfo(this.mapId);
-                    const query = { skinCode: rest.data.lineCode, mapId: this.mapId, group: this.group, subSystem: this.$route.query.subSystem };
+                    const query = { lineCode: rest.data.lineCode, mapId: this.mapId, group: this.group, subSystem: this.$route.query.subSystem };
                     this.$router.push({ path: `/jointTraining`, query: query });
                 } else if (this.state == '01') {
                     const query = { group: this.group };

src/views/demonstration/deomonTopic/index.vue

@@ -59,7 +59,7 @@ export default {
                 launchFullscreen();
                 await putJointTrainingSimulationEntrance(this.group);
                 const rest = await getPublishMapInfo(this.mapId);
-                const query = { skinCode: rest.data.lineCode, mapId: this.mapId, group: this.group };
+                const query = { lineCode: rest.data.lineCode, mapId: this.mapId, group: this.group };
                 this.$router.push({ path: `/jointTraining`, query: query });
             } else if (this.state == '01') {
                 const query = { group: this.group };

src/views/demonstration/detail/index.vue

@@ -54,7 +54,7 @@ export default {
                 id: '',
                 name: '',
                 mapId: '',
-                skinCode: '',
+                lineCode: '',
                 remarks: '',
                 prdType: '',
                 prdId: '',
@@ -105,7 +105,7 @@ export default {
                         id: resp.data.mapPrd.id,
                         name: resp.data.mapPrd.name,
                         mapId: this.mapId,
-                        skinCode: resp.data.mapPrd.skinCode,
+                        lineCode: resp.data.mapPrd.lineCode,
                         remarks: resp.data.mapPrd.remarks,
                         prdType: resp.data.mapPrd.prdType,
                         prdId: resp.data.mapPrd.id,
@@ -158,7 +158,7 @@ export default {
         },
         async joinRoom() {
             await getjointTraining(this.jointGroup);
-            const query = { skinCode: this.courseModel.skinCode, group: this.jointGroup, subSystem: this.$route.params.subSystem};
+            const query = { lineCode: this.courseModel.lineCode, group: this.jointGroup, subSystem: this.$route.params.subSystem};
             this.$router.push({ path: `/trainroom`, query: query });
         },
         async createRoom() {
@@ -170,7 +170,7 @@ export default {
                 };
                 const res = await postCreateRoom(param);
                 if (res && res.code == 200) {
-                    const query = { skinCode: this.courseModel.skinCode, group: res.data, subSystem: this.$route.params.subSystem };
+                    const query = { lineCode: this.courseModel.lineCode, group: res.data, subSystem: this.$route.params.subSystem };
                     this.$router.push({ path: `/trainroom`, query: query });
                 }
             } catch (error) {
@@ -214,7 +214,7 @@ export default {
             this.buttonLoading = true;
             const data = { mapId: this.courseModel.mapId, prdId: this.currentPrdId };
             schedulingNotify(data).then(resp => {
-                const query = { skinCode: this.courseModel.skinCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdId, goodsId: this.goodsId, try: this.tryUser };
+                const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdId, goodsId: this.goodsId, try: this.tryUser };
                 this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
                 launchFullscreen();
             }).catch(error => {
@@ -226,7 +226,7 @@ export default {
             const data = { mapId: this.courseModel.mapId, mapPrdId: this.currentPrdId };
             this.buttonLoading = true;
             simulationNotify(data).then(resp => {
-                const query = { skinCode: this.courseModel.skinCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdId, goodsId: this.goodsId, try: this.tryUser };
+                const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdId, goodsId: this.goodsId, try: this.tryUser };
                 this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
                 launchFullscreen();
             }).catch(error => {

src/views/designUser/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-wrapper">
-    <map-create ref="mapCreate" :skin-code="skinCode" @refresh="refresh1" />
+    <map-create ref="mapCreate" :line-code="lineCode" @refresh="refresh1" />
     <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
       <demon-list ref="demonList" :width="widthLeft" @createMap="createMap" />
     </div>
@@ -32,7 +32,7 @@ export default {
             listShow: true,
             widthLeft: Number(localStore.get('LeftWidth')) || 450,
             productList: [],
-            skinCode: ''
+            lineCode: ''
         };
     },
     computed: {

src/views/publish/publishLesson/index.vue

@@ -18,7 +18,6 @@ export default {
     },
     data() {
         return {
-            cityList: [],
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
@@ -65,13 +64,6 @@ export default {
                         columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
                         tagType: (row) => { return 'success'; }
                     },
-                    {
-                        title: this.$t('publish.city'),
-                        prop: 'cityCode',
-                        type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.cityCode, this.cityList, ['code', 'name']); },
-                        tagType: (row) => { return 'success'; }
-                    },
                     {
                         title: this.$t('publish.lessonIntroduction'),
                         prop: 'remarks'
@@ -123,7 +115,6 @@ export default {
     },
     methods: {
         loadInitData() {
-            this.cityList = [];
             this.mapList = [];
             getPublishMapListOnline().then(resp => {
                 this.mapList = resp.data;
@@ -131,14 +122,6 @@ export default {
                     this.queryForm.queryObject.mapId.config.data.push({value: elem.id, label: elem.name});
                 });
             });
-            this.$Dictionary.cityType().then(list => {
-                this.cityList = list;
-                this.cityList.forEach(elem => {
-                    this.queryForm.queryObject.cityCode.config.data.push({ value: elem.code, label: elem.name });
-                });
-            }).catch(() => {
-                this.$messageBox(this.$t('error.loadingCityListFailed'));
-            });
         },
         // 编辑
         handleEdit(index, row) {