Merge branch 'master' of http://106.12.23.251:10080/CDHABOOK/TEAMModelOS

TEAMModelOS.SmartClass/ClientApp/locale/index.js

@@ -4,6 +4,10 @@ import customZhCn from './lang/zh-CN'
 import customZhTw from './lang/zh-TW'
 import customEnUs from './lang/en-US'
 
+import zhLocale from "iview/src/locale/lang/zh-CN";
+import enLocale from "iview/src/locale/lang/en-US";
+import twLocale from "iview/src/locale/lang/zh-TW";
+
 Vue.use(VueI18n)
 
 // 自动根据浏览器系统语言设置语言
@@ -18,9 +22,9 @@ Vue.config.lang = lang
 
 Vue.locale = () => { }
 const messages = {
-  'zh-CN': customZhCn,
-  'zh-TW': customZhTw,
-  'en-US': customEnUs
+  'zh-CN': Object.assign(customZhCn, zhLocale),
+  'zh-TW': Object.assign(customZhTw, twLocale),
+  'en-US': Object.assign(customEnUs, enLocale),
 }
 const i18n = new VueI18n({
   locale: lang,

TEAMModelOS.SmartClass/ClientApp/view/smart-class/notice.vue

@@ -19,9 +19,10 @@
     <div class="right-box center-col">
       <p class="title">{{typeName}}</p>
       <Table :columns="newColumns" :data="noticeList" @on-row-click="rowClick" no-data-text="暂无数据"></Table>
-      <Page :total="50" show-elevator show-total/>
+      <Page :total="50" show-elevator show-total />
     </div>
   </div>
+
 </template>
 <script>