From a52dd1bdb2d1761c83a8a9716627a6f851625003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Wed, 28 Apr 2021 09:32:40 +0800
Subject: [PATCH] =?UTF-8?q?update=20moment=E5=85=A8=E5=B1=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/App.vue                           |  4 ----
 Web/src/main.js                           | 11 ++++++++++-
 Web/src/pages/home/notice.vue             | 10 ++++------
 Web/src/pages/system/config/form.vue      |  2 --
 Web/src/pages/system/log/oplog/index.vue  | 10 +++-------
 Web/src/pages/system/log/vislog/index.vue | 10 +++-------
 Web/src/pages/system/user/form.vue        |  8 ++------
 7 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/Web/src/App.vue b/Web/src/App.vue
index 67822e7..bd456df 100644
--- a/Web/src/App.vue
+++ b/Web/src/App.vue
@@ -9,10 +9,6 @@
 <script>
 import zh_CN from 'ant-design-vue/es/locale/zh_CN';
 
-import moment from 'moment';
-import 'moment/locale/zh-cn';
-moment.locale('zh-cn');
-
 export default {
   name: 'App',
   data() {
diff --git a/Web/src/main.js b/Web/src/main.js
index f921c86..7f33e88 100644
--- a/Web/src/main.js
+++ b/Web/src/main.js
@@ -40,7 +40,16 @@ Vue.prototype.$api = api
  */
 import _ from 'lodash'
 Vue.prototype.$_ = _
-
+/**
+ * moment全局化
+ */
+import moment from 'moment'
+import 'moment/locale/zh-cn'
+moment.locale('zh-cn')
+Vue.prototype.$moment = moment
+/**
+ * 权限验证全局化
+ */
 import { auth } from './components/authorized'
 Vue.prototype.$auth = auth
 
diff --git a/Web/src/pages/home/notice.vue b/Web/src/pages/home/notice.vue
index 205f806..1e7144c 100644
--- a/Web/src/pages/home/notice.vue
+++ b/Web/src/pages/home/notice.vue
@@ -3,7 +3,10 @@
     <a href="#" slot="extra">更多</a>
     <a-list :data-source="data" item-layout="horizontal">
       <a-list-item slot="renderItem" slot-scope="item">
-        <a-list-item-meta :description="moment().format('YYYY-MM-DD HH:mm:ss')" :title="item.title">
+        <a-list-item-meta
+          :description="$moment().format('YYYY-MM-DD HH:mm:ss')"
+          :title="item.title"
+        >
           <a-icon :style="{ fontSize: '18px' }" slot="avatar" theme="twoTone" type="message" />
         </a-list-item-meta>
       </a-list-item>
@@ -11,8 +14,6 @@
   </a-card>
 </template>
 <script>
-import moment from 'moment';
-
 export default {
   data() {
     return {
@@ -23,8 +24,5 @@ export default {
       ],
     };
   },
-  methods: {
-    moment,
-  },
 };
 </script>
\ No newline at end of file
diff --git a/Web/src/pages/system/config/form.vue b/Web/src/pages/system/config/form.vue
index 16e8277..e12a41f 100644
--- a/Web/src/pages/system/config/form.vue
+++ b/Web/src/pages/system/config/form.vue
@@ -37,7 +37,6 @@
   </a-form-model>
 </template>
 <script>
-import moment from 'moment';
 export default {
   data() {
     return {
@@ -56,7 +55,6 @@ export default {
     };
   },
   methods: {
-      moment,
     /**
      * 必要的方法
      * 在打开编辑页时允许填充数据
diff --git a/Web/src/pages/system/log/oplog/index.vue b/Web/src/pages/system/log/oplog/index.vue
index cb37a3b..38ffa4f 100644
--- a/Web/src/pages/system/log/oplog/index.vue
+++ b/Web/src/pages/system/log/oplog/index.vue
@@ -44,7 +44,7 @@
               <a-range-picker
                 :show-time="{
                       hideDisabledOptions: true,
-                      defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+                      defaultValue: [$moment('00:00:00', 'HH:mm:ss'), $moment('23:59:59', 'HH:mm:ss')],
                     }"
                 format="YYYY-MM-DD HH:mm:ss"
                 v-model="query.dates"
@@ -84,8 +84,6 @@
   </container>
 </template>
 <script>
-import moment from 'moment';
-
 export default {
   data() {
     return {
@@ -133,8 +131,6 @@ export default {
     this.onLoadCodes();
   },
   methods: {
-    moment,
-
     /**
      * 必要的方法
      * 传给yo-table以示意数据接口及其参数和返回的数据结构
@@ -142,8 +138,8 @@ export default {
     loadData(params) {
       const query = this.$_.cloneDeep(this.query);
       if (query.dates && query.dates.length) {
-        query.searchBeginTime = moment(query.dates[0]).format('YYYY-MM-DD HH:mm:ss');
-        query.searchEndTime = moment(query.dates[1]).format('YYYY-MM-DD HH:mm:ss');
+        query.searchBeginTime = this.$moment(query.dates[0]).format('YYYY-MM-DD HH:mm:ss');
+        query.searchEndTime = this.$moment(query.dates[1]).format('YYYY-MM-DD HH:mm:ss');
         delete query.dates;
       }
 
diff --git a/Web/src/pages/system/log/vislog/index.vue b/Web/src/pages/system/log/vislog/index.vue
index 18fccb5..a6b1f3c 100644
--- a/Web/src/pages/system/log/vislog/index.vue
+++ b/Web/src/pages/system/log/vislog/index.vue
@@ -41,7 +41,7 @@
               <a-range-picker
                 :show-time="{
                       hideDisabledOptions: true,
-                      defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+                      defaultValue: [$moment('00:00:00', 'HH:mm:ss'), $moment('23:59:59', 'HH:mm:ss')],
                     }"
                 format="YYYY-MM-DD HH:mm:ss"
                 v-model="query.dates"
@@ -76,8 +76,6 @@
   </container>
 </template>
 <script>
-import moment from 'moment';
-
 export default {
   data() {
     return {
@@ -125,8 +123,6 @@ export default {
     this.onLoadCodes();
   },
   methods: {
-    moment,
-
     /**
      * 必要的方法
      * 传给yo-table以示意数据接口及其参数和返回的数据结构
@@ -134,8 +130,8 @@ export default {
     loadData(params) {
       const query = this.$_.cloneDeep(this.query);
       if (query.dates && query.dates.length) {
-        query.searchBeginTime = moment(query.dates[0]).format('YYYY-MM-DD HH:mm:ss');
-        query.searchEndTime = moment(query.dates[1]).format('YYYY-MM-DD HH:mm:ss');
+        query.searchBeginTime = this.$moment(query.dates[0]).format('YYYY-MM-DD HH:mm:ss');
+        query.searchEndTime = this.$moment(query.dates[1]).format('YYYY-MM-DD HH:mm:ss');
         delete query.dates;
       }
 
diff --git a/Web/src/pages/system/user/form.vue b/Web/src/pages/system/user/form.vue
index f35bba0..63eb789 100644
--- a/Web/src/pages/system/user/form.vue
+++ b/Web/src/pages/system/user/form.vue
@@ -25,7 +25,7 @@
             </a-form-model-item>
             <a-form-model-item label="生日">
               <a-date-picker
-                @change="(date) => form.birthday = date ? moment(date).format('YYYY-MM-DD') : undefined"
+                @change="(date) => form.birthday = date ? $moment(date).format('YYYY-MM-DD') : undefined"
                 class="w-100-p"
                 placeholder="请选择生日"
                 v-model="form.birthday"
@@ -120,8 +120,6 @@
   </a-form-model>
 </template>
 <script>
-import moment from 'moment';
-
 const validateToNextPassword = (rule, value, callback) => {
   callback();
 };
@@ -179,8 +177,6 @@ export default {
     };
   },
   methods: {
-    moment,
-
     /**
      * 必要的方法
      * 在打开编辑页时允许填充数据
@@ -189,7 +185,7 @@ export default {
       const form = this.$_.cloneDeep(record || {});
       // 日期特殊处理
       if (form.birthday) {
-        form.birthday = moment(form.birthday).format('YYYY-MM-DD');
+        form.birthday = this.$moment(form.birthday).format('YYYY-MM-DD');
       }
       // 提交的时候是"param",而获取下来却是"info",在这里转换一下
       if (form.sysEmpInfo) {