{{ item.QuestionName }}
From 3f5092bcbb5446ec6391afdb9fd1dd8d3f80b10e Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Fri, 19 Jul 2024 13:28:43 +0800
Subject: [PATCH 02/23] 1
---
public/favicon.ico | Bin 7886 -> 21238 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/public/favicon.ico b/public/favicon.ico
index 70e9d37fc718762afe01d026773da1f1d82a35a5..68177d686c6c92a375da87e3e045f414b8ea3816 100644
GIT binary patch
literal 21238
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
literal 7886
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
e!K>-;3bYpA=W
Date: Fri, 19 Jul 2024 14:34:21 +0800
Subject: [PATCH 03/23] 1
---
.env.usa | 2 +-
.env.usa_prod | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.env.usa b/.env.usa
index 99a61943..3ace663a 100644
--- a/.env.usa
+++ b/.env.usa
@@ -2,7 +2,7 @@
ENV = 'usa'
NODE_ENV = 'usa'
# base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-17/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-19/'
# 是否开启登陆限制 true:是 false:否
VUE_APP_LOGIN_FOR_PERMISSION = true
diff --git a/.env.usa_prod b/.env.usa_prod
index 47554665..03e31548 100644
--- a/.env.usa_prod
+++ b/.env.usa_prod
@@ -2,7 +2,7 @@
ENV = 'usa'
NODE_ENV = 'usa'
# base public path
-VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-17/'
+VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-19/'
# 是否开启登陆限制 true:是 false:否
VUE_APP_LOGIN_FOR_PERMISSION = true
From a0eaf2f64a36d4a20356402f412378674ed53f66 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Wed, 24 Jul 2024 13:10:42 +0800
Subject: [PATCH 04/23] =?UTF-8?q?=E7=BE=8E=E5=9B=BDuat=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.usa | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.env.usa b/.env.usa
index 3ace663a..e626554f 100644
--- a/.env.usa
+++ b/.env.usa
@@ -2,7 +2,7 @@
ENV = 'usa'
NODE_ENV = 'usa'
# base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-19/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-24/'
# 是否开启登陆限制 true:是 false:否
VUE_APP_LOGIN_FOR_PERMISSION = true
From 47fc6c5ef03e51c09f38298a50f613d409f7e27f Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Thu, 25 Jul 2024 14:54:41 +0800
Subject: [PATCH 05/23] =?UTF-8?q?mfa=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.usa | 2 +-
.env.usa_prod | 2 +-
src/components/MFA/index.vue | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.env.usa b/.env.usa
index e626554f..97f23925 100644
--- a/.env.usa
+++ b/.env.usa
@@ -2,7 +2,7 @@
ENV = 'usa'
NODE_ENV = 'usa'
# base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-24/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-25/'
# 是否开启登陆限制 true:是 false:否
VUE_APP_LOGIN_FOR_PERMISSION = true
diff --git a/.env.usa_prod b/.env.usa_prod
index 03e31548..841c748a 100644
--- a/.env.usa_prod
+++ b/.env.usa_prod
@@ -2,7 +2,7 @@
ENV = 'usa'
NODE_ENV = 'usa'
# base public path
-VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-19/'
+VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-25/'
# 是否开启登陆限制 true:是 false:否
VUE_APP_LOGIN_FOR_PERMISSION = true
diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue
index ff5f2b7d..fd8771a3 100644
--- a/src/components/MFA/index.vue
+++ b/src/components/MFA/index.vue
@@ -91,21 +91,21 @@ export default {
Code: [
{
required: true,
- message: this.$t("common:ruleMessage:specify"),
+ message: this.$t("mfa:ruleMessage:specify"),
trigger: "blur",
},
],
EMail: [
{
required: true,
- message: this.$t("common:ruleMessage:specify"),
+ message: this.$t("mfa:ruleMessage:specify"),
trigger: "blur",
},
],
username: [
{
required: true,
- message: this.$t("common:ruleMessage:specify"),
+ message: this.$t("mfa:ruleMessage:specify"),
trigger: "blur",
},
],
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 06/23] =?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 07/23] =?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 08/23] =?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 09/23] =?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 10/23] =?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 @@
{{ $t("login:title:system") }}
-V1.5.3.001
+V1.5.4.001
Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司 版权所有 From 535d30b6df1f819913761ccc49a53bb5452d57b8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Tue, 30 Jul 2024 10:18:31 +0800 Subject: [PATCH 14/23] =?UTF-8?q?logo=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.usa | 2 +- .env.usa_prod | 2 +- src/views/login/index.vue | 9 +-------- .../trials/trials-layout/components/trialsNavbar.vue | 9 +-------- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/.env.usa b/.env.usa index 97f23925..58c8454a 100644 --- a/.env.usa +++ b/.env.usa @@ -2,7 +2,7 @@ ENV = 'usa' NODE_ENV = 'usa' # base public path -VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-25/' +VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-30/' # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = true diff --git a/.env.usa_prod b/.env.usa_prod index 841c748a..17a23e09 100644 --- a/.env.usa_prod +++ b/.env.usa_prod @@ -2,7 +2,7 @@ ENV = 'usa' NODE_ENV = 'usa' # base public path -VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-25/' +VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-30/' # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = true diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 4d8142b0..103adf5a 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -6,14 +6,7 @@
- 
- 
- 
+
-
-
+
-
- 
-
+
{{ $t("trials:trials:title:eics") }}
From 2e11c881f5c31c166f11b3c897777aae7ba9085d Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Tue, 30 Jul 2024 10:43:24 +0800
Subject: [PATCH 15/23] 1
---
src/components/Dicom/DicomCanvas.vue | 370 +++++++++++++--------------
1 file changed, 185 insertions(+), 185 deletions(-)
diff --git a/src/components/Dicom/DicomCanvas.vue b/src/components/Dicom/DicomCanvas.vue
index 752aea7f..3f693524 100644
--- a/src/components/Dicom/DicomCanvas.vue
+++ b/src/components/Dicom/DicomCanvas.vue
@@ -872,192 +872,192 @@ export default {
this.setAllToolsPassive()
},
onContextmenu(event) {
- const colormapsList = cornerstone.colors.getColormapsList()
- const colorItems = []
- colorItems.push({
- label: '默认值',
- onClick: () => {
- this.setColormap()
- }
- })
- colormapsList.forEach(colormap => {
- const item = {}
- item.label = colormap.name
- item.onClick = () => {
- this.setColormap(colormap.id)
- }
- colorItems.push(item)
- })
- this.$contextmenu({
- items: [
- {
- label: '移动',
- divided: true,
- onClick: () => {
- this.setToolActive('Pan')
- }
- },
- {
- label: '缩放',
- divided: true,
- children: [
- {
- label: '自由缩放',
- onClick: () => {
- this.setToolActive('Zoom')
- }
- },
- {
- label: '适应图像',
- onClick: () => {
- this.fitToWindow()
- }
- },
- {
- label: '适应窗口',
- onClick: () => {
- this.fitToImage()
- }
- }
- ]
- },
- {
- label: '透镜',
- divided: true,
- onClick: () => {
- this.setToolActive('Magnify')
- }
- },
- {
- label: '旋转',
- divided: true,
- children: [
- {
- label: '默认值',
- onClick: () => {
- this.resetRotate()
- }
- },
- {
- label: '自由旋转',
- onClick: () => {
- this.setToolActive('Rotate')
- }
- },
- {
- label: '水平翻转',
- onClick: () => {
- this.setRotate(true, false, 0)
- }
- },
- {
- label: '垂直翻转',
- onClick: () => {
- this.setRotate(false, true, 0)
- }
- },
- {
- label: '左转90度',
- onClick: () => {
- this.setRotate(false, false, -90)
- }
- },
- {
- label: '右转90度',
- onClick: () => {
- this.setRotate(false, false, 90)
- }
- }
- ]
- },
+ // const colormapsList = cornerstone.colors.getColormapsList()
+ // const colorItems = []
+ // colorItems.push({
+ // label: '默认值',
+ // onClick: () => {
+ // this.setColormap()
+ // }
+ // })
+ // colormapsList.forEach(colormap => {
+ // const item = {}
+ // item.label = colormap.name
+ // item.onClick = () => {
+ // this.setColormap(colormap.id)
+ // }
+ // colorItems.push(item)
+ // })
+ // this.$contextmenu({
+ // items: [
+ // {
+ // label: '移动',
+ // divided: true,
+ // onClick: () => {
+ // this.setToolActive('Pan')
+ // }
+ // },
+ // {
+ // label: '缩放',
+ // divided: true,
+ // children: [
+ // {
+ // label: '自由缩放',
+ // onClick: () => {
+ // this.setToolActive('Zoom')
+ // }
+ // },
+ // {
+ // label: '适应图像',
+ // onClick: () => {
+ // this.fitToWindow()
+ // }
+ // },
+ // {
+ // label: '适应窗口',
+ // onClick: () => {
+ // this.fitToImage()
+ // }
+ // }
+ // ]
+ // },
+ // {
+ // label: '透镜',
+ // divided: true,
+ // onClick: () => {
+ // this.setToolActive('Magnify')
+ // }
+ // },
+ // {
+ // label: '旋转',
+ // divided: true,
+ // children: [
+ // {
+ // label: '默认值',
+ // onClick: () => {
+ // this.resetRotate()
+ // }
+ // },
+ // {
+ // label: '自由旋转',
+ // onClick: () => {
+ // this.setToolActive('Rotate')
+ // }
+ // },
+ // {
+ // label: '水平翻转',
+ // onClick: () => {
+ // this.setRotate(true, false, 0)
+ // }
+ // },
+ // {
+ // label: '垂直翻转',
+ // onClick: () => {
+ // this.setRotate(false, true, 0)
+ // }
+ // },
+ // {
+ // label: '左转90度',
+ // onClick: () => {
+ // this.setRotate(false, false, -90)
+ // }
+ // },
+ // {
+ // label: '右转90度',
+ // onClick: () => {
+ // this.setRotate(false, false, 90)
+ // }
+ // }
+ // ]
+ // },
- {
- label: '测量',
- divided: true,
- minWidth: 0,
- children: [
- {
- label: '探针',
- onClick: () => {
- this.setToolActive('Probe')
- }
- },
- {
- label: '长度测量',
- onClick: () => {
- this.setToolActive('Length')
- }
- },
- {
- label: '角度测量',
- onClick: () => {
- this.setToolActive('Angle')
- }
- },
- {
- label: 'Cobb测量',
- onClick: () => {
- this.setToolActive('CobbAngle')
- }
- },
- {
- label: '椭圆测量',
- onClick: () => {
- this.setToolActive('EllipticalRoi')
- }
- },
- {
- label: '矩形测量',
- onClick: () => {
- this.setToolActive('RectangleRoi')
- }
- },
- {
- label: '多边形标记',
- onClick: () => {
- this.setToolActive('FreehandRoi')
- }
- },
- {
- label: '十字线',
- onClick: () => {
- this.setToolActive('Bidirectional')
- }
- },
- {
- label: '文字标注',
- onClick: () => {
- this.setToolActive('ArrowAnnotate')
- }
- }
- ]
- },
- {
- label: '调窗',
- divided: true,
- onClick: () => {
- this.setToolActive('Wwwc')
- }
- },
- {
- label: '反色',
- divided: true,
- onClick: () => {
- this.toggleInvert()
- }
- },
- {
- label: '伪彩',
- children: colorItems
- }
- ],
- event,
- // x: event.clientX,
- // y: event.clientY,
- customClass: 'class-a',
- zIndex: 3,
- minWidth: 100
- })
+ // {
+ // label: '测量',
+ // divided: true,
+ // minWidth: 0,
+ // children: [
+ // {
+ // label: '探针',
+ // onClick: () => {
+ // this.setToolActive('Probe')
+ // }
+ // },
+ // {
+ // label: '长度测量',
+ // onClick: () => {
+ // this.setToolActive('Length')
+ // }
+ // },
+ // {
+ // label: '角度测量',
+ // onClick: () => {
+ // this.setToolActive('Angle')
+ // }
+ // },
+ // {
+ // label: 'Cobb测量',
+ // onClick: () => {
+ // this.setToolActive('CobbAngle')
+ // }
+ // },
+ // {
+ // label: '椭圆测量',
+ // onClick: () => {
+ // this.setToolActive('EllipticalRoi')
+ // }
+ // },
+ // {
+ // label: '矩形测量',
+ // onClick: () => {
+ // this.setToolActive('RectangleRoi')
+ // }
+ // },
+ // {
+ // label: '多边形标记',
+ // onClick: () => {
+ // this.setToolActive('FreehandRoi')
+ // }
+ // },
+ // {
+ // label: '十字线',
+ // onClick: () => {
+ // this.setToolActive('Bidirectional')
+ // }
+ // },
+ // {
+ // label: '文字标注',
+ // onClick: () => {
+ // this.setToolActive('ArrowAnnotate')
+ // }
+ // }
+ // ]
+ // },
+ // {
+ // label: '调窗',
+ // divided: true,
+ // onClick: () => {
+ // this.setToolActive('Wwwc')
+ // }
+ // },
+ // {
+ // label: '反色',
+ // divided: true,
+ // onClick: () => {
+ // this.toggleInvert()
+ // }
+ // },
+ // {
+ // label: '伪彩',
+ // children: colorItems
+ // }
+ // ],
+ // event,
+ // // x: event.clientX,
+ // // y: event.clientY,
+ // customClass: 'class-a',
+ // zIndex: 3,
+ // minWidth: 100
+ // })
return false
},
getToolSate() {
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 16/23] =?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"
/>
-
Date: Tue, 30 Jul 2024 13:42:24 +0800
Subject: [PATCH 17/23] 1
---
public/favicon.ico | Bin 21238 -> 7886 bytes
src/views/login/index.vue | 9 ++++++++-
.../trials-layout/components/trialsNavbar.vue | 9 ++++++++-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/public/favicon.ico b/public/favicon.ico
index 68177d686c6c92a375da87e3e045f414b8ea3816..70e9d37fc718762afe01d026773da1f1d82a35a5 100644
GIT binary patch
literal 7886
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
e!K>-;3bYpA=WZ?$i#EB=ncR
zvI1oV{&yinuKf>9l9gcTIj-TSa4F)?o3fTyu|2OIT
zb--h6i^t*9a2d#EEzASOQk)5(zU|=0F#k>Tp9aeDFnkBj27es#e>329w%>qP;A)r+
zuY%bvqdf%1!&6?r>COLXbnk&%J)6C>F9EB=muM@O`R=BD6`ThjhG9^FonSW4(VhaT
z?P{-I`i*b_%z;xtdFFzjV-?$nIo(H)FM`G1M_YMqe3C=q$6z+E(f$}n_hqkN`W_ew
zzW=FgYro9@N!sI_jiip3=_IdrIzPrOfz2Xkb0N|{Hp(;A>C9i}VINqImuOFSHadjIlQ+19wE|0wJSi>-5X8kn!-DA2Jr8=WV!K)SDc{nB^A
zaPa+SvMnF;S1jAdV`x9^>11;y`2G!SFAr?yJDbaqs=LL0hW4>eXE8KaRWq~ML;Fl;
zqx1VGo=!G*IGy=RegM{h&ZS2{=f3(+1I4r0S~uo^@2m4kYu7J9{@tK?YBu5dExVDP
zUUq}w{h-+A!}~yS!}D9?SO^x|Fd0mDF>M>a4TvCdl~)!
zI=n
z@$<`0eMdsGkP>-FiRDNKSN>C0psc`KvI1{LeiWqPUo1*1ey!~g37@L;oeJ;l8OVzrd*Va`_en!_6*jC-)#599l8P^{zN_mJnSZ+DX*+<(p6
zMaQ}zUcW=Z`@t%j10bk7{Z!X!sRHeR6>f34F7+yg)ry3_4_mymG
zYsnbizx5;E3%emNmj13F``ZMKoo%7(*He(^r+)n%M|Lf>{Wgit
zV$G(lzeC82^&50rbIe}n%-s=t#rZRw3aO9fG->@v&A&d#%dPo$A!Kn}dnocj$n#VG
zE;wNQtTToRb~_@m{)X;DVEZpwbk69Uo@+jq(_~-&8lYO<1+o3O(T`(oq}KMBpRTRv
zn7!pTY5hpmavj8CU6b1Pk9!u|FBkae9xAQbJ4Ow*w3##=@(TrVR-$i`{TA-WB^|my
z_y@$s-DdV#Vy|I3WKk`bW8>DdH2=HU{vE_}{|vpZap`!yv}x1&kwvxqEjHsld)t5A
zi~R{=WB4KZA*nBGZum?4tK++vcC41&=>7YK!`XfSV!3PX9m3q+b5(^nv0A=_z7=f0
zP3mulHbHC*+tI(%e8VwVKT`K(&p}?S7toyomRs_sh`r*}+&e^aYyPb*i1k_YY3@yn
zDmI1&`j!>={T2NO%{MZJQP^yb#PaSZvKm~3{i_il)nFl{;|+6b+jL0XE9TW+{n`D5
z{Pcdn`Ce7vC*OI_R<1R_?&@=>VyTwjg4h_ASR5y(AfGMp`4Rf`-a*g2;m^fU{-U*P
zD>mu3(9W;^=4bkVnI#5F5i5^g6#&zsMLgPjs!%i?s{gM2oYrJ-rs)9=b+~gV*_o?Q_CxP
z2JC^nF{^(Cr1uVeOQLIl?s3kC+3|V7aEU`uK7COGCSJ3f8PeN+}YYC-|(ltI%v)GbE}=Mqvqe!G0FT|(CvWO7_@c`
zht$Vn_|oZ==N!;nyENb;wvP?oB{b4^7sPUF?aF-?(iqSidLGnsLzw##`ldm><3E)C
zqWkw<*h~WQ9QaPz8-rp!0NNj|IX;^IPr_`l@k)LkV*9Tc+NadVuer5Nhx{D80e)U<
z@23A&^YO;4xHm&=4AEzyAl9OSSa+gN=QC2dXTU)}3pEcPj>?EM(lHXU*n=$y@qrTIP@G+v?m@Vg<;Uj16bMgVI|#ZqQc{SIBvwbtdv
z%A9BfbMYknbRYQ;^aS*=t#d^4)en)i)$h<6cQ)wWdNpW1tZ}HV`91;6UQ+eA8diet
zH~jp)Y_Ec`P_+MwH3e>h`@zqxF|5u8to>hH_r2aQ>~y~qqWWuH_d{fD^#{mSYp&MB
z5dZx5{bb(^VQ%%MwXb*lH3;+}L+A_hX6v5~JpGo$b+wLvZlC#vGKkr(gy2oGR(6h+;8&4>V7mm5yE-O%0psYYyfwBT+1{m;~rBv0D^qtK8vbtOqtdqdJ#N2;%JCm2N`k_79TUU0eAG(tLPPQTUvt5-tQ~AZDzHGyD0rqXlp|0mZ+!
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 7ace6530..59697a13 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -6,7 +6,14 @@
From db4632fb9b707e5fabd93700c695732c4095a366 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 30 Jul 2024 16:28:11 +0800
Subject: [PATCH 19/23] =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=B8=A7=E6=B8=B2?=
=?UTF-8?q?=E6=9F=93=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../reading/dicoms/components/DicomCanvas.vue | 5 +++-
.../reading/dicoms/components/StudyList.vue | 10 ++++----
.../dicoms/customize/CustomizeDicomCanvas.vue | 9 ++++----
.../dicoms/customize/CustomizeStudyList.vue | 23 +++++++++++--------
4 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 37a76e12..6b44c1af 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -1203,7 +1203,7 @@ export default {
this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
this.stack.instanceId = instanceId
this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
- this.resetWwwc()
+ // this.resetWwwc()
resolve()
})
},
@@ -1941,6 +1941,9 @@ export default {
for (const [key, value] of searchParams.entries()) {
params[key] = value
}
+ if (isNaN(params.frame)){
+ params.frame = 0
+ }
return params
},
preventDefault(e) {
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 b310032b..44d8db0f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
@@ -629,7 +629,8 @@ export default {
this.studyIndex = studyIndex
this.seriesIndex = seriesIndex
this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
- var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
+ // var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
+ var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
dicomStatck.imageIdIndex = 0
this.$emit('loadImageStack', dicomStatck)
if (!series.loadStatus && series.modality !== 'SR') {
@@ -672,7 +673,7 @@ export default {
},
showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) {
this.currentSeriesIndex = seriesIndex
- var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+ var idx = this.visitTaskIdx
const imageIds = []
if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
@@ -680,11 +681,12 @@ export default {
}
} else {
imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`)
- }
+ }
this.studyIndex = studyIndex
this.seriesIndex = seriesIndex
this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
- var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
+ // var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
+ var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
dicomStatck.imageIds = imageIds
dicomStatck.imageIdIndex = 0
this.$emit('loadImageStack', dicomStatck)
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
index bf21b24d..6d0f7af5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
@@ -889,8 +889,7 @@ export default {
cornerstoneTools.setToolPassiveForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
}
-
- if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame && data.MeasureData) || (!this.stack.isExistMutiFrames && data.MeasureData))) {
+ if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && (data.MeasureData.frame === this.stack.frame) && data.MeasureData) || (!this.stack.isExistMutiFrames && data.MeasureData))) {
// console.log('renderMeasuredData', this.stack.frame,data.MeasureData.frame,this.stack.isExistMutiFrames)
const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type)
if (toolState && toolState.data.length > 0) {
@@ -1181,7 +1180,7 @@ export default {
this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
this.stack.instanceId = instanceId
this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
- this.resetWwwc()
+ // this.resetWwwc()
resolve()
})
},
@@ -1246,7 +1245,6 @@ export default {
// console.log('onImageLoaded')
},
onImageRendered(e) {
- // console.log('onImageRendered')
this.stack.imageRendered = true
// const { element } = e.detail
var imageId = e.detail.image.imageId
@@ -1921,6 +1919,9 @@ export default {
for (const [key, value] of searchParams.entries()) {
params[key] = value
}
+ if (isNaN(params.frame)){
+ params.frame = 0
+ }
return params
},
preventDefault(e) {
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 d68ef8c6..f00cabf5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
@@ -600,7 +600,9 @@ export default {
this.studyIndex = studyIndex
this.seriesIndex = seriesIndex
this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
- var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
+ var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
+
+ dicomStatck.imageIdIndex = 0
this.$emit('loadImageStack', dicomStatck)
if (!series.loadStatus && series.modality !== 'SR') {
this.loopLoadStatus = -1
@@ -642,18 +644,19 @@ export default {
},
showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) {
this.currentSeriesIndex = seriesIndex
- const imageIds = []
- if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
- for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
- imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}`)
- }
- } else {
- imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}`)
- }
+ var idx = this.visitTaskIdx
this.studyIndex = studyIndex
this.seriesIndex = seriesIndex
this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
- var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
+ var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
+ const imageIds = []
+ if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
+ for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
+ imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`)
+ }
+ } else {
+ imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`)
+ }
dicomStatck.imageIds = imageIds
dicomStatck.imageIdIndex = 0
this.$emit('loadImageStack', dicomStatck)
From 750c465b18f0f07428e80ebb437d65abe724c56c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 30 Jul 2024 17:04:16 +0800
Subject: [PATCH 20/23] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
=?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../medical-feedback/components/ChatForm.vue | 23 +++++++++----
.../mim-medical-audit/components/AdReview.vue | 34 ++++++++++---------
.../mim-medical-audit/components/ChatForm.vue | 23 +++++++++----
3 files changed, 52 insertions(+), 28 deletions(-)
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 35d7bb17..1280f856 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -77,12 +77,23 @@
{{ $t('trials:medicalFeedback:message:msg5') }}
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
index c1aafe9d..9dcd6339 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
@@ -138,20 +138,22 @@
>
this.OSSclientConfig.basePath + f.url)
+ this.$refs[file.url].$viewer.show()
},
handleViewDetail(visitTaskId) {
console.log(this.rowData)
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index a51c3169..272555a2 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -77,12 +77,23 @@
{{ $t('trials:medicalFeedback:message:msg5') }}
From ec96011d4b327320e903a8b2a16d8269a967917d Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 30 Jul 2024 18:57:07 +0800
Subject: [PATCH 21/23] =?UTF-8?q?=E5=A4=9A=E5=B8=A7=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=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 | 7 ++-
src/views/dicom-show/dicom-study.vue | 46 ++++++++-------
src/views/dicom-show/dicom-visit.vue | 46 ++++++++-------
.../reading/dicoms/components/StudyList.vue | 26 +++++----
.../dicoms/customize/CustomizeStudyList.vue | 56 ++++++++++++-------
5 files changed, 105 insertions(+), 76 deletions(-)
diff --git a/src/components/Dicom/DicomCanvas.vue b/src/components/Dicom/DicomCanvas.vue
index b8ec4a50..a7ce70cc 100644
--- a/src/components/Dicom/DicomCanvas.vue
+++ b/src/components/Dicom/DicomCanvas.vue
@@ -873,7 +873,10 @@ export default {
synchronizer.remove(this.$refs.canvas)
this.setAllToolsPassive()
},
- onContextmenu(event) {
+ onContextmenu(e) {
+ e.stopImmediatePropagation()
+ e.stopPropagation()
+ e.preventDefault()
// const colormapsList = cornerstone.colors.getColormapsList()
// const colorItems = []
// colorItems.push({
@@ -1060,7 +1063,7 @@ export default {
// zIndex: 3,
// minWidth: 100
// })
- return false
+ // return false
},
getToolSate() {
const toolROITypes = [
diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue
index 68c31dbc..d87d4806 100644
--- a/src/views/dicom-show/dicom-study.vue
+++ b/src/views/dicom-show/dicom-study.vue
@@ -56,28 +56,20 @@
trigger="hover"
popper-class="instance_frame_wrapper"
>
-
-
-
+
{{ $t("trials:trials:title:eics") }}
From 2e11c881f5c31c166f11b3c897777aae7ba9085d Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Tue, 30 Jul 2024 10:43:24 +0800
Subject: [PATCH 15/23] 1
---
src/components/Dicom/DicomCanvas.vue | 370 +++++++++++++--------------
1 file changed, 185 insertions(+), 185 deletions(-)
diff --git a/src/components/Dicom/DicomCanvas.vue b/src/components/Dicom/DicomCanvas.vue
index 752aea7f..3f693524 100644
--- a/src/components/Dicom/DicomCanvas.vue
+++ b/src/components/Dicom/DicomCanvas.vue
@@ -872,192 +872,192 @@ export default {
this.setAllToolsPassive()
},
onContextmenu(event) {
- const colormapsList = cornerstone.colors.getColormapsList()
- const colorItems = []
- colorItems.push({
- label: '默认值',
- onClick: () => {
- this.setColormap()
- }
- })
- colormapsList.forEach(colormap => {
- const item = {}
- item.label = colormap.name
- item.onClick = () => {
- this.setColormap(colormap.id)
- }
- colorItems.push(item)
- })
- this.$contextmenu({
- items: [
- {
- label: '移动',
- divided: true,
- onClick: () => {
- this.setToolActive('Pan')
- }
- },
- {
- label: '缩放',
- divided: true,
- children: [
- {
- label: '自由缩放',
- onClick: () => {
- this.setToolActive('Zoom')
- }
- },
- {
- label: '适应图像',
- onClick: () => {
- this.fitToWindow()
- }
- },
- {
- label: '适应窗口',
- onClick: () => {
- this.fitToImage()
- }
- }
- ]
- },
- {
- label: '透镜',
- divided: true,
- onClick: () => {
- this.setToolActive('Magnify')
- }
- },
- {
- label: '旋转',
- divided: true,
- children: [
- {
- label: '默认值',
- onClick: () => {
- this.resetRotate()
- }
- },
- {
- label: '自由旋转',
- onClick: () => {
- this.setToolActive('Rotate')
- }
- },
- {
- label: '水平翻转',
- onClick: () => {
- this.setRotate(true, false, 0)
- }
- },
- {
- label: '垂直翻转',
- onClick: () => {
- this.setRotate(false, true, 0)
- }
- },
- {
- label: '左转90度',
- onClick: () => {
- this.setRotate(false, false, -90)
- }
- },
- {
- label: '右转90度',
- onClick: () => {
- this.setRotate(false, false, 90)
- }
- }
- ]
- },
+ // const colormapsList = cornerstone.colors.getColormapsList()
+ // const colorItems = []
+ // colorItems.push({
+ // label: '默认值',
+ // onClick: () => {
+ // this.setColormap()
+ // }
+ // })
+ // colormapsList.forEach(colormap => {
+ // const item = {}
+ // item.label = colormap.name
+ // item.onClick = () => {
+ // this.setColormap(colormap.id)
+ // }
+ // colorItems.push(item)
+ // })
+ // this.$contextmenu({
+ // items: [
+ // {
+ // label: '移动',
+ // divided: true,
+ // onClick: () => {
+ // this.setToolActive('Pan')
+ // }
+ // },
+ // {
+ // label: '缩放',
+ // divided: true,
+ // children: [
+ // {
+ // label: '自由缩放',
+ // onClick: () => {
+ // this.setToolActive('Zoom')
+ // }
+ // },
+ // {
+ // label: '适应图像',
+ // onClick: () => {
+ // this.fitToWindow()
+ // }
+ // },
+ // {
+ // label: '适应窗口',
+ // onClick: () => {
+ // this.fitToImage()
+ // }
+ // }
+ // ]
+ // },
+ // {
+ // label: '透镜',
+ // divided: true,
+ // onClick: () => {
+ // this.setToolActive('Magnify')
+ // }
+ // },
+ // {
+ // label: '旋转',
+ // divided: true,
+ // children: [
+ // {
+ // label: '默认值',
+ // onClick: () => {
+ // this.resetRotate()
+ // }
+ // },
+ // {
+ // label: '自由旋转',
+ // onClick: () => {
+ // this.setToolActive('Rotate')
+ // }
+ // },
+ // {
+ // label: '水平翻转',
+ // onClick: () => {
+ // this.setRotate(true, false, 0)
+ // }
+ // },
+ // {
+ // label: '垂直翻转',
+ // onClick: () => {
+ // this.setRotate(false, true, 0)
+ // }
+ // },
+ // {
+ // label: '左转90度',
+ // onClick: () => {
+ // this.setRotate(false, false, -90)
+ // }
+ // },
+ // {
+ // label: '右转90度',
+ // onClick: () => {
+ // this.setRotate(false, false, 90)
+ // }
+ // }
+ // ]
+ // },
- {
- label: '测量',
- divided: true,
- minWidth: 0,
- children: [
- {
- label: '探针',
- onClick: () => {
- this.setToolActive('Probe')
- }
- },
- {
- label: '长度测量',
- onClick: () => {
- this.setToolActive('Length')
- }
- },
- {
- label: '角度测量',
- onClick: () => {
- this.setToolActive('Angle')
- }
- },
- {
- label: 'Cobb测量',
- onClick: () => {
- this.setToolActive('CobbAngle')
- }
- },
- {
- label: '椭圆测量',
- onClick: () => {
- this.setToolActive('EllipticalRoi')
- }
- },
- {
- label: '矩形测量',
- onClick: () => {
- this.setToolActive('RectangleRoi')
- }
- },
- {
- label: '多边形标记',
- onClick: () => {
- this.setToolActive('FreehandRoi')
- }
- },
- {
- label: '十字线',
- onClick: () => {
- this.setToolActive('Bidirectional')
- }
- },
- {
- label: '文字标注',
- onClick: () => {
- this.setToolActive('ArrowAnnotate')
- }
- }
- ]
- },
- {
- label: '调窗',
- divided: true,
- onClick: () => {
- this.setToolActive('Wwwc')
- }
- },
- {
- label: '反色',
- divided: true,
- onClick: () => {
- this.toggleInvert()
- }
- },
- {
- label: '伪彩',
- children: colorItems
- }
- ],
- event,
- // x: event.clientX,
- // y: event.clientY,
- customClass: 'class-a',
- zIndex: 3,
- minWidth: 100
- })
+ // {
+ // label: '测量',
+ // divided: true,
+ // minWidth: 0,
+ // children: [
+ // {
+ // label: '探针',
+ // onClick: () => {
+ // this.setToolActive('Probe')
+ // }
+ // },
+ // {
+ // label: '长度测量',
+ // onClick: () => {
+ // this.setToolActive('Length')
+ // }
+ // },
+ // {
+ // label: '角度测量',
+ // onClick: () => {
+ // this.setToolActive('Angle')
+ // }
+ // },
+ // {
+ // label: 'Cobb测量',
+ // onClick: () => {
+ // this.setToolActive('CobbAngle')
+ // }
+ // },
+ // {
+ // label: '椭圆测量',
+ // onClick: () => {
+ // this.setToolActive('EllipticalRoi')
+ // }
+ // },
+ // {
+ // label: '矩形测量',
+ // onClick: () => {
+ // this.setToolActive('RectangleRoi')
+ // }
+ // },
+ // {
+ // label: '多边形标记',
+ // onClick: () => {
+ // this.setToolActive('FreehandRoi')
+ // }
+ // },
+ // {
+ // label: '十字线',
+ // onClick: () => {
+ // this.setToolActive('Bidirectional')
+ // }
+ // },
+ // {
+ // label: '文字标注',
+ // onClick: () => {
+ // this.setToolActive('ArrowAnnotate')
+ // }
+ // }
+ // ]
+ // },
+ // {
+ // label: '调窗',
+ // divided: true,
+ // onClick: () => {
+ // this.setToolActive('Wwwc')
+ // }
+ // },
+ // {
+ // label: '反色',
+ // divided: true,
+ // onClick: () => {
+ // this.toggleInvert()
+ // }
+ // },
+ // {
+ // label: '伪彩',
+ // children: colorItems
+ // }
+ // ],
+ // event,
+ // // x: event.clientX,
+ // // y: event.clientY,
+ // customClass: 'class-a',
+ // zIndex: 3,
+ // minWidth: 100
+ // })
return false
},
getToolSate() {
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 16/23] =?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"
/>
-
-
+
+
+
+
+
+
-
+
+
+
{{ $t("trials:trials:title:eics") }}
From 1eae9eda2803a05fc8068bdef8f2c0e51b291d1a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 30 Jul 2024 14:55:59 +0800
Subject: [PATCH 18/23] =?UTF-8?q?=E5=A4=9A=E5=B8=A7=E4=B8=8B=E8=BD=BD?=
=?UTF-8?q?=E5=8F=8A=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/getters.js | 1 +
src/store/modules/reading.js | 155 ++++++++++-
.../reading/dicoms/components/DicomCanvas.vue | 29 +-
.../reading/dicoms/components/DicomViewer.vue | 38 +--
.../reading/dicoms/components/ReadPage.vue | 30 ++-
.../reading/dicoms/components/StudyList.vue | 228 +++++-----------
.../dicoms/customize/CustomizeDicomCanvas.vue | 24 +-
.../dicoms/customize/CustomizeDicomViewer.vue | 73 ++---
.../dicoms/customize/CustomizeReadPage.vue | 33 ++-
.../dicoms/customize/CustomizeStudyList.vue | 254 ++++--------------
10 files changed, 408 insertions(+), 457 deletions(-)
diff --git a/src/store/getters.js b/src/store/getters.js
index e79727d6..9f5c1c33 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -41,6 +41,7 @@ const getters = {
lastCanvasTaskId: state => state.reading.lastCanvasTaskId,
imageQuality: state => state.reading.imageQuality,
imageQualityIssues: state => state.reading.imageQualityIssues,
+ currentLoadIns: state => state.reading.currentLoadIns,
language: state => state.lang.language,
TotalNeedSignSystemDocCount: state => state.user.TotalNeedSignSystemDocCount,
TotalNeedSignTrialDocCount: state => state.user.TotalNeedSignTrialDocCount,
diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js
index 6ca73932..efe3cbc4 100644
--- a/src/store/modules/reading.js
+++ b/src/store/modules/reading.js
@@ -30,7 +30,8 @@ const getDefaultState = () => {
activeSeries: {},
lastCanvasTaskId: '',
imageQuality: null,
- imageQualityIssues: null
+ imageQualityIssues: null,
+ currentLoadIns: []
}
}
function getQuestions(questions) {
@@ -139,6 +140,22 @@ function getQuestionAnswer(questions, questionMark, answers) {
return ''
}
}
+// function getKeySeriesInfo(keyInstance, series) {
+// const obj = {}
+// const set = new Set()
+// var instances = series.instanceList.concat(keyInstance).filter((item) => {
+// if (set.has(item)) {
+// return true
+// } else {
+// set.add(item)
+// return false
+// }
+// })
+// instances.map(item => {
+// obj[item] = { seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex }
+// })
+// return obj
+// }
const state = getDefaultState
@@ -759,7 +776,17 @@ const actions = {
resolve()
} else {
var studyList = []
+ var keyImages = []
getReadingVisitStudyList(obj.trialId, obj.subjectVisitId, obj.visitTaskId).then(res => {
+ const i = res.Result.findIndex(i => i.IsCriticalSequence)
+ if (i > -1) {
+ const seriesList = res.Result[i].SeriesList && res.Result[i].SeriesList
+ seriesList.map(i => {
+ i.InstanceInfoList.map(k => {
+ keyImages.push({ instanceId: k.Id })
+ })
+ })
+ }
res.Result.forEach((study, studyIndex) => {
const data = {}
data.StudyId = study.StudyId
@@ -785,16 +812,22 @@ const actions = {
series.InstanceInfoList.forEach(instance => {
if (instance.NumberOfFrames && instance.NumberOfFrames > 1) {
for (let i = 0; i < instance.NumberOfFrames; i++) {
- const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}`
+ const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
imageIds.push(imageId)
}
- instance.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${0}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}`
+ instance.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${0}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
} else {
- const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}`
+ const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
imageIds.push(imageId)
instance.ImageId = imageId
}
-
+ if (!study.IsCriticalSequence && series.IsBeMark) {
+ const i = keyImages.findIndex(i => i.instanceId === instance.Id)
+ if (i > -1) {
+ keyImages[i].studyIndex = studyIndex
+ keyImages[i].seriesIndex = seriesIndex
+ }
+ }
instanceList.push(instance.Id)
})
seriesList.push({
@@ -837,6 +870,7 @@ const actions = {
})
state.visitTaskList[index].StudyList = studyList
state.visitTaskList[index].studyListInit = true
+ state.visitTaskList[index].KeyImages = keyImages
// sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
resolve()
}).catch(() => { resolve() })
@@ -895,11 +929,114 @@ const actions = {
resolve()
})
},
+ setImageLoadedProgress({ state }, obj) {
+ const studyIndex = parseInt(obj.idx.split('|')[0])
+ const seriesIndex = parseInt(obj.idx.split('|')[1])
+ const visitTaskIndex = parseInt(obj.idx.split('|')[2])
+ let pStudyIndex = null
+ let pSeriesIndex = null
+ let pSeries = null
+ try {
+ const study = state.visitTaskList[visitTaskIndex].StudyList[studyIndex]
+ const series = state.visitTaskList[visitTaskIndex].StudyList[studyIndex].SeriesList[seriesIndex]
+ const keyImages = state.visitTaskList[visitTaskIndex].KeyImages
+ if (study.IsCriticalSequence) {
+ const i = keyImages.findIndex(i => i.instanceId === obj.instanceId)
+ if (i > -1) {
+ pStudyIndex = keyImages[i].studyIndex
+ pSeriesIndex = keyImages[i].seriesIndex
+ }
+ } else if (series.isBeMark) {
+ if (keyImages.length > 0) {
+ pStudyIndex = 0
+ pSeriesIndex = 0
+ }
+ }
+ if (pStudyIndex !== null && pSeriesIndex !== null) {
+ pSeries = state.visitTaskList[visitTaskIndex].StudyList[pStudyIndex].SeriesList[pSeriesIndex]
+ }
+
+ var prefetchInstanceCount = series.prefetchInstanceCount
+ var instanceCount = series.instanceCount
+ var prefetchInstanceCount2 = pSeries ? pSeries.prefetchInstanceCount : null
+ var instanceCount2 = pSeries ? pSeries.instanceCount : null
+ if (series.imageloadedArr.indexOf(obj.instanceId) < 0) {
+ const i = state.currentLoadIns.findIndex(i => i.instanceId === obj.instanceId)
+ if (i > -1) {
+ prefetchInstanceCount = prefetchInstanceCount + obj.percentComplete - state.currentLoadIns[i].percentComplete
+ prefetchInstanceCount2 = prefetchInstanceCount2 !== null ? prefetchInstanceCount2 + obj.percentComplete - state.currentLoadIns[i].percentComplete : null
+ state.currentLoadIns[i].percentComplete = obj.percentComplete
+ if (obj.percentComplete >= 100) {
+ state.currentLoadIns.splice(i, 1)
+ }
+ } else {
+ if (obj.percentComplete !== 100) {
+ state.currentLoadIns.push({ instanceId: obj.instanceId, percentComplete: obj.percentComplete })
+ }
+ prefetchInstanceCount = prefetchInstanceCount + obj.percentComplete
+ prefetchInstanceCount2 = prefetchInstanceCount2 !== null ? prefetchInstanceCount2 + obj.percentComplete : null
+ }
+ series.prefetchInstanceCount = prefetchInstanceCount
+ if (pSeries) {
+ pSeries.prefetchInstanceCount = prefetchInstanceCount2
+ }
+ if (obj.percentComplete >= 100) {
+ series.imageloadedArr.push(obj.instanceId)
+ if (pSeries) {
+ pSeries.imageloadedArr.push(obj.instanceId)
+ }
+ }
+ }
+
+ if (prefetchInstanceCount >= instanceCount * 100) {
+ series.prefetchInstanceCount = instanceCount * 100
+ // 设置当前序列状态为已下载完成
+ series.loadStatus = true
+ }
+ if (prefetchInstanceCount2 !== null && instanceCount2 !== null && prefetchInstanceCount2 >= instanceCount2 * 100) {
+ pSeries.prefetchInstanceCount = instanceCount2 * 100
+ // 设置当前序列状态为已下载完成
+ pSeries.loadStatus = true
+ }
+ } catch (e) {
+ console.log('error')
+ }
+ },
setImageloadedInfo({ state }, obj) {
- var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
- const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount
- state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount = prefetchInstanceCount + 100
- state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr.push(obj.imageId)
+ console.log('setImageloadedInfo', obj)
+ // if(obj.instance === '20dd8fc9-51b0-ec63-942b-cb3006c72650')
+ // var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
+ // // const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount
+ // const instanceList = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].instanceList
+ // const idx = state.visitTaskList[index].StudyList.findIndex(i => i.IsCriticalSequence)
+
+ // if (!state.visitTaskList[index].StudyList[obj.studyIndex].IsCriticalSequence) {
+ // // 当前下载的非关键序列
+ // console.log('当前下载的非关键序列')
+ // if (idx > -1) {
+ // const keyInstance = state.visitTaskList[index].StudyList[idx].SeriesList[0].instanceList
+ // obj.markedImages = getKeySeriesInfo(keyInstance, state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex])
+ // instanceList.map(i => {
+ // if (obj.markedImages.hasOwnProperty(i) && state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr.indexOf(i) < 0) {
+ // state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr.push(i)
+ // state.visitTaskList[index].StudyList[idx].SeriesList[0].prefetchInstanceCount = state.visitTaskList[index].StudyList[idx].SeriesList[0].prefetchInstanceCount + 100
+ // }
+ // })
+ // if (state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr >= state.visitTaskList[index].StudyList[idx].SeriesList[0].instanceCount) {
+ // state.visitTaskList[index].StudyList[idx].SeriesList[0].loadStatus = true
+ // }
+ // }
+ // }
+ // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].instanceCount * 100
+ // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr = instanceList
+ // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].loadStatus = true
+ // const imageloadedArr = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr
+ // if (imageloadedArr.indexOf())
+
+ // if (state.visitTaskList[index].StudyList[0].IsCriticalSequence){
+ // state.visitTaskList[index].StudyList[0].SeriesList[0].prefetchInstanceCount = prefetchInstanceCount + 100
+ // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr.push(obj.imageId)
+ // }
},
setStatus({ state }, obj) {
var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 8ccbc807..37a76e12 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -13,7 +13,7 @@
-
@@ -222,7 +222,8 @@ export default {
taskBlindName: '',
frame: null,
imageRendered: false,
- isExistsClinicalData:false
+ isExistsClinicalData: false,
+ isExistMutiFrames: false
// preventCache: true
},
dicomInfo: {
@@ -758,7 +759,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId
var frame = imageInfo.frame
- this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+ this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
for (var m = 0; m < this.measuredTools.length; m++) {
var toolType = this.measuredTools[m]
@@ -880,7 +881,6 @@ export default {
return seriesList[seriesIdx].loadStatus ? 1 : 0
},
renderMeasuredData(e) {
- this.stack.frame = !isNaN(parseInt(this.stack.frame)) ? parseInt(this.stack.frame) : 0
var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId)
if (idx === -1) return
this.measureData = this.visitTaskList[idx].MeasureData
@@ -899,9 +899,7 @@ export default {
} else {
cornerstoneTools.setToolEnabledForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
}
- // console.log('renderMeasuredData', this.stack.frame)
-
- if (this.stack.instanceId.includes(data.InstanceId) && ((data.NumberOfFrames === this.stack.frame) || !data.NumberOfFrames) && data.MeasureData) {
+ if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame && data.MeasureData) || (!this.stack.isExistMutiFrames && data.MeasureData))) {
const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type)
if (toolState && toolState.data.length > 0) {
var idx = toolState.data.findIndex(item => item.uuid === data.MeasureData.data.uuid)
@@ -988,7 +986,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId
var frame = imageInfo.frame
- this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+ this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
for (let t = 0; t < this.measuredTools.length; t++) {
var toolType = this.measuredTools[t]
@@ -1056,7 +1054,7 @@ export default {
this.stack.studyId = dicomSeries.studyId
this.stack.seriesNumber = dicomSeries.seriesNumber
this.stack.imageIds = dicomSeries.imageIds
- this.stack.currentImageIdIndex = dicomSeries.imageIdIndex ? dicomSeries.imageIdIndex : 0
+ this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length - 1 ? dicomSeries.imageIdIndex : 0
this.stack.imageIdIndex = dicomSeries.imageIdIndex
this.stack.firstImageLoading = true
this.stack.visitTaskId = dicomSeries.visitTaskId
@@ -1067,6 +1065,7 @@ export default {
this.stack.sliceThickness = dicomSeries.sliceThickness
this.stack.instanceCount = dicomSeries.instanceCount
this.stack.isExistsClinicalData = dicomSeries.isExistsClinicalData
+ this.stack.isExistMutiFrames = dicomSeries.isExistMutiFrames
// this.measuredData = dicomSeries.measuredData
var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === dicomSeries.visitTaskId)
this.stack.visitTaskNum = this.visitTaskList[idx].VisitTaskNum
@@ -1087,7 +1086,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId
var frame = imageInfo.frame
- this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+ this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
this.stack.instanceId = instanceId
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
ToolStateManager.clearImageIdToolState(dicomSeries.imageIds)
@@ -1201,7 +1200,7 @@ export default {
const imageInfo = this.getInstanceInfo(image.imageId)
var instanceId = imageInfo.instanceId
var frame = imageInfo.frame
- this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+ this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
this.stack.instanceId = instanceId
this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
this.resetWwwc()
@@ -1276,7 +1275,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId
var frame = imageInfo.frame
- this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+ this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
if (this.imageId !== instanceId) {
this.getOrientationMarker(e.detail.element)
// 初次加载时，如果该影像存在标记，则以标记的窗宽窗位为初始化默认值，否则以序列的窗宽窗位为初始化默认值
@@ -1335,13 +1334,13 @@ export default {
const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId
var frame = imageInfo.frame
- this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+ this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
if (e.detail.toolName === 'Length' || e.detail.toolName === 'ArrowAnnotate' || e.detail.toolName === 'RectangleRoi') {
const measureData = {}
measureData.studyId = this.stack.studyId
measureData.seriesId = this.stack.seriesId
measureData.instanceId = instanceId
- measureData.frame = this.stack.frame ? this.stack.frame : 0
+ measureData.frame = this.stack.frame
measureData.data = e.detail.measurementData
measureData.type = e.detail.toolName
measureData.thick = this.dicomInfo.thick
@@ -1455,7 +1454,7 @@ export default {
const imageInfo = this.getInstanceInfo(imageId)
var instanceId = imageInfo.instanceId
var frame = imageInfo.frame
- this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+ this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
var uuid = measurementData.uuid
var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 3eeac316..ba120a41 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -878,7 +878,7 @@ export default {
activeSeries: {
immediate: true,
handler(v) {
- console.log('activeSeries', v)
+ // console.log('activeSeries', v)
if (v && v.isCurrentTask && this.studyList.length === 0) {
this.activeTaskInfo.taskName = v.taskBlindName
this.activeTaskInfo.visitTaskId = v.visitTaskId
@@ -1021,6 +1021,10 @@ export default {
if (!this.petctWindow) return
this.petctWindow.postMessage({ type: 'readingPageUpdate', data: data }, window.location)
})
+ DicomEvent.$on('resetPage', () => {
+ if (!this.petctWindow) return
+ this.petctWindow.postMessage({ type: 'resetPage' }, window.location)
+ })
DicomEvent.$on('setReadingState', (data) => {
if (!this.petctWindow) return
this.petctWindow.postMessage({ type: 'setReadingState', data: data }, window.location)
@@ -1058,28 +1062,30 @@ export default {
})
},
methods: {
- getWwcTpl() {
- const loading = this.$loading({ fullscreen: true })
- getUserWLTemplateList().then(res => {
+ async getWwcTpl() {
+ // const loading = this.$loading({ fullscreen: true })
+ try {
+ const res = await getUserWLTemplateList()
this.customWwcTpl = []
res.Result.map(i => {
this.customWwcTpl.push({ label: i.TemplateName, wc: i.WL, ww: i.WW })
})
this.wwwcArr = [...this.defaultWwwc, ...this.customWwcTpl]
- loading.close()
- }).catch(() => { loading.close() })
+ } catch (e) {
+ console.log(e)
+ }
},
- getHotKeys() {
- const loading = this.$loading({ fullscreen: true })
- getDoctorShortcutKey({ imageToolType: 0 }).then(res => {
+ async getHotKeys() {
+ // const loading = this.$loading({ fullscreen: true })
+ try {
+ const res = await getDoctorShortcutKey({ imageToolType: 0 })
res.Result.map(item => {
this.hotKeyList.push({ id: item.Id, altKey: item.AltKey, ctrlKey: item.CtrlKey, shiftKey: item.ShiftKey, metaKey: item.MetaKey, key: item.Keyboardkey, code: item.Code, text: item.Text, shortcutKeyEnum: item.ShortcutKeyEnum })
})
this.bindHotKey()
- loading.close()
- }).catch(() => {
- loading.close()
- })
+ } catch (e) {
+ console.log(e)
+ }
},
resetHotkeyList(arr) {
this.hotKeyList = []
@@ -1102,7 +1108,7 @@ export default {
var container = this.$refs['container']
// window.addEventListener
container.addEventListener('keydown', event => {
- console.log(event)
+ // console.log(event)
event.preventDefault()
var idx = this.hotKeyList.findIndex(i => i.code === event.code && i.ctrlKey === event.ctrlKey && i.shiftKey === event.shiftKey && i.altKey === event.altKey)
@@ -1582,7 +1588,9 @@ export default {
var seriesIdx = studyList[studyIdx].SeriesList.findIndex(s => s.seriesId === seriesId)
if (seriesIdx > -1) {
var series = studyList[studyIdx].SeriesList[seriesIdx]
- var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId))
+ const frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
+ const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
+ var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
if (instanceIdx > -1) {
series.imageIdIndex = instanceIdx
seriesInfo = series
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
index a406553f..633570e1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
@@ -72,6 +72,13 @@ import DicomEvent from './DicomEvent'
import store from '@/store'
import { getToken } from '@/utils/auth'
import { mapGetters } from 'vuex'
+import * as dicomParser from 'dicom-parser'
+import * as cornerstone from 'cornerstone-core'
+import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
+cornerstoneWADOImageLoader.external.dicomParser = dicomParser
+cornerstoneWADOImageLoader.external.cornerstone = cornerstone
+const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
+cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
export default {
name: 'ReadPage',
components: {
@@ -210,14 +217,20 @@ export default {
this.$refs[this.activeTaskVisitId][0].selectSeries(data)
})
})
+ cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
+ window.addEventListener('beforeunload', e => {
+ cornerstone.imageCache.purgeCache()
+ })
},
beforeDestroy() {
+ cornerstone.imageCache.purgeCache()
DicomEvent.$off('getNextVisitInfo')
DicomEvent.$off('toggleSeries')
DicomEvent.$off('isCanActiveNoneDicomTool')
DicomEvent.$off('removeNoneDicomMeasureData')
DicomEvent.$off('addNoneDicomMeasureData')
DicomEvent.$off('selectSeries')
+ window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
},
methods: {
async getVisitInfo() {
@@ -400,7 +413,7 @@ export default {
idx > -1 ? obj = seriesList[idx] : ''
}
if (obj) {
- const index = Math.floor(obj.imageIds.length * ((baseSeries.imageIdIndex + 1) / baseSeries.instanceCount))
+ const index = Math.floor(obj.imageIds.length * ((baseSeries.imageIdIndex + 1) / baseSeries.imageIds))
obj.imageIdIndex = index > 0 ? index - 1 : 0
}
return obj
@@ -464,7 +477,10 @@ export default {
var seriesIdx = studyList[studyIdx].SeriesList.findIndex(s => s.seriesId === seriesId)
if (seriesIdx > -1) {
var series = studyList[studyIdx].SeriesList[seriesIdx]
- var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId))
+ // var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId))
+ const frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
+ const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
+ var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
if (instanceIdx > -1) {
series.imageIdIndex = instanceIdx
// series.studyIndex = studyIdx
@@ -485,6 +501,16 @@ export default {
seriesInfo = this.getLinkedSeries(baseSeries, visitTaskId, visitTaskIdx)
}
return seriesInfo
+ },
+ cornerstoneimageloadprogress(e) {
+ const imageId = e.detail.imageId
+ const params = {}
+ const searchParams = new URLSearchParams(imageId.split('?')[1])
+ for (const [key, value] of searchParams.entries()) {
+ params[key] = value
+ }
+ params.percentComplete = e.detail.percentComplete
+ store.dispatch('reading/setImageLoadedProgress', params)
}
}
}
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 ccf002e7..b310032b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
@@ -158,18 +158,13 @@
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 7872beb4..d68ef8c6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
@@ -157,18 +157,11 @@
+
+
+
{{ $t("trials:trials:title:eics") }}
From 1eae9eda2803a05fc8068bdef8f2c0e51b291d1a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 30 Jul 2024 14:55:59 +0800
Subject: [PATCH 18/23] =?UTF-8?q?=E5=A4=9A=E5=B8=A7=E4=B8=8B=E8=BD=BD?=
=?UTF-8?q?=E5=8F=8A=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/getters.js | 1 +
src/store/modules/reading.js | 155 ++++++++++-
.../reading/dicoms/components/DicomCanvas.vue | 29 +-
.../reading/dicoms/components/DicomViewer.vue | 38 +--
.../reading/dicoms/components/ReadPage.vue | 30 ++-
.../reading/dicoms/components/StudyList.vue | 228 +++++-----------
.../dicoms/customize/CustomizeDicomCanvas.vue | 24 +-
.../dicoms/customize/CustomizeDicomViewer.vue | 73 ++---
.../dicoms/customize/CustomizeReadPage.vue | 33 ++-
.../dicoms/customize/CustomizeStudyList.vue | 254 ++++--------------
10 files changed, 408 insertions(+), 457 deletions(-)
diff --git a/src/store/getters.js b/src/store/getters.js
index e79727d6..9f5c1c33 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -41,6 +41,7 @@ const getters = {
lastCanvasTaskId: state => state.reading.lastCanvasTaskId,
imageQuality: state => state.reading.imageQuality,
imageQualityIssues: state => state.reading.imageQualityIssues,
+ currentLoadIns: state => state.reading.currentLoadIns,
language: state => state.lang.language,
TotalNeedSignSystemDocCount: state => state.user.TotalNeedSignSystemDocCount,
TotalNeedSignTrialDocCount: state => state.user.TotalNeedSignTrialDocCount,
diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js
index 6ca73932..efe3cbc4 100644
--- a/src/store/modules/reading.js
+++ b/src/store/modules/reading.js
@@ -30,7 +30,8 @@ const getDefaultState = () => {
activeSeries: {},
lastCanvasTaskId: '',
imageQuality: null,
- imageQualityIssues: null
+ imageQualityIssues: null,
+ currentLoadIns: []
}
}
function getQuestions(questions) {
@@ -139,6 +140,22 @@ function getQuestionAnswer(questions, questionMark, answers) {
return ''
}
}
+// function getKeySeriesInfo(keyInstance, series) {
+// const obj = {}
+// const set = new Set()
+// var instances = series.instanceList.concat(keyInstance).filter((item) => {
+// if (set.has(item)) {
+// return true
+// } else {
+// set.add(item)
+// return false
+// }
+// })
+// instances.map(item => {
+// obj[item] = { seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex }
+// })
+// return obj
+// }
const state = getDefaultState
@@ -759,7 +776,17 @@ const actions = {
resolve()
} else {
var studyList = []
+ var keyImages = []
getReadingVisitStudyList(obj.trialId, obj.subjectVisitId, obj.visitTaskId).then(res => {
+ const i = res.Result.findIndex(i => i.IsCriticalSequence)
+ if (i > -1) {
+ const seriesList = res.Result[i].SeriesList && res.Result[i].SeriesList
+ seriesList.map(i => {
+ i.InstanceInfoList.map(k => {
+ keyImages.push({ instanceId: k.Id })
+ })
+ })
+ }
res.Result.forEach((study, studyIndex) => {
const data = {}
data.StudyId = study.StudyId
@@ -785,16 +812,22 @@ const actions = {
series.InstanceInfoList.forEach(instance => {
if (instance.NumberOfFrames && instance.NumberOfFrames > 1) {
for (let i = 0; i < instance.NumberOfFrames; i++) {
- const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}`
+ const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
imageIds.push(imageId)
}
- instance.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${0}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}`
+ instance.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${0}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
} else {
- const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}`
+ const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
imageIds.push(imageId)
instance.ImageId = imageId
}
-
+ if (!study.IsCriticalSequence && series.IsBeMark) {
+ const i = keyImages.findIndex(i => i.instanceId === instance.Id)
+ if (i > -1) {
+ keyImages[i].studyIndex = studyIndex
+ keyImages[i].seriesIndex = seriesIndex
+ }
+ }
instanceList.push(instance.Id)
})
seriesList.push({
@@ -837,6 +870,7 @@ const actions = {
})
state.visitTaskList[index].StudyList = studyList
state.visitTaskList[index].studyListInit = true
+ state.visitTaskList[index].KeyImages = keyImages
// sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
resolve()
}).catch(() => { resolve() })
@@ -895,11 +929,114 @@ const actions = {
resolve()
})
},
+ setImageLoadedProgress({ state }, obj) {
+ const studyIndex = parseInt(obj.idx.split('|')[0])
+ const seriesIndex = parseInt(obj.idx.split('|')[1])
+ const visitTaskIndex = parseInt(obj.idx.split('|')[2])
+ let pStudyIndex = null
+ let pSeriesIndex = null
+ let pSeries = null
+ try {
+ const study = state.visitTaskList[visitTaskIndex].StudyList[studyIndex]
+ const series = state.visitTaskList[visitTaskIndex].StudyList[studyIndex].SeriesList[seriesIndex]
+ const keyImages = state.visitTaskList[visitTaskIndex].KeyImages
+ if (study.IsCriticalSequence) {
+ const i = keyImages.findIndex(i => i.instanceId === obj.instanceId)
+ if (i > -1) {
+ pStudyIndex = keyImages[i].studyIndex
+ pSeriesIndex = keyImages[i].seriesIndex
+ }
+ } else if (series.isBeMark) {
+ if (keyImages.length > 0) {
+ pStudyIndex = 0
+ pSeriesIndex = 0
+ }
+ }
+ if (pStudyIndex !== null && pSeriesIndex !== null) {
+ pSeries = state.visitTaskList[visitTaskIndex].StudyList[pStudyIndex].SeriesList[pSeriesIndex]
+ }
+
+ var prefetchInstanceCount = series.prefetchInstanceCount
+ var instanceCount = series.instanceCount
+ var prefetchInstanceCount2 = pSeries ? pSeries.prefetchInstanceCount : null
+ var instanceCount2 = pSeries ? pSeries.instanceCount : null
+ if (series.imageloadedArr.indexOf(obj.instanceId) < 0) {
+ const i = state.currentLoadIns.findIndex(i => i.instanceId === obj.instanceId)
+ if (i > -1) {
+ prefetchInstanceCount = prefetchInstanceCount + obj.percentComplete - state.currentLoadIns[i].percentComplete
+ prefetchInstanceCount2 = prefetchInstanceCount2 !== null ? prefetchInstanceCount2 + obj.percentComplete - state.currentLoadIns[i].percentComplete : null
+ state.currentLoadIns[i].percentComplete = obj.percentComplete
+ if (obj.percentComplete >= 100) {
+ state.currentLoadIns.splice(i, 1)
+ }
+ } else {
+ if (obj.percentComplete !== 100) {
+ state.currentLoadIns.push({ instanceId: obj.instanceId, percentComplete: obj.percentComplete })
+ }
+ prefetchInstanceCount = prefetchInstanceCount + obj.percentComplete
+ prefetchInstanceCount2 = prefetchInstanceCount2 !== null ? prefetchInstanceCount2 + obj.percentComplete : null
+ }
+ series.prefetchInstanceCount = prefetchInstanceCount
+ if (pSeries) {
+ pSeries.prefetchInstanceCount = prefetchInstanceCount2
+ }
+ if (obj.percentComplete >= 100) {
+ series.imageloadedArr.push(obj.instanceId)
+ if (pSeries) {
+ pSeries.imageloadedArr.push(obj.instanceId)
+ }
+ }
+ }
+
+ if (prefetchInstanceCount >= instanceCount * 100) {
+ series.prefetchInstanceCount = instanceCount * 100
+ // 设置当前序列状态为已下载完成
+ series.loadStatus = true
+ }
+ if (prefetchInstanceCount2 !== null && instanceCount2 !== null && prefetchInstanceCount2 >= instanceCount2 * 100) {
+ pSeries.prefetchInstanceCount = instanceCount2 * 100
+ // 设置当前序列状态为已下载完成
+ pSeries.loadStatus = true
+ }
+ } catch (e) {
+ console.log('error')
+ }
+ },
setImageloadedInfo({ state }, obj) {
- var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
- const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount
- state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount = prefetchInstanceCount + 100
- state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr.push(obj.imageId)
+ console.log('setImageloadedInfo', obj)
+ // if(obj.instance === '20dd8fc9-51b0-ec63-942b-cb3006c72650')
+ // var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
+ // // const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount
+ // const instanceList = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].instanceList
+ // const idx = state.visitTaskList[index].StudyList.findIndex(i => i.IsCriticalSequence)
+
+ // if (!state.visitTaskList[index].StudyList[obj.studyIndex].IsCriticalSequence) {
+ // // 当前下载的非关键序列
+ // console.log('当前下载的非关键序列')
+ // if (idx > -1) {
+ // const keyInstance = state.visitTaskList[index].StudyList[idx].SeriesList[0].instanceList
+ // obj.markedImages = getKeySeriesInfo(keyInstance, state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex])
+ // instanceList.map(i => {
+ // if (obj.markedImages.hasOwnProperty(i) && state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr.indexOf(i) < 0) {
+ // state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr.push(i)
+ // state.visitTaskList[index].StudyList[idx].SeriesList[0].prefetchInstanceCount = state.visitTaskList[index].StudyList[idx].SeriesList[0].prefetchInstanceCount + 100
+ // }
+ // })
+ // if (state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr >= state.visitTaskList[index].StudyList[idx].SeriesList[0].instanceCount) {
+ // state.visitTaskList[index].StudyList[idx].SeriesList[0].loadStatus = true
+ // }
+ // }
+ // }
+ // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].instanceCount * 100
+ // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr = instanceList
+ // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].loadStatus = true
+ // const imageloadedArr = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr
+ // if (imageloadedArr.indexOf())
+
+ // if (state.visitTaskList[index].StudyList[0].IsCriticalSequence){
+ // state.visitTaskList[index].StudyList[0].SeriesList[0].prefetchInstanceCount = prefetchInstanceCount + 100
+ // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr.push(obj.imageId)
+ // }
},
setStatus({ state }, obj) {
var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 8ccbc807..37a76e12 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -13,7 +13,7 @@
-
-
-
-
{{ file.FileName }} + -
+
+ + {{ file.FileName }} + ++
- ![]()
-
-
-
-
-
+
+ ![]()
+
+
+
+
+
+
-
-
-
-
{{ file.FileName }} + -
+
+ + {{ file.FileName }} + ++
-
-
-
+ {{ instance.InstanceNumber }}
- {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
-
+
@@ -885,6 +877,18 @@ export default {
border: 1px solid #2c2c2c;
padding: 5px;
}
+.frame_list{
+ max-height: 500px;
+ overflow-y: auto;
+}
+.instance_frame_wrapper ::-webkit-scrollbar {
+ width: 7px;
+ height: 7px;
+}
+.instance_frame_wrapper ::-webkit-scrollbar-thumb {
+ border-radius: 10px;
+ background: #d0d0d0;
+}
.frame_content{
height: 50px;
padding: 5px;
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index 05b0a943..34a204a8 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -200,28 +200,20 @@
trigger="hover"
popper-class="instance_frame_wrapper"
>
-
+
+
+ {{ instance.InstanceNumber }}
+ {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+
-
-
-
+ {{ instance.InstanceNumber }}
- {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
-
+
@@ -901,6 +893,18 @@ export default {
border: 1px solid #2c2c2c;
padding: 5px;
}
+.frame_list{
+ max-height: 500px;
+ overflow-y: auto;
+}
+.instance_frame_wrapper ::-webkit-scrollbar {
+ width: 7px;
+ height: 7px;
+}
+.instance_frame_wrapper ::-webkit-scrollbar-thumb {
+ border-radius: 10px;
+ background: #d0d0d0;
+}
.frame_content{
height: 50px;
padding: 5px;
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 44d8db0f..23d98a76 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
@@ -67,28 +67,20 @@
trigger="hover"
popper-class="instance_frame_wrapper"
>
-
+
+
+ {{ instance.InstanceNumber }}
+ {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+
+
@@ -1022,6 +1014,18 @@ export default {
border: 1px solid #2c2c2c;
padding: 5px;
}
+.frame_list{
+ max-height: 500px;
+ overflow-y: auto;
+}
+.instance_frame_wrapper ::-webkit-scrollbar {
+ width: 7px;
+ height: 7px;
+}
+.instance_frame_wrapper ::-webkit-scrollbar-thumb {
+ border-radius: 10px;
+ background: #d0d0d0;
+}
.frame_content{
height: 50px;
padding: 5px;
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 f00cabf5..411bca95 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
@@ -67,28 +67,30 @@
trigger="hover"
popper-class="instance_frame_wrapper"
>
-
-
+
{{ instance.InstanceNumber }}
{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
-
-
-
+ {{ instance.InstanceNumber }}
- {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
-
+
@@ -954,6 +956,18 @@ export default {
border: 1px solid #2c2c2c;
padding: 5px;
}
+.frame_list{
+ max-height: 500px;
+ overflow-y: auto;
+}
+.instance_frame_wrapper ::-webkit-scrollbar {
+ width: 7px;
+ height: 7px;
+}
+.instance_frame_wrapper ::-webkit-scrollbar-thumb {
+ border-radius: 10px;
+ background: #d0d0d0;
+}
.frame_content{
height: 50px;
padding: 5px;
From 73a6935fb8e5676765291cfaa84cbbf43b69ef54 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Wed, 31 Jul 2024 10:06:19 +0800
Subject: [PATCH 22/23] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0?=
=?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AE=BF=E9=97=AE=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/trials/trials-layout/components/trialsNavbar.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index bc036840..5d6720fb 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -162,7 +162,7 @@ export default {
this.logout();
break;
case "4-4":
- this.go("/system");
+ this.go("/dashboard/list");
break;
case "1":
this.go("/trials/trials-workbench");
From 4b6c5898815078a499a28e5f4d1a9399b7123aee Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Wed, 31 Jul 2024 10:06:54 +0800
Subject: [PATCH 23/23] =?UTF-8?q?=E9=94=81=E5=AE=9AMFA=E9=AA=8C=E8=AF=81?=
=?UTF-8?q?=E9=82=AE=E7=AE=B1=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main.js b/src/main.js
index a9e2f218..762ef18e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -446,7 +446,7 @@ async function VueInit() {
Vue.prototype.$MFA({
status: "lock",
UserId: my_userid,
- EMail: my_EMail,
+ EMail: res.Result,
username: my_username,
callBack: () => {
closeLock(_vm)
+
+
+
+ {{ instance.InstanceNumber }}
+ {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+