From 89292199af8b4db3a6333b9941ef277f26490f6d Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 14 十月 2024 17:06:55 +0800
Subject: [PATCH] 1. 添加dayjs插件声明
---
package-lock.json | 14 +++++++-------
src/main.js | 8 ++++++++
package.json | 2 +-
src/components.d.ts | 8 ++++----
src/api/fysp/evaluateApi.js | 6 +++---
5 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 7d0a226..d934b3f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
"@element-plus/icons-vue": "^2.0.10",
"@vueuse/core": "^9.7.0",
"axios": "^1.2.1",
- "dayjs": "^1.11.10",
+ "dayjs": "^1.11.13",
"element-plus": "^2.8.3",
"js-base64": "^3.7.5",
"md5": "^2.3.0",
@@ -3680,9 +3680,9 @@
}
},
"node_modules/dayjs": {
- "version": "1.11.10",
- "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz",
- "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+ "version": "1.11.13",
+ "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
+ "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
},
"node_modules/debug": {
"version": "4.3.4",
@@ -10000,9 +10000,9 @@
}
},
"dayjs": {
- "version": "1.11.10",
- "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz",
- "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+ "version": "1.11.13",
+ "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
+ "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
},
"debug": {
"version": "4.3.4",
diff --git a/package.json b/package.json
index 6d0b5e4..2aa6804 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"@element-plus/icons-vue": "^2.0.10",
"@vueuse/core": "^9.7.0",
"axios": "^1.2.1",
- "dayjs": "^1.11.10",
+ "dayjs": "^1.11.13",
"element-plus": "^2.8.3",
"js-base64": "^3.7.5",
"md5": "^2.3.0",
diff --git a/src/api/fysp/evaluateApi.js b/src/api/fysp/evaluateApi.js
index 4ab4a94..3e804e5 100644
--- a/src/api/fysp/evaluateApi.js
+++ b/src/api/fysp/evaluateApi.js
@@ -68,14 +68,14 @@
* 鎵归噺淇敼鏈�灏忛」寰楀垎
*/
updateMultipleScore(evaVo) {
- return $fysp.post(`/itemevaluation/update/multiple`, evaVo).then((res) => res.data);
+ return $fysp.post(`itemevaluation/update/multiple`, evaVo).then((res) => res.data);
},
/**
* 淇敼鏈�灏忛」寰楀垎
*/
updateScore({itemList, subTaskId}) {
const param = `?subTaskId=${subTaskId}`
- return $fysp.post(`/itemevaluation/update${param}`, itemList).then((res) => res.data);
+ return $fysp.post(`itemevaluation/update${param}`, itemList).then((res) => res.data);
},
/**
* 鑾峰緱鎵�鏈夎鍒欑埗鑺傜偣
@@ -86,7 +86,7 @@
/** 鏍规嵁鐖惰妭鐐筰d鑾峰彇瀛愯鍒� */
getSubRules(id) {
const param = `?id=${id}`
- return $fysp.get(`/evaluationsubrule/byRule${param}`).then((res) => res.data);
+ return $fysp.get(`evaluationsubrule/byRule${param}`).then((res) => res.data);
},
/**
* 鏇存柊鐖惰妭鐐硅鍒�
diff --git a/src/components.d.ts b/src/components.d.ts
index 425e47b..cb3ff11 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -9,14 +9,11 @@
export interface GlobalComponents {
BaseContentLayout: typeof import('./components/core/BaseContentLayout.vue')['default']
BasePanelLayout: typeof import('./components/core/BasePanelLayout.vue')['default']
- CompInfoSearch: typeof import('./components/search-option/CompInfoSearch.vue')['default']
CompQuickSet: typeof import('./components/search-option/CompQuickSet.vue')['default']
Content: typeof import('./components/core/Content.vue')['default']
- copy: typeof import('./components/list-item/ItemScene copy.vue')['default']
ElAffix: typeof import('element-plus/es')['ElAffix']
ElAside: typeof import('element-plus/es')['ElAside']
ElAvatar: typeof import('element-plus/es')['ElAvatar']
- ElBacktop: typeof import('element-plus/es')['ElBacktop']
ElBadge: typeof import('element-plus/es')['ElBadge']
ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
@@ -35,6 +32,9 @@
ElDialog: typeof import('element-plus/es')['ElDialog']
ElDivider: typeof import('element-plus/es')['ElDivider']
ElDrawer: typeof import('element-plus/es')['ElDrawer']
+ ElDropdown: typeof import('element-plus/es')['ElDropdown']
+ ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
+ ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
ElEmpty: typeof import('element-plus/es')['ElEmpty']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
@@ -59,7 +59,6 @@
ElSegmented: typeof import('element-plus/es')['ElSegmented']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElSpace: typeof import('element-plus/es')['ElSpace']
- ElStatistic: typeof import('element-plus/es')['ElStatistic']
ElStep: typeof import('element-plus/es')['ElStep']
ElSteps: typeof import('element-plus/es')['ElSteps']
ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
@@ -71,6 +70,7 @@
ElTag: typeof import('element-plus/es')['ElTag']
ElText: typeof import('element-plus/es')['ElText']
ElTooltip: typeof import('element-plus/es')['ElTooltip']
+ ElTransfer: typeof import('element-plus/es')['ElTransfer']
ElTree: typeof import('element-plus/es')['ElTree']
ElUpload: typeof import('element-plus/es')['ElUpload']
Footer: typeof import('./components/core/Footer.vue')['default']
diff --git a/src/main.js b/src/main.js
index 8a0d286..e7e95b7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,6 +15,14 @@
import 'element-plus/theme-chalk/src/message-box.scss';
import 'element-plus/theme-chalk/src/notification.scss';
+// dayjs plugin
+import dayjs from 'dayjs';
+import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
+
+dayjs.extend(isSameOrAfter);
+dayjs.extend(isSameOrBefore);
+
const app = createApp(App);
app.config.globalProperties.$fm = timeUtil;
--
Gitblit v1.9.3