From f985a93c9e0a1388c9533d570ca203ecd2aa58aa Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 27 Dec 2019 10:47:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=B9=B3=E5=8F=B0=20?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=BE=E8=AE=A1=20=E5=AE=9E=E8=AE=AD?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20prdtype=20=E6=8E=A5=E5=8F=A3=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/api/management/mapprd.js              |  9 -----
 src/i18n/langs/en/error.js                |  1 -
 src/i18n/langs/zh/error.js                |  1 -
 src/views/lesson/trainingmanage/index.vue | 46 +++++++++--------------
 4 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/src/api/management/mapprd.js b/src/api/management/mapprd.js
index 0de602a42..62908e0c4 100644
--- a/src/api/management/mapprd.js
+++ b/src/api/management/mapprd.js
@@ -17,12 +17,3 @@ export function getCommodityMapProduct(mapId) {
         method: 'get'
     });
 }
-
-/** 获取产品管理列表*/
-export function getProductList(data) {
-    return request({
-        url: `/api/mapPrd/list`,
-        method: 'get',
-        params: data
-    });
-}
diff --git a/src/i18n/langs/en/error.js b/src/i18n/langs/en/error.js
index 11024cbd7..42a333aee 100644
--- a/src/i18n/langs/en/error.js
+++ b/src/i18n/langs/en/error.js
@@ -60,7 +60,6 @@ export default {
     updateOperateStepFailed: 'The update action step failed',
     packagePermissionFailed: 'Packaging authority failed',
     acquisitionTimeFailed: 'Acquisition Time Failed',
-    getProductListFailed: 'Failed to get product list',
     obtainChapterDataFailed: 'Failed to obtain chapter data',
     obtainCourseDetailsFailed: 'Failed to obtain course details',
     obtainCourseInformationFailed: 'Failed to obtain course information',
diff --git a/src/i18n/langs/zh/error.js b/src/i18n/langs/zh/error.js
index 98c43a7eb..b6ba9df52 100644
--- a/src/i18n/langs/zh/error.js
+++ b/src/i18n/langs/zh/error.js
@@ -60,7 +60,6 @@ export default {
     updateOperateStepFailed: '更新操作步骤失败',
     packagePermissionFailed: '打包权限失败',
     acquisitionTimeFailed: '获取时间失败',
-    getProductListFailed: '获取产品列表失败',
     obtainChapterDataFailed: '获取章节数据失败',
     obtainCourseDetailsFailed: '获取课程详情失败',
     obtainCourseInformationFailed: '获取课程信息失败',
diff --git a/src/views/lesson/trainingmanage/index.vue b/src/views/lesson/trainingmanage/index.vue
index d476d6b12..749a50277 100644
--- a/src/views/lesson/trainingmanage/index.vue
+++ b/src/views/lesson/trainingmanage/index.vue
@@ -17,9 +17,10 @@
 </template>
 
 <script>
+import ConstConfig from '@/scripts/ConstConfig';
+import Cookies from 'js-cookie';
 import { pageQueryTraining } from '@/api/jmap/training';
 import { trainingNotify } from '@/api/simulation';
-import { getCommodityMapProduct, getProductList } from '@/api/management/mapprd';
 import { launchFullscreen } from '@/utils/screen';
 import { getPublishMapListOnline } from '@/api/jmap/map';
 import { UrlConfig } from '@/router/index';
@@ -35,7 +36,6 @@ export default {
         return {
             mapIdList: [],
             trainingTypeList: [],
-            prdTypeList: [],
             trainingOperateTypeMap: {},
             pagerConfig: {
                 pageSize: 'pageSize',
@@ -44,9 +44,9 @@ export default {
             queryForm: {
                 labelWidth: '120px',
                 queryObject: {
-                    prdId: {
+                    prdType: {
                         type: 'select',
-                        label: this.$t('lesson.product'),
+                        label: this.$t('lesson.prdType'),
                         change: this.prdChoose,
                         config: {
                             data: []
@@ -83,10 +83,10 @@ export default {
                         prop: 'name'
                     },
                     {
-                        title: this.$t('lesson.product'),
-                        prop: 'prdId',
+                        title: this.$t('lesson.prdType'),
+                        prop: 'prdType',
                         type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.prdId, this.prdTypeList, ['id', 'name']); },
+                        columnValue: (row) => { return this.$convertField(row.prdType, this.prdTypeList, ['value', 'label']); },
                         tagType: (row) => { return 'success'; }
                     },
                     {
@@ -143,39 +143,29 @@ export default {
             currentModel: {}
         };
     },
+    computed:{
+        prdTypeList() {
+            const productTypeList = ConstConfig.ConstSelect.prdType;
+            return Cookies.get('user_lang') == 'en'
+                ? productTypeList.map(elem => { return { value: elem.value, label: elem.enlabel }; })
+                : productTypeList.map(elem => { return { value: elem.value, label: elem.label }; });
+        }
+    },
     async created() {
         await this.loadInitData();
         const json = localStore.get(this.$route.path);
         json.type = '';
-        json.prdId = '';
+        json.prdType = '';
         json.operateType = '';
     },
     methods: {
         async loadInitData() {
             this.mapIdList = [];
-            this.queryForm.queryObject.prdId.config.data = [];
+            this.queryForm.queryObject.prdType.config.data = [];
             getPublishMapListOnline().then(response => {
                 this.mapIdList = response.data;
             });
-            getCommodityMapProduct(this.$route.query.mapId).then((response) => {
-                const productList = response.data;
-                if (productList && productList.length > 0) {
-                    productList.forEach(elem => {
-                        // 过滤综合演练产品
-                        if (elem.prdType != '03') {
-                            this.queryForm.queryObject.prdId.config.data.push({ value: elem.id, label: elem.name });
-                        }
-                    });
-                }
-            });
-
-            this.prdTypeList = [];
-            getProductList({ pageSize: 500, pageNum: 1 }).then(res => {
-                const list = res.data.list;
-                if (list && list.length > 0) {
-                    this.prdTypeList = list.filter(elem => { return elem.prdType != '03'; });
-                }
-            });
+            this.queryForm.queryObject.prdType.config.data = this.prdTypeList;
 
             // 获取实训类型
             this.trainingTypeList = [];