样式调整

.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-12/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-30/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true

.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-11/'
+VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-30/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true

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==",
+      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw=="
-      "dev": true
     },
     "@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==",
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
-          "dev": true
         },
         "semver": {
           "version": "6.3.1",
           "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-          "dev": true
+        }
+      }
+    },
+    "@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==",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-          "dev": true
         },
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
-          "dev": true
         }
       }
     },
@@ -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==",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
-      "dev": true
     },
     "@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==",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ=="
-      "dev": true
     },
     "@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==",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
-      "dev": true
     },
     "@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==",
+      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw=="
-      "dev": true
     },
     "@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==",
+          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-          "dev": true
         }
       }
     },
@@ -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==",
+          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-          "dev": true
         }
       }
     },
@@ -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==",
+          "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
-          "dev": true
         }
       }
     },
@@ -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==",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="
-      "dev": true
     },
     "@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==",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
-      "dev": true
     },
     "@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==",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
-      "dev": true
     },
     "@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==",
+      "integrity": "sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A=="
-      "dev": true
     },
     "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==",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
-      "dev": true
     },
     "cookie": {
       "version": "0.5.0",
@@ -6555,12 +6613,32 @@
       }
     },
     "cornerstone-wado-image-loader": {
-      "version": "3.3.2",
+      "version": "4.13.2",
-      "resolved": "https://registry.npmmirror.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-3.3.2.tgz",
+      "resolved": "https://registry.npmmirror.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-4.13.2.tgz",
-      "integrity": "sha512-Yy0DtfSMlflMS5RMQhX9YnXiYYkZz99nnXG2qtBRvzvSdwqiElIpE13sKw0Ohi4mqNwrWRx0xt8utk0HKnAXyw==",
+      "integrity": "sha512-NGqH44bY1VMY8OYuVykkLriNtZQrmoZU/S6f/1t1xX3rMc+WUMNN+yi4Nu3jp6nckLdH/bVGiigoJXrp0dTrAg==",
       "requires": {
-        "dicom-parser": "^1.8.3",
+        "@babel/eslint-parser": "^7.19.1",
-        "pako": "^1.0.10"
+        "@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==",
+      "integrity": "sha512-ZtRpDxrjHapOwxtv+nuth5ByB8clyn8crVynmRNGO3wG3LOp8RTcyZDqwaI6Ng6y8FCK2hVZmJoqwCskKbNMaw=="
-      "dev": true
     },
     "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==",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
-      "dev": true
     },
     "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==",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-          "dev": true
         }
       }
     },
     "estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
-      "dev": true
     },
     "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==",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
-      "dev": true
     },
     "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==",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
-      "dev": true
     },
     "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==",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-          "dev": true
         }
       }
     },
@@ -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==",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
-      "dev": true
     },
     "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",

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-core": "^2.6.1",
-    "cornerstone-math": "^0.1.8",
+    "cornerstone-math": "^0.1.10",
-    "cornerstone-tools": "^6.0.8",
+    "cornerstone-tools": "^6.0.10",
-    "cornerstone-wado-image-loader": "^3.1.2",
+    "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",

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
@@ -871,194 +873,197 @@ export default {
       synchronizer.remove(this.$refs.canvas)
       this.setAllToolsPassive()
     },
