dayjs 替代 moment

.eslintrc.js

@@ -89,7 +89,6 @@ module.exports = {
     'localStorage': true,
     'window': true,
     'BootstrapDialog': true,
-    'moment': true,
     'gantt': true,
     '__webpack_public_path__': true,
     'Notify': true,

package.json

@@ -14,8 +14,7 @@
   ],
   "peerDependencies": {
     "ant-design-vue": "^3.2.15",
-    "moment": "^2.29.4",
-    "pc-component-v3": "^1.0.67",
+    "pc-component-v3": "1.0.81",
     "v-tooltip": "^4.0.0-beta.17",
     "vue-select": "^4.0.0-beta.6"
   },

public/index.html

@@ -17,8 +17,7 @@
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/table-fixer.jquery/table-fixer.jquery.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/jQuery-ResizableColumns/jQuery.resizableColumns.js"></script>
 
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/moment/moment.js"></script>
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/moment/locale/zh-cn.js"></script>
+	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/dayjs/dayjs.min.js"></script>
 
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/bootstrap/dist/js/bootstrap.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/bootstrap3-dialog/dist/js/bootstrap-dialog.js"></script>
@@ -32,8 +31,6 @@
 
 
 	<script nonce="*NONCE_TOKEN*"  type="text/javascript">
-		moment.locale('zh');
-		
 		var nonce_token = "*NONCE_TOKEN*";
 	</script>
 </head>

src/components/customer/AssetInstanceSearchDetail.vue

@@ -897,7 +897,7 @@
 import Common from '../../common/Common.js';
 import { Notify, Uuid } from 'pc-component-v3';
 import AuthImage from '../../widget/AuthImage.vue';
-
+import dayjs from 'dayjs';
 import AssetInstanceRfidRecordResource from '../../api/asset/AssetInstanceRfidRecordResource.js';
 
 export default {
@@ -1043,7 +1043,7 @@ export default {
         wdate.getSeconds() < 10 ? '0' + wdate.getSeconds() : wdate.getSeconds();
       var formatwdate = y + '-' + m + '-' + d + ' ' + h + mm + dd;
       console.log('前一个月的时间' + formatwdate);
-      _self.eventOriginalEndDate = moment().format('YYYY-MM-DD HH:mm:ss');
+      _self.eventOriginalEndDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
       _self.eventOriginalStartDate = formatwdate;
     },
 

src/components/customer/ExportPictureLibrary.vue

@@ -24,6 +24,7 @@
 import Common from '../../common/Common.js';
 import { DownloadService } from 'pc-component-v3';
 import { Notify } from 'pc-component-v3';
+import dayjs from 'dayjs';
 
 
 
@@ -48,10 +49,10 @@ export default {
          * @author XiongLiuJie 20210422
          */
     download: function () {
-      var timeStr = moment().format('_YYYYMMDD_hhmmss');
+      var timeStr = dayjs().format('YYYYMMDD_hhmmss');
       let url = Common.getApiURL('AssetInstanceResource/plistDownLoad');
           
-      var fileName = '导出图片库'+ timeStr + '.zip';
+      var fileName = '导出图片库_'+ timeStr + '.zip';
       DownloadService.downloadFile(url, fileName);
       Notify.success('成功', fileName, true);
     },

src/components/customer/InventoryDataProcessingStep5.vue

@@ -201,6 +201,7 @@
 import AssetInventoryResource from '../../api/asset/AssetInventoryResource.js';
 import Common from '../../common/Common.js';
 import { Uuid } from'pc-component-v3';
+import dayjs from 'dayjs';
 
 
 
@@ -342,9 +343,9 @@ module.exports = {
               }else {
                 item.checked = true;
               }
-              item.inventoryStartDate = moment(item.inventoryStartDate).format('YYYY-MM-DD');
-              item.inventoryEndDate = moment(item.inventoryEndDate).format('YYYY-MM-DD');
-              item.accountDate = moment(item.accountDate).format('YYYY-MM-DD');
+              item.inventoryStartDate = dayjs(item.inventoryStartDate).format('YYYY-MM-DD');
+              item.inventoryEndDate = dayjs(item.inventoryEndDate).format('YYYY-MM-DD');
+              item.accountDate = dayjs(item.accountDate).format('YYYY-MM-DD');
             });
             _self.checked = isChange;
           }

