From 74e46f4f38fc7fadf4d7d12c9b3626df7ffbcd2f Mon Sep 17 00:00:00 2001 From: v_yutyi Date: Fri, 10 Dec 2021 16:03:44 +0800 Subject: [PATCH 1/4] fix: eslint --- src/pages/package.json | 6 +++--- src/pages/src/views/catalog/dataUpdate.vue | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/package.json b/src/pages/package.json index 06b0b5569..52345e8dd 100644 --- a/src/pages/package.json +++ b/src/pages/package.json @@ -41,9 +41,9 @@ } }, "dependencies": { - "bk-magic-vue": "2.2.16", "art-template": "4.1.0", "axios": "0.18.0", + "bk-magic-vue": "2.2.16", "connect-history-api-fallback": "1.6.0", "cookie": "0.4.0", "cookie-parser": "1.4.4", @@ -52,6 +52,7 @@ "express-art-template": "1.0.1", "intl-tel-input": "16.0.0", "jsonp": "0.2.1", + "node-sass": "4.14.1", "query-string": "6.5.0", "sortablejs": "1.10.1", "url-parse": "1.4.7", @@ -123,7 +124,6 @@ "markdown-it-container": "2.0.0", "mini-css-extract-plugin": "0.6.0", "moment": "2.24.0", - "node-sass": "4.13.0", "npm": "6.9.0", "open": "6.3.0", "opencollective": "1.0.3", @@ -161,7 +161,7 @@ }, "engines": { "node": ">= 12.3.1", - "npm": ">= 6.0.0" + "npm": ">= 6.0.0 < 7" }, "resolutions": { "node-gyp": "8.0.0" diff --git a/src/pages/src/views/catalog/dataUpdate.vue b/src/pages/src/views/catalog/dataUpdate.vue index 2f93b9654..9020bffdf 100644 --- a/src/pages/src/views/catalog/dataUpdate.vue +++ b/src/pages/src/views/catalog/dataUpdate.vue @@ -170,13 +170,13 @@ export default { if (60 <= row.required_time && row.required_time < 3600) { const time = row.required_time / 60; const min = time.toString().split('.')[0]; - const sec = parseInt(time.toString().split('.')[1][0]) * 6; + const sec = parseInt(time.toString().split('.')[1][0], 10) * 6; return `${min}${this.$t('分钟')}${sec}${this.$t('秒')}`; } if (3600 <= row.required_time) { const time = row.required_time / 3600; const hour = time.toString().split('.')[0]; - const min = parseInt(time.toString().split('.')[1][0]) * 6; + const min = parseInt(time.toString().split('.')[1][0], 10) * 6; return `${hour}${this.$t('小时')}${min}${this.$t('分钟')}`; } }, From 2ace8818008f9d1abac7d7bbbfc99e6bd8effec7 Mon Sep 17 00:00:00 2001 From: v_yutyi Date: Fri, 10 Dec 2021 16:18:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E5=8D=87=E7=BA=A7@babel/core?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/package.json b/src/pages/package.json index 52345e8dd..6dc5dd0a1 100644 --- a/src/pages/package.json +++ b/src/pages/package.json @@ -67,7 +67,7 @@ "vuex": "3.1.1" }, "devDependencies": { - "@babel/core": "7.9.6", + "@babel/core": "7.11.0", "@babel/eslint-parser": "~7.14.7", "@babel/node": "7.8.7", "@babel/plugin-proposal-decorators": "7.4.4", From 57682b5ba2bfed09fa16931adc915236d5d74b81 Mon Sep 17 00:00:00 2001 From: Blues Yu Date: Tue, 21 Dec 2021 11:22:52 +0800 Subject: [PATCH 3/4] fix: unlock eslint version --- src/pages/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/package.json b/src/pages/package.json index 6dc5dd0a1..ab6d44921 100644 --- a/src/pages/package.json +++ b/src/pages/package.json @@ -101,7 +101,7 @@ "cors": "2.8.5", "cross-env": "5.2.0", "css-loader": "2.1.1", - "eslint": "5.16.0", + "eslint": "^5.16.0", "eslint-config-standard": "12.0.0", "eslint-friendly-formatter": "4.0.1", "eslint-loader": "2.1.2", From 4de80fa093bdb00e514affdcb16ef49bd2120a07 Mon Sep 17 00:00:00 2001 From: Blues Yu Date: Tue, 21 Dec 2021 11:28:12 +0800 Subject: [PATCH 4/4] fix: unlock eslint version --- src/pages/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/package.json b/src/pages/package.json index ab6d44921..02208eb53 100644 --- a/src/pages/package.json +++ b/src/pages/package.json @@ -101,7 +101,7 @@ "cors": "2.8.5", "cross-env": "5.2.0", "css-loader": "2.1.1", - "eslint": "^5.16.0", + "eslint": "^7.5.0", "eslint-config-standard": "12.0.0", "eslint-friendly-formatter": "4.0.1", "eslint-loader": "2.1.2",