-    onContextmenu(event) {
+    onContextmenu(e) {
-      const colormapsList = cornerstone.colors.getColormapsList()
+      e.stopImmediatePropagation()
-      const colorItems = []
+      e.stopPropagation()
-      colorItems.push({
+      e.preventDefault()
-        label: '默认值',
+      // const colormapsList = cornerstone.colors.getColormapsList()
-        onClick: () => {
+      // const colorItems = []
-          this.setColormap()
+      // colorItems.push({
-        }
+      //   label: '默认值',
-      })
+      //   onClick: () => {
-      colormapsList.forEach(colormap => {
+      //     this.setColormap()
-        const item = {}
+      //   }
-        item.label = colormap.name
+      // })
-        item.onClick = () => {
+      // colormapsList.forEach(colormap => {
-          this.setColormap(colormap.id)
+      //   const item = {}
-        }
+      //   item.label = colormap.name
-        colorItems.push(item)
+      //   item.onClick = () => {
-      })
+      //     this.setColormap(colormap.id)
-      this.$contextmenu({
+      //   }
-        items: [
+      //   colorItems.push(item)
-          {
+      // })
-            label: '移动',
+      // this.$contextmenu({
-            divided: true,
+      //   items: [
-            onClick: () => {
+      //     {
-              this.setToolActive('Pan')
+      //       label: '移动',
-            }
+      //       divided: true,
-          },
+      //       onClick: () => {
-          {
+      //         this.setToolActive('Pan')
-            label: '缩放',
+      //       }
-            divided: true,
+      //     },
-            children: [
+      //     {
-              {
+      //       label: '缩放',
-                label: '自由缩放',
+      //       divided: true,
-                onClick: () => {
+      //       children: [
-                  this.setToolActive('Zoom')
+      //         {
-                }
+      //           label: '自由缩放',
-              },
+      //           onClick: () => {
-              {
+      //             this.setToolActive('Zoom')
-                label: '适应图像',
+      //           }
-                onClick: () => {
+      //         },
-                  this.fitToWindow()
+      //         {
-                }
+      //           label: '适应图像',
-              },
+      //           onClick: () => {
-              {
+      //             this.fitToWindow()
-                label: '适应窗口',
+      //           }
-                onClick: () => {
+      //         },
-                  this.fitToImage()
+      //         {
-                }
+      //           label: '适应窗口',
-              }
+      //           onClick: () => {
-            ]
+      //             this.fitToImage()
-          },
+      //           }
-          {
+      //         }
-            label: '透镜',
+      //       ]
-            divided: true,
+      //     },
-            onClick: () => {
+      //     {
-              this.setToolActive('Magnify')
+      //       label: '透镜',
-            }
+      //       divided: true,
-          },
+      //       onClick: () => {
-          {
+      //         this.setToolActive('Magnify')
-            label: '旋转',
+      //       }
-            divided: true,
+      //     },
-            children: [
+      //     {
-              {
+      //       label: '旋转',
-                label: '默认值',
+      //       divided: true,
-                onClick: () => {
+      //       children: [
-                  this.resetRotate()
+      //         {
-                }
+      //           label: '默认值',
-              },
+      //           onClick: () => {
-              {
+      //             this.resetRotate()
-                label: '自由旋转',
+      //           }
-                onClick: () => {
+      //         },
-                  this.setToolActive('Rotate')
+      //         {
-                }
+      //           label: '自由旋转',
-              },
+      //           onClick: () => {
-              {
+      //             this.setToolActive('Rotate')
-                label: '水平翻转',
+      //           }
-                onClick: () => {
+      //         },
-                  this.setRotate(true, false, 0)
+      //         {
-                }
+      //           label: '水平翻转',
-              },
+      //           onClick: () => {
-              {
+      //             this.setRotate(true, false, 0)
-                label: '垂直翻转',
+      //           }
-                onClick: () => {
+      //         },
-                  this.setRotate(false, true, 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: '右转90度',
+      //           }
-                onClick: () => {
+      //         },
-                  this.setRotate(false, false, 90)
+      //         {
-                }
+      //           label: '右转90度',
-              }
+      //           onClick: () => {
-            ]
+      //             this.setRotate(false, false, 90)
-          },
+      //           }
+      //         }
+      //       ]
+      //     },
 
-          {
+      //     {
-            label: '测量',
+      //       label: '测量',
-            divided: true,
+      //       divided: true,
-            minWidth: 0,
+      //       minWidth: 0,
-            children: [
+      //       children: [
-              {
+      //         {
-                label: '探针',
+      //           label: '探针',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('Probe')
+      //             this.setToolActive('Probe')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '长度测量',
+      //           label: '长度测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('Length')
+      //             this.setToolActive('Length')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '角度测量',
+      //           label: '角度测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('Angle')
+      //             this.setToolActive('Angle')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: 'Cobb测量',
+      //           label: 'Cobb测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('CobbAngle')
+      //             this.setToolActive('CobbAngle')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '椭圆测量',
+      //           label: '椭圆测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('EllipticalRoi')
+      //             this.setToolActive('EllipticalRoi')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '矩形测量',
+      //           label: '矩形测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('RectangleRoi')
+      //             this.setToolActive('RectangleRoi')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '多边形标记',
+      //           label: '多边形标记',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('FreehandRoi')
+      //             this.setToolActive('FreehandRoi')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '十字线',
+      //           label: '十字线',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('Bidirectional')
+      //             this.setToolActive('Bidirectional')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '文字标注',
+      //           label: '文字标注',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('ArrowAnnotate')
+      //             this.setToolActive('ArrowAnnotate')
-                }
+      //           }
-              }
+      //         }
-            ]
+      //       ]
-          },
+      //     },
-          {
+      //     {
-            label: '调窗',
+      //       label: '调窗',
-            divided: true,
+      //       divided: true,
-            onClick: () => {
+      //       onClick: () => {
-              this.setToolActive('Wwwc')
+      //         this.setToolActive('Wwwc')
-            }
+      //       }
-          },
+      //     },
-          {
+      //     {
-            label: '反色',
+      //       label: '反色',
-            divided: true,
+      //       divided: true,
-            onClick: () => {
+      //       onClick: () => {
-              this.toggleInvert()
+      //         this.toggleInvert()
-            }
+      //       }
-          },
+      //     },
-          {
+      //     {
-            label: '伪彩',
+      //       label: '伪彩',
-            children: colorItems
+      //       children: colorItems
-          }
+      //     }
-        ],
+      //   ],
-        event,
+      //   event,
-        // x: event.clientX,
+      //   // x: event.clientX,
-        // y: event.clientY,
+      //   // y: event.clientY,
-        customClass: 'class-a',
+      //   customClass: 'class-a',
-        zIndex: 3,
+      //   zIndex: 3,
-        minWidth: 100
+      //   minWidth: 100
-      })
+      // })
-      return false
+      // return false
     },
     getToolSate() {
       const toolROITypes = [

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",
           },
         ],
@@ -201,4 +201,7 @@ export default {
     margin-right: 5px;
   }
 }
+::v-deep .el-dialog__header{
+  font-weight: bold;
+}
 </style>

src/main.js

@@ -130,7 +130,8 @@ Vue.prototype.$validatePassword = (rule, value, callback) => {
   /* eslint-disable */
   var reg1 = eval(process.env.VUE_APP_PASSWORD_FOR_PERMISSION) ? new RegExp(`${process.env.VUE_APP_PASSWORD_FOR_REGULAR}`) : /.*/g; //密码必须是8位以上、必须含有字母、数字、特殊符号
   if (!reg1.test(value)) {
-    callback(lang === 'zh' ? new Error("密码必须包含：1）8 – 32 个字符；2）至少1个数字；3) 至少1个大写字母；4）至少1个小写字母；5）至少1个特殊字符 (~!-@#$%^&*_+?)") : new Error('Passwords must have: 1) 8 - 32 characters; 2) At least 1 number; 3) At least 1 uppercase letter; 4) At least 1 lowercase letter; 5) At least 1 special character (~!-@#$%^&*_+?) '))
+    callback(
+      new Error(_vm.$t('env:regExp:formatPassword')))
   } else {
     callback();
   }
@@ -306,7 +307,7 @@ async function VueInit() {
       if (_vm.$store.state.user.userId !== zzSessionStorage.getItem('userId')) {
         window.location.href = `/login`
         zzSessionStorage.removeItem('lastWorkbench')
-        _vm.$alert(lang === 'en' ? 'The same browser only allows one user account to be logged in at a time.' : '同一浏览器只允许同时登陆一个账户', {
+        _vm.$alert(_vm.$t("env:sso:tip"), {
           type: 'warning',
         })
       }
@@ -367,13 +368,18 @@ async function VueInit() {
     }
     _vm.$store.dispatch('user/logout').then(res => {
       // window.location.href = `/login`
-      _vm.$msgbox.close();
+      if (_vm.$msgbox) {
+        _vm.$msgbox.close();
+      }
       isOpen = false
       isLock = null
       zzSessionStorage.removeItem('isLock')
       router.push("/login")
     }).then(() => {
-      _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登陆！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', {
+      // _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登陆！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', {
+      //   type: 'warning',
+      // })
+      _vm.$alert(_vm.$t("env:loginOut"), {
         type: 'warning',
       })
     })
@@ -397,17 +403,17 @@ async function VueInit() {
       isOpen = true
       zzSessionStorage.setItem('isLock', 'true')
       _vm.$msgbox({
-        title: lang === 'zh' ? '已锁定' : 'Locked',
+        title: _vm.$t("env:lock:msgBox:title"),
-        confirmButtonText: lang === 'zh' ? '解锁' : 'Unlock',
+        confirmButtonText: _vm.$t("env:lock:msgBox:confirmButtonText"),
         showClose: false,
         beforeClose: (action, instance, done) => {
           if (action === 'confirm') {
             if (!_vm.unlock.my_username) {
-              _vm.$alert(lang === 'zh' ? '请输入您的用户名解锁' : 'Please enter your user name to unlock.')
+              _vm.$alert(_vm.$t("env:lock:msgBox:iupUser"))
               return
             }
             if (!_vm.unlock.my_password) {
-              _vm.$alert(lang === 'zh' ? '请输入您的密码解锁' : 'Please enter the correct password to unlock.')
+              _vm.$alert(_vm.$t("env:lock:msgBox:inpPassword"))
               return
             }
             var my_username = zzSessionStorage.getItem('my_username')
@@ -418,7 +424,7 @@ async function VueInit() {
               resetReadingRestTime().then(() => {
               })
               const closeLock = (_vm) => {
-                _vm.$message.success(lang === 'zh' ? '解锁成功，请继续操作' : 'Unlocked successfully. Please continue operation.')
+                _vm.$message.success(_vm.$t("env:lock:msgBox:lockSuccess"))
                 _vm.unlock = {
                   my_username: null,
                   my_password: null
@@ -440,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)
@@ -453,7 +459,7 @@ async function VueInit() {
 
             } else {
               // console.log(111)
-              _vm.$message.error(lang === 'zh' ? '请输入正确用户名密码' : 'Please enter the correct password.')
+              _vm.$message.error(_vm.$t('env:lock:msgBox:userFail'))
             }
           }
         },
@@ -462,7 +468,7 @@ async function VueInit() {
             props: { labelWidth: "80px" }
           }, [
             h('el-form-item', {
-              props: { label: lang === 'zh' ? '用户名' : 'Username' },
+              props: { label: _vm.$t("env:lock:msgBox:form:username") },
             }, [
               h('input', {
                 props: {
@@ -484,7 +490,7 @@ async function VueInit() {
               })
             ]),
             h('el-form-item', {
-              props: { label: lang === 'zh' ? '密码' : 'Password' },
+              props: { label: _vm.$t("env:lock:msgBox:form:Password") },
             }, [
               h('input', {
                 props: {

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,

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)
+    console.log('setImageloadedInfo', obj)
-    const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount
+    // if(obj.instance === '20dd8fc9-51b0-ec63-942b-cb3006c72650')
-    state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount = prefetchInstanceCount + 100
+    // var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
-    state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr.push(obj.imageId)
+    // // 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)

src/utils/uploadZip.js

@@ -2,12 +2,14 @@ import JSZip from "jszip";
 import axios from "axios";
 import { saveAs } from "file-saver";
 import Vue from 'vue';
+import store from "@/store";
 import {
     requestPackageAndAnonymizImage,
 } from "@/api/load.js";
 let flag = {};
 export const resetFlag = () => {
-    flag = {}
+    flag = {};
+    store.dispatch("trials/setUnLock", false);
 }
 export const downloadImage = async (id, id2, IsDicom = true) => {
     if (flag[`${id2}_${IsDicom}`]) return Vue.prototype.$message.warning(Vue.prototype.$t('trials:upload:tip:uploading'));
@@ -18,6 +20,7 @@ export const downloadImage = async (id, id2, IsDicom = true) => {
             SubjectVisitId: id2,
             IsDicom: IsDicom
         }
+        store.dispatch("trials/setUnLock", true);
         let res = await requestPackageAndAnonymizImage(params);
         if (res.IsSuccess) {
             if (!res.Result) {
@@ -153,6 +156,7 @@ export const fileDownload = (content, filename) => {
 let download = async (downloadUrl, downloadFileName, res) => {
     const blob = await getBlob(downloadUrl);
     flag[`${res.id2}_${res.IsDicom}`] = false;
+    store.dispatch("trials/setUnLock", false);
     saveAsB(blob, downloadFileName);
 }
 

src/views/dicom-show/dicom-study.vue

@@ -56,28 +56,20 @@
                                 trigger="hover"
                                 popper-class="instance_frame_wrapper"
                               >
-                                <div
+                                <div class="frame_list">
-                                  v-for="(instance, idx) in item.instanceInfoList"
+                                  <div
-                                  :key="instance.Id"
+                                    v-for="(instance, idx) in item.instanceInfoList"
-                                  class="frame_content"
+                                    :key="instance.Id"
-                                  :style="{'margin-bottom':idx<item.instanceInfoList.length-1? '5px':'0px'}"
+                                    class="frame_content"
-                                  @click="showMultiFrames(item, index, instance)"
+                                    :style="{'margin-bottom':idx<item.instanceInfoList.length-1? '5px':'0px'}"
-                                >
+                                    @click="showMultiFrames(item, index, instance)"
-                                  <!-- <div>
+                                  >
-                                        <img
+                                    <div>
-                                          class="image-preview"
+                                      <div>{{ instance.InstanceNumber }}</div>
-                                          :src="series.previewImageUrl"
+                                      <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                                          crossorigin="anonymous"
+                                    </div>
-                                          alt=""
-                                          style="width: 40px;height:40px;"
-                                          fit="fill"
-                                        >
-                                      </div> -->
-                                  <div>
-                                    <div>{{ instance.InstanceNumber }}</div>
-                                    <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                                  </div>
 
+                                  </div>
                                 </div>
                                 <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
                               </el-popover>
@@ -155,7 +147,8 @@ 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
+cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
   components: {
     'dicom-viewer': dicomViewer
@@ -658,7 +651,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
@@ -884,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;

src/views/dicom-show/dicom-visit.vue

@@ -200,28 +200,20 @@
                                     trigger="hover"
                                     popper-class="instance_frame_wrapper"
                                   >
-                                    <div
+                                    <div class="frame_list">
-                                      v-for="(instance, idx) in seriesItem.instanceInfoList"
+                                      <div
-                                      :key="instance.Id"
+                                        v-for="(instance, idx) in seriesItem.instanceInfoList"
-                                      class="frame_content"
+                                        :key="instance.Id"
-                                      :style="{'margin-bottom':idx<seriesItem.instanceInfoList.length-1? '5px':'0px'}"
+                                        class="frame_content"
-                                      @click="showMultiFrames(studyIndex,seriesItem, index, instance)"
+                                        :style="{'margin-bottom':idx<seriesItem.instanceInfoList.length-1? '5px':'0px'}"
-                                    >
+                                        @click="showMultiFrames(studyIndex,seriesItem, index, instance)"
-                                      <!-- <div>
+                                      >
-                                        <img
+                                        <div>
-                                          class="image-preview"
+                                          <div>{{ instance.InstanceNumber }}</div>
-                                          :src="series.previewImageUrl"
+                                          <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                                          crossorigin="anonymous"
+                                        </div>
-                                          alt=""
-                                          style="width: 40px;height:40px;"
-                                          fit="fill"
-                                        >
-                                      </div> -->
-                                      <div>
-                                        <div>{{ instance.InstanceNumber }}</div>
-                                        <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                                      </div>
 
+                                      </div>
                                     </div>
                                     <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
                                   </el-popover>
@@ -274,7 +266,8 @@ 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
+cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
   name: 'DicomsOfVisit',
   components: {
@@ -690,7 +683,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
@@ -900,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;

src/views/login/index.vue

@@ -119,7 +119,7 @@
             {{ $t("login:button:login") }}
           </el-button>
           <div style="text-align: right">
-            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
+            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
             <!-- Forget password? -->
             <el-button
               type="text"
@@ -183,7 +183,7 @@
           {{ $t("login:title:system_title") }}
         </p>
         <p style="margin-bottom: 20px" v-else>{{ $t("login:title:system") }}</p>
-        <p style="margin-bottom: 20px">V1.5.3.001</p>
+        <p style="margin-bottom: 20px">V1.5.4.001</p>
         <p style="margin-bottom: 20px" v-if="language === 'zh'">
           Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
           版权所有
@@ -269,7 +269,7 @@ export default {
       this.setLanguage("en");
       this.$updateDictionary();
     } else {
-      if (this.location === "USA") {
+      if (this.location === "USA" || this.NODE_ENV === "usa") {
         this.$i18n.locale = "en";
         this.setLanguage("en");
         this.$updateDictionary();

src/views/none-dicom-show/index.vue

@@ -121,7 +121,7 @@ export default {
     // 获取非Dicom检查信息
     getNoneDicomList() {
       this.loading = true
-      getNoneDicomStudyList(this.subjectVisitId, this.studyId, true).then(res => {
+      getNoneDicomStudyList(this.subjectVisitId, this.studyId).then(res => {
         this.studyList = res.Result
         this.loading = false
         const studyIndex = this.studyList.findIndex(item => {

src/views/none-dicom-show/multiple.vue

@@ -62,7 +62,7 @@ export default {
     // 获取非Dicom检查信息
     getNoneDicomList() {
       this.loading = true
-      getNoneDicomStudyList(this.subjectVisitId, '', true).then(res => {
+      getNoneDicomStudyList(this.subjectVisitId, '').then(res => {
         this.noneDicomStudyList = res.Result
         this.loading = false
         const study = this.noneDicomStudyList.find((item, index) => {

src/views/system/login-log/index.vue

@@ -85,13 +85,13 @@
           sortable="custom"
           show-overflow-tooltip
         />
-        <el-table-column
+        <!-- <el-table-column
           :label="$t('trials:loginLog:table:IPRegion')"
           prop="IPRegion"
           min-width="120"
           show-overflow-tooltip
           sortable="custom"
-        />
+        /> -->
         <el-table-column
           :label="$t('system:loginLog:table:LoginFaildName')"
           prop="LoginFaildName"

src/views/trials/trials-layout/components/trialsNavbar.vue

@@ -93,7 +93,7 @@
           }}</el-menu-item>
         </el-submenu>
       </el-menu>
-      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
+      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
     </div>
   </div>
 </template>
@@ -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");

src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue

@@ -13,7 +13,7 @@
     <!-- 临床数据 -->
     <div v-if="stack.isExistsClinicalData" class="info-cd" @click.stop="handleViewCD($event)">
       <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:clinicalData')" placement="bottom">
-        <svg-icon icon-class="documentation" class="svg-icon"/>
+        <svg-icon icon-class="documentation" class="svg-icon" />
       </el-tooltip>
 
     </div>
@@ -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) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame && data.MeasureData) || (!this.stack.isExistMutiFrames && data.MeasureData))) {
-
-          if (this.stack.instanceId.includes(data.InstanceId) && ((data.NumberOfFrames === this.stack.frame) || !data.NumberOfFrames) && 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,10 +1200,10 @@ 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()
+        // this.resetWwwc()
         resolve()
       })
     },
@@ -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)
@@ -1942,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) {

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() {
+    async getWwcTpl() {
-      const loading = this.$loading({ fullscreen: true })
+      // const loading = this.$loading({ fullscreen: true })
-      getUserWLTemplateList().then(res => {
+      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 (e) {
-      }).catch(() => { loading.close() })
+        console.log(e)
+      }
     },
-    getHotKeys() {
+    async getHotKeys() {
-      const loading = this.$loading({ fullscreen: true })
+      // const loading = this.$loading({ fullscreen: true })
-      getDoctorShortcutKey({ imageToolType: 0 }).then(res => {
+      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 (e) {
-      }).catch(() => {
+        console.log(e)
-        loading.close()
+      }
-      })
     },
     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

src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue

@@ -7,7 +7,7 @@
         {{ language==='en'?question.GroupEnName:question.GroupName }}
       </h4>
     </div>
-    <template v-else-if="((question.QuestionType === 56 || question.QuestionType === 57) && question.IsBaseLineTask)" />
+    <template v-else-if="((question.QuestionType === 56) && question.IsBaseLineTask)" />
     <template v-else>
       <el-form-item
         v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0"

src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue

@@ -29,7 +29,7 @@
                   class="title"
                 >
                   {{ item.QuestionName }}
-                  <span v-if="isFirstChangeTask && item.TableQuestions.Answers.length > 0" style="color:red;font-size: 12px;">(请重新评估)</span>
+                  <span v-if="isFirstChangeTask && item.TableQuestions.Answers.length > 0" style="color:red;font-size: 12px;">{{ $t("trials:reading:dicom:IRecist:reevaluate") }}</span>
                 </div>
                 <div v-else class="title">
                   {{ item.QuestionName }}

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)
     }
   }
 }

src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue

@@ -67,28 +67,20 @@
                         trigger="hover"
                         popper-class="instance_frame_wrapper"
                       >
-                        <div
+                        <div class="frame_list">
+                          <div
                           v-for="(instance, idx) in series.instanceInfoList"
                           :key="instance.Id"
                           class="frame_content"
                           :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
                           @click.stop="showMultiFrames(index,series, i, instance)"
                         >
-                          <!-- <div>
-                                        <img
-                                          class="image-preview"
-                                          :src="series.previewImageUrl"
-                                          crossorigin="anonymous"
-                                          alt=""
-                                          style="width: 40px;height:40px;"
-                                          fit="fill"
-                                        >
-                                      </div> -->
                           <div>
                             <div>{{ instance.InstanceNumber }}</div>
                             <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
                           </div>
 
+                        </div>
                         </div>
                         <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;color: #ffeb3b;" />
                       </el-popover>
@@ -158,18 +150,13 @@
   </div>
 </template>
 <script>
-import * as dicomParser from 'dicom-parser'
+// import * as cornerstone from 'cornerstone-core'
-import * as cornerstone from 'cornerstone-core'
-import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import requestPoolManager from '@/utils/request-pool'
 import DicomEvent from './DicomEvent'
 import { mapGetters } from 'vuex'
 import store from '@/store'
 import SrList from './SrList'
-cornerstoneWADOImageLoader.external.dicomParser = dicomParser
+
-cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
-cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
   name: 'StudyList',
   components: { SrList },
@@ -218,9 +205,7 @@ export default {
       srDialogVisible: false,
       srInfo: {},
       digitPlaces: 2,
-      visitTaskIdx: -1,
+      visitTaskIdx: -1
-      currentLoadIns: [],
-      keySeriesLoad: []
     }
   },
 
@@ -270,18 +255,18 @@ export default {
     //   }
     // })
     // const debouncedInputHandler = this.debounce(this.cornerstoneimageloadprogress, 100)
-    cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
+    // cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
-    cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded)
+    // cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded)
     // cornerstone.events.addEventListener('cornerstoneimagecachefull', this.cornerstoneimagecachefull)
     // cornerstone.events.addEventListener('cornerstoneimagecachechanged', this.cornerstoneimagecachechanged)
-    window.addEventListener('beforeunload', e => {
+    // window.addEventListener('beforeunload', e => {
-      cornerstone.imageCache.purgeCache()
+    //   cornerstone.imageCache.purgeCache()
-    })
+    // })
   },
   beforeDestroy() {
-    cornerstone.imageCache.purgeCache()
+    // cornerstone.imageCache.purgeCache()
     DicomEvent.$off('refreshStudyListMeasureData')
-    window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
+    // window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
   },
   methods: {
     debounce(fn, delay) {
@@ -360,8 +345,27 @@ export default {
             this.studyIndex = sIdx
             this.seriesIndex = 0
             this.activeNames = [`${this.studyList[sIdx].StudyId}`]
-
+            // 下载关键序列
-            this.loadImages(this.visitTaskList[idx])
+            const i = this.studyList.findIndex(i => i.IsCriticalSequence)
+            if (i > -1 && this.studyList[i].SeriesList[0].length > 0) {
+              const series = this.studyList[i].SeriesList[0]
+              if (!series.loadStatus) {
+                let priority = parseInt(new Date().getTime())
+                if (series.isExistMutiFrames) {
+                  series.instanceInfoList.map(image => {
+                    priority = priority - 1
+                    this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: i, seriesIndex: 0, visitTaskId: series.visitTaskId, priority })
+                  })
+                } else {
+                  series.imageIds.map(imageId => {
+                    priority = priority - 1
+                    this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: i, seriesIndex: 0, visitTaskId: series.visitTaskId, priority })
+                  })
+                }
+              }
+            }
+            this.loopLoad()
+            // this.loadImages(this.visitTaskList[idx])
           }
         }
         this.isRender = true
@@ -369,7 +373,6 @@ export default {
     },
 
     async getInitSeries() {
-      console.log('getInitSeries')
       var seriesList = []
       var isReadingTaskViewInOrder = parseInt(this.$router.currentRoute.query.isReadingTaskViewInOrder)
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
@@ -444,9 +447,10 @@ export default {
           const sdIndx = studyList.findIndex(sd => sd.StudyId === measureDatas[i].StudyId)
           const seriesList = studyList[sdIndx].SeriesList
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[i].SeriesId)
-          // const instanceList = seriesList[srIdx].imageIds
+          // const instanceList = seriesList[srIdx].instanceList
-          const instanceList = seriesList[srIdx].instanceList
+          const imageIds = seriesList[srIdx].imageIds
-          const isIdx = instanceList.findIndex(is => is.includes(measureDatas[i].InstanceId))
+          const filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}` : `instanceId=${measureDatas[i].InstanceId}`
+          const isIdx = imageIds.findIndex(is => is.includes(filterStr))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx
 
@@ -517,8 +521,9 @@ export default {
           const seriesList = studyList[sdIndx].SeriesList
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId)
           // const instanceList = seriesList[srIdx].imageIds
-          const instanceList = seriesList[srIdx].instanceList
+          const imageIds = seriesList[srIdx].imageIds
-          const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId))
+          const filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}` : `instanceId=${measureDatas[mIdx].InstanceId}`
+          const isIdx = imageIds.findIndex(is => is.includes(filterStr))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx
 
@@ -616,7 +621,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 = 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
@@ -658,18 +665,20 @@ export default {
     },
     showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) {
       this.currentSeriesIndex = seriesIndex
+      var idx = this.visitTaskIdx
       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}`)
+          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}`)
+        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)
@@ -712,7 +721,8 @@ export default {
       var activeNames = `${this.studyList[obj.studyIndex].StudyId}`
       if (this.activeNames.includes(activeNames)) return
       this.activeNames.push(activeNames)
-      this.loadImages(this.visitTaskList[idx])
+      // console.log('setSeriesActive', obj)
+      this.loadImages(obj)
     },
     selectSeries(obj) {
       var seriseList = this.studyList.map(s => s.SeriesList).flat()
@@ -737,10 +747,27 @@ export default {
       var activeNames = `${this.studyList[series.studyIndex].StudyId}`
       if (this.activeNames.includes(activeNames)) return
       this.activeNames.push(activeNames)
-      this.loadImages(this.visitTaskList[idx])
+      this.loadImages(series)
       store.dispatch('reading/setActiveSeries', series)
     },
-    loadImages(taskInfo) {
+    loadImages(series) {
+      var priority = parseInt(new Date().getTime())
+      if (!series.loadStatus && series.isDicom && series.modality !== 'SR') {
+        if (series.isExistMutiFrames) {
+          series.instanceInfoList.map(image => {
+            priority = priority - 1
+            this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex, visitTaskId: series.visitTaskId, priority })
+          })
+        } else {
+          series.imageIds.map(imageId => {
+            priority = priority - 1
+            this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex, visitTaskId: series.visitTaskId, priority })
+          })
+        }
+      }
+      this.loopLoad()
+    },
+    loadImages1(taskInfo) {
       // const isBaseLineTask = taskInfo.IsBaseLineTask
       const isCurrentTask = taskInfo.IsCurrentTask
       // var priority = isCurrentTask ? parseInt(new Date().getTime()) : 999
@@ -832,141 +859,6 @@ export default {
       console.log('stopLoadSeries')
       requestPoolManager.removeTask(series.seriesId)
       this.$set(this.studyList[studyIndex].SeriesList[seriesIndex], 'isLoading', false)
-    },
-    async imageLoaded(image, seriesUid) {
-      // await store.dispatch('reading/updateStudyList', { visitTaskId: image.visitTaskId, imageId: image.imageId, seriesUid })
-      // console.log(this.studyList[image.studyIndex].SeriesList[image.seriesIndex])
-      if (image.studyIndex > -1 && image.seriesIndex > -1) {
-        var prefetchInstanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount
-        var instanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].instanceCount
-        if (this.studyList[image.studyIndex].SeriesList[image.seriesIndex].imageloadedArr.indexOf(image.imageId) < 0) {
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].imageloadedArr.push(image.imageId)
-          prefetchInstanceCount = prefetchInstanceCount + 1
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount = prefetchInstanceCount
-        }
-        if (prefetchInstanceCount >= instanceCount) {
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].loadStatus = true
-        }
-      }
-
-      // store.dispatch('reading/updateSeriesList', { visitTaskindex: this.visitTaskIdx, studyIndex: image.studyIndex, seriesIndex: image.seriesIndex, imageId: image.imageId })
-    },
-    // instance下载成功回调
-    async cornerstoneImageLoaded(e) {
-      // var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
-      // if (idx === -1) return
-      // this.studyList = this.visitTaskList[idx].StudyList
-      // if (!this.studyList || this.studyList.length === 0) {
-      //   return
-      // }
-      // if (!this.visitTaskList[idx].IsInit) {
-      //   const loading = this.$loading({ fullscreen: true })
-      //   await store.dispatch('reading/getMeasuredData', this.visitTaskList[idx].VisitTaskId)
-      //   await store.dispatch('reading/getStudyInfo', { trialId: this.trialId, subjectVisitId: this.visitTaskList[idx].VisitId, visitTaskId: this.visitTaskList[idx].VisitTaskId, taskBlindName: this.visitTaskList[idx].TaskBlindName })
-      //   await store.dispatch('reading/getReadingQuestionAndAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[idx].VisitTaskId })
-      //   await store.dispatch('reading/getDicomReadingQuestionAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[idx].VisitTaskId })
-      //   await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[idx].VisitTaskId })
-      //   loading.close()
-      // }
-      // await store.dispatch('reading/updateStudyList', { visitTaskId: this.visitTaskId, imageId: e.detail.image.imageId, seriesUid: e.detail.image.data.string('x0020000e') })
-      // const uri = e.detail.image.sharedCacheKey
-      // const index = this.cachedImages.findIndex(item => item.uri === uri)
-      // if (index === -1) {
-      //   this.cachedImages.push({ uri: uri, timestamp: new Date().getTime() })
-      // } else {
-      //   this.cachedImages[index].timestamp = new Date().getTime()
-      // }
-      // var imageId = e.detail.image.imageId
-      // var seriesUid = e.detail.image.data.string('x0020000e')
-      // var studyIndex = -1
-      // var seriesIndex = -1
-      // for (let i = 0; i < this.studyList.length; ++i) {
-      //   for (let j = 0; j < this.studyList[i].SeriesList.length; ++j) {
-      //     if (this.studyList[i].SeriesList[j].seriesUid === seriesUid) {
-      //       studyIndex = i
-      //       seriesIndex = j
-      //       break
-      //     }
-      //   }
-      //   if (studyIndex > 0) break
-      // }
-      // if (seriesIndex < 0) return
-
-      // const imageIdIndex = this.studyList[studyIndex].SeriesList[seriesIndex].imageIds.indexOf(imageId)
-      // if (imageIdIndex < 0) return
-      // if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
-      //   if (this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount >= this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount) {
-      //     // 设置当前序列状态为已下载完成
-      //     this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
-      //   }
-      // }
-    },
-    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
-      }
-      if (this.visitTaskId !== params.visitTaskId) return
-      const percentComplete = e.detail.percentComplete
-
-      const studyIndex = parseInt(params.idx.split('|')[0])
-      const seriesIndex = parseInt(params.idx.split('|')[1])
-      // 关键序列处理
-      const seriesId = this.studyList[studyIndex].SeriesList[seriesIndex].seriesId
-      const i = this.keySeriesLoad.findIndex(i => i.seriesId === seriesId)
-      if (this.studyList[studyIndex].IsCriticalSequence && percentComplete >= 100) {
-        // 关键序列处理
-        if (i === -1) {
-          this.keySeriesLoad.push({ seriesId: seriesId, loadCount: 1, imageIds: [imageId] })
-        } else {
-          ++this.keySeriesLoad[i].loadCount
-          this.keySeriesLoad[i].imageIds.push(imageId)
-        }
-      }
-      if (!this.studyList[studyIndex].IsCriticalSequence && i > -1) {
-        this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount + 100 * this.keySeriesLoad[i].loadCount
-        this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr = [this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr, this.keySeriesLoad[i].imageIds]
-        this.keySeriesLoad.splice(i, 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) {
-        const i = this.currentLoadIns.findIndex(i => i.imageId === imageId)
-        if (i > -1) {
-          prefetchInstanceCount = prefetchInstanceCount + percentComplete - this.currentLoadIns[i].percentComplete
-          this.currentLoadIns[i].percentComplete = percentComplete
-          if (percentComplete >= 100) {
-            this.currentLoadIns.splice(i, 1)
-          }
-        } else {
-          if (percentComplete !== 100) {
-            this.currentLoadIns.push({ imageId, percentComplete })
-          }
-          prefetchInstanceCount = prefetchInstanceCount + percentComplete
-        }
-        this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = prefetchInstanceCount
-        if (percentComplete >= 100) {
-          this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.push(imageId)
-        }
-      }
-
-      if (prefetchInstanceCount >= instanceCount * 100) {
-        this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
-        // 设置当前序列状态为已下载完成
-        this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
-        // this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.push(imageId)
-      }
-    },
-    cornerstoneimagecachechanged(e) {
-      const cacheInfo = cornerstone.imageCache.getCacheInfo()
-      console.log(cacheInfo)
-    },
-    cornerstoneimagecachefull(e) {
-      console.log('超过内存了')
     }
   }
 }
@@ -1122,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;

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue

@@ -222,7 +222,8 @@ export default {
         taskBlindName: '',
         frame: null,
         imageRendered: false,
-        isExistsClinicalData: false
+        isExistsClinicalData: false,
+        isExistMutiFrames: false
         // preventCache: true
       },
       dicomInfo: {
@@ -669,7 +670,7 @@ export default {
       this.sliderInfo.isMove = false
     },
     getMeasureData() {
-      console.log('getMeasureData')
+      console.log('getMeasureData') 
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId)
       this.measureData = this.visitTaskList[idx].MeasureData
       const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
@@ -746,7 +747,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]
@@ -868,7 +869,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
@@ -889,9 +889,8 @@ export default {
             cornerstoneTools.setToolPassiveForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
             
           }
-          // console.log('renderMeasuredData', this.stack.frame)
+          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)
-          if (this.stack.instanceId.includes(data.InstanceId) && ((data.NumberOfFrames === this.stack.frame) || !data.NumberOfFrames) && 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)
@@ -978,7 +977,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]
@@ -1039,7 +1038,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
@@ -1063,7 +1062,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)
@@ -1178,10 +1177,10 @@ 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()
+        // this.resetWwwc()
         resolve()
       })
     },
@@ -1246,14 +1245,13 @@ export default {
       // console.log('onImageLoaded')
     },
     onImageRendered(e) {
-      // console.log('onImageRendered')
       this.stack.imageRendered = true
       // const { element } = e.detail
       var imageId = e.detail.image.imageId
       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)
         // 初次加载时，如果该影像存在标记，则以标记的窗宽窗位为初始化默认值，否则以序列的窗宽窗位为初始化默认值
@@ -1434,7 +1432,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)
@@ -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) {

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 // 1 GB
+    // const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 // 1 GB
     // const maximumSizeInBytes = 1024 * 1024 * 500
-    cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
+    // cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
     this.customWwc = {
       visible: false,
       title: this.$t('trials:reading:dagTitle:wwwcCustom')
@@ -993,6 +993,7 @@ export default {
       }
       console.log('getMeasureData')
     })
+    
     DicomEvent.$on('getScreenshots', (callback) => {
       var base64Str =
         this.$refs[
@@ -1051,11 +1052,11 @@ export default {
       this.uploadStatus = status
       this.uploadImageVisible = true
     },
-    getWwcTpl() {
+    async getWwcTpl() {
-      const loading = this.$loading({ fullscreen: true })
+      // const loading = this.$loading({ fullscreen: true })
-      getUserWLTemplateList()
+      try {
-        .then((res) => {
+        let res = await getUserWLTemplateList()
-          this.customWwcTpl = []
+        this.customWwcTpl = []
           res.Result.map((i) => {
             this.customWwcTpl.push({
               label: i.TemplateName,
@@ -1064,35 +1065,32 @@ export default {
             })
           })
           this.wwwcArr = [...this.defaultWwwc, ...this.customWwcTpl]
-          loading.close()
+      } catch(e) {
-        })
+        console.log(e)
-        .catch(() => {
+      }
-          loading.close()
+      
-        })
     },
-    getHotKeys() {
+    async getHotKeys() {
-      const loading = this.$loading({ fullscreen: true })
+      // const loading = this.$loading({ fullscreen: true })
-      getDoctorShortcutKey({ imageToolType: 0 })
+      try {
-        .then((res) => {
+        let res = await getDoctorShortcutKey({ imageToolType: 0 })
-          res.Result.map((item) => {
+        res.Result.map((item) => {
-            this.hotKeyList.push({
+          this.hotKeyList.push({
-              id: item.Id,
+            id: item.Id,
-              altKey: item.AltKey,
+            altKey: item.AltKey,
-              ctrlKey: item.CtrlKey,
+            ctrlKey: item.CtrlKey,
-              shiftKey: item.ShiftKey,
+            shiftKey: item.ShiftKey,
-              metaKey: item.MetaKey,
+            metaKey: item.MetaKey,
-              key: item.Keyboardkey,
+            key: item.Keyboardkey,
-              code: item.Code,
+            code: item.Code,
-              text: item.Text,
+            text: item.Text,
-              shortcutKeyEnum: item.ShortcutKeyEnum
+            shortcutKeyEnum: item.ShortcutKeyEnum
-            })
           })
-          this.bindHotKey()
-          loading.close()
-        })
-        .catch(() => {
-          loading.close()
         })
+        this.bindHotKey()
+      } catch(e) {
+        console.log(e)
+      }
     },
     resetHotkeyList(arr) {
       this.hotKeyList = []
@@ -1702,10 +1700,13 @@ export default {
               (s) => s.seriesId === seriesId
             )
             if (seriesIdx > -1) {
-              var series = studyList[studyIdx].SeriesList[seriesIdx]
+              var series = studyList[studyIdx].SeriesList[seriesIdx];
-              var instanceIdx = series.instanceList.findIndex(
+              let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
-                (imageId) => !!~imageId.indexOf(instanceId)
+              let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
-              )
+              var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
+              // var instanceIdx = series.instanceList.findIndex(
+              //   (imageId) => !!~imageId.indexOf(instanceId)
+              // );
               if (instanceIdx > -1) {
                 series.imageIdIndex = instanceIdx
                 seriesInfo = series

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue

@@ -74,6 +74,13 @@ import DicomEvent from "./../components/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: "CustomizeReadPage",
   components: {
@@ -229,6 +236,10 @@ export default {
         this.$refs[this.activeTaskVisitId][0].selectSeries(data);
       });
     });
+    cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
+    window.addEventListener('beforeunload', e => {
+      cornerstone.imageCache.purgeCache()
+    })
   },
   beforeDestroy() {
     DicomEvent.$off("getNextVisitInfo");
@@ -237,6 +248,7 @@ export default {
     DicomEvent.$off("removeNoneDicomMeasureData");
     DicomEvent.$off("addNoneDicomMeasureData");
     DicomEvent.$off("selectSeries");
+    window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
   },
   methods: {
     async getVisitInfo() {
@@ -523,7 +535,7 @@ export default {
       if (obj) {
         let index = Math.floor(
           obj.imageIds.length *
-            ((baseSeries.imageIdIndex + 1) / baseSeries.instanceCount)
+            ((baseSeries.imageIdIndex + 1) / baseSeries.imageIds)
         );
         obj.imageIdIndex = index > 0 ? index - 1 : 0;
       }
@@ -607,9 +619,12 @@ export default {
               );
               if (seriesIdx > -1) {
                 var series = studyList[studyIdx].SeriesList[seriesIdx];
-                var instanceIdx = series.instanceList.findIndex(
+                // var instanceIdx = series.instanceList.findIndex(
-                  (imageId) => !!~imageId.indexOf(instanceId)
+                //   (imageId) => !!~imageId.indexOf(instanceId)
-                );
+                // );
+                let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
+                let 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
@@ -643,6 +658,16 @@ export default {
       }
       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)
+    }
   },
 };
 </script>

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue

@@ -67,28 +67,30 @@
                         trigger="hover"
                         popper-class="instance_frame_wrapper"
                       >
-                        <div
+                        <div class="frame_list">
-                          v-for="(instance, idx) in series.instanceInfoList"
+                          <div
-                          :key="instance.Id"
+                            v-for="(instance, idx) in series.instanceInfoList"
-                          class="frame_content"
+                            :key="instance.Id"
-                          :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
+                            class="frame_content"
-                          @click.stop="showMultiFrames(index,series, i, instance)"
+                            :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
-                        >
+                            @click.stop="showMultiFrames(index,series, i, instance)"
-                          <!-- <div>
+                          >
-                                        <img
+                            <!-- <div>
-                                          class="image-preview"
+                                          <img
-                                          :src="series.previewImageUrl"
+                                            class="image-preview"
-                                          crossorigin="anonymous"
+                                            :src="series.previewImageUrl"
-                                          alt=""
+                                            crossorigin="anonymous"
-                                          style="width: 40px;height:40px;"
+                                            alt=""
-                                          fit="fill"
+                                            style="width: 40px;height:40px;"
-                                        >
+                                            fit="fill"
-                                      </div> -->
+                                          >
-                          <div>
+                                        </div> -->
-                            <div>{{ instance.InstanceNumber }}</div>
+                            <div>
-                            <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
+                              <div>{{ instance.InstanceNumber }}</div>
-                          </div>
+                              <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
+                            </div>
 
+                          </div>
                         </div>
                         <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;color: #ffeb3b;" />
                       </el-popover>
@@ -157,18 +159,11 @@
   </div>
 </template>
 <script>
-import * as dicomParser from 'dicom-parser'
-import * as cornerstone from 'cornerstone-core'
-import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import requestPoolManager from '@/utils/request-pool'
 import DicomEvent from './../components/DicomEvent'
 import { mapGetters } from 'vuex'
 import store from '@/store'
 import SrList from './../components/SrList'
-cornerstoneWADOImageLoader.external.dicomParser = dicomParser
-cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
-cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
   name: 'StudyList',
   components: { SrList },
@@ -217,9 +212,7 @@ export default {
       srDialogVisible: false,
       srInfo: {},
       digitPlaces: 2,
-      visitTaskIdx: -1,
+      visitTaskIdx: -1
-      currentLoadIns: [],
-      keySeriesLoad: []
     }
   },
 
@@ -257,24 +250,19 @@ export default {
     this.subjectCode = localStorage.getItem('subjectCode')
     var digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
-
+    DicomEvent.$on('refreshStudyListMeasureData', () => {
+      var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+      this.measureData = this.visitTaskList[idx].MeasureData
+    })
     // DicomEvent.$on('setReadingState', readingTaskState => {
     //   var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
     //   if (idx > -1) {
     //     this.studyList = this.visitTaskList[idx].StudyList
     //   }
     // })
-    cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
+
-    cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded)
-    // cornerstone.events.addEventListener('cornerstoneimagecachefull', this.cornerstoneimagecachefull)
-    // cornerstone.events.addEventListener('cornerstoneimagecachechanged', this.cornerstoneimagecachechanged)
-    window.addEventListener('beforeunload', e => {
-      cornerstone.imageCache.purgeCache()
-    })
   },
   beforeDestroy() {
-    cornerstone.imageCache.purgeCache()
-    window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
   },
   methods: {
     initStudyInfo() {
@@ -326,7 +314,6 @@ export default {
       requestPoolManager.loadAndCacheImagePlus(imageId, seriesInfo.seriesId, p * 100)
     },
     getStudyList() {
-      console.log('getStudyList')
       if (!this.isRender) {
         var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
         if (idx > -1 && this.visitTaskList[idx].StudyList && this.visitTaskList[idx].StudyList.length > 0) {
@@ -337,8 +324,27 @@ export default {
             this.studyIndex = sIdx
             this.seriesIndex = 0
             this.activeNames = [`${this.studyList[sIdx].StudyId}`]
-
+            // 下载关键序列
-            this.loadImages(this.visitTaskList[idx])
+            const i = this.studyList.findIndex(i => i.IsCriticalSequence)
+            if (i > -1 && this.studyList[i].SeriesList[0].length > 0) {
+              const series = this.studyList[i].SeriesList[0]
+              if (!series.loadStatus) {
+                let priority = parseInt(new Date().getTime())
+                if (series.isExistMutiFrames) {
+                  series.instanceInfoList.map(image => {
+                    priority = priority - 1
+                    this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: i, seriesIndex: 0, visitTaskId: series.visitTaskId, priority })
+                  })
+                } else {
+                  series.imageIds.map(imageId => {
+                    priority = priority - 1
+                    this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: i, seriesIndex: 0, visitTaskId: series.visitTaskId, priority })
+                  })
+                }
+              }
+            }
+            this.loopLoad()
+            // this.loadImages(this.visitTaskList[idx])
           }
         }
         this.isRender = true
@@ -420,9 +426,11 @@ export default {
           const sdIndx = studyList.findIndex(sd => sd.StudyId === measureDatas[i].StudyId)
           const seriesList = studyList[sdIndx].SeriesList
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[i].SeriesId)
-          // const instanceList = seriesList[srIdx].imageIds
+          // const instanceList = seriesList[srIdx].instanceList
-          const instanceList = seriesList[srIdx].instanceList
+          // const isIdx = instanceList.findIndex(is => is.includes(measureDatas[i].InstanceId))
-          const isIdx = instanceList.findIndex(is => is.includes(measureDatas[i].InstanceId))
+          const imageIds = seriesList[srIdx].imageIds
+          let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}` : `instanceId=${measureDatas[i].InstanceId}`
+          const isIdx = imageIds.findIndex(is => is.includes(filterStr))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx
 
@@ -492,9 +500,11 @@ export default {
         if (sdIndx > -1) {
           const seriesList = studyList[sdIndx].SeriesList
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId)
-          // const instanceList = seriesList[srIdx].imageIds
+          // const instanceList = seriesList[srIdx].instanceList
-          const instanceList = seriesList[srIdx].instanceList
+          // const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId))
-          const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId))
+          const imageIds = seriesList[srIdx].imageIds
+          let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}` : `instanceId=${measureDatas[mIdx].InstanceId}`
+          const isIdx = imageIds.findIndex(is => is.includes(filterStr))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx
 
@@ -592,7 +602,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
@@ -634,18 +646,19 @@ export default {
     },
     showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) {
       this.currentSeriesIndex = seriesIndex
-      const imageIds = []
+      var idx = this.visitTaskIdx
-      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}`)
-      }
       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)
@@ -688,7 +701,8 @@ export default {
       var activeNames = `${this.studyList[obj.studyIndex].StudyId}`
       if (this.activeNames.includes(activeNames)) return
       this.activeNames.push(activeNames)
-      this.loadImages(this.visitTaskList[idx])
+      // this.loadImages(this.visitTaskList[idx])
+      this.loadImages(obj)
     },
     selectSeries(obj) {
       var seriseList = this.studyList.map(s => s.SeriesList).flat()
@@ -713,45 +727,25 @@ export default {
       var activeNames = `${this.studyList[series.studyIndex].StudyId}`
       if (this.activeNames.includes(activeNames)) return
       this.activeNames.push(activeNames)
-      this.loadImages(this.visitTaskList[idx])
+      this.loadImages(series)
+      // this.loadImages(this.visitTaskList[idx])
       store.dispatch('reading/setActiveSeries', series)
     },
-    loadImages(taskInfo) {
+    loadImages(series) {
-      // const isBaseLineTask = taskInfo.IsBaseLineTask
-      const isCurrentTask = taskInfo.IsCurrentTask
-      // var priority = isCurrentTask ? parseInt(new Date().getTime()) : 999
       var priority = parseInt(new Date().getTime())
-      this.studyList.map((study, studyIndex) => {
+      if (!series.loadStatus && series.isDicom && series.modality !== 'SR') {
-        study.SeriesList.map((series, seriesIndex) => {
+        if (series.isExistMutiFrames) {
-          if (!series.loadStatus && series.isDicom && series.modality !== 'SR') {
+          series.instanceInfoList.map(image => {
-            // if (isCurrentTask || isBaseLineTask) {
+            priority = priority - 1
-            //   // 当前任务/基线任务下载所有影像
+            this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex, visitTaskId: series.visitTaskId, priority })
-            //   series.imageIds.map(image => {
+          })
-            //     this.imageList.push({ imageId: image, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority })
+        } else {
-            //   })
+          series.imageIds.map(imageId => {
-            // } else if (!isBaseLineTask && !isCurrentTask && study.IsCriticalSequence) {
+            priority = priority - 1
-            //   // 非当前随访任务下载关键影像
+            this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex, visitTaskId: series.visitTaskId, priority })
-            //   series.imageIds.map(image => {
+          })
-            //     this.imageList.push({ imageId: image, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority })
+        }
-            //   })
+      }
-            // }
-            // 均只下载关键序列
-            if (!isCurrentTask && study.IsCriticalSequence) {
-              if (series.isExistMutiFrames) {
-                series.instanceInfoList.map(image => {
-                  priority = priority - 1
-                  this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority })
-                })
-              } else {
-                series.imageIds.map(imageId => {
-                  priority = priority - 1
-                  this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority })
-                })
-              }
-            }
-          }
-        })
-      })
       this.loopLoad()
     },
 
@@ -808,139 +802,6 @@ export default {
       requestPoolManager.removeTask(series.seriesId)
       this.$set(this.studyList[studyIndex].SeriesList[seriesIndex], 'isLoading', false)
     },
-    async imageLoaded(image, seriesUid) {
-      // await store.dispatch('reading/updateStudyList', { visitTaskId: image.visitTaskId, imageId: image.imageId, seriesUid })
-      // console.log(this.studyList[image.studyIndex].SeriesList[image.seriesIndex])
-      if (image.studyIndex > -1 && image.seriesIndex > -1) {
-        var prefetchInstanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount
-        var instanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].instanceCount
-        if (this.studyList[image.studyIndex].SeriesList[image.seriesIndex].imageloadedArr.indexOf(image.imageId) < 0) {
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].imageloadedArr.push(image.imageId)
-          prefetchInstanceCount = prefetchInstanceCount + 1
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount = prefetchInstanceCount
-        }
-        if (prefetchInstanceCount >= instanceCount) {
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].loadStatus = true
-        }
-      }
-
-      // store.dispatch('reading/updateSeriesList', { visitTaskindex: this.visitTaskIdx, studyIndex: image.studyIndex, seriesIndex: image.seriesIndex, imageId: image.imageId })
-    },
-    // instance下载成功回调
-    async cornerstoneImageLoaded(e) {
-      // var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
-      // if (idx === -1) return
-      // this.studyList = this.visitTaskList[idx].StudyList
-      // if (!this.studyList || this.studyList.length === 0) {
-      //   return
-      // }
-      // if (!this.visitTaskList[idx].IsInit) {
-      //   const loading = this.$loading({ fullscreen: true })
-      //   await store.dispatch('reading/getMeasuredData', this.visitTaskList[idx].VisitTaskId)
-      //   await store.dispatch('reading/getStudyInfo', { trialId: this.trialId, subjectVisitId: this.visitTaskList[idx].VisitId, visitTaskId: this.visitTaskList[idx].VisitTaskId, taskBlindName: this.visitTaskList[idx].TaskBlindName })
-      //   await store.dispatch('reading/getReadingQuestionAndAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[idx].VisitTaskId })
-      //   await store.dispatch('reading/getDicomReadingQuestionAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[idx].VisitTaskId })
-      //   await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[idx].VisitTaskId })
-      //   loading.close()
-      // }
-      // await store.dispatch('reading/updateStudyList', { visitTaskId: this.visitTaskId, imageId: e.detail.image.imageId, seriesUid: e.detail.image.data.string('x0020000e') })
-      // const uri = e.detail.image.sharedCacheKey
-      // const index = this.cachedImages.findIndex(item => item.uri === uri)
-      // if (index === -1) {
-      //   this.cachedImages.push({ uri: uri, timestamp: new Date().getTime() })
-      // } else {
-      //   this.cachedImages[index].timestamp = new Date().getTime()
-      // }
-      // var imageId = e.detail.image.imageId
-      // var seriesUid = e.detail.image.data.string('x0020000e')
-      // var studyIndex = -1
-      // var seriesIndex = -1
-      // for (let i = 0; i < this.studyList.length; ++i) {
-      //   for (let j = 0; j < this.studyList[i].SeriesList.length; ++j) {
-      //     if (this.studyList[i].SeriesList[j].seriesUid === seriesUid) {
-      //       studyIndex = i
-      //       seriesIndex = j
-      //       break
-      //     }
-      //   }
-      //   if (studyIndex > 0) break
-      // }
-      // if (seriesIndex < 0) return
-
-      // const imageIdIndex = this.studyList[studyIndex].SeriesList[seriesIndex].imageIds.indexOf(imageId)
-      // if (imageIdIndex < 0) return
-      // if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
-      //   if (this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount >= this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount) {
-      //     // 设置当前序列状态为已下载完成
-      //     this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
-      //   }
-      // }
-    },
-    cornerstoneimageloadprogress(e) {
-      const imageId = e.detail.imageId
-      const percentComplete = e.detail.percentComplete
-      const params = {}
-      const searchParams = new URLSearchParams(imageId.split('?')[1])
-      for (const [key, value] of searchParams.entries()) {
-        params[key] = value
-      }
-      if (this.visitTaskId === params.visitTaskId) {
-        const studyIndex = params.idx.split('|')[0]
-        const seriesIndex = params.idx.split('|')[1]
-        
-        const seriesId = this.studyList[studyIndex].SeriesList[seriesIndex].seriesId
-        const i = this.keySeriesLoad.findIndex(i => i.seriesId === seriesId)
-        if (this.studyList[studyIndex].IsCriticalSequence && percentComplete >= 100) {
-          // 关键序列处理
-          if (i === -1) {
-            this.keySeriesLoad.push({ seriesId: seriesId, loadCount: 1, imageIds: [imageId] })
-          } else {
-            ++this.keySeriesLoad[i].loadCount
-            this.keySeriesLoad[i].imageIds.push(imageId)
-          } 
-        }
-        if (!this.studyList[studyIndex].IsCriticalSequence && i > -1) {
-          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount + 100 * this.keySeriesLoad[i].loadCount
-          this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr = [this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr, this.keySeriesLoad[i].imageIds]
-          this.keySeriesLoad.splice(i, 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) {
-          const i = this.currentLoadIns.findIndex(i => i.imageId === imageId)
-          if (i > -1) {
-            prefetchInstanceCount = prefetchInstanceCount - this.currentLoadIns[i].percentComplete + percentComplete
-            this.currentLoadIns[i].percentComplete = percentComplete
-            if (percentComplete === 100) {
-              this.currentLoadIns.splice(i, 1)
-            }
-          } else {
-            if (percentComplete !== 100) {
-              this.currentLoadIns.push({ imageId, percentComplete })
-            }
-            prefetchInstanceCount = prefetchInstanceCount + percentComplete
-          }
-          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = prefetchInstanceCount
-          if (percentComplete >= 100) {
-            this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.push(imageId)
-          }
-        }
-        if (prefetchInstanceCount >= instanceCount * 100) {
-          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
-          // 设置当前序列状态为已下载完成
-          this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
-        }
-      }
-    },
-    cornerstoneimagecachechanged(e) {
-      const cacheInfo = cornerstone.imageCache.getCacheInfo()
-      console.log(cacheInfo)
-    },
-    cornerstoneimagecachefull(e) {
-      console.log('超过内存了')
-    }
   }
 }
 </script>
@@ -1095,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;

src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue

@@ -77,12 +77,23 @@
                   <!-- 本次医学审核相关截图（如适用）如下： -->
                   {{ $t('trials:medicalFeedback:message:msg5') }}
                   <ol>
-                    <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;">
+                    <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;"> 
-                      <el-button
+                      <viewer
-                        type="text"
+                        v-if="file.ImagePath"
-                        size="mini"
+                        :ref="file.ImagePath"
-                        @click="previewImage(file.ImagePath)"
+                        style="margin:0 10px;"
-                      >{{ file.FileName }}</el-button>
+                        :images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
+                      >
+                        <el-button type="text" @click="previewImage(file.ImagePath)">
+                          {{ file.FileName }}
+                        </el-button>
+                        <img
+                          v-show="false"
+                          crossorigin="anonymous"
+                          :src="`${OSSclientConfig.basePath}${file.ImagePath}`"
+                          alt="Image"
+                        >
+                      </viewer>
                     </li>
                   </ol>
                 </div>

src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue

@@ -138,20 +138,22 @@
         >
           <i slot="default" class="el-icon-plus" />
           <div slot="file" slot-scope="{file}">
-            <img
+            <viewer :ref="file.url" :images="images">
-              class="el-upload-list__item-thumbnail"
+                <img
-              :src="OSSclientConfig.basePath + file.url"
+                  class="el-upload-list__item-thumbnail"
-              alt=""
+                  :src="OSSclientConfig.basePath + file.url"
-              crossorigin="anonymous"
+                  alt=""
-            >
+                  crossorigin="anonymous"
-            <span class="el-upload-list__item-actions">
+                >
-              <span
+                <span class="el-upload-list__item-actions">
-                class="el-upload-list__item-preview"
+                  <span
-                @click="handlePictureCardPreview(file)"
+                    class="el-upload-list__item-preview"
-              >
+                    @click="handlePictureCardPreview(file)"
-                <i class="el-icon-zoom-in" />
+                  >
-              </span>
+                    <i class="el-icon-zoom-in" />
-            </span>
+                  </span>
+                </span>
+              </viewer>
           </div>
         </el-upload>
         <el-dialog
@@ -237,8 +239,8 @@ export default {
       this.visitTaskArmList = JudgeInfo.VisitTaskArmList
     },
     handlePictureCardPreview(file) {
-      this.imageUrl = this.OSSclientConfig.basePath + file.url
+      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
-      this.imgVisible = true
+      this.$refs[file.url].$viewer.show()
     },
     handleViewDetail(visitTaskId) {
       console.log(this.rowData)

src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue

@@ -77,12 +77,23 @@
                   <!-- 本次医学审核相关截图（如适用）如下： -->
                   {{ $t('trials:medicalFeedback:message:msg5') }}
                   <ol>
-                    <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;">
+                    <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;"> 
-                      <el-button
+                      <viewer
-                        type="text"
+                        v-if="file.ImagePath"
-                        size="mini"
+                        :ref="file.ImagePath"
-                        @click="previewImage(file.ImagePath)"
+                        style="margin:0 10px;"
-                      >{{ file.FileName }}</el-button>
+                        :images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
+                      >
+                        <el-button type="text" @click="previewImage(file.ImagePath)">
+                          {{ file.FileName }}
+                        </el-button>
+                        <img
+                          v-show="false"
+                          crossorigin="anonymous"
+                          :src="`${OSSclientConfig.basePath}${file.ImagePath}`"
+                          alt="Image"
+                        >
+                      </viewer>
                     </li>
                   </ol>
                 </div>

src/views/trials/trials-panel/reading/none-dicoms/index.vue

@@ -59,7 +59,7 @@
       :show-close="false"
     >
       <span slot="title" class="dialog-footer">
-        当前阅片任务存在临床数据，请查看。若已查看，请点击“确认”
+        {{ $t('trials:reading:noneDicom:tip:hasCllinicalData') }}
       </span>
       <div :style="{'height':dialogH,'margin':0}">
         <ClinicalData
@@ -70,7 +70,7 @@
       </div>
 
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handleConfirmCD">确认</el-button>
+        <el-button type="primary" @click="handleConfirmCD">{{$t("common:button:confirm")}}</el-button>
       </span>
     </el-dialog>
 
@@ -136,7 +136,8 @@ export default {
     this.readingTool = this.$router.currentRoute.query.readingTool
     this.isNewSubject = this.$router.currentRoute.query.isNewSubject
     if (this.isNewSubject && this.isReadingTaskViewInOrder) {
-      this.$message.success(`已开始受试者${this.subjectCode}阅片任务`)
+      let message = this.$t('trials:reading:noneDicom:message:startRead').replace("xxx",this.subjectCode);
+      this.$message.success(message)
       changeURLStatic('isNewSubject', '')
     }
     if (this.$router.currentRoute.query.TokenKey) {

src/views/trials/trials-panel/reading/reReading-tracking/index.vue

@@ -313,8 +313,9 @@
                 </div>
                 <el-tag type="danger">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
               </el-tooltip>
-              <el-tag v-if="scope.row.RequestReReadingResultEnum === 1" type="primary">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
+              <el-tag v-else-if="scope.row.RequestReReadingResultEnum === 1" type="primary">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
-              <el-tag v-if="scope.row.RequestReReadingResultEnum === 0" type="warning">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
+              <el-tag v-else-if="scope.row.RequestReReadingResultEnum === 0" type="warning">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
+              <el-tag v-else type="info">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
             </div>
           </template>
         </el-table-column>
@@ -784,7 +785,7 @@ export default {
         this.signVisible = false
       }
     },
-    confirmReReading(row, type, open, signInfo) {
+    async confirmReReading(row, type, open, signInfo) {
       if (open) {
         this.rowData = { ...row }
         this.ConfirmReReadingVisible = true
@@ -794,41 +795,41 @@ export default {
         return
       }
       if (type === 2) {
-        this.$refs.reasonForm.validate((valid) => {
+        let valid = await this.$refs.reasonForm.validate()
-          if (!valid) return
+        if (!valid) return
-          var params = {
+        var params = {
-            data: {
+          data: {
-              ConfirmReReadingList: [
+            ConfirmReReadingList: [
-                {
+              {
-                  Id: row.Id,
+                Id: row.Id,
-                  OriginalReReadingTaskId: row.OriginalReReadingTaskId,
+                OriginalReReadingTaskId: row.OriginalReReadingTaskId,
-                  RootReReadingTaskId: row.RootReReadingTaskId,
+                RootReReadingTaskId: row.RootReReadingTaskId,
-                  NewReReadingTaskId: row.NewReReadingTaskId
+                NewReReadingTaskId: row.NewReReadingTaskId
-                }
+              }
-              ],
+            ],
-              RequestReReadingRejectReason: this.ConfirmReReadingForm.RequestReReadingRejectReason,
+            RequestReReadingRejectReason: this.ConfirmReReadingForm.RequestReReadingRejectReason,
-              TrialId: this.$route.query.trialId,
+            TrialId: this.$route.query.trialId,
-              RequestReReadingResultEnum: type
+            RequestReReadingResultEnum: type
-            },
+          },
-            signInfo: signInfo
+          signInfo: signInfo
-          }
+        }
-          this.loading = true
+        this.loading = true
-          this.btnLoading = true
+        this.btnLoading = true
-          confirmReReading(params).then(() => {
+        try {
-            this.loading = false
+          await confirmReReading(params)
-            this.btnLoading = false
+          this.loading = false
-            // 同意申请成功/拒绝申请成功
+          this.btnLoading = false
-            this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`)
+          // 同意申请成功/拒绝申请成功
-            this.$refs['signForm'].btnLoading = false
+          this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`)
-            this.signVisible = false
+          this.$refs['signForm'].btnLoading = false
-            this.getList()
+          this.signVisible = false
-            this.ConfirmReReadingVisible = false
+          this.getList()
-          }).catch(() => {
+          this.ConfirmReReadingVisible = false
-            this.loading = false
+        } catch (e) {
-            this.$refs['signForm'].btnLoading = false
+          this.loading = false
-            this.btnLoading = false
+          this.$refs['signForm'].btnLoading = false
-          })
+          this.btnLoading = false
-        })
+        }
         return
       }
       var params = {
@@ -848,21 +849,29 @@ export default {
       }
       this.loading = true
       this.btnLoading = true
-      confirmReReading(params).then(() => {
+      try {
+        let res = await confirmReReading(params)
         this.loading = false
         this.btnLoading = false
-        // this.$message.success(`${type === 1 ? '同意' : '拒绝'}申请成功`)
-        // 同意申请成功/拒绝申请成功
-        this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`)
-        this.ReReadingOrBackVisible = false
         this.$refs['signForm'].btnLoading = false
-        this.signVisible = false
+        if (res.ErrorMessage) {
-        this.getList()
+          let alert = await this.$alert(res.ErrorMessage)
-      }).catch(() => {
+          if (alert !== "confirm") return
+          this.ReReadingOrBackVisible = false
+          this.signVisible = false
+          this.getList()
+        } else {
+          // 同意申请成功/拒绝申请成功
+          this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`)
+          this.ReReadingOrBackVisible = false
+          this.signVisible = false
+          this.getList()
+        }
+      } catch (e) {
         this.loading = false
         this.$refs['signForm'].btnLoading = false
         this.btnLoading = false
-      })
+      }
     },
     assignSubjectTaskToDoctor(row, type) {
       this.rowData = { ...row }

src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue

@@ -27,7 +27,7 @@
       </el-form-item>
       <!-- 分组名称 -->
       <el-form-item
-        v-if="(form.Type === 'group' && !isLook) || (isLook && $i18n.locale !== 'en')"
+        v-if="(form.Type === 'group' &&  $i18n.locale !== 'en')"
         :label="$t('trials:readingUnit:qsList:title:groupName')"
         prop="GroupName"
       >
@@ -37,7 +37,7 @@
       </el-form-item>
       <!-- 分组名称(En) -->
       <el-form-item
-        v-if="(form.Type === 'group' && !isLook) || (isLook && $i18n.locale !== 'zh')"
+        v-if="(form.Type === 'group' &&  $i18n.locale !== 'zh')"
         :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
         prop="GroupEnName"
       >
@@ -47,7 +47,7 @@
       </el-form-item>
       <!-- 问题名称 -->
       <el-form-item
-        v-if="(form.Type !== 'group' && !isLook) || (isLook && $i18n.locale !== 'en')"
+        v-if="(form.Type !== 'group' && $i18n.locale !== 'en' )"
         :label="$t('trials:readingUnit:qsList:title:qsName')"
         prop="QuestionName"
       >
@@ -57,7 +57,7 @@
       </el-form-item>
       <!-- 问题名称(En) -->
       <el-form-item
-        v-if="(form.Type !== 'group' && !isLook) || (isLook && $i18n.locale !== 'zh')"
+        v-if="(form.Type !== 'group' && $i18n.locale !== 'zh')"
         :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
         prop="QuestionEnName"
       >
@@ -791,6 +791,8 @@ export default {
         ],
         QuestionName: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
           {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
+        QuestionEnName:[{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
         TypeValue: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
           {validator: validateTypeVal, trigger: ['blur', 'change']},
           {max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200`}],
@@ -974,6 +976,16 @@ export default {
       this.$refs.qsForm.validate(valid => {
         if (!valid) return
         this.loading = true
+        if(this.form.QuestionName && this.$i18n.locale === 'zh'){
+          this.form.QuestionEnName = this.form.QuestionName;
+        }else if(this.form.QuestionEnName && this.$i18n.locale === 'en'){
+          this.form.QuestionName = this.form.QuestionEnName;
+        }
+        if(this.form.GroupName && this.$i18n.locale === 'zh'){
+          this.form.GroupEnName = this.form.GroupName;
+        }else if(this.$i18n.locale === 'en' && this.form.GroupEnName){
+          this.form.GroupName = this.form.GroupEnName;
+        }
         var params = Object.assign({}, this.form)
         params.TrialId = this.$route.query.trialId
         params.ReadingCriterionPageId = this.data.ReadingCriterionPageId

src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue

@@ -146,7 +146,7 @@
       <el-table-column
         prop=""
         :label="$t('common:action:action')"
-        width="280"
+        width="300"
         show-overflow-tooltip
       >
         <template slot-scope="scope">

src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue

@@ -35,7 +35,7 @@
         />
       </el-form-item>
       <el-form-item
-        v-if="form.Type !== 'group'"
+        v-if="form.Type !== 'group'&& $i18n.locale !== 'en'"
         :label="$t('trials:readingUnit:qsList:title:qsName')"
         prop="QuestionName"
       >
@@ -44,7 +44,7 @@
         />
       </el-form-item>
       <el-form-item
-        v-if="form.Type !== 'group'"
+        v-if="form.Type !== 'group'&& $i18n.locale !== 'zh'"
         :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
         prop="QuestionEnName"
       >
@@ -553,7 +553,8 @@ export default {
         ],
         QuestionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
-
+        QuestionEnName:[{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
         TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           { validator: validateTypeVal, trigger: 'blur' },
           { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
@@ -695,6 +696,11 @@ export default {
       this.$refs.tableQsForm.validate(valid => {
         if (!valid) return
         this.loading = true
+        if(this.form.QuestionName && this.$i18n.locale === 'zh'){
+          this.form.QuestionEnName = this.form.QuestionName;
+        }else if(this.form.QuestionEnName && this.$i18n.locale === 'en'){
+          this.form.QuestionName = this.form.QuestionEnName;
+        }
         var params = Object.assign({}, this.form)
         params.TrialId = this.$route.query.trialId
         params.ReadingQuestionId = this.readingQuestionId

src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue

@@ -29,12 +29,14 @@
       <!-- 名称 -->
       <el-table-column
         prop="QuestionName"
+        v-if="$i18n.locale === 'zh'"
         :label="$t('trials:readingUnit:qsList:title:qsName')"
         show-overflow-tooltip
       />
       <!-- 名称(EN) -->
       <el-table-column
         prop="QuestionEnName"
+        v-if="$i18n.locale === 'en'"
         :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
         show-overflow-tooltip
       />

src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue

@@ -691,7 +691,8 @@
             <el-input
               v-model="addBodyPartForm.bodyPartStr"
               clearable
-              :maxlength="50"
+              type="textarea"
+              :rows="2"
               @focus="errMessage = null"
             ></el-input>
             <span class="errTip" v-if="errMessage">{{ errMessage }}</span>

src/views/trials/trials-panel/trial-summary/login-log/index.vue

@@ -128,13 +128,13 @@
           show-overflow-tooltip
           sortable="custom"
         />
-        <el-table-column
+        <!-- <el-table-column
           :label="$t('trials:loginLog:table:IPRegion')"
           prop="IPRegion"
           min-width="90"
           show-overflow-tooltip
           sortable="custom"
-        />
+        /> -->
         <el-table-column
           v-if="!isMine"
           :label="$t('trials:loginLog:table:incorrectUserName')"

src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

@@ -882,7 +882,7 @@ export default {
           modality: this.studyForm.Modality,
           bodyPart: this.studyForm.BodyPart,
         };
-        updateModality(this.data.TrialId, params)
+        updateModality(this.trialId, params)
           .then((res) => {
             this.btnLoading = false;
             if (res.IsSuccess) {

src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue

@@ -412,6 +412,7 @@ import { getToken } from '@/utils/auth'
 // import PreviewFiles from './previewFiles'
 import uploadVideos from '@/components/videos'
 import moment from 'moment'
+import store from "@/store";
 export default {
   name: 'UploadNonDicomFiles',
   components: { uploadVideos },
@@ -470,7 +471,8 @@ export default {
       uploadVideoVisible: false,
       trialId: this.$route.query.trialId,
       moment,
-      BodyPart:{}
+      BodyPart:{},
+      studyMonitorId: null
     };
   },
   async mounted() {
@@ -497,6 +499,12 @@ export default {
         });
       }
     },
+    btnLoading(){
+      store.dispatch("trials/setUnLock", this.btnLoading);
+    }
+  },
+  beforeDestroy(){
+    store.dispatch("trials/setUnLock", false);
   },
   methods: {
     // 初始化非Dicom列表数据
@@ -752,11 +760,20 @@ export default {
         this.selectArr.forEach(item=>item.status = 0);
         let num = this.selectArr.length > 6 ? 6 : this.selectArr.length;
         let funArr = [];
-        for (let i = 0; i < num; i++) {
+        let res = await preArchiveStudy({
-          funArr.push(this.handleUploadTask(this.selectArr, i));
+          subjectVisitId: this.subjectVisitId,
-        }
+          isDicom: false
-        if (funArr.length > 0) {
+        });
-          let res = await Promise.all(funArr);
+        if(res.IsSuccess){
+          this.studyMonitorId = res.Result;
+          for (let i = 0; i < num; i++) {
+            funArr.push(this.handleUploadTask(this.selectArr, i));
+          }
+          if (funArr.length > 0) {
+            let res = await Promise.all(funArr);
+          }
+        }else{
+          this.isFail = true;
         }
       }
     },
@@ -814,16 +831,12 @@ export default {
     // 非Dicom文件上传归档
     submitFile(uploadedFileList){
       if(!this.uploadVisible) return;
-      preArchiveStudy({
-        subjectVisitId: this.subjectVisitId,
-        isDicom: false
-      }).then(res => {
         this.btnLoading = true
         var params = {
           trialId: this.trialId,
           subjectVisitId: this.subjectVisitId,
           noneDicomStudyId:this.currentRow.Id,
-          studyMonitorId: res.Result,
+          studyMonitorId: this.studyMonitorId,
           uploadedFileList: uploadedFileList
         }
         uploadNoneDicomFile(params).then(res => {
@@ -833,7 +846,6 @@ export default {
           this.$emit('getList')
           this.$message.success(this.$t('trials:uploadNonDicoms:message:uploadedSuccessfully'))
         }).catch(() => { this.btnLoading = false })
-      })
     },
     resetFileDiaolg(){
       this.btnLoading = false

src/views/trials/trials-panel/visit/crc-upload/index.vue

@@ -308,6 +308,13 @@
             <el-tag v-else-if="scope.row.AuditState*1 === 8" type="primary">{{ $fd('AuditStateRC', scope.row.AuditState*1) }}</el-tag>
           </template>
         </el-table-column>
+        <!-- 审核完成时间 -->
+        <el-table-column
+          prop="AuditTime"
+          :label="$t('trials:crcUpload:table:auditTime')"
+          show-overflow-tooltip
+          width="170"
+        />
         <el-table-column
           v-if="hasPermi(['trials:trials-panel:visit:crc-upload:upload', 'trials:trials-panel:visit:crc-upload:submit','trials:trials-panel:visit:crc-upload:edit','trials:trials-panel:visit:crc-upload:delete'], '||')"
           :label="$t('common:action:action')"

src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue

@@ -1998,7 +1998,9 @@ export default {
                     this.$emit("getList");
                     this.$emit("nextTask", res.Result.VisitId);
                   });
-                });
+                }).catch(()=>{
+                  this.$emit("getList")
+                })
               } else {
                 // 没有后续质控任务
                 this.$emit("getList");

src/views/trials/trials-panel/visit/qc-check/index.vue

@@ -80,7 +80,18 @@
             </el-option>
           </el-select>
         </el-form-item>
-
+        <!-- 审核通过时间 -->
+        <el-form-item :label="$t('trials:qcCheck:table:auditTime')">
+          <el-date-picker
+            v-model="timeList"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            @change="changeTimeList"
+            style="width:240px"
+          />
+        </el-form-item>
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -309,6 +320,13 @@
             <el-tag v-else-if="scope.row.AuditState*1 === 8" type="primary"> {{ $fd('AuditStateRC', scope.row.AuditState*1) }}</el-tag>
           </template>
         </el-table-column>
+        <!-- 审核完成时间 -->
+        <el-table-column
+          prop="AuditTime"
+          :label="$t('trials:qcCheck:table:auditTime')"
+          show-overflow-tooltip
+          width="170"
+        />
         <!-- 历史审核人 -->
         <el-table-column
           v-show="OtherInfo.QCProcessEnum !== 0"
@@ -652,6 +670,8 @@ const searchDataDefault = () => {
     IsUrgent: null,
     AuditStateArray: [],
     HandleUserId: '',
+    BeginAuditTime: null,
+    EndAuditTime: null,
     PageIndex: 1,
     PageSize: 20
     // SortField: '',
@@ -683,7 +703,8 @@ export default {
       trialCode: this.$route.query.trialCode,
       query: null,
       manualsDialog: { visible: false },
-      isFullscreen: false
+      isFullscreen: false,
+      timeList: []
     }
   },
   watch: {
@@ -822,6 +843,7 @@ export default {
     // 重置
     handleReset() {
       this.searchData = searchDataDefault()
+      this.timeList = []
       this.getList()
       this.$nextTick(() => {
         this.$refs.qcCheckList.clearSort()
@@ -949,6 +971,15 @@ export default {
         this.qcVisible = false
       })
     },
+    changeTimeList() {
+      if (this.timeList) {
+        this.searchData.BeginAuditTime = this.timeList[0]
+        this.searchData.EndAuditTime = this.timeList[1]
+      } else {
+        this.searchData.BeginAuditTime = null
+        this.searchData.EndAuditTime = null
+      }
+    },
     openManuals() {
       this.manualsDialog.visible = true
     }