From 558f359c77bc024e6b5190cc2cedf70091c54d42 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 14 Nov 2019 14:10:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4elementui=20=E6=94=B9?=
 =?UTF-8?q?=E7=94=A8cdn=E6=96=B9=E5=BC=8F=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                          |  1 -
 public/index.html                     |  6 +--
 src/i18n/langs/en/index.js            | 63 ++++++++++++++-------------
 src/i18n/langs/zh/index.js            |  5 ++-
 src/main.js                           |  9 ++--
 src/router/index.js                   |  2 +-
 src/views/display/menuPlan.vue        |  1 +
 src/views/display/menuSystemTime.vue  |  1 +
 src/views/{ => system}/news/index.vue |  0
 vue.config.js                         | 55 +++++++++++------------
 10 files changed, 72 insertions(+), 71 deletions(-)
 rename src/views/{ => system}/news/index.vue (100%)
diff --git a/package.json b/package.json
index 60fea5bca..5e288ca0f 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,6 @@
   },
   "dependencies": {
     "axios": "0.18.0",
-    "element-ui": "2.7.2",
     "file-saver": "^1.3.3",
     "js-cookie": "2.2.0",
     "js-md5": "^0.7.3",
diff --git a/public/index.html b/public/index.html
index c9d03ae77..6dc1a0313 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.png">
-    <!-- <link rel="stylesheet" href="https://cdn.bootcss.com/element-ui/2.12.0/theme-chalk/index.css"> -->
+    <link rel="stylesheet" href="https://cdn.bootcss.com/element-ui/2.12.0/theme-chalk/index.css">
     <link href="https://cdn.bootcss.com/nprogress/0.2.0/nprogress.min.css" rel="stylesheet">
     <title><%= webpackConfig.name %></title>
     <script src="/static/inflate.min.js"></script>
@@ -17,9 +17,9 @@
     <script src="https://cdn.bootcss.com/vue-router/3.0.6/vue-router.min.js"></script>
     <script src="https://cdn.bootcss.com/nprogress/0.2.0/nprogress.min.js"></script>
 
-    <!-- <script src="https://cdn.bootcss.com/element-ui/2.12.0/index.js"></script>
+    <script src="https://cdn.bootcss.com/element-ui/2.12.0/index.js"></script>
     <script src="https://cdn.bootcss.com/element-ui/2.12.0/locale/en.min.js"></script>
-    <script src="https://cdn.bootcss.com/element-ui/2.12.0/locale/zh-CN.min.js"></script> -->
+    <script src="https://cdn.bootcss.com/element-ui/2.12.0/locale/zh-CN.min.js"></script>
   </head>
   <body>  
     <noscript>
diff --git a/src/i18n/langs/en/index.js b/src/i18n/langs/en/index.js
index 2717010cb..edfbe50bb 100644
--- a/src/i18n/langs/en/index.js
+++ b/src/i18n/langs/en/index.js
@@ -1,4 +1,5 @@
-import enLocale from 'element-ui/lib/locale/lang/en';
+// import enLocale from 'element-ui/lib/locale/lang/en';
+import ELEMENT from 'element-ui';
 import map from './map';
 import global from './global';
 import router from './router';
@@ -30,34 +31,34 @@ import login from './login';
 import designPlatform from './designPlatform';
 
 export default {
-	...enLocale,
-	map,
-	global,
-	router,
-	lesson,
-	teach,
-	error,
-	rules,
-	scriptRecord,
-	tip,
-	system,
-	orderAuthor,
-	publish,
-	permission,
-	replay,
-	planMonitor,
-	screenMonitor,
-	demonstration,
-	exam,
-	dashboard,
-	jlmap3d,
-	display,
-	joinTraining,
-	trainRoom,
-	menu,
-	ibp,
-	approval,
-	systemGenerate,
-	login,
-	designPlatform
+    ...ELEMENT.lang.en,
+    map,
+    global,
+    router,
+    lesson,
+    teach,
+    error,
+    rules,
+    scriptRecord,
+    tip,
+    system,
+    orderAuthor,
+    publish,
+    permission,
+    replay,
+    planMonitor,
+    screenMonitor,
+    demonstration,
+    exam,
+    dashboard,
+    jlmap3d,
+    display,
+    joinTraining,
+    trainRoom,
+    menu,
+    ibp,
+    approval,
+    systemGenerate,
+    login,
+    designPlatform
 };
diff --git a/src/i18n/langs/zh/index.js b/src/i18n/langs/zh/index.js
index 004486c75..14bb3e3ad 100644
--- a/src/i18n/langs/zh/index.js
+++ b/src/i18n/langs/zh/index.js
@@ -1,4 +1,5 @@
-import cnLocale from 'element-ui/lib/locale/lang/zh-CN';
+// import cnLocale from 'element-ui/lib/locale/lang/zh-CN';
+import ELEMENT from 'element-ui';
 import map from './map';
 import global from './global';
 import router from './router';
@@ -30,7 +31,7 @@ import login from './login';
 import designPlatform from './designPlatform';
 
 export default {
-    ...cnLocale,
+    ...ELEMENT.lang.zhCN,
     map,
     global,
     router,
diff --git a/src/main.js b/src/main.js
index 438e917d2..a0649ace0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,10 +1,7 @@
 import Vue from 'vue';
 
 import 'normalize.css/normalize.css'; // A modern alternative to CSS resets
-
-import ElementUI from 'element-ui';
-import ElementLocale from 'element-ui/lib/locale';
-import 'element-ui/lib/theme-chalk/index.css';
+import ELEMENT from 'element-ui';
 
 import '@/styles/index.scss'; // global css
 
@@ -26,7 +23,7 @@ import '@/directive/quickMenuDrag/index.js';
 import '@/directive/waves/index.js';
 import messages from '@/i18n/index';
 
-Vue.use(ElementUI);
+Vue.use(ELEMENT);
 Vue.use(VueI18n);
 
 Vue.config.productionTip = false;
@@ -36,7 +33,7 @@ export const i18n = new VueI18n({
     messages
 });
 
-ElementLocale.i18n((key, value) => i18n.t(key, value));
+ELEMENT.i18n((key, value) => i18n.t(key, value));
 
 new Vue({
     el: '#app',
diff --git a/src/router/index.js b/src/router/index.js
index c3cac6593..c2cf6f58b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -30,6 +30,7 @@ const ExistingSimulation = () => import('@/views/system/existingSimulation/index
 const CacheControl = () => import('@/views/system/cacheControl/index');
 const SystemGenerate = () => import('@/views/system/systemGenerate/index');
 const IbpDraw = () => import('@/views/system/ibpDraw/index');
+const News = () => import('@/views/system/news/index');
 
 const Mapedit = () => import('@/views/mapdraft/index');
 
@@ -99,7 +100,6 @@ const UserRulesDetail = () => import('@/views/orderauthor/rules/detail');
 const LessonApproval = () => import('@/views/approval/lesson/index');
 const ScriptApproval = () => import('@/views/approval/script/index');
 const RunPlanApproval = () => import('@/views/approval/runPlan/index');
-const News = () => import('@/views/news/index');
 
 import { loginTitle } from '@/scripts/ConstDic';
 import { getSessionStorage } from '@/utils/auth';
diff --git a/src/views/display/menuPlan.vue b/src/views/display/menuPlan.vue
index 1e65bdbb4..459fbc486 100644
--- a/src/views/display/menuPlan.vue
+++ b/src/views/display/menuPlan.vue
@@ -15,6 +15,7 @@ import { Notification } from 'element-ui';
 import { runDiagramIsStart, runDiagramGetTime, runDiagramOver, runDiagramStart } from '@/api/simulation';
 import { timeFormat } from '@/utils/date';
 
+// 琏计划 暂时不用
 export default {
     name: 'MenuPlan',
     components: {
diff --git a/src/views/display/menuSystemTime.vue b/src/views/display/menuSystemTime.vue
index 2ebd79ecc..ab65f3642 100644
--- a/src/views/display/menuSystemTime.vue
+++ b/src/views/display/menuSystemTime.vue
@@ -16,6 +16,7 @@
 import { prefixIntrger } from '@/utils/date';
 import SystemTime from '@/views/components/systemTime/index';
 
+// 顶部时间栏显示
 export default {
     name: 'MenuSystemTime',
     components: {
diff --git a/src/views/news/index.vue b/src/views/system/news/index.vue
similarity index 100%
rename from src/views/news/index.vue
rename to src/views/system/news/index.vue
diff --git a/vue.config.js b/vue.config.js
index e12abd347..0fea72334 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -81,7 +81,8 @@ module.exports = {
             'vuex': 'Vuex',
             'vue-router': 'VueRouter',
             'nprogress': 'NProgress',
-            'echarts': 'echarts'
+            'echarts': 'echarts',
+            'element-ui': 'ELEMENT'
         };
 
     },
@@ -144,39 +145,39 @@ module.exports = {
                                     priority: 10,
                                     chunks: 'initial' // only package third parties that are initially dependent
                                 },
-                                elementUI: {
-                                    name: 'chunk-elementUI', // split elementUI into a single package
-                                    priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                                    test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-                                },
+                                // elementUI: {
+                                //     name: 'chunk-elementUI', // split elementUI into a single package
+                                //     priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+                                //     test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+                                // },
                                 commons: {
                                     name: 'chunk-commons',
                                     test: resolve('src/components'), // can customize your rules
                                     minChunks: 3, //  minimum common number
                                     priority: 5,
                                     reuseExistingChunk: true
-                                },
-                                jmap: {
-                                    name: 'chunk-jmap',
-                                    test: resolve('src/jmap'), // can customize your rules
-                                    minChunks: 3, //  minimum common number
-                                    priority: 5,
-                                    reuseExistingChunk: true
-                                },
-                                jlmap3d: {
-                                    name: 'chunk-jlmap3d',
-                                    test: resolve('src/jlmap3d'), // can customize your rules
-                                    minChunks: 3, //  minimum common number
-                                    priority: 5,
-                                    reuseExistingChunk: true
-                                },
-                                ibp: {
-                                    name: 'chunk-ibp',
-                                    test: resolve('src/ibp'), // can customize your rules
-                                    minChunks: 3, //  minimum common number
-                                    priority: 5,
-                                    reuseExistingChunk: true
                                 }
+                                // jmap: {
+                                //     name: 'chunk-jmap',
+                                //     test: resolve('src/jmap'), // can customize your rules
+                                //     minChunks: 3, //  minimum common number
+                                //     priority: 5,
+                                //     reuseExistingChunk: true
+                                // },
+                                // jlmap3d: {
+                                //     name: 'chunk-jlmap3d',
+                                //     test: resolve('src/jlmap3d'), // can customize your rules
+                                //     minChunks: 3, //  minimum common number
+                                //     priority: 5,
+                                //     reuseExistingChunk: true
+                                // },
+                                // ibp: {
+                                //     name: 'chunk-ibp',
+                                //     test: resolve('src/ibp'), // can customize your rules
+                                //     minChunks: 3, //  minimum common number
+                                //     priority: 5,
+                                //     reuseExistingChunk: true
+                                // }
                             }
                         });
                     config.optimization.runtimeChunk('single');