src/components/rfidRecord/AssetRfidRecord.vue

@@ -73,7 +73,7 @@
             format="YYYY-MM-DD HH:mm:ss"
             :show-time="{
               format: 'HH:mm:ss',
-              defaultValue: moment('00:00:00', 'HH:mm:ss'),
+              defaultValue: dayjs('00:00:00', 'HH:mm:ss'),
             }"
             style="width: 70%"
             placeholder="请选择开始时间"
@@ -92,7 +92,7 @@
             format="YYYY-MM-DD HH:mm:ss"
             :show-time="{
               format: 'HH:mm:ss',
-              defaultValue: moment('00:00:00', 'HH:mm:ss'),
+              defaultValue: dayjs('00:00:00', 'HH:mm:ss'),
             }"
             style="width: 70%"
             placeholder="请选择结束时间"
@@ -130,7 +130,6 @@
 <script setup>
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
-import moment from 'moment';
 import CommonTable from '../../common/CommonTable.vue';
 import Common from '../../common/Common.js';
 import { ref, reactive, onMounted } from 'vue';

src/dashboard/eam/AssetDashboardClient.vue

@@ -195,10 +195,10 @@ import ScrapStatisticsClient from './ScrapStatisticsClient.js';
 import RepairStatisticsClient from './RepairStatisticsClient.js';
 import MaintainStatisticsClient from './MaintainStatisticsClient.js';
 import UseStatusStatisticsClient from './UseStatusStatisticsClient.js';
-
 import UserStorageResource from '../../api/base/UserStorageResource.js';
 
 import { Uuid, SqlApi} from 'pc-component-v3';
