From ca18abe26e5d898971bd4df9aa015c2c2034c3ca Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 25 Jul 2024 13:44:38 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E9=87=8D=E9=98=85=E8=B7=9F=E8=B8=AA--?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=BB=93=E6=9E=9C=E6=96=B0=E5=A2=9E=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials/trials-panel/reading/reReading-tracking/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue index 88c96737..329edfb2 100644 --- a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue @@ -313,8 +313,9 @@ {{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }} - {{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }} - {{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }} + {{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }} + {{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }} + {{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }} From de638b14361f1c34f582eac58b7c45cb6f128055 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 25 Jul 2024 14:08:50 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=90=8C=E6=84=8F=E9=87=8D=E9=98=85?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reading/reReading-tracking/index.vue | 98 ++++++++++--------- 1 file changed, 53 insertions(+), 45 deletions(-) diff --git a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue index 329edfb2..74165789 100644 --- a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue @@ -785,7 +785,7 @@ export default { this.signVisible = false } }, - confirmReReading(row, type, open, signInfo) { + async confirmReReading(row, type, open, signInfo) { if (open) { this.rowData = { ...row } this.ConfirmReReadingVisible = true @@ -795,41 +795,41 @@ export default { return } if (type === 2) { - this.$refs.reasonForm.validate((valid) => { - if (!valid) return - var params = { - data: { - ConfirmReReadingList: [ - { - Id: row.Id, - OriginalReReadingTaskId: row.OriginalReReadingTaskId, - RootReReadingTaskId: row.RootReReadingTaskId, - NewReReadingTaskId: row.NewReReadingTaskId - } - ], - RequestReReadingRejectReason: this.ConfirmReReadingForm.RequestReReadingRejectReason, - TrialId: this.$route.query.trialId, - RequestReReadingResultEnum: type - }, - signInfo: signInfo - } - this.loading = true - this.btnLoading = true - confirmReReading(params).then(() => { - this.loading = false - this.btnLoading = false - // 同意申请成功/拒绝申请成功 - this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`) - this.$refs['signForm'].btnLoading = false - this.signVisible = false - this.getList() - this.ConfirmReReadingVisible = false - }).catch(() => { - this.loading = false - this.$refs['signForm'].btnLoading = false - this.btnLoading = false - }) - }) + let valid = await this.$refs.reasonForm.validate() + if (!valid) return + var params = { + data: { + ConfirmReReadingList: [ + { + Id: row.Id, + OriginalReReadingTaskId: row.OriginalReReadingTaskId, + RootReReadingTaskId: row.RootReReadingTaskId, + NewReReadingTaskId: row.NewReReadingTaskId + } + ], + RequestReReadingRejectReason: this.ConfirmReReadingForm.RequestReReadingRejectReason, + TrialId: this.$route.query.trialId, + RequestReReadingResultEnum: type + }, + signInfo: signInfo + } + this.loading = true + this.btnLoading = true + try { + await confirmReReading(params) + this.loading = false + this.btnLoading = false + // 同意申请成功/拒绝申请成功 + this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`) + this.$refs['signForm'].btnLoading = false + this.signVisible = false + this.getList() + this.ConfirmReReadingVisible = false + } catch (e) { + this.loading = false + this.$refs['signForm'].btnLoading = false + this.btnLoading = false + } return } var params = { @@ -849,21 +849,29 @@ export default { } this.loading = true this.btnLoading = true - confirmReReading(params).then(() => { + try { + let res = await confirmReReading(params) this.loading = false this.btnLoading = false - // this.$message.success(`${type === 1 ? '同意' : '拒绝'}申请成功`) - // 同意申请成功/拒绝申请成功 - this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`) - this.ReReadingOrBackVisible = false this.$refs['signForm'].btnLoading = false - this.signVisible = false - this.getList() - }).catch(() => { + if (res.ErrorMessage) { + let alert = await this.$alert(res.ErrorMessage) + if (alert !== "confirm") return + this.ReReadingOrBackVisible = false + this.signVisible = false + this.getList() + } else { + // 同意申请成功/拒绝申请成功 + this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`) + + this.signVisible = false + this.getList() + } + } catch (e) { this.loading = false this.$refs['signForm'].btnLoading = false this.btnLoading = false - }) + } }, assignSubjectTaskToDoctor(row, type) { this.rowData = { ...row } From fd70c3ee2c41d011a303f6c60083da98119480e5 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 25 Jul 2024 14:19:56 +0800 Subject: [PATCH 03/12] 1 --- .../trials/trials-panel/reading/reReading-tracking/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue index 74165789..17a67283 100644 --- a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue @@ -863,7 +863,7 @@ export default { } else { // 同意申请成功/拒绝申请成功 this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`) - + this.ReReadingOrBackVisible = false this.signVisible = false this.getList() } From 057d23d34b01fc34dd6cf01592e97a65a3f79d16 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Fri, 26 Jul 2024 10:39:49 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=8C=85=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 407 +++++++++++++++++++++++++--------------------- package.json | 10 +- 2 files changed, 232 insertions(+), 185 deletions(-) diff --git a/package-lock.json b/package-lock.json index 285d43f9..9da78b88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "EICS", - "version": "1.0.0", + "version": "1.3.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -19,7 +19,6 @@ "version": "2.2.1", "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.1.tgz", "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", - "dev": true, "requires": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -29,7 +28,6 @@ "version": "7.23.5", "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.23.5.tgz", "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", - "dev": true, "requires": { "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" @@ -38,14 +36,12 @@ "@babel/compat-data": { "version": "7.23.5", "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.23.5.tgz", - "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==", - "dev": true + "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==" }, "@babel/core": { "version": "7.23.6", "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.23.6.tgz", "integrity": "sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==", - "dev": true, "requires": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.23.5", @@ -67,14 +63,34 @@ "json5": { "version": "2.2.3", "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" }, "semver": { "version": "6.3.1", "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" + } + } + }, + "@babel/eslint-parser": { + "version": "7.24.8", + "resolved": "https://registry.npmmirror.com/@babel/eslint-parser/-/eslint-parser-7.24.8.tgz", + "integrity": "sha512-nYAikI4XTGokU2QX7Jx+v4rxZKhKivaQaREZjuW3mrJrbdWJ5yUfohnoUULge+zEEaKjPYNxhoRgUKktjXtbwA==", + "requires": { + "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1", + "eslint-visitor-keys": "^2.1.0", + "semver": "^6.3.1" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==" + }, + "semver": { + "version": "6.3.1", + "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" } } }, @@ -82,7 +98,6 @@ "version": "7.23.6", "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.23.6.tgz", "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", - "dev": true, "requires": { "@babel/types": "^7.23.6", "@jridgewell/gen-mapping": "^0.3.2", @@ -112,7 +127,6 @@ "version": "7.23.6", "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", - "dev": true, "requires": { "@babel/compat-data": "^7.23.5", "@babel/helper-validator-option": "^7.23.5", @@ -125,7 +139,6 @@ "version": "5.1.1", "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz", "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, "requires": { "yallist": "^3.0.2" } @@ -133,14 +146,12 @@ "semver": { "version": "6.3.1", "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "yallist": { "version": "3.1.1", "resolved": "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" } } }, @@ -204,14 +215,12 @@ "@babel/helper-environment-visitor": { "version": "7.22.20", "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", - "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", - "dev": true + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==" }, "@babel/helper-function-name": { "version": "7.23.0", "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", - "dev": true, "requires": { "@babel/template": "^7.22.15", "@babel/types": "^7.23.0" @@ -221,7 +230,6 @@ "version": "7.22.5", "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", - "dev": true, "requires": { "@babel/types": "^7.22.5" } @@ -239,7 +247,6 @@ "version": "7.22.15", "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", - "dev": true, "requires": { "@babel/types": "^7.22.15" } @@ -248,7 +255,6 @@ "version": "7.23.3", "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", - "dev": true, "requires": { "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-module-imports": "^7.22.15", @@ -298,7 +304,6 @@ "version": "7.22.5", "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", - "dev": true, "requires": { "@babel/types": "^7.22.5" } @@ -316,7 +321,6 @@ "version": "7.22.6", "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", - "dev": true, "requires": { "@babel/types": "^7.22.5" } @@ -324,20 +328,17 @@ "@babel/helper-string-parser": { "version": "7.23.4", "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", - "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", - "dev": true + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==" }, "@babel/helper-validator-identifier": { "version": "7.22.20", "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", - "dev": true + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==" }, "@babel/helper-validator-option": { "version": "7.23.5", "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", - "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", - "dev": true + "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==" }, "@babel/helper-wrap-function": { "version": "7.22.20", @@ -354,7 +355,6 @@ "version": "7.23.6", "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.23.6.tgz", "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==", - "dev": true, "requires": { "@babel/template": "^7.22.15", "@babel/traverse": "^7.23.6", @@ -365,7 +365,6 @@ "version": "7.23.4", "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.23.4.tgz", "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", - "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", @@ -375,8 +374,7 @@ "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" } } }, @@ -1326,7 +1324,6 @@ "version": "7.22.15", "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.22.15.tgz", "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", - "dev": true, "requires": { "@babel/code-frame": "^7.22.13", "@babel/parser": "^7.22.15", @@ -1337,7 +1334,6 @@ "version": "7.23.6", "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.23.6.tgz", "integrity": "sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==", - "dev": true, "requires": { "@babel/code-frame": "^7.23.5", "@babel/generator": "^7.23.6", @@ -1354,8 +1350,7 @@ "globals": { "version": "11.12.0", "resolved": "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" } } }, @@ -1363,7 +1358,6 @@ "version": "7.23.6", "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.23.6.tgz", "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==", - "dev": true, "requires": { "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", @@ -1373,8 +1367,7 @@ "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==" } } }, @@ -1581,11 +1574,15 @@ } } }, + "@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmmirror.com/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==" + }, "@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dev": true, "requires": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -1595,31 +1592,61 @@ "@jridgewell/resolve-uri": { "version": "3.1.1", "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", - "dev": true + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==" }, "@jridgewell/set-array": { "version": "1.1.2", "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==" }, "@jridgewell/sourcemap-codec": { "version": "1.4.15", "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" }, "@jridgewell/trace-mapping": { "version": "0.3.20", "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", - "dev": true, "requires": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "@jsdevtools/coverage-istanbul-loader": { + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz", + "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==", + "requires": { + "convert-source-map": "^1.7.0", + "istanbul-lib-instrument": "^4.0.3", + "loader-utils": "^2.0.0", + "merge-source-map": "^1.1.0", + "schema-utils": "^2.7.0" + }, + "dependencies": { + "convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" + }, + "json5": { + "version": "2.2.3", + "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" + }, + "loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + } + } + }, "@kitware/vtk.js": { "version": "27.3.1", "resolved": "https://registry.npmmirror.com/@kitware/vtk.js/-/vtk.js-27.3.1.tgz", @@ -1718,6 +1745,25 @@ "glob-to-regexp": "^0.3.0" } }, + "@nicolo-ribaudo/eslint-scope-5-internals": { + "version": "5.1.1-v1", + "resolved": "https://registry.npmmirror.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", + "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==", + "requires": { + "eslint-scope": "5.1.1" + }, + "dependencies": { + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + } + } + } + }, "@node-ipc/js-queue": { "version": "2.0.3", "resolved": "https://registry.npmmirror.com/@node-ipc/js-queue/-/js-queue-2.0.3.tgz", @@ -3084,7 +3130,6 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0", "nan": "^2.12.1" } }, @@ -4332,6 +4377,26 @@ "zip-stream": "^4.1.0" }, "dependencies": { + "compress-commons": { + "version": "4.1.2", + "resolved": "https://registry.npmmirror.com/compress-commons/-/compress-commons-4.1.2.tgz", + "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==", + "requires": { + "buffer-crc32": "^0.2.13", + "crc32-stream": "^4.0.2", + "normalize-path": "^3.0.0", + "readable-stream": "^3.6.0" + } + }, + "crc32-stream": { + "version": "4.0.3", + "resolved": "https://registry.npmmirror.com/crc32-stream/-/crc32-stream-4.0.3.tgz", + "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==", + "requires": { + "crc-32": "^1.2.0", + "readable-stream": "^3.4.0" + } + }, "readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz", @@ -4341,6 +4406,35 @@ "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } + }, + "zip-stream": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/zip-stream/-/zip-stream-4.1.1.tgz", + "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==", + "requires": { + "archiver-utils": "^3.0.4", + "compress-commons": "^4.1.2", + "readable-stream": "^3.6.0" + }, + "dependencies": { + "archiver-utils": { + "version": "3.0.4", + "resolved": "https://registry.npmmirror.com/archiver-utils/-/archiver-utils-3.0.4.tgz", + "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==", + "requires": { + "glob": "^7.2.3", + "graceful-fs": "^4.2.0", + "lazystream": "^1.0.0", + "lodash.defaults": "^4.2.0", + "lodash.difference": "^4.5.0", + "lodash.flatten": "^4.4.0", + "lodash.isplainobject": "^4.0.6", + "lodash.union": "^4.6.0", + "normalize-path": "^3.0.0", + "readable-stream": "^3.6.0" + } + } + } } } }, @@ -5086,16 +5180,6 @@ "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" }, - "bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "dev": true, - "optional": true, - "requires": { - "file-uri-to-path": "1.0.0" - } - }, "bl": { "version": "4.1.0", "resolved": "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz", @@ -5379,7 +5463,6 @@ "version": "4.22.2", "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.22.2.tgz", "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==", - "dev": true, "requires": { "caniuse-lite": "^1.0.30001565", "electron-to-chromium": "^1.4.601", @@ -5659,8 +5742,7 @@ "caniuse-lite": { "version": "1.0.30001568", "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001568.tgz", - "integrity": "sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A==", - "dev": true + "integrity": "sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A==" }, "case-sensitive-paths-webpack-plugin": { "version": "2.4.0", @@ -6252,29 +6334,6 @@ "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==", "dev": true }, - "compress-commons": { - "version": "4.1.2", - "resolved": "https://registry.npmmirror.com/compress-commons/-/compress-commons-4.1.2.tgz", - "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==", - "requires": { - "buffer-crc32": "^0.2.13", - "crc32-stream": "^4.0.2", - "normalize-path": "^3.0.0", - "readable-stream": "^3.6.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "compressible": { "version": "2.0.18", "resolved": "https://registry.npmmirror.com/compressible/-/compressible-2.0.18.tgz", @@ -6444,8 +6503,7 @@ "convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" }, "cookie": { "version": "0.5.0", @@ -6555,12 +6613,32 @@ } }, "cornerstone-wado-image-loader": { - "version": "3.3.2", - "resolved": "https://registry.npmmirror.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-3.3.2.tgz", - "integrity": "sha512-Yy0DtfSMlflMS5RMQhX9YnXiYYkZz99nnXG2qtBRvzvSdwqiElIpE13sKw0Ohi4mqNwrWRx0xt8utk0HKnAXyw==", + "version": "4.13.2", + "resolved": "https://registry.npmmirror.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-4.13.2.tgz", + "integrity": "sha512-NGqH44bY1VMY8OYuVykkLriNtZQrmoZU/S6f/1t1xX3rMc+WUMNN+yi4Nu3jp6nckLdH/bVGiigoJXrp0dTrAg==", "requires": { - "dicom-parser": "^1.8.3", - "pako": "^1.0.10" + "@babel/eslint-parser": "^7.19.1", + "@cornerstonejs/codec-charls": "^1.2.3", + "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", + "@cornerstonejs/codec-openjpeg": "^1.2.2", + "@cornerstonejs/codec-openjph": "^2.4.2", + "coverage-istanbul-loader": "^3.0.5", + "date-format": "^4.0.14", + "dicom-parser": "^1.8.9", + "pako": "^2.0.4", + "uuid": "^9.0.0" + }, + "dependencies": { + "pako": { + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/pako/-/pako-2.1.0.tgz", + "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==" + }, + "uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmmirror.com/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==" + } } }, "cosmiconfig": { @@ -6587,32 +6665,19 @@ } } }, + "coverage-istanbul-loader": { + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz", + "integrity": "sha512-xsw2phF0VNqUPk47V/vHXkdcTyl0tkMSmaZfLrTOhoPhPMXFelNju7utl5s7I93KXzipqDEK0YwofQSSflPz8A==", + "requires": { + "@jsdevtools/coverage-istanbul-loader": "3.0.5" + } + }, "crc-32": { "version": "1.2.2", "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz", "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==" }, - "crc32-stream": { - "version": "4.0.3", - "resolved": "https://registry.npmmirror.com/crc32-stream/-/crc32-stream-4.0.3.tgz", - "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==", - "requires": { - "crc-32": "^1.2.0", - "readable-stream": "^3.4.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "create-ecdh": { "version": "4.0.4", "resolved": "https://registry.npmmirror.com/create-ecdh/-/create-ecdh-4.0.4.tgz", @@ -7101,6 +7166,11 @@ "resolved": "https://registry.npmmirror.com/date-fns/-/date-fns-1.30.1.tgz", "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==" }, + "date-format": { + "version": "4.0.14", + "resolved": "https://registry.npmmirror.com/date-format/-/date-format-4.0.14.tgz", + "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==" + }, "dateformat": { "version": "2.2.0", "resolved": "https://registry.npmmirror.com/dateformat/-/dateformat-2.2.0.tgz", @@ -7613,8 +7683,7 @@ "electron-to-chromium": { "version": "1.4.611", "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.611.tgz", - "integrity": "sha512-ZtRpDxrjHapOwxtv+nuth5ByB8clyn8crVynmRNGO3wG3LOp8RTcyZDqwaI6Ng6y8FCK2hVZmJoqwCskKbNMaw==", - "dev": true + "integrity": "sha512-ZtRpDxrjHapOwxtv+nuth5ByB8clyn8crVynmRNGO3wG3LOp8RTcyZDqwaI6Ng6y8FCK2hVZmJoqwCskKbNMaw==" }, "elegant-spinner": { "version": "1.0.1", @@ -7821,8 +7890,7 @@ "escalade": { "version": "3.1.1", "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, "escape-html": { "version": "1.0.3", @@ -8085,7 +8153,6 @@ "version": "4.3.0", "resolved": "https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, "requires": { "estraverse": "^5.2.0" }, @@ -8093,16 +8160,14 @@ "estraverse": { "version": "5.3.0", "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" } } }, "estraverse": { "version": "4.3.0", "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" }, "esutils": { "version": "2.0.3", @@ -8542,13 +8607,6 @@ "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz", "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" }, - "file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "dev": true, - "optional": true - }, "filesize": { "version": "3.6.1", "resolved": "https://registry.npmmirror.com/filesize/-/filesize-3.6.1.tgz", @@ -8878,8 +8936,7 @@ "gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmmirror.com/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" }, "get-caller-file": { "version": "2.0.5", @@ -10467,6 +10524,29 @@ "resolved": "https://registry.npmmirror.com/isstream/-/isstream-0.1.2.tgz", "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==" }, + "istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmmirror.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==" + }, + "istanbul-lib-instrument": { + "version": "4.0.3", + "resolved": "https://registry.npmmirror.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", + "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "requires": { + "@babel/core": "^7.7.5", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.1", + "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" + } + } + }, "javascript-stringify": { "version": "2.1.0", "resolved": "https://registry.npmmirror.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz", @@ -10518,8 +10598,7 @@ "jsesc": { "version": "2.5.2", "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" }, "json-parse-better-errors": { "version": "1.0.2", @@ -11197,7 +11276,6 @@ "version": "1.1.0", "resolved": "https://registry.npmmirror.com/merge-source-map/-/merge-source-map-1.1.0.tgz", "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", - "dev": true, "requires": { "source-map": "^0.6.1" }, @@ -11205,8 +11283,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, @@ -11922,8 +11999,7 @@ "node-releases": { "version": "2.0.14", "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", - "dev": true + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==" }, "node-sass": { "version": "4.14.1", @@ -14223,6 +14299,11 @@ "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==", "dev": true }, + "qrcodejs2": { + "version": "0.0.2", + "resolved": "https://registry.npmmirror.com/qrcodejs2/-/qrcodejs2-0.0.2.tgz", + "integrity": "sha512-+Y4HA+cb6qUzdgvI3KML8GYpMFwB24dFwzMkS/yXq6hwtUGNUnZQdUnksrV1XGMc2mid5ROw5SAuY9XhI3ValA==" + }, "qs": { "version": "6.11.2", "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.2.tgz", @@ -15841,6 +15922,11 @@ "resolved": "https://registry.npmmirror.com/stream-wormhole/-/stream-wormhole-1.1.0.tgz", "integrity": "sha512-gHFfL3px0Kctd6Po0M8TzEvt3De/xu6cnRrjlfYNhwbhLPLwigI2t1nc6jrzNuaYg5C4YF78PPFuQPzRiqn9ew==" }, + "streamsaver": { + "version": "2.0.6", + "resolved": "https://registry.npmmirror.com/streamsaver/-/streamsaver-2.0.6.tgz", + "integrity": "sha512-LK4e7TfCV8HzuM0PKXuVUfKyCB1FtT9L0EGxsFk5Up8njj0bXK8pJM9+Wq2Nya7/jslmCQwRK39LFm55h7NBTw==" + }, "strict-uri-encode": { "version": "1.1.0", "resolved": "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", @@ -17160,7 +17246,6 @@ "version": "1.0.13", "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", - "dev": true, "requires": { "escalade": "^3.1.1", "picocolors": "^1.0.0" @@ -17767,7 +17852,6 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0", "nan": "^2.12.1" } }, @@ -18898,45 +18982,6 @@ } } }, - "zip-stream": { - "version": "4.1.1", - "resolved": "https://registry.npmmirror.com/zip-stream/-/zip-stream-4.1.1.tgz", - "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==", - "requires": { - "archiver-utils": "^3.0.4", - "compress-commons": "^4.1.2", - "readable-stream": "^3.6.0" - }, - "dependencies": { - "archiver-utils": { - "version": "3.0.4", - "resolved": "https://registry.npmmirror.com/archiver-utils/-/archiver-utils-3.0.4.tgz", - "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==", - "requires": { - "glob": "^7.2.3", - "graceful-fs": "^4.2.0", - "lazystream": "^1.0.0", - "lodash.defaults": "^4.2.0", - "lodash.difference": "^4.5.0", - "lodash.flatten": "^4.4.0", - "lodash.isplainobject": "^4.0.6", - "lodash.union": "^4.6.0", - "normalize-path": "^3.0.0", - "readable-stream": "^3.6.0" - } - }, - "readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "zrender": { "version": "4.3.2", "resolved": "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz", diff --git a/package.json b/package.json index f3578eb6..1887aa91 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,10 @@ "babel-eslint": "7.2.3", "copy-webpack-plugin": "^4.5.2", "core-js": "^3.8.3", - "cornerstone-core": "^2.3.0", - "cornerstone-math": "^0.1.8", - "cornerstone-tools": "^6.0.8", - "cornerstone-wado-image-loader": "^3.1.2", + "cornerstone-core": "^2.6.1", + "cornerstone-math": "^0.1.10", + "cornerstone-tools": "^6.0.10", + "cornerstone-wado-image-loader": "^4.13.2", "dcmjs": "^0.29.8", "dicom-parser": "^1.8.9", "dicomedit": "^0.1.0", @@ -51,9 +51,11 @@ "path-to-regexp": "2.4.0", "pdfobject": "^2.2.8", "popper.js": "^1.16.1", + "qrcodejs2": "0.0.2", "sass-loader": "^8.0.0", "screenfull": "^4.2.0", "sortablejs": "^1.15.0", + "streamsaver": "^2.0.6", "v-viewer": "^1.6.4", "vcrontab": "^0.3.5", "vue": "^2.6.11", From 16581bd7b940ea69737a97b21a1ee52f645c2bc7 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Fri, 26 Jul 2024 11:41:30 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dicom-show/dicom-study.vue | 2 +- src/views/dicom-show/dicom-visit.vue | 2 +- .../trials/trials-panel/reading/dicoms/components/StudyList.vue | 2 +- .../reading/dicoms/customize/CustomizeDicomViewer.vue | 2 +- .../reading/dicoms/customize/CustomizeStudyList.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue index b51e5315..bb3d87de 100644 --- a/src/views/dicom-show/dicom-study.vue +++ b/src/views/dicom-show/dicom-study.vue @@ -155,7 +155,7 @@ import store from '@/store' import { changeURLStatic } from '@/utils/history.js' cornerstoneWADOImageLoader.external.dicomParser = dicomParser cornerstoneWADOImageLoader.external.cornerstone = cornerstone -const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB +const maximumSizeInBytes = 1024 * 1024 * 1024 * 3// 3 GB export default { components: { 'dicom-viewer': dicomViewer diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue index d0a59869..ebf8a3c4 100644 --- a/src/views/dicom-show/dicom-visit.vue +++ b/src/views/dicom-show/dicom-visit.vue @@ -274,7 +274,7 @@ import store from '@/store' import { changeURLStatic } from '@/utils/history.js' cornerstoneWADOImageLoader.external.dicomParser = dicomParser cornerstoneWADOImageLoader.external.cornerstone = cornerstone -const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB +const maximumSizeInBytes = 1024 * 1024 * 1024 * 6 export default { name: 'DicomsOfVisit', components: { diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue index 0a7c181c..6de06315 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue @@ -168,7 +168,7 @@ import store from '@/store' import SrList from './SrList' cornerstoneWADOImageLoader.external.dicomParser = dicomParser cornerstoneWADOImageLoader.external.cornerstone = cornerstone -const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB +const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes) export default { name: 'StudyList', diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue index 3b6793d7..2a3b6bac 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue @@ -914,7 +914,7 @@ export default { this.getWwcTpl() // cornerstone.imageCache.setMaximumSizeBytes(0) - const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB + const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 // const maximumSizeInBytes = 1024 * 1024 * 500 cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes) this.customWwc = { diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue index 1b5a35c2..fb16fef1 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue @@ -167,7 +167,7 @@ import store from '@/store' import SrList from './../components/SrList' cornerstoneWADOImageLoader.external.dicomParser = dicomParser cornerstoneWADOImageLoader.external.cornerstone = cornerstone -const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB +const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes) export default { name: 'StudyList', From 8b6714806e72828b43a0f88f6a10b3715d61eed2 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Fri, 26 Jul 2024 13:21:12 +0800 Subject: [PATCH 06/12] =?UTF-8?q?dicom=E9=A2=84=E8=A7=88=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dicom/DicomCanvas.vue | 4 +++- src/views/dicom-show/dicom-study.vue | 2 +- .../trials-panel/reading/dicoms/components/StudyList.vue | 2 +- .../reading/dicoms/customize/CustomizeDicomViewer.vue | 4 ++-- .../reading/dicoms/customize/CustomizeStudyList.vue | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/Dicom/DicomCanvas.vue b/src/components/Dicom/DicomCanvas.vue index 752aea7f..4d989911 100644 --- a/src/components/Dicom/DicomCanvas.vue +++ b/src/components/Dicom/DicomCanvas.vue @@ -212,8 +212,10 @@ export default { this.toolState.clipPlaying = false const element = this.$refs.canvas cornerstone.enable(element) + cornerstoneTools.stopClip(this.canvas) + this.toolState.clipPlaying = false this.loading = true - + cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex]) .then(image => { this.loading = false diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue index bb3d87de..7507f1ee 100644 --- a/src/views/dicom-show/dicom-study.vue +++ b/src/views/dicom-show/dicom-study.vue @@ -155,7 +155,7 @@ import store from '@/store' import { changeURLStatic } from '@/utils/history.js' cornerstoneWADOImageLoader.external.dicomParser = dicomParser cornerstoneWADOImageLoader.external.cornerstone = cornerstone -const maximumSizeInBytes = 1024 * 1024 * 1024 * 3// 3 GB +const maximumSizeInBytes = 1024 * 1024 * 1024 * 6 export default { components: { 'dicom-viewer': dicomViewer diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue index 6de06315..ccf002e7 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue @@ -168,7 +168,7 @@ import store from '@/store' import SrList from './SrList' cornerstoneWADOImageLoader.external.dicomParser = dicomParser cornerstoneWADOImageLoader.external.cornerstone = cornerstone -const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 +const maximumSizeInBytes = 1024 * 1024 * 1024 * 6 cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes) export default { name: 'StudyList', diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue index 2a3b6bac..ceca644e 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue @@ -914,9 +914,9 @@ export default { this.getWwcTpl() // cornerstone.imageCache.setMaximumSizeBytes(0) - const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 + // const maximumSizeInBytes = 1024 * 1024 * 1024 * 6 // const maximumSizeInBytes = 1024 * 1024 * 500 - cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes) + // cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes) this.customWwc = { visible: false, title: this.$t('trials:reading:dagTitle:wwwcCustom') diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue index fb16fef1..7872beb4 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue @@ -167,7 +167,7 @@ import store from '@/store' import SrList from './../components/SrList' cornerstoneWADOImageLoader.external.dicomParser = dicomParser cornerstoneWADOImageLoader.external.cornerstone = cornerstone -const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 +const maximumSizeInBytes = 1024 * 1024 * 1024 * 6 cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes) export default { name: 'StudyList', From e1b6bec85b3937523a5390f584f14fa960556d02 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Fri, 26 Jul 2024 14:42:51 +0800 Subject: [PATCH 07/12] =?UTF-8?q?dicom=E9=A2=84=E8=A7=88=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dicom-show/dicom-study.vue | 3 ++- src/views/dicom-show/dicom-visit.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue index 7507f1ee..68c31dbc 100644 --- a/src/views/dicom-show/dicom-study.vue +++ b/src/views/dicom-show/dicom-study.vue @@ -156,6 +156,7 @@ import { changeURLStatic } from '@/utils/history.js' cornerstoneWADOImageLoader.external.dicomParser = dicomParser cornerstoneWADOImageLoader.external.cornerstone = cornerstone const maximumSizeInBytes = 1024 * 1024 * 1024 * 6 +cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes) export default { components: { 'dicom-viewer': dicomViewer @@ -658,7 +659,7 @@ export default { const seriesIndex = params.seriesIndex var prefetchInstanceCount = this.seriesList[seriesIndex].prefetchInstanceCount var instanceCount = this.seriesList[seriesIndex].instanceCount - if (this.seriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) { + if (this.seriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0 && this.seriesList[seriesIndex].imageloadedArr.length < this.seriesList[seriesIndex].instanceCount) { const i = this.currentLoadIns.findIndex(i => i.imageId === imageId) if (i > -1) { prefetchInstanceCount = prefetchInstanceCount - this.currentLoadIns[i].percentComplete + percentComplete diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue index ebf8a3c4..05b0a943 100644 --- a/src/views/dicom-show/dicom-visit.vue +++ b/src/views/dicom-show/dicom-visit.vue @@ -275,6 +275,7 @@ import { changeURLStatic } from '@/utils/history.js' cornerstoneWADOImageLoader.external.dicomParser = dicomParser cornerstoneWADOImageLoader.external.cornerstone = cornerstone const maximumSizeInBytes = 1024 * 1024 * 1024 * 6 +cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes) export default { name: 'DicomsOfVisit', components: { @@ -690,7 +691,7 @@ export default { const seriesIndex = params.idx.split('|')[1] var prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount var instanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount - if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) { + if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0 && this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.length < this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount) { const i = this.currentLoadIns.findIndex(i => i.imageId === imageId) if (i > -1) { prefetchInstanceCount = prefetchInstanceCount - this.currentLoadIns[i].percentComplete + percentComplete From 22193bb2912fcff789a26b9bb56427e0f8827a39 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Mon, 29 Jul 2024 17:17:22 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=83=A8=E4=BD=8D?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E9=99=90=E5=88=B6=E6=8F=90=E5=8D=87=E8=87=B3?= =?UTF-8?q?500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/trial-config/components/logicalConfig.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue index f91029ec..f19ed21c 100644 --- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue +++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue @@ -691,7 +691,7 @@ {{ errMessage }} From e16a02eaff5285e025ca6a915cd9d97b7b4d2bba Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Mon, 29 Jul 2024 17:35:12 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=83=A8=E4=BD=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=96=87=E6=9C=AC=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/trial-config/components/logicalConfig.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue index f19ed21c..85e36f25 100644 --- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue +++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue @@ -691,7 +691,8 @@ {{ errMessage }} From 84a8f6ec758306e24b046846b647ee713d61f96f Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Tue, 30 Jul 2024 09:32:00 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=99=90=E5=88=B6?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=9B=BD=E9=99=85=E5=8C=96=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main.js b/src/main.js index 65322394..a9e2f218 100644 --- a/src/main.js +++ b/src/main.js @@ -130,7 +130,8 @@ Vue.prototype.$validatePassword = (rule, value, callback) => { /* eslint-disable */ var reg1 = eval(process.env.VUE_APP_PASSWORD_FOR_PERMISSION) ? new RegExp(`${process.env.VUE_APP_PASSWORD_FOR_REGULAR}`) : /.*/g; //密码必须是8位以上、必须含有字母、数字、特殊符号 if (!reg1.test(value)) { - callback(lang === 'zh' ? new Error("密码必须包含：1）8 – 32 个字符；2）至少1个数字；3) 至少1个大写字母；4）至少1个小写字母；5）至少1个特殊字符 (~!-@#$%^&*_+?)") : new Error('Passwords must have: 1) 8 - 32 characters; 2) At least 1 number; 3) At least 1 uppercase letter; 4) At least 1 lowercase letter; 5) At least 1 special character (~!-@#$%^&*_+?) ')) + callback( + new Error(_vm.$t('env:regExp:formatPassword'))) } else { callback(); } @@ -306,7 +307,7 @@ async function VueInit() { if (_vm.$store.state.user.userId !== zzSessionStorage.getItem('userId')) { window.location.href = `/login` zzSessionStorage.removeItem('lastWorkbench') - _vm.$alert(lang === 'en' ? 'The same browser only allows one user account to be logged in at a time.' : '同一浏览器只允许同时登陆一个账户', { + _vm.$alert(_vm.$t("env:sso:tip"), { type: 'warning', }) } @@ -367,7 +368,7 @@ async function VueInit() { } _vm.$store.dispatch('user/logout').then(res => { // window.location.href = `/login` - if(_vm.$msgbox){ + if (_vm.$msgbox) { _vm.$msgbox.close(); } isOpen = false @@ -375,7 +376,10 @@ async function VueInit() { zzSessionStorage.removeItem('isLock') router.push("/login") }).then(() => { - _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登陆！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', { + // _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登陆！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', { + // type: 'warning', + // }) + _vm.$alert(_vm.$t("env:loginOut"), { type: 'warning', }) }) @@ -399,17 +403,17 @@ async function VueInit() { isOpen = true zzSessionStorage.setItem('isLock', 'true') _vm.$msgbox({ - title: lang === 'zh' ? '已锁定' : 'Locked', - confirmButtonText: lang === 'zh' ? '解锁' : 'Unlock', + title: _vm.$t("env:lock:msgBox:title"), + confirmButtonText: _vm.$t("env:lock:msgBox:confirmButtonText"), showClose: false, beforeClose: (action, instance, done) => { if (action === 'confirm') { if (!_vm.unlock.my_username) { - _vm.$alert(lang === 'zh' ? '请输入您的用户名解锁' : 'Please enter your user name to unlock.') + _vm.$alert(_vm.$t("env:lock:msgBox:iupUser")) return } if (!_vm.unlock.my_password) { - _vm.$alert(lang === 'zh' ? '请输入您的密码解锁' : 'Please enter the correct password to unlock.') + _vm.$alert(_vm.$t("env:lock:msgBox:inpPassword")) return } var my_username = zzSessionStorage.getItem('my_username') @@ -420,7 +424,7 @@ async function VueInit() { resetReadingRestTime().then(() => { }) const closeLock = (_vm) => { - _vm.$message.success(lang === 'zh' ? '解锁成功，请继续操作' : 'Unlocked successfully. Please continue operation.') + _vm.$message.success(_vm.$t("env:lock:msgBox:lockSuccess")) _vm.unlock = { my_username: null, my_password: null @@ -455,7 +459,7 @@ async function VueInit() { } else { // console.log(111) - _vm.$message.error(lang === 'zh' ? '请输入正确用户名密码' : 'Please enter the correct password.') + _vm.$message.error(_vm.$t('env:lock:msgBox:userFail')) } } }, @@ -464,7 +468,7 @@ async function VueInit() { props: { labelWidth: "80px" } }, [ h('el-form-item', { - props: { label: lang === 'zh' ? '用户名' : 'Username' }, + props: { label: _vm.$t("env:lock:msgBox:form:username") }, }, [ h('input', { props: { @@ -486,7 +490,7 @@ async function VueInit() { }) ]), h('el-form-item', { - props: { label: lang === 'zh' ? '密码' : 'Password' }, + props: { label: _vm.$t("env:lock:msgBox:form:Password") }, }, [ h('input', { props: { From be14515286243213b1b50d11a10c8bd16bdc4a68 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Tue, 30 Jul 2024 09:32:22 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7v1.5.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 4d8142b0..59697a13 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -183,7 +183,7 @@ {{ $t("login:title:system_title") }}

{{ $t("login:title:system") }}

-

V1.5.3.001

+

V1.5.4.001

Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司 版权所有 From b43202076cf8759ebbe5ab575a3baf31aa4167cf Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Tue, 30 Jul 2024 13:32:17 +0800 Subject: [PATCH 12/12] =?UTF-8?q?ip=E6=89=80=E5=9C=A8=E5=9C=B0=E6=9A=82?= =?UTF-8?q?=E6=97=B6=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials/trials-panel/trial-summary/login-log/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-panel/trial-summary/login-log/index.vue b/src/views/trials/trials-panel/trial-summary/login-log/index.vue index 68db8cc2..4888773d 100644 --- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue +++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue @@ -128,13 +128,13 @@ show-overflow-tooltip sortable="custom" /> - + /> -->