+import dayjs from 'dayjs';
 
 const reports = [
   {
@@ -440,8 +440,8 @@ export default {
         _self.monthNum = monthNum;
         var nowDate = new Date();
 
-        _self.startDate = moment(nowDate).subtract(monthNum, 'M').format('YYYY-MM-DD HH:mm:ss');
-        _self.endDate = moment(nowDate).add(1, 'd').format('YYYY-MM-DD HH:mm:ss');
+        _self.startDate = dayjs(nowDate).subtract(monthNum, 'M').format('YYYY-MM-DD HH:mm:ss');
+        _self.endDate = dayjs(nowDate).add(1, 'd').format('YYYY-MM-DD HH:mm:ss');
 
         let selectedClientIds = this.getSelectedClientIds();
 

src/dashboard/eam/AssetDashboardOrg.vue

@@ -195,6 +195,7 @@ import RepairStatisticsOrg from './RepairStatisticsOrg.js';
 import MaintainStatisticsOrg from './MaintainStatisticsOrg.js';
 import UseStatusStatisticsOrg from './UseStatusStatisticsOrg.js';
 import { SqlApi } from 'pc-component-v3';
+import dayjs from 'dayjs';
 
 
 const reports = [
@@ -364,8 +365,8 @@ export default {
         _self.monthNum = monthNum;
         var nowDate = new Date();
 
-        _self.startDate = moment(nowDate).subtract(monthNum, 'M').format('YYYY-MM-DD HH:mm:ss');
-        _self.endDate = moment(nowDate).add(1, 'd').format('YYYY-MM-DD HH:mm:ss');
+        _self.startDate = dayjs(nowDate).subtract(monthNum, 'M').format('YYYY-MM-DD HH:mm:ss');
+        _self.endDate = dayjs(nowDate).add(1, 'd').format('YYYY-MM-DD HH:mm:ss');
 
         let selectedOrgs = this.getSelectedOrganizations();
 

src/dashboard/eam/DecreaseStatisticsClient.js

@@ -16,8 +16,8 @@ export default function () {
       let maxOriginalValue = 0;
 
       for (let i = 1; i < 100; i++) {
-        let currentYearMonth = moment(startDate).add(i, 'M').format('YYYY-MM');
-        if (moment(endDate).isBefore(currentYearMonth)) {
+        let currentYearMonth = dayjs(startDate).add(i, 'M').format('YYYY-MM');
+        if (dayjs(endDate).isBefore(currentYearMonth)) {
           break;
         }
         recentMonths.push(currentYearMonth);

src/dashboard/eam/IncreaseStatisticsClient.js

@@ -6,7 +6,7 @@ export default function () {
     sqlApiNo: '202112011906',
     exportSqlApiNo: '202112081906',
     exportPageTitle: function(startDate, endDate){
-      return '新增资产数据明细(' + moment(startDate).format('YYYY-MM-DD') + '    ' + moment(endDate).format('YYYY-MM-DD') + ')';
+      return '新增资产数据明细(' + dayjs(startDate).format('YYYY-MM-DD') + '    ' + dayjs(endDate).format('YYYY-MM-DD') + ')';
     },
     processReportNo: '286213',
     dateRangeSelect: true,
@@ -20,8 +20,8 @@ export default function () {
       let maxOriginalValue = 0;
 
       for (let i = 1; i < 100; i++) {
-        let currentYearMonth = moment(startDate).add(i, 'M').format('YYYY-MM');
-        if (moment(endDate).isBefore(currentYearMonth)) {
+        let currentYearMonth = dayjs(startDate).add(i, 'M').format('YYYY-MM');
+        if (dayjs(endDate).isBefore(currentYearMonth)) {
           break;
         }
         recentMonths.push(currentYearMonth);

src/dashboard/eam/MaintainStatisticsClient.js

@@ -17,8 +17,8 @@ export default function () {
       let maxOriginalValue = 0;
 
       for (let i = 1; i < 100; i++) {
-        let currentYearMonth = moment(startDate).add(i, 'M').format('YYYY-MM');
-        if (moment(endDate).isBefore(currentYearMonth)) {
+        let currentYearMonth = dayjs(startDate).add(i, 'M').format('YYYY-MM');
+        if (dayjs(endDate).isBefore(currentYearMonth)) {
           break;
         }
         recentMonths.push(currentYearMonth);

src/dashboard/eam/RepairStatisticsClient.js

@@ -11,8 +11,8 @@ export default function () {
       let recentMonths = [];
       let assetCounts = [];
       for (let i = 1; i < 100; i++) {
-        let currentYearMonth = moment(startDate).add(i, 'M').format('YYYY-MM');
-        if (moment(endDate).isBefore(currentYearMonth)) {
+        let currentYearMonth = dayjs(startDate).add(i, 'M').format('YYYY-MM');
+        if (dayjs(endDate).isBefore(currentYearMonth)) {
           break;
         }
         recentMonths.push(currentYearMonth);

src/dashboard/eam/ScrapStatisticsClient.js

@@ -16,8 +16,8 @@ export default function () {
       let maxOriginalValue = 0;
 
       for (let i = 1; i < 100; i++) {
-        let currentYearMonth = moment(startDate).add(i, 'M').format('YYYY-MM');
-        if (moment(endDate).isBefore(currentYearMonth)) {
+        let currentYearMonth = dayjs(startDate).add(i, 'M').format('YYYY-MM');
+        if (dayjs(endDate).isBefore(currentYearMonth)) {
           break;
         }
         recentMonths.push(currentYearMonth);

src/main.js

@@ -14,8 +14,6 @@ import App from './App.vue';
 import routes from './router/index.js';
 import 'ant-design-vue/dist/antd.css';
 
-import moment from 'moment';
-moment.locale('zh');
 
 import 'jquery';
 

webpack.base.js

@@ -80,7 +80,7 @@ module.exports = {
     'jquery': "window.jquery",
     'bootstrap': 'bootstrap',
     'BootstrapDialog': 'BootstrapDialog',
-    'moment': 'moment',
+    'dayjs': 'dayjs',
     'vue': 'Vue',
     'vue-i18n': 'VueI18n',
     'vue-router': 'VueRouter',

webpack.lib.js

@@ -116,7 +116,7 @@ module.exports = WebpackMerge.merge(baseConfig,{
   // 不把第三方库打包到bundle中
   externals: {
     "ant-design-vue": "ant-design-vue",
-    "moment": "moment",
+    "dayjs": "dayjs",
     "pc-component-v3": "pc-component-v3",
     "v-tooltip": "v-tooltip",
     "vue-select": "vue-select",