系统标准添加报告页显示在阅片页配置

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

.env.development

@@ -14,6 +14,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = false
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = false
 
+# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否
+VUE_APP_LOCK_FOR_PERMISSION_MFA = false
+
 # 是否开启长时间无操作锁定弹框 true:是 false:否
 VUE_APP_LOCK_FOR_PERMISSION = false
 

.env.prod

@@ -8,6 +8,9 @@ VUE_APP_BASE_PATH = '/'
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
 
+# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否
+VUE_APP_LOCK_FOR_PERMISSION_MFA = false
+
 # 是否开启长时间无操作锁定弹框 true:是 false:否
 VUE_APP_LOCK_FOR_PERMISSION = true
 

.env.production

@@ -9,6 +9,9 @@ VUE_APP_IS_TEST = true
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = false
 
+# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否
+VUE_APP_LOCK_FOR_PERMISSION_MFA = false
+
 # 是否开启长时间无操作锁定弹框 true:是 false:否
 VUE_APP_LOCK_FOR_PERMISSION = false
 

.env.prop

@@ -5,6 +5,9 @@ NODE_ENV = 'prop'
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
 
+# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否
+VUE_APP_LOCK_FOR_PERMISSION_MFA = false
+
 # 是否开启长时间无操作锁定弹框 true:是 false:否
 VUE_APP_LOCK_FOR_PERMISSION = true
 

.env.uat

@@ -10,6 +10,9 @@ VUE_APP_BASE_PATH = '/'
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
 
+# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否
+VUE_APP_LOCK_FOR_PERMISSION_MFA = false
+
 # 是否开启长时间无操作锁定弹框 true:是 false:否
 VUE_APP_LOCK_FOR_PERMISSION = true
 

.env.usa

@@ -1,26 +1,29 @@
 # just a flag
-ENV = 'production'
-NODE_ENV = 'production'
+ENV = 'usa'
+NODE_ENV = 'usa'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-04-29/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-30/'
 
 # 是否开启登陆限制 true:是 false:否
-VUE_APP_LOGIN_FOR_PERMISSION = false
+VUE_APP_LOGIN_FOR_PERMISSION = true
+
+# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否
+VUE_APP_LOCK_FOR_PERMISSION_MFA = true
 
 # 是否开启长时间无操作锁定弹框 true:是 false:否
-VUE_APP_LOCK_FOR_PERMISSION = false
+VUE_APP_LOCK_FOR_PERMISSION = true
 
 # 无操作锁定弹框判断时间 单位:秒
 VUE_APP_LOCK_FOR_TIME = 900
 
 # 是否开启长时间无操作登出 true:是 false:否
-VUE_APP_LOGOUT_FOR_PERMISSION = false
+VUE_APP_LOGOUT_FOR_PERMISSION = true
 
 # 无操作锁定弹框判断时间 单位:秒
 VUE_APP_LOGOUT_FOR_TIME = 1800
 
 # 是否开启密码正则验证 true:是 false:否
-VUE_APP_PASSWORD_FOR_PERMISSION = false
+VUE_APP_PASSWORD_FOR_PERMISSION = true
 
 # 是否开启密码正则验证 true:是 false:否
 VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$

.env.usa_prod

@@ -0,0 +1,46 @@
+# just a flag
+ENV = 'usa'
+NODE_ENV = 'usa'
+# base public path
+VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-30/'
+
+# 是否开启登陆限制 true:是 false:否
+VUE_APP_LOGIN_FOR_PERMISSION = true
+
+# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否
+VUE_APP_LOCK_FOR_PERMISSION_MFA = true
+
+# 是否开启长时间无操作锁定弹框 true:是 false:否
+VUE_APP_LOCK_FOR_PERMISSION = true
+
+# 无操作锁定弹框判断时间 单位:秒
+VUE_APP_LOCK_FOR_TIME = 900
+
+# 是否开启长时间无操作登出 true:是 false:否
+VUE_APP_LOGOUT_FOR_PERMISSION = true
+
+# 无操作锁定弹框判断时间 单位:秒
+VUE_APP_LOGOUT_FOR_TIME = 1800
+
+# 是否开启密码正则验证 true:是 false:否
+VUE_APP_PASSWORD_FOR_PERMISSION = true
+
+# 是否开启密码正则验证 true:是 false:否
+VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
+
+# 是否开启文档签署验证 true:是 false:否
+VUE_APP_WORD_FOR_PERMISSION = true
+
+# 公司名称
+VUE_APP_COMPANY_NAME = "Elevate Imaging"
+
+# dicom文件地址
+VUE_APP_DICOM_PATH = 'https://zyypacs-usa.oss-us-west-1.aliyuncs.com'
+
+VUE_APP_DICOM_USA_PATH = 'https://zyypacs-usa.oss-us-west-1.aliyuncs.com'
+
+VUE_APP_OSS_CONFIG_REGION = 'oss-us-west-1'
+
+VUE_APP_OSS_CONFIG_BUCKET = 'zyypacs-usa'
+
+VUE_APP_OSS_PATH = '/usa/dist'

irc_vue_drone.yml

@@ -1,3 +1,32 @@
+kind: pipeline
+type: ssh
+name: ssh-linux-uat-irc-publish
+
+platform:
+  os: Linux
+  arch: 386
+  
+clone:
+  disable: true  #禁用默认克隆
+  
+server:
+  host: 47.117.164.182
+  user: root
+  password:
+    from_secret: local_pwd
+
+steps:
+- name: uat-branch-publish-irc-vue
+  commands:
+  - cd /opt/1panel/vue-devops/Uat_IRC/Uat-To-Uat
+  - sh uat-to-uat.sh v${DRONE_BUILD_NUMBER}
+  
+trigger:
+  branch:
+    - uat    
+    
+---    
+    
 kind: pipeline
 type: ssh
 name: ssh-linux-test-irc-publish
@@ -10,7 +39,7 @@ clone:
   disable: true  #禁用默认克隆
   
 server:
-  host: 192.168.3.68
+  host: 106.14.89.110
   user: root
   password:
     from_secret: local_pwd
@@ -19,42 +48,14 @@ steps:
 - name: publish-test-irc-vue
   commands:
   - echo start publish test-irc-vue
-  - cd /opt/hang/vue/test-irc    
+  - cd /opt/1panel/hang/vue/test-irc
   - sh test-irc.sh v${DRONE_BUILD_NUMBER}
   
 trigger:
   branch:
     - main    
        
----
 
-      
-kind: pipeline
-type: ssh
-name: ssh-linux-test-study-publish
+       
 
-platform:
-  os: Linux
-  arch: 386
-
-clone:
-  disable: true  #禁用默认克隆
-  
-server:
-  host: 123.56.94.154
-  user: root
-  password:
-    from_secret: local_pwd
-  
-steps:
-- name: publish-test-study
-  commands:
-  - echo start publish test-study-api
-  - cd /opt/1panel/hang/devops/test-study
-  - sh test-study.sh v${DRONE_BUILD_NUMBER}
-  
-trigger:
-  branch:
-    - Test.Study  
-    
     

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "EICS",
-  "version": "1.0.0",
+  "version": "1.3.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -19,7 +19,6 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.1.tgz",
       "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
-      "dev": true,
       "requires": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
@@ -29,7 +28,6 @@
       "version": "7.23.5",
       "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.23.5.tgz",
       "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
-      "dev": true,
       "requires": {
         "@babel/highlight": "^7.23.4",
         "chalk": "^2.4.2"
@@ -38,14 +36,12 @@
     "@babel/compat-data": {
       "version": "7.23.5",
       "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.23.5.tgz",
-      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
-      "dev": true
+      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw=="
     },
     "@babel/core": {
       "version": "7.23.6",
       "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.23.6.tgz",
       "integrity": "sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==",
-      "dev": true,
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.23.5",
@@ -67,14 +63,34 @@
         "json5": {
           "version": "2.2.3",
           "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
-          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-          "dev": true
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
         },
         "semver": {
           "version": "6.3.1",
           "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+        }
+      }
+    },
+    "@babel/eslint-parser": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmmirror.com/@babel/eslint-parser/-/eslint-parser-7.24.8.tgz",
+      "integrity": "sha512-nYAikI4XTGokU2QX7Jx+v4rxZKhKivaQaREZjuW3mrJrbdWJ5yUfohnoUULge+zEEaKjPYNxhoRgUKktjXtbwA==",
+      "requires": {
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.1"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
+        },
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
         }
       }
     },
@@ -82,7 +98,6 @@
       "version": "7.23.6",
       "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.23.6.tgz",
       "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.23.6",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -112,7 +127,6 @@
       "version": "7.23.6",
       "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
       "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
-      "dev": true,
       "requires": {
         "@babel/compat-data": "^7.23.5",
         "@babel/helper-validator-option": "^7.23.5",
@@ -125,7 +139,6 @@
           "version": "5.1.1",
           "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz",
           "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
           "requires": {
             "yallist": "^3.0.2"
           }
@@ -133,14 +146,12 @@
         "semver": {
           "version": "6.3.1",
           "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
         },
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
         }
       }
     },
@@ -204,14 +215,12 @@
     "@babel/helper-environment-visitor": {
       "version": "7.22.20",
       "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
     },
     "@babel/helper-function-name": {
       "version": "7.23.0",
       "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
       "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dev": true,
       "requires": {
         "@babel/template": "^7.22.15",
         "@babel/types": "^7.23.0"
@@ -221,7 +230,6 @@
       "version": "7.22.5",
       "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
       "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.22.5"
       }
@@ -239,7 +247,6 @@
       "version": "7.22.15",
       "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
       "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.22.15"
       }
@@ -248,7 +255,6 @@
       "version": "7.23.3",
       "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
       "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
-      "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-module-imports": "^7.22.15",
@@ -298,7 +304,6 @@
       "version": "7.22.5",
       "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
       "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.22.5"
       }
@@ -316,7 +321,6 @@
       "version": "7.22.6",
       "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
       "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.22.5"
       }
@@ -324,20 +328,17 @@
     "@babel/helper-string-parser": {
       "version": "7.23.4",
       "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
-      "dev": true
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ=="
     },
     "@babel/helper-validator-identifier": {
       "version": "7.22.20",
       "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-      "dev": true
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
     },
     "@babel/helper-validator-option": {
       "version": "7.23.5",
       "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
-      "dev": true
+      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw=="
     },
     "@babel/helper-wrap-function": {
       "version": "7.22.20",
@@ -354,7 +355,6 @@
       "version": "7.23.6",
       "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.23.6.tgz",
       "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==",
-      "dev": true,
       "requires": {
         "@babel/template": "^7.22.15",
         "@babel/traverse": "^7.23.6",
@@ -365,7 +365,6 @@
       "version": "7.23.4",
       "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.23.4.tgz",
       "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
-      "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
@@ -375,8 +374,7 @@
         "js-tokens": {
           "version": "4.0.0",
           "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-          "dev": true
+          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
         }
       }
     },
@@ -1326,7 +1324,6 @@
       "version": "7.22.15",
       "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.22.15.tgz",
       "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
-      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.22.13",
         "@babel/parser": "^7.22.15",
@@ -1337,7 +1334,6 @@
       "version": "7.23.6",
       "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.23.6.tgz",
       "integrity": "sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==",
-      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.23.5",
         "@babel/generator": "^7.23.6",
@@ -1354,8 +1350,7 @@
         "globals": {
           "version": "11.12.0",
           "resolved": "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
+          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
         }
       }
     },
@@ -1363,7 +1358,6 @@
       "version": "7.23.6",
       "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.23.6.tgz",
       "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
-      "dev": true,
       "requires": {
         "@babel/helper-string-parser": "^7.23.4",
         "@babel/helper-validator-identifier": "^7.22.20",
@@ -1373,8 +1367,7 @@
         "to-fast-properties": {
           "version": "2.0.0",
           "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-          "dev": true
+          "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
         }
       }
     },
@@ -1581,11 +1574,15 @@
         }
       }
     },
+    "@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmmirror.com/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="
+    },
     "@jridgewell/gen-mapping": {
       "version": "0.3.3",
       "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
       "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
-      "dev": true,
       "requires": {
         "@jridgewell/set-array": "^1.0.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -1595,31 +1592,61 @@
     "@jridgewell/resolve-uri": {
       "version": "3.1.1",
       "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
-      "dev": true
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="
     },
     "@jridgewell/set-array": {
       "version": "1.1.2",
       "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "dev": true
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
     },
     "@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
       "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
     "@jridgewell/trace-mapping": {
       "version": "0.3.20",
       "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
       "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
-      "dev": true,
       "requires": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "@jsdevtools/coverage-istanbul-loader": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmmirror.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz",
+      "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==",
+      "requires": {
+        "convert-source-map": "^1.7.0",
+        "istanbul-lib-instrument": "^4.0.3",
+        "loader-utils": "^2.0.0",
+        "merge-source-map": "^1.1.0",
+        "schema-utils": "^2.7.0"
+      },
+      "dependencies": {
+        "convert-source-map": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-1.9.0.tgz",
+          "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+        },
+        "json5": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
+        },
+        "loader-utils": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        }
+      }
+    },
     "@kitware/vtk.js": {
       "version": "27.3.1",
       "resolved": "https://registry.npmmirror.com/@kitware/vtk.js/-/vtk.js-27.3.1.tgz",
@@ -1718,6 +1745,25 @@
         "glob-to-regexp": "^0.3.0"
       }
     },
+    "@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmmirror.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "requires": {
+        "eslint-scope": "5.1.1"
+      },
+      "dependencies": {
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
+          }
+        }
+      }
+    },
     "@node-ipc/js-queue": {
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/@node-ipc/js-queue/-/js-queue-2.0.3.tgz",
@@ -3084,7 +3130,6 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
         },
@@ -4332,6 +4377,26 @@
         "zip-stream": "^4.1.0"
       },
       "dependencies": {
+        "compress-commons": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/compress-commons/-/compress-commons-4.1.2.tgz",
+          "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==",
+          "requires": {
+            "buffer-crc32": "^0.2.13",
+            "crc32-stream": "^4.0.2",
+            "normalize-path": "^3.0.0",
+            "readable-stream": "^3.6.0"
+          }
+        },
+        "crc32-stream": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmmirror.com/crc32-stream/-/crc32-stream-4.0.3.tgz",
+          "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==",
+          "requires": {
+            "crc-32": "^1.2.0",
+            "readable-stream": "^3.4.0"
+          }
+        },
         "readable-stream": {
           "version": "3.6.2",
           "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -4341,6 +4406,35 @@
             "string_decoder": "^1.1.1",
             "util-deprecate": "^1.0.1"
           }
+        },
+        "zip-stream": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmmirror.com/zip-stream/-/zip-stream-4.1.1.tgz",
+          "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==",
+          "requires": {
+            "archiver-utils": "^3.0.4",
+            "compress-commons": "^4.1.2",
+            "readable-stream": "^3.6.0"
+          },
+          "dependencies": {
+            "archiver-utils": {
+              "version": "3.0.4",
+              "resolved": "https://registry.npmmirror.com/archiver-utils/-/archiver-utils-3.0.4.tgz",
+              "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==",
+              "requires": {
+                "glob": "^7.2.3",
+                "graceful-fs": "^4.2.0",
+                "lazystream": "^1.0.0",
+                "lodash.defaults": "^4.2.0",
+                "lodash.difference": "^4.5.0",
+                "lodash.flatten": "^4.4.0",
+                "lodash.isplainobject": "^4.0.6",
+                "lodash.union": "^4.6.0",
+                "normalize-path": "^3.0.0",
+                "readable-stream": "^3.6.0"
+              }
+            }
+          }
         }
       }
     },
@@ -5086,16 +5180,6 @@
       "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
     },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
     "bl": {
       "version": "4.1.0",
       "resolved": "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz",
@@ -5379,7 +5463,6 @@
       "version": "4.22.2",
       "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.22.2.tgz",
       "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
-      "dev": true,
       "requires": {
         "caniuse-lite": "^1.0.30001565",
         "electron-to-chromium": "^1.4.601",
@@ -5659,8 +5742,7 @@
     "caniuse-lite": {
       "version": "1.0.30001568",
       "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001568.tgz",
-      "integrity": "sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A==",
-      "dev": true
+      "integrity": "sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A=="
     },
     "case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
@@ -6252,29 +6334,6 @@
       "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
       "dev": true
     },
-    "compress-commons": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmmirror.com/compress-commons/-/compress-commons-4.1.2.tgz",
-      "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==",
-      "requires": {
-        "buffer-crc32": "^0.2.13",
-        "crc32-stream": "^4.0.2",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^3.6.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmmirror.com/compressible/-/compressible-2.0.18.tgz",
@@ -6444,8 +6503,7 @@
     "convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
     "cookie": {
       "version": "0.5.0",
@@ -6555,12 +6613,32 @@
       }
     },
     "cornerstone-wado-image-loader": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmmirror.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-3.3.2.tgz",
-      "integrity": "sha512-Yy0DtfSMlflMS5RMQhX9YnXiYYkZz99nnXG2qtBRvzvSdwqiElIpE13sKw0Ohi4mqNwrWRx0xt8utk0HKnAXyw==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmmirror.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-4.13.2.tgz",
+      "integrity": "sha512-NGqH44bY1VMY8OYuVykkLriNtZQrmoZU/S6f/1t1xX3rMc+WUMNN+yi4Nu3jp6nckLdH/bVGiigoJXrp0dTrAg==",
       "requires": {
-        "dicom-parser": "^1.8.3",
-        "pako": "^1.0.10"
+        "@babel/eslint-parser": "^7.19.1",
+        "@cornerstonejs/codec-charls": "^1.2.3",
+        "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
+        "@cornerstonejs/codec-openjpeg": "^1.2.2",
+        "@cornerstonejs/codec-openjph": "^2.4.2",
+        "coverage-istanbul-loader": "^3.0.5",
+        "date-format": "^4.0.14",
+        "dicom-parser": "^1.8.9",
+        "pako": "^2.0.4",
+        "uuid": "^9.0.0"
+      },
+      "dependencies": {
+        "pako": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmmirror.com/pako/-/pako-2.1.0.tgz",
+          "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug=="
+        },
+        "uuid": {
+          "version": "9.0.1",
+          "resolved": "https://registry.npmmirror.com/uuid/-/uuid-9.0.1.tgz",
+          "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
+        }
       }
     },
     "cosmiconfig": {
@@ -6587,32 +6665,19 @@
         }
       }
     },
+    "coverage-istanbul-loader": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmmirror.com/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz",
+      "integrity": "sha512-xsw2phF0VNqUPk47V/vHXkdcTyl0tkMSmaZfLrTOhoPhPMXFelNju7utl5s7I93KXzipqDEK0YwofQSSflPz8A==",
+      "requires": {
+        "@jsdevtools/coverage-istanbul-loader": "3.0.5"
+      }
+    },
     "crc-32": {
       "version": "1.2.2",
       "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
       "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="
     },
-    "crc32-stream": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmmirror.com/crc32-stream/-/crc32-stream-4.0.3.tgz",
-      "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==",
-      "requires": {
-        "crc-32": "^1.2.0",
-        "readable-stream": "^3.4.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "create-ecdh": {
       "version": "4.0.4",
       "resolved": "https://registry.npmmirror.com/create-ecdh/-/create-ecdh-4.0.4.tgz",
@@ -7101,6 +7166,11 @@
       "resolved": "https://registry.npmmirror.com/date-fns/-/date-fns-1.30.1.tgz",
       "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="
     },
+    "date-format": {
+      "version": "4.0.14",
+      "resolved": "https://registry.npmmirror.com/date-format/-/date-format-4.0.14.tgz",
+      "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg=="
+    },
     "dateformat": {
       "version": "2.2.0",
       "resolved": "https://registry.npmmirror.com/dateformat/-/dateformat-2.2.0.tgz",
@@ -7613,8 +7683,7 @@
     "electron-to-chromium": {
       "version": "1.4.611",
       "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.611.tgz",
-      "integrity": "sha512-ZtRpDxrjHapOwxtv+nuth5ByB8clyn8crVynmRNGO3wG3LOp8RTcyZDqwaI6Ng6y8FCK2hVZmJoqwCskKbNMaw==",
-      "dev": true
+      "integrity": "sha512-ZtRpDxrjHapOwxtv+nuth5ByB8clyn8crVynmRNGO3wG3LOp8RTcyZDqwaI6Ng6y8FCK2hVZmJoqwCskKbNMaw=="
     },
     "elegant-spinner": {
       "version": "1.0.1",
@@ -7821,8 +7890,7 @@
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
     "escape-html": {
       "version": "1.0.3",
@@ -8085,7 +8153,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
       "requires": {
         "estraverse": "^5.2.0"
       },
@@ -8093,16 +8160,14 @@
         "estraverse": {
           "version": "5.3.0",
           "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
         }
       }
     },
     "estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
     },
     "esutils": {
       "version": "2.0.3",
@@ -8542,13 +8607,6 @@
       "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
       "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
     },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
     "filesize": {
       "version": "3.6.1",
       "resolved": "https://registry.npmmirror.com/filesize/-/filesize-3.6.1.tgz",
@@ -8878,8 +8936,7 @@
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmmirror.com/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
     },
     "get-caller-file": {
       "version": "2.0.5",
@@ -10467,6 +10524,29 @@
       "resolved": "https://registry.npmmirror.com/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
     },
+    "istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmmirror.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg=="
+    },
+    "istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "requires": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+        }
+      }
+    },
     "javascript-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmmirror.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz",
@@ -10518,8 +10598,7 @@
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
     },
     "json-parse-better-errors": {
       "version": "1.0.2",
@@ -11197,7 +11276,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/merge-source-map/-/merge-source-map-1.1.0.tgz",
       "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-      "dev": true,
       "requires": {
         "source-map": "^0.6.1"
       },
@@ -11205,8 +11283,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -11922,8 +11999,7 @@
     "node-releases": {
       "version": "2.0.14",
       "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-      "dev": true
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
     },
     "node-sass": {
       "version": "4.14.1",
@@ -14223,6 +14299,11 @@
       "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
       "dev": true
     },
+    "qrcodejs2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmmirror.com/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
+      "integrity": "sha512-+Y4HA+cb6qUzdgvI3KML8GYpMFwB24dFwzMkS/yXq6hwtUGNUnZQdUnksrV1XGMc2mid5ROw5SAuY9XhI3ValA=="
+    },
     "qs": {
       "version": "6.11.2",
       "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.2.tgz",
@@ -15841,6 +15922,11 @@
       "resolved": "https://registry.npmmirror.com/stream-wormhole/-/stream-wormhole-1.1.0.tgz",
       "integrity": "sha512-gHFfL3px0Kctd6Po0M8TzEvt3De/xu6cnRrjlfYNhwbhLPLwigI2t1nc6jrzNuaYg5C4YF78PPFuQPzRiqn9ew=="
     },
+    "streamsaver": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmmirror.com/streamsaver/-/streamsaver-2.0.6.tgz",
+      "integrity": "sha512-LK4e7TfCV8HzuM0PKXuVUfKyCB1FtT9L0EGxsFk5Up8njj0bXK8pJM9+Wq2Nya7/jslmCQwRK39LFm55h7NBTw=="
+    },
     "strict-uri-encode": {
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
@@ -17160,7 +17246,6 @@
       "version": "1.0.13",
       "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
       "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
-      "dev": true,
       "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
@@ -17767,7 +17852,6 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
         },
@@ -18898,45 +18982,6 @@
         }
       }
     },
-    "zip-stream": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmmirror.com/zip-stream/-/zip-stream-4.1.1.tgz",
-      "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==",
-      "requires": {
-        "archiver-utils": "^3.0.4",
-        "compress-commons": "^4.1.2",
-        "readable-stream": "^3.6.0"
-      },
-      "dependencies": {
-        "archiver-utils": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmmirror.com/archiver-utils/-/archiver-utils-3.0.4.tgz",
-          "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==",
-          "requires": {
-            "glob": "^7.2.3",
-            "graceful-fs": "^4.2.0",
-            "lazystream": "^1.0.0",
-            "lodash.defaults": "^4.2.0",
-            "lodash.difference": "^4.5.0",
-            "lodash.flatten": "^4.4.0",
-            "lodash.isplainobject": "^4.0.6",
-            "lodash.union": "^4.6.0",
-            "normalize-path": "^3.0.0",
-            "readable-stream": "^3.6.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "zrender": {
       "version": "4.3.2",
       "resolved": "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz",

package.json

@@ -1,12 +1,13 @@
 {
   "name": "EICS",
-  "version": "1.0.0",
+  "version": "1.3.2",
   "scripts": {
     "dev": "vue-cli-service serve --open --mode development",
     "build": "vue-cli-service build",
     "build:prod": "vue-cli-service  build --mode prod",
     "build:uat": "vue-cli-service  build --mode uat",
     "build:usa": "vue-cli-service  build --mode usa",
+    "build:usa_prod": "vue-cli-service  build --mode usa_prod",
     "pre": "vue-cli-service build --mode pre",
     "i18n": "npm run i18n:zh && npm run i18n:en",
     "i18n:zh": "node i18nGenerate.js lang=zh keyCol=5 valCol=6",
@@ -26,11 +27,13 @@
     "axios": "0.18.1",
     "babel-eslint": "7.2.3",
     "copy-webpack-plugin": "^4.5.2",
+    "@aws-sdk/client-s3": "^3.370.0",
     "core-js": "^3.8.3",
-    "cornerstone-core": "^2.3.0",
-    "cornerstone-math": "^0.1.8",
-    "cornerstone-tools": "^6.0.8",
-    "cornerstone-wado-image-loader": "^3.1.2",
+    "cornerstone-core": "^2.6.1",
+    "cornerstone-math": "^0.1.10",
+    "cornerstone-tools": "^6.0.10",
+    "cornerstone-wado-image-loader": "^4.13.2",
+    "crypto-js": "^4.2.0",
     "dcmjs": "^0.29.8",
     "dicom-parser": "^1.8.9",
     "dicomedit": "^0.1.0",
@@ -41,6 +44,7 @@
     "hammerjs": "^2.0.8",
     "html2canvas": "^1.4.1",
     "js-md5": "^0.7.3",
+    "jsencrypt": "^3.3.2",
     "jszip": "^3.7.1",
     "moment": "^2.27.0",
     "node-polyfill-webpack-plugin": "^2.0.1",
@@ -50,9 +54,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",

public/mitm.html

@@ -0,0 +1,167 @@
+<!--
+	mitm.html is the lite "man in the middle"
+
+	This is only meant to signal the opener's messageChannel to
+	the service worker - when that is done this mitm can be closed
+    but it's better to keep it alive since this also stops the sw
+    from restarting
+
+	The service worker is capable of intercepting all request and fork their
+	own "fake" response - wish we are going to craft
+	when the worker then receives a stream then the worker will tell the opener
+	to open up a link that will start the download
+-->
+<script>
+// This will prevent the sw from restarting
+let keepAlive = () => {
+  keepAlive = () => {}
+  var ping = location.href.substr(0, location.href.lastIndexOf('/')) + '/ping'
+  var interval = setInterval(() => {
+    if (sw) {
+      sw.postMessage('ping')
+    } else {
+      fetch(ping).then(res => res.text(!res.ok && clearInterval(interval)))
+    }
+  }, 10000)
+}
+
+// message event is the first thing we need to setup a listner for
+// don't want the opener to do a random timeout - instead they can listen for
+// the ready event
+// but since we need to wait for the Service Worker registration, we store the
+// message for later
+let messages = []
+window.onmessage = evt => messages.push(evt)
+
+let sw = null
+let scope = ''
+
+function registerWorker() {
+  return navigator.serviceWorker.getRegistration('./').then(swReg => {
+    return swReg || navigator.serviceWorker.register('sw.js', { scope: './' })
+  }).then(swReg => {
+    const swRegTmp = swReg.installing || swReg.waiting
+
+    scope = swReg.scope
+
+    return (sw = swReg.active) || new Promise(resolve => {
+      swRegTmp.addEventListener('statechange', fn = () => {
+        if (swRegTmp.state === 'activated') {
+          swRegTmp.removeEventListener('statechange', fn)
+          sw = swReg.active
+          resolve()
+        }
+      })
+    })
+  })
+}
+
+// Now that we have the Service Worker registered we can process messages
+function onMessage (event) {
+  let { data, ports, origin } = event
+
+  // It's important to have a messageChannel, don't want to interfere
+  // with other simultaneous downloads
+  if (!ports || !ports.length) {
+    throw new TypeError("[StreamSaver] You didn't send a messageChannel")
+  }
+
+  if (typeof data !== 'object') {
+    throw new TypeError("[StreamSaver] You didn't send a object")
+  }
+
+  // the default public service worker for StreamSaver is shared among others.
+  // so all download links needs to be prefixed to avoid any other conflict
+  data.origin = origin
+
+  // if we ever (in some feature versoin of streamsaver) would like to
+  // redirect back to the page of who initiated a http request
+  data.referrer = data.referrer || document.referrer || origin
+
+  // pass along version for possible backwards compatibility in sw.js
+  data.streamSaverVersion = new URLSearchParams(location.search).get('version')
+
+  if (data.streamSaverVersion === '1.2.0') {
+    console.warn('[StreamSaver] please update streamsaver')
+  }
+
+  /** @since v2.0.0 */
+  if (!data.headers) {
+    console.warn("[StreamSaver] pass `data.headers` that you would like to pass along to the service worker\nit should be a 2D array or a key/val object that fetch's Headers api accepts")
+  } else {
+    // test if it's correct
+    // should thorw a typeError if not
+    new Headers(data.headers)
+  }
+
+  /** @since v2.0.0 */
+  if (typeof data.filename === 'string') {
+    console.warn("[StreamSaver] You shouldn't send `data.filename` anymore. It should be included in the Content-Disposition header option")
+    // Do what File constructor do with fileNames
+    data.filename = data.filename.replace(/\//g, ':')
+  }
+
+  /** @since v2.0.0 */
+  if (data.size) {
+    console.warn("[StreamSaver] You shouldn't send `data.size` anymore. It should be included in the content-length header option")
+  }
+
+  /** @since v2.0.0 */
+  if (data.readableStream) {
+    console.warn("[StreamSaver] You should send the readableStream in the messageChannel, not throught mitm")
+  }
+
+  /** @since v2.0.0 */
+  if (!data.pathname) {
+    console.warn("[StreamSaver] Please send `data.pathname` (eg: /pictures/summer.jpg)")
+    data.pathname = Math.random().toString().slice(-6) + '/' + data.filename
+  }
+
+  // remove all leading slashes
+  data.pathname = data.pathname.replace(/^\/+/g, '')
+
+  // remove protocol
+  let org = origin.replace(/(^\w+:|^)\/\//, '')
+
+  // set the absolute pathname to the download url.
+  data.url = new URL(`${scope + org}/${data.pathname}`).toString()
+
+  if (!data.url.startsWith(`${scope + org}/`)) {
+    throw new TypeError('[StreamSaver] bad `data.pathname`')
+  }
+
+  // This sends the message data as well as transferring
+  // messageChannel.port2 to the service worker. The service worker can
+  // then use the transferred port to reply via postMessage(), which
+  // will in turn trigger the onmessage handler on messageChannel.port1.
+
+  const transferable = data.readableStream
+    ? [ ports[0], data.readableStream ]
+    : [ ports[0] ]
+
+  if (!(data.readableStream || data.transferringReadable)) {
+    keepAlive()
+  }
+
+  return sw.postMessage(data, transferable)
+}
+
+if (window.opener) {
+  // The opener can't listen to onload event, so we need to help em out!
+  // (telling them that we are ready to accept postMessage's)
+  window.opener.postMessage('StreamSaver::loadedPopup', '*')
+}
+
+if (navigator.serviceWorker) {
+  registerWorker().then(() => {
+    window.onmessage = onMessage
+    messages.forEach(window.onmessage)
+  })
+}
+
+// FF v102 just started to supports transferable streams, but still needs to ping sw.js
+// even tough the service worker dose not have to do any kind of work and listen to any
+// messages... #305
+keepAlive()
+
+</script>

public/sw.js

@@ -0,0 +1,130 @@
+/* global self ReadableStream Response */
+
+self.addEventListener('install', () => {
+  self.skipWaiting()
+})
+
+self.addEventListener('activate', event => {
+  event.waitUntil(self.clients.claim())
+})
+
+const map = new Map()
+
+// This should be called once per download
+// Each event has a dataChannel that the data will be piped through
+self.onmessage = event => {
+  // We send a heartbeat every x second to keep the
+  // service worker alive if a transferable stream is not sent
+  if (event.data === 'ping') {
+    return
+  }
+
+  const data = event.data
+  const downloadUrl = data.url || self.registration.scope + Math.random() + '/' + (typeof data === 'string' ? data : data.filename)
+  const port = event.ports[0]
+  const metadata = new Array(3) // [stream, data, port]
+
+  metadata[1] = data
+  metadata[2] = port
+
+  // Note to self:
+  // old streamsaver v1.2.0 might still use `readableStream`...
+  // but v2.0.0 will always transfer the stream through MessageChannel #94
+  if (event.data.readableStream) {
+    metadata[0] = event.data.readableStream
+  } else if (event.data.transferringReadable) {
+    port.onmessage = evt => {
+      port.onmessage = null
+      metadata[0] = evt.data.readableStream
+    }
+  } else {
+    metadata[0] = createStream(port)
+  }
+
+  map.set(downloadUrl, metadata)
+  port.postMessage({ download: downloadUrl })
+}
+
+function createStream (port) {
+  // ReadableStream is only supported by chrome 52
+  return new ReadableStream({
+    start (controller) {
+      // When we receive data on the messageChannel, we write
+      port.onmessage = ({ data }) => {
+        if (data === 'end') {
+          return controller.close()
+        }
+
+        if (data === 'abort') {
+          controller.error('Aborted the download')
+          return
+        }
+
+        controller.enqueue(data)
+      }
+    },
+    cancel (reason) {
+      console.log('user aborted', reason)
+      port.postMessage({ abort: true })
+    }
+  })
+}
+
+self.onfetch = event => {
+  const url = event.request.url
+
+  // this only works for Firefox
+  if (url.endsWith('/ping')) {
+    return event.respondWith(new Response('pong'))
+  }
+
+  const hijacke = map.get(url)
+
+  if (!hijacke) return null
+
+  const [ stream, data, port ] = hijacke
+
+  map.delete(url)
+
+  // Not comfortable letting any user control all headers
+  // so we only copy over the length & disposition
+  const responseHeaders = new Headers({
+    'Content-Type': 'application/octet-stream; charset=utf-8',
+
+    // To be on the safe side, The link can be opened in a iframe.
+    // but octet-stream should stop it.
+    'Content-Security-Policy': "default-src 'none'",
+    'X-Content-Security-Policy': "default-src 'none'",
+    'X-WebKit-CSP': "default-src 'none'",
+    'X-XSS-Protection': '1; mode=block',
+    'Cross-Origin-Embedder-Policy': 'require-corp'
+  })
+
+  let headers = new Headers(data.headers || {})
+
+  if (headers.has('Content-Length')) {
+    responseHeaders.set('Content-Length', headers.get('Content-Length'))
+  }
+
+  if (headers.has('Content-Disposition')) {
+    responseHeaders.set('Content-Disposition', headers.get('Content-Disposition'))
+  }
+
+  // data, data.filename and size should not be used anymore
+  if (data.size) {
+    console.warn('Depricated')
+    responseHeaders.set('Content-Length', data.size)
+  }
+
+  let fileName = typeof data === 'string' ? data : data.filename
+  if (fileName) {
+    console.warn('Depricated')
+    // Make filename RFC5987 compatible
+    fileName = encodeURIComponent(fileName).replace(/['()]/g, escape).replace(/\*/g, '%2A')
+    responseHeaders.set('Content-Disposition', "attachment; filename*=UTF-8''" + fileName)
+  }
+
+  event.respondWith(new Response(stream, { headers: responseHeaders }))
+
+  port.postMessage({ debug: 'Download started' })
+}

src/App.vue

@@ -1,169 +1,242 @@
 <template>
   <div id="app" style="position: relative">
     <router-view />
-    <div v-show="show" v-adaptive @click="openI18n" style="position: fixed;bottom: 50px;left: 50px;z-index: 100000;width: 50px;height: 50px;background: #409eff88;line-height: 50px;text-align: center;color:#fff;border-radius: 50%;cursor: pointer">
+    <div
+      v-show="show"
+      v-if="$route.matched.length > 0"
+      v-adaptive
+      @click="openI18n"
+      style="
+        position: fixed;
+        bottom: 50px;
+        left: 50px;
+        z-index: 100000;
+        width: 50px;
+        height: 50px;
+        background: #409eff88;
+        line-height: 50px;
+        text-align: center;
+        color: #fff;
+        border-radius: 50%;
+        cursor: pointer;
+      "
+    >
       i18n
     </div>
-    <el-drawer
-      title="国际化"
-      :visible.sync="drawer"
-      direction="rtl"
-      size="80%">
+    <el-drawer title="国际化" :visible.sync="drawer" direction="rtl" size="80%">
       <div style="width: 320px">
-        <el-form
-          label-width="100px"
-          @submit.native.prevent
-          size="small"
-        >
+        <el-form label-width="100px" @submit.native.prevent size="small">
           <el-form-item label="关键字">
-            <el-input v-model="key" @input="keyChange"/>
+            <el-input v-model="key" @input="keyChange" />
           </el-form-item>
         </el-form>
       </div>
       <el-table
         :data="tableData"
-        v-adaptive="{bottomOffset:50}"
+        v-adaptive="{ bottomOffset: 50 }"
         height="100"
-        style="width: 100%">
-        <el-table-column
-          prop="Code"
-          label="标签"
-          width="300">
+        style="width: 100%"
+      >
+        <el-table-column prop="Code" label="标签" width="300">
         </el-table-column>
-<!--        <el-table-column-->
-<!--          prop="Description"-->
-<!--          label="路由"-->
-<!--          show-overflow-tooltip-->
-<!--          width="180">-->
-<!--          <template slot-scope="scope">-->
-<!--            {{scope.row.Description}}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-        <el-table-column
-          prop="Value"
-          label="英文">
+        <!--        <el-table-column-->
+        <!--          prop="Description"-->
+        <!--          label="路由"-->
+        <!--          show-overflow-tooltip-->
+        <!--          width="180">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{scope.row.Description}}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column prop="Value" label="英文">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.Value" @input="(e) => {$set(scope.row, 'Value', e)}" size="mini"></el-input>
+            <el-input
+              v-model="scope.row.Value"
+              @input="
+                (e) => {
+                  $set(scope.row, 'Value', e);
+                }
+              "
+              size="mini"
+            ></el-input>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="ValueCN"
-          label="中文">
+        <el-table-column prop="ValueCN" label="中文">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.ValueCN" @input="(e) => {$set(scope.row, 'ValueCN', e)}" size="mini"></el-input>
+            <el-input
+              v-model="scope.row.ValueCN"
+              @input="
+                (e) => {
+                  $set(scope.row, 'ValueCN', e);
+                }
+              "
+              size="mini"
+            ></el-input>
           </template>
         </el-table-column>
       </el-table>
-      <div style="text-align: right;padding-top: 10px;padding-right: 10px;">
-        <el-button size="mini" @click="drawer = false">取消
-        </el-button>
-        <el-button size="mini" type="primary" @click="handleSave">保存</el-button>
+      <div style="text-align: right; padding-top: 10px; padding-right: 10px">
+        <el-button size="mini" @click="drawer = false">取消 </el-button>
+        <el-button size="mini" type="primary" @click="handleSave"
+          >保存</el-button
+        >
       </div>
     </el-drawer>
+    <feedBack v-if="$route.matched.length > 0" />
   </div>
 </template>
 
 <script>
-import { batchAddOrUpdateFrontInternationalization, getFrontInternationalizationList } from '@/api/dictionary/dictionary'
+import {
+  batchAddOrUpdateFrontInternationalization,
+  getFrontInternationalizationList,
+} from "@/api/dictionary/dictionary";
+import { getTrialExtralConfig } from "@/api/trials";
+import feedBack from "@/views/trials/trials-layout/components/feedBack";
 import Vue from "vue";
 import i18n from "./lang";
 export default {
-  name: 'App',
-  data () {
+  name: "App",
+  components: { feedBack },
+  data() {
     return {
       drawer: false,
       tableData: [],
       show: false,
       key: null,
-      arr: []
-    }
+      arr: [],
+    };
   },
   mounted() {
-    this.show = process.env.VUE_APP_OSS_PATH === '/test/dist'
+    this.show = process.env.VUE_APP_OSS_PATH === "/test/dist";
+  },
+  watch: {
+    "$route.query": {
+      async handler() {
+        if (
+          this.$route.query.trialId &&
+          this.$route.query.trialId !==
+            this.$store.state.trials.config.trialId &&
+          this.$store.state.trials.whiteList.indexOf(this.$route.path) === -1
+        ) {
+          let res = await getTrialExtralConfig({
+            TrialId: this.$route.query.trialId,
+          });
+          if (res.IsSuccess) {
+            this.$store.dispatch("trials/setConfig", {
+              trialId: this.$route.query.trialId,
+              ...res.Result,
+            });
+          }
+        }
+      },
+      immediate: true,
+      deep: true,
+    },
   },
   methods: {
     changeValue(target, attr, e) {
-      this.$set(target, attr, e)
+      this.$set(target, attr, e);
     },
     keyChange(v) {
       if (this.key) {
-        this.tableData = Object.assign([], this.arr.filter(v => ~v.Code.indexOf(this.key) || ~v.Value.indexOf(this.key) || ~v.ValueCN.indexOf(this.key)))
+        this.tableData = Object.assign(
+          [],
+          this.arr.filter(
+            (v) =>
+              ~v.Code.indexOf(this.key) ||
+              ~v.Value.indexOf(this.key) ||
+              ~v.ValueCN.indexOf(this.key)
+          )
+        );
       } else {
-        this.tableData = Object.assign([], this.arr)
+        this.tableData = Object.assign([], this.arr);
       }
     },
     handleSave() {
-      this.$confirm('确定修改当前页面国际化内容？').then(() => {
-        batchAddOrUpdateFrontInternationalization(this.tableData).then(async res => {
-          var zhMessages = {}, enMessages = {}
-          var Internationalization = await getFrontInternationalizationList()
-          Vue.prototype.$tl = Internationalization.Result
-          this.tableData.forEach(v => {
-            // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
-            // enMessages[v.Description + '_' + v.Code] = v.Value
-            zhMessages[v.Code] = v.ValueCN
-            enMessages[v.Code] = v.Value
-          })
-          i18n.mergeLocaleMessage('zh', zhMessages)
-          i18n.mergeLocaleMessage('en', enMessages)
-          this.drawer = false
-          this.$message.success('国际化修改成功')
-        })
-      })
+      this.$confirm("确定修改当前页面国际化内容？").then(() => {
+        batchAddOrUpdateFrontInternationalization(this.tableData).then(
+          async (res) => {
+            var zhMessages = {},
+              enMessages = {};
+            var Internationalization = await getFrontInternationalizationList();
+            Vue.prototype.$tl = Internationalization.Result;
+            this.tableData.forEach((v) => {
+              // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
+              // enMessages[v.Description + '_' + v.Code] = v.Value
+              zhMessages[v.Code] = v.ValueCN;
+              enMessages[v.Code] = v.Value;
+            });
+            i18n.mergeLocaleMessage("zh", zhMessages);
+            i18n.mergeLocaleMessage("en", enMessages);
+            this.drawer = false;
+            this.$message.success("国际化修改成功");
+          }
+        );
+      });
     },
     openI18n() {
-      this.tableData = []
-      this.key = null
-      this.drawer = true
-      let arr = []
-      let tableData = this.$tl.map(v => {
-        let a = {...v}
+      this.tableData = [];
+      this.key = null;
+      this.drawer = true;
+      let arr = [];
+      let tableData = this.$tl.map((v) => {
+        let a = { ...v };
         // if (!a.Description) {
         //   a.Description = this.$route.path
         // }
-        return a
-      })
-      tableData = tableData.filter(v => {
+        return a;
+      });
+      tableData = tableData.filter((v) => {
         // return  ~this.$path.indexOf(v.Description + '_' + v.Code)
-        return  ~this.$path.indexOf(v.Code)
-      })
-      this.$path.forEach(v => {
-        let o = tableData.find(a => {
-          return a.Code === v
-        })
+        return ~this.$path.indexOf(v.Code);
+      });
+      this.$path.forEach((v) => {
+        let o = tableData.find((a) => {
+          return a.Code === v;
+        });
         if (o) {
-          arr.push(o)
+          arr.push(o);
         } else {
           arr.push({
             Code: v,
             Description: null,
             Value: null,
-            ValueCN: null
-          })
+            ValueCN: null,
+          });
         }
-      })
-      this.arr = arr
+      });
+      this.arr = arr;
       if (this.key) {
-        this.tableData = Object.assign([], this.arr.filter(v => ~v.Code.indexOf(this.key) || ~v.Value.indexOf(this.key) || ~v.ValueCN.indexOf(this.key)))
+        this.tableData = Object.assign(
+          [],
+          this.arr.filter(
+            (v) =>
+              ~v.Code.indexOf(this.key) ||
+              ~v.Value.indexOf(this.key) ||
+              ~v.ValueCN.indexOf(this.key)
+          )
+        );
       } else {
-        this.tableData = Object.assign([], this.arr)
+        this.tableData = Object.assign([], this.arr);
       }
       // console.log(JSON.stringify(this.$path))
       // console.log(JSON.stringify(this.tableData))
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-.el-tooltip__popper{
+$light_gray: #606266;
+.el-tooltip__popper {
   max-width: 400px;
 }
-.my_multiple{
-  .el-input--medium .el-input__inner{
-    height: 36px!important;
+.my_multiple {
+  .el-input--medium .el-input__inner {
+    height: 36px !important;
   }
-  .el-select__tags{
+  .el-select__tags {
     flex-wrap: nowrap;
     overflow: hidden;
     white-space: nowrap;
@@ -180,21 +253,35 @@ input[type="number"] {
   -moz-appearance: textfield !important;
 }
 
-.viewer-fixed.viewer-container{
+.viewer-fixed.viewer-container {
   z-index: 10000;
 }
-textarea{
+textarea {
   white-space: break-spaces;
   word-break: normal;
 }
 
-*{
-  word-break: normal!important;
+* {
+  word-break: normal !important;
 }
-.box-body .el-button.is-circle:not(.is-disabled) i:before{
+.box-body .el-button.is-circle:not(.is-disabled) i:before {
   color: #428bca;
 }
-.box-body .el-button.is-circle i.el-icon-question:before{
+.box-body .el-button.is-circle i.el-icon-question:before {
   color: #fff;
 }
+.system-title {
+  font-size: 35px;
+  color: $light_gray;
+  text-align: center;
+  font-weight: bold;
+  font-family: "Times New Roman";
+  text-shadow: 1px 0.5px 1.5px #666;
+}
+.title-logo {
+  height: 40px;
+}
+.title-logo {
+  height: 40px;
+}
 </style>

src/api/admin.js

@@ -277,3 +277,19 @@ export function batchAddInternationalization(param) {
     data: param
   })
 }
+
+// 国际化获取迭代列表
+export function getPublishVersionSelect() {
+  return request({
+    url: `/PublishLog/getPublishVersionSelect`,
+    method: 'get',
+  })
+}
+// 国际化批量更新
+export function batchUpdateInternationalInfo(data) {
+  return request({
+    url: `/Internationalization/batchUpdateInternationalInfo`,
+    method: 'put',
+    data
+  })
+}

src/api/dictionary.js

@@ -1006,3 +1006,43 @@ export function deleteCommonDocument(commonDocumentId) {
     method: 'delete'
   })
 }
+//getTrialSiteList
+export function getTrialSiteList(params) {
+  return request({
+    url: `/site/getTrialSiteList`,
+    method: 'post',
+    data: params
+  })
+}
+
+// 获取版本记录列表
+export function getExploreRecommendList(params) {
+  return request({
+    url: `/ExploreRecommend/getExploreRecommendList`,
+    method: 'post',
+    data: params
+  })
+}
+// 新增或修改推荐版本记录
+export function addOrUpdateExploreRecommend(params) {
+  return request({
+    url: `/ExploreRecommend/addOrUpdateExploreRecommend`,
+    method: 'post',
+    data: params
+  })
+}
+// 删除推荐版本记录
+export function deleteExploreRecommend(id) {
+  return request({
+    url: `/ExploreRecommend/deleteExploreRecommend/${id}`,
+    method: 'delete'
+  })
+}
+// 获取推荐版本记录详情
+export function getExploreRecommentInfo(params) {
+  return request({
+    url: `/ExploreRecommend/getExploreRecommentInfo`,
+    method: 'get',
+    params
+  })
+}

src/api/dictionary/checkConfig.js

@@ -76,3 +76,11 @@ export function fullyReplicated(param) {
   })
 }
 
+// 获取所有字典key
+export function getDictionaryCodeList() {
+  return request({
+    url: `/Dictionary/getAllDictionaryKey`,
+    method: 'post',
+  })
+}
+

src/api/dictionary/dictionary.js

@@ -51,4 +51,10 @@ export function batchAddOrUpdateFrontInternationalization(params) {
     data: params
   })
 }
-
+// 获取当前版本
+export function getCurrentPublishInfo() {
+  return request({
+    url: `/PublishLog/getCurrentPublishInfo`,
+    method: 'get'
+  })
+}

src/api/export.js

@@ -160,3 +160,30 @@ export function getSubjectProgress_Export(param) {
     data: param
   })
 }
+// 导出项目列表
+export function getTrialList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getTrialList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出培训记录
+export function pMTrainingRecordList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/pMTrainingRecordList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出影像指控
+export function qCVisitList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/qCVisitList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}

src/api/global.js

@@ -14,17 +14,19 @@ export function getHospitalList() {
   })
 }
 
-export function getAllSponsorList() {
+export function getAllSponsorList(params) {
   return request({
     url: '/sponsor/getAllSponsorList',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 
-export function getAllCROList() {
+export function getAllCROList(params) {
   return request({
     url: '/cro/getAllCROList',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 export function getAllSiteList() {

src/api/load.js

@@ -0,0 +1,98 @@
+import request from '@/utils/request'
+// 下载打包影像
+export function requestPackageAndAnonymizImage(params) {
+    return request({
+        url: '/DownloadAndUpload/requestPackageAndAnonymizImage',
+        method: 'post',
+        params
+    })
+}
+// 获取影像上传列表
+export function getSubjectImageUploadList(data) {
+    return request({
+        url: '/DownloadAndUpload/getSubjectImageUploadList',
+        method: 'post',
+        data
+    })
+}
+// 预上传
+export function preArchiveDicomStudy(data) {
+    return request({
+        url: '/DownloadAndUpload/preArchiveDicomStudy',
+        method: 'post',
+        data
+    })
+}
+// 归档
+export function addOrUpdateArchiveTaskStudy(data) {
+    return request({
+        url: '/DownloadAndUpload/addOrUpdateArchiveTaskStudy',
+        method: 'post',
+        data
+    })
+}
+
+// 删除上传文件
+export function deleteTaskStudy(params) {
+    return request({
+        url: '/DownloadAndUpload/deleteTaskStudy',
+        method: 'delete',
+        params
+    })
+}
+// 获取iqc下载文件信息
+export function getCRCUploadedStudyInfo(data) {
+    return request({
+        url: '/DownloadAndUpload/getCRCUploadedStudyInfo',
+        method: 'post',
+        data
+    })
+}
+// 获取ir阅片和任务列表
+export function getSubjectImageDownloadSelectList(data) {
+    return request({
+        url: '/DownloadAndUpload/getSubjectImageDownloadSelectList',
+        method: 'post',
+        data
+    })
+}
+// 获取ir阅片和任务下载文件信息
+export function getIRReadingDownloadStudyInfo(data) {
+    return request({
+        url: '/DownloadAndUpload/getIRReadingDownloadStudyInfo',
+        method: 'post',
+        data
+    })
+}
+// 获取ir阅片和任务非dicom上传列表
+export function getIRUploadTaskNoneDicomStudyList(data) {
+    return request({
+        url: '/DownloadAndUpload/getIRUploadTaskNoneDicomStudyList',
+        method: 'post',
+        data
+    })
+}
+// 校验上传影像
+export function verifyIRStudyAllowUpload(data) {
+    return request({
+        url: '/DownloadAndUpload/verifyIRStudyAllowUpload',
+        method: 'post',
+        data
+    })
+}
+// 影像下载成功确认
+export function downloadImageSuccess(params) {
+    return request({
+        url: '/DownloadAndUpload/downloadImageSuccess',
+        method: 'post',
+        params
+    })
+}
+// 影像下载记录列表
+export function getTrialDownloadList(data) {
+    return request({
+        url: '/DownloadAndUpload/getTrialDownloadList',
+        method: 'post',
+        data
+    })
+}

src/api/reading.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-
+import requestDownload from '@/utils/request-download'
 export function addBaseLineLesion(param) {
   return request({
     url: '/report/addBaseLineLesion',
@@ -171,3 +171,81 @@ export function getCustomTag(param) {
     data: param
   })
 }
+
+export function clearSkipReadingCache(param) {
+  return request({
+    url: `/ReadingImageTask/clearSkipReadingCache`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function setSkipReadingCache(param) {
+  return request({
+    url: `/ReadingImageTask/setSkipReadingCache`,
+    method: 'post',
+    data: param
+  })
+}
+export function resetReadingTask(param) {
+  return request({
+    url: `/ReadingImageTask/resetReadingTask`,
+    method: 'post',
+    data: param
+  })
+}
+export function getTaskUploadedDicomStudyList(param) {
+  return request({
+    url: `/DownloadAndUpload/getTaskUploadedDicomStudyList`,
+    method: 'post',
+    data: param
+  })
+}
+export function getIVUSTemplate(param) {
+  return requestDownload({
+    url: '/IVUSCalculate/getIVUSTemplate',
+    method: 'post',
+    responseType: 'blob',
+    data: param
+  })
+}
+export function uploadIVUSTemplate(param) {
+  return request({
+    url: `/IVUSCalculate/uploadIVUSTemplate`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function getOCTFCTTemplate(param) {
+  return requestDownload({
+    url: '/OCTCalculate/getOCTFCTTemplate',
+    method: 'post',
+    responseType: 'blob',
+    data: param
+  })
+}
+
+export function uploadOCTFCTTemplate(param) {
+  return request({
+    url: `/OCTCalculate/uploadOCTFCTTemplate`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function getOCTLipidAngleTemplate(param) {
+  return requestDownload({
+    url: '/OCTCalculate/getOCTLipidAngleTemplate',
+    method: 'post',
+    responseType: 'blob',
+    data: param
+  })
+}
+export function uploadOCTLipidAngleTemplate(param) {
+  return request({
+    url: `/OCTCalculate/uploadOCTLipidAngleTemplate`,
+    method: 'post',
+    data: param
+  })
+}

src/api/trials.js

@@ -1364,9 +1364,9 @@ export function getForwardList(param) {
   })
 }
 
-export function getNoneDicomStudyList(subjectVisitId, sudyId = '') {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '') {
   return request({
-    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}`,
+    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}`,
     method: 'get'
   })
 }
@@ -3667,3 +3667,242 @@ export function getDicomSeriesInfo(param) {
     data: param
   })
 }
+
+export function getTrialSiteSelectList(params) {
+  return request({
+    url: `/trialMaintenance/getTrialSiteSelectList`,
+    method: 'get',
+    params
+  })
+}
+
+export function getNextIRMedicalFeedback(param) {
+  return request({
+    url: `/ReadingMedicalReview/getNextIRMedicalFeedback`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function getNextCRCChallenge(param) {
+  return request({
+    url: `/QCList/getNextCRCChallenge`,
+    method: 'post',
+    data: param
+  })
+}
+
+// 获取中心dicomae列表
+export function getTrialSiteDicomAEList(param) {
+  return request({
+    url: `/TrialSiteDicomAE/getTrialSiteDicomAEList`,
+    method: 'post',
+    data: param
+  })
+}
+// 新增或修改中心dicomae信息
+export function addOrUpdateTrialSiteDicomAE(param) {
+  return request({
+    url: `/TrialSiteDicomAE/addOrUpdateTrialSiteDicomAE`,
+    method: 'post',
+    data: param
+  })
+}
+// 删除中心dicomae信息
+export function deleteTrialSiteDicomAE(id) {
+  return request({
+    url: `/TrialSiteDicomAE/deleteTrialSiteDicomAE/${id}`,
+    method: 'delete'
+  })
+}
+// 获取项目中dicomAE配置
+export function getTrialDicomAE(params) {
+  return request({
+    url: `/TrialDicomAE/getTrialDicomAE`,
+    method: 'get',
+    params
+  })
+}
+// 获取项目配置
+export function getTrialExtralConfig(params) {
+  return request({
+    url: `/TrialConfig/getTrialExtralConfig`,
+    method: 'get',
+    params
+  })
+}
+// 项目新增或修改dicomAE配置
+export function addOrUpdateDicomAE(data) {
+  return request({
+    url: `/TrialDicomAE/addOrUpdateDicomAE`,
+    method: 'post',
+    data
+  })
+}
+// 测试dicomAE链接
+export function testSCPServerConnect(data) {
+  return request({
+    url: `/TrialDicomAE/testSCPServerConnect`,
+    method: 'post',
+    data
+  })
+}
+// 获取dicomAE默认值
+export function getTrialPacsConfigInfo(params) {
+  return request({
+    url: `/TrialConfig/getTrialPacsConfigInfo`,
+    method: 'get',
+    params
+  })
+}
+// dicomAE配置签名
+export function ConfigTrialPACSInfoConfirm(data) {
+  return request({
+    url: `/Inspection/configTrialBasicInfo/ConfigTrialPACSInfoConfirm`,
+    method: 'post',
+    data
+  })
+}
+// 获取推送记录
+export function getSCPImageUploadList(data) {
+  return request({
+    url: `/Patient/getSCPImageUploadList`,
+    method: 'post',
+    data
+  })
+}
+// 获取影像检查患者列表
+export function getPatientList(data) {
+  return request({
+    url: `/Patient/getPatientList`,
+    method: 'post',
+    data
+  })
+}
+// 获取影像检查患者检查列表
+export function getPatientStudyList(data) {
+  return request({
+    url: `/Patient/getPatientStudyList`,
+    method: 'post',
+    data
+  })
+}
+// 获取接收方AE列表
+export function getDicomCalledAEList(params) {
+  return request({
+    url: `/Patient/getDicomCalledAEList`,
+    method: 'get',
+    params
+  })
+}
+// 获取发送方AE列表
+export function getDicomCallingAEList(params) {
+  return request({
+    url: `/Patient/getDicomCallingAEList`,
+    method: 'get',
+    params
+  })
+}
+// CRCpacs上传检查列表
+export function getVisitPatientStudyFilterList(data) {
+  return request({
+    url: `/Patient/getVisitPatientStudyFilterList`,
+    method: 'post',
+    data
+  })
+}
+// CRCpacs上传检查校验
+export function verifyPacsImage(data) {
+  return request({
+    url: `/Patient/verifyPacsImage`,
+    method: 'post',
+    data
+  })
+}
+// CRCpacs上传检查
+export function submitVisitStudyBinding(data) {
+  return request({
+    url: `/Patient/submitVisitStudyBinding`,
+    method: 'post',
+    data
+  })
+}
+// 获取pacs检查技术
+export function getDicomModalityList(params) {
+  return request({
+    url: `/Patient/getDicomModalityList`,
+    method: 'get',
+    params
+  })
+}
+// 获取患者序列信息
+export function getPatientSeriesList(scpStudyId) {
+  return request({
+    url: `/Patient/getPatientSeriesList?scpStudyId=${scpStudyId}`,
+    method: 'get'
+  })
+}
+// 获取反馈列表
+export function getUserFeedBackList(data) {
+  return request({
+    url: `/UserFeedBack/getUserFeedBackList`,
+    method: 'post',
+    data
+  })
+}
+// 更新反馈状态
+export function batchUpdateFeedBackState(data) {
+  return request({
+    url: `/UserFeedBack/batchUpdateFeedBackState`,
+    method: 'put',
+    data
+  })
+}
+// 新增或修改意见反馈
+export function addOrUpdateUserFeedBack(data) {
+  return request({
+    url: `/UserFeedBack/addOrUpdateUserFeedBack`,
+    method: 'post',
+    data
+  })
+}
+// 获取反馈详情
+export function getUserFeedBackInfo(data) {
+  return request({
+    url: `/UserFeedBack/getUserFeedBackInfo`,
+    method: 'post',
+    data
+  })
+}
+//  一致性分析获取临床数据列表
+export function getConsistencyAnalysisReadingClinicalDataList(data) {
+  return request({
+    url: `/ReadingClinicalData/getConsistencyAnalysisReadingClinicalDataList`,
+    method: 'post',
+    data
+  })
+}
+//  新增或修改一致性分析临床数据
+export function addOrUpdateConsistencyAnalysisReadingClinicalData(data) {
+  return request({
+    url: `/ReadingClinicalData/addOrUpdateConsistencyAnalysisReadingClinicalData`,
+    method: 'post',
+    data
+  })
+}
+//  一致性分析临床数据签名
+export function signConsistencyAnalysisReadingClinicalData(data) {
+  return request({
+    url: `/Inspection/ReadingClinicalData/SignConsistencyAnalysisReadingClinicalData`,
+    method: 'post',
+    data
+  })
+}
+//  一致性分析临床数据设置任务为有效
+export function setTaskValid(data) {
+  return request({
+    url: `/ReadingClinicalData/setTaskValid`,
+    method: 'post',
+    data
+  })
+}

src/api/trials/reading.js

@@ -436,9 +436,9 @@ export function addSubjectCancelDoctorNote(params) {
   })
 }
 
-export function getSubjectCancelDoctorHistoryList(SubjectId) {
+export function getSubjectCancelDoctorHistoryList(SubjectId, TrialReadingCriterionId) {
   return request({
-    url: `/TaskAllocationRule/getSubjectCancelDoctorHistoryList?SubjectId=${SubjectId}`,
+    url: `/TaskAllocationRule/getSubjectCancelDoctorHistoryList?SubjectId=${SubjectId}&&TrialReadingCriterionId=${TrialReadingCriterionId}`,
     method: 'get'
   })
 }

src/api/trials/setting.js

@@ -94,4 +94,20 @@ export function getTrialJudgyInfo(params) {
     data: params
   })
 }
+// 获取检查部位列表
+export function getTrialBodyPartList(params) {
+  return request({
+    url: `/TrialConfig/getTrialBodyPartList`,
+    method: 'get',
+    params
+  })
+}
+// 新增检查部位
+export function addOrUpdateTrialBodyPart(data) {
+  return request({
+    url: `/TrialConfig/addOrUpdateTrialBodyPart`,
+    method: 'post',
+    data
+  })
+}
 

src/api/user.js

@@ -4,13 +4,15 @@ export function login(data) {
   return request({
     url: '/user/login',
     method: 'post',
-    data
+    data,
+    ENCRYPT: true
   })
 }
-export function loginOut() {
+export function loginOut(params) {
   return request({
     url: `/User/loginOut`,
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 export function getAllDictionary() {
@@ -157,3 +159,37 @@ export function getUserLogList(params) {
     data: params
   })
 }
+
+// 获取登录用户
+export function getTrialUserList(params) {
+  return request({
+    url: `/TrialMaintenance/getTrialUserList`,
+    method: 'get',
+    params
+  })
+}
+
+// 验证MFA邮件
+export function verifyMFACode(params) {
+  return request({
+    url: `/User/verifyMFACode`,
+    method: 'post',
+    params
+  })
+}
+
+// 发送MFA邮件
+export function sendMFAEmail(params) {
+  return request({
+    url: `/User/sendMFAEmail`,
+    method: 'post',
+    params
+  })
+}
+// 获取公钥
+export function getPublicKey() {
+  return request({
+    url: `/user/getPublicKey`,
+    method: 'get',
+  })
+}

src/assets/icons/svg/login-bg.svg

@@ -0,0 +1,781 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 765.14 474.77">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #d1d6ff;
+      }
+
+      .cls-2 {
+        fill: #707bef;
+      }
+
+      .cls-3 {
+        fill: #3d37a6;
+      }
+
+      .cls-4, .cls-5, .cls-6 {
+        fill: #fff;
+      }
+
+      .cls-5 {
+        opacity: .5;
+      }
+
+      .cls-5, .cls-7, .cls-8, .cls-9, .cls-6, .cls-10, .cls-11, .cls-12, .cls-13, .cls-14 {
+        fill-rule: evenodd;
+      }
+
+      .cls-15 {
+        fill: #f58d7d;
+      }
+
+      .cls-7 {
+        fill: #afbee7;
+      }
+
+      .cls-16 {
+        fill: #9f2121;
+      }
+
+      .cls-8 {
+        fill: #7483a7;
+      }
+
+      .cls-17 {
+        fill: #200000;
+      }
+
+      .cls-18 {
+        fill: #ab2426;
+      }
+
+      .cls-19 {
+        fill: #00338f;
+      }
+
+      .cls-9 {
+        fill: #333d56;
+      }
+
+      .cls-20 {
+        fill: #fac6bf;
+      }
+
+      .cls-21 {
+        fill: #e8625b;
+      }
+
+      .cls-22 {
+        fill: #ffbfce;
+      }
+
+      .cls-23 {
+        fill: #ffd785;
+      }
+
+      .cls-10 {
+        fill: #90a2d0;
+      }
+
+      .cls-11, .cls-24 {
+        fill: #384a8e;
+      }
+
+      .cls-25 {
+        fill: #a1b1f5;
+      }
+
+      .cls-26 {
+        fill: #fcfdff;
+      }
+
+      .cls-27, .cls-28 {
+        fill: #4b65de;
+      }
+
+      .cls-29 {
+        fill: #1067db;
+      }
+
+      .cls-30 {
+        fill: #7fc346;
+      }
+
+      .cls-31 {
+        clip-path: url(#clippath-2);
+      }
+
+      .cls-12, .cls-32 {
+        fill: #464c5c;
+      }
+
+      .cls-33 {
+        fill: #ff768d;
+      }
+
+      .cls-34 {
+        isolation: isolate;
+      }
+
+      .cls-35 {
+        fill: #2897cc;
+      }
+
+      .cls-36 {
+        fill: #ff5722;
+      }
+
+      .cls-37 {
+        fill: #025aa4;
+      }
+
+      .cls-38 {
+        stroke-width: 8.99px;
+      }
+
+      .cls-38, .cls-39, .cls-40, .cls-41, .cls-42 {
+        fill: none;
+      }
+
+      .cls-38, .cls-39, .cls-40, .cls-42 {
+        stroke-miterlimit: 10;
+      }
+
+      .cls-38, .cls-39, .cls-42 {
+        stroke: #dae2f9;
+      }
+
+      .cls-43 {
+        clip-path: url(#clippath-1);
+      }
+
+      .cls-39 {
+        stroke-width: 22.47px;
+      }
+
+      .cls-44 {
+        fill: #002daa;
+      }
+
+      .cls-13 {
+        fill: #c1d4ff;
+      }
+
+      .cls-45 {
+        fill: #1e1c1c;
+      }
+
+      .cls-46 {
+        fill: #e3edfe;
+      }
+
+      .cls-40 {
+        stroke: #e8eef9;
+      }
+
+      .cls-40, .cls-42 {
+        stroke-width: 6.74px;
+      }
+
+      .cls-28 {
+        opacity: .4;
+      }
+
+      .cls-28, .cls-47 {
+        mix-blend-mode: multiply;
+      }
+
+      .cls-48 {
+        fill: #c54342;
+      }
+
+      .cls-49 {
+        fill: #f99595;
+      }
+
+      .cls-50 {
+        clip-path: url(#clippath);
+      }
+
+      .cls-51 {
+        fill: #eef4fc;
+      }
+
+      .cls-52 {
+        fill: #f7d5b0;
+      }
+
+      .cls-53 {
+        fill: #c1d0f2;
+      }
+
+      .cls-54 {
+        fill: #6169b3;
+      }
+
+      .cls-55 {
+        fill: #fafcff;
+      }
+
+      .cls-56 {
+        fill: #d47180;
+      }
+
+      .cls-14 {
+        fill: #2e3d6d;
+      }
+
+      .cls-57 {
+        fill: #4770e4;
+      }
+
+      .cls-58 {
+        fill: #e8eef9;
+      }
+
+      .cls-59 {
+        fill: #e56059;
+      }
+
+      .cls-60 {
+        fill: #c24434;
+      }
+
+      .cls-61 {
+        fill: #d04139;
+      }
+
+      .cls-62 {
+        fill: #f2f2f2;
+      }
+
+      .cls-63 {
+        fill: #065fa8;
+      }
+
+      .cls-64 {
+        fill: #5ad2fe;
+      }
+
+      .cls-65 {
+        fill: #aa2f27;
+      }
+    </style>
+    <clipPath id="clippath">
+      <polygon class="cls-4" points="420.66 471.75 343.93 471.75 345.03 363.22 421.77 363.22 420.66 471.75"/>
+    </clipPath>
+    <clipPath id="clippath-1">
+      <path class="cls-41" d="m185.09,399.5c-.01,10.38,9.49,19.78,20.01,19.78h333.01c12.07,0,20.96-8.77,20.97-20.68l.05-36.91H185.15l-.05,37.81Z"/>
+    </clipPath>
+    <clipPath id="clippath-2">
+      <path class="cls-41" d="m466.77,472.37h-191.24c-2.4,0-4.65-1.95-5.03-4.35l-.03-.19c-.38-2.4,1.26-4.35,3.66-4.35h191.24l1.4,8.88Z"/>
+    </clipPath>
+  </defs>
+  <g class="cls-34">
+    <g id="_图层_2" data-name="图层 2">
+      <g id="_图层_1-2" data-name="图层 1">
+        <g>
+          <path class="cls-51" d="m677.06,197.09c-3.8-25.04-18.99-48.95-39.61-64.35-29.98-22.39-68.97-29.39-106.39-28.8-66.18,1.04-88.53-62.47-139.47-91.25-35.63-20.13-81.65-14.74-117.31,5.35-35.65,20.1-62.42,52.89-84.63,87.27-9.81,15.19-19.17,31.14-33.03,42.75-12.48,10.45-27.85,16.72-41.72,25.25-40.79,25.09-67.77,71.28-69.59,119.13-1.82,47.85,21.59,95.96,60.36,124.07,31.42,22.78,77.46,38.95,113.74,51.18,40.37,13.6,86.38,2.08,127.83,2.24,87.87.33,175.74.67,263.61,1,.01,0,.02,0,.03,0,17.46.07,40.06,3.53,56.3-.95-6.97,1.92,9.65-39.42,10.09-42.39,2.42-16.35-1.82-32.18-10.45-46.22-12.07-19.65-29.28-38.04-30.63-61.06-1.92-32.74,28.59-57.84,38.45-89.12,3.51-11.13,4.12-22.72,2.4-34.08Z"/>
+          <g>
+            <path class="cls-63" d="m635.26,192.49s8.62,56.26-19.83,100.54c-14.36,22.34-30.95,40.22-46.12,51.01l-45.66-7.31c-2.6-19.71,7.73-52.27,28.4-84.44,28.45-44.28,83.21-59.81,83.21-59.81Z"/>
+            <image class="cls-47" width="113" height="148" transform="translate(523.11 192.24)" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHEAAACUCAYAAACk98bhAAAACXBIWXMAAAsSAAALEgHS3X78AAANuUlEQVR4nO2d+Y8dRxHHa3af7djxfeEc5CYmiFMIxCEQ/EAw8O/yE78hJJBAIBA3KOQgiZPY2PHtXe9Oo3lvel51dVV1z/lm5vVXsnaOntl1f963uqrneBkkTU7GGAOrn5BlGSSIE5FZyftjd3Z2ssW2d87Yled55TorijI5cYTC4RIoNLOmtruzs1xKEEckHDL9wFnsXy8vdncqdimcjkAW3vKf/XOMC9IojktO3KBosmIXqQvp+hHkQkgQh5cHzv5EpBwHkoz06GLXY5bC6UDCIRM8UHhZzkIlJSf2LMl5dsyTXMcBPMa4EBLE/mTrOxBcZ9CKoe0YgseO8AAhhdPuxcGj4x038yIlNTFKTuxIXNjkkpVQUkNV7DquuBASxPaqEhZyJmPoTItxx0DiPIMPRDp+dBFklMJpQ1l4OYqDHJAKHOdK1I7uq6PkxAZaA/SPpa70HGm3wxqypBMRLoTkxHrC7tPGO2msow71tnsrcUpOjBBOWnJhrAOmBgTkOLTLC69Uxa6Tx+JcCAmiLnpVISdxUqr/OHBcO0l1AEIKp7KKei9H7uPGLxo2pctI2HleGNXqi0glJzIqANo6z0tUYB0uM+Q8toAHl1oOMjR7vlNPHanNJEFEKmKnTVooGAzP3cZDdtY1yEinGwCEFE7XOizCZ26WbnHCIlf/2XXSTmqjBcwOomly4tJ9uSkTFwEe09M54zZyXn6fUDeeOd7MhbDtEAuAh7lNXgwfMoXrf7HgJKfhzWdbAIRtDacW3oEFmPudnwu9T2dppGuAYqHP7WyprXOiBWgTFy8sCsU7Xg9NmWm1IA3N504cbc1gqyAWAJfuMwYOcUejMEjB4cWY2wmlqTWvPQCc7wAgbEs4taVDAdC6T5vn5DqfC6+xNzex5+wwou52d6pxqijci/BZGnBVcEckKiYwJwp4nzahjTbg7Ree7saFMHcnFrXfyn2uk9azLG579qp7IEmhrlMTmp402zHx4DCvZl9y7CpuDpOOdWbdM2KSwjiVSzo5iBc7dCHMFeL+waGxIRI70Gai2q2B6tjIhVjQwyzddunksc77fHbhdK8EeGjdVfYjnnzWsstqHe2QQIvjYCAz7VqzcuLekxU6fOXdcOHSirmBt9rFuAikkBm4R8Zuu9yDC2EuEAt4xc8DMvMi3YXmrsvlgDQDY8hG1pHktJdP9QMQ5hBOHz85XCYw9LYJI8yFAlO8c/vYWRpwaUqTA8xqr5q0Ex/tH5Thc73NwotNUJzN4EPHCUqtJAhtv9KjC2HKEB/uHxgOHnDF+3JdH7eAg1IDNj3O6srpp3rv40mG0wd7K4BcR1OwVGrhDvKxYpiV2g2oyTnx/t6B/1w7mk6Dmpkld4w/DtLzKGMp0jMDuBCmNnd67/ETG8mWqmpALcUXZlykuk4ChzfH1JnPnhkGIEwpnBYAKTwjuAID4JIaobmaqEhjZExy07cmEU7vFg5kbliil4dCNWCdJIUmKFLN6OwrdmQZPDegC2EKTrzz6Ilxsk3lETEtMeFEs1gKDgSXutu9T069/2AHGrUTlwDLZfqqEK3z1fEPXPDa8bGXoOxS0ZnPnz0+eJ+O2ol0zPNuUrI/JYCCKUwN1/ljoByiNwEQxgzx9sN9oxfwpMwIOMc9NDzWSdmrs28ESQ2MtcRYAoR1wiGGO7QS04liEiPA0Ap+eo4Xzm3GhTDGMfHWg31DO7JOVgkO3AblhHK/jHQl48XzJzbaj6MLp9hlISc4qb1wHmdbg7GODdEbyEA1jSqc3nywXw50fBlhF6WO5LLSTNtfI1za30m3v7RhF8KYwunN+3sGu1BKGrQbeEExSag8sCtc6cIDBXj5wuYBwljC6Y0SoHRnGXZeLDy8mkWUISF4whA7Cm38k/TJ/T0jOcBZt8sRTnMaZ5n8Gmaa6UIYnl18ZSQuhFE4MfCmCadpRDmBHWcdSMdW6QMjwaOgXx0RQNg0xI/v7Rn6HLuaFVKFQqxQitStO8eYkWJt7BP10d3HXHQLPtenAeM2cuHS+50gwCOxtFh67eLTo6utN+LEAqAUKsEBaqo3VDhtpROTbIarJUMh0/5eoJBHfLVg8L/rOnJgqBOxGpcUHBDuAxPR9nOXxudC2IQTYx5Q4fcr+5Rf1AU8GDFAGBrih3dIGFXe0sTNmlBxHwQg20V4kWOj/VKtMWtQiFwHAu10hpyWmdr9GVrmnNQEntXrI3YhDDkmvv/pI1quVQqCazhGciHT2R5waKGrl0+O/j6kQZxoAVKKciiVnUrF1SkavDrhdSoaBKKUhQIBZ9BL79RzcSeqAU/KhKlD3/jM+F0IQ4TT924/4sxSroQfxuSgccdwLq7rPBwApgIQBnUi8OOS3FbZxx4YWVI0neIbsXr9tL1buDBiflNqED5GzzTtYsxVe9zmC1dOTeoZld7+2HduPeQrA2+B2Ue3ByafpbDJwhNewGc1NYDQdziVB8P4cS14DHNe7Qu2tHZTfVizl3ts3i5cGOk0mklK7bh99P6ZGHgA7jVG7OAvPjM9F0JfTtSiHwcNFHBa+K1e8RUTNsHNhqXEZ4rq3In/+d9Dv98jwyPt2JDawKO/5ksTdSH04UR6IbXazrWVdijHrH8PCZ3KdzW5f5sP+csTBghdQ3zr5gOxfG9c/zGOs1cV2FIBbdDcJ4X1KapTiL4Twm297REdW71wnYHng1ovc22+8uzpyb+QqbP/wL9vPFB7ny8P6jvBtIDnHJ8BfHUGAKErJ2KAbQr2GDnjWgAebWe8HfNQJxC5OqxOe65BTFLDlQv+NvcNU3b/156bhwuhi3D6z0/uxzBRd8S7MBYeCp1MmzkBhN6KfWFjkwjGlQscGEAAOXhS6TMHtfpE/kNwYUy+omdBfJ1JOaxLDNl5dOz8+vNnZve25XZOjHSXHE5NXDuh1gMEMEcNcf2IU585AoQ2EP/+8X3RcN72Glcl2HZc6FTCK/fut3kG0pUaQ4yNo9GgIvdp4x5QuAjeNz47TxdCq3Da8O4w36X+KveINgfJDZ2u+7ivT5+rGn06//rRPSkB5RXo0PBYqF+FoK+KdiEb+OYLZ2f9nVitEpuQqyJ3yccE6j1DptK4cmTuAKEJxL9cv6e9nVJVXZAiPCDuVMLqNqg2xNogGhbZJhQ6FffZ8fBbL87fhVB3TPzzdX8sbFLtR7m2hvuKlZwcty0Aoa4T61y1r6vq1BnJOkGBh5zJPRyzLYr+tP7pw7u1+6ZNtmrh4eYVQDQTY6hrjYFvv3Ruq76htfUEuPEW2p+Pug9w3YcKfXoHd7H6nS0DCHUgxuYnbVnStypyyQt1nym/4GvkD/T2piiIf/zgrvj4Uv1stRz4UIdnaJ9WNgAC6Ey/lbu30YUQC7Gpu+Qr/G524k+tyQV91c5mpOW27768nQAhBuIfPri7RtGi5otqJzzsIoXPZn/N/BR2YsvLSLHSZl0qYGVWSoF+75XzW+tCiIHYBladOxI9gEo9aBDAraZXSoX4+/fvyBiMuholeoz0xZWm/JJLYGBvuwshBLHuvb1tEyB25oUAxF8t9P0EcCkd4gB/AC0rrOit+ka4fT9JmXb73X+VUEogtBENn4aMixzAYukHryYXWolObAuHPSf7dO962f5eGlItwMMyrv7wtQsJIBIL8bfvfdqYYOhAOqUGjhv98sGCpl+zl7QWCzEujjbsReIhbvpMA5hc6IsPp8yUWGeiMy1k+oyOfwlgWM2dGCF7HrbnOfeRpAYD3KZbEOvK69/fvNt8PKye3gz5hQ2f6EIvAmiToeRCWb4TWycQ4XvmafiktSIGCAlgUB7EQaJWJMCUlcbJ+YT/+p3bvfcYvVohASzGwGL/j16/mFwYkOPEIT709ldgh3khtFgvKCZ8Uer+ZURomTKgAKvLSmSK5qBMRd9MLoyS68SOT+5damKuF9IrGHZq7c2rCWCsKoi/evu20VwEVYfLJUS4sggDpPOrSWEtUA+7HS6jEHdqTsYJDAVIZ3GSC+upglg3lDbpZRZg+dOG0R8ngLXV7ePeWnsJIAqjSc20/NT/8q1b9fsws98UKu9TAZrVzE2OACYXNlOLZ/YVN5J9Tk0ICWDXWkLsKpRpFHD4BATwyaHZ2mcoutIKInJKhpdqdi73YeBuhMLri90MriUXtpIyAd7xG3wswPIWRDs6Xrt6KQFsKTGcdtWzdMI756baklpp5URmmqRNF68fVXNrwZyY+9rnkwu70NqJAjW2l8uN1kwZ3Q7+T5yJJhd2q2YP1Bhhlbl6RAHm5UMwyYXdKVhi4O/q5bZT4Xbco9uQAHauqsTwe3X1LhJDt5GQSY+woo+iAXO2pG6kTICzVR9kLIcVXMd1eLoNjYM/SS7sXLu/+NdNg7/Ht00Ps/OlsI6jCWA/WtCa3jS84At0PKwWUhDtWwuvg2nZ4G52lfFtq4dCy+K+mBtNLuxP8qNtgV+ZoUahOdMEsF8ttJcDaZIg4/E11fTDqHQi/3Kgpch1Ijylxl3osJmoBfjTN5IL+5Y/Jpaqel67gapgX0K27fEF4ARwGC2kWwSjxkRYQ+ZmZpIGgsheNiSFYwxkeuXiZ8mFg2mBWK1FCj53jGTaM1cukgaESCFQeXaiZUWGx8PVz+TCYbWg4xe9aSl49YI4NQEcXk6H//xvN0yTO8/w5aoEcXhFdXgs3ARwoioAF/+2vR82JgD4Py3tuexQuXy8AAAAAElFTkSuQmCC"/>
+            <path class="cls-4" d="m635.62,191.94c-.3-.2-.71-.11-.9.2l-34.84,54.22-6.23-22.68c-.1-.35-.46-.55-.8-.46-.35.1-.55.46-.46.8l6.54,23.81-39.18,60.98-9.98-20.48c-.16-.32-.55-.46-.87-.3-.32.16-.46.55-.3.87l10.32,21.2-18.65,29.03c-.19.3-.11.71.2.9.08.05.16.08.25.1.25.04.51-.07.65-.29l39.47-61.42,25.89-1.33c.36-.02.64-.33.62-.69-.02-.36-.33-.64-.69-.62l-24.96,1.29,54.12-84.21c.2-.3.11-.71-.2-.9Z"/>
+          </g>
+          <g>
+            <path class="cls-63" d="m645.71,307.02s-15.11,28.68-42.62,40.29c-13.88,5.86-27.26,8.96-37.62,9.23l-17.79-17.58c5.48-9.92,21.02-21.75,41.01-30.18,27.52-11.61,57.02-1.75,57.02-1.75Z"/>
+            <image width="99" height="44" transform="translate(547.11 302.24)" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGMAAAAsCAYAAABxNQYsAAAACXBIWXMAAAsSAAALEgHS3X78AAABTElEQVR4nO3aiQ3CMAyF4SIxDAOwFBOxFAOwDUhIRq565LRjO+8fgDr9FHrAgux0mcXi9nx9NI/3ftyLz204DO2TXlIKKASGZYBUHMgthmeAo1xhRATgmceIDuDia2omBMocRmQEF3dTM+6CvYZiAGHdMIyoEDVP3pQ6BhCOU8MAQjpxjIgIPQF4ohjRIKQQKJEPj4QgDcDrfqAoEJoIVLcDAqG9Lgf2DjESgNc0BBD6Vj1MlF/XLFU1lEcIqwC8ogGBIFv2oN4gPCFQWQN7gfAIwEsO7wHCOwJ1ugjPfwjz2OGCrEJERKB2F2YRIjICdbUxxn4zAPA2i7WwK2ZDoFaLHg0xKwL1X/woiNkBeL8TMQICCNtUL+AAOO+isSuAkJfozgBCWd2vGQCor9vdFBDaa37OAEK/qp7AASBT0YtCIMiW9QodCAoty/IFaUmhq+RDGEYAAAAASUVORK5CYII="/>
+            <path class="cls-4" d="m646.02,306.89c-.07-.17-.27-.25-.45-.18l-30.53,12.88,6.58-11.71c.09-.16.03-.37-.13-.46-.16-.09-.37-.03-.46.13l-6.95,12.36s-.02.06-.03.1l-41.85,17.66,5.35-16.3c.06-.18-.04-.37-.22-.43-.18-.06-.37.04-.43.22l-5.51,16.79s0,.04,0,.07l-17.15,7.24c-.17.07-.25.27-.18.45.03.08.1.14.18.18.08.04.18.04.27,0l40.88-17.25,14.56,6.27c.17.07.37,0,.45-.18.07-.17,0-.38-.18-.45l-13.96-6.01,49.59-20.93c.17-.07.25-.27.18-.45Z"/>
+          </g>
+          <g>
+            <g>
+              <path class="cls-63" d="m132.21,302.14s9.06,30.39,33.93,45.91c12.55,7.83,25.17,12.88,35.38,14.71l21.26-14.56c-3.38-10.55-16.34-24.48-34.42-35.76-24.88-15.52-56.15-10.3-56.15-10.3Z"/>
+              <image class="cls-47" width="91" height="53" transform="translate(132.11 301.24)" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFsAAAA1CAYAAAAuyJezAAAACXBIWXMAAAsSAAALEgHS3X78AAAGTUlEQVR4nO2c+2/cRBDHZy/pu2nTPCilpYWW0qoIAQIhBIiXUOEH/lzevyAhkEAIhBAQgqpWpbSUJiG5vF/nRePz2rOzs2v7Hrnz3Y2UnL1evz47993Z9fiUbhqUMVO7phTgvnSdmlKsYMhNRVEUs8J/yNzCozOwPsP6tK0y8J4dNEAt2ThsjRHfbKMRpbxSbpQ88V6V0NXkANqUx1Xt5jEtiXytY5C6Y2Y92T4+5m2qSpt1U3uNSFOQGXhSUxu4WQUKntdzwWugDm2Oo1k9g/vI+NjAgBdvZGe/oTlIILCodiC4tJzruVBuHyv78ihazuqYCicOj1cavPfit/YaCaUwLKMjRHGsOsZDNTuIz+trTFJAkCa0iaOHKgc+94I3d/czToK3A8jyAAQS1ei8DjcvMOKbJ49VB3qhC13fSYAXgAUBYErQc+7BToDiOScvmzp+uO+hl7rA1e09K1hJl4UDOYB4RCOUW/uxTlPSdLt+c2nm5JG+hd7ShdW39mzn9QATAREpouGgKfRJlHMc1slymTs70X/QW76g5c1d3ueFNR0yXefrvE74GIFzEBcwS+dOHe0b6G1fyNLGrsTbCw3A9kLjlV4ZCkQwQCCnfYBQCYvOn+499I5cwOL6jtgnuq4fBgZcz8l2Gv75OmDH24WKFyaP9Qx6R0/8aG1HckjLqOeHIhvFjiHNv4AHKLBvBq9x8UxvgHflpA9Xtx0Ekpdz45tVgcbJ03IAV8/RLk0dP3DgXTvhgzoBXjA+p0br1wAgSo9lfcj75I16ybbL0wcHvesnul/f1pFPA/KdPTU+ICrk8T7pIfuiXZk5cSDAD+Qk91a2UleLQhWLPMQgk2DWKDQQtfjCQr7v1dnuQj9Q3bq7vKWlmw4iFjb6HlhACbDONST7XHvsZNeY9KRXvrO0KfIto+um8wzC9cTcIEQxdO16l4D3LOa8vbSpc8O2AkanBIp4rnQO6Vty42zngfd8VHVrcSP4vFkaXTrbWVDOB0G0HASPD3W2zz0+0TFGfTFv8OfCRqIGZQPEzFTypJ9bELDU0ZIFs/78uc4A76uZsflH6zoqwZtKiFk2cy1evRa818iPLzzE5ReeONU2q76c+537dz3Vc6+MBLIgrGyMnDg8FCZyj3+xTeB9O9H+28M17XR4nquVinnKhTR6BObBwAEL9V863zrwvn+U9Os/a14lL3TxQsoFeCB7G4SFli9fON0St0o8LP3lwWp8t/Hok2dtEUuLWYWaZ+AjhYsSZNpxmuVXniwPvFLpAD/fX9VBVQk0ApWVIvG4FIfzTvPVi5Ol+FUy6eUnhE6w85uQHkAokJ9V+kagDuC03C4pA7yyGUY//l23wkQqFZw1XTWZWk7U4Qn9uF6DUPe1S8WAVz6P7od7ddvLPV4NrBGUAM/y2bjMbgygjUD+4cfrT53JZTkQSYvf/7XiDB55DmFWnpVgKoUziBISS8UZRkH/33g6DHygUnO/u7sSDM2Rsw9+qGM05c5klqDrbwaAjxe+kwqY0c5v7yxbVAzkZgKum95Gkz+lyANE+QhHMJINZNI52jcMOAjabcCnkUoAtCQlvm/D21em5BmGtu6oAvb17f8s6DUC2AKhSE45EE32jT55yh2r944AvDbQpAHgrctTCkFgR4gvVqR/uvkXEc/F8hgiljcXrSjF6LYmDaFZPbNdsoH3bGpf3VqSvVzZZdIrLLyD5J4sDe3fuzpt8R0q2MYQejoAMp8ImYCnb0CkIIUhfmj+BD/fJ8AHXkYke/eZaRUlcoJvszSlAKVDW1JDJYF3kBGVk6QwT06G0rOpfTm/GCNBEPhGII/FsYxKRp4nS7nqN5+diQ85lJ5N7ea1JgiEsh9pwBflGsRDYw8v4cnZOqSdrLGh92xqX8wvpmMW9EJ8E1mROBwoaCe+lie1jLd/eH1WDdQIsl37IPHyj39fiBkdIqBroKwXZDOo8mSVJCkjz/bY538spJxMpAJGw4FNWOXpdrIygp1jCF1z4IrDlb3Z7lhHHWSuodYCZKFh3GnSAQ19kJCTZDTy7BL2GXp5wrPG5lJ4SMi9+qMbs6MfX2nFPp1r6nn8uylCbgoFjpDNKUawWzQErukPIThzJTZoGMFu3z6ZW9BW2rIA2dgIdgcMgRvP9oEGAPgf3OtAXqhoKN0AAAAASUVORK5CYII="/>
+              <path class="cls-4" d="m131.9,301.95c.11-.17.33-.22.5-.12l30.46,19.01-2.27-12.91c-.03-.2.1-.39.3-.42.2-.03.39.1.42.3l2.38,13.55,34.26,21.38.15-12.69c0-.2.17-.36.37-.36.2,0,.36.17.36.37l-.15,13.13,16.31,10.18c.17.11.22.33.12.5-.03.04-.06.08-.1.11-.12.08-.27.09-.4,0l-34.51-21.53-13.36,5.5c-.19.08-.4-.01-.47-.2-.08-.19.01-.4.2-.47l12.87-5.3-47.31-29.52c-.17-.11-.22-.33-.12-.5Z"/>
+            </g>
+            <g>
+              <path class="cls-63" d="m144.35,355.63s11.05,13.35,26.71,16.41c7.9,1.54,15.24,1.7,20.69.71l7.38-11.15c-3.95-4.59-13.38-9.07-24.76-11.3-15.67-3.06-30.03,5.33-30.03,5.33Z"/>
+              <image width="56" height="17" transform="translate(144.11 349.24)" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADgAAAARCAYAAACIJW/gAAAACXBIWXMAAAsSAAALEgHS3X78AAAAmklEQVRIidXW2w2AIAxA0bKNA7iUE7mUA7iNRj8MNiVQSkt7vxVyfAAJhC37cbWOcG6reD5u7Ak5IG4aD6A6oCao1ggwOcBMFJUE+rvRG4yKi30vjgDDtUJTRFxeDRruEy1VgrpeRXvC0K7VyTs6Rw7bWL1uLapHp9noB2l+NrRGmwNLacCnvEFOErTJP6hRKzoskAqjv20CAG4a0EKcs+XdfAAAAABJRU5ErkJggg=="/>
+              <path class="cls-4" d="m144.17,355.6c.02-.1.11-.16.21-.14l17.39,3.39-4.72-5.4c-.07-.08-.06-.19.02-.26.08-.07.19-.06.26.02l4.99,5.71s.02.03.03.05l23.83,4.65-4.58-7.94c-.05-.09-.02-.2.07-.25.09-.05.2-.02.25.07l4.72,8.18s0,.02.01.03l9.77,1.91c.1.02.16.11.14.21,0,.05-.04.09-.07.11-.04.03-.09.04-.14.03l-23.28-4.55-6.93,4.88c-.08.06-.2.04-.25-.04-.06-.08-.04-.2.04-.25l6.65-4.68-28.24-5.51c-.1-.02-.16-.11-.14-.21Z"/>
+            </g>
+          </g>
+          <g>
+            <g>
+              <polygon class="cls-4" points="420.66 471.75 343.93 471.75 345.03 363.22 421.77 363.22 420.66 471.75"/>
+              <g class="cls-50">
+                <polygon class="cls-46" points="343.93 469.46 344.29 471.75 343.93 471.75 343.93 469.46"/>
+                <polygon class="cls-4" points="343.93 448.1 347.67 471.75 344.29 471.75 343.93 469.46 343.93 448.1"/>
+                <polygon class="cls-4" points="343.93 426.74 351.05 471.75 347.67 471.75 343.93 448.1 343.93 426.74"/>
+                <polygon class="cls-4" points="343.93 405.37 354.43 471.75 351.05 471.75 343.93 426.74 343.93 405.37"/>
+                <polygon class="cls-4" points="343.93 384.01 357.81 471.75 354.43 471.75 343.93 405.37 343.93 384.01"/>
+                <polygon class="cls-4" points="344.02 363.22 361.19 471.75 357.81 471.75 343.93 384.01 343.93 363.22 344.02 363.22"/>
+                <polygon class="cls-4" points="347.4 363.22 364.57 471.75 361.19 471.75 344.02 363.22 347.4 363.22"/>
+                <polygon class="cls-4" points="350.78 363.22 367.95 471.75 364.57 471.75 347.4 363.22 350.78 363.22"/>
+                <polygon class="cls-4" points="354.16 363.22 371.33 471.75 367.95 471.75 350.78 363.22 354.16 363.22"/>
+                <polygon class="cls-4" points="357.54 363.22 374.71 471.75 371.33 471.75 354.16 363.22 357.54 363.22"/>
+                <polygon class="cls-4" points="360.92 363.22 378.09 471.75 374.71 471.75 357.54 363.22 360.92 363.22"/>
+                <polygon class="cls-4" points="364.3 363.22 381.47 471.75 378.09 471.75 360.92 363.22 364.3 363.22"/>
+                <polygon class="cls-4" points="367.68 363.22 384.85 471.75 381.47 471.75 364.3 363.22 367.68 363.22"/>
+                <polygon class="cls-4" points="371.06 363.22 388.23 471.75 384.85 471.75 367.68 363.22 371.06 363.22"/>
+                <polygon class="cls-4" points="374.44 363.22 391.61 471.75 388.23 471.75 371.06 363.22 374.44 363.22"/>
+                <polygon class="cls-4" points="377.82 363.22 394.99 471.75 391.61 471.75 374.44 363.22 377.82 363.22"/>
+                <polygon class="cls-4" points="381.2 363.22 398.37 471.75 394.99 471.75 377.82 363.22 381.2 363.22"/>
+                <polygon class="cls-4" points="384.58 363.22 401.75 471.75 398.37 471.75 381.2 363.22 384.58 363.22"/>
+                <polygon class="cls-4" points="387.96 363.22 405.13 471.75 401.75 471.75 384.58 363.22 387.96 363.22"/>
+                <polygon class="cls-4" points="391.34 363.22 408.51 471.75 405.13 471.75 387.96 363.22 391.34 363.22"/>
+                <polygon class="cls-4" points="394.72 363.22 411.9 471.75 408.51 471.75 391.34 363.22 394.72 363.22"/>
+                <polygon class="cls-4" points="398.1 363.22 415.28 471.75 411.9 471.75 394.72 363.22 398.1 363.22"/>
+                <polygon class="cls-4" points="401.48 363.22 418.66 471.75 415.28 471.75 398.1 363.22 401.48 363.22"/>
+                <polygon class="cls-4" points="404.86 363.22 421.77 470.04 421.77 471.75 418.66 471.75 401.48 363.22 404.86 363.22"/>
+                <polygon class="cls-4" points="408.24 363.22 421.77 448.68 421.77 470.04 404.86 363.22 408.24 363.22"/>
+                <polygon class="cls-4" points="411.62 363.22 421.77 427.31 421.77 448.68 408.24 363.22 411.62 363.22"/>
+                <polygon class="cls-4" points="415.01 363.22 421.77 405.95 421.77 427.31 411.62 363.22 415.01 363.22"/>
+                <polygon class="cls-4" points="418.39 363.22 421.77 384.59 421.77 405.95 415.01 363.22 418.39 363.22"/>
+                <polygon class="cls-4" points="421.77 363.22 421.77 363.22 421.77 384.59 418.39 363.22 421.77 363.22"/>
+              </g>
+            </g>
+            <polygon class="cls-4" points="427.04 363.22 425.08 466.33 419.8 466.33 421.77 363.22 427.04 363.22"/>
+            <path class="cls-37" d="m544.25,176.11H211.24c-12.07,0-20.96,8.77-20.97,20.68l-.34,207.82c0,1.89.31,3.75.89,5.52l-.56,1.72,3.76,4.32c.53.69,1.1,1.34,1.7,1.96l.02.02h0c3.71,3.78,8.81,6.23,14.18,6.23h333.01c12.07,0,20.96-8.77,20.97-20.68l.34-207.82c.01-10.38-9.49-19.78-20.01-19.78Z"/>
+            <path class="cls-53" d="m538.11,419.28H205.1c-10.51,0-20.02-9.4-20.01-19.78l.34-207.82c.02-11.92,8.91-20.68,20.97-20.68h333.01c10.51,0,20.02,9.4,20.01,19.78l-.34,207.82c-.02,11.92-8.91,20.68-20.97,20.68Z"/>
+            <g class="cls-43">
+              <polygon class="cls-46" points="185.08 391.65 189.45 419.28 185.08 419.28 185.08 391.65"/>
+              <polygon class="cls-4" points="193.87 361.69 202.98 419.28 189.45 419.28 185.08 391.65 185.08 361.69 193.87 361.69"/>
+              <polygon class="cls-4" points="207.4 361.69 216.51 419.28 202.98 419.28 193.87 361.69 207.4 361.69"/>
+              <polygon class="cls-4" points="220.92 361.69 230.04 419.28 216.51 419.28 207.4 361.69 220.92 361.69"/>
+              <polygon class="cls-4" points="234.45 361.69 243.57 419.28 230.04 419.28 220.92 361.69 234.45 361.69"/>
+              <polygon class="cls-4" points="247.98 361.69 257.1 419.28 243.57 419.28 234.45 361.69 247.98 361.69"/>
+              <polygon class="cls-4" points="261.51 361.69 270.62 419.28 257.1 419.28 247.98 361.69 261.51 361.69"/>
+              <polygon class="cls-4" points="275.04 361.69 284.15 419.28 270.62 419.28 261.51 361.69 275.04 361.69"/>
+              <polygon class="cls-4" points="288.57 361.69 297.68 419.28 284.15 419.28 275.04 361.69 288.57 361.69"/>
+              <polygon class="cls-4" points="302.09 361.69 311.21 419.28 297.68 419.28 288.57 361.69 302.09 361.69"/>
+              <polygon class="cls-4" points="315.62 361.69 324.74 419.28 311.21 419.28 302.09 361.69 315.62 361.69"/>
+              <polygon class="cls-4" points="329.15 361.69 338.27 419.28 324.74 419.28 315.62 361.69 329.15 361.69"/>
+              <polygon class="cls-4" points="342.68 361.69 351.79 419.28 338.27 419.28 329.15 361.69 342.68 361.69"/>
+              <polygon class="cls-4" points="356.21 361.69 365.32 419.28 351.79 419.28 342.68 361.69 356.21 361.69"/>
+              <polygon class="cls-4" points="369.74 361.69 378.85 419.28 365.32 419.28 356.21 361.69 369.74 361.69"/>
+              <polygon class="cls-4" points="383.27 361.69 392.38 419.28 378.85 419.28 369.74 361.69 383.27 361.69"/>
+              <polygon class="cls-4" points="396.79 361.69 405.91 419.28 392.38 419.28 383.27 361.69 396.79 361.69"/>
+              <polygon class="cls-4" points="410.32 361.69 419.44 419.28 405.91 419.28 396.79 361.69 410.32 361.69"/>
+              <polygon class="cls-4" points="423.85 361.69 432.96 419.28 419.44 419.28 410.32 361.69 423.85 361.69"/>
+              <polygon class="cls-4" points="437.38 361.69 446.49 419.28 432.96 419.28 423.85 361.69 437.38 361.69"/>
+              <polygon class="cls-4" points="450.91 361.69 460.02 419.28 446.49 419.28 437.38 361.69 450.91 361.69"/>
+              <polygon class="cls-4" points="464.44 361.69 473.55 419.28 460.02 419.28 450.91 361.69 464.44 361.69"/>
+              <polygon class="cls-4" points="477.96 361.69 487.08 419.28 473.55 419.28 464.44 361.69 477.96 361.69"/>
+              <polygon class="cls-4" points="491.49 361.69 500.61 419.28 487.08 419.28 477.96 361.69 491.49 361.69"/>
+              <polygon class="cls-4" points="505.02 361.69 514.13 419.28 500.61 419.28 491.49 361.69 505.02 361.69"/>
+              <polygon class="cls-4" points="518.55 361.69 527.66 419.28 514.13 419.28 505.02 361.69 518.55 361.69"/>
+              <polygon class="cls-4" points="532.08 361.69 541.19 419.28 527.66 419.28 518.55 361.69 532.08 361.69"/>
+              <polygon class="cls-4" points="545.61 361.69 554.72 419.28 541.19 419.28 532.08 361.69 545.61 361.69"/>
+              <polygon class="cls-4" points="559.13 361.69 559.13 361.69 559.13 419.28 554.72 419.28 545.61 361.69 559.13 361.69"/>
+            </g>
+            <path class="cls-44" d="m538.11,420.1H205.1c-5.27,0-10.6-2.31-14.62-6.33-3.94-3.95-6.2-9.15-6.19-14.26h.81s-.81,0-.81,0l.05-38.62h375.61l-.05,37.72c0,5.98-2.21,11.45-6.21,15.39-3.99,3.94-9.53,6.11-15.58,6.11Zm-352.15-57.6l-.05,37c0,4.69,2.08,9.47,5.72,13.11,3.72,3.72,8.63,5.86,13.47,5.86h333.01c11.67,0,20.15-8.36,20.16-19.87l.05-36.1H185.96Z"/>
+            <g class="cls-31">
+              <polygon class="cls-46" points="270.52 463.5 271.93 472.37 270.09 472.37 270.09 463.5 270.52 463.5"/>
+              <polygon class="cls-4" points="277.48 463.5 278.89 472.37 271.93 472.37 270.52 463.5 277.48 463.5"/>
+              <polygon class="cls-4" points="284.44 463.5 285.84 472.37 278.89 472.37 277.48 463.5 284.44 463.5"/>
+              <polygon class="cls-4" points="291.4 463.5 292.8 472.37 285.84 472.37 284.44 463.5 291.4 463.5"/>
+              <polygon class="cls-4" points="298.36 463.5 299.76 472.37 292.8 472.37 291.4 463.5 298.36 463.5"/>
+              <polygon class="cls-4" points="305.32 463.5 306.72 472.37 299.76 472.37 298.36 463.5 305.32 463.5"/>
+              <polygon class="cls-4" points="312.27 463.5 313.68 472.37 306.72 472.37 305.32 463.5 312.27 463.5"/>
+              <polygon class="cls-4" points="319.23 463.5 320.64 472.37 313.68 472.37 312.27 463.5 319.23 463.5"/>
+              <polygon class="cls-4" points="326.19 463.5 327.6 472.37 320.64 472.37 319.23 463.5 326.19 463.5"/>
+              <polygon class="cls-4" points="333.15 463.5 334.55 472.37 327.6 472.37 326.19 463.5 333.15 463.5"/>
+              <polygon class="cls-4" points="340.11 463.5 341.51 472.37 334.55 472.37 333.15 463.5 340.11 463.5"/>
+              <polygon class="cls-4" points="347.07 463.5 348.47 472.37 341.51 472.37 340.11 463.5 347.07 463.5"/>
+              <polygon class="cls-4" points="354.03 463.5 355.43 472.37 348.47 472.37 347.07 463.5 354.03 463.5"/>
+              <polygon class="cls-4" points="360.98 463.5 362.39 472.37 355.43 472.37 354.03 463.5 360.98 463.5"/>
+              <polygon class="cls-4" points="367.94 463.5 369.35 472.37 362.39 472.37 360.98 463.5 367.94 463.5"/>
+              <polygon class="cls-4" points="374.9 463.5 376.31 472.37 369.35 472.37 367.94 463.5 374.9 463.5"/>
+              <polygon class="cls-4" points="381.86 463.5 383.26 472.37 376.31 472.37 374.9 463.5 381.86 463.5"/>
+              <polygon class="cls-4" points="388.82 463.5 390.22 472.37 383.26 472.37 381.86 463.5 388.82 463.5"/>
+              <polygon class="cls-4" points="395.78 463.5 397.18 472.37 390.22 472.37 388.82 463.5 395.78 463.5"/>
+              <polygon class="cls-4" points="402.73 463.5 404.14 472.37 397.18 472.37 395.78 463.5 402.73 463.5"/>
+              <polygon class="cls-4" points="409.69 463.5 411.1 472.37 404.14 472.37 402.73 463.5 409.69 463.5"/>
+              <polygon class="cls-4" points="416.65 463.5 418.06 472.37 411.1 472.37 409.69 463.5 416.65 463.5"/>
+              <polygon class="cls-4" points="423.61 463.5 425.01 472.37 418.06 472.37 416.65 463.5 423.61 463.5"/>
+              <polygon class="cls-4" points="430.57 463.5 431.97 472.37 425.01 472.37 423.61 463.5 430.57 463.5"/>
+              <polygon class="cls-55" points="437.53 463.5 438.93 472.37 431.97 472.37 430.57 463.5 437.53 463.5"/>
+              <polygon class="cls-4" points="444.49 463.5 445.89 472.37 438.93 472.37 437.53 463.5 444.49 463.5"/>
+              <polygon class="cls-26" points="451.44 463.5 452.85 472.37 445.89 472.37 444.49 463.5 451.44 463.5"/>
+              <polygon class="cls-4" points="458.4 463.5 459.81 472.37 452.85 472.37 451.44 463.5 458.4 463.5"/>
+              <polygon class="cls-4" points="465.36 463.5 466.77 472.37 466.77 472.37 459.81 472.37 458.4 463.5 465.36 463.5"/>
+              <polygon class="cls-4" points="466.77 472.37 465.36 463.5 466.77 463.5 466.77 472.37"/>
+            </g>
+            <path class="cls-44" d="m467.72,473.18h-192.19c-2.78,0-5.4-2.26-5.83-5.03l-.03-.19c-.22-1.41.13-2.74.99-3.75.85-.99,2.08-1.54,3.47-1.54h191.93l1.66,10.5Zm-193.59-8.88c-.91,0-1.7.34-2.24.97-.55.64-.77,1.51-.62,2.44l.03.19c.32,2.02,2.22,3.66,4.23,3.66h190.29l-1.15-7.25h-190.54Z"/>
+            <path class="cls-4" d="m465.99,472.37h15.06c2.4,0,4.04-1.95,3.66-4.35l-.03-.19c-.38-2.4-2.63-4.35-5.03-4.35h-15.06c-2.4,0-4.04,1.95-3.66,4.35l.03.19c.38,2.4,2.63,4.35,5.03,4.35Z"/>
+            <path class="cls-44" d="m481.05,473.18h-15.06c-2.78,0-5.4-2.26-5.83-5.03l-.03-.18c-.22-1.41.13-2.74.99-3.75.85-.99,2.08-1.54,3.47-1.54h15.06c2.78,0,5.4,2.26,5.83,5.03l.03.18c.22,1.41-.13,2.74-.99,3.75-.85.99-2.08,1.54-3.47,1.54Zm-16.46-8.88c-.91,0-1.7.34-2.24.97-.55.64-.77,1.51-.62,2.44l.03.18c.32,2.02,2.22,3.66,4.23,3.66h15.06c.91,0,1.7-.34,2.24-.97.55-.64.77-1.51.62-2.44l-.03-.18c-.32-2.02-2.22-3.66-4.23-3.66h-15.06Z"/>
+          </g>
+          <g>
+            <path class="cls-63" d="m320.46,133.97h-155.48c-4.07,0-7.4-3.3-7.43-7.38l-.63-85.31c-.03-4.07,3.25-7.38,7.32-7.38h155.48c4.07,0,7.4,3.3,7.43,7.38l.63,85.31c.03,4.07-3.25,7.38-7.32,7.38Z"/>
+            <polygon class="cls-4" points="314.32 68.54 238.79 68.54 238.74 61.82 314.27 61.82 314.32 68.54"/>
+            <polygon class="cls-4" points="314.46 87.3 238.93 87.3 238.88 80.57 314.41 80.57 314.46 87.3"/>
+            <polygon class="cls-33" points="276.83 106.05 239.07 106.05 239.02 99.33 276.78 99.33 276.83 106.05"/>
+          </g>
+          <path class="cls-44" d="m670.62,296.46c-1.32,0-2.64,1.07-2.96,2.39-.32,1.32.5,2.39,1.81,2.39s2.64-1.07,2.96-2.39c.32-1.32-.5-2.39-1.81-2.39Z"/>
+          <path class="cls-44" d="m98.43,256.14c-1.33,0-2.66,1.07-2.98,2.4-.32,1.33.5,2.4,1.82,2.4s2.66-1.07,2.98-2.4c.32-1.33-.5-2.4-1.82-2.4Z"/>
+          <path class="cls-36" d="m725.01,299.56c-1.65,0-3.31,1.34-3.7,2.98-.4,1.65.62,2.98,2.27,2.98s3.31-1.34,3.7-2.98c.4-1.65-.62-2.98-2.27-2.98Z"/>
+          <path class="cls-29" d="m20.75,263.19c-1.51,0-3.03,1.23-3.39,2.74-.36,1.51.57,2.74,2.08,2.74s3.03-1.23,3.39-2.74c.36-1.51-.57-2.74-2.08-2.74Z"/>
+          <path class="cls-44" d="m764.33,473.18H10.82c-.45,0-.81-.36-.81-.81s.36-.81.81-.81h753.51c.45,0,.81.36.81.81s-.36.81-.81.81Z"/>
+          <g>
+            <path class="cls-30" d="m363.73,230.37h-181.35c-6,0-11.43-5.36-11.43-11.29l-.02-55.55c0-4.75,3.54-8.24,8.34-8.24h181.35c6,0,11.43,5.36,11.43,11.29l.02,55.55c0,4.75-3.54,8.24-8.34,8.24Z"/>
+            <g>
+              <path class="cls-4" d="m292.72,185.47h-40.54c-1.02,0-1.95-.91-1.95-1.92v-9.45c0-.81.6-1.4,1.42-1.4h40.54c1.02,0,1.95.91,1.95,1.92v9.45c0,.81-.6,1.4-1.42,1.4Z"/>
+              <path class="cls-4" d="m350.82,205.05h-98.62c-1.02,0-1.95-.91-1.95-1.92v-9.45c0-.81.6-1.4,1.42-1.4h98.62c1.02,0,1.95.91,1.95,1.92v9.45c0,.81-.6,1.4-1.42,1.4Z"/>
+            </g>
+            <path class="cls-36" d="m209.1,212.44c.71.14,1.09.18,1.09.18,0,0-.38-.06-1.08-.23-.34-.1-.78-.2-1.26-.39v.12c.48.15.9.25,1.25.32Z"/>
+          </g>
+          <g>
+            <g>
+              <path class="cls-63" d="m662.9,104.77s-7.01,9.91-1.15,15.35l7.07-13.12-5.92-2.23Z"/>
+              <g>
+                <g>
+                  <path class="cls-63" d="m688.53,135.41s9.66-1.31,10.74-21.24c1.07-19.92-17.64-21.02-28.76-16.17,0,0-10.81,5.42-.97,19.46,9.84,14.04,18.99,17.94,18.99,17.94Z"/>
+                  <g>
+                    <path class="cls-22" d="m698.63,120.35c-1.04-.79-2.55-.99-3.85-.58,1.41-6.83.45-13.86-4.64-18.38-1.08-.95-2.24-1.69-3.47-2.23-5.79-2.54-15.27-1.56-20.39,2.44-5.13,4.01-4.02,11.77-5.06,18.27-1.39,8.72-.31,17.72,8.4,20.59.44.15.89.26,1.34.36l-1.15,14.34c-.53,6.06,4.46,11.18,10.53,10.81,5.26-.32,9.36-4.68,9.35-9.95,0,0,.46-21.83.58-24.8,0-.16.17-.24.31-.16,1.67.92,3.85,1.14,5.58.45,2.14-.85,3.84-2.97,4.31-5.37.41-2.15-.23-4.55-1.85-5.79Z"/>
+                    <path class="cls-19" d="m693.87,126.85c1.27.08,2.34-.65,2.4-1.63.04-.73-.49-1.4-1.3-1.71"/>
+                    <path class="cls-63" d="m670.51,145.74l.31-5.16s8.53,2.24,15.82-5.16c0,0-4.1,9.11-16.14,10.32Z"/>
+                  </g>
+                </g>
+                <path class="cls-63" d="m686.03,105.28s-20.88,12.29-23.57.91c-1.04-4.4,8.64-18.29,28.58-8.78,0,0,9.19,6.7,6.13,22.27,0,0-.81-.52-2.25,0-4.27,1.52-8.85-1.52-9.36-6.02-.25-2.25-.17-5.01.48-8.38Z"/>
+              </g>
+            </g>
+            <g>
+              <path class="cls-22" d="m637.27,265.61h0c-.83,5.11-1.78,8.97-2.02,13.59-.16,3.02.48,5.77.96,5.56,1.03-.46,2.56-7.07,2.56-7.07,0,0-.9,9.43.64,6.77,1.54-2.66,2.46-8.14,2.46-8.14,0,0,.13,8.97,1.29,5.99,1.15-2.98,1.72-8.43,1.72-8.43,0,0,.59,10,1.93,5.21,1.34-4.8,4.19-13.7,4.19-13.7l-13.73.23Z"/>
+              <polygon class="cls-22" points="648.89 193.13 636.88 268.2 648.89 273 659.7 206.34 648.89 193.13"/>
+            </g>
+            <g>
+              <polygon class="cls-22" points="645.06 460.58 661.73 460.58 662.77 435.94 647.06 435.94 645.06 460.58"/>
+              <path class="cls-63" d="m661.73,458.19h-20.62l-15.57,6.52c-3.09,1.59-5.04,4.77-5.04,8.25h43.58l-2.36-14.77Z"/>
+              <path class="cls-63" d="m639.58,458.89l4.21-5.7s6.59-1.2,6.01,5.96l-10.23-.26Z"/>
+            </g>
+            <g>
+              <polygon class="cls-22" points="726.08 454.34 741.75 448.94 734.71 425.25 719.04 430.65 726.08 454.34"/>
+              <path class="cls-63" d="m740.89,446.72l-19.36,6.83-12.16,11.71c-2.31,2.6-2.97,6.27-1.71,9.51h0l40.76-15.13-7.54-12.92Z"/>
+              <path class="cls-63" d="m720.36,454.75l1.87-6.84s5.71-3.5,7.76,3.39l-9.63,3.46Z"/>
+            </g>
+            <path class="cls-63" d="m669.69,448.91l-37.28-.33s16.45-181.72,27.42-234.84l32.69-3.89-22.82,239.05Z"/>
+            <path class="cls-63" d="m748.91,437.46l-34.01,8.15s-48.29-199.38-36.06-235.7l35.95-2.85,34.12,230.39Z"/>
+            <path class="cls-4" d="m722.9,271.14s-.05,0-.07,0c-6.65-1.01-11.96-5.45-15.37-12.86-2.55-5.55-3.14-10.72-3.16-10.93-.03-.26.16-.5.42-.53.26-.03.5.16.53.42,0,.05.59,5.25,3.09,10.66,3.31,7.19,8.24,11.32,14.64,12.29.26.04.44.28.4.54-.04.24-.24.41-.47.41Z"/>
+            <path class="cls-4" d="m652.72,267.48c-.24,0-.45-.18-.47-.42-.03-.26.16-.5.42-.53,9.01-1.07,11.3-21.85,11.32-22.06.03-.26.26-.45.53-.43.26.03.45.26.43.53-.09.89-2.4,21.75-12.16,22.91-.02,0-.04,0-.06,0Z"/>
+            <path class="cls-4" d="m683.85,300.36c-.25,0-.47-.2-.48-.46l-1.97-44.69c-.01-.26.19-.49.46-.5.25-.01.49.19.5.46l1.97,44.69c.01.26-.19.49-.46.5,0,0-.01,0-.02,0Z"/>
+            <g>
+              <path class="cls-64" d="m690.34,145.74l-8.64,17.09-11.51-15.54s-26.14-.75-26.14,62.66l13.69,1.51-6.92,41.36,70.26-1.12-2.47-53.11,16.86-7.91s-16.33-47.02-45.14-44.92Z"/>
+              <path class="cls-17" d="m715.86,200.15c-.18,0-.35-.1-.43-.27l-7.08-14.65c-.12-.24-.02-.52.22-.64.24-.11.52-.02.64.22l7.08,14.65c.12.24.02.52-.22.64-.07.03-.14.05-.21.05Z"/>
+              <path class="cls-22" d="m735.48,190.66s16.08,44.33.46,45.53c-15.61,1.2-53.91-39.53-53.91-39.53l5.27-13.01,31.89,25.85-3.33-9.84,19.62-9.01Z"/>
+              <g>
+                <polygon class="cls-4" points="695.33 161.28 678.57 218.8 636.88 205.59 652.83 148.67 695.33 161.28"/>
+                <polygon class="cls-4" points="692.49 171.77 704.8 171.39 704.8 177.13 692.49 176.4 692.49 171.77"/>
+                <path class="cls-22" d="m695.01,189.91h0c-3.14-3.4-6.95-6.11-11.2-7.96-2.77-1.2-5.36-2.18-5.39-1.66-.06,1.13,5.14,5.49,5.14,5.49,0,0-8-5.08-6.32-2.49,1.67,2.58,6.14,5.88,6.14,5.88,0,0-8.06-3.95-5.92-1.57,2.14,2.38,6.73,6.34,6.73,6.34,0,0-9.19-4.19-5.52-.82,3.67,3.37,8.82,9.13,8.82,9.13l7.51-12.35Z"/>
+              </g>
+            </g>
+            <path class="cls-63" d="m696.67,104.93c-1.03-1.79-2.19-3.49-3.48-5.1-.25-.31-.52-.64-.9-.77-.45-.16-.94-.03-1.4.05-2.03.37-4.14-.16-6.01-1.03s-3.58-2.06-5.35-3.12c-2.57-1.53-5.31-2.77-8.03-4.01-4.66-2.12-7.88,1.45-11.15,4.44-1.11,1.01-2.21,2.11-2.73,3.52-.63,1.69-.33,3.57.08,5.33.27,1.17.61,2.37,1.34,3.33.88,1.17,2.24,1.88,3.63,2.36,2.74.95,5.74,1.13,8.57.51,2.63-.58,5.06-1.81,7.64-2.58,2.77-.83,5.7-1.11,8.58-.83"/>
+          </g>
+          <g>
+            <g>
+              <g>
+                <g>
+                  <path class="cls-63" d="m47.43,148.01l21.34,1.18-5.52-49.52c-19.4-.19-15.97,16.61-24.22,25.96-2.72,3.08-3.91,5.99-4.17,8.64-.67,6.81,5.42,13.35,12.57,13.74Z"/>
+                  <path class="cls-63" d="m62.21,99.68l1.21,50.45,4.46-.31c10.49-.74,18.25-10.05,17.12-20.51-1.47-13.68-6.65-29.63-22.79-29.63Z"/>
+                </g>
+                <path class="cls-22" d="m45.48,124.69c1.04-.8,2.56-1.01,3.87-.6-1.45-6.87-.52-13.95,4.59-18.52,1.08-.97,2.25-1.71,3.48-2.26,5.81-2.58,12.94-.71,18.11,3.3,5.18,4.01,4.33,10.63,5.4,17.16,1.44,8.77,2.59,18.1-6.16,21.03-.45.15-.9.27-1.35.37l1.22,14.43c.56,6.1-4.43,11.27-10.55,10.93-5.3-.3-9.44-4.67-9.46-9.97,0,0-.56-21.97-.7-24.96,0-.16-.18-.24-.32-.16-1.67.93-3.87,1.16-5.61.48-2.16-.85-3.88-2.98-4.36-5.39-.43-2.16.21-4.58,1.84-5.84Z"/>
+                <path class="cls-45" d="m50.1,131.67c-.63,0-1.23-.17-1.71-.5-.57-.39-.91-.94-.95-1.55-.06-.91.56-1.76,1.58-2.17.23-.09.49.02.58.25s-.02.49-.25.58c-.66.26-1.06.77-1.02,1.29.02.33.22.64.56.87.38.25.87.37,1.39.34.24-.02.46.17.47.41.02.24-.17.46-.41.47-.08,0-.15,0-.23,0Z"/>
+                <path class="cls-63" d="m73.91,150.13l-.34-5.19s-8.57,2.3-15.95-5.13c0,0,4.16,9.15,16.29,10.32Z"/>
+                <path class="cls-63" d="m76.36,112.6c2.66,1.57,3.57,3.5,4.39,6.14,0,0,2.63-10.16-5.3-14.56l-3.2-.02s-3.31,4.05,4.11,8.44Z"/>
+              </g>
+              <path class="cls-63" d="m55.19,105.57c8.27,6.46,1.38,20.05-4.89,19.28,0,0-1.28-1.64-3.05-.9,0,0,1.57-23.35,7.94-18.38Z"/>
+            </g>
+            <g>
+              <g>
+                <g>
+                  <path class="cls-22" d="m81.86,211.36l18.67,14.84c6.99,5.07,14.18,3.25,18.18-4.41.26-.49.49-1.01.7-1.54,3.29-8.54,4.45-60.76,4.45-60.76l-11.26-.36-7.82,45.57-10.57-8.75-12.34,15.41Z"/>
+                  <path class="cls-22" d="m111.99,164.42c.22-5.01.92-10.56,2.01-14.33.71-2.46,1.47-4.68,1.83-4.42.77.57.8,6.32.8,6.32,0,0,1.01-7.96,1.79-5.48s.52,7.19.52,7.19c0,0,1.78-7.39,2.18-4.71.4,2.68-.15,7.29-.15,7.29,0,0,2.35-8.16,2.57-3.95.32,6.27.49,6.85.14,12.37l-11.68-.29Z"/>
+                </g>
+                <path class="cls-53" d="m109.32,168.86l17.03,6.44s.32,59.86-17.92,55.09c-18.24-4.77-22.52-10.83-22.52-10.83l-2.11-42.88,22.2,16.76,3.32-24.57Z"/>
+              </g>
+              <g>
+                <polygon class="cls-22" points="102.86 461.97 87.38 461.97 84.63 439.07 101 439.07 102.86 461.97"/>
+                <path class="cls-63" d="m86.79,459.75l16.13-.79,18.38,6.85c2.87,1.48,4.68,4.44,4.68,7.67h-40.49l1.3-13.72Z"/>
+              </g>
+              <g>
+                <polygon class="cls-22" points="22.68 454.24 8.2 448.75 13.76 426.37 29.07 432.18 22.68 454.24"/>
+                <path class="cls-63" d="m8.44,446.47l15.36,4.99,14.76,12.93c2.16,2.4,2.8,5.81,1.65,8.83h0l-37.86-14.37,6.09-12.37Z"/>
+              </g>
+              <path class="cls-63" d="m75.03,449.07l38.19.58s-9.49-204.44-28.46-234.58l-30.94-.03,21.2,234.02Z"/>
+              <path class="cls-63" d="m3.79,435.57l36.99,9.54s37.11-196.26,25.75-230l-33.41-2.65L3.79,435.57Z"/>
+              <path class="cls-64" d="m55.52,152.76l10.27,16.76,9.41-16.03s10.48-1.21,10.2,36.85l3.36,69.23-60.06.52.86-55.51-15.66-7.35s14.86-46.42,41.62-44.47Z"/>
+              <g>
+                <path class="cls-53" d="m96.88,255.83l12.55,79.02h-21.34c1.42-1.42-11.51-180.98-11.51-180.98,0,0,6.9-2.72,12.04,10.84l5.13,62.68"/>
+                <path class="cls-57" d="m96.88,256.27c-.22,0-.41-.16-.44-.38l-6.27-46.23c-.03-.24.14-.47.38-.5.24-.03.47.14.5.38l6.27,46.23c.03.24-.14.47-.38.5-.02,0-.04,0-.06,0Z"/>
+                <path class="cls-17" d="m81.59,197.9s-.07,0-.1-.01c-.24-.05-.39-.29-.33-.53l5.48-24.05-5.3-4.85c-.1-.09-.15-.23-.14-.36.01-.14.08-.26.2-.34l6.15-4.1-10.41-9.13c-.18-.16-.2-.44-.04-.63.16-.18.44-.2.63-.04l10.85,9.51c.1.09.16.23.15.36,0,.14-.08.26-.2.34l-6.16,4.11,5.07,4.64c.12.11.17.27.13.43l-5.54,24.3c-.05.21-.23.35-.43.35Z"/>
+              </g>
+              <path class="cls-4" d="m62.52,309.49s-.04,0-.05,0c-.24-.03-.42-.25-.39-.49l4.7-39.43c.03-.24.25-.42.49-.39.24.03.42.25.39.49l-4.7,39.43c-.03.23-.22.39-.44.39Z"/>
+              <g>
+                <g>
+                  <path class="cls-53" d="m50.51,152.96h0c6.48,18.24,8.03,37.86,4.5,56.88l-22.88,123.22-32.13,1.79,20.13-87,30.37-94.89Z"/>
+                  <g>
+                    <path class="cls-22" d="m58.66,190.71l-19.5,15.81c.02,1.55.03,3.1,0,4.65.53,4.29,1.22,8.57,1.95,12.84,11.93-10.03,22.44-21.21,22.44-21.21l-4.9-12.09Z"/>
+                    <path class="cls-53" d="m50.51,152.96h0c-8.74-1.27-20.36,5.02-25.33,12.17-7.99,11.49-35.26,66.73-18.05,75.74,17.21,9.01,53.27-29.73,53.27-29.73l-7.52-15.74-20.75,14.97,18.38-57.42Z"/>
+                    <path class="cls-57" d="m32.13,207.02c-.06,0-.11-.01-.17-.03-.23-.09-.34-.35-.25-.58l5.97-14.87c.09-.23.35-.34.58-.25.23.09.34.35.25.58l-5.97,14.87c-.07.17-.24.28-.41.28Z"/>
+                    <path class="cls-57" d="m50.18,195.89c-.18,0-.35-.11-.42-.29l-8.89-23.29c-.06-.15-.03-.32.07-.44l4.37-5.3-6.67-3.21c-.13-.06-.23-.19-.25-.34-.02-.15.03-.29.14-.39l10.25-9.15c.18-.16.46-.15.63.04.16.18.15.46-.04.63l-9.75,8.71,6.58,3.16c.12.06.21.17.24.3s0,.27-.09.38l-4.57,5.54,8.8,23.05c.09.23-.03.49-.26.57-.05.02-.11.03-.16.03Z"/>
+                    <path class="cls-57" d="m25.21,212.87c-.13,0-.25-.05-.34-.16-.16-.19-.13-.47.06-.63l15.2-12.63c.19-.16.47-.13.63.06.16.19.13.47-.06.63l-15.2,12.63c-.08.07-.18.1-.28.1Z"/>
+                  </g>
+                </g>
+                <g>
+                  <polygon class="cls-35" points="54.34 165.97 74.87 217.72 111.02 202.42 90.36 151.16 54.34 165.97"/>
+                  <path class="cls-22" d="m57.14,192.43h0c3.09-3.24,6.13-5.76,9.66-8.34,2.27-1.66,4.77-2.49,4.84-2.01.16,1.04-4.28,5.53-4.28,5.53,0,0,6.95-5.39,5.63-2.86-1.32,2.53-5.17,5.98-5.17,5.98,0,0,7.11-4.36,5.34-1.97-1.77,2.39-5.76,5.54-5.76,5.54,0,0,8.15-4.51,5.05-1.07-3.1,3.44-8.75,9.43-8.75,9.43l-6.56-10.22Z"/>
+                </g>
+              </g>
+            </g>
+            <path class="cls-63" d="m75.45,106.53s-5.75,19.59-22.46,16.97l-4.18-14.89,6.27-5.22s3.13-2.09,3.92-2.35,9.4.78,9.4.78l7.05,4.7Z"/>
+          </g>
+          <g>
+            <polygon class="cls-4" points="199.87 211.84 199.88 217.74 235.8 217.74 235.77 175.72 229.82 175.72 229.84 211.84 199.87 211.84"/>
+            <path class="cls-4" d="m230.79,212.78h-37.82l-.03-43.9h37.82l.03,43.9Zm-35.92-1.88h34.03l-.03-40.15h-34.03l.03,40.15Z"/>
+            <rect class="cls-4" x="203.88" y="165.61" width="15.94" height="8.42"/>
+            <rect class="cls-4" x="200.28" y="183.6" width="23.17" height="1.88"/>
+            <rect class="cls-4" x="200.28" y="193.11" width="23.17" height="1.88"/>
+            <rect class="cls-4" x="200.29" y="202.62" width="23.17" height="1.88"/>
+          </g>
+          <g>
+            <path class="cls-4" d="m216.85,86.58c-2.26,1.18-5.08,2.14-8.3,2.83l-32.33-16.5c2.15-1.22,4.86-2.23,7.98-2.99l32.64,16.66Z"/>
+            <path class="cls-4" d="m196.92,91.76c-1.6,0-3.17-.06-4.69-.18-13.16-1.01-22.35-5.96-22.35-12.03,0-2.86,2-5.5,5.78-7.65,2.26-1.28,5.05-2.33,8.28-3.1,2.56-.62,5.35-1.05,8.29-1.27,3.02-.24,6.34-.24,9.38,0,13.16,1,22.35,5.94,22.35,12.02,0,3.07-2.27,5.87-6.57,8.07-2.36,1.23-5.25,2.21-8.58,2.93-2.29.5-4.71.84-7.2,1.03-1.51.12-3.09.18-4.69.18Zm0-22.1c-1.53,0-3.05.06-4.51.17-2.82.21-5.48.62-7.93,1.22-3.02.73-5.61,1.69-7.68,2.87-2.97,1.68-4.6,3.68-4.6,5.63,0,2.15,1.94,4.31,5.46,6.09,3.76,1.9,8.99,3.19,14.74,3.63,2.92.23,6.1.23,9.02,0,2.39-.18,4.7-.51,6.89-.99,3.13-.68,5.83-1.59,8.01-2.72,3.43-1.76,5.32-3.89,5.32-6.01s-1.94-4.31-5.46-6.09c-3.76-1.9-8.99-3.18-14.74-3.62-1.46-.12-2.98-.17-4.51-.17Z"/>
+            <path class="cls-4" d="m196.92,102.81c-1.59,0-3.17-.06-4.69-.18-13.16-1.01-22.35-5.95-22.35-12.03v-11.05h2.32v11.05c0,2.15,1.94,4.31,5.46,6.09,3.76,1.9,8.99,3.19,14.74,3.63,2.92.23,6.1.23,9.02,0,5.75-.44,10.99-1.73,14.75-3.63,3.52-1.78,5.46-3.94,5.46-6.09v-11.05h2.32v11.05c0,6.08-9.19,11.02-22.35,12.03-1.51.12-3.09.18-4.69.18Z"/>
+          </g>
+          <g>
+            <rect class="cls-4" x="398.49" y="176.57" width="137.96" height="80.72"/>
+            <polyline class="cls-42" points="398.49 176.57 536.45 176.57 536.45 215.41"/>
+            <polyline class="cls-42" points="503.26 257.29 398.49 257.29 398.49 187.62"/>
+            <line class="cls-42" x1="536.45" y1="229.59" x2="536.45" y2="257.29"/>
+            <g>
+              <line class="cls-39" x1="525.9" y1="188.3" x2="490.21" y2="188.3"/>
+              <line class="cls-38" x1="525.9" y1="196.44" x2="485.52" y2="196.44"/>
+              <line class="cls-38" x1="505.8" y1="202.43" x2="485.52" y2="202.43"/>
+              <line class="cls-38" x1="525.9" y1="202.43" x2="513.1" y2="202.43"/>
+              <line class="cls-38" x1="525.9" y1="208.41" x2="485.52" y2="208.41"/>
+              <line class="cls-38" x1="525.9" y1="214.39" x2="487.33" y2="214.39"/>
+            </g>
+            <rect class="cls-42" x="405.99" y="185.56" width="66.6" height="62.74"/>
+            <circle class="cls-23" cx="521.51" cy="224.85" r="4.38"/>
+            <circle class="cls-58" cx="505.8" cy="224.85" r="4.38"/>
+            <circle class="cls-58" cx="490.09" cy="224.85" r="4.38"/>
+            <line class="cls-40" x1="525.9" y1="238.63" x2="499.66" y2="238.63"/>
+            <line class="cls-40" x1="525.9" y1="243.44" x2="507.25" y2="243.44"/>
+          </g>
+          <g>
+            <path class="cls-52" d="m429.34,203.49s4.02-.96,6.1-.32c2.09.64,4.61,3.53,6.64,3.11,2.03-.43,4.99-1.22,6.43-.75s.96,3.05.96,3.75-3.37,15.58-4.93,16.65c-1.55,1.07-1.22,2.95-3.1,2.68-1.88-.27-2.36-1.93-2.84-2.78-.48-.86-4.55-10.76-4.61-10.92-.05-.16-4.66-11.41-4.66-11.41Z"/>
+            <path class="cls-25" d="m415.84,238.62s-1.77.16-1.5-4.28c.27-4.44,0-15.8,1.5-20.72,1.5-4.93,5.38-10.75,12.85-10.98,17.4-.54,12.08,24.3,11.65,25.6-.86,2.54-5.92,6.45-9.53,6.99-12.57,1.86-13.25,3.51-14.97,3.4Z"/>
+            <path class="cls-25" d="m443.33,211.17s.57-5.07,6.89-5.18c6.32-.11,8.15,1.91,10.31,2.24,2.44.37,4.47.16,4.69,1.79.15,1.14-2.93,4.61-3.61,5.93-.68,1.32-4,8.07-10.07,10.03-6.07,1.96-7.75.75-8.43-1-.68-1.75.04-11.46.21-13.82Z"/>
+          </g>
+          <g>
+            <g>
+              <path class="cls-4" d="m537.16,267.25v84.36c0,1.28-1,2.32-2.24,2.32h-135.16c-1.24,0-2.24-1.04-2.24-2.32v-84.36c0-1.28,1-2.32,2.24-2.32h135.16c1.24,0,2.24,1.04,2.24,2.32Z"/>
+              <path class="cls-54" d="m534.03,262.67h-133.21c-2.26,0-4.09,1.83-4.09,4.09v86.08c0,2.26,1.83,4.09,4.09,4.09h133.21c2.26,0,4.09-1.83,4.09-4.09v-86.08c0-2.26-1.83-4.09-4.09-4.09Zm2.66,88.97c0,1.26-1,2.29-2.22,2.29h-133.98c-1.23,0-2.22-1.02-2.22-2.29v-83.24c0-1.26.99-2.29,2.22-2.29h133.98c1.23,0,2.22,1.02,2.22,2.29v83.24Z"/>
+              <rect class="cls-2" x="398.26" y="346.96" width="138.43" height="6.97" rx="3.48" ry="3.48"/>
+              <g>
+                <path class="cls-4" d="m511.59,350.47h-108.39c-.27,0-.48.24-.48.53s.22.53.48.53h108.39c.27,0,.48-.24.48-.53s-.22-.53-.48-.53Z"/>
+                <rect class="cls-4" x="422.65" y="349.6" width=".65" height="2.79"/>
+                <path class="cls-4" d="m399.76,351c0-.47.38-.86.86-.86s.86.38.86.86-.38.86-.86.86-.86-.38-.86-.86Z"/>
+                <g>
+                  <path class="cls-4" d="m518.69,351c0-.47.38-.86.86-.86s.86.38.86.86-.38.86-.86.86-.86-.38-.86-.86Z"/>
+                  <circle class="cls-4" cx="523.14" cy="351" r=".86"/>
+                  <path class="cls-4" d="m514.59,351c0-.47.38-.86.86-.86s.86.38.86.86-.38.86-.86.86-.86-.38-.86-.86Z"/>
+                </g>
+                <g>
+                  <path class="cls-4" d="m532.55,352.84c-.16,0-.29-.13-.29-.29s.13-.29.29-.29c.59,0,1.06-.48,1.06-1.06,0-.16.13-.29.29-.29s.29.13.29.29c0,.9-.74,1.64-1.64,1.64Z"/>
+                  <path class="cls-4" d="m533.9,350.01c-.16,0-.29-.13-.29-.29,0-.58-.48-1.06-1.06-1.06-.16,0-.29-.13-.29-.29s.13-.29.29-.29c.9,0,1.64.73,1.64,1.64,0,.16-.13.29-.29.29Z"/>
+                  <path class="cls-4" d="m527.69,350.01c-.16,0-.29-.13-.29-.29,0-.9.74-1.64,1.64-1.64.16,0,.29.13.29.29s-.13.29-.29.29c-.59,0-1.06.48-1.06,1.06,0,.16-.13.29-.29.29Z"/>
+                  <path class="cls-4" d="m529.04,352.84c-.9,0-1.64-.73-1.64-1.64,0-.16.13-.29.29-.29s.29.13.29.29c0,.58.48,1.06,1.06,1.06.16,0,.29.13.29.29s-.13.29-.29.29Z"/>
+                </g>
+              </g>
+              <path class="cls-1" d="m423.34,335.57h-21.41c-.37,0-.68-.3-.68-.68h0c0-.37.3-.68.68-.68h21.41c.37,0,.68.3.68.68h0c0,.37-.3.68-.68.68Z"/>
+              <path class="cls-1" d="m423.34,332.36h-21.41c-.37,0-.68-.3-.68-.68h0c0-.37.3-.68.68-.68h21.41c.37,0,.68.3.68.68h0c0,.37-.3.68-.68.68Z"/>
+              <path class="cls-1" d="m423.34,328.8h-21.41c-.37,0-.68-.3-.68-.68h0c0-.37.3-.68.68-.68h21.41c.37,0,.68.3.68.68h0c0,.37-.3.68-.68.68Z"/>
+              <path class="cls-1" d="m529.2,281.57h-21.41c-.37,0-.68-.3-.68-.68h0c0-.37.3-.68.68-.68h21.41c.37,0,.68.3.68.68h0c0,.37-.3.68-.68.68Z"/>
+              <path class="cls-1" d="m529.2,278.36h-21.41c-.37,0-.68-.3-.68-.68h0c0-.37.3-.68.68-.68h21.41c.37,0,.68.3.68.68h0c0,.37-.3.68-.68.68Z"/>
+              <path class="cls-1" d="m529.2,274.8h-21.41c-.37,0-.68-.3-.68-.68h0c0-.37.3-.68.68-.68h21.41c.37,0,.68.3.68.68h0c0,.37-.3.68-.68.68Z"/>
+              <g>
+                <path class="cls-1" d="m438.88,270.95h-34.15c-.37,0-.68-.3-.68-.68h0c0-.37.3-.68.68-.68h34.15c.37,0,.68.3.68.68h0c0,.37-.3.68-.68.68Z"/>
+                <path class="cls-1" d="m426.14,275.39h-21.41c-.37,0-.68-.3-.68-.68h0c0-.37.3-.68.68-.68h21.41c.37,0,.68.3.68.68h0c0,.37-.3.68-.68.68Z"/>
+                <path class="cls-1" d="m438.36,275.39h-6.58c-.37,0-.68-.3-.68-.68h0c0-.37.3-.68.68-.68h6.58c.37,0,.68.3.68.68h0c0,.37-.3.68-.68.68Z"/>
+              </g>
+              <g>
+                <path class="cls-1" d="m519.53,323.61h-21.41c-.37,0-.68-.3-.68-.68h0c0-.37.3-.68.68-.68h21.41c.37,0,.68.3.68.68h0c0,.37-.3.68-.68.68Z"/>
+                <path class="cls-1" d="m519.53,328.93h-12.11c-.37,0-.68-.3-.68-.68h0c0-.37.3-.68.68-.68h12.11c.37,0,.68.3.68.68h0c0,.37-.3.68-.68.68Z"/>
+                <rect class="cls-1" x="523.32" y="321.12" width="11.73" height="8.12" rx="1.76" ry="1.76"/>
+              </g>
+            </g>
+            <g>
+              <g>
+                <path class="cls-2" d="m532.29,287.14h-7.01c-.06,0-.1-.04-.1-.1s.04-.1.1-.1h7.01c.06,0,.1.04.1.1s-.04.1-.1.1Z"/>
+                <path class="cls-2" d="m531.84,289.3h-6.12c-.06,0-.1-.04-.1-.1s.04-.1.1-.1h6.12c.06,0,.1.04.1.1s-.04.1-.1.1Z"/>
+                <path class="cls-2" d="m530.56,291.08h-3.5c-.06,0-.1-.04-.1-.1s.04-.1.1-.1h3.5c.06,0,.1.04.1.1s-.04.1-.1.1Z"/>
+                <path class="cls-2" d="m530.56,293.92h-3.5c-.06,0-.1-.04-.1-.1s.04-.1.1-.1h3.5c.06,0,.1.04.1.1s-.04.1-.1.1Z"/>
+                <path class="cls-2" d="m531.84,295.7h-6.11c-.06,0-.1-.04-.1-.1s.04-.1.1-.1h6.11c.06,0,.1.04.1.1s-.04.1-.1.1Z"/>
+                <path class="cls-2" d="m532.29,297.86h-7.02c-.06,0-.1-.04-.1-.1s.04-.1.1-.1h7.02c.06,0,.1.04.1.1s-.04.1-.1.1Z"/>
+                <path class="cls-2" d="m531.83,300.02h-6.1c-.06,0-.1-.04-.1-.1s.04-.1.1-.1h6.1c.06,0,.1.04.1.1s-.04.1-.1.1Z"/>
+                <path class="cls-2" d="m530.5,301.8h-3.46c-.06,0-.1-.04-.1-.1s.04-.1.1-.1h3.46c.06,0,.1.04.1.1s-.04.1-.1.1Z"/>
+                <path class="cls-2" d="m530.49,304.64h-3.41c-.06,0-.1-.04-.1-.1s.04-.1.1-.1h3.41c.06,0,.1.04.1.1s-.04.1-.1.1Z"/>
+                <path class="cls-2" d="m531.84,306.41h-6.1c-.06,0-.1-.04-.1-.1s.04-.1.1-.1h6.1c.06,0,.1.04.1.1s-.04.1-.1.1Z"/>
+                <path class="cls-2" d="m532.27,308.6h-7c-.06,0-.1-.04-.1-.1s.04-.1.1-.1h7c.06,0,.1.04.1.1s-.04.1-.1.1Z"/>
+              </g>
+              <g>
+                <path class="cls-3" d="m532.29,287.49c-.12,0-.23-.05-.32-.13-.08-.08-.13-.2-.13-.32,0-.03,0-.06,0-.09,0-.03.02-.06.03-.08.01-.03.03-.05.04-.08.02-.02.04-.05.06-.07.11-.11.26-.15.41-.12.03,0,.06.01.09.03.03.01.05.03.08.04.03.02.05.04.07.06.02.02.04.04.06.07.02.03.03.05.04.08.01.03.02.06.03.08,0,.03,0,.06,0,.09,0,.12-.05.23-.13.32-.02.02-.04.04-.07.06-.02.02-.05.03-.08.04-.03.01-.06.02-.08.03-.03,0-.06,0-.09,0Z"/>
+                <path class="cls-3" d="m531.41,306.5c-.11-.22-.01-.49.21-.6h0c.22-.11.49-.01.6.21h0c.11.22.01.49-.21.6h0c-.06.03-.13.04-.19.04h0c-.17,0-.33-.1-.41-.26Z"/>
+                <path class="cls-3" d="m530.18,304.86c-.18-.17-.19-.46-.01-.64h0c.17-.18.46-.19.64-.01h0c.18.17.19.46.01.64h0c-.09.09-.21.14-.32.14h0c-.11,0-.23-.04-.31-.13Z"/>
+                <path class="cls-3" d="m526.73,302.02c-.18-.17-.18-.46-.01-.64h0c.17-.18.46-.18.64,0h0c.18.17.18.46.01.64h0c-.09.09-.21.14-.32.14h0c-.11,0-.23-.04-.31-.13Z"/>
+                <path class="cls-3" d="m525.32,300.11c-.11-.23,0-.49.22-.6h0c.23-.1.49,0,.6.22h0c.11.23,0,.49-.22.6h0c-.06.03-.13.04-.19.04h0c-.17,0-.33-.1-.41-.26Z"/>
+                <path class="cls-3" d="m525.27,298.21c-.25,0-.45-.2-.45-.45h0c0-.25.2-.45.45-.45h0c.25,0,.45.2.45.45h0c0,.25-.2.45-.45.45h0Z"/>
+                <path class="cls-3" d="m525.55,296.01c-.22-.11-.32-.38-.22-.6h0c.11-.23.37-.32.6-.22h0c.23.11.32.37.22.6h0c-.08.16-.24.26-.41.26h0c-.06,0-.13-.01-.19-.04Z"/>
+                <path class="cls-3" d="m526.74,294.14c-.17-.18-.17-.47.01-.64h0c.18-.17.47-.17.64.01h0c.17.18.17.47-.01.64h0c-.09.08-.2.13-.31.13h0c-.12,0-.24-.05-.32-.14Z"/>
+                <path class="cls-3" d="m530.18,291.3c-.17-.18-.17-.47.01-.64h0c.18-.17.47-.17.64.01h0c.17.18.17.47-.01.64h0c-.09.09-.2.13-.31.13h0c-.12,0-.24-.05-.32-.14Z"/>
+                <path class="cls-3" d="m531.64,289.61c-.23-.11-.32-.38-.22-.6h0c.11-.23.37-.32.6-.22h0c.23.11.32.37.22.6h0c-.08.16-.24.26-.41.26h0c-.06,0-.13-.01-.19-.04Z"/>
+                <path class="cls-3" d="m532.29,308.95s-.06,0-.09,0c-.03,0-.06-.01-.08-.03-.03-.01-.05-.03-.08-.04-.03-.02-.05-.04-.07-.06-.08-.08-.13-.2-.13-.32,0-.03,0-.06,0-.09,0-.03.02-.06.03-.08.01-.03.03-.05.04-.08.02-.02.04-.05.06-.07.08-.08.2-.13.32-.13s.24.05.32.13c.02.02.04.04.06.07.02.03.03.05.04.08.01.03.02.06.03.08,0,.03,0,.06,0,.09s0,.06,0,.09c0,.03-.02.06-.03.08-.01.03-.03.05-.04.08-.02.02-.04.05-.06.07-.02.02-.04.04-.07.06-.02.02-.05.03-.08.04-.03.01-.06.02-.08.03-.03,0-.06,0-.09,0Z"/>
+              </g>
+              <g>
+                <path class="cls-2" d="m525.27,287.49c-.12,0-.23-.05-.32-.13-.08-.08-.13-.2-.13-.32,0-.03,0-.06,0-.09,0-.03.02-.06.03-.08.01-.03.03-.05.04-.08.02-.02.04-.05.06-.07.11-.11.26-.15.41-.12.03,0,.06.01.09.03.03.01.05.03.08.04.03.02.05.04.07.06.02.02.04.04.06.07.02.03.03.05.04.08.01.03.02.06.03.08,0,.03,0,.06,0,.09,0,.12-.05.23-.13.32-.02.02-.04.04-.07.06-.02.02-.05.03-.08.04-.03.01-.06.02-.08.03-.03,0-.06,0-.09,0Z"/>
+                <path class="cls-2" d="m525.55,306.72c-.22-.11-.32-.38-.21-.6h0c.11-.23.38-.32.6-.21h0c.22.11.32.38.21.6h0c-.08.16-.24.26-.41.26h0c-.07,0-.13-.01-.19-.04Z"/>
+                <path class="cls-2" d="m526.75,304.85c-.17-.18-.17-.47.01-.64h0c.18-.17.47-.17.64.01h0c.17.18.17.47-.01.64h0c-.09.08-.2.13-.31.13h0c-.12,0-.24-.05-.33-.14Z"/>
+                <path class="cls-2" d="m528.44,303.39c-.15-.2-.11-.48.08-.63h0c.2-.15.48-.11.63.08h0c.15.2.11.48-.08.63h0c-.08.06-.18.09-.27.09h0c-.14,0-.27-.06-.36-.18Z"/>
+                <path class="cls-2" d="m530.2,302.01c-.17-.18-.17-.46.01-.64h0c.18-.17.46-.17.64,0h0c.17.18.17.46,0,.64h0c-.09.09-.2.13-.31.13h0c-.12,0-.24-.05-.32-.14Z"/>
+                <path class="cls-2" d="m531.65,300.33c-.23-.1-.32-.37-.22-.6h0c.1-.23.37-.32.6-.22h0c.23.11.32.37.22.6h0c-.08.16-.24.26-.41.26h0c-.06,0-.13-.01-.19-.04Z"/>
+                <path class="cls-2" d="m531.84,297.76c0-.25.2-.45.45-.45h0c.25,0,.45.2.45.45h0c0,.25-.2.45-.45.45h0c-.25,0-.45-.2-.45-.45Z"/>
+                <path class="cls-2" d="m531.42,295.79c-.11-.23,0-.49.22-.6h0c.23-.11.49-.01.6.22h0c.11.23,0,.49-.22.6h0c-.06.03-.13.04-.19.04h0c-.17,0-.33-.1-.41-.26Z"/>
+                <path class="cls-2" d="m530.19,294.15h0c-.18-.17-.18-.46-.01-.64h0c.17-.18.46-.18.64-.01h0c.18.17.18.46.01.64h0c-.09.09-.21.14-.32.14h0c-.11,0-.23-.04-.31-.13Z"/>
+                <path class="cls-2" d="m528.51,292.76h0c-.2-.15-.24-.44-.08-.63h0c.15-.2.43-.24.63-.08h0c.2.15.24.43.08.63h0c-.09.12-.22.18-.36.18h0c-.1,0-.19-.03-.27-.09Z"/>
+                <path class="cls-2" d="m526.75,291.31h0c-.18-.17-.18-.46-.01-.64h0c.17-.18.46-.18.64-.01h0c.18.17.18.46.01.64h0c-.09.09-.21.14-.32.14h0c-.11,0-.23-.04-.31-.13Z"/>
+                <path class="cls-2" d="m525.33,289.4h0c-.11-.22,0-.49.22-.6h0c.23-.11.49,0,.6.22h0c.11.23,0,.49-.22.6h0c-.06.03-.13.04-.19.04h0c-.17,0-.33-.1-.41-.26Z"/>
+                <path class="cls-2" d="m525.27,308.95s-.06,0-.09,0c-.03,0-.06-.01-.08-.03-.03-.01-.05-.03-.08-.04-.03-.02-.05-.04-.07-.06-.08-.08-.13-.2-.13-.32,0-.03,0-.06,0-.09s.02-.06.03-.08c.01-.03.03-.05.04-.08.02-.02.04-.05.06-.07.08-.08.2-.13.32-.13s.24.05.32.13c.02.02.04.04.06.07.02.03.03.05.04.08.01.03.02.06.03.08,0,.03,0,.06,0,.09s0,.06,0,.09c0,.03-.02.06-.03.08-.01.03-.03.05-.04.08-.02.02-.04.05-.06.07-.02.02-.04.04-.07.06-.02.02-.05.03-.08.04-.03.01-.06.02-.08.03-.03,0-.06,0-.09,0Z"/>
+              </g>
+            </g>
+            <circle class="cls-4" cx="499.98" cy="303.2" r="2.32"/>
+            <g id="head">
+              <path class="cls-49" d="m433.27,316.46c.61-2.67,2.46-5.21,4.14-8.01.77-1.29,2.06-2.31,2.33-3.65.56-2.75-1.55-9.59,2.01-16.72,4.85-9.72,15.76-15.23,26.3-15.2,1.53,0,16.2.28,24.18,12.16,5.92,8.82,5.16,19.47-.42,29.69-2.34,4.28-.78,20.61-.64,25.44h-28.84c-.11-1.3-.67-2.03-.95-2.33-1.39-1.49-4.23-1.2-7-.41-6.78,1.94-9.73,1-10.39.51-1.75-1.3-2.94-4.83-1.91-6.99.24-.5.71-1.17.42-1.72-.35-.68-1.41-.36-2.44-1.22-.14-.12-1.19-.99-.95-2.03.23-1.02,1.52-1.4,1.59-1.42-.06.02-1.26.37-1.95-.29-.45-.43-.45-1.07-.44-1.48,0-.69.24-.8.33-1.48.02-.19.21-1.59-.55-2.22-.4-.33-.67-.13-2.16-.37-1.13-.18-1.73-.29-2.16-.74-.46-.48-.58-1.15-.49-1.53Z"/>
+            </g>
+            <g id="brainwave">
+              <path class="cls-56" d="m448.45,310c-.41,0-.73-.39-.99-5.39-.16-3.07-.25-7.11-.34-11.02-.12-5.32-.26-11.27-.56-12.87-.58,2.23-1.09,13.41-1.28,20.5,0,.09-.05.18-.14.22-.08.04-.18.04-.26,0-.19-.12-1.91-1.21-2.31-1.85-.18-.29-.31-.77-.45-1.29-.19-.7-.47-1.75-.82-1.72-.24.02-.4.82-.5,1.35-.17.88-.34,1.7-.95,1.78-2.89.34-6.28.17-9.27.02l-.32-.02c-.54-.03-1.19-.41-1.87-.81-.64-.38-1.31-.77-1.75-.76-.4.01-1.03.42-1.59.77-.56.36-1.1.71-1.55.79-.42.07-1.02-.04-1.67-.15-.86-.16-1.92-.35-2.15.03-.23.39-.39,2.68-.53,4.69-.32,4.59-.48,5.74-1.06,5.74-.3,0-.35-.29-.42-1.07-.05-.51-.1-1.26-.14-2.28-.09-1.91-.17-4.57-.26-7.38-.12-3.99-.26-8.51-.45-12.08-.23-4.15-.47-5.66-.62-6.19-.26,1.17-.31,5.31-.36,8.72-.1,7.21-.21,11.63-.98,12.16-.1.07-.22.09-.34.06-.28-.08-.44-.44-.65-.9-.1-.23-.24-.54-.33-.62-.1-.08-.31-.18-.52-.27-.35-.16-.72-.32-.89-.56-.23-.31-.38-.84-.55-1.4-.21-.71-.5-1.67-.86-1.68h0c-.32,0-.59.86-.79,1.48-.22.7-.43,1.36-.81,1.65-1.16.89-5.29.14-5.76.05-.14-.03-.23-.16-.21-.3.03-.14.16-.23.3-.21,1.21.23,4.52.68,5.35.05.25-.19.45-.83.63-1.4.29-.91.59-1.85,1.3-1.84.75.01,1.05,1.05,1.35,2.05.15.49.3,1,.47,1.24.1.13.42.28.69.4.24.11.48.21.63.34.19.15.33.47.48.81.07.17.19.42.27.55.12-.22.36-1.01.51-3.88.12-2.23.16-5.06.19-7.8.11-8.14.23-9.46.86-9.46.33,0,.55.31.76,1.98.14,1.04.26,2.51.37,4.5.21,3.64.35,8.37.48,12.53.12,3.98.25,8.07.4,9.67.2-1.04.34-3.17.45-4.7.19-2.75.33-4.45.6-4.92.41-.69,1.56-.48,2.68-.28.57.1,1.16.21,1.49.15.35-.06.87-.39,1.36-.71.64-.41,1.31-.84,1.86-.86.58-.02,1.28.4,2.02.83.6.35,1.22.72,1.63.74l.32.02c2.97.15,6.33.32,9.18-.02.24-.03.4-.83.51-1.36.18-.88.34-1.71.97-1.77.78-.07,1.08,1.03,1.37,2.1.12.46.25.93.39,1.15.22.36,1.14,1.03,1.76,1.44.04-1.4.18-5.76.4-10.08.16-3.06.32-5.5.49-7.25.32-3.27.58-3.52.92-3.52.31,0,.44.32.56,1.35.08.68.15,1.67.21,3.02.12,2.5.2,5.81.28,9.32.14,6.15.34,14.46.84,15.8.15-.46.14-1.9.12-3.08-.03-2.64-.07-5.92,1.09-7.04.54-.52,1.62-.35,2.67-.19.58.09,1.12.17,1.46.12.28-.04.68-.35,1.07-.65.5-.38.98-.74,1.42-.77.54-.04,1.19.41,1.81.84.37.26.72.5.97.58.75.25,3.13.08,3.98-.01.14-.01.27.09.28.23.01.14-.09.27-.23.28-.13.01-3.19.33-4.2-.01-.32-.11-.7-.37-1.1-.65-.5-.35-1.11-.78-1.48-.75-.29.02-.75.37-1.15.67-.46.35-.9.68-1.3.74-.42.07-1-.02-1.62-.12-.84-.13-1.88-.29-2.23.05-.99.96-.96,4.25-.93,6.66.02,2.1.02,3.21-.34,3.58-.09.09-.2.14-.32.14Z"/>
+            </g>
+            <g id="brainwave-2" data-name="brainwave">
+              <path class="cls-56" d="m508.15,310c-.41,0-.73-.39-.99-5.39-.16-3.07-.25-7.11-.34-11.02-.12-5.32-.26-11.27-.56-12.87-.58,2.23-1.09,13.41-1.28,20.5,0,.09-.05.18-.14.22-.08.04-.18.04-.26,0-.19-.12-1.91-1.21-2.31-1.85-.18-.29-.31-.77-.45-1.29-.19-.7-.47-1.75-.82-1.72-.24.02-.4.82-.5,1.35-.17.88-.34,1.7-.95,1.78-2.89.34-6.28.17-9.27.02l-.32-.02c-.54-.03-1.19-.41-1.87-.81-.64-.38-1.31-.77-1.75-.76-.4.01-1.03.42-1.59.77-.56.36-1.1.71-1.55.79-.42.07-1.02-.04-1.67-.15-.86-.16-1.92-.35-2.15.03-.23.39-.39,2.68-.53,4.69-.32,4.59-.48,5.74-1.06,5.74-.3,0-.35-.29-.42-1.07-.05-.51-.1-1.26-.14-2.28-.09-1.91-.17-4.57-.26-7.38-.12-3.99-.26-8.51-.45-12.08-.23-4.15-.47-5.66-.62-6.19-.26,1.17-.31,5.31-.36,8.72-.1,7.21-.21,11.63-.98,12.16-.1.07-.22.09-.34.06-.28-.08-.44-.44-.65-.9-.1-.23-.24-.54-.33-.62-.1-.08-.31-.18-.52-.27-.35-.16-.72-.32-.89-.56-.23-.31-.38-.84-.55-1.4-.21-.71-.5-1.67-.86-1.68h0c-.32,0-.59.86-.79,1.48-.22.7-.43,1.36-.81,1.65-1.16.89-5.29.14-5.76.05-.14-.03-.23-.16-.21-.3.03-.14.16-.23.3-.21,1.21.23,4.52.68,5.35.05.25-.19.45-.83.63-1.4.29-.91.59-1.85,1.3-1.84.75.01,1.05,1.05,1.35,2.05.15.49.3,1,.47,1.24.1.13.42.28.69.4.24.11.48.21.63.34.19.15.33.47.48.81.07.17.19.42.27.55.12-.22.36-1.01.51-3.88.12-2.23.16-5.06.19-7.8.11-8.14.23-9.46.86-9.46.33,0,.55.31.76,1.98.14,1.04.26,2.51.37,4.5.21,3.64.35,8.37.48,12.53.12,3.98.25,8.07.4,9.67.2-1.04.34-3.17.45-4.7.19-2.75.33-4.45.6-4.92.41-.69,1.56-.48,2.68-.28.57.1,1.16.21,1.49.15.35-.06.87-.39,1.36-.71.64-.41,1.31-.84,1.86-.86.59-.02,1.28.4,2.02.83.6.35,1.22.72,1.63.74l.32.02c2.97.15,6.33.32,9.18-.02.24-.03.4-.83.51-1.36.18-.88.34-1.71.97-1.77.78-.07,1.08,1.03,1.37,2.1.12.46.25.93.39,1.15.22.36,1.14,1.03,1.76,1.44.04-1.4.18-5.76.4-10.08.16-3.06.32-5.5.49-7.25.32-3.27.58-3.52.92-3.52.31,0,.44.32.56,1.35.08.68.15,1.67.21,3.02.12,2.5.2,5.81.28,9.32.14,6.15.34,14.46.84,15.8.15-.46.14-1.9.12-3.08-.03-2.64-.07-5.92,1.09-7.04.54-.52,1.62-.35,2.67-.19.58.09,1.12.17,1.46.12.28-.04.68-.35,1.07-.65.5-.38.98-.74,1.42-.77.55-.04,1.19.41,1.81.84.37.26.72.5.97.58.75.25,3.13.08,3.98-.01.14-.01.27.09.28.23.01.14-.09.27-.23.28-.13.01-3.19.33-4.2-.01-.32-.11-.7-.37-1.1-.65-.5-.35-1.12-.78-1.48-.75-.29.02-.75.37-1.15.67-.46.35-.9.68-1.3.74-.42.07-1-.02-1.62-.12-.84-.13-1.88-.29-2.23.05-.99.96-.96,4.25-.93,6.66.02,2.1.02,3.21-.34,3.58-.09.09-.2.14-.32.14Z"/>
+            </g>
+            <g id="brain">
+              <g>
+                <path class="cls-60" d="m486.75,305.32c.32.51.95,1.67.79,3.14-.32,3.02-3.66,4.3-3.8,4.35-.97.35-1.15.12-3.73.21-4.31.16-5.01.86-6.1.14-1.66-1.1-1.71-3.82-1.72-4.77,0-.34.57-3.14.57-3.14,0,0,7.18-2.61,14,.07Z"/>
+                <path class="cls-65" d="m478.39,304.17c-.4.03-.78.06-1.15.11,2.18,1.44,4.1,3.19,5.71,5.22.7.87,1.33,1.79,1.91,2.75.2-.12.4-.26.62-.42-.58-.97-1.23-1.91-1.94-2.79-1.48-1.85-3.2-3.48-5.14-4.86Z"/>
+                <path class="cls-65" d="m484.81,308.17c.65.81,1.25,1.67,1.79,2.56.17-.21.32-.44.45-.69-.51-.81-1.06-1.59-1.66-2.33-1.02-1.28-2.15-2.45-3.4-3.5-.43-.04-.86-.07-1.27-.08,1.52,1.19,2.89,2.54,4.09,4.05Z"/>
+                <path class="cls-65" d="m478.7,308.11c-1.06-1.13-2.05-2.35-2.97-3.61-.28.05-.55.1-.8.16.98,1.39,2.06,2.72,3.22,3.96,1.5,1.6,3.14,3.06,4.9,4.36.21-.03.42-.08.68-.18.02,0,.1-.04.21-.09-1.9-1.36-3.66-2.9-5.25-4.6Z"/>
+                <path class="cls-65" d="m475.95,308.53c-1-1.07-1.95-2.21-2.82-3.41-.25.08-.38.13-.38.13,0,0-.04.19-.1.48.85,1.16,1.77,2.27,2.75,3.31,1.35,1.45,2.83,2.78,4.4,3.99.06,0,.13,0,.19,0,.38-.01.72-.02,1-.02-1.82-1.32-3.52-2.82-5.06-4.46Z"/>
+                <path class="cls-65" d="m474.34,310.32c-.74-.76-1.44-1.57-2.1-2.4-.04.23-.06.4-.06.46,0,.17,0,.4.02.66.51.61,1.05,1.21,1.6,1.78.84.88,1.74,1.71,2.68,2.49.3-.04.63-.08,1.02-.13-1.12-.89-2.17-1.85-3.16-2.88Z"/>
+              </g>
+              <g>
+                <path class="cls-18" d="m468.3,306.52c-.38,1.69-.09,2.8.22,3.49.13.28.59.88,1.51,2.07,1.67,2.16,1.77,2.16,2.01,2.71.41.93.35,1.39.93,1.92.15.13.81.74,1.58.57.8-.17,1.15-1.04,1.22-1.21.3-.79.06-1.51-.65-3.35-1.08-2.8-1.14-2.71-1.22-3.14-.2-1.05-.05-2.64,1.72-4.92-2.44.62-4.88,1.24-7.32,1.85Z"/>
+                <path class="cls-16" d="m474.83,315.8c-.97.06-2.32-2.37-2.65-3.62-.29-1.08-.96-3.81-.4-6.54-1.16.29-2.32.59-3.47.88-.38,1.69-.09,2.8.22,3.49.13.28.59.88,1.51,2.07,1.67,2.16,1.77,2.16,2.01,2.71.41.93.35,1.39.93,1.92.15.13.81.74,1.58.57.8-.17,1.15-1.04,1.22-1.21.15-.4.17-.78.05-1.29-.25.53-.58,1-1,1.02Z"/>
+              </g>
+              <g>
+                <path class="cls-15" d="m492.22,301.35c-.3,2-1.9,3.01-2.12,3.14-.14.53-.47,1.48-1.29,2.36-.4.43-1.76,1.89-3.62,1.65-1.35-.17-2.16-1.09-2.25-1.2-.02-.03-.04-.05-.06-.08-.02-.02-.03-.04-.05-.06-.02-.03-.04-.06-.07-.09-.01-.02-.03-.04-.04-.06-.02-.02-.03-.05-.05-.07-.02-.03-.03-.05-.05-.08-.01-.02-.02-.04-.04-.06-.01-.02-.03-.05-.04-.07-.02-.03-.03-.06-.04-.09,0-.02-.02-.04-.03-.05-.1-.21-.17-.41-.22-.59,0-.02-.01-.04-.02-.06-.02-.08-.04-.15-.05-.21,0,.04,0,.08,0,.12.01.32-.04.69-.26,1-.49.68-1.53.69-2.42.66-3.17-.09-4.3-.54-6-.58-1.17-.03-.91.18-5,1.03-.07.02-.14.03-.21.04-.02,0-.04,0-.05.01-.09.02-.17.04-.26.05-.09.02-.17.04-.26.05-.08.02-.16.03-.24.05-.17.03-.33.07-.48.1-.04,0-.08.02-.11.02-.23.05-.46.09-.67.14-.06.01-.11.02-.17.03-.05.01-.11.02-.16.03,0,0-.01,0-.02,0-.05,0-.09.02-.14.03-.05.01-.1.02-.15.03-.04,0-.08.01-.11.02,0,0-.02,0-.03,0-.09.02-.18.03-.27.05-.12.02-.23.04-.35.06-.08.01-.17.03-.25.04-.02,0-.03,0-.05,0-.13.02-.25.04-.37.06-.09.01-.18.02-.26.03,0,0,0,0,0,0-.03,0-.05,0-.08.01-.05,0-.09.01-.14.02-.02,0-.03,0-.05,0-.59.06-1.05.07-1.45,0-.65-.1-4.06-.68-5.96-3.73-.03-.05-.06-.1-.09-.15-.03-.05-.06-.1-.09-.15-.1-.19-.2-.37-.28-.56-.02-.04-.04-.09-.06-.13-.12-.28-.22-.56-.31-.84-.01-.04-.02-.08-.04-.12,0-.03-.02-.06-.03-.09-.02-.06-.03-.12-.05-.17-.01-.06-.03-.11-.04-.17-.01-.06-.03-.12-.04-.17-.01-.08-.03-.15-.04-.22,0-.03-.01-.06-.02-.1-.04-.26-.07-.51-.08-.74,0-.03,0-.07,0-.1-.02-.3-.02-.55,0-.75h0s-.04,0-.05,0c-.27.04-.58.07-.92.1-.11,0-.22.01-.34.02-.08,0-.16,0-.24,0-.04,0-.08,0-.12,0-.12,0-.25,0-.38,0-.05,0-.1,0-.15,0-.07,0-.15,0-.22,0-.07,0-.14,0-.21-.01-.04,0-.09,0-.13,0-.01,0-.02,0-.04,0-.04,0-.09,0-.13,0-.17-.01-.34-.03-.52-.05-1.64-.2-4.02-.48-5.8-2.32-.02-.02-.05-.05-.07-.08-.42-.45-1.71-1.83-1.75-3.97,0-.03,0-.06,0-.09,0-.03,0-.07,0-.1t0,0c0-.07,0-.13,0-.2,0-.04,0-.07,0-.11,0-.03,0-.06,0-.09,0-.04,0-.07.01-.11,0-.03,0-.06.01-.09.02-.12.03-.24.06-.35,0-.02,0-.04.01-.06.06-.27.13-.53.22-.76,0-.02.02-.05.03-.07,0,0,0,0,0,0,.01-.03.02-.05.03-.08.01-.03.02-.06.04-.09,0-.02.02-.04.03-.07.03-.08.07-.15.1-.22.01-.02.02-.05.04-.07.02-.05.05-.09.07-.14.01-.02.02-.04.04-.07.01-.02.02-.04.04-.07,0,0,0,0,0,0,.02-.03.04-.06.05-.09,0-.02.02-.03.03-.05.02-.03.04-.07.06-.1.03-.04.05-.08.08-.12.01-.02.02-.04.03-.05.04-.05.07-.11.11-.16.03-.05.06-.09.1-.13,0-.01.02-.02.03-.03.02-.02.03-.04.05-.07,0,0,0,0,0,0,0-.01.02-.02.02-.03.18-.22.33-.38.41-.46-.02-.08-.04-.2-.07-.35,0-.02,0-.04,0-.07,0-.01,0-.03,0-.04,0-.07-.02-.14-.02-.22,0-.03,0-.05,0-.08,0-.07,0-.13,0-.21,0-.03,0-.06,0-.09,0-.13,0-.28.01-.43,0-.09.02-.18.03-.27,0-.02,0-.05,0-.07,0-.05.01-.1.02-.14.01-.07.03-.15.04-.22,0-.02.01-.05.02-.07.01-.06.03-.13.05-.19.02-.06.04-.13.06-.19,0-.03.02-.05.03-.08.02-.05.04-.1.06-.16.03-.08.06-.16.1-.24.02-.05.05-.11.07-.16.03-.05.05-.11.08-.16.65-1.21,1.63-1.81,2.04-2.03.14-.6.49-1.69,1.42-2.69,1.82-1.95,4.36-1.91,4.79-1.9.48-.47,1.47-1.33,3-1.82,1.46-.47,2.72-.38,3.37-.29.57-.43,1.86-1.28,3.75-1.53.37-.05.72-.07,1.05-.07.37,0,.72.03,1.05.07.04,0,.08.01.13.02.01,0,.02,0,.04,0,.04,0,.07.01.11.02,0,0,.02,0,.03,0,.25.04.48.1.7.15.42.11.76.24.99.33.45-.13,1.38-.34,2.5-.08,1.52.34,2.42,1.31,2.71,1.65.14-.07.35-.18.63-.28.3-.11.68-.2,1.11-.23h0c.2-.01.41-.01.63,0,1.73.16,2.73,1.38,2.92,1.61.37-.06,2.37-.37,4.25.95,1.91,1.34,2.27,3.36,2.33,3.72.36.02,1.31.14,2.12.87,1.45,1.29,1.11,3.3,1.08,3.43.16.05,1.41.44,1.92,1.74.59,1.49-.36,2.78-.42,2.85.24.11,1.19.58,1.62,1.65.43,1.05.21,2.29-.54,3.23.11.16.4.59.59,1.23,0,.02.01.05.02.07,0,.02.01.05.02.07,0,0,0,0,0,0,0,.02.01.04.02.06.02.08.04.16.06.24,0,.03.01.05.02.08,0,.02,0,.05.01.07,0,.03.01.06.01.09,0,.03,0,.07.01.1,0,.02,0,.04,0,.06,0,.07.01.15.02.23,0,.02,0,.05,0,.07,0,.02,0,.04,0,.05,0,.23,0,.47-.04.72Z"/>
+                <path class="cls-59" d="m492.27,300.63s0-.04,0-.05c0-.02,0-.05,0-.07,0-.08-.01-.15-.02-.23,0-.02,0-.04,0-.06,0-.03,0-.07-.01-.1,0-.03,0-.06-.01-.09,0-.02,0-.05-.01-.07,0-.03-.01-.05-.02-.08-.02-.08-.04-.16-.06-.24,0-.02-.01-.04-.02-.06,0,0,0,0,0,0,0-.02-.01-.05-.02-.07,0-.02-.01-.05-.02-.07-1.06,1.69-2.72,2.91-4.64,3.32-3.43.73-6.09-1.46-6.42-1.74-.28.87-.8,2-1.83,2.4-1.36.53-2.59-.63-4.17-1.24-4.67-1.82-8.53,2.63-11.16,1.08-2.47-1.45-2.42-4.2-2.13-5.79.12-.66.29-1.13.33-1.2-.13.17-.32.39-.52.61,0,.01-.02.02-.03.03-.03.04-.06.07-.1.11-.02.03-.05.05-.07.08-.02.03-.05.05-.07.08-.03.03-.06.07-.1.1-.92,1.66-1.36,3.52-1.11,5.1.49,3.03,2.42,5.57,5.53,6.19.05,0,.1-.02.15-.03.05,0,.09-.02.14-.03,0,0,.01,0,.02,0,.05-.01.11-.02.16-.03.05-.01.11-.02.17-.03.21-.04.44-.09.67-.14.04,0,.08-.02.11-.02.16-.03.32-.07.48-.1.08-.02.16-.03.24-.05.08-.02.17-.04.26-.05.09-.02.17-.04.26-.05.02,0,.04,0,.05-.01.07-.01.14-.03.21-.04,4.09-.85,3.83-1.06,5-1.03,1.7.04,2.83.49,6,.58.89.02,1.92.02,2.42-.66.22-.31.27-.67.26-1,0-.04,0-.08,0-.12.01.07.03.14.05.21,0,.02.01.04.02.06.05.18.12.38.22.59,0,.02.02.04.03.05.01.03.03.06.04.09.01.02.03.05.04.07.01.02.02.04.04.06.02.03.03.05.05.08.01.02.03.05.05.07.01.02.03.04.04.06.02.03.04.06.07.09.02.02.03.04.05.06.02.03.04.05.06.08.09.11.9,1.03,2.25,1.2,1.87.23,3.23-1.23,3.62-1.65.82-.88,1.15-1.83,1.29-2.36.23-.14,1.83-1.14,2.12-3.14.04-.25.05-.49.04-.72Zm-10.08,5.1c-.03-.13-.04-.25-.05-.33,0,.02,0,.05.01.08,0,.03.01.07.02.11,0,.02,0,.04,0,.06,0,0,0,0,0,0,0,.02,0,.05,0,.07,0,0,0,0,0,.01t0,0Z"/>
+                <path class="cls-61" d="m465.59,308.56s-.08.01-.11.02c0,0-.02,0-.03,0-.09.02-.18.03-.27.05-.12.02-.23.04-.35.06-.08.01-.17.03-.25.04-.01,0-.03,0-.05,0-.13.02-.25.04-.37.06-.09.01-.18.02-.26.03,0,0,0,0,0,0-.03,0-.05,0-.08.01-.05,0-.09.01-.14.02-.02,0-.03,0-.05,0-.59.06-1.05.07-1.45,0-.65-.1-4.06-.68-5.96-3.73-.03-.05-.06-.1-.09-.15-.03-.05-.06-.1-.09-.15-.1-.19-.2-.37-.28-.56-.02-.04-.04-.09-.06-.13-.12-.28-.22-.56-.31-.84-.01-.04-.02-.08-.04-.12,0-.03-.02-.06-.03-.09-.02-.06-.03-.12-.05-.17-.01-.06-.03-.11-.04-.17-.01-.06-.03-.12-.04-.17-.01-.08-.03-.15-.04-.22,0-.03-.01-.06-.02-.1-.04-.26-.07-.51-.08-.74,0-.03,0-.07,0-.1-.02-.3-.02-.55,0-.75.57-.16,1.17-.35,1.79-.58,1.59-.58,2.83-1.46,3.75-2.29.2-.18.39-.37.56-.54-.92,1.66-1.36,3.52-1.11,5.1.49,3.03,2.42,5.57,5.53,6.19Z"/>
+                <path class="cls-21" d="m466.92,276.59c-1.15.23-2.42.71-3.23,1.81-.26.35-.41.67-.5.91-.73-.11-2.15-.23-3.79.29-1.4.44-2.4,1.17-3.02,1.73,0,0-.02.02-.03.02-.18.17-.33.31-.45.44-.41.04-1.95.26-3.21,1.57-1.33,1.39-1.41,3.05-1.42,3.43-.21.13-3.43,2.19-3.29,5.29.04.88.34,1.63.78,2.28.88,1.3,2.35,2.16,3.48,2.68.73.33,1.32.52,1.53.58.16.05.32.09.48.13.46.11.91.18,1.34.22.06,0,.12,0,.18.01,2.36.15,4.35-.65,5.43-1.21.14-.07.27-.14.38-.2.17-.1.31-.18.39-.23-.13.16-.27.34-.44.53,0,.01-.02.02-.03.03-.03.04-.06.07-.1.11-.02.03-.05.05-.07.08-.02.03-.05.05-.07.08-.03.03-.06.07-.1.1-.06.06-.12.12-.18.19-.03.03-.06.05-.08.08-.07.07-.14.14-.22.2-.02.01-.03.03-.05.04,0,0,0,0,0,0,0,0-.01.01-.02.02h0s-.06.05-.09.08c-.03.03-.06.05-.09.08-.03.03-.06.05-.09.08-.06.05-.12.11-.19.16-.03.03-.06.05-.1.08-.03.03-.07.05-.1.08-.1.08-.2.16-.31.23-.03.02-.07.05-.1.07-.04.03-.08.05-.11.08-.03.02-.06.04-.09.06-.02.01-.04.03-.06.04-.03.02-.05.03-.08.05-.08.05-.15.1-.23.15-.03.02-.06.04-.09.06-.01,0-.02.01-.03.02-.04.02-.07.04-.11.07-.04.02-.08.05-.12.07-.12.07-.25.14-.38.21-.03.02-.07.04-.1.05-.04.02-.08.04-.11.06-.03.02-.06.03-.09.05,0,0-.02,0-.03.01,0,0-.01,0-.02,0-.04.02-.09.04-.13.06,0,0,0,0,0,0-.06.03-.11.05-.17.08,0,0-.01,0-.02,0-.05.02-.1.05-.16.07-.04.02-.08.04-.13.05-.03.01-.05.02-.08.03,0,0-.01,0-.02,0-.02,0-.04.02-.05.02,0,0,0,0,0,0-.04.01-.07.03-.11.04-.05.02-.1.04-.15.06-.62.23-1.22.42-1.79.58h0s-.04,0-.05,0c-.27.04-.58.07-.92.1-.11,0-.22.01-.34.02-.08,0-.16,0-.24,0-.04,0-.08,0-.12,0-.12,0-.25,0-.38,0-.05,0-.1,0-.15,0-.07,0-.15,0-.22,0-.07,0-.14,0-.21-.01-.04,0-.09,0-.13,0-.01,0-.02,0-.04,0-.04,0-.09,0-.13,0-.17-.01-.34-.03-.52-.05-1.64-.2-4.02-.48-5.8-2.32-.02-.02-.05-.05-.07-.08-.42-.45-1.71-1.83-1.75-3.97,0-.03,0-.06,0-.09,0-.03,0-.07,0-.1t0,0c0-.07,0-.13,0-.2,0-.04,0-.07,0-.11,0-.03,0-.06,0-.09,0-.04,0-.07.01-.11,0-.03,0-.06.01-.09.02-.12.03-.24.06-.35,0-.02,0-.04.01-.06.06-.27.13-.53.22-.76,0-.02.02-.05.03-.07,0,0,0,0,0,0,.01-.03.02-.05.03-.08.01-.03.02-.06.04-.09,0-.02.02-.04.03-.07.03-.08.07-.15.1-.22.01-.02.02-.05.04-.07.02-.05.05-.09.07-.14.01-.02.02-.04.04-.07.01-.02.02-.04.04-.07,0,0,0,0,0,0,.02-.03.04-.06.05-.09,0-.02.02-.03.03-.05.02-.03.04-.07.06-.1.03-.04.05-.08.08-.12.01-.02.02-.04.03-.05.04-.05.07-.11.11-.16.03-.05.06-.09.1-.13,0-.01.02-.02.03-.03.02-.02.03-.04.05-.07,0,0,0,0,0,0,0-.01.02-.02.02-.03.18-.22.33-.38.41-.46-.02-.08-.04-.2-.07-.35,0-.02,0-.04,0-.07,0-.01,0-.03,0-.04,0-.07-.02-.14-.02-.22,0-.03,0-.05,0-.08,0-.07,0-.13,0-.21,0-.03,0-.06,0-.09,0-.13,0-.28.01-.43,0-.09.02-.18.03-.27,0-.02,0-.05,0-.07,0-.05.01-.1.02-.14.01-.07.03-.15.04-.22,0-.02.01-.05.02-.07.01-.06.03-.13.05-.19.02-.06.04-.13.06-.19,0-.03.02-.05.03-.08.02-.05.04-.1.06-.16.03-.08.06-.16.1-.24.02-.05.05-.11.07-.16.03-.05.05-.11.08-.16.65-1.21,1.63-1.81,2.04-2.03.14-.6.49-1.69,1.42-2.69,1.82-1.95,4.36-1.91,4.79-1.9.48-.47,1.47-1.33,3-1.82,1.46-.47,2.72-.38,3.37-.29.57-.43,1.86-1.28,3.75-1.53.37-.05.72-.07,1.05-.07.37,0,.72.03,1.05.07.04,0,.08.01.13.02.01,0,.02,0,.04,0,.04,0,.07.01.11.02,0,0,.02,0,.03,0Z"/>
+              </g>
+              <g>
+                <path class="cls-20" d="m476.37,291.34c-.08,0-.17-.03-.24-.08-.19-.14-.83-.68-.91-1.61-.1-1.12.71-1.83.81-1.91.17-.14.42-.12.56.05.14.17.12.42-.05.56-.02.02-.59.5-.53,1.23.05.61.5.97.59,1.04.18.13.21.38.08.55-.08.1-.2.16-.32.16Z"/>
+                <path class="cls-20" d="m453.83,296.43c-.99,0-1.94-.25-2.75-.72-1-.58-1.68-1.45-1.93-2.44-.43-1.69.58-3.15.9-3.56.13-.17.39-.2.56-.07.17.13.21.38.07.56-.26.34-1.1,1.55-.76,2.89.37,1.47,2.18,2.82,4.56,2.52.22-.03.42.13.45.34.03.22-.13.42-.35.44-.25.03-.5.05-.75.05Z"/>
+                <path class="cls-20" d="m468.62,284.64c-.2,0-.37-.15-.4-.35-.02-.22.13-.41.35-.44,1.27-.14,2.48-.52,3.61-1.11,1.24-.66,2.35-1.59,3.2-2.7.13-.17.38-.21.56-.07.17.13.21.38.07.56-.93,1.2-2.12,2.21-3.46,2.92-1.21.64-2.52,1.05-3.89,1.2-.02,0-.03,0-.05,0Z"/>
+                <path class="cls-20" d="m462.57,294.39c-.09,0-.18-.02-.26-.08-.17-.14-.2-.38-.07-.56.5-.63,1.1-1.18,1.77-1.61.92-.6,1.99-.99,3.1-1.13.22-.03.42.12.45.34.03.22-.13.42-.34.44-.99.13-1.94.48-2.77,1.01-.6.39-1.13.87-1.58,1.44-.08.1-.19.15-.3.15Z"/>
+                <path class="cls-20" d="m483.87,298.13c-.16,0-.31-.09-.37-.25-.26-.63-.91-1.82-2.25-2.62-.97-.58-1.93-.74-2.56-.77-.22-.01-.39-.2-.38-.42.01-.22.2-.39.42-.38,1.04.05,2.06.36,2.94.88,1.54.92,2.28,2.28,2.58,3,.08.2-.01.43-.22.52-.05.02-.1.03-.15.03Z"/>
+                <path class="cls-20" d="m477.2,301.6c-.08,0-.15-.02-.22-.06-.18-.12-.24-.37-.12-.55,1.14-1.73,1.35-3.24.51-3.85-.54-.4-1.96.25-3.11,1.82-.13.18-.38.21-.56.09-.18-.13-.22-.38-.09-.55,1.38-1.88,3.2-2.73,4.22-1.99,1.22.89,1.1,2.77-.32,4.92-.08.12-.2.18-.33.18Z"/>
+                <path class="cls-20" d="m484.87,292.4c-.66,0-1.23-.35-1.69-1.03-.42-.61-.78-1.52-1.16-2.92-.06-.21.07-.43.28-.49.21-.06.43.07.49.28.66,2.39,1.26,3.37,2.1,3.37.07,0,.13,0,.2-.02.8-.14,1.01-1.12.75-3.62-.02-.22.14-.41.36-.43.22-.02.42.14.44.35.1,1.02.18,2.07.02,2.88-.18.93-.66,1.47-1.43,1.6-.12.02-.23.03-.35.03Z"/>
+                <path class="cls-20" d="m457.87,283.24s0,0,0,0c-.22,0-.4-.18-.4-.4,0-.45.11-1.12.58-1.73.66-.84,1.79-1.25,2.96-1.06.22.04.37.24.33.46-.04.22-.24.36-.46.33-.88-.14-1.72.15-2.2.76-.34.43-.41.92-.42,1.25,0,.22-.18.39-.4.39Z"/>
+                <path class="cls-20" d="m472.73,279.32c-.09,0-.17-.03-.24-.08-.43-.33-1.13-.75-2.09-.89-.65-.1-1.34-.05-1.97.14-.21.06-.43-.06-.5-.27-.06-.21.06-.43.27-.49.75-.22,1.55-.28,2.32-.16,1.12.17,1.96.67,2.46,1.05.17.13.21.38.07.56-.08.1-.2.15-.32.15Z"/>
+                <path class="cls-20" d="m463.1,283.27c-.07,0-.14-.02-.2-.06-.19-.11-.25-.35-.14-.54.03-.05.69-1.13,1.86-1.6,1.4-.56,2.6-.01,2.65,0,.2.09.28.33.19.53-.09.2-.33.28-.53.19-.04-.02-.94-.42-2.01,0-.91.37-1.46,1.26-1.47,1.27-.07.12-.21.19-.34.19Z"/>
+                <path class="cls-20" d="m462.86,289.73c-.82,0-1.61-.35-2.2-.98-.15-.16-.14-.41.02-.56.16-.15.41-.14.56.02.45.49,1.08.75,1.71.72.47-.02.89-.21,1.12-.51.37-.48.34-1.47-.35-2.22-.15-.16-.14-.41.03-.56.16-.15.42-.14.56.03.89.97,1.06,2.36.4,3.24-.37.49-1,.78-1.71.82-.05,0-.09,0-.14,0Z"/>
+              </g>
+              <g>
+                <path class="cls-48" d="m469.63,292.23c-1.09.15-4.82.89-7.24,4.25l-.03.05c-.15.21-.38.53-.63.94-.69,1.12-1.52,2.9-1.26,4.86.23,1.78,1.35,3.5,3.15,4.85.68.51,1.45.96,2.28,1.33,0,0,0,0,0,0-.05,0-.09.02-.14.03-.05.01-.1.02-.15.03-.04,0-.08.01-.11.02,0,0-.02,0-.03,0-.09.02-.18.03-.27.05-.12.02-.23.04-.35.06-.08.01-.17.03-.25.04h0c-2.72-1.5-4.58-3.77-4.92-6.32-.24-1.79.32-3.41.94-4.61.2-.4.42-.75.61-1.04.2-.3.37-.54.49-.71l.03-.05c1.16-1.61,2.72-2.85,4.63-3.68,1.01-.44,2.13-.76,3.15-.9.22-.03.42.12.45.34.03.22-.12.42-.34.45Z"/>
+                <path class="cls-48" d="m475.55,278.14c-.83,1.33-1.83,2.38-3.01,3.12-1.52.96-3.12,1.31-4.67,1.65-1.99.44-3.71.82-4.84,2.4-.26.37-.48.77-.64,1.21-.06.16-.21.26-.38.26-.05,0-.09,0-.14-.02-.21-.07-.31-.3-.24-.51.18-.5.43-.97.74-1.4,1.32-1.83,3.26-2.26,5.32-2.72,1.48-.33,3.01-.66,4.41-1.55.88-.55,1.66-1.29,2.33-2.22.3-.11.68-.2,1.11-.23Z"/>
+                <path class="cls-48" d="m463.02,288.32c-.14,0-.28-.08-.35-.21-.2-.37-.57-.89-1.22-1.27-.66-.38-1.3-.45-1.72-.44-.22,0-.4-.17-.41-.39,0-.22.17-.4.39-.41.53-.01,1.33.07,2.15.55.82.48,1.28,1.12,1.53,1.58.1.19.03.43-.17.54-.06.03-.12.05-.19.05Z"/>
+                <path class="cls-48" d="m467.61,276.74c-.69.07-1.84.32-2.9,1.18-.46.38-.81.79-1.08,1.21-.15.24-.28.48-.39.71-.31.68-.42,1.29-.46,1.63-.02.2-.2.35-.4.35-.02,0-.03,0-.05,0-.22-.03-.38-.22-.35-.44.04-.37.16-1.01.47-1.74-1.76-.35-3.47.02-4.61,1.08-.22.21-.41.43-.57.66-.17.25-.31.51-.43.77-.23,0-.53,0-.87.04-.86.1-1.97.43-2.9,1.35-1.21,1.2-1.39,2.69-1.41,3.28v.22s-.2.11-.2.11c-.64.36-1.83,1.19-2.56,2.71-.22.46-.9,2.07-.5,3.63.08.31.2.61.35.89.64,1.19,1.9,2.14,3.48,2.68.9.31,1.91.48,2.97.49.22,0,.4.18.4.4,0,.01,0,.03,0,.04-.02.2-.19.35-.4.35h0c-1.83-.01-3.54-.47-4.93-1.33-1.37-.85-2.31-2.03-2.64-3.32-.45-1.76.24-3.5.55-4.16.75-1.58,1.95-2.5,2.7-2.95.06-.78.35-2.32,1.63-3.59,1.26-1.26,2.79-1.57,3.83-1.62,0,0,0,0,.01,0,0,0,0-.01.01-.02.23-.41.54-.82.94-1.19,1.39-1.29,3.45-1.71,5.53-1.23.32-.55.77-1.1,1.37-1.6.45-.37.92-.64,1.36-.84.37,0,.72.03,1.05.07.04,0,.08.01.13.02.01,0,.02,0,.04,0,.04,0,.07.01.11.02,0,0,.02,0,.03,0,.25.04.48.1.7.15Z"/>
+                <path class="cls-48" d="m485.78,284.44c-.45.67-.86,1.56-1,2.67-.18,1.39.16,2.54.47,3.27.09.2,0,.43-.21.52-.05.02-.1.03-.16.03-.15,0-.3-.09-.37-.24-.35-.81-.73-2.11-.53-3.68.19-1.52.85-2.68,1.46-3.47l.33.9Z"/>
+                <path class="cls-48" d="m448.07,288.47c-.22.48-.53.89-.9,1.24-.6.55-1.28.84-1.88.98.18-.22.33-.38.41-.46-.02-.08-.04-.2-.07-.35,0-.02,0-.04,0-.07,0-.01,0-.03,0-.04.34-.13.69-.33,1.01-.63.3-.28.54-.61.72-.99.09-.2.33-.28.53-.19.2.09.29.33.19.53Z"/>
+                <path class="cls-48" d="m468.51,304.69s-.09,0-.14-.03c-.21-.08-.31-.31-.23-.51.45-1.18,1.12-2,1.99-2.43.68-.34,1.28-.35,1.76-.36.1,0,.19,0,.28,0,1.36-.08,2.78-1.07,4.21-2.94.13-.17.38-.21.56-.08.18.13.21.38.08.56-1.58,2.07-3.2,3.16-4.8,3.25-.1,0-.2,0-.31,0-.42,0-.9.02-1.41.28-.69.34-1.23,1.02-1.6,2.01-.06.16-.21.26-.37.26Z"/>
+                <path class="cls-48" d="m473.71,301.19c-.23,0-.47-.03-.73-.1-.38-.11-.74-.31-1.04-.57-.16-.15-.18-.4-.03-.56.15-.16.4-.18.56-.03.21.19.46.33.73.4.53.15,1,.03,1.24-.06.21-.08.44.02.52.22s-.02.43-.23.51c-.22.08-.58.19-1.02.19Z"/>
+                <path class="cls-48" d="m473.59,295.62c-.23,0-.47-.03-.73-.1-.38-.11-.74-.31-1.04-.57-.16-.15-.18-.4-.03-.56.15-.16.4-.18.56-.03.21.19.46.33.73.4.53.15,1,.03,1.24-.06.21-.08.44.02.52.22.08.2-.02.43-.23.51-.22.08-.58.19-1.02.19Z"/>
+                <path class="cls-48" d="m462.63,296.01c-.11,0-.22-.05-.3-.14-.14-.17-.13-.42.04-.56.41-.35,1.53-1.16,3.12-1.07,1.29.07,2.2.7,2.62,1.06.17.14.18.39.04.56-.14.17-.4.18-.56.04-.35-.3-1.09-.81-2.14-.87-1.3-.07-2.22.59-2.55.88-.08.06-.17.1-.26.1Z"/>
+                <path class="cls-48" d="m485.99,303.3c-.79,0-1.58-.13-2.35-.39-.21-.07-.32-.3-.25-.5.07-.21.3-.32.51-.25.82.28,1.66.39,2.51.33,1.64-.11,2.87-.81,3.61-1.39.17-.13.42-.1.56.07.14.17.1.42-.07.56-.83.64-2.21,1.43-4.05,1.55-.16.01-.31.02-.47.02Z"/>
+                <path class="cls-48" d="m486.01,298.44c-.15,0-.29-.08-.36-.22-1.1-2.24-2.55-3.83-4.32-4.72-.89-.44-1.61-.6-2.37-.76-.79-.17-1.61-.34-2.58-.86-1.89-1.01-3.38-2.81-4.43-5.35-.08-.2.01-.43.22-.52.2-.08.44.01.52.22.97,2.36,2.34,4.03,4.07,4.95.87.47,1.6.62,2.37.78.78.16,1.58.33,2.56.83,1.93.97,3.51,2.68,4.68,5.08.1.2.01.43-.19.53-.06.03-.12.04-.17.04Z"/>
+                <path class="cls-48" d="m474.37,289.9s-.01,0-.02,0c-.22,0-.39-.19-.38-.41.01-.28.06-.56.13-.83.12-.45.33-.86.62-1.24.13-.17.38-.21.56-.08.18.13.21.38.08.56-.23.3-.39.62-.49.97-.06.21-.09.43-.1.65,0,.21-.19.38-.4.38Z"/>
+                <path class="cls-48" d="m482.29,293.83c-.16,0-.31-.09-.37-.25-.1-.26-.18-.53-.22-.81-.07-.46-.05-.92.06-1.38.05-.21.26-.35.48-.3.21.05.35.26.3.48-.08.36-.1.73-.05,1.09.03.22.09.43.17.63.08.2-.02.43-.22.51-.05.02-.1.03-.15.03Z"/>
+                <path class="cls-48" d="m467.96,301.68c-.16,0-.31-.09-.37-.25-.1-.26-.18-.53-.22-.81-.07-.46-.05-.92.06-1.38.05-.21.26-.35.48-.3.21.05.35.26.3.48-.08.36-.1.73-.05,1.09.03.22.09.43.17.63.08.2-.02.43-.22.51-.05.02-.1.03-.15.03Z"/>
+                <path class="cls-48" d="m474.22,291.63c-.31,0-.63-.04-.94-.12-.21-.06-.34-.27-.29-.48.06-.21.27-.34.49-.28.36.09.73.12,1.09.07.22-.03.43-.08.64-.15.21-.08.44.03.51.23.08.21-.03.43-.24.51-.26.1-.54.16-.82.2-.15.02-.3.03-.45.03Z"/>
+                <path class="cls-48" d="m458.7,291.29c-1.47,0-2.92-.3-4.25-.89-2.79-1.24-4.29-3.38-4.94-4.56-.11-.19-.03-.43.16-.54.19-.11.44-.03.54.16.6,1.08,1.98,3.07,4.56,4.21,1.82.8,3.53.88,4.64.79.22-.02.41.15.43.37.02.22-.15.41-.37.42-.26.02-.52.03-.78.03Z"/>
+                <path class="cls-48" d="m461.7,292.17s0,0,0,0c-.15,0-1.46-.04-2.17-1.18-.48-.77-.37-1.56-.3-1.87.05-.21.26-.35.48-.3.22.05.35.26.3.47-.05.21-.12.75.2,1.28.49.79,1.46.8,1.5.8.22,0,.4.18.4.4,0,.22-.18.39-.4.39Z"/>
+                <path class="cls-48" d="m453.45,289.28c-.17,0-.32-.11-.38-.27-.07-.21.05-.43.26-.5,1.99-.65,3.32-1.94,3.48-3.39.04-.4,0-.82-.15-1.24-.07-.21.04-.43.25-.5.21-.07.44.04.51.25.18.53.24,1.06.19,1.57-.19,1.76-1.73,3.31-4.02,4.06-.04.01-.08.02-.12.02Z"/>
+                <path class="cls-48" d="m461.96,296.3c-.12,0-.24-.05-.31-.15-.29-.37-.64-.67-1.04-.9-1.62-.92-3.76-.4-5.26.19-.2.08-.44-.02-.52-.22-.08-.2.02-.43.22-.51,1.67-.66,4.05-1.22,5.95-.14.48.27.91.64,1.27,1.09.14.17.11.42-.07.56-.07.06-.16.08-.25.08Z"/>
+                <path class="cls-48" d="m484.53,286.71c-.13,0-.26-.06-.33-.18-.01-.02-1.35-1.96-4.43-2.82-2.6-.73-5.09,0-5.12,0-.21.06-.43-.06-.5-.27-.06-.21.06-.43.27-.49.11-.03,2.74-.8,5.56,0,3.37.94,4.82,3.06,4.88,3.15.12.18.07.43-.11.55-.07.04-.14.07-.22.07Z"/>
+                <path class="cls-48" d="m487.63,303.12c-.08,0-.17-.03-.24-.08-.18-.13-.21-.38-.08-.55.44-.59.94-1.53.77-2.69-.09-.61-.35-1.21-.77-1.76-.13-.17-.1-.42.08-.56.18-.13.43-.1.56.08.51.66.82,1.38.92,2.13.16,1.11-.17,2.28-.92,3.28-.08.1-.2.16-.32.16Z"/>
+                <path class="cls-48" d="m466.12,300.19c-.18,0-.35-.12-.39-.31-.05-.21.09-.43.3-.47,2.51-.57,4.88-1.72,6.86-3.32,1.55-1.26,2.85-2.78,3.86-4.51.11-.19.35-.25.55-.14.19.11.26.35.15.54-1.06,1.82-2.42,3.41-4.04,4.73-2.07,1.68-4.55,2.88-7.18,3.48-.03,0-.06.01-.09.01Z"/>
+                <path class="cls-48" d="m470.52,307.92c-.16,0-.31-.09-.37-.25-.08-.2.02-.43.22-.52.84-.34,1.72-.54,2.6-.61.99-.07,1.73.05,2.52.18.15.02.3.05.46.07,1.31.2,2.69.31,4.09.32.22,0,.4.18.4.4,0,.22-.18.39-.4.39h0c-1.44,0-2.85-.12-4.21-.33-.16-.02-.32-.05-.47-.08-.77-.13-1.44-.24-2.33-.17-.8.06-1.59.25-2.36.55-.05.02-.1.03-.15.03Z"/>
+                <path class="cls-48" d="m455.01,300.69c-.27.04-.58.07-.92.1-.11,0-.22.01-.34.02-.08,0-.16,0-.24,0-.04,0-.08,0-.12,0-.12,0-.25,0-.38,0-.05,0-.1,0-.15,0-.07,0-.15,0-.22,0-.07,0-.14,0-.21-.01-.04,0-.09,0-.13,0-.01,0-.02,0-.04,0-.04,0-.09,0-.13,0-.17-.01-.34-.03-.52-.05-1.64-.2-4.02-.48-5.8-2.32.01-.05.03-.11.07-.16.13-.18.38-.22.56-.09.89.64,1.87,1.14,2.9,1.48,1.68.56,3.52.7,5.32.4.22-.04.42.11.46.33.02.12-.02.24-.09.32Z"/>
+              </g>
+            </g>
+            <g>
+              <circle class="cls-1" cx="450.77" cy="278.71" r="2.03"/>
+              <rect class="cls-1" x="444.63" y="267.03" width=".9" height="13.96" transform="translate(-47.8 447.92) rotate(-51.05)"/>
+            </g>
+            <g>
+              <circle class="cls-1" cx="444" cy="308.49" r="2.03" transform="translate(-87.55 209.74) rotate(-24.27)"/>
+              <rect class="cls-1" x="418.36" y="317.54" width="28.72" height=".9" transform="translate(-102.84 357.26) rotate(-40.5)"/>
+            </g>
+            <g>
+              <circle class="cls-1" cx="491.73" cy="308.34" r="2.03" transform="translate(58.7 694.81) rotate(-73.84)"/>
+              <rect class="cls-1" x="510.08" y="295.56" width=".9" height="39.25" transform="translate(42.44 690.51) rotate(-70.41)"/>
+            </g>
+          </g>
+          <g>
+            <g>
+              <g>
+                <path class="cls-4" d="m558.92,41.42s-.03-8.59-.03-8.59l-3.23-1.47c-7-3.18-31.95-13.5-59.34-13.5s-52.33,10.33-59.33,13.5l-3.25,1.46-.05,16.52c0,26.91,1.16,54.84,15.04,75.1,15.1,22.01,36.44,35.26,44.92,39.93l2.67,1.47,2.66-1.47c8.49-4.67,29.84-17.92,44.91-39.93,13.9-20.27,15.06-48.19,15.06-75.09l-.03-7.93Z"/>
+                <path class="cls-27" d="m439.26,36.38c-.01,1.91-.05,12.98-.05,12.98,0,26.01,1.08,53.01,14.08,71.94,14.63,21.36,35.72,34.2,43.01,38.24,7.29-4.03,28.38-16.88,43.01-38.24,13-18.94,14.08-45.93,14.08-71.95v-7.92s-.03-3.04-.03-5.05c-6.31-2.84-30.62-13-57.07-13s-50.76,10.16-57.05,13Z"/>
+              </g>
+              <path class="cls-28" d="m553.38,36.38c-6.31-2.84-30.62-13-57.07-13-.21,0-.42.02-.65.02v135.77c.21.11.46.25.65.37,7.29-4.03,28.38-16.88,43.01-38.24,13-18.94,14.08-45.93,14.08-71.95v-7.92s-.03-3.04-.03-5.05Z"/>
+            </g>
+            <g>
+              <path class="cls-62" d="m523.29,82.72c0,14.9-12.08,27-26.96,27s-26.98-12.1-26.98-27,12.07-26.97,26.98-26.97,26.96,12.1,26.96,26.97Z"/>
+              <polygon class="cls-27" points="512.89 78.2 500.85 78.2 500.85 66.13 491.81 66.13 491.81 78.2 479.74 78.2 479.74 87.23 491.81 87.23 491.81 99.3 500.85 99.3 500.85 87.23 512.89 87.23 512.89 78.2"/>
+            </g>
+          </g>
+          <g>
+            <path class="cls-14" d="m176.95,449.72l-8.69,20.63c-.18.42-.14.87.12,1.25.25.38.65.59,1.11.59h59.48l-11.15-19.64s-30.52-6.74-40.86-2.84Z"/>
+            <path class="cls-6" d="m212.52,452.94l-7.32,17.41c-.18.42-.14.87.12,1.25.25.38.65.59,1.11.59h57.2c.49,0,.9-.24,1.15-.66.24-.42.25-.9,0-1.32l-10.03-17.65s-31.88-3.52-42.23.38Z"/>
+            <path class="cls-24" d="m178.05,327.34h34.9c1.38,0,2.51,1.12,2.51,2.51v120.59c0,1.38-1.12,2.51-2.51,2.51h-34.9c-1.38,0-2.51-1.12-2.51-2.51v-120.59c0-1.38,1.12-2.51,2.51-2.51Z"/>
+            <path class="cls-11" d="m178.05,452.94h34.9c1.38,0,2.51-1.13,2.51-2.51v-58.68h-16.88v-45.67h-23.03v104.35c0,1.38,1.13,2.51,2.51,2.51Z"/>
+            <rect class="cls-4" x="209.6" y="327.34" width="46.65" height="125.6" rx="2.93" ry="2.93"/>
+            <path class="cls-9" d="m212.52,452.94h40.79c1.61,0,2.93-1.32,2.93-2.93v-58.26h-46.65v58.26c0,1.61,1.32,2.93,2.93,2.93Z"/>
+            <polygon class="cls-7" points="223.75 327.73 267.27 327.73 264.16 306.65 217.57 306.65 223.75 327.73"/>
+            <path class="cls-8" d="m227.76,327.73h.67l-.94-6.38h3.68l.94,6.38h.67l-.94-6.38h3.68l.94,6.38h.67l-.94-6.38h3.68l.94,6.38h.67l-.94-6.38h3.68l.94,6.38h.67l-.94-6.38h3.68l.94,6.38h.67l-.94-6.38h3.68l.94,6.38h.67l-.94-6.38h3.68l.94,6.38h.67l-.94-6.38h3.68l.94,6.38h.67l-.94-6.38h4.02l-.1-.66h-4.02l-.43-2.93h4.02l-.1-.66h-4.02l-.43-2.93h4.02l-.1-.66h-4.02l-.43-2.93h4.02l-.1-.66h-4.02l-.48-3.26h-.67l.48,3.26h-3.68l-.48-3.26h-.67l.48,3.26h-3.68l-.48-3.26h-.67l.48,3.26h-3.68l-.48-3.26h-.67l.48,3.26h-3.68l-.48-3.26h-.67l.48,3.26h-3.68l-.48-3.26h-.67l.48,3.26h-3.68l-.48-3.26h-.67l.48,3.26h-3.68l-.48-3.26h-.67l.48,3.26h-3.68l-.48-3.26h-.67l.48,3.26h-6.61l.19.66h6.52l.43,2.93h-6.09l.19.66h5.99l.43,2.93h-5.57l.19.66h5.47l.43,2.93h-5.04l.19.66h4.95l.94,6.38h0Zm33.78-7.05h-3.68l-.43-2.93h3.68l.43,2.93h0Zm-.53-3.59h-3.68l-.43-2.93h3.68l.43,2.93h0Zm-.53-3.59h-3.68l-.43-2.93h3.68l.43,2.93h0Zm-4.78-2.93l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm26.65,3.59l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm26.65,3.59l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Zm-4.35,0l.43,2.93h-3.68l-.43-2.93h3.68Z"/>
+            <polygon class="cls-12" points="223.75 327.73 267.27 327.73 266.81 324.61 222.83 324.61 223.75 327.73"/>
+            <polygon class="cls-12" points="180.81 327.73 186.56 327.73 190.25 299.14 176.78 300.4 180.81 327.73"/>
+            <polygon class="cls-9" points="186.56 327.73 223.75 327.73 219.71 300.4 182.53 300.4 186.56 327.73"/>
+            <g>
+              <g>
+                <polygon class="cls-13" points="189.58 324.44 196.53 324.44 193.47 303.7 186.52 303.7 189.58 324.44"/>
+                <path class="cls-32" d="m189.58,324.77h6.94c.1,0,.19-.04.25-.11.06-.07.09-.17.08-.27l-3.06-20.74c-.02-.16-.16-.28-.33-.28h-6.94c-.1,0-.19.04-.25.11-.06.07-.09.17-.08.27l3.06,20.74c.02.16.16.28.33.28Zm6.56-.66h-6.27l-2.96-20.07h6.27l2.96,20.07Z"/>
+              </g>
+              <path class="cls-32" d="m193.06,324.77s.03,0,.05,0c.18-.03.31-.2.28-.38l-.45-3.08h3.09c.18,0,.33-.15.33-.33s-.15-.33-.33-.33h-3.19l-.41-2.79h3.09c.18,0,.33-.15.33-.33s-.15-.33-.33-.33h-3.19l-.41-2.79h3.09c.18,0,.33-.15.33-.33s-.15-.33-.33-.33h-3.19l-.41-2.79h3.09c.18,0,.33-.15.33-.33s-.15-.33-.33-.33h-3.19l-.41-2.79h3.09c.18,0,.33-.15.33-.33s-.15-.33-.33-.33h-3.19l-.47-3.17c-.03-.18-.19-.3-.38-.28-.18.03-.31.2-.28.38l.45,3.08h-3.09c-.18,0-.33.15-.33.33s.15.33.33.33h3.19l.41,2.79h-3.09c-.18,0-.33.15-.33.33s.15.33.33.33h3.19l.41,2.79h-3.09c-.18,0-.33.15-.33.33s.15.33.33.33h3.19l.41,2.79h-3.09c-.18,0-.33.15-.33.33s.15.33.33.33h3.19l.41,2.79h-3.09c-.18,0-.33.15-.33.33s.15.33.33.33h3.19l.47,3.17c.02.16.17.28.33.28Z"/>
+            </g>
+            <path class="cls-10" d="m151.14,243.34c.91,0,1.82,0,2.74,0,5.49,19.14,8.36,39.19,8.65,60.12h-2.74c-2.88-20.04-5.76-40.08-8.65-60.12Z"/>
+            <polygon class="cls-7" points="153.87 243.34 222.43 243.34 231.07 303.46 162.52 303.46 153.87 243.34"/>
+            <polygon class="cls-11" points="159.31 248.03 166.61 298.77 225.64 298.77 218.34 248.03 159.31 248.03"/>
+            <path class="cls-5" d="m163.61,277.93l3,20.84h19.77s-22.77-20.84-22.77-20.84h0Zm60.05,20.84l-52.8-50.74h0s6.72,0,6.72,0l47.23,44.95h0l.83,5.79h-1.98Zm-3.01-34.65l-2.31-16.09h-13.43s0,0,0,0l15.75,16.09h0Z"/>
+            <path class="cls-10" d="m203.58,318.41c-2.27,0-4.11-1.75-4.11-3.9s1.85-3.9,4.11-3.9,4.11,1.75,4.11,3.9-1.85,3.9-4.11,3.9Z"/>
+            <path class="cls-7" d="m209.69,311.19h7.27l-4.51-5.92-2.76,5.92h0Zm8.34,7.22h-7.27l4.51,5.92,2.76-5.92Z"/>
+            <path class="cls-12" d="m235.56,335.24c4.73,0,6.86,7.07,6.93,15.88v.84c-.07,8.81-2.2,15.88-6.93,15.88s-6.86-7.07-6.93-15.88v-.84c.07-8.81,2.2-15.88,6.93-15.88Z"/>
+            <path class="cls-13" d="m235.94,376.79c.1-1.46,1.36-2.57,2.82-2.47,1.46.1,2.57,1.36,2.47,2.82,0,.08-2.02,29.05,1.38,41.99,2.53,9.63,11.47,9.48,13.19,6.76.16-.22.26-.5.28-.82.23-3.18.1-6.78.16-10,7.81,5.39,6.85,17.62-4.15,17.85-6.64.14-12.56-4.65-14.61-12.44-3.63-13.8-1.55-43.61-1.55-43.69Z"/>
+            <path class="cls-8" d="m228.68,349.14c1.21-.88,3.56-2.14,6.68-1.75,4.68.59,7.56,2.68,7.56,11.91v17.57c0,4.73-8.69,5.95-8.69-.1s1.37-12.98-.49-15.81c-1.4-2.13-3.18-1.91-4.68-2.84-.28-1.89-.42-3.97-.44-6.16v-.84c0-.67.02-1.33.05-1.98Z"/>
+            <path class="cls-13" d="m242.84,356.76c.06.78.08,1.63.08,2.54v17.57c0,.93-.34,1.73-.88,2.36-2.15-.43-4.35-1.13-4.92-2.27.98,0,1.07-2.1,1.07-4.54v-13.91c0-3.06,3.01-5.17,4.65-1.76Z"/>
+            <path class="cls-10" d="m242.92,376.96c-.12,4.6-8.49,5.79-8.68,0h8.68Z"/>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

src/assets/icons/svg/login-logo.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="_图层_2" data-name="图层 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 454.72 126.1">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #0093dd;
+      }
+
+      .cls-2 {
+        fill: #5b5b5b;
+      }
+    </style>
+  </defs>
+  <g id="_图层_1-2" data-name="图层 1">
+    <g>
+      <path class="cls-1" d="m162.51,68.1h14.37c5.59,0,9.79,4.03,8.73,8.37l-1.38,5.61h-44.66c-2.41,0-4.3-.44-5.66-1.32-1.36-.82-1.84-2.17-1.42-4.06L148.68,6.71c.52-1.95,1.97-3.56,4.32-4.82,2.36-1.26,5.16-1.89,8.41-1.89h16.82l-15.72,68.1Z"/>
+      <path class="cls-1" d="m204.2,25.41c.52-1.76,1.86-3.21,4.01-4.34,2.15-1.13,4.69-1.7,7.62-1.7h15.88l-11.32,49.4c-.94,3.97-3.83,7.19-8.64,9.68-4.82,2.49-10.43,3.73-16.82,3.73h-3.61l12.89-56.77ZM219.29.38h17.6l-2.04,8.78c-.42,1.26-1.36,2.28-2.83,3.07-1.47.79-3.2,1.18-5.19,1.18h-19.02l1.89-8.12c.31-1.45,1.39-2.63,3.22-3.54,1.83-.91,3.95-1.37,6.36-1.37Z"/>
+      <path class="cls-1" d="m262.55,68.1h14.37c5.59,0,9.79,4.03,8.73,8.37l-1.38,5.61h-44.66c-2.41,0-4.3-.44-5.66-1.32-1.36-.82-1.84-2.17-1.42-4.06L248.72,6.71c.52-1.95,1.97-3.56,4.32-4.82,2.36-1.26,5.16-1.89,8.41-1.89h16.82l-15.72,68.1Z"/>
+      <path class="cls-1" d="m304.25,25.41c.52-1.76,1.86-3.21,4.01-4.34,2.15-1.13,4.69-1.7,7.62-1.7h15.88l-11.32,49.4c-.94,3.97-3.83,7.19-8.64,9.68-4.82,2.49-10.43,3.73-16.82,3.73h-3.61l12.89-56.77ZM319.33.38h17.6l-2.04,8.78c-.42,1.26-1.36,2.28-2.83,3.07-1.47.79-3.2,1.18-5.19,1.18h-19.02l1.89-8.12c.31-1.45,1.39-2.63,3.22-3.54,1.83-.91,3.95-1.37,6.36-1.37Z"/>
+      <g>
+        <path class="cls-2" d="m0,101.17h2.51v19.36H0v-19.36Z"/>
+        <path class="cls-2" d="m28.37,110.12v10.4h-2.4v-9.54c0-2.31-.64-3.65-2.9-3.65-1.76,0-3.26.5-3.91,2.65v10.54h-2.4v-9.54c0-2.31-.56-3.65-2.76-3.65-1.87,0-3.24.42-3.99,2.73v10.46h-2.4v-15.06h2.4v1.98c.92-1.79,2.54-2.26,4.35-2.26,2.37,0,3.74.95,4.38,2.45.89-1.95,2.84-2.45,4.69-2.45,3.51,0,4.94,2.04,4.94,4.94Z"/>
+        <path class="cls-2" d="m45.28,109.84v10.68h-2.04l-.36-2.29c-.86,1.65-3.12,2.57-5.38,2.57-3.6,0-5.19-1.65-5.19-4.49,0-3.57,2.37-4.8,5.97-4.8h4.6v-1.26c0-1.81-.64-3.07-3.71-3.07-1,0-2.23.11-3.32.33v-2.12c1.12-.14,2.34-.22,3.43-.22,4.74,0,6,1.95,6,4.66Zm-2.4,6.08v-2.48h-4.43c-2.48,0-3.65.5-3.65,2.85,0,1.65.81,2.51,2.93,2.51,2.51,0,4.38-1.09,5.16-2.87Z"/>
+        <path class="cls-2" d="m63.05,105.46v14c0,4.16-2.26,6.64-7.36,6.64-1.28,0-2.71-.17-3.65-.36v-2.04c1.14.22,2.4.33,3.68.33,3.35,0,4.94-1.37,4.94-4.83v-1.51c-.61,1.76-1.98,2.82-4.88,2.82-5.02,0-6.25-3.07-6.25-7.67,0-4.16,1.23-7.67,6.25-7.67,3.04,0,4.29,1.31,4.88,3.1v-2.82h2.4Zm-2.32,7.39c0-3.46-1-5.66-4.63-5.66s-4.02,2.73-4.02,5.66c0,3.15.47,5.66,4.02,5.66s4.63-2.06,4.63-5.66Z"/>
+        <path class="cls-2" d="m67.9,101.28c0-1.26.39-1.42,1.45-1.42,1,0,1.42.17,1.42,1.42s-.42,1.42-1.42,1.42c-1.06,0-1.45-.2-1.45-1.42Zm.22,4.18h2.4v15.06h-2.4v-15.06Z"/>
+        <path class="cls-2" d="m87.87,110.09v10.43h-2.43v-9.54c0-2.31-.47-3.65-2.87-3.65-1.9,0-3.74.36-4.57,3.01v10.18h-2.4v-15.06h2.4v2.15c.92-1.92,2.98-2.43,4.83-2.43,3.93,0,5.05,2.04,5.05,4.91Z"/>
+        <path class="cls-2" d="m105.5,105.46v14c0,4.16-2.26,6.64-7.36,6.64-1.28,0-2.71-.17-3.65-.36v-2.04c1.14.22,2.4.33,3.68.33,3.35,0,4.94-1.37,4.94-4.83v-1.51c-.61,1.76-1.98,2.82-4.88,2.82-5.02,0-6.25-3.07-6.25-7.67,0-4.16,1.23-7.67,6.25-7.67,3.04,0,4.29,1.31,4.88,3.1v-2.82h2.4Zm-2.32,7.39c0-3.46-1-5.66-4.63-5.66s-4.02,2.73-4.02,5.66c0,3.15.47,5.66,4.02,5.66s4.63-2.06,4.63-5.66Z"/>
+        <path class="cls-2" d="m129.47,103.4h-5.63v17.13h-2.51v-17.13h-5.66v-2.23h13.81v2.23Z"/>
+        <path class="cls-2" d="m138.31,105.18l-.08,2.18h-.33c-1.92,0-3.82.64-4.66,3.32v9.85h-2.4v-15.06h2.4v2.73c.95-2.51,2.98-3.01,4.8-3.01h.28Z"/>
+        <path class="cls-2" d="m141.19,101.28c0-1.26.39-1.42,1.45-1.42,1,0,1.42.17,1.42,1.42s-.42,1.42-1.42,1.42c-1.06,0-1.45-.2-1.45-1.42Zm.22,4.18h2.4v15.06h-2.4v-15.06Z"/>
+        <path class="cls-2" d="m160.85,109.84v10.68h-2.04l-.36-2.29c-.86,1.65-3.12,2.57-5.38,2.57-3.6,0-5.19-1.65-5.19-4.49,0-3.57,2.37-4.8,5.97-4.8h4.6v-1.26c0-1.81-.64-3.07-3.71-3.07-1,0-2.23.11-3.32.33v-2.12c1.12-.14,2.34-.22,3.43-.22,4.74,0,6,1.95,6,4.66Zm-2.4,6.08v-2.48h-4.43c-2.48,0-3.65.5-3.65,2.85,0,1.65.81,2.51,2.93,2.51,2.51,0,4.38-1.09,5.16-2.87Z"/>
+        <path class="cls-2" d="m165.96,117.48v-18.16h2.4v17.54c0,1.51.42,1.81,1.39,1.81.33,0,.75-.03,1.14-.14v1.98c-.45.11-.92.17-1.59.17-2.23,0-3.35-.95-3.35-3.21Z"/>
+        <path class="cls-2" d="m181.13,101.17h4.02l4.94,12.47h.17l4.94-12.47h3.96v19.36h-2.51v-16.82h-.17l-4.96,12.44h-2.73l-5.02-12.44h-.17v16.82h-2.45v-19.36Z"/>
+        <path class="cls-2" d="m216.23,109.84v10.68h-2.04l-.36-2.29c-.86,1.65-3.12,2.57-5.38,2.57-3.6,0-5.19-1.65-5.19-4.49,0-3.57,2.37-4.8,5.97-4.8h4.6v-1.26c0-1.81-.64-3.07-3.71-3.07-1,0-2.23.11-3.32.33v-2.12c1.12-.14,2.34-.22,3.43-.22,4.74,0,6,1.95,6,4.66Zm-2.4,6.08v-2.48h-4.43c-2.48,0-3.65.5-3.65,2.85,0,1.65.81,2.51,2.93,2.51,2.51,0,4.38-1.09,5.16-2.87Z"/>
+        <path class="cls-2" d="m233.61,110.09v10.43h-2.43v-9.54c0-2.31-.47-3.65-2.87-3.65-1.9,0-3.74.36-4.57,3.01v10.18h-2.4v-15.06h2.4v2.15c.92-1.92,2.98-2.43,4.83-2.43,3.93,0,5.05,2.04,5.05,4.91Z"/>
+        <path class="cls-2" d="m250.54,109.84v10.68h-2.04l-.36-2.29c-.86,1.65-3.12,2.57-5.38,2.57-3.6,0-5.19-1.65-5.19-4.49,0-3.57,2.37-4.8,5.97-4.8h4.6v-1.26c0-1.81-.64-3.07-3.71-3.07-1,0-2.23.11-3.32.33v-2.12c1.12-.14,2.34-.22,3.43-.22,4.74,0,6,1.95,6,4.66Zm-2.4,6.08v-2.48h-4.43c-2.48,0-3.65.5-3.65,2.85,0,1.65.81,2.51,2.93,2.51,2.51,0,4.38-1.09,5.16-2.87Z"/>
+        <path class="cls-2" d="m268.31,105.46v14c0,4.16-2.26,6.64-7.36,6.64-1.28,0-2.71-.17-3.65-.36v-2.04c1.14.22,2.4.33,3.68.33,3.35,0,4.94-1.37,4.94-4.83v-1.51c-.61,1.76-1.98,2.82-4.88,2.82-5.02,0-6.25-3.07-6.25-7.67,0-4.16,1.23-7.67,6.25-7.67,3.04,0,4.29,1.31,4.88,3.1v-2.82h2.4Zm-2.32,7.39c0-3.46-1-5.66-4.63-5.66s-4.02,2.73-4.02,5.66c0,3.15.47,5.66,4.02,5.66s4.63-2.06,4.63-5.66Z"/>
+        <path class="cls-2" d="m285.22,113.24l-10.21.64c.03,3.29,1.17,4.8,4.83,4.8,1.65,0,3.57-.42,4.71-.98v2.2c-.86.45-2.93.89-5.08.89-4.44,0-6.97-1.81-6.97-7.81s2.54-7.81,6.83-7.81c5.13,0,6.02,3.38,6.02,6.3,0,.42-.06,1.06-.14,1.76Zm-2.23-1.73c0-2.32-.39-4.35-3.65-4.35-3.46,0-4.24,1.87-4.32,4.94l7.98-.59Z"/>
+        <path class="cls-2" d="m310.27,110.12v10.4h-2.4v-9.54c0-2.31-.64-3.65-2.9-3.65-1.76,0-3.26.5-3.91,2.65v10.54h-2.4v-9.54c0-2.31-.56-3.65-2.76-3.65-1.87,0-3.24.42-3.99,2.73v10.46h-2.4v-15.06h2.4v1.98c.92-1.79,2.54-2.26,4.35-2.26,2.37,0,3.74.95,4.38,2.45.89-1.95,2.84-2.45,4.69-2.45,3.51,0,4.94,2.04,4.94,4.94Z"/>
+        <path class="cls-2" d="m327.03,113.24l-10.21.64c.03,3.29,1.17,4.8,4.83,4.8,1.65,0,3.57-.42,4.71-.98v2.2c-.86.45-2.93.89-5.08.89-4.44,0-6.97-1.81-6.97-7.81s2.54-7.81,6.83-7.81c5.13,0,6.03,3.38,6.03,6.3,0,.42-.06,1.06-.14,1.76Zm-2.23-1.73c0-2.32-.39-4.35-3.65-4.35-3.46,0-4.24,1.87-4.32,4.94l7.98-.59Z"/>
+        <path class="cls-2" d="m343.6,110.09v10.43h-2.43v-9.54c0-2.31-.47-3.65-2.87-3.65-1.9,0-3.74.36-4.57,3.01v10.18h-2.4v-15.06h2.4v2.15c.92-1.92,2.98-2.43,4.83-2.43,3.93,0,5.05,2.04,5.05,4.91Z"/>
+        <path class="cls-2" d="m354.9,118.52v2.04c-.59.08-1.06.14-1.7.14-3.32,0-4.52-.81-4.52-4.77v-8.45h-2.23v-2.01h2.23v-3.57h2.4v3.57h3.74v2.01h-3.74v8.31c0,2.34.33,2.9,2.18,2.9.67,0,1.12-.06,1.65-.17Z"/>
+        <path class="cls-2" d="m364.19,120.05v-2.32c1.14.42,3.46.86,5.75.86,2.9,0,4.41-.86,4.41-3.26s-.84-3.01-4.46-3.88c-3.96-.95-5.41-1.92-5.41-5.36s2.06-5.24,6.44-5.24c1.87,0,3.93.33,4.85.7v2.29c-1.12-.42-3.07-.78-4.83-.78-2.71,0-3.99.53-3.99,3.04,0,1.81.47,2.45,3.96,3.26,4.32,1,5.88,2.15,5.88,5.94s-2.4,5.49-6.86,5.49c-2.4,0-4.8-.42-5.75-.75Z"/>
+        <path class="cls-2" d="m379.71,124.04c2.62,0,3.68-1.12,4.43-3.54l-6.02-15.03h2.59l4.6,12.5h.17l4.35-12.5h2.43l-5.41,14.56c-1.42,3.77-2.71,6.08-7.14,6.08v-2.06Z"/>
+        <path class="cls-2" d="m394.18,120.22v-2.06c1.06.31,2.98.59,4.35.59,2.29,0,3.49-.56,3.49-2.31s-.5-2.15-3.38-2.82c-3.32-.75-4.21-1.81-4.21-4.35s1.84-4.07,5.41-4.07c1.45,0,3.07.22,3.79.5l-.17,2.04c-.86-.33-2.2-.59-3.6-.59-2.12,0-3.18.47-3.18,2.18,0,1.53.53,1.87,2.87,2.4,3.46.78,4.71,1.73,4.71,4.63s-2.04,4.35-5.72,4.35c-1.45,0-3.54-.22-4.38-.47Z"/>
+        <path class="cls-2" d="m414.77,118.52v2.04c-.59.08-1.06.14-1.7.14-3.32,0-4.52-.81-4.52-4.77v-8.45h-2.23v-2.01h2.23v-3.57h2.4v3.57h3.74v2.01h-3.74v8.31c0,2.34.33,2.9,2.18,2.9.67,0,1.12-.06,1.65-.17Z"/>
+        <path class="cls-2" d="m429.67,113.24l-10.21.64c.03,3.29,1.17,4.8,4.83,4.8,1.65,0,3.57-.42,4.71-.98v2.2c-.86.45-2.93.89-5.08.89-4.44,0-6.97-1.81-6.97-7.81s2.54-7.81,6.83-7.81c5.13,0,6.02,3.38,6.02,6.3,0,.42-.06,1.06-.14,1.76Zm-2.23-1.73c0-2.32-.39-4.35-3.65-4.35-3.46,0-4.24,1.87-4.32,4.94l7.98-.59Z"/>
+        <path class="cls-2" d="m454.72,110.12v10.4h-2.4v-9.54c0-2.31-.64-3.65-2.9-3.65-1.76,0-3.26.5-3.91,2.65v10.54h-2.4v-9.54c0-2.31-.56-3.65-2.76-3.65-1.87,0-3.24.42-3.99,2.73v10.46h-2.4v-15.06h2.4v1.98c.92-1.79,2.54-2.26,4.35-2.26,2.37,0,3.74.95,4.38,2.45.89-1.95,2.84-2.45,4.69-2.45,3.51,0,4.94,2.04,4.94,4.94Z"/>
+      </g>
+    </g>
+  </g>
+</svg>

src/components/BaseForm/search-form.vue

@@ -2,18 +2,28 @@
 <template>
   <div class="base-search-form">
     <el-form :size="size" :inline="true" :label-width="labelWidth">
-      <el-form-item v-for="item in searchForm" :key="item.prop" :label="item.label">
+      <el-form-item
+        v-for="item in searchForm"
+        :key="item.prop"
+        :label="item.label"
+      >
         <!-- 输入框 -->
-        <el-input v-if="item.type==='Input'" v-model="searchData[item.prop]" :placeholder="item.placeholder" size="mini" :style="{width:item.width}" :readonly="item.readonly" />
-        <!-- 下拉框 -->
-        <el-select
-          v-if="item.type==='Select'"
+        <el-input
+          v-if="item.type === 'Input'"
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
-          :style="{width:item.width}"
-
-          @change="item.change && item.change(that,searchData[item.prop])"
+          :style="{ width: item.width }"
+          :readonly="item.readonly"
+        />
+        <!-- 下拉框 -->
+        <el-select
+          v-if="item.type === 'Select'"
+          v-model="searchData[item.prop]"
+          :placeholder="item.placeholder"
+          size="mini"
+          :style="{ width: item.width }"
+          @change="item.change && item.change(that, searchData[item.prop])"
         >
           <el-option
             v-for="op in item.options"
@@ -23,49 +33,122 @@
           />
         </el-select>
         <el-select
-          v-if="item.type==='Select2'"
+          v-if="item.type === 'Select2'"
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
-          :style="{width:item.width}"
-
-          @change="item.change && item.change(that,searchData[item.prop])"
+          :style="{ width: item.width }"
+          @change="item.change && item.change(that, searchData[item.prop])"
         >
           <el-option
-            v-for="(key,value) of item.options"
+            v-for="(key, value) of item.options"
             :key="key"
             :label="key"
             :value="value"
           />
         </el-select>
         <!-- 单选 -->
-        <el-radio-group v-if="item.type==='Radio'" v-model="searchData[item.prop]" :style="{width:item.width}">
-          <el-radio v-for="ra in item.radios" :key="ra.value" :label="ra.value">{{ ra.label }}</el-radio>
+        <el-radio-group
+          v-if="item.type === 'Radio'"
+          v-model="searchData[item.prop]"
+          :style="{ width: item.width }"
+        >
+          <el-radio
+            v-for="ra in item.radios"
+            :key="ra.value"
+            :label="ra.value"
+            >{{ ra.label }}</el-radio
+          >
         </el-radio-group>
         <!-- 单选按钮 -->
-        <el-radio-group v-if="item.type==='RadioButton'" v-model="searchData[item.prop]" :style="{width:item.width}" @change="item.change && item.change(searchData[item.prop])">
-          <el-radio-button v-for="ra in item.radios" :key="ra.value" :label="ra.value">{{ ra.label }}</el-radio-button>
+        <el-radio-group
+          v-if="item.type === 'RadioButton'"
+          v-model="searchData[item.prop]"
+          :style="{ width: item.width }"
+          @change="item.change && item.change(searchData[item.prop])"
+        >
+          <el-radio-button
+            v-for="ra in item.radios"
+            :key="ra.value"
+            :label="ra.value"
+            >{{ ra.label }}</el-radio-button
+          >
         </el-radio-group>
         <!-- 复选框 -->
-        <el-checkbox-group v-if="item.type==='Checkbox'" v-model="searchData[item.prop]" :style="{width:item.width}">
-          <el-checkbox v-for="ch in item.checkboxs" :key="ch.value" :label="ch.value">{{ ch.label }}</el-checkbox>
+        <el-checkbox-group
+          v-if="item.type === 'Checkbox'"
+          v-model="searchData[item.prop]"
+          :style="{ width: item.width }"
+        >
+          <el-checkbox
+            v-for="ch in item.checkboxs"
+            :key="ch.value"
+            :label="ch.value"
+            >{{ ch.label }}</el-checkbox
+          >
         </el-checkbox-group>
         <!-- 日期 -->
-        <el-date-picker v-if="item.type==='Date'" v-model="searchData[item.prop]" :placeholder="item.placeholder" :style="{width:item.width}" value-format="yyyy-MM-dd" format="yyyy-MM-dd" :picker-options="item.pickerOption" />
+        <el-date-picker
+          v-if="item.type === 'Date'"
+          v-model="searchData[item.prop]"
+          :placeholder="item.placeholder"
+          :style="{ width: item.width }"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          :picker-options="item.pickerOption"
+        />
         <!-- 时间 -->
-        <el-time-select v-if="item.type==='Time'" v-model="searchData[item.prop]" :placeholder="item.placeholder" type="" :style="{width:item.width}" />
+        <el-time-select
+          v-if="item.type === 'Time'"
+          v-model="searchData[item.prop]"
+          :placeholder="item.placeholder"
+          type=""
+          :style="{ width: item.width }"
+        />
         <!-- 日期时间 -->
-        <el-date-picker v-if="item.type==='DateTime'" v-model="searchData[item.prop]" :placeholder="item.placeholder" type="datetime" :disabled="item.disable && item.disable(searchData[item.prop])" :style="{width:item.width}" />
+        <el-date-picker
+          v-if="item.type === 'DateTime'"
+          v-model="searchData[item.prop]"
+          :placeholder="item.placeholder"
+          type="datetime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          :disabled="item.disable && item.disable(searchData[item.prop])"
+          :style="{ width: item.width }"
+        />
+        <!-- 日期时间段 -->
+        <el-date-picker
+          v-if="item.type === 'Daterange'"
+          v-model="searchData[item.prop]"
+          type="datetimerange"
+          :range-separator="$t('baseForm:daterange:rangeSeparator')"
+          :start-placeholder="$t('baseForm:daterange:startPlaceholder')"
+          :end-placeholder="$t('baseForm:daterange:startendPlaceholder')"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          format="yyyy-MM-dd HH:mm:ss"
+          :style="{ width: item.width }"
+          clearable
+        />
         <!-- 滑块 -->
         <!-- <el-slider v-if="item.type==='Slider'" v-model="searchData[item.prop]"></el-slider> -->
         <!-- 开关 -->
-        <el-switch v-if="item.type==='Switch'" v-model="searchData[item.prop]" :style="{width:item.width}" />
+        <el-switch
+          v-if="item.type === 'Switch'"
+          v-model="searchData[item.prop]"
+          :style="{ width: item.width }"
+        />
         <!-- 具名slot -->
-        <slot v-if="item.type==='Custom'" :name="item.slot" />
+        <slot v-if="item.type === 'Custom'" :name="item.slot" />
       </el-form-item>
       <el-form-item v-for="item in searchHandle" :key="item.label">
         <slot v-if="item.slot" :name="item.slot" />
-        <el-button v-else :type="item.type" :size="item.size || size" :icon="item.icon || ''" @click="handleClick(item.emitKey)">{{ item.label }}</el-button>
+        <el-button
+          v-else
+          :type="item.type"
+          :size="item.size || size"
+          :icon="item.icon || ''"
+          @click="handleClick(item.emitKey)"
+          >{{ item.label }}</el-button
+        >
       </el-form-item>
     </el-form>
   </div>
@@ -76,47 +159,45 @@ export default {
   props: {
     that: {
       type: Object,
-      default: this
+      default: this,
     },
     isHandle: {
       type: Boolean,
-      default: true
+      default: true,
     },
     labelWidth: {
       type: String,
-      default: ''
+      default: "",
     },
     size: {
       type: String,
-      default: 'mini'
+      default: "mini",
     },
     searchForm: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     searchHandle: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     searchData: {
       type: Object,
-      default: () => {}
-    }
+      default: () => {},
+    },
   },
   methods: {
     handleClick(emitKey) {
       // emit事件
-      this.$emit(`${emitKey}`)
-    }
-  }
-
-}
-
+      this.$emit(`${emitKey}`);
+    },
+  },
+};
 </script>
 <style lang="scss">
-  .base-search-form{
-    .el-form-item{
-      margin-bottom: 0px;
-    }
+.base-search-form {
+  .el-form-item {
+    margin-bottom: 0px;
   }
+}
 </style>

src/components/BaseModel/index.vue

@@ -1,6 +1,16 @@
 <template>
   <div class="base-model-wrapper">
-    <el-dialog v-if="config.visible" v-dialogDrag :title="config.title" :append-to-body="config.appendToBody" :visible.sync="config.visible" :close-on-click-modal="false" :show-close="config.showClose" :width="config.width" :fullscreen="config.fullscreen">
+    <el-dialog
+      v-if="config.visible"
+      v-dialogDrag
+      :title="config.title"
+      :append-to-body="config.appendToBody"
+      :visible.sync="config.visible"
+      :close-on-click-modal="false"
+      :show-close="config.showClose"
+      :width="config.width"
+      :fullscreen="config.fullscreen"
+    >
       <div class="base-modal-body">
         <slot name="dialog-body" />
       </div>
@@ -12,46 +22,51 @@
 </template>
 <script>
 export default {
-  name: 'BaseDialog',
+  name: "BaseDialog",
   props: {
     config: {
       type: Object,
       default: () => {
         return {
           visible: false,
-          title: '',
+          title: "",
           closeOnClickModal: false,
           showClose: true,
           appendToBody: false,
-          width: '100px',
-          fullscreen: false
-        }
-      }
-    }
-  }
-}
+          width: "100px",
+          fullscreen: false,
+        };
+      },
+    },
+  },
+};
 </script>
 <style lang="scss">
-  .base-model-wrapper{
-    .el-dialog__header{
-      padding: 10px;
-      .el-dialog__headerbtn{
-        top: 10px;
-        right: 10px;
-      }
-    }
-    .el-dialog__body{
-      padding:10px 10px 10px 10px;
-      .base-modal-body{
-        min-height: 100px;
-        max-height:650px;
-        overflow-y: auto;
-        padding: 10px;
-        border: 1px solid #e0e0e0;
-      }
-    }
-    .el-dialog__footer{
-      padding: 10px;
+.base-model-wrapper {
+  .el-dialog__header {
+    padding: 10px;
+    .el-dialog__headerbtn {
+      top: 10px;
+      right: 10px;
     }
   }
+  .el-dialog__body {
+    padding: 10px 10px 10px 10px;
+    .base-modal-body {
+      min-height: 100px;
+      max-height: 650px;
+      overflow-y: auto;
+      padding: 10px;
+      border: 1px solid #e0e0e0;
+    }
+  }
+  .el-dialog__footer {
+    padding: 10px;
+  }
+}
+.notFooter {
+  .is-fullscreen .el-dialog__footer {
+    display: none;
+  }
+}
 </style>

src/components/ChatForm/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="chat-wrapper">
     <div class="chat-content">
-      <div v-for="(record,index) in recordContent" :key="index">
+      <div v-for="(record,index) in recordContent" :key="`${record.chatTime}${index}`">
         <div v-if="!record.mineMsg" class="word">
           <!-- <img :src="record.headUrl"> -->
           <img src="@/assets/CRC.png">

src/components/Dicom/DicomCanvas.vue

@@ -8,7 +8,6 @@
     style="width:100%;height:100%;position:relative;"
     class="cornerstone-element"
     @contextmenu.prevent="onContextmenu"
-    @mousemove="sliderMousemove"
     @mouseup="sliderMouseup"
   >
     <div v-show="dicomInfo.series" class="info-series">
@@ -54,7 +53,7 @@
       <!-- <div v-show="dicomInfo.acc">ACC {{ dicomInfo.acc }}</div> -->
       <!-- <div>{{ dicomInfo.time }}</div> -->
     </div>
-    <div ref="sliderBox" class="my_slider_box" style="position: absolute;right: 1px;height: calc(100% - 100px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer">
+    <div ref="sliderBox" class="my_slider_box" style="position: absolute;right: 1px;height: calc(100% - 100px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer" @click.stop="goViewer($event)">
       <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @mousedown="sliderMousedown($event)" />
     </div>
     <div style="position: absolute;left: 50%;top: 15px;color: #f44336;">
@@ -82,16 +81,25 @@
     <!-- <div v-show="stack.firstImageLoading" class="load-indicator">
       Loading Series #{{ stack.seriesNumber }}...
     </div>-->
+    <el-dialog
+      v-if="dcmTag.visible"
+      :visible.sync="dcmTag.visible"
+      :close-on-click-modal="false"
+      :title="dcmTag.title"
+      width="1000px"
+      custom-class="base-dialog-wrapper"
+      append-to-body
+    >
+      <DicomTags :image-id="stack.imageIds[stack.currentImageIdIndex]" @close="dcmTag.visible = false" />
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import Vue from 'vue'
-import Contextmenu from 'vue-contextmenujs'
-Vue.use(Contextmenu)
 import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneMath from 'cornerstone-math'
 import * as cornerstoneTools from 'cornerstone-tools'
+
 const scroll = cornerstoneTools.import('util/scrollToIndex')
 import Hammer from 'hammerjs'
 import getOrientationString from '@/views/trials/trials-panel/reading/dicoms/tools/OrientationMarkers/getOrientationString'
@@ -109,8 +117,10 @@ cornerstoneTools.toolColors.setActiveColor('rgb(0, 255, 0)')
 // cornerstoneTools.init({ showSVGCursors: true })
 cornerstoneTools.init()
 const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
+import DicomTags from './DicomTags'
 export default {
   name: 'DicomCanvas',
+  components: { DicomTags },
   data() {
     return {
       loading: false,
@@ -163,7 +173,10 @@ export default {
         isMove: false
       },
       mousePosition: { x: '', y: '', mo: '' },
-      markers: { top: '', right: '', bottom: '', left: '' }
+      markers: { top: '', right: '', bottom: '', left: '' },
+      orientationMarkers: [],
+      originalMarkers: [],
+      dcmTag: { visible: false, title: this.$t('trials:dicom-tag:title') }
     }
   },
 
@@ -186,6 +199,9 @@ export default {
     document.addEventListener('mouseup', () => {
       this.sliderMouseup()
     })
+    document.addEventListener('mousemove', (e) => {
+      this.sliderMousemove(e)
+    })
     this.canvas.addEventListener('cornerstonetoolsstackscroll', this.stackScrollCallback)
   },
 
@@ -196,7 +212,7 @@ export default {
         this.stack.seriesId = dicomSeries.seriesId
         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 ? dicomSeries.imageIdIndex : 0
         this.stack.firstImageLoading = true
         this.stack.description = dicomSeries.description
         this.toolState.viewportInvert = false
@@ -205,15 +221,19 @@ export default {
         var instanceId = imageId.split('/')[imageId.split('/').length - 1]
         instanceId = instanceId.split('.')[0]
         this.stack.instanceId = instanceId
-        if (this.toolState.clipPlaying) this.toggleClipPlay()
+        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
-            this.onFirstImageLoaded(image)
+            if (this.stack.imageIds.indexOf(image.imageId) !== -1) {
+              this.onFirstImageLoaded(image)
+            }
           }).catch((error) => {
             this.loading = false
             if (error.error && error.error.message) {
@@ -356,6 +376,12 @@ export default {
       if (this.dicomInfo.thick) {
         this.dicomInfo.thick = this.dicomInfo.thick.toFixed(2)
       }
+      const newImageIdIndex = this.stack.imageIds.findIndex(i => i === e.detail.image.imageId)
+      if (newImageIdIndex === -1) return
+      this.stack.currentImageIdIndex = newImageIdIndex
+      this.stack.imageIdIndex = newImageIdIndex
+      this.series.imageIdIndex = newImageIdIndex
+      this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
     },
     stackScrollCallback(e) {
       const { detail } = e
@@ -403,6 +429,7 @@ export default {
       this.dicomInfo.location = position
     },
     getOrientationMarker(element) {
+      console.log('getOrientationMarker')
       const enabledElement = cornerstone.getEnabledElement(element)
       const imagePlane = cornerstone.metaData.get(
         'imagePlaneModule',
@@ -426,6 +453,7 @@ export default {
       if (!markers) {
         return
       }
+
       this.orientationMarkers = [oppositeColumn, row, column, oppositeRow]
       this.originalMarkers = [oppositeColumn, row, column, oppositeRow]
       this.setMarkers()
@@ -438,10 +466,10 @@ export default {
       }
     },
     onImageLoaded(e) {
-      var image = e.detail.image
-      // var seriesIndex = -1
-      var seriesUid = image.data.string('x0020000e')
-      console.log(seriesUid)
+      // var image = e.detail.image
+      // // var seriesIndex = -1
+      // var seriesUid = image.data.string('x0020000e')
+      // console.log(seriesUid)
     },
     getToolForElement(toolName) {
       var isExist = false
@@ -521,6 +549,9 @@ export default {
       this.sliderInfo.oldB = parseInt(e.srcElement.style.top) * boxHeight / 100
       this.sliderInfo.oldM = e.clientY
       this.sliderInfo.isMove = true
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
     },
     sliderMousemove(e) {
       if (!this.sliderInfo.isMove) return
@@ -540,6 +571,13 @@ export default {
     sliderMouseup(e) {
       this.sliderInfo.isMove = false
     },
+    goViewer(e) {
+      // console.log(this.$refs['sliderBox'].clientHeight)
+      var height = e.offsetY * 100 / this.$refs['sliderBox'].clientHeight
+      this.height = height
+      var index = Math.trunc(this.stack.imageIds.length * this.height / 100)
+      scroll(this.canvas, index)
+    },
     onClipStopped() {
       this.toolState.clipPlaying = false
     },
@@ -610,6 +648,7 @@ export default {
       enabledElement.renderingTools.renderCanvasData = renderCanvasData
     },
     scrollPage(offset) {
+      if (this.loading) return
       var index = this.stack.currentImageIdIndex + offset
       if (index < 0) index = 0
       else if (index >= this.stack.imageIds.length) {
@@ -621,6 +660,7 @@ export default {
     },
 
     toggleClipPlay() {
+      if (this.loading) return
       if (this.toolState.clipPlaying) {
         cornerstoneTools.stopClip(this.canvas)
         this.toolState.clipPlaying = false
@@ -640,7 +680,7 @@ export default {
     resetWwwc() {
       this.toolState.viewportInvert = false
       var viewport = cornerstone.getViewport(this.canvas)
-      viewport.invert = false
+      // viewport.invert = false
       var image = cornerstone.getImage(this.canvas)
       viewport.voi.windowWidth = image.windowWidth
       viewport.voi.windowCenter = image.windowCenter
@@ -675,8 +715,11 @@ export default {
     },
 
     resetRotate() {
-      this.orientationMarkers = [...this.originalMarkers]
-      this.setMarkers()
+      if (this.originalMarkers.length > 0) {
+        this.orientationMarkers = [...this.originalMarkers]
+        this.setMarkers()
+      }
+
       var viewport = cornerstone.getViewport(this.canvas)
       viewport.hflip = false
       viewport.vflip = false
@@ -685,24 +728,26 @@ export default {
     },
 
     setRotate(hflip, vflip, angle, type) {
-      var markers = [...this.orientationMarkers]
-      if (type === 2) {
-        // 垂直翻转
-        this.orientationMarkers[1] = markers[3]
+      if (this.orientationMarkers.length > 0) {
+        var markers = [...this.orientationMarkers]
+        if (type === 2) {
+          // 垂直翻转
+          this.orientationMarkers[1] = markers[3]
 
-        this.orientationMarkers[3] = markers[1]
-      } else if (type === 3) {
-        // 水平翻转
-        this.orientationMarkers[0] = markers[2]
-        this.orientationMarkers[2] = markers[0]
-      } else if (type === 4) {
-        // 左转90度
-        this.orientationMarkers = markers.slice(1, 4).concat(markers[0])
-      } else if (type === 5) {
-        // 右转90度
-        this.orientationMarkers = [markers[3]].concat(markers.slice(0, 3))
+          this.orientationMarkers[3] = markers[1]
+        } else if (type === 3) {
+          // 水平翻转
+          this.orientationMarkers[0] = markers[2]
+          this.orientationMarkers[2] = markers[0]
+        } else if (type === 4) {
+          // 左转90度
+          this.orientationMarkers = markers.slice(1, 4).concat(markers[0])
+        } else if (type === 5) {
+          // 右转90度
+          this.orientationMarkers = [markers[3]].concat(markers.slice(0, 3))
+        }
+        this.setMarkers()
       }
-      this.setMarkers()
       var viewport = cornerstone.getViewport(this.canvas)
       if (hflip) viewport.hflip = !viewport.hflip
       if (vflip) viewport.vflip = !viewport.vflip
@@ -714,6 +759,9 @@ export default {
       var uid = cornerstone.getImage(this.canvas).data.string('x00080018')
       cornerstoneTools.SaveAs(this.canvas, `${uid}.png`)
     },
+    showTags() {
+      this.dcmTag.visible = true
+    },
     fitToWindow() {
       if (this.stack.seriesNumber) {
         cornerstone.fitToWindow(this.canvas)
@@ -840,194 +888,197 @@ export default {
       synchronizer.remove(this.$refs.canvas)
       this.setAllToolsPassive()
     },
-    onContextmenu(event) {
-      const colormapsList = cornerstone.colors.getColormapsList()
-      const colorItems = []
-      colorItems.push({
-        label: '默认值',
-        onClick: () => {
-          this.setColormap()
-        }
-      })
-      colormapsList.forEach(colormap => {
-        const item = {}
-        item.label = colormap.name
-        item.onClick = () => {
-          this.setColormap(colormap.id)
-        }
-        colorItems.push(item)
-      })
-      this.$contextmenu({
-        items: [
-          {
-            label: '移动',
-            divided: true,
-            onClick: () => {
-              this.setToolActive('Pan')
-            }
-          },
-          {
-            label: '缩放',
-            divided: true,
-            children: [
-              {
-                label: '自由缩放',
-                onClick: () => {
-                  this.setToolActive('Zoom')
-                }
-              },
-              {
-                label: '适应图像',
-                onClick: () => {
-                  this.fitToWindow()
-                }
-              },
-              {
-                label: '适应窗口',
-                onClick: () => {
-                  this.fitToImage()
-                }
-              }
-            ]
-          },
-          {
-            label: '透镜',
-            divided: true,
-            onClick: () => {
-              this.setToolActive('Magnify')
-            }
-          },
-          {
-            label: '旋转',
-            divided: true,
-            children: [
-              {
-                label: '默认值',
-                onClick: () => {
-                  this.resetRotate()
-                }
-              },
-              {
-                label: '自由旋转',
-                onClick: () => {
-                  this.setToolActive('Rotate')
-                }
-              },
-              {
-                label: '水平翻转',
-                onClick: () => {
-                  this.setRotate(true, false, 0)
-                }
-              },
-              {
-                label: '垂直翻转',
-                onClick: () => {
-                  this.setRotate(false, true, 0)
-                }
-              },
-              {
-                label: '左转90度',
-                onClick: () => {
-                  this.setRotate(false, false, -90)
-                }
-              },
-              {
-                label: '右转90度',
-                onClick: () => {
-                  this.setRotate(false, false, 90)
-                }
-              }
-            ]
-          },
+    onContextmenu(e) {
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
+      // const colormapsList = cornerstone.colors.getColormapsList()
+      // const colorItems = []
+      // colorItems.push({
+      //   label: '默认值',
+      //   onClick: () => {
+      //     this.setColormap()
+      //   }
+      // })
+      // colormapsList.forEach(colormap => {
+      //   const item = {}
+      //   item.label = colormap.name
+      //   item.onClick = () => {
+      //     this.setColormap(colormap.id)
+      //   }
+      //   colorItems.push(item)
+      // })
+      // this.$contextmenu({
+      //   items: [
+      //     {
+      //       label: '移动',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.setToolActive('Pan')
+      //       }
+      //     },
+      //     {
+      //       label: '缩放',
+      //       divided: true,
+      //       children: [
+      //         {
+      //           label: '自由缩放',
+      //           onClick: () => {
+      //             this.setToolActive('Zoom')
+      //           }
+      //         },
+      //         {
+      //           label: '适应图像',
+      //           onClick: () => {
+      //             this.fitToWindow()
+      //           }
+      //         },
+      //         {
+      //           label: '适应窗口',
+      //           onClick: () => {
+      //             this.fitToImage()
+      //           }
+      //         }
+      //       ]
+      //     },
+      //     {
+      //       label: '透镜',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.setToolActive('Magnify')
+      //       }
+      //     },
+      //     {
+      //       label: '旋转',
+      //       divided: true,
+      //       children: [
+      //         {
+      //           label: '默认值',
+      //           onClick: () => {
+      //             this.resetRotate()
+      //           }
+      //         },
+      //         {
+      //           label: '自由旋转',
+      //           onClick: () => {
+      //             this.setToolActive('Rotate')
+      //           }
+      //         },
+      //         {
+      //           label: '水平翻转',
+      //           onClick: () => {
+      //             this.setRotate(true, false, 0)
+      //           }
+      //         },
+      //         {
+      //           label: '垂直翻转',
+      //           onClick: () => {
+      //             this.setRotate(false, true, 0)
+      //           }
+      //         },
+      //         {
+      //           label: '左转90度',
+      //           onClick: () => {
+      //             this.setRotate(false, false, -90)
+      //           }
+      //         },
+      //         {
+      //           label: '右转90度',
+      //           onClick: () => {
+      //             this.setRotate(false, false, 90)
+      //           }
+      //         }
+      //       ]
+      //     },
 
-          {
-            label: '测量',
-            divided: true,
-            minWidth: 0,
-            children: [
-              {
-                label: '探针',
-                onClick: () => {
-                  this.setToolActive('Probe')
-                }
-              },
-              {
-                label: '长度测量',
-                onClick: () => {
-                  this.setToolActive('Length')
-                }
-              },
-              {
-                label: '角度测量',
-                onClick: () => {
-                  this.setToolActive('Angle')
-                }
-              },
-              {
-                label: 'Cobb测量',
-                onClick: () => {
-                  this.setToolActive('CobbAngle')
-                }
-              },
-              {
-                label: '椭圆测量',
-                onClick: () => {
-                  this.setToolActive('EllipticalRoi')
-                }
-              },
-              {
-                label: '矩形测量',
-                onClick: () => {
-                  this.setToolActive('RectangleRoi')
-                }
-              },
-              {
-                label: '多边形标记',
-                onClick: () => {
-                  this.setToolActive('FreehandRoi')
-                }
-              },
-              {
-                label: '十字线',
-                onClick: () => {
-                  this.setToolActive('Bidirectional')
-                }
-              },
-              {
-                label: '文字标注',
-                onClick: () => {
-                  this.setToolActive('ArrowAnnotate')
-                }
-              }
-            ]
-          },
-          {
-            label: '调窗',
-            divided: true,
-            onClick: () => {
-              this.setToolActive('Wwwc')
-            }
-          },
-          {
-            label: '反色',
-            divided: true,
-            onClick: () => {
-              this.toggleInvert()
-            }
-          },
-          {
-            label: '伪彩',
-            children: colorItems
-          }
-        ],
-        event,
-        // x: event.clientX,
-        // y: event.clientY,
-        customClass: 'class-a',
-        zIndex: 3,
-        minWidth: 100
-      })
-      return false
+      //     {
+      //       label: '测量',
+      //       divided: true,
+      //       minWidth: 0,
+      //       children: [
+      //         {
+      //           label: '探针',
+      //           onClick: () => {
+      //             this.setToolActive('Probe')
+      //           }
+      //         },
+      //         {
+      //           label: '长度测量',
+      //           onClick: () => {
+      //             this.setToolActive('Length')
+      //           }
+      //         },
+      //         {
+      //           label: '角度测量',
+      //           onClick: () => {
+      //             this.setToolActive('Angle')
+      //           }
+      //         },
+      //         {
+      //           label: 'Cobb测量',
+      //           onClick: () => {
+      //             this.setToolActive('CobbAngle')
+      //           }
+      //         },
+      //         {
+      //           label: '椭圆测量',
+      //           onClick: () => {
+      //             this.setToolActive('EllipticalRoi')
+      //           }
+      //         },
+      //         {
+      //           label: '矩形测量',
+      //           onClick: () => {
+      //             this.setToolActive('RectangleRoi')
+      //           }
+      //         },
+      //         {
+      //           label: '多边形标记',
+      //           onClick: () => {
+      //             this.setToolActive('FreehandRoi')
+      //           }
+      //         },
+      //         {
+      //           label: '十字线',
+      //           onClick: () => {
+      //             this.setToolActive('Bidirectional')
+      //           }
+      //         },
+      //         {
+      //           label: '文字标注',
+      //           onClick: () => {
+      //             this.setToolActive('ArrowAnnotate')
+      //           }
+      //         }
+      //       ]
+      //     },
+      //     {
+      //       label: '调窗',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.setToolActive('Wwwc')
+      //       }
+      //     },
+      //     {
+      //       label: '反色',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.toggleInvert()
+      //       }
+      //     },
+      //     {
+      //       label: '伪彩',
+      //       children: colorItems
+      //     }
+      //   ],
+      //   event,
+      //   // x: event.clientX,
+      //   // y: event.clientY,
+      //   customClass: 'class-a',
+      //   zIndex: 3,
+      //   minWidth: 100
+      // })
+      // return false
     },
     getToolSate() {
       const toolROITypes = [

src/components/Dicom/DicomTags.vue

@@ -0,0 +1,287 @@
+<template>
+  <div class="dcm-tag">
+    <el-input
+      v-model="search"
+      size="mini"
+      :placeholder="$t('trials:dicom-tag:keywords')"
+      style="width:200px"
+    />
+
+    <el-table
+      :data="filterList(list)"
+      row-key="id"
+      default-expand-all
+      :tree-props="{children: 'child', hasChildren: 'hasChildren'}"
+      :default-sort="{prop: 'tagCode', order: 'ascending'}"
+      height="500"
+    >
+      <el-table-column
+        prop="tagCode"
+        label="Tag"
+        min-width="120"
+        sortable
+      />
+      <el-table-column
+        prop="tagName"
+        label="Description"
+        min-width="150"
+        show-overflow-tooltip
+        sortable
+      />
+      <el-table-column
+        prop="vr"
+        label="VR"
+        min-width="50"
+        show-overflow-tooltip
+        sortable
+      />
+      <el-table-column
+        prop="tagLength"
+        label="Length"
+        min-width="80"
+        show-overflow-tooltip
+        sortable
+      />
+      <el-table-column
+        prop="value"
+        label="Value"
+        min-width="200"
+        show-overflow-tooltip
+        sortable
+      />
+    </el-table>
+  </div>
+</template>
+<script>
+import TAG_DICT from './dataDictionary'
+import * as cornerstone from 'cornerstone-core'
+import dicomParser from 'dicom-parser'
+export default {
+  name: 'DicomTags',
+  props: {
+    imageId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      list: [],
+      idx: 0,
+      search: ''
+    }
+  },
+  async mounted() {
+    const image = await cornerstone.loadAndCacheImage(this.imageId)
+    var dataSet = dicomParser.parseDicom(image.data.byteArray)
+    var output = []
+    this.dumpDataSet(dataSet, output)
+    this.list = output
+  },
+  methods: {
+    filterList(list) {
+      if (list.length === 0) return []
+      if (!this.search) {
+        return list
+      } else {
+        const search = isNaN(parseFloat(this.search)) ? this.search.toLowerCase() : String(this.search)
+        const arr = list.filter(data => {
+          if (data.tagCode && data.tagCode.toLowerCase().includes(search)) {
+            return data
+          } else if (data.tagName && data.tagName.toLowerCase().includes(search)) {
+            return data
+          } else if (data.value) {
+            let v = ''
+            if (!isNaN(parseFloat(data.value))) {
+              v = String(data.value)
+            } else {
+              v = data.value.toLowerCase()
+            }
+            if (v.includes(search)) {
+              return data
+            }
+          }
+        })
+        return arr
+      }
+    },
+    dumpDataSet(dataSet, output) {
+      try {
+        for (const propertyName in dataSet.elements) {
+          const elementObject = {}
+          const element = dataSet.elements[propertyName]
+          const tag = this.getTag(element.tag)
+          elementObject.id = `${this.idx++}${new Date().getTime()}`
+          if (!tag) {
+            const group = element.tag.substring(1, 5)
+            const el = element.tag.substring(5, 9)
+            elementObject.tagCode = ('(' + group + ',' + el + ')').toUpperCase()
+          } else {
+            elementObject.tagCode = tag ? tag.tag : ''
+            elementObject.tagName = tag ? tag.name : ''
+          }
+
+          elementObject.tagLength = element.length
+          elementObject.value = ''
+          elementObject.child = []
+
+          if (element.items) {
+            element.items.forEach(item => {
+              const childOutput = []
+              this.dumpDataSet(item.dataSet, childOutput)
+              elementObject.child.push(...childOutput)
+            })
+          } else if (element.fragments) {
+            // 多帧处理
+          } else {
+            var vr
+            if (element.vr !== undefined) {
+              vr = element.vr
+            } else {
+              if (tag !== undefined) {
+                vr = tag.vr
+              }
+            }
+            elementObject.vr = vr
+            if (element.length < 128) {
+              // const str = dataSet.string(propertyName)
+              // if (elementObject.tagCode === 'x00280010') {
+              //   console.log(str)
+              // }
+              // const stringIsAscii = this.isASCII(str)
+              // if (stringIsAscii && str !== undefined) {
+              //   elementObject.value = str
+              // }
+
+              if (element.vr === undefined && tag === undefined) {
+                if (element.length === 2) {
+                  elementObject.value = dataSet.uint16(propertyName)
+                } else if (element.length === 4) {
+                  elementObject.value = dataSet.uint32(propertyName)
+                }
+                const str = dataSet.string(propertyName)
+                const stringIsAscii = this.isASCII(str)
+
+                if (stringIsAscii) {
+                  if (str !== undefined) {
+                    elementObject.value = str
+                  }
+                } else {
+                  if (element.length !== 2 && element.length !== 4) {
+                    // elementObject.value = 'binary data'
+                  }
+                }
+              } else {
+                if (this.isStringVr(vr)) {
+                  const str = dataSet.string(propertyName)
+                  const stringIsAscii = this.isASCII(str)
+
+                  if (stringIsAscii) {
+                    if (str !== undefined) {
+                      elementObject.value = str
+                    }
+                  } else {
+                    if (element.length !== 2 && element.length !== 4) {
+                      // elementObject.value = 'binary data'
+                    }
+                  }
+                } else if (vr === 'US') {
+                  let text = dataSet.uint16(propertyName)
+                  for (let i = 1; i < dataSet.elements[propertyName].length / 2; i++) {
+                    text += '\\' + dataSet.uint16(propertyName, i)
+                  }
+                  elementObject.value = text
+                } else if (vr === 'SS') {
+                  let text = dataSet.int16(propertyName)
+                  for (let i = 1; i < dataSet.elements[propertyName].length / 2; i++) {
+                    text += '\\' + dataSet.int16(propertyName, i)
+                  }
+                  elementObject.value = text
+                } else if (vr === 'UL') {
+                  let text = dataSet.uint32(propertyName)
+                  for (let i = 1; i < dataSet.elements[propertyName].length / 4; i++) {
+                    text += '\\' + dataSet.uint32(propertyName, i)
+                  }
+                  elementObject.value = text
+                } else if (vr === 'SL') {
+                  let text = dataSet.int32(propertyName)
+                  for (let i = 1; i < dataSet.elements[propertyName].length / 4; i++) {
+                    text += '\\' + dataSet.int32(propertyName, i)
+                  }
+                  elementObject.value = text
+                } else if (vr === 'FD') {
+                  let text = dataSet.double(propertyName)
+                  for (let i = 1; i < dataSet.elements[propertyName].length / 8; i++) {
+                    text += '\\' + dataSet.double(propertyName, i)
+                  }
+                  elementObject.value = text
+                } else if (vr === 'FL') {
+                  let text = dataSet.float(propertyName)
+                  for (let i = 1; i < dataSet.elements[propertyName].length / 4; i++) {
+                    text += '\\' + dataSet.float(propertyName, i)
+                  }
+                  elementObject.value = text
+                } else if (vr === 'OB' || vr === 'OW' || vr === 'UN' || vr === 'OF' || vr === 'UT') {
+                  if (element.length === 2) {
+                    elementObject.value = dataSet.uint16(propertyName)
+                  } else if (element.length === 4) {
+                    elementObject.value = dataSet.uint32(propertyName)
+                  } else {
+
+                  }
+                } else if (vr === 'AT') {
+                  // var group = dataSet.uint16(propertyName, 0);
+                  // var groupHexStr = ("0000" + group.toString(16)).substr(-4);
+                  // var element = dataSet.uint16(propertyName, 1);
+                  // var elementHexStr = ("0000" + element.toString(16)).substr(-4);
+                  // text += "x" + groupHexStr + elementHexStr;
+                } else if (vr === 'SQ') {
+                } else {
+                  // no display code for VR yet, sorry!
+                }
+              }
+            }
+          }
+
+          output.push(elementObject)
+        }
+      } catch (err) {
+        const ex = {
+          exception: err,
+          output: output
+        }
+        console.log(ex)
+      }
+    },
+    getTag(tag) {
+      var group = tag.substring(1, 5)
+      var element = tag.substring(5, 9)
+      var tagIndex = ('(' + group + ',' + element + ')').toUpperCase()
+      var attr = TAG_DICT[tagIndex]
+      return attr
+    },
+    isASCII(str) {
+      return /^[\x00-\x7F]*$/.test(str)
+    },
+    isStringVr(vr) {
+      if (vr === 'AT' || vr === 'FL' || vr === 'FD' || vr === 'OB' || vr === 'OF' || vr === 'OW' || vr === 'SI' || vr === 'SQ' || vr === 'SS' || vr === 'UL' || vr === 'US') {
+        return false
+      }
+      return true
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.dcm-tag{
+  // user-select: none;
+  ::-webkit-scrollbar {
+    width: 8px;
+    height: 15px;
+  }
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background: #d0d0d0;
+  }
+}
+</style>

src/components/Dicom/DicomViewer.vue

@@ -162,6 +162,19 @@
           <button :title="$t('trials:dicom-show:lens')" class="btn-link" data-tool="Magnify" @click="setToolActive($event,'Magnify')">
             <svg-icon icon-class="zoom" style="font-size:20px;" />
           </button>
+          <button :title="$t('trials:reading:button:rotate')" class="btn-link dropdown" data-tool="Rotate">
+            <svg-icon icon-class="rotate" style="font-size:20px;" />
+            <div class="dropdown-content">
+              <div @click.stop="setDicomCanvasRotate(1)">{{ $t('trials:reading:button:rotateDefault') }}</div>
+              <div @click.stop="setDicomCanvasRotate(2)">{{ $t('trials:reading:button:rotateHorizontal') }}</div>
+              <div @click.stop="setDicomCanvasRotate(3)">{{ $t('trials:reading:button:rotateVertical') }}</div>
+              <div @click.stop="setDicomCanvasRotate(4)">{{ $t('trials:reading:button:rotateTurnLeft') }}</div>
+              <div @click.stop="setDicomCanvasRotate(5)">{{ $t('trials:reading:button:rotateTurnRight') }}</div>
+            </div>
+          </button>
+          <button :title="$t('trials:reading:button:move')" class="btn-link" data-tool="Pan" @click="setToolActive($event,'Pan')">
+            <svg-icon icon-class="move" style="font-size:20px;" />
+          </button>
           <button :title="$t('trials:reading:button:fitWindow')" class="btn-link" data-tool="fitToWindow" @click="fitToType($event,'fitToWindow')">
             <svg-icon icon-class="fitToWindow" style="font-size:20px;" />
           </button>
@@ -169,19 +182,7 @@
             <svg-icon icon-class="fitToImage" style="font-size:20px;" />
           </button>
           <!-- <button title="旋转" class="btn-link dropdown" data-tool="Rotate" @click="setToolActive($event,'Rotate')"> -->
-          <button :title="$t('trials:reading:button:rotate')" class="btn-link dropdown" data-tool="Rotate">
-            <svg-icon icon-class="rotate" style="font-size:20px;" />
-            <div class="dropdown-content">
-              <p @click.stop="setDicomCanvasRotate(1)">{{ $t('trials:reading:button:rotateDefault') }}</p>
-              <p @click.stop="setDicomCanvasRotate(2)">{{ $t('trials:reading:button:rotateHorizontal') }}</p>
-              <p @click.stop="setDicomCanvasRotate(3)">{{ $t('trials:reading:button:rotateVertical') }}</p>
-              <p @click.stop="setDicomCanvasRotate(4)">{{ $t('trials:reading:button:rotateTurnLeft') }}</p>
-              <p @click.stop="setDicomCanvasRotate(5)">{{ $t('trials:reading:button:rotateTurnRight') }}</p>
-            </div>
-          </button>
-          <button :title="$t('trials:reading:button:move')" class="btn-link" data-tool="Pan" @click="setToolActive($event,'Pan')">
-            <svg-icon icon-class="move" style="font-size:20px;" />
-          </button>
+
         </div>
       </div>
       <!-- 测量标注 -->
@@ -232,6 +233,10 @@
           <button :title="$t('trials:dicom-show:image')" class="btn-link" @click="currentDicomCanvas.saveImage()">
             <svg-icon icon-class="image" style="font-size:20px;" />
           </button>
+          <!-- 标签 -->
+          <button :title="$t('trials:dicom-show:tags')" class="btn-link" @click="currentDicomCanvas.showTags()">
+            <svg-icon icon-class="dictionary" style="font-size:20px;" />
+          </button>
         </div>
       </div>
       <div class="measureTool-wrapper">
@@ -247,7 +252,7 @@
             <svg-icon icon-class="previousframe" style="font-size:20px;" />
           </button>
           <!-- 播放 -->
-          <button class="btn-link" :title="$t('trials:dicom-show:play')" @click="currentDicomCanvas.toggleClipPlay()">
+          <button class="btn-link" :title="$t('trials:dicom-show:play')" @click="clipPlay">
             <svg-icon
               :icon-class="currentDicomCanvas.toolState.clipPlaying ? 'stop' : 'play'"
               style="font-size:20px;"
@@ -261,9 +266,10 @@
           <button class="btn-link" :title="$t('trials:dicom-show:lastframe')" @click="currentDicomCanvas.scrollPage(9999)">
             <svg-icon icon-class="lastframe" style="font-size:20px;" />
           </button>
-          <select class="sidetool-select" style="width:60px" @change="setDicomCanvasfps($event)">
+          <select v-model="fps" class="sidetool-select" style="width:60px" @change="setDicomCanvasfps($event)">
             <!-- 默认值 -->
-            <option :value="10">{{ $t('trials:dicom-show:default') }}</option>
+            <option :value="5">5</option>
+            <option :value="10">10</option>
             <option :value="15">15</option>
             <option :value="20">20</option>
             <option :value="30">30</option>
@@ -386,22 +392,25 @@ export default {
       wwwcList: [],
       layout: null,
       seriesList: [],
-      customWwc: { visible: false, title: null }
+      customWwc: { visible: false, title: null },
+      fps: 15
     }
   },
   mounted() {
     this.customWwc = { visible: false, title: this.$t('DicomViewer:data:customWwc') }
     this.rotateList[0] = '1'
     this.colorList[0] = ''
-    this.wwwcList[0] = '1'
+    this.wwwcList[0] = '-1'
     this.colormapsList = cornerstone.colors.getColormapsList()
     this.currentDicomCanvas = this.$refs['dicomCanvas0']
   },
 
   methods: {
     loadImageStack(dicomSeries) {
+      this.currentDicomCanvas.toolState.clipPlaying = false
       this.$nextTick(() => {
-        this.currentDicomCanvas.loadImageStack(dicomSeries)
+        const series = Object.assign({}, dicomSeries)
+        this.currentDicomCanvas.loadImageStack(series)
       })
     },
     loadOtherImageStack(seriesList) {
@@ -411,7 +420,8 @@ export default {
         Array.from(elements).forEach((element, index) => {
           const canvasIndex = element.getAttribute('data-index')
           if (index < seriesList.length && element.style.display !== 'none') {
-            this.$refs[`dicomCanvas${canvasIndex}`].loadImageStack(seriesList[index])
+            const series = Object.assign({}, seriesList[index])
+            this.$refs[`dicomCanvas${canvasIndex}`].loadImageStack(series)
           }
         })
       })
@@ -444,7 +454,7 @@ export default {
           this.colorList[this.currentDicomCanvasIndex] = ''
         }
         if (!this.wwwcList[this.currentDicomCanvasIndex]) {
-          this.wwwcList[this.currentDicomCanvasIndex] = '1'
+          this.wwwcList[this.currentDicomCanvasIndex] = '-1'
         }
       }
     },
@@ -565,6 +575,10 @@ export default {
     setDicomCanvasfps(event) {
       this.currentDicomCanvas.setFps(event.target.value)
     },
+    clipPlay() {
+      this.currentDicomCanvas.setFps(this.fps)
+      this.currentDicomCanvas.toggleClipPlay()
+    },
     fitToType(e, type) {
       const toolButtons = document.querySelectorAll('[data-tool]')
       Array.from(toolButtons).forEach((toolBtn) => {
@@ -879,13 +893,19 @@ export default {
   background-color: #323232;
   min-width: 80px;
   box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+  border: 1px solid #4e4e4e;
   padding: 5px;
 }
 .dicom-wrapper .dropdown:hover .dropdown-content {
     display: block;
 }
-.dicom-wrapper .dropdown-content p{
+.dicom-wrapper .dropdown-content div{
+  height: 25px;
+  line-height: 25px;
   cursor:point;
 }
+.dicom-wrapper .dropdown-content div:hover{
+  background-color: #16477b90;
+}
 
 </style>

src/components/MFA/fun.js

@@ -0,0 +1,37 @@
+import Vue from "vue";
+import MFACOMP from "./index.vue";
+
+const MFAConstructor = Vue.extend(MFACOMP);
+let MFAINSTANCELIST = [];
+const MFA = options => {
+    const { UserId, username, EMail, callBack, cancelBack, status = 'login' } = options;
+    if (!UserId) throw `UserId is requred.but ${UserId}`
+    const id = `MFA${new Date().getTime()}`;
+    const instance = new MFAConstructor();
+    MFAINSTANCELIST.push(instance)
+    instance.id = id;
+    instance.vm = instance.$mount();
+    if (instance.vm.visible) return;
+    document.body.appendChild(instance.vm.$el);
+    instance.vm.open({ UserId, username, EMail, status });
+    instance.vm.$on("success", (Id) => {
+        if (callBack) callBack(Id)
+    });
+    instance.vm.$on("closed", () => {
+        if (cancelBack) cancelBack();
+        document.body.removeChild(instance.vm.$el);
+        instance.vm.$destroy();
+        let index = MFAINSTANCELIST.findIndex(item => item.id === id);
+        MFAINSTANCELIST.splice(index, 1)
+    });
+    return instance.vm;
+}
+MFA.close = () => {
+    if (MFAINSTANCELIST.length <= 0) return;
+    MFAINSTANCELIST.forEach(item => {
+        document.body.removeChild(item.vm.$el);
+        item.vm.$destroy();
+    })
+    MFAINSTANCELIST = [];
+}
+export default MFA;

src/components/MFA/index.js

@@ -0,0 +1,7 @@
+import MFACOMP from "./index.vue";
+import MFA from "./fun";
+
+export default Vue => {
+    Vue.component(MFACOMP.name, MFACOMP);
+    Vue.prototype.$MFA = MFA;
+};

src/components/MFA/index.vue

@@ -0,0 +1,208 @@
+<template>
+  <!--MFA-->
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    width="540px"
+    :close-on-click-modal="false"
+    append-to-body
+    center
+    :show-close="status === 'login'"
+    @close="cancel"
+  >
+    <div slot="title">
+      {{ status === "login" ? $t("mfa:title") : $t("mfa:lock:title") }}
+    </div>
+    <el-form
+      ref="mfaForm"
+      label-position="right"
+      :model="form"
+      :rules="rules"
+      label-width="100px"
+    >
+      <!-- 邮箱 -->
+      <p class="tip">
+        <i class="el-icon-warning" style="color: #409eff"></i>
+        <span>{{ tip }}</span>
+      </p>
+      <!-- 用户名 -->
+      <el-form-item :label="$t('mfa:form:username')" prop="username">
+        <span>{{ form.username }}</span>
+      </el-form-item>
+      <!-- 验证码 -->
+      <el-form-item :label="$t('mfa:form:MFACode')" prop="Code">
+        <el-input
+          :placeholder="$t('mfa:form:input:placeholder:Codes')"
+          v-model="form.Code"
+          style="width: 240px; margin-right: 10px"
+        />
+        <el-button
+          type="primary"
+          size="small"
+          @click.stop="sendMFACode"
+          :disabled="flag || sendFlag"
+          >{{ flag ? `${second}s` : $t("mfa:form:sendMFACode") }}</el-button
+        >
+      </el-form-item>
+    </el-form>
+    <div slot="footer">
+      <!-- 取消 -->
+      <!-- <el-button size="small" @click="cancel" v-if="status === 'login'">
+        {{ $t("mfa:button:cancel") }}
+      </el-button> -->
+      <!-- 保存 -->
+      <el-button
+        type="primary"
+        size="small"
+        @click="save"
+        :loading="loading"
+        style="width: 80%"
+      >
+        {{
+          status === "login"
+            ? $t("mfa:button:save")
+            : $t("mfa:lock:button:save")
+        }}
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { sendMFAEmail, verifyMFACode } from "@/api/user.js";
+export default {
+  name: "MFA",
+  data() {
+    return {
+      status: "login", // lock
+      tip: null,
+      visible: false,
+      loading: false,
+      timer: null,
+      flag: false,
+      sendFlag: false,
+      second: 60,
+      form: {
+        Code: null,
+        UserId: null,
+        EMail: null,
+        username: null,
+      },
+      rules: {
+        Code: [
+          {
+            required: true,
+            message: this.$t("mfa:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        EMail: [
+          {
+            required: true,
+            message: this.$t("mfa:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        username: [
+          {
+            required: true,
+            message: this.$t("mfa:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    open(data) {
+      let { UserId, status, username, EMail } = data;
+      this.form.UserId = UserId;
+      this.status = status ? status : "login";
+      this.form.username = username;
+      this.form.EMail = EMail;
+      this.visible = true;
+      this.tip = this.$t("mfa:tip").replace("xx", EMail);
+    },
+    cancel() {
+      this.visible = false;
+      this.$emit("closed");
+    },
+    async save() {
+      try {
+        let validate = await this.$refs.mfaForm.validate();
+        if (!validate) return;
+        this.loading = true;
+        let res = await verifyMFACode(this.form);
+        this.loading = false;
+        if (res.IsSuccess) {
+          if (this.status === "login") {
+            this.$message.success(this.$t("mfa:message:verifySuccess"));
+          }
+          this.$emit("success", this.form.UserId);
+          this.cancel();
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
+    },
+    async sendMFACode() {
+      try {
+        if (this.flag || this.sendFlag) return;
+        this.sendFlag = true;
+        if (this.timer) {
+          clearInterval(this.timer);
+          this.timer = null;
+        }
+        let data = {
+          UserId: this.form.UserId,
+        };
+        if (this.status === "lock") {
+          data.MfaType = 1;
+        }
+        let res = await sendMFAEmail(data);
+        this.sendFlag = false;
+        if (res.IsSuccess) {
+          this.flag = true;
+          this.second = 60;
+          this.timer = setInterval(() => {
+            this.second--;
+            if (this.second <= 0) {
+              this.flag = false;
+              clearInterval(this.timer);
+              this.timer = null;
+            }
+          }, 1000);
+        }
+      } catch (err) {
+        console.log(err);
+        this.flag = false;
+        this.sendFlag = false;
+      }
+    },
+  },
+  destroyed() {
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.tip {
+  width: 86%;
+  margin: auto;
+  margin-bottom: 20px;
+  text-align: left;
+  padding: 0 10px;
+  line-height: 30px;
+  border-radius: 5px;
+  background-color: #eee;
+  i {
+    margin-right: 5px;
+  }
+}
+::v-deep .el-dialog__header {
+  font-weight: bold;
+}
+</style>

src/components/Preview/fun.js

@@ -0,0 +1,22 @@
+import Vue from "vue";
+import Preview from "./index.vue";
+
+const PreviewConstructor = Vue.extend(Preview);
+
+const preview = options => {
+    const { path, type, title } = options;
+    if (!path) throw `path is requred.but ${path}`
+    const id = `Preview_${new Date().getTime()}`;
+    const instance = new PreviewConstructor();
+    instance.id = id;
+    instance.vm = instance.$mount();
+    if (instance.vm.visible) return;
+    document.body.appendChild(instance.vm.$el);
+    instance.vm.open(path, type, title);
+    instance.vm.$on("closed", () => {
+        document.body.removeChild(instance.vm.$el);
+        instance.vm.$destroy();
+    });
+    return instance.vm;
+}
+export default preview;

src/components/Preview/index.js

@@ -0,0 +1,7 @@
+import Preview from "./index.vue";
+import preview from "./fun";
+
+export default Vue => {
+    Vue.component(Preview.name, Preview);
+    Vue.prototype.$preview = preview;
+};

src/components/Preview/index.vue

@@ -0,0 +1,41 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    :title="title"
+    :fullscreen="true"
+    append-to-body
+    custom-class="base-dialog-wrapper"
+    @close="handleClose"
+  >
+    <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
+      <PreviewFile v-if="visible" :file-path="path" :file-type="type" />
+    </div>
+  </el-dialog>
+</template>
+<script>
+import PreviewFile from "@/components/PreviewFile";
+export default {
+  name: "preview",
+  components: { PreviewFile },
+  data() {
+    return {
+      visible: false,
+      path: null,
+      type: null,
+      title: null,
+    };
+  },
+  methods: {
+    open(path, type, title) {
+      this.path = path;
+      this.type = type;
+      this.title = title;
+      this.visible = true;
+    },
+    handleClose() {
+      this.$emit("closed");
+    },
+  },
+};
+</script>

src/components/PreviewFile/index.vue

@@ -9,7 +9,7 @@
     />
     <!-- <embed v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" style="width: 100%; height: 100%"> -->
     <!-- <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" width="100%" height="100%" frameborder="0" /> -->
-    <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${filePath}?userName=${currentUser}`" width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
+    <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${filePath}?userName=${currentUser}&COMPANY=${COMPANY}`" width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
     <!--    <pdf-->
     <!--      v-else-if="fileType.indexOf('pdf') !== -1"-->
     <!--      :src="`/static/pdfjs/web/viewer.html?file=${filePath}`">-->
@@ -40,7 +40,8 @@ export default {
   },
   data() {
     return {
-      currentUser: zzSessionStorage.getItem('userName')
+      currentUser: zzSessionStorage.getItem('userName'),
+      COMPANY:process.env.VUE_APP_COMPANY_NAME
     }
   },
   mounted() {

src/components/TrialsTab/index.vue

@@ -4,14 +4,15 @@
     <el-tabs v-model="trialsTab" @tab-click="clickTab">
       <el-tab-pane v-for="item of trialsRouter.children.find(v => {return v.name == 'TrialsPanel'}).children" :key="`tab${item.path}`" :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'" :label="$t(item.LanguageMark)" :name="item.path">
         <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab">
-          <el-tab-pane
-            v-for="item1 of item.children"
-            v-if="TrialConfig && isShow(item1.path)"
-            :key="`tab1${item1.path}`"
-            :disabled="TotalNeedSignTrialDocCount !== 0 && item1.path !== '/trials/trials-panel/attachments/self-attachment' || (TrialStatusStr === 'Initializing' && (item1.path === '/trials/trials-panel/setting/personnel-manage' || item1.path === '/trials/trials-panel/setting/qc-question' || item1.path === '/trials/trials-panel/setting/reading-unit' || item1.path === '/trials/trials-panel/setting/medical-audit' || item1.path === '/trials/trials-panel/setting/email-manage'))"
-            :label="$t(item1.LanguageMark)"
-            :name="item1.path"
-          />
+          <template v-for="item1 of item.children">
+            <el-tab-pane
+              v-if="TrialConfig && isShow(item1.path)"
+              :key="`tab1${item1.path}`"
+              :disabled="TotalNeedSignTrialDocCount !== 0 && item1.path !== '/trials/trials-panel/attachments/self-attachment' || (TrialStatusStr === 'Initializing' && (item1.path === '/trials/trials-panel/setting/personnel-manage' || item1.path === '/trials/trials-panel/setting/qc-question' || item1.path === '/trials/trials-panel/setting/reading-unit' || item1.path === '/trials/trials-panel/setting/medical-audit' || item1.path === '/trials/trials-panel/setting/email-manage'))"
+              :label="$t(item1.LanguageMark)"
+              :name="item1.path"
+            />
+          </template>
         </el-tabs>
       </el-tab-pane>
     </el-tabs>
@@ -126,6 +127,10 @@ export default {
       var additionalAssessmentList = [
         '/trials/trials-panel/subject/brain-metastasis'
       ]
+      let dicomList = [
+        '/trials/trials-panel/trial-summary/image-inspect',
+        '/trials/trials-panel/trial-summary/push-record',
+      ]
       if (this.TrialConfig.QCProcessEnum === 0 && ~qualityList.indexOf(path)) {
         isShow = false
       }
@@ -135,6 +140,9 @@ export default {
       if (!this.IsAdditionalAssessment && ~additionalAssessmentList.indexOf(path)) {
         isShow = false
       }
+      if ((!this.TrialConfig.IsPACSConnect || !this.TrialConfig.IsTrialPACSConfirmed) && ~dicomList.indexOf(path)) {
+        isShow = false
+      }
       return isShow
     },
     goBack() {

src/components/UploadFile/index.vue

@@ -15,7 +15,7 @@
       accept=".pdf"
     >
       <el-button size="small" type="primary" :disabled="btnDisabled || $route.query.ReviewStatus === '1'" >{{ $t('system:GcpCertificate:upload:Upload') }}</el-button>
-      <span slot="tip" class="el-upload__tip">{{$t('system:GcpCertificate:tap:must2') }}</span>
+      <span slot="tip" class="el-upload__tip">{{$t('system:tip:file:pdf') }}</span>
     </el-upload>
   </div>
 </template>

src/components/downloadDicomAndNonedicom/index.vue

@@ -0,0 +1,508 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    :fullscreen="true"
+    :close-on-click-modal="false"
+    :before-close="beforeClose"
+    :append-to-body="true"
+    v-loading="btnLoading"
+    class="downloadDicomAndNonedicom"
+  >
+    <span slot="title">{{ title }}</span>
+    <div class="top">
+      <span>{{ $t('download:top:title') }}</span>
+      <div class="btnBox">
+        <el-button
+          type="primary"
+          size="mini"
+          v-if="hasDicom"
+          @click.stop="getIRReadingDownloadStudyInfo('dicom')"
+        >
+          {{ $t('download:button:downloadDicom') }}
+        </el-button>
+        <el-button
+          type="primary"
+          size="mini"
+          v-if="hasNonedicom"
+          @click.stop="getIRReadingDownloadStudyInfo('noneDicom')"
+        >
+          {{ $t('download:button:downloadNonedicom') }}
+        </el-button>
+        <el-button
+          type="primary"
+          size="mini"
+          v-if="hasDicom || hasNonedicom"
+          @click.stop="getIRReadingDownloadStudyInfo('all')"
+        >
+          {{ $t('download:button:downloadAll') }}
+        </el-button>
+      </div>
+    </div>
+    <div class="tip">
+      <i class="el-icon-warning-outline"></i>
+      <div v-html="$t('download:tip:message')"></div>
+    </div>
+    <!--上传列表@selection-change="handleSelectionChange"-->
+    <el-table
+      ref="dicomFilesTable"
+      v-adaptive="{ bottomOffset: 85 }"
+      height="100"
+      :data="list"
+      :loading="loading"
+      class="dicomFiles-table"
+      @sort-change="handleSortByColumn"
+      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }"
+    >
+      <!-- <el-table-column
+        type="selection"
+        width="55"
+        :selectable="handleSelectable"
+      /> -->
+      <el-table-column type="index" width="40" />
+      <!--受试者-->
+      <el-table-column
+        :label="$t('download:table:subjectCode')"
+        min-width="130"
+        prop="SubjectCode"
+        show-overflow-tooltip
+      />
+      <!--任务名称-->
+      <el-table-column
+        :label="$t('download:table:taskName')"
+        min-width="130"
+        show-overflow-tooltip
+        prop="TaskBlindName"
+        sortable="custom"
+      />
+      <!--检查类型-->
+      <el-table-column
+        :label="$t('download:table:studyType')"
+        min-width="130"
+        show-overflow-tooltip
+        prop="IsDicom"
+        sortable="custom"
+      >
+        <template slot-scope="scope">
+          <span>{{ $fd('IsDicom', scope.row.IsDicom) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('download:table:orginalStudyListNum')"
+        min-width="150"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-if="
+              (scope.row.IsDicom &&
+                scope.row.DicomStudyList &&
+                scope.row.DicomStudyList.length >= 1) ||
+              (!scope.row.IsDicom &&
+                scope.row.NoneDicomStudyList &&
+                scope.row.NoneDicomStudyList.length >= 1)
+            "
+            type="text"
+            @click="handleOpenDialog(scope.row)"
+          >
+            <span>{{
+              scope.row.IsDicom
+                ? scope.row.DicomStudyList.length
+                : scope.row.NoneDicomStudyList.length
+            }}</span>
+          </el-button>
+          <span v-else>0</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('common:action:action')"
+        fixed="right"
+        width="150"
+      >
+        <template slot-scope="scope">
+          <!--预览--->
+          <el-button
+            circle
+            icon="el-icon-view"
+            :title="$t('download:button:preview')"
+            @click.stop="preview(scope.row)"
+          />
+          <!--下载--->
+          <el-button
+            circle
+            icon="el-icon-download"
+            :title="$t('download:button:download')"
+            @click.stop="getIRReadingDownloadStudyInfo('one', scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <study-view
+      v-if="model_cfg.visible"
+      :model_cfg="model_cfg"
+      :modelList="modelList"
+      :bodyPart="bodyPart"
+      :IsDicom="IsDicom"
+    />
+  </el-dialog>
+</template>
+<script>
+import {
+  getSubjectImageDownloadSelectList,
+  getIRReadingDownloadStudyInfo,
+  downloadImageSuccess,
+} from '@/api/load.js'
+import studyView from '@/components/uploadDicomAndNonedicom/study-view.vue'
+import store from '@/store'
+import { downLoadFile } from '@/utils/stream.js'
+import { getToken } from '@/utils/auth'
+let defaultSearchData = () => {
+  return {
+    SubjectId: null,
+    TrialReadingCriterionId: null,
+    SubjectCode: null,
+    Asc: false,
+    SortField: 'TaskBlindName',
+  }
+}
+export default {
+  name: 'downloadDicomAndNonedicom',
+  components: {
+    'study-view': studyView,
+  },
+  props: {
+    visible: {
+      required: true,
+      type: Boolean,
+      default: false,
+    },
+    SubjectId: {
+      type: String,
+      default: '',
+    },
+    TaskId: {
+      type: String,
+      default: '',
+    },
+    SubjectCode: {
+      type: String,
+      default: '',
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
+  },
+  data() {
+    return {
+      title: null,
+      loading: false,
+      list: [],
+      searchData: defaultSearchData(),
+      btnLoading: false,
+      hasDicom: false,
+      hasNonedicom: false,
+      // 检查数弹框
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '1000px',
+        title: '',
+        appendToBody: true,
+      },
+      modelList: [],
+      IsDicom: true,
+      open: null,
+      downloadId: null,
+      IsReadingTaskViewInOrder: 0, // 阅片规则
+      bodyPart: [],
+    }
+  },
+  async mounted() {
+    this.getList()
+    this.bodyPart = await this.$getBodyPart(this.$route.query.trialId)
+    this.title = `Download Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
+  },
+  beforeDestroy() {
+    store.dispatch('trials/setUnLock', false)
+  },
+  methods: {
+    beforeClose() {
+      this.$emit('update:visible', false)
+    },
+    // 获取列表
+    async getList() {
+      try {
+        this.searchData.SubjectId = this.SubjectId
+        this.searchData.TrialReadingCriterionId =
+          this.Criterion.TrialReadingCriterionId
+        this.searchData.SubjectCode = this.SubjectCode
+        if (this.TaskId) {
+          this.searchData.VisitTaskId = this.TaskId
+        }
+        this.loading = true
+        let res = await getSubjectImageDownloadSelectList(this.searchData)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list = res.Result
+          this.hasDicom = this.list.some((item) => item.IsDicom)
+          this.hasNonedicom = this.list.some((item) => !item.IsDicom)
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    // 获取下载文件信息
+    async getIRReadingDownloadStudyInfo(type, row) {
+      try {
+        let data = {
+          SubjectId: this.SubjectId || this.list[0].SubjectId,
+          TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId,
+          SubjectCode: this.SubjectCode || this.list[0].SubjectCode,
+          SubjectVisitTaskList: [],
+          DicomStudyIdList: [],
+          NoneDicomStudyIdList: [],
+        }
+        if (type === 'dicom' || type === 'all') {
+          this.list.forEach((item) => {
+            if (
+              item.IsDicom &&
+              item.DicomStudyList &&
+              item.DicomStudyList.length > 0
+            ) {
+              data.SubjectVisitTaskList.push({
+                SubjectvisitId: item.SourceSubjectVisitId,
+                TaskId: item.VisitTaskId,
+              })
+              let arr = item.DicomStudyList.map((d) => d.Id)
+              data.DicomStudyIdList = [...data.DicomStudyIdList, ...arr]
+            }
+          })
+        }
+        if (type === 'noneDicom' || type === 'all') {
+          this.list.forEach((item) => {
+            if (
+              !item.IsDicom &&
+              item.NoneDicomStudyList &&
+              item.NoneDicomStudyList.length > 0
+            ) {
+              data.SubjectVisitTaskList.push({
+                SubjectvisitId: item.SourceSubjectVisitId,
+                TaskId: item.VisitTaskId,
+              })
+              let arr = item.NoneDicomStudyList.map((d) => d.Id)
+              data.NoneDicomStudyIdList = [...data.NoneDicomStudyIdList, ...arr]
+            }
+          })
+        }
+        if (type === 'one') {
+          if (
+            row.IsDicom &&
+            row.DicomStudyList &&
+            row.DicomStudyList.length > 0
+          ) {
+            data.SubjectVisitTaskList.push({
+              SubjectvisitId: row.SourceSubjectVisitId,
+              TaskId: row.VisitTaskId,
+            })
+            let arr = row.DicomStudyList.map((d) => d.Id)
+            data.DicomStudyIdList = [...data.DicomStudyIdList, ...arr]
+          }
+          if (
+            !row.IsDicom &&
+            row.NoneDicomStudyList &&
+            row.NoneDicomStudyList.length > 0
+          ) {
+            data.SubjectVisitTaskList.push({
+              SubjectvisitId: row.SourceSubjectVisitId,
+              TaskId: row.VisitTaskId,
+            })
+            let arr = row.NoneDicomStudyList.map((d) => d.Id)
+            data.NoneDicomStudyIdList = [...data.NoneDicomStudyIdList, ...arr]
+          }
+        }
+        this.btnLoading = true
+        let res = await getIRReadingDownloadStudyInfo(data)
+        this.btnLoading = false
+        if (res.IsSuccess) {
+          this.downloadId = res.OtherInfo.PreDownloadId
+          this.IsReadingTaskViewInOrder = res.OtherInfo.IsReadingTaskViewInOrder
+          this.downloadImage(res.Result)
+        }
+      } catch (err) {
+        this.btnLoading = false
+        console.log(err)
+      }
+    },
+    // 打包下载
+    async downloadImage(data) {
+      try {
+        let { files, name, fileType } = this.formatDownloadFile(data)
+        let res = await downLoadFile(files, name, 'zip')
+        if (res && this.downloadId) {
+          this.downloadImageSuccess()
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    // 格式化下载文件路径
+    formatDownloadFile(list) {
+      let files = [],
+        name = `${list[0].SubjectCode}_${new Date().getTime()}.zip`
+      if (this.IsReadingTaskViewInOrder === 1) {
+        name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
+      }
+      if (this.IsReadingTaskViewInOrder === 0) {
+        name = `${list[0].TaskBlindName}.zip`
+      }
+      list.forEach((data) => {
+        if (data.StudyList && data.StudyList.length > 0) {
+          let StudyList = data.StudyList
+          StudyList.forEach((study) => {
+            if (study.SeriesList.length > 0) {
+              study.SeriesList.forEach((series) => {
+                if (series.InstancePathList.length > 0) {
+                  series.InstancePathList.forEach((instance) => {
+                    let fileName = instance.Path.split('/').pop()
+                    let obj = {
+                      name: `${data.SubjectCode}/${
+                        data.TaskBlindName
+                      }/${this.$fd('IsDicom', true)}/${
+                        study.StudyCode
+                      }/${fileName}`,
+                      url: this.OSSclientConfig.basePath + instance.Path,
+                    }
+                    if (this.IsReadingTaskViewInOrder === 0) {
+                      obj = {
+                        name: `${data.TaskBlindName}/${this.$fd(
+                          'IsDicom',
+                          true
+                        )}/${fileName}`,
+                        url: this.OSSclientConfig.basePath + instance.Path,
+                      }
+                    }
+                    files.push(obj)
+                  })
+                }
+              })
+            }
+          })
+        }
+        if (data.NoneDicomStudyList && data.NoneDicomStudyList.length > 0) {
+          let NoneDicomStudyList = data.NoneDicomStudyList
+          // 多文件
+          NoneDicomStudyList.forEach((study) => {
+            if (study.FileList.length > 0) {
+              study.FileList.forEach((item) => {
+                let obj = {
+                  name: `${data.SubjectCode}/${data.TaskBlindName}/${this.$fd(
+                    'IsDicom',
+                    false
+                  )}/${study.StudyCode}/${item.FileName}`,
+                  url: this.OSSclientConfig.basePath + item.Path,
+                }
+                if (this.IsReadingTaskViewInOrder === 0) {
+                  obj = {
+                    name: `${data.TaskBlindName}/${this.$fd(
+                      'IsDicom',
+                      false
+                    )}/${item.FileName}`,
+                    url: this.OSSclientConfig.basePath + item.Path,
+                  }
+                }
+                files.push(obj)
+              })
+            }
+          })
+        }
+      })
+      return { files, name }
+    },
+    // 影像下载成功确认
+    async downloadImageSuccess() {
+      try {
+        let params = {
+          TrialImageDownloadId: this.downloadId,
+        }
+        await downloadImageSuccess(params)
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    handleOpenDialog(item) {
+      this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
+      if (item.IsDicom) {
+        this.modelList = item.DicomStudyList
+      } else {
+        this.modelList = item.NoneDicomStudyList
+        this.modelList.forEach((data) => {
+          data.SourceSubjectVisitId = item.SourceSubjectVisitId
+        })
+      }
+      this.IsDicom = item.IsDicom
+      this.model_cfg.visible = true
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    preview(row) {
+      if (!row.IsDicom) {
+        this.handlePreviewNoneDicomFiles(row)
+      } else {
+        this.handleViewReadingImages(row)
+      }
+    },
+    // 预览单个检查下非Dicom文件
+    handlePreviewNoneDicomFiles(row) {
+      if (this.open) {
+        this.open.close()
+      }
+      let trialId = this.$route.query.trialId
+      var token = getToken()
+      const routeData = this.$router.resolve({
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}`,
+      })
+      this.open = window.open(routeData.href, '_blank')
+    },
+    // 预览阅片影像
+    handleViewReadingImages(row) {
+      if (this.open) {
+        this.open.close()
+      }
+      var token = getToken()
+      let trialId = this.$route.query.trialId
+      const routeData = this.$router.resolve({
+        path: `/showvisitdicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
+      })
+      this.open = window.open(routeData.href, '_blank')
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.top {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 10px 0;
+}
+.tip {
+  display: flex;
+  align-items: flex-start;
+  margin-top: 5px;
+  i {
+    margin: 3px 5px 0 0;
+  }
+}
+</style>

src/components/feedBack/fun.js

@@ -0,0 +1,37 @@
+import Vue from "vue";
+import FEEDBACKCOMP from "./index.vue";
+const FBConstructor = Vue.extend(FEEDBACKCOMP);
+let FBCINSTANCELIST = [];
+const FB = options => {
+    const { type, callBack, cancelBack, trialId = null, Id = null, visitTaskId = null, SubjectVisitId = null } = options;
+    if (!type) throw `type is requred.but ${type}`
+    const id = `FB${new Date().getTime()}`;
+    const instance = new FBConstructor();
+    FBCINSTANCELIST.push(instance);
+    instance.id = id;
+    instance.vm = instance.$mount();
+    if (instance.vm.visible) return;
+    document.body.appendChild(instance.vm.$el);
+    instance.vm.open({ type, trialId, Id, visitTaskId, SubjectVisitId });
+    instance.vm.$on("success", (Id) => {
+        if (callBack) callBack();
+
+    });
+    instance.vm.$on("closed", () => {
+        document.body.removeChild(instance.vm.$el);
+        instance.vm.$destroy();
+        let index = FBCINSTANCELIST.findIndex(item => item.id === id);
+        FBCINSTANCELIST.splice(index, 1)
+        if (cancelBack) cancelBack()
+    });
+    return instance.vm;
+}
+FB.close = () => {
+    if (FBCINSTANCELIST.length <= 0) return;
+    FBCINSTANCELIST.forEach(item => {
+        document.body.removeChild(item.vm.$el);
+        item.vm.$destroy();
+    })
+    FBCINSTANCELIST = [];
+}
+export default FB;

src/components/feedBack/index.js

@@ -0,0 +1,7 @@
+import FEEDBACKCOMP from "./index.vue";
+import FB from "./fun";
+
+export default Vue => {
+    Vue.component(FEEDBACKCOMP.name, FEEDBACKCOMP);
+    Vue.prototype.$FB = FB;
+};

src/components/feedBack/index.vue

@@ -0,0 +1,416 @@
+<template>
+  <!--FEEDBACK-->
+  <div v-if="visible" @click.stop="() => false" class="feedBack-box">
+    <div class="feedBack-box-modal"></div>
+    <el-dialog
+      :visible.sync="visible"
+      v-dialogDrag
+      width="800px"
+      :close-on-click-modal="false"
+      @close="cancel"
+      :modal="false"
+    >
+      <div slot="title">
+        {{ title }}
+      </div>
+      <!-- 项目详情 -->
+      <div class="trialsBox" v-if="visitTaskId || SubjectVisitId">
+        <el-form
+          label-position="right"
+          :model="form"
+          :inline="true"
+          class="trialsForm"
+          v-if="type === 'detail'"
+        >
+          <el-form-item :label="$t('feedBack:trials:code')" style="width: 40%">
+            <span>{{ form.TrialCode }}</span>
+          </el-form-item>
+          <el-form-item :label="$t('feedBack:trials:name')" style="width: 40%">
+            <span>{{ form.ExperimentName }}</span>
+          </el-form-item>
+          <el-form-item
+            :label="$t('feedBack:trials:siteCode')"
+            style="width: 40%"
+          >
+            <span>{{ form.TrialSiteCode }}</span>
+          </el-form-item>
+          <el-form-item :label="$t('feedBack:trials:visit')" style="width: 40%">
+            <span>{{ form.SubjectCode }} - {{ form.SubjectVisitName }}</span>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-form
+        ref="feedBackForm"
+        label-position="right"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+      >
+        <!-- 影像异常tip -->
+        <p class="tip" v-if="type === 'imgfail'">
+          <i
+            class="el-icon-warning-outline"
+            style="color: #f56c6c; font-size: 24px"
+          ></i>
+          <span>{{ $t("feedBack:imgfail:tip") }}</span>
+        </p>
+        <!-- 问题反馈 -->
+        <el-form-item
+          :label="$t('feedBack:form:feedBack')"
+          prop="QuestionType"
+          v-if="type === 'feedback' && trialId"
+        >
+          <el-select
+            v-model="form.QuestionType"
+            style="width: 100%"
+            popper-class="feedBack-select-box"
+          >
+            <el-option
+              v-for="item in QuestionTypeOptions"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- 问题反馈 -->
+        <el-form-item
+          :label="$t('feedBack:form:feedBack')"
+          prop="QuestionType"
+          v-if="type === 'detail'"
+        >
+          <span>{{
+            QuestionTypeOptions.filter(
+              (item) => item.value === form.QuestionType
+            )[0].label
+          }}</span>
+        </el-form-item>
+        <!-- 问题描述 -->
+        <el-form-item
+          :label="$t('feedBack:form:description')"
+          prop="QuestionDescription"
+        >
+          <el-input
+            v-model="form.QuestionDescription"
+            type="textarea"
+            :rows="4"
+            :maxlength="500"
+            :disabled="type === 'detail'"
+          />
+        </el-form-item>
+        <!-- 截图 -->
+        <el-form-item :label="$t('feedBack:form:screenshot')" prop="screenshot">
+          <uploadImage
+            :path.sync="form.ScreenshotList"
+            :isUpload.sync="loading"
+            :trialId="trialId"
+            :disabled="type === 'detail'"
+            ref="uploadImage"
+          />
+        </el-form-item>
+        <!-- 反馈时间 -->
+        <el-form-item
+          :label="$t('feedBack:form:time')"
+          prop="screenshot"
+          v-if="type === 'detail'"
+        >
+          <span>{{ form.CreateTime }}</span>
+        </el-form-item>
+        <!-- 状态 -->
+        <el-form-item
+          :label="$t('feedBack:form:status')"
+          prop="screenshot"
+          v-if="type === 'detail' && level > 7"
+        >
+          <el-switch
+            v-model="form.State"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            :active-value="1"
+            :inactive-value="0"
+            :active-text="$fd('FeedBackStatus', 1)"
+            :inactive-text="$fd('FeedBackStatus', 0)"
+            :disabled="level < 8 || !isStateChange"
+            @change="changeState"
+          >
+          </el-switch>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" v-if="type !== 'detail' || isImgfail">
+        <!-- 取消 -->
+        <el-button size="small" @click.stop="cancel">
+          {{ $t("feedBack:button:cancel") }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button
+          type="primary"
+          size="small"
+          @click.stop="save"
+          :loading="loading"
+        >
+          {{ $t("feedBack:button:save") }}
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import uploadImage from "./uploadImage.vue";
+import {
+  addOrUpdateUserFeedBack,
+  getUserFeedBackInfo,
+  batchUpdateFeedBackState,
+} from "@/api/trials.js";
+export default {
+  name: "FB",
+  components: { uploadImage },
+  data() {
+    return {
+      title: null,
+      visible: false,
+      loading: false,
+      options: [],
+      type: null, // detail 表格详情  feedback 填写反馈  imgfail 影像异常
+      trialId: null, // 项目id
+      Id: null, // 反馈数据id
+      visitTaskId: null, // 任务id
+      isImgfail: false, // 是否是影像异常
+      isStateChange: true, // 是否可以切换状态
+      form: {
+        Id: null,
+        SubjectId: null,
+        SubjectVisitId: null,
+        QuestionType: 0,
+        QuestionDescription: null,
+        State: 0,
+        TrialSiteId: null,
+        TrialId: null,
+        VisitTaskId: null,
+        SubjectVisitId: null,
+        ScreenshotList: [],
+        ScreenshotListStr: null,
+      },
+      rules: {
+        QuestionType: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        QuestionDescription: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (value.length < 5) {
+                callback(
+                  new Error(this.$t("feedBack:ruleMessage:lengthLimitMin5"))
+                );
+              }
+              callback();
+            },
+            trigger: "blur",
+          },
+        ],
+      },
+      isUpload: false,
+    };
+  },
+  computed: {
+    level() {
+      if (this.hasPermi(["role:dev", "role:admin"])) {
+        return 9;
+      }
+      if (this.hasPermi(["role:pm"])) {
+        return 8;
+      }
+      if (this.hasPermi(["role:ir", "role:crc"])) {
+        return 7;
+      }
+      return 0;
+    },
+    QuestionTypeOptions() {
+      if (this.level > 7) {
+        return [
+          ...this.$d.FeedBackTypeToCRC.filter((item) => item.value > 0),
+          ...this.$d.FeedBackTypeToIR,
+        ];
+      }
+      if (this.hasPermi(["role:ir"])) {
+        return this.$d.FeedBackTypeToIR;
+      }
+      if (this.hasPermi(["role:crc"])) {
+        return this.$d.FeedBackTypeToCRC;
+      }
+      return [];
+    },
+  },
+  methods: {
+    open(data) {
+      let { type, trialId, Id, visitTaskId, SubjectVisitId } = data;
+      this.type = type;
+      this.trialId = trialId;
+      this.Id = Id;
+      this.visitTaskId = visitTaskId;
+      this.SubjectVisitId = SubjectVisitId;
+      if (visitTaskId) {
+        this.isImgfail = true;
+      }
+      this.setTypeOption();
+      if (!Id) {
+        this.title = this.setTitle();
+      }
+      if (Id || visitTaskId) {
+        this.getInfo(Id, visitTaskId);
+      }
+      this.visible = true;
+    },
+    cancel() {
+      this.visible = false;
+      this.$emit("closed");
+    },
+    async save() {
+      try {
+        let validate = await this.$refs.feedBackForm.validate();
+        if (!validate) return;
+        if (this.trialId) {
+          this.form.TrialId = this.trialId;
+        }
+        if (this.visitTaskId) {
+          this.form.VisitTaskId = this.visitTaskId;
+        }
+        if (this.SubjectVisitId) {
+          this.form.SubjectVisitId = this.SubjectVisitId;
+        }
+        if (this.Id) {
+          this.form.Id = this.Id;
+        }
+        this.loading = true;
+        let res = await addOrUpdateUserFeedBack(this.form);
+        this.loading = false;
+        if (res.IsSuccess) {
+          this.$emit("success");
+          this.$message.success(this.$t("feedBack:save:success"));
+          this.cancel();
+        }
+      } catch (err) {
+        this.loading = false;
+        console.log(err);
+      }
+    },
+    // 修改状态
+    async changeState() {
+      if (this.isImgfail) return;
+      try {
+        let data = {
+          IdList: [this.Id],
+          State: this.form.State,
+        };
+        let res = await batchUpdateFeedBackState(data);
+        if (res.IsSuccess) {
+          this.$message.success(this.$t("feedBack:changeState:success"));
+          this.$emit("success");
+          // this.cancel();
+          this.getInfo(this.Id, this.visitTaskId);
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    // 获取反馈详情
+    async getInfo(Id, visitTaskId) {
+      try {
+        let data = {
+          Id,
+          visitTaskId,
+        };
+        let res = await getUserFeedBackInfo(data);
+        if (res.IsSuccess && res.Result) {
+          this.form = res.Result;
+          this.form.ScreenshotList = this.form.ScreenshotList || []
+          this.Id = res.Result.Id;
+          if (res.Result.State > 0) {
+            this.isStateChange = false;
+          }
+          if (res.Result.VisitTaskId) {
+            this.visitTaskId = res.Result.VisitTaskId;
+          }
+          if (res.Result.SubjectVisitId) {
+            this.SubjectVisitId = res.Result.SubjectVisitId;
+          }
+          let code = this.$fd("UserType", res.Result.UserTypeEnum);
+          this.title = this.setTitle(code, res.Result.FeedBackFullName);
+          if (visitTaskId) {
+            code = `${res.Result.SubjectCode}-${res.Result.SubjectVisitName}`;
+            this.title = this.setTitle(code, res.Result.FeedBackFullName);
+          }
+          this.$refs.uploadImage.initFileList(res.Result.ScreenshotList);
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    setTypeOption() {
+      if (!this.trialId) return (this.options = []);
+      if (this.hasPermi(["role:ir"]))
+        return (this.option = this.$d.FeedBackTypeToIR);
+      if (this.hasPermi(["role:crc"]))
+        return (this.option = this.$d.FeedBackTypeToCRC);
+    },
+    setTitle(code, name) {
+      if (this.hasPermi(["role:pm"]) && this.visitTaskId) {
+        return `${this.$t("feedBack:form:title:pm2")}(${code}/${name})`;
+      }
+      if (this.hasPermi(["role:pm", "role:dev", "role:admin"])) {
+        return `${this.$t("feedBack:form:title:pm")}(${code},${name})`;
+      }
+      if (this.hasPermi(["role:ir", "role:crc"]) && this.type === "detail") {
+        return `${this.$t("feedBack:form:detail:title")}`;
+      }
+      if (this.hasPermi(["role:ir", "role:crc"])) {
+        return `${this.$t("feedBack:form:title")}`;
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.tip {
+  width: 86%;
+  margin: auto;
+  margin-bottom: 20px;
+  text-align: left;
+  padding: 0 10px;
+  display: flex;
+  align-items: center;
+  // border-radius: 5px;
+  // background-color: #eee;
+  i {
+    margin-right: 5px;
+  }
+}
+.trialsBox {
+  margin: auto;
+  margin-bottom: 20px;
+  text-align: left;
+  padding: 0 10px;
+  display: flex;
+  align-items: center;
+  border-radius: 5px;
+  background-color: #eee;
+}
+.trialsForm {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  .el-form-item {
+    margin-bottom: 10px;
+  }
+}
+</style>

src/components/feedBack/uploadImage.vue

@@ -0,0 +1,252 @@
+<template>
+  <div class="upload-container">
+    <el-upload
+      class="upload-demo"
+      :class="{ uploadDisabled: disabled ? true : false }"
+      action
+      multiple
+      :http-request="uploadFile"
+      :before-upload="beforeUpload"
+      :file-list="fileList"
+      :on-preview="handlePreview"
+      :on-remove="remove"
+      :on-exceed="handleExceed"
+      accept=".png,.jpg,.jpeg"
+      list-type="picture-card"
+    >
+      <i slot="default" class="el-icon-plus"></i>
+      <div slot="file" slot-scope="{ file }" style="width: 100%; height: 100%">
+        <viewer
+          :ref="file.url"
+          :images="fileList"
+          style="
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 100%;
+            height: 100%;
+          "
+        >
+          <img
+            class="el-upload-list__item-thumbnail"
+            :src="`${file.url}`"
+            alt=""
+            crossorigin="anonymous"
+            style="max-width: 100%; max-height: 100%"
+          />
+          <span class="el-upload-list__item-actions" v-if="!isUpload">
+            <span
+              class="el-upload-list__item-preview"
+              @click="handlePictureCardPreview(file)"
+            >
+              <i class="el-icon-zoom-in"></i>
+            </span>
+            <span
+              class="el-upload-list__item-delete"
+              v-if="!disabled"
+              @click="handleRemove(file)"
+            >
+              <i class="el-icon-delete"></i>
+            </span>
+          </span>
+          <div class="loadingBox" v-else>
+            <i class="el-icon-loading" style="color: #fff; margin: auto"></i>
+          </div>
+        </viewer>
+      </div>
+    </el-upload>
+  </div>
+</template>
+<script>
+const type = "Statement of Work";
+export default {
+  name: "UploadImage",
+  props: {
+    path: {
+      required: true,
+      default: () => {
+        return [];
+      },
+    },
+    disabled: {
+      required: true,
+      default: false,
+    },
+    isUpload: {
+      required: true,
+      default: false,
+    },
+    trialId: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      fileList: [],
+      btnDisabled: false,
+    };
+  },
+  methods: {
+    remove(file, fileList) {
+      // this.$emit("update:path", null);
+    },
+    fileToBlob(file) {
+      // 创建 FileReader 对象
+      const reader = new FileReader();
+      return new Promise((resolve) => {
+        // FileReader 添加 load 事件
+        reader.addEventListener("load", (e) => {
+          let blob;
+          if (typeof e.target.result === "object") {
+            blob = new Blob([e.target.result]);
+          } else {
+            blob = e.target.result;
+          }
+          resolve(blob);
+        });
+        // FileReader 以 ArrayBuffer 格式 读取 File 对象中数据
+        reader.readAsArrayBuffer(file);
+      });
+    },
+    // 上传oss
+    async uploadToOSS(name, file) {
+      try {
+        let defaultPath = "/System/FeedBack/";
+        if (this.trialId) {
+          defaultPath = `/${this.trialId}/FeedBack/`;
+        }
+        let res = await this.OSSclient.put(`${defaultPath}${name}`, file);
+        return res;
+      } catch (err) {
+        console.log(err);
+        return false;
+      }
+    },
+    initFileList(list) {
+      if (list && list.length > 0) {
+        this.fileList = [];
+        list.forEach((item, index) => {
+          let name = item.split("/");
+          this.fileList.push({
+            name: name[name.length - 1],
+            path: item,
+            fullPath: this.OSSclientConfig.basePath + item,
+            url: this.OSSclientConfig.basePath + item,
+            uid: `${name[name.length - 1]}${index}`,
+          });
+        });
+        console.log(this.fileList);
+      }
+    },
+    async uploadFile(param) {
+      var fileName = param.file.name;
+      this.$emit("update:isUpload", true);
+      this.btnDisabled = true;
+      this.fileList.push({
+        url: param.file.url,
+        path: fileName,
+        uid: param.file.uid,
+      });
+      let file = await this.fileToBlob(param.file);
+      let res = await this.uploadToOSS(fileName, file);
+      this.btnDisabled = false;
+      let index = this.fileList.findIndex(
+        (item) => item.uid === param.file.uid
+      );
+      if (!res) {
+        if (index >= 0) {
+          this.fileList.splice(index, 1);
+        }
+        return this.$emit("update:isUpload", false);
+      }
+      this.fileList[index].url = this.OSSclientConfig.basePath + res.name;
+      this.fileList[index].path = res.name;
+      this.$emit("update:path", [...this.path, res.name]);
+      this.$emit("update:isUpload", false);
+      return false;
+    },
+    beforeUpload(file, fileList) {
+      const isValidFile = this.fileValid(file.name, ["png", "jpg", "jpeg"]);
+      if (isValidFile) {
+        // this.fileList = [];
+      } else {
+        this.$alert(this.$t("feedBack:uploadImg:format"));
+        return false;
+      }
+    },
+    handlePreview(file) {
+      file.fullPath ? window.open(file.fullPath, "_blank") : "";
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(`Upload is currently limited to 1 file`);
+    },
+    fileValid(fileName, typeArr) {
+      var extendName = fileName
+        .substring(fileName.lastIndexOf(".") + 1)
+        .toLocaleLowerCase();
+      if (typeArr.indexOf(extendName) > -1) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+    handlePictureCardPreview(file) {
+      this.$refs[file.url].$viewer.show();
+    },
+    handleRemove(file) {
+      let index = this.fileList.findIndex((item) => item.uid === file.uid);
+      this.fileList.splice(index, 1);
+      let arr = this.fileList.map((item) => item.path);
+      this.$emit("update:path", arr);
+    },
+  },
+};
+</script>
+<style>
+.upload-container .el-upload--text {
+  border: none;
+  width: 80px;
+  height: 30px;
+}
+.upload-container .el-form-item__label {
+  font-size: 12px;
+}
+.upload-container .el-upload-list__item {
+  font-size: 12px;
+}
+.logoAMessage {
+  font-size: 12px;
+  cursor: pointer;
+}
+.upload-container .uploadDisabled .el-upload--picture-card {
+  display: none;
+}
+.upload-container .el-upload--picture-card {
+  width: 100px;
+  height: 100px;
+  line-height: 100px;
+}
+.upload-container .el-upload-list--picture-card .el-upload-list__item {
+  width: 100px;
+  height: 100px;
+  line-height: 100px;
+}
+.loadingBox {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  left: 0;
+  width: 100px;
+  height: 100px;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.el-upload-list--picture-card .el-upload-list__item-thumbnail {
+  width: auto;
+  height: auto;
+}
+</style>

src/components/feedBackTable/fun.js

@@ -0,0 +1,35 @@
+import Vue from "vue";
+import FEEDBACKCOMP from "./index.vue";
+const FBConstructor = Vue.extend(FEEDBACKCOMP);
+let FBCTABLEINSTANCELIST = [];
+const FBT = (options = {}) => {
+    const { data = {}, callBack } = options;
+    // if (!UserId) throw `UserId is requred.but ${UserId}`
+    const id = `FB${new Date().getTime()}`;
+    const instance = new FBConstructor();
+    FBCTABLEINSTANCELIST.push(instance);
+    instance.id = id;
+    instance.vm = instance.$mount();
+    if (instance.vm.visible) return;
+    document.body.appendChild(instance.vm.$el);
+    instance.vm.open({ ...data });
+    instance.vm.$on("success", (Id) => {
+        if (callBack) callBack();
+    });
+    instance.vm.$on("closed", () => {
+        document.body.removeChild(instance.vm.$el);
+        instance.vm.$destroy();
+        let index = FBCTABLEINSTANCELIST.findIndex(item => item.id === id);
+        FBCTABLEINSTANCELIST.splice(index, 1)
+    });
+    return instance.vm;
+}
+FBT.close = () => {
+    if (FBCTABLEINSTANCELIST.length <= 0) return;
+    FBCTABLEINSTANCELIST.forEach(item => {
+        document.body.removeChild(item.vm.$el);
+        item.vm.$destroy();
+    })
+    FBCTABLEINSTANCELIST = [];
+}
+export default FBT;

src/components/feedBackTable/index.js

@@ -0,0 +1,7 @@
+import FEEDBACKCOMP from "./index.vue";
+import FBT from "./fun";
+
+export default Vue => {
+    Vue.component(FEEDBACKCOMP.name, FEEDBACKCOMP);
+    Vue.prototype.$FBT = FBT;
+};

src/components/feedBackTable/index.vue

@@ -0,0 +1,62 @@
+<template>
+  <div v-if="visible" @click.stop="() => false" class="feedBack-box">
+    <el-dialog
+      :visible.sync="visible"
+      v-dialogDrag
+      width="1200px"
+      :close-on-click-modal="false"
+      @close="cancel"
+      :fullscreen="true"
+    >
+      <div slot="title">
+        {{ title }}
+      </div>
+      <feedBackTable :trialId="trialId" @success="success" />
+    </el-dialog>
+  </div>
+</template>
+<script>
+import feedBackTable from "@/views/feedBack/index.vue";
+export default {
+  name: "FBT",
+  components: { feedBackTable },
+  data() {
+    return {
+      title: null,
+      visible: false,
+      trialId: null,
+    };
+  },
+  computed: {},
+  methods: {
+    open(data) {
+      let { code, name, trialId } = data;
+      this.title = this.setTitle(code, name);
+      this.trialId = trialId;
+      this.visible = true;
+    },
+    cancel() {
+      this.visible = false;
+      this.$emit("closed");
+    },
+    setTitle(code, name) {
+      if (this.hasPermi(["role:pm"])) {
+        return `${this.$t("feedBack:table:title:pm")}(${code},${name})`;
+      }
+      if (this.hasPermi(["role:ir", "role:crc"])) {
+        return `${this.$t("feedBack:table:title")}`;
+      }
+    },
+    success() {
+      this.$emit("success");
+    },
+  },
+};
+</script>
+// <style lang="scss" scoped>
+// ::v-deep .el-dialog__body {
+//   padding-bottom: 0;
+//   height: 500px;
+// }
+//
+</style>

src/components/uploadDicomAndNonedicom/index.vue

@@ -0,0 +1,115 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    :fullscreen="true"
+    :close-on-click-modal="false"
+    :before-close="beforeClose"
+    :append-to-body="true"
+    class="uploadDicomAndNonedicom"
+  >
+    <span slot="title">{{ title }}</span>
+    <el-tabs type="border-card" v-model="activeName">
+      <el-tab-pane
+        :label="$t('uploadDicomAndNonedicom:label:dicom')"
+        name="dicom"
+      >
+        <dicomFile
+          v-if="activeName === 'dicom'"
+          :SubjectId="SubjectId"
+          :SubjectCode="SubjectCode"
+          :Criterion="Criterion"
+          :TaskId="VisitTaskId"
+          :isUpload.sync="isUpload"
+          :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
+        />
+      </el-tab-pane>
+      <el-tab-pane
+        :label="$t('uploadDicomAndNonedicom:label:nonedicom')"
+        name="nonedicom"
+      >
+        <nonedicomFile
+          v-if="activeName === 'nonedicom'"
+          :SubjectId="SubjectId"
+          :SubjectCode="SubjectCode"
+          :Criterion="Criterion"
+          :VisitTaskId="VisitTaskId"
+          :isUpload.sync="isUpload"
+        />
+      </el-tab-pane>
+    </el-tabs>
+  </el-dialog>
+</template>
+<script>
+import dicomFile from './dicomFile.vue'
+import nonedicomFile from './nonedicomFile.vue'
+export default {
+  name: 'uploadDicomAndNonedicom',
+  components: { dicomFile, nonedicomFile },
+  props: {
+    visible: {
+      required: true,
+      type: Boolean,
+      default: false,
+    },
+    SubjectId: {
+      type: String,
+      default: '',
+    },
+    SubjectCode: {
+      type: String,
+      default: '',
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
+    VisitTaskId: {
+      type: String,
+      default: '',
+    },
+    isReadingTaskViewInOrder: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      title: '',
+      activeName: 'dicom',
+      isUpload: false,
+    }
+  },
+  mounted() {
+    this.title = `Upload Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
+  },
+  methods: {
+    beforeClose() {
+      if (
+        this.$route.path !== '/trials/trials-panel/reading/readingTask' &&
+        this.isUpload
+      ) {
+        return window.location.reload()
+      }
+      this.$emit('update:visible', false)
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep.el-tabs--left .el-tabs__header.is-left {
+  margin-right: 0;
+}
+.uploadDicomAndNonedicom {
+  ::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item {
+    color: #909399;
+  }
+  ::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
+    color: #428bca;
+    background-color: #fff;
+    border-right-color: #dcdfe6;
+    border-left-color: #dcdfe6;
+  }
+}
+</style>

src/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -0,0 +1,916 @@
+<template>
+  <div class="nonedicomFile">
+    <div class="top">
+      <span>{{ $t('upload:nonedicom:title') }}</span>
+      <div class="tip">
+        <i class="el-icon-warning-outline"></i>
+        <div v-html="$t('upload:nonedicom:tip:message')"></div>
+      </div>
+    </div>
+    <!--检查列表-->
+    <el-table
+      :data="list"
+      style="width: 100%"
+      v-adaptive="{ bottomOffset: 60 }"
+      :loading="loading"
+      @sort-change="handleSortByColumn"
+      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }"
+    >
+      <!--受试者-->
+      <el-table-column
+        prop="SubjectCode"
+        :label="$t('upload:nonedicom:table:subject')"
+      />
+      <!--任务名称-->
+      <el-table-column
+        prop="TaskBlindName"
+        :label="$t('upload:nonedicom:table:taskName')"
+        sortable="custom"
+      />
+      <!--检查类型-->
+      <el-table-column
+        prop="Modality"
+        :label="$t('upload:nonedicom:table:molityType')"
+        sortable="custom"
+      >
+      </el-table-column>
+      <!--检查部位-->
+      <el-table-column
+        prop="BodyPart"
+        :label="$t('upload:nonedicom:table:bodyPart')"
+        sortable="custom"
+      />
+      <!--原文件数-->
+      <el-table-column
+        prop="FileCount"
+        :label="$t('upload:nonedicom:table:fileCount')"
+      >
+        <template slot-scope="scope">
+          <el-popover
+            v-if="scope.row.FileCount"
+            trigger="click"
+            placement="bottom"
+          >
+            <el-table :data="scope.row.FileList" height="300" size="small">
+              <!-- 文件名称 -->
+              <el-table-column
+                prop="FileName"
+                :label="$t('trials:audit:table:nonDicomsFileName')"
+                width="200"
+              />
+              <el-table-column
+                prop="FileSize"
+                :label="$t('trials:audit:table:nonDicomsFileSize')"
+                width="100"
+              >
+                <template slot-scope="scope">
+                  <span>{{
+                    scope.row.FileSize && scope.row.FileSize > 0
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
+                      : 0
+                  }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('common:action:action')" width="120">
+                <template slot-scope="files">
+                  <!-- 预览 -->
+                  <viewer
+                    :ref="files.row.Path"
+                    style="margin: 0 10px"
+                    :images="[`${OSSclientConfig.basePath}${files.row.Path}`]"
+                  >
+                    <el-button
+                      circle
+                      icon="el-icon-view"
+                      :title="$t('upload:nonedicom:button:preview')"
+                      :disabled="
+                        files.row.FileType &&
+                        files.row.FileType.indexOf('zip') >= 0
+                      "
+                      @click.native.prevent="previewFile(files.row)"
+                    />
+                    <img
+                      v-show="false"
+                      crossorigin="anonymous"
+                      :src="`${OSSclientConfig.basePath}${files.row.Path}`"
+                      alt="Image"
+                    />
+                  </viewer>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div slot="reference" class="name-wrapper">
+              <el-button type="text">
+                {{ scope.row.FileCount }}
+              </el-button>
+            </div>
+          </el-popover>
+          <span v-else>{{ scope.row.FileCount }}</span>
+        </template>
+      </el-table-column>
+      <!--后处理文件数-->
+      <el-table-column
+        prop="UploadedFileCount"
+        :label="$t('upload:nonedicom:table:uploadFileCount')"
+      >
+        <template slot-scope="scope">
+          <el-popover
+            v-if="scope.row.UploadedFileCount"
+            trigger="click"
+            placement="bottom"
+          >
+            <el-table
+              :data="scope.row.UploadedFileList"
+              height="300"
+              size="small"
+            >
+              <!-- 文件名称 -->
+              <el-table-column
+                prop="FileName"
+                :label="$t('trials:audit:table:nonDicomsFileName')"
+                width="200"
+              />
+              <el-table-column
+                prop="FileSize"
+                :label="$t('trials:audit:table:nonDicomsFileSize')"
+                width="100"
+              >
+                <template slot-scope="scope">
+                  <span>{{
+                    scope.row.FileSize && scope.row.FileSize > 0
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
+                      : 0
+                  }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('common:action:action')" width="120">
+                <template slot-scope="files">
+                  <!-- 预览 -->
+                  <viewer
+                    :ref="files.row.Path"
+                    style="margin: 0 10px"
+                    :images="[`${OSSclientConfig.basePath}${files.row.Path}`]"
+                  >
+                    <el-button
+                      circle
+                      icon="el-icon-view"
+                      :title="$t('upload:nonedicom:button:preview')"
+                      :disabled="
+                        files.row.FileType &&
+                        files.row.FileType.indexOf('zip') >= 0
+                      "
+                      @click.native.prevent="previewFile(files.row)"
+                    />
+                    <img
+                      v-show="false"
+                      crossorigin="anonymous"
+                      :src="`${OSSclientConfig.basePath}${files.row.Path}`"
+                      alt="Image"
+                    />
+                  </viewer>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div slot="reference" class="name-wrapper">
+              <el-button type="text">
+                {{ scope.row.UploadedFileCount }}
+              </el-button>
+            </div>
+          </el-popover>
+          <span v-else>{{ scope.row.UploadedFileCount }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('common:action:action')"
+        fixed="right"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <!--预览--->
+          <el-button
+            circle
+            :disabled="scope.row.UploadedFileCount <= 0"
+            icon="el-icon-view"
+            :title="$t('upload:nonedicom:button:preview')"
+            @click.stop="handlePreviewNoneDicomFiles(scope.row)"
+          />
+          <!--上传--->
+          <el-button
+            circle
+            icon="el-icon-upload2"
+            :title="$t('upload:nonedicom:button:upload')"
+            @click.native.prevent="handleUpload(scope.row)"
+          />
+          <!--删除--->
+          <el-button
+            :disabled="scope.row.UploadedFileCount <= 0"
+            circle
+            icon="el-icon-delete"
+            :title="$t('upload:nonedicom:button:delete')"
+            @click.stop="remove(scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 预览单个图像 -->
+    <el-dialog
+      v-if="imgObj.visible"
+      :visible.sync="imgObj.visible"
+      :title="$t('upload:nonedicom:dialogTitle:preview')"
+      append-to-body
+      width="565px"
+    >
+      <div
+        v-loading="imgObj.loading"
+        class="base-modal-body"
+        style="border: 2px solid #ccc; padding: 10px"
+      >
+        <el-image
+          :src="`${OSSclientConfig.basePath}${imgObj.url}`"
+          crossorigin="anonymous"
+          fit="fit"
+          style="height: 500px; width: 500px"
+          @error="imgObj.loading = false"
+          @load="imgObj.loading = false"
+        />
+      </div>
+    </el-dialog>
+    <!-- 上传非dicom文件 -->
+    <el-dialog
+      v-if="uploadVisible"
+      :visible.sync="uploadVisible"
+      :close-on-click-modal="false"
+      :title="$t('trials:uploadNonDicoms:dialogTitle:upload')"
+      width="800px"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+      @close="resetFileDiaolg"
+    >
+      <!-- 多文件上传 -->
+      <form id="inputForm" ref="uploadForm">
+        <el-divider content-position="left">{{
+          $t('trials:uploadNonDicoms:label:fileType')
+        }}</el-divider>
+        <div class="form-group">
+          <div class="upload" style="margin-right: 10px">
+            <input
+              multiple="multiple"
+              webkitdirectory=""
+              directory
+              accept="*/*"
+              type="file"
+              name="uploadFolder"
+              class="select-file"
+              title=""
+              @change="beginScanFiles($event)"
+              v-if="!btnLoading"
+            />
+            <div class="btn-select">
+              {{ $t('trials:uploadNonDicoms:button:selectFolder') }}
+            </div>
+          </div>
+          <div class="upload">
+            <input
+              class="select-file"
+              multiple=""
+              :accept="faccept.join(',')"
+              type="file"
+              name="uploadFile"
+              title=""
+              @change="beginScanFiles($event)"
+              v-if="!btnLoading"
+            />
+            <div class="btn-select">
+              {{ $t('trials:uploadNonDicoms:button:select') }}
+            </div>
+          </div>
+          <!-- <span style="margin-left: 10px">{{
+            $store.state.trials.uploadTip
+          }}</span> -->
+        </div>
+      </form>
+      <!-- 文件列表 -->
+      <el-table
+        ref="filesTable"
+        :data="fileList"
+        class="dicomFiles-table"
+        height="300"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          :selectable="(row, index) => row.status !== 2 && !btnLoading"
+        />
+        <el-table-column type="index" width="50" />
+        <!-- 文件名称 -->
+        <el-table-column
+          prop="name"
+          :label="$t('trials:uploadNonDicoms:table:fileName')"
+          min-width="100"
+        />
+        <!-- 文件大小 -->
+        <el-table-column
+          prop="size"
+          :label="$t('trials:uploadNonDicoms:table:fileSize')"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.size && scope.row.size > 0
+                ? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
+                : 0
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- 文件类型 -->
+        <el-table-column
+          prop="type"
+          :label="$t('trials:uploadNonDicoms:table:fileType')"
+        />
+        <!-- 上传状态 -->
+        <el-table-column
+          prop="status"
+          :label="$t('trials:uploadNonDicoms:table:uploadStatus')"
+          min-width="100"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              :type="['warning', 'info', 'success', 'danger'][scope.row.status]"
+              v-if="scope.row.status || scope.row.status === 0"
+              >{{ $fd('NoneDicomUploadStatus', scope.row.status) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('trials:uploadNonDicoms:table:failedFileCount')"
+          min-width="150"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-progress
+              color="#409eff"
+              :percentage="
+                ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
+                1
+              "
+            />
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('common:action:action')">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              icon="el-icon-delete"
+              circle
+              :disabled="btnLoading"
+              :title="$t('trials:crcUpload:action:delete')"
+              @click="handleRemoveFile(scope.row)"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="text-align: right; padding: 10px 0px">
+        <span style="margin-right: 10px">{{
+          $store.state.trials.uploadTip
+        }}</span>
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="selectArr.length == 0"
+          :loading="btnLoading"
+          @click="beginUpload"
+        >
+          {{ $t('trials:uploadNonDicoms:action:upload') }}
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  getIRUploadTaskNoneDicomStudyList,
+  deleteTaskStudy,
+} from '@/api/load.js'
+import { preArchiveStudy, uploadNoneDicomFile } from '@/api/trials'
+import store from '@/store'
+import { getToken } from '@/utils/auth'
+let defaultSearchData = () => {
+  return {
+    SubjectId: null,
+    TrialReadingCriterionId: null,
+    SubjectCode: null,
+    Asc: false,
+    SortField: 'TaskBlindName',
+  }
+}
+export default {
+  name: 'nonedicomFile',
+  props: {
+    SubjectId: {
+      type: String,
+      default: '',
+    },
+    SubjectCode: {
+      type: String,
+      default: '',
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
+    VisitTaskId: {
+      type: String,
+      default: '',
+    },
+    isUpload: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      searchData: defaultSearchData(),
+      imgObj: { url: '', visible: false, loading: false },
+      uploadVisible: false,
+      fileList: [],
+      selectArr: [],
+      successFileList: [],
+      isFail: false,
+      faccept: ['.jpg', '.jpeg', '.png', '.bmp', '.zip'],
+      fCount: 0,
+      btnLoading: false,
+      currentRow: {},
+      studyMonitorId: null,
+      open: null,
+    }
+  },
+  watch: {
+    isFail() {
+      if (this.isFail) {
+        this.$confirm(
+          this.$t('trials:visit:crcUpload:nomDicomFiles:failUpload'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t('common:button:confirm'),
+            cancelButtonText: this.$t('common:button:cancel'),
+          }
+        )
+          .then(() => {
+            this.beginUpload()
+          })
+          .catch((err) => {
+            this.btnLoading = false
+            console.log(err)
+          })
+      }
+    },
+    btnLoading() {
+      store.dispatch('trials/setUnLock', this.btnLoading)
+    },
+  },
+  created() {
+    this.getList()
+  },
+  beforeDestroy() {
+    store.dispatch('trials/setUnLock', false)
+  },
+  methods: {
+    async getList() {
+      try {
+        this.searchData.SubjectId = this.SubjectId
+        this.searchData.TrialReadingCriterionId =
+          this.Criterion.TrialReadingCriterionId
+        this.searchData.SubjectCode = this.SubjectCode
+        if (this.VisitTaskId) {
+          this.searchData.VisitTaskId = this.VisitTaskId
+        }
+        this.loading = true
+        let res = await getIRUploadTaskNoneDicomStudyList(this.searchData)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list = res.Result
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    // 扫描待上传文件
+    beginScanFiles(e) {
+      var files = [...e.target.files]
+      var sameFiles = []
+      files.forEach((file) => {
+        var extendName = file.name
+          .substring(file.name.lastIndexOf('.'))
+          .toLocaleLowerCase()
+        if (
+          this.faccept.indexOf(extendName) !== -1 &&
+          this.fileList.findIndex((v) => v.name === file.name) > -1
+        ) {
+          sameFiles.push(file.name)
+        }
+      })
+      var scope = this
+      if (sameFiles.length > 0) {
+        const h = this.$createElement
+        var msg = this.$t(
+          'trials:uploadNonDicoms:message:exsitSameFile'
+        ).replace('xxx', sameFiles.join(', '))
+        this.$msgbox({
+          message: h('div', { style: 'maxHeight:300px;overflow: auto;' }, [
+            h('p', null, msg),
+            h(
+              'p',
+              null,
+              this.$t('trials:uploadNonDicoms:message:isContinueUpload')
+            ),
+          ]),
+          type: 'warning',
+          showCancelButton: true,
+        })
+          .then(() => {
+            scope.pendingUploadQuene(files)
+          })
+          .catch(() => {
+            scope.resetUploadForm()
+          })
+      } else {
+        scope.pendingUploadQuene(files)
+      }
+    },
+    pendingUploadQuene(files) {
+      for (var i = 0; i < files.length; ++i) {
+        const fileName = files[i].name
+        var extendName = fileName
+          .substring(fileName.lastIndexOf('.'))
+          .toLocaleLowerCase()
+        if (this.faccept.indexOf(extendName) !== -1) {
+          files[i].id = `${files[i].lastModified}${files[i].name}`
+          let obj = {
+            name: files[i].name,
+            size: files[i].size,
+            type: extendName.split('.')[1],
+            status: 0,
+            file: files[i],
+            id: `${files[i].lastModified}${files[i].name}`,
+            fileType: files[i].type,
+            uploadFileSize: 0,
+          }
+          this.fileList.push(obj)
+          this.$refs.filesTable.toggleRowSelection(obj, true)
+        }
+      }
+      this.resetUploadForm()
+    },
+    handleRemoveFile(row) {
+      this.$confirm(this.$t('trials:uploadNonDicoms:message:delete'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+      })
+        .then(() => {
+          this.fileList.splice(
+            this.fileList.findIndex((item) => item.id === row.id),
+            1
+          )
+          let flag = this.successFileList.some((item) => item.id === row.id)
+          if (flag) {
+            this.successFileList.splice(
+              this.successFileList.findIndex((item) => item.id === row.id),
+              1
+            )
+          }
+        })
+        .catch(() => {})
+    },
+    resetUploadForm() {
+      this.$nextTick(() => {
+        this.$refs.uploadForm.reset()
+      })
+    },
+    // 打开上传文件弹窗
+    handleUpload(row) {
+      this.fileList = []
+      this.uploadVisible = true
+      this.fCount = 0
+      this.currentRow = { ...row }
+    },
+    resetFileDiaolg() {
+      this.btnLoading = false
+      this.uploadVisible = false
+      this.selectArr = []
+      this.successFileList = []
+      this.OSSclient.close()
+    },
+    // 预览文件
+    previewFile(row) {
+      // window.open(row.FullFilePath, '_blank')
+      // this.imgObj.url = row.FullFilePath || row.Path
+      // this.imgObj.loading = true
+      // this.imgObj.visible = true
+      this.$refs[row.Path].$viewer.show()
+    },
+    // 预览单个检查下非Dicom文件
+    handlePreviewNoneDicomFiles(row) {
+      if (this.open) {
+        this.open.close()
+      }
+      let trialId = this.$route.query.trialId
+      var token = getToken()
+      const routeData = this.$router.resolve({
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&visitTaskId=${row.VisitTaskId}&TokenKey=${token}`,
+      })
+      this.open = window.open(routeData.href, '_blank')
+    },
+    // 删除
+    async remove(item) {
+      try {
+        let confirm = await this.$confirm(
+          this.$t('upload:nonedicom:confirm:delMessage'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t('common:button:confirm'),
+            cancelButtonText: this.$t('common:button:cancel'),
+          }
+        )
+        if (confirm !== 'confirm') return
+        let params = {
+          VisitTaskId: item.VisitTaskId,
+          IsDicom: false,
+          NoneDicomStudyId: item.Id,
+        }
+        let res = await deleteTaskStudy(params)
+        if (res.IsSuccess) {
+          this.getList()
+          this.$emit('update:isUpload', true)
+          this.$message.success(
+            this.$t('trials:uploadImage:message:delSuccess')
+          )
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    // 获取待上传文件信息
+    handleSelectionChange(selection) {
+      this.selectArr = selection
+    },
+    // 开始上传文件
+    async beginUpload() {
+      this.btnLoading = true
+      this.isFail = false
+      const fileMaxSize = 1024 * 1024 * 1024 * 2 // 1G
+      var currentFilesSize = 0
+      this.selectArr.forEach((item) => {
+        currentFilesSize += item.size
+      })
+      if (currentFilesSize / fileMaxSize > 1) {
+        // 'Upload file size cannot exceed 1G'
+        this.$alert(this.$t('trials:uploadNonDicoms:message:uploadSize'))
+        this.btnLoading = false
+      } else {
+        this.selectArr.forEach((item) => (item.status = 0))
+        let num = this.selectArr.length > 6 ? 6 : this.selectArr.length
+        let funArr = []
+        let res = await preArchiveStudy({
+          subjectVisitId: this.currentRow.SourceSubjectVisitId,
+          isDicom: false,
+          FileCount: this.selectArr.length,
+        })
+        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
+        }
+      }
+    },
+    // 并发上传
+    async handleUploadTask(arr, index) {
+      if (!this.uploadVisible) return
+      let file = this.fileList.filter((item) => item.id === arr[index].id)[0]
+      file.status = 1
+      let path = `/${this.$route.query.trialId}/TaskImage/${
+        this.currentRow.SubjectId
+      }/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
+        .substring(file.name.lastIndexOf('.'))
+        .toLocaleLowerCase()}`
+      file.curPath = path
+      const fileData = await this.fileToBlob(file.file)
+      let res = await this.fileToOss(path, fileData, file)
+      if (res) {
+        file.status = 2
+        this.successFileList.push({
+          fileName: file.name,
+          filePath: this.$getObjectName(res.url),
+          fileFize: file.size,
+          fileType: file.fileType,
+        })
+        let flag = arr.every((item) => item.status === 2)
+        if (flag) {
+          let RecordPath = await this.uploadRecord(arr)
+          return this.submitFile(this.successFileList, RecordPath)
+        }
+      } else {
+        file.status = 3
+      }
+      let flag = arr.every((item) => item.status > 1)
+      if (flag) {
+        let failFileList = arr.filter((item) => item.status === 3)
+        if (failFileList && failFileList.length > 0) {
+          let RecordPath = await this.uploadRecord(arr)
+          this.$refs.filesTable.clearSelection()
+          failFileList.forEach((row) => {
+            row.uploadFileSize = 0
+            this.$refs.filesTable.toggleRowSelection(row)
+          })
+          this.isFail = true
+          this.submitFile(this.successFileList, RecordPath, true)
+          return false
+        }
+      }
+      let ind = arr.findIndex((item) => item.status === 0)
+      if (ind >= 0) {
+        return this.handleUploadTask(arr, ind)
+      } else {
+        return false
+      }
+    },
+    // file上传到oss
+    async fileToOss(path, file, item) {
+      try {
+        let res = await this.OSSclient.multipartUpload(
+          {
+            path,
+            file,
+            speed: true,
+          },
+          (percentage, checkpoint, lastPer) => {
+            item.uploadFileSize += checkpoint.size * (percentage - lastPer)
+            if (item.uploadFileSize > file.fileSize) {
+              item.uploadFileSize = file.fileSize
+            }
+          }
+        )
+        if (res) {
+          return res
+        } else {
+          return false
+        }
+      } catch (err) {
+        console.log(err)
+        return false
+      }
+    },
+    // 非Dicom文件上传归档
+    submitFile(uploadedFileList, RecordPath, isReLoad = false) {
+      if (!this.uploadVisible) return
+      this.btnLoading = true
+      var params = {
+        trialId: this.$route.query.trialId,
+        subjectVisitId: this.currentRow.SourceSubjectVisitId,
+        noneDicomStudyId: this.currentRow.Id,
+        studyMonitorId: this.studyMonitorId,
+        VisitTaskId: this.currentRow.VisitTaskId,
+        uploadedFileList: uploadedFileList,
+      }
+      if (RecordPath) {
+        params.RecordPath = RecordPath.path
+        params.FailedFileCount = RecordPath.Record.Failed.length
+      }
+      uploadNoneDicomFile(params)
+        .then((res) => {
+          if (!isReLoad) {
+            this.resetFileDiaolg()
+          }
+          this.getList()
+          this.$emit('update:isUpload', true)
+          // 刷新父组件列表
+          this.$emit('getList')
+          this.$message.success(
+            this.$t('trials:uploadNonDicoms:message:uploadedSuccessfully')
+          )
+        })
+        .catch(() => {
+          this.btnLoading = false
+        })
+    },
+    // 上传提交记录
+    uploadRecord(arr) {
+      return new Promise(async (resolve) => {
+        try {
+          let Record = {
+            Failed: [],
+            Existed: [],
+            Uploaded: [],
+            FileCount: arr.length,
+          }
+          arr.forEach((item) => {
+            let file = this.fileList.find((data) => data.id === item.id)
+            if (file.status === 2) {
+              Record.Uploaded.push(file.curPath)
+            }
+            if (file.status === 3) {
+              Record.Failed.push(file.curPath)
+            }
+          })
+          let text = JSON.stringify(Record)
+          let logJsonBlob = this.generateTxtFile(text)
+          let logJsonObjectName = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId}/${this.currentRow.VisitTaskId}/${this.studyMonitorId}.txt`
+          let logRes
+          try {
+            logRes = await this.OSSclient.put(logJsonObjectName, logJsonBlob)
+            if (logRes && logRes.url) {
+              resolve({ path: this.$getObjectName(logRes.url), Record })
+            } else {
+              resolve(false)
+            }
+          } catch (e) {
+            resolve(false)
+          }
+        } catch (err) {
+          console.log(err)
+          resolve(false)
+        }
+      })
+    },
+    generateTxtFile(text) {
+      let blob = new Blob(['\ufeff', text], { type: 'text/plain' })
+      return blob
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.top {
+  margin: 10px 0;
+}
+.upload {
+  display: inline-block;
+  height: 30px;
+  width: 90px;
+  padding: 2px 10px;
+  line-height: 23px;
+  position: relative;
+  text-decoration: none;
+  border-radius: 3px;
+  overflow: hidden;
+  text-align: center;
+  background: #428bca;
+  border-color: #428bca;
+  color: #fff;
+  .select-file {
+    height: 30px;
+    width: 90px;
+    position: absolute;
+    overflow: hidden;
+    left: 0;
+    top: 0;
+    opacity: 0;
+    font-size: 0;
+  }
+  .btn-select {
+    //给显示在页面上的按钮写样式
+    width: 90px;
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    cursor: pointer;
+    border-radius: 24px;
+    overflow: hidden;
+    position: absolute;
+    top: 0;
+    left: 0;
+    pointer-events: none; //pointer-events:none用来控制该标签的点击穿透事件
+  }
+}
+.tip {
+  display: flex;
+  align-items: flex-start;
+  margin-top: 5px;
+  i {
+    margin: 3px 5px 0 0;
+  }
+}
+</style>

src/components/uploadDicomAndNonedicom/study-view.vue

@@ -0,0 +1,170 @@
+<template>
+  <base-model :config="model_cfg">
+    <div slot="dialog-body">
+      <el-table :data="modelList" style="width: 100%" height="300">
+        <!--检查编号-->
+        <el-table-column
+          prop="StudyCode"
+          :label="$t('trials:uploadImage:table:StudyCode')"
+        />
+        <!--检查类型-->
+        <el-table-column
+          prop="ModalityForEdit"
+          :label="$t('trials:uploadImage:table:ModalityForEdit')"
+          v-if="IsDicom"
+        />
+        <!--检查模态-->
+        <el-table-column
+          prop="Modalities"
+          :label="$t('trials:uploadImage:table:Modalities')"
+          v-if="IsDicom"
+        />
+        <!--检查部位-->
+        <el-table-column
+          prop="BodyPartForEdit"
+          :label="$t('trials:uploadImage:table:BodyPartForEdit')"
+          v-if="IsDicom"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              $fd(
+                'Bodypart',
+                scope.row.BodyPartForEdit,
+                'Code',
+                { Bodypart: bodyPart },
+                'Name'
+              )
+            }}</span>
+          </template>
+        </el-table-column>
+        <!--序列数量-->
+        <el-table-column
+          prop="SeriesCount"
+          :label="$t('trials:uploadImage:table:SeriesCount')"
+          v-if="IsDicom"
+        />
+        <!--图像数量-->
+        <el-table-column
+          prop="InstanceCount"
+          :label="$t('trials:uploadImage:table:InstanceCount')"
+          v-if="IsDicom"
+        />
+        <!--检查时间-->
+        <el-table-column
+          prop="StudyTime"
+          :label="$t('trials:uploadImage:table:StudyTime')"
+          v-if="IsDicom"
+          min-width="130"
+        />
+        <!--检查模态-->
+        <el-table-column
+          prop="Modality"
+          :label="$t('trials:uploadImage:table:Modalities')"
+          v-if="!IsDicom"
+        />
+        <!--检查部位-->
+        <el-table-column
+          prop="BodyPart"
+          :label="$t('trials:uploadImage:table:BodyPartForEdit')"
+          v-if="!IsDicom"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              $fd(
+                'Bodypart',
+                scope.row.BodyPart,
+                'Code',
+                { Bodypart: bodyPart },
+                'Name'
+              )
+            }}</span>
+          </template>
+        </el-table-column>
+        <!--文件数量-->
+        <el-table-column
+          prop="FileCount"
+          :label="$t('trials:uploadImage:table:FileCount')"
+          v-if="!IsDicom"
+        />
+        <!--检查时间-->
+        <el-table-column
+          prop="ImageDate"
+          :label="$t('trials:uploadImage:table:StudyTime')"
+          v-if="!IsDicom"
+          min-width="130"
+        />
+        <el-table-column
+          :label="$t('common:action:action')"
+          fixed="right"
+          width="80"
+        >
+          <template slot-scope="scope">
+            <!--预览--->
+            <el-button
+              circle
+              icon="el-icon-view"
+              :title="$t('trials:uploadImage:button:preview')"
+              @click.stop="preview(scope.row)"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </base-model>
+</template>
+<script>
+import baseModel from '@/components/BaseModel'
+import { getToken } from '@/utils/auth'
+export default {
+  name: 'studyView',
+  props: {
+    model_cfg: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
+    bodyPart: {
+      type: Array,
+      default: () => {
+        return []
+      },
+    },
+    modelList: {
+      type: Array,
+      default: () => {
+        return []
+      },
+    },
+    IsDicom: {
+      required: true,
+      type: Boolean,
+      default: true,
+    },
+  },
+  components: {
+    'base-model': baseModel,
+  },
+  methods: {
+    // 预览
+    preview(row) {
+      let routeData = null
+      if (this.IsDicom) {
+        var token = getToken()
+        routeData = this.$router.resolve({
+          path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study`,
+        })
+      } else {
+        let trialId = this.$route.query.trialId
+        var token = getToken()
+        routeData = this.$router.resolve({
+          path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&TokenKey=${token}`,
+        })
+      }
+      window.open(routeData.href, '_blank')
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+</style>

src/components/uploadImage/components/study-view.vue

@@ -0,0 +1,95 @@
+<template>
+  <base-model :config="model_cfg">
+    <div slot="dialog-body">
+      <el-table :data="modelList" style="width: 100%" height="300">
+        <!--检查编号-->
+        <el-table-column
+          prop="StudyCode"
+          :label="$t('trials:uploadImage:table:StudyCode')"
+        />
+        <!--检查类型-->
+        <el-table-column
+          prop="ModalityForEdit"
+          :label="$t('trials:uploadImage:table:ModalityForEdit')"
+        />
+        <!--检查模态-->
+        <el-table-column
+          prop="Modalities"
+          :label="$t('trials:uploadImage:table:Modalities')"
+        />
+        <!--检查部位-->
+        <el-table-column
+          prop="BodyPartForEdit"
+          :label="$t('trials:uploadImage:table:BodyPartForEdit')"
+        />
+        <!--序列数量-->
+        <el-table-column
+          prop="SeriesCount"
+          :label="$t('trials:uploadImage:table:SeriesCount')"
+        />
+        <!--图像数量-->
+        <el-table-column
+          prop="InstanceCount"
+          :label="$t('trials:uploadImage:table:InstanceCount')"
+        />
+        <!--检查时间-->
+        <el-table-column
+          prop="StudyTime"
+          :label="$t('trials:uploadImage:table:StudyTime')"
+          min-width="130"
+        />
+        <el-table-column
+          :label="$t('common:action:action')"
+          fixed="right"
+          width="80"
+        >
+          <template slot-scope="scope">
+            <!--预览--->
+            <el-button
+              circle
+              icon="el-icon-view"
+              :title="$t('trials:uploadImage:button:download')"
+              @click.stop="preview(scope.row)"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </base-model>
+</template>
+<script>
+import baseModel from "@/components/BaseModel";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "studyView",
+  props: {
+    model_cfg: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+    modelList: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  components: {
+    "base-model": baseModel,
+  },
+  methods: {
+    // 预览
+    preview(row) {
+      var token = getToken();
+      const routeData = this.$router.resolve({
+        path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study`,
+      });
+      window.open(routeData.href, "_blank");
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>

src/components/uploadImage/components/upload-list.vue

@@ -0,0 +1,769 @@
+<template>
+  <div class="uploadList">
+    <el-divider content-position="left">{{
+      $t("trials:uploadImage:button:uploadTableTitle")
+    }}</el-divider>
+    <div class="top" style="margin-bottom: 10px">
+      <el-button
+        type="primary"
+        size="small"
+        v-if="!isLoad"
+        style="position: relative;
+}"
+      >
+        <span style="opacity: 0">{{
+          $t("trials:uploadImage:button:selectFolder")
+        }}</span>
+        <label for="file">
+          {{ $t("trials:uploadImage:button:selectFolder") }}
+        </label>
+      </el-button>
+      <el-button
+        type="primary"
+        size="small"
+        class="el-icon-upload2"
+        @click.stop="notUp"
+        v-else
+      >
+        {{ $t("trials:uploadImage:button:selectFolder") }}
+      </el-button>
+      <input
+        type="file"
+        name="file"
+        id="file"
+        ref="file"
+        style="display: none"
+        webkitdirectory
+        multiple
+        @change="beginScanFiles($event)"
+      />
+    </div>
+    <!--本地影像检查-->
+    <el-table
+      :data="uploadList"
+      style="width: 100%"
+      v-adaptive="{ bottomOffset: 50 }"
+    >
+      <el-table-column type="index" width="40" />
+      <!--检查信息-->
+      <el-table-column min-width="200" show-overflow-tooltip>
+        <template slot="header">
+          <el-tooltip placement="top">
+            <div slot="content">
+              {{ $t("trials:uploadImage:table:studyDetail1") }}<br />
+              {{ $t("trials:uploadImage:table:studyDetail2") }}<br />
+              {{ $t("trials:uploadedDicoms:table:studyDate") }}
+            </div>
+            <span>{{ $t("trials:uploadImage:table:studyInfo") }}</span>
+          </el-tooltip>
+        </template>
+        <template slot-scope="scope">
+          <div style="line-height: 15px">
+            <div>
+              <div>
+                <span>
+                  <span style="font-weight: 500">Acc:</span>
+                  <span
+                    :class="{
+                      colorOfRed: !scope.row.dicomInfo.AccessionNumber,
+                    }"
+                    >{{ scope.row.dicomInfo.AccessionNumber || "N/A" }}</span
+                  >
+                </span>
+              </div>
+              <div style="display: inline-block; margin-right: 2px">
+                <span v-if="scope.row.dicomInfo.Modalities.length > 0">
+                  {{ scope.row.dicomInfo.Modalities.join("、") }},
+                </span>
+                <span v-else style="color: #f44336">N/A,</span>
+              </div>
+              <div style="display: inline-block; margin-right: 2px">
+                <span v-if="scope.row.SeriesInstanceUidList.length"
+                  >{{ scope.row.SeriesInstanceUidList.length }} Series,
+                </span>
+                <span v-else style="color: #f44336">N/A,</span>
+              </div>
+              <div style="display: inline-block">
+                <span v-if="scope.row.count"
+                  >{{ scope.row.count }} Instances
+                </span>
+                <span v-else style="color: #f44336">N/A</span>
+              </div>
+            </div>
+
+            <div>
+              <div style="display: inline-block; margin-right: 2px">
+                <span v-if="scope.row.dicomInfo.seriesBodyPartExamined">
+                  {{ scope.row.dicomInfo.seriesBodyPartExamined }},
+                </span>
+                <span v-else style="color: #f44336">N/A, </span>
+              </div>
+              <div style="display: inline-block">
+                <span v-if="scope.row.dicomInfo.StudyDescription">
+                  {{ scope.row.dicomInfo.StudyDescription }}</span
+                >
+                <span v-else style="color: #f44336">N/A</span>
+              </div>
+            </div>
+            <div>
+              {{ scope.row.dicomInfo.StudyTime }}
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <!--患者信息-->
+      <el-table-column min-width="130" show-overflow-tooltip>
+        <template slot="header">
+          <el-tooltip placement="top">
+            <div slot="content">
+              {{ $t("trials:uploadImage:table:pId") }}<br />
+              {{ $t("trials:uploadImage:table:patientName") }}<br />
+              {{ $t("trials:uploadImage:table:pInfo") }}
+            </div>
+            <span>{{ $t("trials:uploadImage:table:patientInfo") }}</span>
+          </el-tooltip>
+        </template>
+        <template slot-scope="scope">
+          <div style="line-height: 15px">
+            <div>
+              <span v-if="scope.row.dicomInfo.PatientId"
+                ><span style="font-weight: 500">PID: </span
+                >{{ scope.row.dicomInfo.PatientId }}</span
+              >
+              <span v-else style="color: #f44336">N/A</span>
+            </div>
+            <div>
+              <span
+                :class="[scope.row.dicomInfo.PatientName ? '' : 'colorOfRed']"
+              >
+                {{ scope.row.dicomInfo.PatientName || "N/A" }}
+              </span>
+            </div>
+            <div>
+              <span
+                :class="[scope.row.dicomInfo.PatientSex ? '' : 'colorOfRed']"
+              >
+                {{ scope.row.dicomInfo.PatientSex || "N/A" }},
+              </span>
+
+              <span
+                :class="[scope.row.dicomInfo.PatientAge ? '' : 'colorOfRed']"
+              >
+                {{ scope.row.dicomInfo.PatientAge || "N/A" }},
+              </span>
+
+              <span
+                :class="[
+                  scope.row.dicomInfo.PatientBirthDate ? '' : 'colorOfRed',
+                ]"
+              >
+                {{ scope.row.dicomInfo.PatientBirthDate || "N/A" }}
+              </span>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <!--上传进度-->
+      <el-table-column
+        prop="schedule"
+        :label="$t('trials:uploadImage:table:schedule')"
+        min-width="150"
+      >
+        <template slot-scope="scope">
+          <el-progress
+            color="#409eff"
+            :percentage="scope.row.schedule"
+            v-if="scope.row.schedule || scope.row.schedule === 0"
+          />
+        </template>
+      </el-table-column>
+      <!--上传状态-->
+      <el-table-column
+        prop="status"
+        :label="$t('trials:uploadImage:table:status')"
+        min-width="120"
+      >
+        <template slot-scope="scope">
+          <el-tag
+            :type="
+              ['warning', 'success', 'danger', 'primary', 'success', 'danger'][
+                scope.row.status
+              ]
+            "
+            v-if="scope.row.status || scope.row.status === 0"
+            >{{ $fd("UploadStatus", scope.row.status) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <!--已有/成功/失败-->
+      <el-table-column
+        prop="scheduleNum"
+        :label="$t('trials:uploadImage:table:scheduleNum')"
+        min-width="140"
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.count">{{
+            `${scope.row.count} /${scope.row.successCount} / ${scope.row.failCount}`
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('common:action:action')"
+        fixed="right"
+        width="140"
+      >
+        <!-- <template slot-scope="scope">
+        </template> -->
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  preArchiveDicomStudy,
+  addOrUpdateArchiveTaskStudy,
+} from "@/api/load.js";
+import { parseDicom, getThumbnail, dicomToOSS } from "@/utils/parseDicom.js";
+import store from "@/store";
+export default {
+  name: "uploadList",
+  props: {
+    SopInstanceUidList: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    StudyInstanceUidList: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    UploadStudyList: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      isLoad: false,
+      uploadList: [], // 待上传文件列表
+      dicomList: [], // 上传的文件列表
+      requestNum: 6,
+      hasOtherStudy: false, // 是否上传文件检查与列表不一致
+      isClose: false,
+    };
+  },
+  watch: {
+    isLoad() {
+      store.dispatch("trials/setUnLock", this.isLoad);
+      if (!this.isLoad) {
+        this.$refs.file.value = null;
+        if (this.dicomList.some((item) => item.isUpload === 3)) {
+          this.$confirm(this.$t("trials:uploadImage:confirm:failUpload"), {
+            type: "warning",
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t("common:button:confirm"),
+            cancelButtonText: this.$t("common:button:cancel"),
+          })
+            .then(() => {
+              this.againUpload();
+            })
+            .catch((err) => {
+              console.log(err);
+            });
+        }
+      }
+    },
+  },
+  methods: {
+    // 失败重传
+    againUpload() {
+      for (let i = 0; i < this.uploadList.length; i++) {
+        let item = this.uploadList[i];
+        if (item.status > 2) continue;
+        item.status = 0;
+        item.failCount = 0;
+        item.schedule = Math.floor(
+          ((item.successCount + item.failCount) / item.count) * 100
+        );
+        let arr = this.dicomList.filter(
+          (dicom) =>
+            dicom.StudyInstanceUid === item.StudyInstanceUid &&
+            dicom.isUpload === 3
+        );
+        arr.forEach((item) => (item.isUpload = 0));
+        this.setUploadTask(arr);
+      }
+    },
+    async setUploadTask(arr) {
+      let num = arr.length > this.requestNum ? this.requestNum : arr.length;
+      let funArr = [];
+      for (let i = 0; i < num; i++) {
+        funArr.push(this.handleUploadTask(arr, i));
+      }
+      if (funArr.length > 0) {
+        let res = await Promise.all(funArr);
+      }
+    },
+    // 预上传
+    async preArchiveDicomStudy(post, index) {
+      try {
+        let res = await preArchiveDicomStudy(post);
+        if (res.IsSuccess) {
+          let item = this.uploadList[index];
+          item.StudyMonitorId = res.Result;
+          let arr = this.dicomList.filter(
+            (dicom) => dicom.StudyInstanceUid === item.StudyInstanceUid
+          );
+          this.setUploadTask(arr);
+        } else {
+          return false;
+        }
+      } catch (err) {
+        console.log(err);
+        return false;
+      }
+    },
+    // 上传
+    async beginScanFiles(e) {
+      let files = e.target.files;
+      try {
+        this.dicomList = [];
+        this.hasOtherStudy = false;
+        for (var i = 0; i < files.length; ++i) {
+          if (files[i].name.indexOf("DICOMDIR") >= 0) continue;
+          let dicom = await parseDicom(files[i]);
+          if (!dicom) continue;
+          let has = this.dicomList.some(
+            (item) => item.SopInstanceUid === dicom.SopInstanceUid
+          );
+          if (has) continue;
+          has = this.StudyInstanceUidList.some(
+            (item) => item.StudyInstanceUid === dicom.StudyInstanceUid
+          );
+          if (!has) {
+            this.hasOtherStudy = true;
+            continue;
+          }
+          if (this.SopInstanceUidList.includes(dicom.SopInstanceUid)) continue;
+
+          this.isLoad = true;
+          dicom.file = files[i];
+          dicom.isUpload = 0;
+          this.StudyInstanceUidList.some((item) => {
+            if (item.StudyInstanceUid === dicom.StudyInstanceUid) {
+              dicom.params = {
+                TrialId: this.$route.query.trialId,
+                SubjectId: item.SubjectId,
+                VisitTaskId: item.VisitTaskId,
+                SourceSubjectVisitId: item.SourceSubjectVisitId,
+              };
+              let uploadHas = this.uploadList.some((uploadData) => {
+                if (uploadData.StudyInstanceUid === dicom.StudyInstanceUid) {
+                  if (uploadData.status > 0) {
+                    uploadData.count = 1;
+                    uploadData.successCount = 0;
+                    uploadData.failCount = 0;
+                    uploadData.schedule = 0;
+                    uploadData.status = 0;
+                    uploadData.FileSize = dicom.file.size;
+                    uploadData.SeriesInstanceUidList = [
+                      dicom.SeriesInstanceUid,
+                    ];
+                    uploadData.dicomInfo = {
+                      AccessionNumber: dicom.AccessionNumber,
+                      Modalities: dicom.Modalities,
+                      seriesBodyPartExamined: dicom.seriesBodyPartExamined,
+                      StudyDescription: dicom.StudyDescription,
+                      StudyTime: this.getTime(dicom.StudyDate, dicom.StudyTime),
+                      PatientName: dicom.PatientName,
+                      PatientId: dicom.PatientId,
+                      PatientAge: dicom.PatientAge,
+                      PatientSex: dicom.PatientSex,
+                      PatientBirthDate: dicom.PatientBirthDate,
+                    };
+                  } else {
+                    uploadData.FileSize += dicom.file.size;
+                    uploadData.count++;
+                  }
+                  if (
+                    !uploadData.SeriesInstanceUidList.includes(
+                      dicom.SeriesInstanceUid
+                    )
+                  ) {
+                    uploadData.SeriesInstanceUidList.push(
+                      dicom.SeriesInstanceUid
+                    );
+                  }
+                }
+
+                return uploadData.StudyInstanceUid === dicom.StudyInstanceUid;
+              });
+              if (!uploadHas) {
+                let uploadData = {
+                  TrialId: this.$route.query.trialId,
+                  SubjectId: item.SubjectId,
+                  SourceSubjectVisitId: item.SourceSubjectVisitId,
+                  StudyId: dicom.StudyId,
+                  StudyInstanceUid: dicom.StudyInstanceUid,
+                  FileSize: dicom.file.size,
+                  count: 1,
+                  successCount: 0,
+                  failCount: 0,
+                  schedule: 0,
+                  status: 0,
+                  SeriesInstanceUidList: [dicom.SeriesInstanceUid],
+                  IsDicomReUpload: false,
+                  dicomInfo: {
+                    AccessionNumber: dicom.AccessionNumber,
+                    Modalities: dicom.Modalities,
+                    seriesBodyPartExamined: dicom.seriesBodyPartExamined,
+                    StudyDescription: dicom.StudyDescription,
+                    StudyTime: this.getTime(dicom.StudyDate, dicom.StudyTime),
+                    PatientName: dicom.PatientName,
+                    PatientId: dicom.PatientId,
+                    PatientAge: dicom.PatientAge,
+                    PatientSex: dicom.PatientSex,
+                    PatientBirthDate: dicom.PatientBirthDate,
+                  },
+                };
+                if (
+                  this.UploadStudyList.some(
+                    (d) => d.StudyInstanceUid === uploadData.StudyInstanceUid
+                  )
+                ) {
+                  uploadData.IsDicomReUpload = true;
+                }
+                this.uploadList.push(uploadData);
+              }
+            }
+            return item.StudyInstanceUid === dicom.StudyInstanceUid;
+          });
+          this.dicomList.push(dicom);
+        }
+        if (this.dicomList.length <= 0 && this.hasOtherStudy) {
+          let confirm = await this.$confirm(
+            this.$t("trials:uploadImage:confirmMessage:failSubject"),
+            {
+              type: "warning",
+              distinguishCancelAndClose: true,
+              confirmButtonText: this.$t("common:button:confirm"),
+              cancelButtonText: this.$t("common:button:cancel"),
+            }
+          );
+          if (confirm !== "confirm") return false;
+          this.$refs.file.click();
+          return false;
+        }
+        let funArr = [];
+        for (let i = 0; i < this.uploadList.length; i++) {
+          let item = this.uploadList[i];
+          let data = {
+            TrialId: item.TrialId,
+            SubjectId: item.SubjectId,
+            SubjectVisitId: item.SourceSubjectVisitId,
+            FileSize: item.FileSize,
+            IsDicomReUpload: item.IsDicomReUpload,
+            FileCount: item.count,
+          };
+          funArr.push(this.preArchiveDicomStudy(data, i));
+        }
+        if (funArr && funArr.length > 0) {
+          let res = await Promise.all(funArr);
+        }
+      } catch (err) {
+        console.log(err);
+        this.$refs.file.value = null;
+      }
+    },
+    // 并发上传
+    async handleUploadTask(arr, index) {
+      if (this.isClose) return false;
+      arr[index].isUpload = 1;
+      let path = `/${arr[index].params.TrialId}/TaskImage/${
+        arr[index].params.SubjectId
+      }/${arr[index].params.VisitTaskId}/${
+        arr[index].StudyInstanceUid
+      }/${this.getGuid(
+        arr[index].StudyInstanceUid +
+          arr[index].SeriesInstanceUid +
+          arr[index].SOPInstanceUid +
+          arr[index].params.TrialId +
+          arr[index].params.VisitTaskId
+      )}`;
+      let uploadDicom = this.uploadList.filter(
+        (item) => item.StudyInstanceUid === arr[index].StudyInstanceUid
+      )[0];
+      let res = await dicomToOSS(arr[index].file, path);
+      if (res) {
+        arr[index].path = res;
+        uploadDicom.successCount++;
+        arr[index].isUpload = 2;
+      } else {
+        uploadDicom.status = 2;
+        uploadDicom.failCount++;
+        arr[index].isUpload = 3;
+      }
+      uploadDicom.schedule = Math.floor(
+        ((uploadDicom.successCount + uploadDicom.failCount) /
+          uploadDicom.count) *
+          100
+      );
+      if (uploadDicom.schedule >= 100) {
+        if (uploadDicom.successCount === uploadDicom.count) {
+          uploadDicom.status = 1;
+          if (!uploadDicom.Study) {
+            let res = await this.formatDicom(arr, arr[index].StudyInstanceUid);
+            if (res) {
+              uploadDicom.Study = res[arr[index].StudyId];
+              uploadDicom.status = 3;
+            }
+          }
+          try {
+            res = await addOrUpdateArchiveTaskStudy(uploadDicom);
+            if (res.IsSuccess) {
+              uploadDicom.status = 4;
+              this.$emit("getList");
+              let ind = this.uploadList.findIndex(
+                (item) => item.StudyInstanceUid === uploadDicom.StudyInstanceUid
+              );
+              this.uploadList.splice(ind, 1);
+            } else {
+              uploadDicom.status = 5;
+            }
+            let flag = this.dicomList.every((item) => item.isUpload > 1);
+            if (flag) this.isLoad = false;
+          } catch (err) {
+            uploadDicom.status = 5;
+            let flag = this.dicomList.every((item) => item.isUpload > 1);
+            if (flag) this.isLoad = false;
+          }
+        } else if (
+          uploadDicom.count ===
+          uploadDicom.successCount + uploadDicom.failCount
+        ) {
+          let flag = this.dicomList.every((item) => item.isUpload > 1);
+          if (flag) this.isLoad = false;
+        }
+      }
+      let ind = arr.findIndex((item) => !item.isUpload);
+      if (ind >= 0) {
+        return this.handleUploadTask(arr, ind);
+      } else {
+        return false;
+      }
+    },
+    // 数据整理
+    async formatDicom(arr, StudyInstanceUid) {
+      let studyObj = {};
+      for (let i = 0; i < arr.length; i++) {
+        let dicom = arr[i];
+        if (dicom.StudyInstanceUid !== StudyInstanceUid) continue;
+        let thumbnailPath = `/${dicom.params.TrialId}/TaskImage/${dicom.params.SubjectId}/${dicom.params.VisitTaskId}/${dicom.StudyInstanceUid}/${dicom.SeriesInstanceUid}.png`;
+        if (!studyObj[dicom.StudyId]) {
+          studyObj[dicom.StudyId] = {
+            StudyId: dicom.StudyId,
+            StudyInstanceUid: dicom.StudyInstanceUid,
+            StudyTime: this.getTime(dicom.StudyDate, dicom.StudyTime),
+            Modalities: dicom.Modalities,
+            Description: dicom.StudyDescription,
+            SeriesCount: 1,
+            InstanceCount: 1,
+            InstitutionName: dicom.InstitutionName,
+            PatientId: dicom.PatientId,
+            PatientName: dicom.PatientName,
+            PatientAge: dicom.PatientAge,
+            PatientSex: dicom.PatientSex,
+            AccessionNumber: dicom.AccessionNumber,
+            PatientBirthDate: dicom.PatientBirthDate,
+            AcquisitionTime: dicom.AcquisitionTime,
+            AcquisitionNumber: dicom.AcquisitionNumber,
+            TriggerTime: dicom.TriggerTime,
+            BodyPartExamined: dicom.BodyPartExamined,
+            SeriesList: [
+              {
+                StudyInstanceUid: dicom.StudyInstanceUid,
+                SeriesInstanceUid: dicom.SeriesInstanceUid,
+                SeriesNumber: dicom.SeriesNumber,
+                SeriesTime: this.getTime(dicom.SeriesDate, dicom.SeriesTime),
+                Modality: dicom.Modality,
+                Description: dicom.SeriesDescription,
+                InstanceCount: 1,
+                SliceThickness: dicom.SliceThickness,
+                ImagePositionPatient: dicom.ImagePosition,
+                ImageOrientationPatient: dicom.ImageOrientation,
+                BodyPartExamined: dicom.seriesBodyPartExamined,
+                SequenceName: dicom.SequenceName,
+                ProtocolName: dicom.ProtocolName,
+                ImagerPixelSpacing: dicom.ImagePixelSpacing,
+                AcquisitionTime: dicom.AcquisitionTime,
+                AcquisitionNumber: dicom.AcquisitionNumber,
+                TriggerTime: dicom.TriggerTime,
+                ImageResizePath: await getThumbnail(
+                  dicom.file,
+                  thumbnailPath,
+                  dicom
+                ),
+                InstanceList: [
+                  {
+                    StudyInstanceUid: dicom.StudyInstanceUid,
+                    SeriesInstanceUid: dicom.SeriesInstanceUid,
+                    SopInstanceUid: dicom.SopInstanceUid,
+                    InstanceNumber: dicom.ImageOrInstanceNumber,
+                    InstanceTime: this.getTime(
+                      dicom.ContentDate,
+                      dicom.ContentTime
+                    ),
+                    ImageRows: dicom.Rows || 0,
+                    ImageColumns: dicom.Columns || 0,
+                    SliceLocation: dicom.SliceLocation,
+                    SliceThickness: dicom.SliceThickness,
+                    NumberOfFrames: dicom.NumberOfFrames || 0,
+                    PixelSpacing: dicom.PixelSpacing,
+                    ImagerPixelSpacing: dicom.ImagePixelSpacing,
+                    FrameOfReferenceUID: dicom.FrameOfReferenceUID,
+                    WindowCenter: dicom.WindowCenter,
+                    WindowWidth: dicom.WindowWidth,
+                    Path: dicom.path,
+                    HtmlPath: "",
+                  },
+                ],
+              },
+            ],
+          };
+        } else {
+          let seriesHas = studyObj[dicom.StudyId].SeriesList.some((item) => {
+            if (item.SeriesInstanceUid === dicom.SeriesInstanceUid) {
+              item.InstanceCount++;
+              let instance = {
+                StudyInstanceUid: dicom.StudyInstanceUid,
+                SeriesInstanceUid: dicom.SeriesInstanceUid,
+                SopInstanceUid: dicom.SopInstanceUid,
+                InstanceNumber: dicom.ImageOrInstanceNumber,
+                InstanceTime: this.getTime(
+                  dicom.ContentDate,
+                  dicom.ContentTime
+                ),
+                ImageRows: dicom.Rows || 0,
+                ImageColumns: dicom.Columns || 0,
+                SliceLocation: dicom.SliceLocation,
+                SliceThickness: dicom.SliceThickness,
+                NumberOfFrames: dicom.NumberOfFrames || 0,
+                PixelSpacing: dicom.PixelSpacing,
+                ImagerPixelSpacing: dicom.ImagePixelSpacing,
+                FrameOfReferenceUID: dicom.FrameOfReferenceUID,
+                WindowCenter: dicom.WindowCenter,
+                WindowWidth: dicom.WindowWidth,
+                Path: dicom.path,
+                HtmlPath: "",
+              };
+              item.InstanceList.push(instance);
+            }
+            return item.SeriesInstanceUid === dicom.SeriesInstanceUid;
+          });
+          if (!seriesHas) {
+            studyObj[dicom.StudyId].SeriesCount++;
+            let series = {
+              StudyInstanceUid: dicom.StudyInstanceUid,
+              SeriesInstanceUid: dicom.SeriesInstanceUid,
+              SeriesNumber: dicom.SeriesNumber,
+              SeriesTime: this.getTime(dicom.SeriesDate, dicom.SeriesTime),
+              Modality: dicom.Modality,
+              Description: dicom.SeriesDescription,
+              InstanceCount: 1,
+              SliceThickness: dicom.SliceThickness,
+              ImagePositionPatient: dicom.ImagePosition,
+              ImageOrientationPatient: dicom.ImageOrientation,
+              BodyPartExamined: dicom.seriesBodyPartExamined,
+              SequenceName: dicom.SequenceName,
+              ProtocolName: dicom.ProtocolName,
+              ImagerPixelSpacing: dicom.ImagePixelSpacing,
+              AcquisitionTime: dicom.AcquisitionTime,
+              AcquisitionNumber: dicom.AcquisitionNumber,
+              TriggerTime: dicom.TriggerTime,
+              ImageResizePath: await getThumbnail(
+                dicom.file,
+                thumbnailPath,
+                dicom
+              ),
+              InstanceList: [
+                {
+                  StudyInstanceUid: dicom.StudyInstanceUid,
+                  SeriesInstanceUid: dicom.SeriesInstanceUid,
+                  SopInstanceUid: dicom.SopInstanceUid,
+                  InstanceNumber: dicom.ImageOrInstanceNumber,
+                  InstanceTime: this.getTime(
+                    dicom.ContentDate,
+                    dicom.ContentTime
+                  ),
+                  ImageRows: dicom.Rows || 0,
+                  ImageColumns: dicom.Columns || 0,
+                  SliceLocation: dicom.SliceLocation,
+                  SliceThickness: dicom.SliceThickness,
+                  NumberOfFrames: dicom.NumberOfFrames || 0,
+                  PixelSpacing: dicom.PixelSpacing,
+                  ImagerPixelSpacing: dicom.ImagePixelSpacing,
+                  FrameOfReferenceUID: dicom.FrameOfReferenceUID,
+                  WindowCenter: dicom.WindowCenter,
+                  WindowWidth: dicom.WindowWidth,
+                  Path: dicom.path,
+                  HtmlPath: "",
+                },
+              ],
+            };
+            studyObj[dicom.StudyId].SeriesList.push(series);
+          }
+          studyObj[dicom.StudyId].InstanceCount++;
+        }
+      }
+      return studyObj;
+    },
+    // dicom时间转换
+    getTime(date, time) {
+      let studyTime = "";
+      if (date) {
+        date = `${date.substring(0, 4)}-${date.substring(
+          4,
+          6
+        )}-${date.substring(6, 8)}`;
+      }
+      if (time) {
+        time = `${time.substring(0, 2)}:${time.substring(
+          2,
+          4
+        )}:${time.substring(4, 6)}`;
+      }
+      if (date) {
+        studyTime = time ? `${date} ${time}` : `${date} 00:00:00`;
+      }
+      return studyTime;
+    },
+  },
+  beforeDestroy() {
+    this.isClose = true;
+    store.dispatch("trials/setUnLock", false);
+  },
+};
+</script>
+<style lang="scss" scoped>
+.colorOfRed {
+  color: #f44336;
+}
+label {
+  cursor: pointer;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  left: 0;
+  padding: 9px 15px;
+}
+</style>

src/components/uploadImage/index.vue

@@ -0,0 +1,611 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    :fullscreen="true"
+    :close-on-click-modal="false"
+    custom-class="upload-dialog"
+    :before-close="beforeClose"
+    class="uploadImage"
+  >
+    <span slot="title">{{ title }}</span>
+    <el-divider content-position="left">{{
+      $t("trials:uploadImage:button:uploadTableTitle1")
+    }}</el-divider>
+    <!--已上传影像检查-->
+    <el-table
+      :data="list"
+      style="width: 100%"
+      height="300"
+      v-adaptive="{ bottomOffset: 50, notAdaptive: isUpload }"
+      :loading="loading"
+    >
+      <!--受试者-->
+      <el-table-column
+        prop="SubjectCode"
+        :label="$t('trials:uploadImage:table:subjectCode')"
+      />
+      <!--任务名称-->
+      <el-table-column
+        prop="TaskBlindName"
+        :label="$t('trials:uploadImage:table:taskBlindName')"
+      />
+      <!--原始检查数-->
+      <el-table-column
+        prop="OrginalStudyList"
+        :label="$t('trials:uploadImage:table:orginalStudyListNum')"
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-if="
+              scope.row.OrginalStudyList &&
+              scope.row.OrginalStudyList.length >= 1
+            "
+            type="text"
+            @click="handleOpenDialog(scope.row, 'OrginalStudyList')"
+          >
+            <span>{{ scope.row.OrginalStudyList.length }}</span>
+          </el-button>
+          <span v-else>0</span>
+        </template>
+      </el-table-column>
+      <!--后处理检查数-->
+      <el-table-column
+        prop="UploadStudyList"
+        :label="$t('trials:uploadImage:table:uploadStudyListNum')"
+      >
+        <template slot-scope="scope">{{
+          scope.row.UploadStudyList && Array.isArray(scope.row.UploadStudyList)
+            ? scope.row.UploadStudyList.length
+            : 0
+        }}</template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('common:action:action')"
+        fixed="right"
+        width="140"
+      >
+        <template slot-scope="scope">
+          <!--下载--->
+          <!-- <el-button
+            v-if="!isUpload && Criterion.ImageDownloadEnum > 0"
+            circle
+            icon="el-icon-download"
+            :title="$t('trials:uploadImage:button:download')"
+            @click.stop="downloadImage(scope.row)"
+          /> -->
+          <!--删除--->
+          <el-button
+            v-if="isUpload"
+            circle
+            icon="el-icon-delete"
+            :title="$t('trials:uploadImage:button:delete')"
+            @click.stop="remove(scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <upload-list
+      v-if="Criterion.ImageUploadEnum > 0 && isUpload"
+      :StudyInstanceUidList="StudyInstanceUidList"
+      :SopInstanceUidList="SopInstanceUidList"
+      :UploadStudyList="UploadStudyList"
+      @getList="getList"
+    />
+    <study-view
+      v-if="model_cfg.visible"
+      :model_cfg="model_cfg"
+      :modelList="modelList"
+    />
+  </el-dialog>
+</template>
+<script>
+import uploadList from "./components/upload-list.vue";
+import studyView from "./components/study-view.vue";
+import { getSubjectImageUploadList, deleteTaskStudy } from "@/api/load.js";
+import store from "@/store";
+export default {
+  name: "uploadImage",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    SubjectId: {
+      type: String,
+      default: "",
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+    status: {
+      type: String,
+      default: "upload",
+    },
+  },
+  components: {
+    "upload-list": uploadList,
+    "study-view": studyView,
+  },
+  data() {
+    return {
+      list: [],
+      StudyInstanceUidList: [],
+      SopInstanceUidList: [],
+      UploadStudyList: [],
+
+      // 检查数弹框
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: "1000px",
+        title: "",
+        appendToBody: true,
+      },
+      modelList: [],
+    };
+  },
+  computed: {
+    title() {
+      let str = this.$t("trials:uploadImage:title:uploadImages");
+      if (this.status === "download") {
+        str = this.$t("trials:uploadImage:title:uploadImagesDownLoad");
+      }
+      return str;
+    },
+    isUpload() {
+      return this.status === "upload";
+    },
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    beforeClose() {
+      this.$emit("update:visible", false);
+    },
+    notUp() {
+      this.$confirm(this.$t("trials:uploadImage:confirmMessage:notUp"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+        confirmButtonText: this.$t("common:button:confirm"),
+        cancelButtonText: this.$t("common:button:cancel"),
+      });
+    },
+    // 获取列表
+    async getList() {
+      try {
+        let params = {
+          SubjectId: this.SubjectId,
+          TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId,
+        };
+        this.loading = true;
+        let res = await getSubjectImageUploadList(params);
+        this.loading = false;
+        if (res.IsSuccess) {
+          this.StudyInstanceUidList = [];
+          this.SopInstanceUidList = [];
+          this.UploadStudyList = [];
+          this.list = res.Result;
+          res.Result.forEach((item) => {
+            if (item.OrginalStudyList && Array.isArray(item.OrginalStudyList)) {
+              item.OrginalStudyList.forEach((data) => {
+                data.SubjectId = item.SubejctId;
+                data.VisitTaskId = item.VisitTaskId;
+                data.SourceSubjectVisitId = item.SourceSubjectVisitId;
+                this.StudyInstanceUidList.push(data);
+              });
+            }
+            if (item.UploadStudyList && Array.isArray(item.UploadStudyList)) {
+              item.UploadStudyList.forEach((data) => {
+                data.SopInstanceUidList &&
+                  this.SopInstanceUidList.push(...data.SopInstanceUidList);
+                this.UploadStudyList.push(data);
+              });
+            }
+          });
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
+    },
+    // 删除
+    async remove(item) {
+      try {
+        let confirm = await this.$confirm(
+          this.$t("trials:uploadImage:confirm:delMessage"),
+          {
+            type: "warning",
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t("common:button:confirm"),
+            cancelButtonText: this.$t("common:button:cancel"),
+          }
+        );
+        if (confirm !== "confirm") return;
+        let params = {
+          VisitTaskId: item.VisitTaskId,
+        };
+        let res = await deleteTaskStudy(params);
+        if (res.IsSuccess) {
+          this.getList();
+          this.$message.success(
+            this.$t("trials:uploadImage:message:delSuccess")
+          );
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    // 打开弹窗
+    handleOpenDialog(item, list) {
+      this.model_cfg.title = `${item.SubejctCode || ""}>${item.TaskBlindName}`;
+      this.modelList = item[list];
+      this.model_cfg.visible = true;
+    },
+    // 打包下载
+    async downloadImage(item) {
+      let zipName = "压缩包.zip";
+      let InstanceInfoList = [
+        {
+          Id: "e634352c-6465-32ba-04b3-824ec8d346a8",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/e634352c-6465-32ba-04b3-824ec8d346a8",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 1,
+        },
+        {
+          Id: "d4ad1dd2-747b-6de7-8ad4-3e81c58943dd",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/d4ad1dd2-747b-6de7-8ad4-3e81c58943dd",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 2,
+        },
+        {
+          Id: "6a1d1d12-2b4a-0368-c7e1-d44f7180b280",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6a1d1d12-2b4a-0368-c7e1-d44f7180b280",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 3,
+        },
+        {
+          Id: "7a8fb1b4-9ea8-1189-4ca6-b9a9b9547a39",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7a8fb1b4-9ea8-1189-4ca6-b9a9b9547a39",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 4,
+        },
+        {
+          Id: "8d00be19-5ac5-c608-dbd0-41f84cfacd95",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8d00be19-5ac5-c608-dbd0-41f84cfacd95",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 5,
+        },
+        {
+          Id: "729ded91-0eca-78f2-1c17-5182d4f27e3a",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/729ded91-0eca-78f2-1c17-5182d4f27e3a",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 6,
+        },
+        {
+          Id: "9e2fd28c-72fe-bb66-e0ce-40115cd82260",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9e2fd28c-72fe-bb66-e0ce-40115cd82260",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 7,
+        },
+        {
+          Id: "9b31613f-3c9e-28ad-fd9e-7001a69e09b5",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9b31613f-3c9e-28ad-fd9e-7001a69e09b5",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 8,
+        },
+        {
+          Id: "4982b453-d068-7e56-2acd-a361d8584f35",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4982b453-d068-7e56-2acd-a361d8584f35",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 9,
+        },
+        {
+          Id: "8279cf5a-2551-43ea-3fe4-673e88ba7e5a",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8279cf5a-2551-43ea-3fe4-673e88ba7e5a",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 10,
+        },
+        {
+          Id: "6424e9c5-d31b-9388-3b64-a56705ab6fc8",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6424e9c5-d31b-9388-3b64-a56705ab6fc8",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 11,
+        },
+        {
+          Id: "a73cf3f9-defa-0c22-dfdc-8c5bfb93c9a7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a73cf3f9-defa-0c22-dfdc-8c5bfb93c9a7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 12,
+        },
+        {
+          Id: "dbfaafea-f721-0a93-37c6-69bcc0d957c3",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/dbfaafea-f721-0a93-37c6-69bcc0d957c3",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 13,
+        },
+        {
+          Id: "52000ac1-6a5b-83e2-5468-4dfdf394e455",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/52000ac1-6a5b-83e2-5468-4dfdf394e455",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 14,
+        },
+        {
+          Id: "de34a347-41f4-1018-a710-48d81fa9aadc",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/de34a347-41f4-1018-a710-48d81fa9aadc",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 15,
+        },
+        {
+          Id: "251d6a13-26b7-935b-d765-0c5db1ed7dfc",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/251d6a13-26b7-935b-d765-0c5db1ed7dfc",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 16,
+        },
+        {
+          Id: "b22e93c8-3f6a-484a-a32b-f7626689f8da",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/b22e93c8-3f6a-484a-a32b-f7626689f8da",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 17,
+        },
+        {
+          Id: "6517400b-d4b5-db65-d026-8c06c40bf244",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6517400b-d4b5-db65-d026-8c06c40bf244",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 18,
+        },
+        {
+          Id: "8e70df99-525a-4ecd-5cf1-6c32698eaa3f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8e70df99-525a-4ecd-5cf1-6c32698eaa3f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 19,
+        },
+        {
+          Id: "7df907f2-b6a6-fd03-67ab-be86c497d412",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7df907f2-b6a6-fd03-67ab-be86c497d412",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 20,
+        },
+        {
+          Id: "ba31ba5b-728e-8301-273d-459fd3c65a43",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/ba31ba5b-728e-8301-273d-459fd3c65a43",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 21,
+        },
+        {
+          Id: "7528c70c-5ba1-59c1-413c-7bfc984c0066",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7528c70c-5ba1-59c1-413c-7bfc984c0066",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 22,
+        },
+        {
+          Id: "15dd574d-fc82-c5b7-fefb-497346d4abbb",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/15dd574d-fc82-c5b7-fefb-497346d4abbb",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 23,
+        },
+        {
+          Id: "6cd76aca-91fa-64ce-6077-af48c5e5b18b",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6cd76aca-91fa-64ce-6077-af48c5e5b18b",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 24,
+        },
+        {
+          Id: "2f0f9f4e-12b8-a6a8-d3f9-f43e2055653d",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/2f0f9f4e-12b8-a6a8-d3f9-f43e2055653d",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 25,
+        },
+        {
+          Id: "3c49f379-8548-67cd-1333-dde28219c6e9",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/3c49f379-8548-67cd-1333-dde28219c6e9",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 26,
+        },
+        {
+          Id: "910f43c8-123a-0753-aaf7-11081eef4268",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/910f43c8-123a-0753-aaf7-11081eef4268",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 27,
+        },
+        {
+          Id: "ffad6b36-74aa-1c7d-01eb-18524da91f6e",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/ffad6b36-74aa-1c7d-01eb-18524da91f6e",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 28,
+        },
+        {
+          Id: "9e2bf22d-8734-62ae-881a-7404064a95ce",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9e2bf22d-8734-62ae-881a-7404064a95ce",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 29,
+        },
+        {
+          Id: "eef8b291-ffdf-dbfb-244d-5e63dc5b8cc7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/eef8b291-ffdf-dbfb-244d-5e63dc5b8cc7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 30,
+        },
+        {
+          Id: "12b0de3a-243c-78b9-b006-82f2cc633a0f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/12b0de3a-243c-78b9-b006-82f2cc633a0f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 31,
+        },
+        {
+          Id: "4341ea87-7d54-2608-184e-01e5c976ce9f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4341ea87-7d54-2608-184e-01e5c976ce9f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 32,
+        },
+        {
+          Id: "4db2bac2-18eb-0589-d520-f297b2840e1d",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4db2bac2-18eb-0589-d520-f297b2840e1d",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 33,
+        },
+        {
+          Id: "9442c2a3-0972-67f7-afc3-6f1a47abefab",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9442c2a3-0972-67f7-afc3-6f1a47abefab",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 34,
+        },
+        {
+          Id: "a7fb75b0-0b09-5340-70cf-a11afd84b1ec",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a7fb75b0-0b09-5340-70cf-a11afd84b1ec",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 35,
+        },
+        {
+          Id: "753d7795-451a-bd32-69ea-fd58c1e89d63",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/753d7795-451a-bd32-69ea-fd58c1e89d63",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 36,
+        },
+        {
+          Id: "33bf7274-de0a-e8f9-f97a-c58fb2ea3aaf",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/33bf7274-de0a-e8f9-f97a-c58fb2ea3aaf",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 37,
+        },
+        {
+          Id: "adadae31-37a1-818d-3721-09a1d371c6a5",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/adadae31-37a1-818d-3721-09a1d371c6a5",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 38,
+        },
+        {
+          Id: "f64e8b0d-d2ab-b112-5705-92c23cfc5df6",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/f64e8b0d-d2ab-b112-5705-92c23cfc5df6",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 39,
+        },
+        {
+          Id: "781088b0-5afd-6eb3-5f87-9bfec210d490",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/781088b0-5afd-6eb3-5f87-9bfec210d490",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 40,
+        },
+        {
+          Id: "56df4cef-8053-bff3-21f7-1b1841a3d6e6",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/56df4cef-8053-bff3-21f7-1b1841a3d6e6",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 41,
+        },
+        {
+          Id: "a3e3dab9-7a61-f822-d113-42f46bc5e8ce",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a3e3dab9-7a61-f822-d113-42f46bc5e8ce",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 42,
+        },
+        {
+          Id: "1cc195b9-e498-179d-b927-6d706266decb",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/1cc195b9-e498-179d-b927-6d706266decb",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 43,
+        },
+        {
+          Id: "7dca834f-d959-898e-a0cb-5c8244c4c4a9",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7dca834f-d959-898e-a0cb-5c8244c4c4a9",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 44,
+        },
+        {
+          Id: "13eeba83-2e93-800e-e934-a56061633c64",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/13eeba83-2e93-800e-e934-a56061633c64",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 45,
+        },
+        {
+          Id: "971f0a62-92a3-6d04-53c5-51fa9155e28c",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/971f0a62-92a3-6d04-53c5-51fa9155e28c",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 46,
+        },
+        {
+          Id: "2959d06c-5ac7-f3b9-63d4-1a56e3974fc7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/2959d06c-5ac7-f3b9-63d4-1a56e3974fc7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 47,
+        },
+      ];
+      let path = "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com";
+      let files = new Array();
+      for (let i = 0; i < InstanceInfoList.length; i++) {
+        let item = InstanceInfoList[i];
+        let obj = {
+          name: "file" + i,
+          url: path + item.Path,
+        };
+        files.push(obj);
+      }
+      store.dispatch("trials/setUnLock", true);
+      // let res = await downloadImage(zipName, files);
+      store.dispatch("trials/setUnLock", false);
+    },
+  },
+  beforeDestroy() {
+    store.dispatch("trials/setUnLock", false);
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep .el-dialog {
+  .el-dialog__header {
+    padding-top: 15px;
+  }
+}
+.uploadImage {
+  background-color: #fff;
+}
+</style>

src/components/videos/index.vue

@@ -1,180 +0,0 @@
-<template>
-  <div style="text-align: center">
-    <div style="display: flex;justify-content: center">
-      <video v-if="videoSrc" id="video" controls crossorigin="anonymous" width="400" height="270"">
-        <source :src="videoSrc" type="video/mp4">
-        无法播放，请点击转码
-      </video>
-      <div v-else style="border:2px dashed #999;border-radius: 10px;cursor:pointer;width:400px;height:270px;display: flex;justify-content: center;align-items: center" @click="$refs.fileInput.click()">
-        请选择视频文件
-      </div>
-    </div>
-    <input v-show="false" ref="fileInput" type="file" accept="video/*" @change="fileChange">
-    <div v-if="isVideoToMp4" style="display: flex;align-items: center;justify-content: right;margin-top: 10px;">
-      <div>转码进度: </div>
-      <el-progress style="width: 200px" :percentage="percentage" :format="() => {return percentage + '%'}" />
-    </div>
-    <div style="margin-top: 10px;display: flex;justify-content: right;align-items: center">
-      <el-button size="small" type="primary" :disabled="isVideoToMp4 || isDisabled" @click="$refs.fileInput.click()">选择文件</el-button>
-      <el-button v-if="isNeedToMp4" size="small" type="primary" :disabled="(videoSrc ? false : true) || isVideoToMp4 || isDisabled" @click="videoToMp4">转码</el-button>
-      <el-button size="small" type="primary" :disabled="(videoSrc ? false : true) || isVideoToMp4 || isDisabled" @click="upload">上传</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import { createFFmpeg, fetchFile } from '@ffmpeg/ffmpeg'
-const ffmpeg = createFFmpeg({
-  log: true,
-  corePath: './ffmpeg-core.js'
-})
-
-export default {
-  props: {
-  },
-  data() {
-    return {
-      isDisabled: false,
-      imgList: [],
-      fileObj: null,
-      videoList: [],
-      videoSrc: null,
-      file: null,
-      dataBuffer: null,
-      percentage: 0,
-      isVideoToMp4: false,
-      isNeedToMp4: false
-    }
-  },
-  watch: {
-  },
-  mounted() {
-  },
-  methods: {
-    async uploadVideo(objectName, file) {
-      try {
-        this.isDisabled = true
-        const result = await this.OSSclient.put(objectName, file)
-        this.$emit('uploadOver', true, result, this.file.name)
-      } catch (e) {
-        console.log(e)
-        this.isDisabled = false
-        this.$emit('uploadOver', false)
-      }
-    },
-    upload() {
-      if (document.querySelector('#video').readyState === 0 && document.querySelector('#video').buffered.length === 0) {
-        this.$alert(this.$t('components:uploadvideo:message:xf2'))
-        this.isNeedToMp4 = true
-        return
-      }
-      this.uploadVideo(`file/videofile/${this.file.name.split('.')[0]}${new Date().getTime()}.mp4`, this.dataBuffer)
-    },
-    async videoToMp4() {
-      // 页面是否在安全上下文中
-      // https 或者 本地开发环境才是安全上下文
-      if (!window.isSecureContext) {
-        this.$alert(this.$t('components:uploadvideo:message:xf3'))
-        return
-      }
-      // 顶部文档是否开启跨源隔离
-      if (!window.crossOriginIsolated) {
-        this.$alert(this.$t('components:uploadvideo:message:xf4'))
-        return
-      }
-      this.$message.success(this.$t('components:uploadvideo:message:xf5'))
-      if (!ffmpeg.isLoaded()) {
-        await ffmpeg.load()
-      }
-      this.percentage = 0
-      this.isVideoToMp4 = true
-      ffmpeg.setProgress(({ ratio }) => {
-        console.log(ratio)
-        if (ratio * 100 < 1) {
-          this.percentage = parseInt(0)
-        } else {
-          this.percentage = parseInt(ratio * 100)
-        }
-      })
-      ffmpeg.FS('writeFile', 'input.mp4', await fetchFile(this.videoSrc))
-      await ffmpeg.run('-i', 'input.mp4', 'output.mp4')
-      this.videoSrc = null
-      const data = ffmpeg.FS('readFile', 'output.mp4')
-      this.dataBuffer = new Blob([data.buffer], { type: 'video/mp4' })
-      this.$message.success(this.$t('components:uploadvideo:message:xf6'))
-      setTimeout(() => {
-        this.videoSrc = URL.createObjectURL(this.dataBuffer)
-        this.isVideoToMp4 = false
-        this.isNeedToMp4 = false
-        process.exit(0)
-      }, 50)
-    },
-    fileChange(e) {
-      this.videoSrc = null
-      const files = e.target.files || e.dataTransfer.files
-      this.file = files[0]
-      var reader = new FileReader()
-      reader.readAsArrayBuffer(this.file)
-      reader.onloadend = async(e) => {
-        this.dataBuffer = new Blob([e.target.result], { type: 'video/mp4' })
-        this.videoSrc = URL.createObjectURL(this.dataBuffer)
-        this.$message.success(this.$t('components:uploadvideo:message:xf7'))
-        e.target.files = []
-      }
-    },
-    deleteimg(index) {
-      this.imgList.splice(index, 1)
-    },
-    jietu() {
-      this.screenShot('video')
-    },
-    screenShot(id) {
-      var player = document.getElementById(id)
-      var canvas = document.createElement('canvas')
-      var img = document.createElement('img')
-      canvas.width = player.videoWidth
-      canvas.height = player.videoHeight
-      canvas.getContext('2d').drawImage(player, 0, 0, canvas.width, canvas.height)
-      var dataURL = canvas.toDataURL('image/png')
-      img.src = dataURL
-      img.width = player.clientWidth
-      img.height = player.clientHeight
-      img.style.objectFit = 'contain'
-      this.imgList.push(dataURL)
-    },
-    downFile(data, fileName) {
-      var save_link = document.createElementNS(
-        'http://www.jumi.com',
-        'a'
-      )
-      save_link.href = data
-      save_link.download = fileName
-      var event = document.createEvent('MouseEvents')
-      event.initMouseEvent(
-        'click',
-        true,
-        false,
-        window,
-        0,
-        0,
-        0,
-        0,
-        0,
-        false,
-        false,
-        false,
-        false,
-        0,
-        null
-      )
-      save_link.dispatchEvent(event)
-    }
-  }
-}
-</script>
-<style lang='scss'>
-  #cutImage{
-    img{
-    }
-  }
-</style>

src/const/sign-code.vue

@@ -1,6 +1,5 @@
 <script>
-export default
-{
+export default {
   processSignature: {
     LogicalConfigConfirmation: 101, // 逻辑配置确认：逻辑配置确认操作
     ProcessConfigConfirmation: 102, // 流程配置确认：流程配置确认操作
@@ -9,6 +8,8 @@ export default
     ProcessConfigUpdates: 105, // 流程配置更新：流程配置更新操作
     ExpeditedConfigUpdates: 106, // 加急配置更新：加急配置更新操作
     QCConfirmation: 107, // 质控问题配置：质控问题配置确认操作
+    DicomConfigConfirmation: 110, // DICOM AE配置确认
+    DicomConfigUpdates: 111, // DICOM AE配置更新
     ClinicalDataConfirmation: 201, // 临床数据完整性确认：临床数据完整性确认操作
     AgreeToRetransmit: 202, // 同意重传：同意重传操作
     QCSingleReviewPassed: 203, // 影像质控单审通过：影像质控审核操作
@@ -25,9 +26,9 @@ export default
     ImageAssessmentReportConfirmation: 214, // 影像评估报告确认
     MedicalAuditConfirmation: 109, // 医学审核问题确认
     ReadingUnitConfirmation: 108, // 医学审核问题确认
-    MedicalAudit: 215,// 医学审核
-    HeavyReadingApproval: 216,// 重阅审批
+    MedicalAudit: 215, // 医学审核
+    HeavyReadingApproval: 216, // 重阅审批
     ResetAndAsyncCriterion: 218, //同步签名
-  }
-}
+  },
+};
 </script>

src/directive/adaptive/adaptive.js

@@ -4,11 +4,12 @@ import {
 } from 'element-ui/src/utils/resize-event'
 
 // 设置表格高度
-const doResize = async(el, binding, vnode) => {
+const doResize = async (el, binding, vnode) => {
   // 获取表格Dom对象
   const { componentInstance: $table } = await vnode
   // 获取调用传递过来的数据
   const { value } = binding
+  if (value && value.notAdaptive) return;
   // 获取距底部距离（用于展示页码等信息）
   const bottomOffset = (value && value.bottomOffset) || 40
   if (!$table) return
@@ -24,7 +25,7 @@ export default {
   // 初始化设置
   bind(el, binding, vnode) {
     // 设置resize监听方法
-    el.resizeListener = async() => {
+    el.resizeListener = async () => {
       await doResize(el, binding, vnode)
     }
     // 绑定监听方法到addResizeListener

src/icons/svg/login-logo.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="_图层_2" data-name="图层 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 454.72 126.1">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #0093dd;
+      }
+
+      .cls-2 {
+        fill: #5b5b5b;
+      }
+    </style>
+  </defs>
+  <g id="_图层_1-2" data-name="图层 1">
+    <g>
+      <path class="cls-1" d="m162.51,68.1h14.37c5.59,0,9.79,4.03,8.73,8.37l-1.38,5.61h-44.66c-2.41,0-4.3-.44-5.66-1.32-1.36-.82-1.84-2.17-1.42-4.06L148.68,6.71c.52-1.95,1.97-3.56,4.32-4.82,2.36-1.26,5.16-1.89,8.41-1.89h16.82l-15.72,68.1Z"/>
+      <path class="cls-1" d="m204.2,25.41c.52-1.76,1.86-3.21,4.01-4.34,2.15-1.13,4.69-1.7,7.62-1.7h15.88l-11.32,49.4c-.94,3.97-3.83,7.19-8.64,9.68-4.82,2.49-10.43,3.73-16.82,3.73h-3.61l12.89-56.77ZM219.29.38h17.6l-2.04,8.78c-.42,1.26-1.36,2.28-2.83,3.07-1.47.79-3.2,1.18-5.19,1.18h-19.02l1.89-8.12c.31-1.45,1.39-2.63,3.22-3.54,1.83-.91,3.95-1.37,6.36-1.37Z"/>
+      <path class="cls-1" d="m262.55,68.1h14.37c5.59,0,9.79,4.03,8.73,8.37l-1.38,5.61h-44.66c-2.41,0-4.3-.44-5.66-1.32-1.36-.82-1.84-2.17-1.42-4.06L248.72,6.71c.52-1.95,1.97-3.56,4.32-4.82,2.36-1.26,5.16-1.89,8.41-1.89h16.82l-15.72,68.1Z"/>
+      <path class="cls-1" d="m304.25,25.41c.52-1.76,1.86-3.21,4.01-4.34,2.15-1.13,4.69-1.7,7.62-1.7h15.88l-11.32,49.4c-.94,3.97-3.83,7.19-8.64,9.68-4.82,2.49-10.43,3.73-16.82,3.73h-3.61l12.89-56.77ZM319.33.38h17.6l-2.04,8.78c-.42,1.26-1.36,2.28-2.83,3.07-1.47.79-3.2,1.18-5.19,1.18h-19.02l1.89-8.12c.31-1.45,1.39-2.63,3.22-3.54,1.83-.91,3.95-1.37,6.36-1.37Z"/>
+      <g>
+        <path class="cls-2" d="m0,101.17h2.51v19.36H0v-19.36Z"/>
+        <path class="cls-2" d="m28.37,110.12v10.4h-2.4v-9.54c0-2.31-.64-3.65-2.9-3.65-1.76,0-3.26.5-3.91,2.65v10.54h-2.4v-9.54c0-2.31-.56-3.65-2.76-3.65-1.87,0-3.24.42-3.99,2.73v10.46h-2.4v-15.06h2.4v1.98c.92-1.79,2.54-2.26,4.35-2.26,2.37,0,3.74.95,4.38,2.45.89-1.95,2.84-2.45,4.69-2.45,3.51,0,4.94,2.04,4.94,4.94Z"/>
+        <path class="cls-2" d="m45.28,109.84v10.68h-2.04l-.36-2.29c-.86,1.65-3.12,2.57-5.38,2.57-3.6,0-5.19-1.65-5.19-4.49,0-3.57,2.37-4.8,5.97-4.8h4.6v-1.26c0-1.81-.64-3.07-3.71-3.07-1,0-2.23.11-3.32.33v-2.12c1.12-.14,2.34-.22,3.43-.22,4.74,0,6,1.95,6,4.66Zm-2.4,6.08v-2.48h-4.43c-2.48,0-3.65.5-3.65,2.85,0,1.65.81,2.51,2.93,2.51,2.51,0,4.38-1.09,5.16-2.87Z"/>
+        <path class="cls-2" d="m63.05,105.46v14c0,4.16-2.26,6.64-7.36,6.64-1.28,0-2.71-.17-3.65-.36v-2.04c1.14.22,2.4.33,3.68.33,3.35,0,4.94-1.37,4.94-4.83v-1.51c-.61,1.76-1.98,2.82-4.88,2.82-5.02,0-6.25-3.07-6.25-7.67,0-4.16,1.23-7.67,6.25-7.67,3.04,0,4.29,1.31,4.88,3.1v-2.82h2.4Zm-2.32,7.39c0-3.46-1-5.66-4.63-5.66s-4.02,2.73-4.02,5.66c0,3.15.47,5.66,4.02,5.66s4.63-2.06,4.63-5.66Z"/>
+        <path class="cls-2" d="m67.9,101.28c0-1.26.39-1.42,1.45-1.42,1,0,1.42.17,1.42,1.42s-.42,1.42-1.42,1.42c-1.06,0-1.45-.2-1.45-1.42Zm.22,4.18h2.4v15.06h-2.4v-15.06Z"/>
+        <path class="cls-2" d="m87.87,110.09v10.43h-2.43v-9.54c0-2.31-.47-3.65-2.87-3.65-1.9,0-3.74.36-4.57,3.01v10.18h-2.4v-15.06h2.4v2.15c.92-1.92,2.98-2.43,4.83-2.43,3.93,0,5.05,2.04,5.05,4.91Z"/>
+        <path class="cls-2" d="m105.5,105.46v14c0,4.16-2.26,6.64-7.36,6.64-1.28,0-2.71-.17-3.65-.36v-2.04c1.14.22,2.4.33,3.68.33,3.35,0,4.94-1.37,4.94-4.83v-1.51c-.61,1.76-1.98,2.82-4.88,2.82-5.02,0-6.25-3.07-6.25-7.67,0-4.16,1.23-7.67,6.25-7.67,3.04,0,4.29,1.31,4.88,3.1v-2.82h2.4Zm-2.32,7.39c0-3.46-1-5.66-4.63-5.66s-4.02,2.73-4.02,5.66c0,3.15.47,5.66,4.02,5.66s4.63-2.06,4.63-5.66Z"/>
+        <path class="cls-2" d="m129.47,103.4h-5.63v17.13h-2.51v-17.13h-5.66v-2.23h13.81v2.23Z"/>
+        <path class="cls-2" d="m138.31,105.18l-.08,2.18h-.33c-1.92,0-3.82.64-4.66,3.32v9.85h-2.4v-15.06h2.4v2.73c.95-2.51,2.98-3.01,4.8-3.01h.28Z"/>
+        <path class="cls-2" d="m141.19,101.28c0-1.26.39-1.42,1.45-1.42,1,0,1.42.17,1.42,1.42s-.42,1.42-1.42,1.42c-1.06,0-1.45-.2-1.45-1.42Zm.22,4.18h2.4v15.06h-2.4v-15.06Z"/>
+        <path class="cls-2" d="m160.85,109.84v10.68h-2.04l-.36-2.29c-.86,1.65-3.12,2.57-5.38,2.57-3.6,0-5.19-1.65-5.19-4.49,0-3.57,2.37-4.8,5.97-4.8h4.6v-1.26c0-1.81-.64-3.07-3.71-3.07-1,0-2.23.11-3.32.33v-2.12c1.12-.14,2.34-.22,3.43-.22,4.74,0,6,1.95,6,4.66Zm-2.4,6.08v-2.48h-4.43c-2.48,0-3.65.5-3.65,2.85,0,1.65.81,2.51,2.93,2.51,2.51,0,4.38-1.09,5.16-2.87Z"/>
+        <path class="cls-2" d="m165.96,117.48v-18.16h2.4v17.54c0,1.51.42,1.81,1.39,1.81.33,0,.75-.03,1.14-.14v1.98c-.45.11-.92.17-1.59.17-2.23,0-3.35-.95-3.35-3.21Z"/>
+        <path class="cls-2" d="m181.13,101.17h4.02l4.94,12.47h.17l4.94-12.47h3.96v19.36h-2.51v-16.82h-.17l-4.96,12.44h-2.73l-5.02-12.44h-.17v16.82h-2.45v-19.36Z"/>
+        <path class="cls-2" d="m216.23,109.84v10.68h-2.04l-.36-2.29c-.86,1.65-3.12,2.57-5.38,2.57-3.6,0-5.19-1.65-5.19-4.49,0-3.57,2.37-4.8,5.97-4.8h4.6v-1.26c0-1.81-.64-3.07-3.71-3.07-1,0-2.23.11-3.32.33v-2.12c1.12-.14,2.34-.22,3.43-.22,4.74,0,6,1.95,6,4.66Zm-2.4,6.08v-2.48h-4.43c-2.48,0-3.65.5-3.65,2.85,0,1.65.81,2.51,2.93,2.51,2.51,0,4.38-1.09,5.16-2.87Z"/>
+        <path class="cls-2" d="m233.61,110.09v10.43h-2.43v-9.54c0-2.31-.47-3.65-2.87-3.65-1.9,0-3.74.36-4.57,3.01v10.18h-2.4v-15.06h2.4v2.15c.92-1.92,2.98-2.43,4.83-2.43,3.93,0,5.05,2.04,5.05,4.91Z"/>
+        <path class="cls-2" d="m250.54,109.84v10.68h-2.04l-.36-2.29c-.86,1.65-3.12,2.57-5.38,2.57-3.6,0-5.19-1.65-5.19-4.49,0-3.57,2.37-4.8,5.97-4.8h4.6v-1.26c0-1.81-.64-3.07-3.71-3.07-1,0-2.23.11-3.32.33v-2.12c1.12-.14,2.34-.22,3.43-.22,4.74,0,6,1.95,6,4.66Zm-2.4,6.08v-2.48h-4.43c-2.48,0-3.65.5-3.65,2.85,0,1.65.81,2.51,2.93,2.51,2.51,0,4.38-1.09,5.16-2.87Z"/>
+        <path class="cls-2" d="m268.31,105.46v14c0,4.16-2.26,6.64-7.36,6.64-1.28,0-2.71-.17-3.65-.36v-2.04c1.14.22,2.4.33,3.68.33,3.35,0,4.94-1.37,4.94-4.83v-1.51c-.61,1.76-1.98,2.82-4.88,2.82-5.02,0-6.25-3.07-6.25-7.67,0-4.16,1.23-7.67,6.25-7.67,3.04,0,4.29,1.31,4.88,3.1v-2.82h2.4Zm-2.32,7.39c0-3.46-1-5.66-4.63-5.66s-4.02,2.73-4.02,5.66c0,3.15.47,5.66,4.02,5.66s4.63-2.06,4.63-5.66Z"/>
+        <path class="cls-2" d="m285.22,113.24l-10.21.64c.03,3.29,1.17,4.8,4.83,4.8,1.65,0,3.57-.42,4.71-.98v2.2c-.86.45-2.93.89-5.08.89-4.44,0-6.97-1.81-6.97-7.81s2.54-7.81,6.83-7.81c5.13,0,6.02,3.38,6.02,6.3,0,.42-.06,1.06-.14,1.76Zm-2.23-1.73c0-2.32-.39-4.35-3.65-4.35-3.46,0-4.24,1.87-4.32,4.94l7.98-.59Z"/>
+        <path class="cls-2" d="m310.27,110.12v10.4h-2.4v-9.54c0-2.31-.64-3.65-2.9-3.65-1.76,0-3.26.5-3.91,2.65v10.54h-2.4v-9.54c0-2.31-.56-3.65-2.76-3.65-1.87,0-3.24.42-3.99,2.73v10.46h-2.4v-15.06h2.4v1.98c.92-1.79,2.54-2.26,4.35-2.26,2.37,0,3.74.95,4.38,2.45.89-1.95,2.84-2.45,4.69-2.45,3.51,0,4.94,2.04,4.94,4.94Z"/>
+        <path class="cls-2" d="m327.03,113.24l-10.21.64c.03,3.29,1.17,4.8,4.83,4.8,1.65,0,3.57-.42,4.71-.98v2.2c-.86.45-2.93.89-5.08.89-4.44,0-6.97-1.81-6.97-7.81s2.54-7.81,6.83-7.81c5.13,0,6.03,3.38,6.03,6.3,0,.42-.06,1.06-.14,1.76Zm-2.23-1.73c0-2.32-.39-4.35-3.65-4.35-3.46,0-4.24,1.87-4.32,4.94l7.98-.59Z"/>
+        <path class="cls-2" d="m343.6,110.09v10.43h-2.43v-9.54c0-2.31-.47-3.65-2.87-3.65-1.9,0-3.74.36-4.57,3.01v10.18h-2.4v-15.06h2.4v2.15c.92-1.92,2.98-2.43,4.83-2.43,3.93,0,5.05,2.04,5.05,4.91Z"/>
+        <path class="cls-2" d="m354.9,118.52v2.04c-.59.08-1.06.14-1.7.14-3.32,0-4.52-.81-4.52-4.77v-8.45h-2.23v-2.01h2.23v-3.57h2.4v3.57h3.74v2.01h-3.74v8.31c0,2.34.33,2.9,2.18,2.9.67,0,1.12-.06,1.65-.17Z"/>
+        <path class="cls-2" d="m364.19,120.05v-2.32c1.14.42,3.46.86,5.75.86,2.9,0,4.41-.86,4.41-3.26s-.84-3.01-4.46-3.88c-3.96-.95-5.41-1.92-5.41-5.36s2.06-5.24,6.44-5.24c1.87,0,3.93.33,4.85.7v2.29c-1.12-.42-3.07-.78-4.83-.78-2.71,0-3.99.53-3.99,3.04,0,1.81.47,2.45,3.96,3.26,4.32,1,5.88,2.15,5.88,5.94s-2.4,5.49-6.86,5.49c-2.4,0-4.8-.42-5.75-.75Z"/>
+        <path class="cls-2" d="m379.71,124.04c2.62,0,3.68-1.12,4.43-3.54l-6.02-15.03h2.59l4.6,12.5h.17l4.35-12.5h2.43l-5.41,14.56c-1.42,3.77-2.71,6.08-7.14,6.08v-2.06Z"/>
+        <path class="cls-2" d="m394.18,120.22v-2.06c1.06.31,2.98.59,4.35.59,2.29,0,3.49-.56,3.49-2.31s-.5-2.15-3.38-2.82c-3.32-.75-4.21-1.81-4.21-4.35s1.84-4.07,5.41-4.07c1.45,0,3.07.22,3.79.5l-.17,2.04c-.86-.33-2.2-.59-3.6-.59-2.12,0-3.18.47-3.18,2.18,0,1.53.53,1.87,2.87,2.4,3.46.78,4.71,1.73,4.71,4.63s-2.04,4.35-5.72,4.35c-1.45,0-3.54-.22-4.38-.47Z"/>
+        <path class="cls-2" d="m414.77,118.52v2.04c-.59.08-1.06.14-1.7.14-3.32,0-4.52-.81-4.52-4.77v-8.45h-2.23v-2.01h2.23v-3.57h2.4v3.57h3.74v2.01h-3.74v8.31c0,2.34.33,2.9,2.18,2.9.67,0,1.12-.06,1.65-.17Z"/>
+        <path class="cls-2" d="m429.67,113.24l-10.21.64c.03,3.29,1.17,4.8,4.83,4.8,1.65,0,3.57-.42,4.71-.98v2.2c-.86.45-2.93.89-5.08.89-4.44,0-6.97-1.81-6.97-7.81s2.54-7.81,6.83-7.81c5.13,0,6.02,3.38,6.02,6.3,0,.42-.06,1.06-.14,1.76Zm-2.23-1.73c0-2.32-.39-4.35-3.65-4.35-3.46,0-4.24,1.87-4.32,4.94l7.98-.59Z"/>
+        <path class="cls-2" d="m454.72,110.12v10.4h-2.4v-9.54c0-2.31-.64-3.65-2.9-3.65-1.76,0-3.26.5-3.91,2.65v10.54h-2.4v-9.54c0-2.31-.56-3.65-2.76-3.65-1.87,0-3.24.42-3.99,2.73v10.46h-2.4v-15.06h2.4v1.98c.92-1.79,2.54-2.26,4.35-2.26,2.37,0,3.74.95,4.38,2.45.89-1.95,2.84-2.45,4.69-2.45,3.51,0,4.94,2.04,4.94,4.94Z"/>
+      </g>
+    </g>
+  </g>
+</svg>

src/main.js

@@ -1,9 +1,9 @@
 
 import Vue from 'vue'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
-
+// import { createVersionPolling } from "@/utils/version-polling.esm.js";
 import ElementUI, { MessageBox } from 'element-ui'
-import { getBasicDataAllSelect, getFrontInternationalizationList } from '@/api/dictionary/dictionary'
+import { getBasicDataAllSelect, getFrontInternationalizationList, getCurrentPublishInfo } from '@/api/dictionary/dictionary'
 import { resetReadingRestTime } from '@/api/trials/reading'
 // import 'element-ui/lib/theme-chalk/index.css'
 import './assets/css/theme-blue/index.css' // 浅绿色主题
@@ -24,31 +24,26 @@ Vue.use(VueClipboard)
 // import htmlToPdf from './utils/htmlToPdf'
 // Vue.use(htmlToPdf)
 import permission from './utils/permission'
-import { OSSclient } from './utils/oss'
 Vue.use(permission)
 
 import Viewer from 'v-viewer'
 import './assets/css/viewer.css'
-
-Vue.use(Viewer)
 Viewer.setDefaults({
-  Options: {
-    'inline': true,
-    'button': true,
-    'navbar': true,
-    'title': true,
-    'toolbar': true,
-    'tooltip': true,
-    'movable': true,
-    'zoomable': true,
-    'rotatable': true,
-    'scalable': true,
-    'transition': true,
-    'fullscreen': true,
-    'keyboard': true,
-    'url': 'data-source'
+  // navbar: true, //底部缩略图
+  toolbar: {
+    zoomIn: true,
+    zoomOut: true,
+    reset: true,
+    prev: true,
+    next: true,
+    rotateLeft: true,
+    rotateRight: true,
+    flipHorizontal: true,
+    flipVertical: true,
   }
 })
+Vue.use(Viewer)
+
 
 import hasPermi from './directive/permission'
 Vue.use(hasPermi)
@@ -57,14 +52,22 @@ Vue.use(hasPermi)
 // Vue.use(ElementUI, { locale, size: 'medium' })
 import upload from '@/components/element-ui/upload'
 Vue.use(upload)
+import Preview from '@/components/Preview/index'
+Vue.use(Preview)
+import MFA from '@/components/MFA/index'
+Vue.use(MFA)
+import FB from '@/components/feedBack/index'
+Vue.use(FB)
+import FBT from '@/components/feedBackTable/index'
+Vue.use(FBT)
 import adaptive from '@/directive/adaptive/index'
 // 表格自适应指令
 Vue.use(adaptive)
 import dialogDrag from '@/directive/dialogDrag'
 // 窗口拖拽
 Vue.use(dialogDrag)
-if(!String.prototype.replaceAll){
-  String.prototype.replaceAll = function(str, newStr){
+if (!String.prototype.replaceAll) {
+  String.prototype.replaceAll = function (str, newStr) {
     // 正则表达式
     if (Object.prototype.toString.call(str).toLowerCase() === '[object regexp]') {
       return this.replace(str, newStr)
@@ -80,6 +83,7 @@ import DictTag from '@/components/DictTag'
 import DictData from '@/components/DictData'
 import { getBasicDataSelect } from '@/api/dictionary/dictionary'
 import { checkConfig } from '@/const/check/index'
+import { getTrialBodyPartList } from "@/api/trials/setting";
 // 全局方法挂载
 var $q = params
 Vue.prototype.checkConfig = checkConfig
@@ -96,12 +100,14 @@ Vue.prototype.selectDictLabel = selectDictLabel
 // Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 Vue.prototype.$getObjectName = (url) => {
-  // console.log(url)
-  var value = url
-  var str = value.split("//"); //https://进行分割，
-  var index = str[1].indexOf("/")+1; //indexOf 获取第一个斜杠的索引,
-  // console.log(str[1].substring(index)); //substring 截取，
-  return '/' + str[1].substring(index)
+  // console.log(url,'url')
+  // console.log(Vue.prototype.OSSclientConfig.viewEndpoint,'url')
+  var value = url;
+  let basePath = Vue.prototype.OSSclientConfig.viewEndpoint;
+  if (Vue.prototype.OSSclientConfig.ObjectStoreUse === 'AliyunOSS') {
+    basePath = Vue.prototype.OSSclientConfig.endPoint.split('https://').length > 1 ? Vue.prototype.OSSclientConfig.endPoint.split('https://')[1] : Vue.prototype.OSSclientConfig.endPoint;
+  }
+  return value.split(basePath)[1];
 }
 Vue.prototype.getGuid = (text) => {
   text = md5(text)
@@ -117,14 +123,15 @@ Vue.prototype.getGuid = (text) => {
   t9 = text.substr(16, 4)
   t10 = text.substr(20, 12)
   // console.log(`${t4+t3+t2+t1}-${t6+t5}-${t8+t7}-${t9}-${t10}`)
-  return `${t4+t3+t2+t1}-${t6+t5}-${t8+t7}-${t9}-${t10}`
+  return `${t4 + t3 + t2 + t1}-${t6 + t5}-${t8 + t7}-${t9}-${t10}`
 }
 Vue.prototype.$validatePassword = (rule, value, callback) => {
-  var lang = zzSessionStorage.getItem('lang')?zzSessionStorage.getItem('lang'):'zh'
+  var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
   /* 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();
   }
@@ -138,6 +145,12 @@ Vue.config.productionTip = false
 Vue.prototype.$upload = () => {
   _vm.$forceUpdate()
 }
+Vue.prototype.$guid = () => {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+    return v.toString(16);
+  });
+}
 Vue.prototype.fileToBlob = (file) => {
   // 创建 FileReader 对象
   const reader = new FileReader()
@@ -158,7 +171,7 @@ Vue.prototype.fileToBlob = (file) => {
 }
 
 var _vm
-async function VueInit () {
+async function VueInit() {
   var params
   var res
   if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct')) {
@@ -179,6 +192,27 @@ async function VueInit () {
     zhMessages[v.Code] = v.ValueCN
     enMessages[v.Code] = v.Value
   })
+  // 获取版本信息
+  let PublishInfo = await getCurrentPublishInfo();
+  Vue.prototype.$version = PublishInfo.Result;
+  // 获取检查部位
+  Vue.prototype.$getBodyPart = (id) => {
+    return new Promise(async (resolve, reject) => {
+      try {
+        let params = {
+          TrialId: id
+        }
+        let BodyPart = await getTrialBodyPartList(params)
+        if (BodyPart.IsSuccess) {
+          resolve(BodyPart.Result);
+        } else {
+          reject(BodyPart);
+        }
+      } catch (err) {
+        reject(err)
+      }
+    })
+  }
   i18n.mergeLocaleMessage('zh', zhMessages)
   i18n.mergeLocaleMessage('en', enMessages)
   Vue.use(ElementUI, {
@@ -187,14 +221,14 @@ async function VueInit () {
   })
   let d = function (code) {
     var dictInfo = res.Result
-    var lang = zzSessionStorage.getItem('lang')?zzSessionStorage.getItem('lang'):'zh'
+    var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
     try {
       for (var code in dictInfo) {
-        var dictList = (dictInfo[code] && dictInfo[code].length > 0)  ? dictInfo[code].map(dict => {
+        var dictList = (dictInfo[code] && dictInfo[code].length > 0) ? dictInfo[code].map(dict => {
           return {
             id: dict.Id,
-            label: lang==='zh' ? dict.ValueCN : dict.Value,
-            value: dict.DataTypeEnum === 3 ? eval(dict.Code) : dict.IsEnumInt ? parseInt(dict.Code): dict.Code,
+            label: lang === 'zh' ? dict.ValueCN : dict.Value,
+            value: dict.DataTypeEnum === 3 ? eval(dict.Code) : dict.IsEnumInt ? parseInt(dict.Code) : dict.Code,
             raw: Object.assign({}, dict),
             IsBaseLineUse: false,
             IsFollowVisitUse: false
@@ -202,35 +236,49 @@ async function VueInit () {
         }) : []
         dictInfo[code] = dictList
       }
-    } catch (e){
+    } catch (e) {
       console.error(e)
     }
     return dictInfo
   }()
   Vue.prototype.$d = d
-  Vue.prototype.$fd = function (code, v, type) {
+  Vue.prototype.$fd = function (code, v, type, arr, key = 'label') {
     try {
+      let data = arr || d;
+      type = type || 'value';
       // code === 'YesOrNo' ? console.log(d) : ''
-      type = type || 'value'
-      return d[code].find(i => {
+      return data[code].find(i => {
         return i[type] === v
-      }) ? d[code].find(i => {
+      }) ? data[code].find(i => {
         return i[type] === v
-      }).label : ''
+      })[key] : ''
     } catch (e) {
     }
   }
-  Vue.prototype.$updateDictionary = function() {
+  Vue.prototype.$company = (isShort = true) => {
+    let companyName = null
+    if (localStorage.getItem('CompanyInfo')) {
+      let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo'))
+      let isZh = zzSessionStorage.getItem('lang') === 'zh' || _vm.$i18n.locale == 'zh'
+      if (isZh) {
+        companyName = isShort ? CompanyInfo.CompanyShortNameCN : CompanyInfo.CompanyNameCN
+      } else {
+        companyName = isShort ? CompanyInfo.CompanyShortName : CompanyInfo.CompanyName
+      }
+    }
+    return companyName;
+  }
+  Vue.prototype.$updateDictionary = function () {
     Vue.prototype.$d = function (code) {
       var dictInfo = res.Result
-      var lang = zzSessionStorage.getItem('lang')?zzSessionStorage.getItem('lang'):'zh'
+      var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
       try {
         for (var code in dictInfo) {
-          var dictList = (dictInfo[code] && dictInfo[code].length > 0)  ? dictInfo[code].map(dict => {
+          var dictList = (dictInfo[code] && dictInfo[code].length > 0) ? dictInfo[code].map(dict => {
             return {
               id: dict.raw.Id,
-              label: lang==='zh' ? dict.raw.ValueCN : dict.raw.Value,
-              value: dict.raw.DataTypeEnum === 3 ? eval(dict.raw.Code) : dict.raw.IsEnumInt ? parseInt(dict.raw.Code): dict.raw.Code,
+              label: lang === 'zh' ? dict.raw.ValueCN : dict.raw.Value,
+              value: dict.raw.DataTypeEnum === 3 ? eval(dict.raw.Code) : dict.raw.IsEnumInt ? parseInt(dict.raw.Code) : dict.raw.Code,
               raw: Object.assign({}, dict.raw),
               IsBaseLineUse: false,
               IsFollowVisitUse: false
@@ -238,7 +286,7 @@ async function VueInit () {
           }) : []
           _vm.$set(dictInfo, code, dictList)
         }
-      } catch (e){
+      } catch (e) {
         console.error(e)
       }
       return dictInfo
@@ -264,7 +312,8 @@ async function VueInit () {
     data: {
       unlock: {
         my_username: null,
-        my_password: null
+        my_password: null,
+        view: false
       }
     },
     render: h => h(App)
@@ -274,14 +323,14 @@ async function VueInit () {
   let count = 0;
   if (eval(process.env.VUE_APP_LOGIN_FOR_PERMISSION)) {
     setInterval(() => {
-      var lang = zzSessionStorage.getItem('lang')?zzSessionStorage.getItem('lang'):'zh'
-      if ( _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
+      if (_vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
         return
       }
       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',
         })
       }
@@ -295,10 +344,10 @@ async function VueInit () {
     function countTime() {
       count++
       localStorage.setItem('count', count)
-      if (count ==  parseInt(second2) || isLock === 'true') {
+      if (count == parseInt(second2) || isLock === 'true') {
         callback2();
       }
-      if (count >=  second) {
+      if (count >= second) {
         callback();
         count = 0;
         localStorage.removeItem('count')
@@ -332,25 +381,43 @@ async function VueInit () {
   }
   const h = _vm.$createElement
   /* eslint-disable */
-  window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME;
+  // eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION)
+  // process.env.VUE_APP_LOGOUT_FOR_TIME
+  // eval(process.env.VUE_APP_LOCK_FOR_PERMISSION)
+  // process.env.VUE_APP_LOCK_FOR_TIME
+  // window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME;
   waitOperate(eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION) ? () => {
-      var lang = zzSessionStorage.getItem('lang')?zzSessionStorage.getItem('lang'):'zh'
-      if ( _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
-        count = 0;
-        localStorage.setItem('count', '0')
-        return
+    var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
+    if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      count = 0;
+      localStorage.setItem('count', '0')
+      return
+    }
+    _vm.$store.dispatch('user/logout').then(res => {
+      // window.location.href = `/login`
+      if (_vm.$msgbox) {
+        _vm.$msgbox.close();
       }
-      _vm.$store.dispatch('user/logout').then(res => {
-        window.location.href = `/login`
-      })
-
-      _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.$FB.close();
+      _vm.$FBT.close();
+      _vm.$MFA.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!', {
+      //   type: 'warning',
+      // })
+      _vm.$alert(_vm.$t("env:loginOut"), {
         type: 'warning',
       })
-    } : () => {}, process.env.VUE_APP_LOGOUT_FOR_TIME,
+    })
+
+  } : () => { }, process.env.VUE_APP_LOGOUT_FOR_TIME,
     eval(process.env.VUE_APP_LOCK_FOR_PERMISSION) ? () => {
-      var lang = zzSessionStorage.getItem('lang')?zzSessionStorage.getItem('lang'):'zh'
-      if ( _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
+      if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
         count = 0;
         localStorage.setItem('count', '0')
         if (_vm.$route.path === '/login') {
@@ -366,53 +433,75 @@ async function VueInit () {
       isOpen = true
       zzSessionStorage.setItem('isLock', 'true')
       _vm.$msgbox({
-        title: lang === 'zh' ? '已锁定' : 'Locked',
-        confirmButtonText: lang === 'zh' ? '解锁' : 'Unlock',
+        title: _vm.$t("env:lock:msgBox:title"),
+        confirmButtonText: _vm.$t("env:lock:msgBox:confirmButtonText"),
         showClose: false,
         beforeClose: (action, instance, done) => {
           if (action === 'confirm') {
             if (!_vm.unlock.my_username) {
-              _vm.$alert(lang === 'zh' ? '请输入您的用户名解锁' : 'Please enter your user name to unlock.')
+              _vm.$alert(_vm.$t("env:lock:msgBox:iupUser"))
               return
             }
             if (!_vm.unlock.my_password) {
-              _vm.$alert(lang === 'zh' ? '请输入您的密码解锁' : 'Please enter the correct password to unlock.')
+              _vm.$alert(_vm.$t("env:lock:msgBox:inpPassword"))
               return
             }
             var my_username = zzSessionStorage.getItem('my_username')
             var my_password = zzSessionStorage.getItem('my_password')
+            let my_userid = zzSessionStorage.getItem('userId')
+            let my_EMail = zzSessionStorage.getItem('my_EMail')
             if (md5(_vm.unlock.my_password) === my_password && my_username === _vm.unlock.my_username) {
               resetReadingRestTime().then(() => {
               })
-              _vm.$message.success(lang === 'zh' ? '解锁成功，请继续操作' : 'Unlocked successfully. Please continue operation.')
-              _vm.unlock = {
-                my_username: null,
-                my_password: null
+              const closeLock = (_vm) => {
+                _vm.$message.success(_vm.$t("env:lock:msgBox:lockSuccess"))
+                _vm.unlock = {
+                  my_username: null,
+                  my_password: null,
+                  view: false
+                }
+                isOpen = false
+                count = 0;
+                isLock = null
+                zzSessionStorage.removeItem('isLock')
+                localStorage.setItem('count', '0')
+                document.querySelector('#my_username').value = null
+                document.querySelector('#my_password').value = null
+                setTimeout(() => {
+                  done()
+                }, 500)
               }
-              isOpen = false
-              count = 0;
-              isLock = null
-              zzSessionStorage.removeItem('isLock')
-              localStorage.setItem('count', '0')
-              document.querySelector('#my_username').value = null
-              document.querySelector('#my_password').value = null
-              setTimeout(() => {
-                done()
-              }, 500)
+              // if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) {
+              //   sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => {
+              //     done();
+              //     Vue.prototype.$MFA({
+              //       status: "lock",
+              //       UserId: my_userid,
+              //       EMail: res.Result,
+              //       username: my_username,
+              //       callBack: () => {
+              //         closeLock(_vm)
+              //       },
+              //     })
+              //   })
+              // } else {
+              closeLock(_vm)
+              // }
+
             } else {
               // console.log(111)
-              _vm.$message.error(lang === 'zh' ? '请输入正确用户名密码' : 'Please enter the correct password.')
+              _vm.$message.error(_vm.$t('env:lock:msgBox:userFail'))
             }
           }
         },
-        message: h('div', {} , [
+        message: h('div', {}, [
           h('el-form', {
             props: { labelWidth: "80px" }
           }, [
             h('el-form-item', {
-              props: {label: lang === 'zh' ? '用户名' : 'Username'},
+              props: { label: _vm.$t("env:lock:msgBox:form:username") },
             }, [
-              h('input',{
+              h('input', {
                 props: {
                   value: _vm.unlock.my_username
                 },
@@ -432,17 +521,22 @@ async function VueInit () {
               })
             ]),
             h('el-form-item', {
-              props: {label: lang === 'zh' ? '密码' : 'Password'},
+              props: { label: _vm.$t("env:lock:msgBox:form:Password") },
+              attrs: {
+                style: "position: relative;"
+              }
             }, [
               h('input', {
                 props: {
                   value: _vm.unlock.my_password
                 },
+                ref: "unlock_my_password_input",
                 attrs: {
                   id: 'my_password',
                   class: 'el-input__inner',
-                  type: 'password',
-                  autocomplete: 'new-password'
+                  type: _vm.unlock.view ? 'text' : 'password',
+                  autocomplete: 'new-password',
+                  style: "padding-right:25px"
                 },
                 on: {
                   change: (event) => {
@@ -452,13 +546,46 @@ async function VueInit () {
                     _vm.unlock.my_password = event.target.value
                   }
                 }
-              })
+              }),
+              h('i', {
+                attrs: {
+                  id: 'my_password_view',
+                  class: "el-icon-view",
+                  style: "cursor: pointer;position: absolute;top:35%;right:10px"
+                },
+                on: {
+                  click: (event) => {
+                    _vm.unlock.view = !_vm.unlock.view
+                    if (_vm.unlock.view) {
+                      _vm.$refs['unlock_my_password_input'].type = "text"
+                    } else {
+                      _vm.$refs['unlock_my_password_input'].type = "password"
+                    }
+                  },
+                }
+              }),
             ])
           ])
         ])
       })
-    } : () => {}, process.env.VUE_APP_LOCK_FOR_TIME)
+    } : () => { }, process.env.VUE_APP_LOCK_FOR_TIME)
 }
 VueInit()
+// createVersionPolling({
+//   appETagKey: "__APP_ETAG__",
+//   pollingInterval: 5 * 60 * 1000, // 单位为毫秒
+//   silent: process.env.NODE_ENV === false, // 开发环境下不检测
+//   onUpdate: (self) => {
+//     // 当检测到有新版本时，执行的回调函数，可以在这里提示用户刷新页面
+//     const result = confirm(_vm.$t("versionPolling:tip"));
+//     if (result) {
+//       self.onRefresh();
+//     } else {
+//       self.onCancel();
+//     }
+//     // 强制更新可以用alert
+//     // alert('有新版本，请刷新页面');
+//   },
+// });
 
 

src/permission.js

@@ -6,13 +6,14 @@ import 'nprogress/nprogress.css'
 import { getToken } from '@/utils/auth'
 import Vue from 'vue'
 import { OSSclient } from './utils/oss'
+import WHITELIST from "./utils/whiteList"
 // import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
-
-router.beforeEach(async(to, from, next) => {
+const whiteList = WHITELIST
+store.state.trials.whiteList = whiteList;
+router.beforeEach(async (to, from, next) => {
   NProgress.start()
   // 设置页面标题
   // document.title = getPageTitle(to.meta.title)
@@ -25,16 +26,16 @@ router.beforeEach(async(to, from, next) => {
     if (to.path === '/login' || to.path === '/recompose' || to.path === '/email-recompose' || to.path === '/error' || to.path === '/ReviewersResearchForm' || to.path === '/ReviewersResearch') {
       if (to.path === '/ReviewersResearch') {
         await this.$store.dispatch('user/logout')
-        OSSclient()
+        await OSSclient()
       }
       if (to.path === '/ReviewersResearchForm') {
-        OSSclient()
+        await OSSclient()
       }
       next()
       NProgress.done()
     } else {
-      OSSclient()
-      const hasGetUserInfo = store.getters.name
+      await OSSclient()
+      const hasGetUserInfo = store.getters.userId
       if (hasGetUserInfo) {
         next()
       } else {
@@ -55,20 +56,33 @@ router.beforeEach(async(to, from, next) => {
   } else {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
-      // 在免登录whiteList中，直接进入
-      if (to.path === '/readingDicoms' || to.path === '/noneDicomReading'){
-        OSSclient()
+      if (to.path === '/researchLogin') {
+        console.log(to)
+        const flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
+        if (flag) {
+          next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${to.query.lang}`)
+        } else {
+          next()
+        }
+      } else {
+        // 在免登录whiteList中，直接进入
+        if (to.path === '/readingDicoms' || to.path === '/noneDicomReading') {
+          await OSSclient()
+        }
+        next()
       }
-      next()
     } else {
       if (to.path === '/researchForm') {
         next(`/researchLogin?`)
         NProgress.done()
+      } else if (to.path === '/researchDetail_m') {
+        next(`/researchLogin_m?`)
+        NProgress.done()
       } else if (to.path === '/ReviewersResearchForm') {
         next(`/ReviewersResearch?`)
         NProgress.done()
       } else {
-      // 其他无权访问的页面将重定向到登录页面。
+        // 其他无权访问的页面将重定向到登录页面。
         next(`/login?`)
         NProgress.done()
       }

src/router/index.js

@@ -201,6 +201,18 @@ export const constantRoutes = [
     component: () => import('@/views/research/form'),
     hidden: true
   },
+  {
+    path: '/researchLogin_m',
+    name: 'researchLogin_m',
+    component: () => import('@/views/research-mobile/login'),
+    hidden: true
+  },
+  {
+    path: '/researchDetail_m',
+    name: 'researchDetail_m',
+    component: () => import('@/views/research-mobile/detail'),
+    hidden: true
+  },
   {
     path: '/trialsResume',
     component: () => import('@/views/trials/trials-panel/enrolled-reviewers/resume/index'),
@@ -262,7 +274,7 @@ export const constantRoutes = [
     children: [{
       path: 'baiscInfo',
       name: 'BaiscInfo',
-      component: () => import('@/views/user/myInfo')
+      component: () => import('@/views/user/editInfo')
     }
     ]
   }

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

@@ -20,8 +20,8 @@ const hangingAgreement = [
 ]
 const getDefaultState = () => {
   return {
-    // visitTaskList: [],
-    visitTaskList: sessionStorage.getItem('visitTaskList') ? JSON.parse(sessionStorage.getItem('visitTaskList')) : [],
+    visitTaskList: [],
+    // visitTaskList: sessionStorage.getItem('visitTaskList') ? JSON.parse(sessionStorage.getItem('visitTaskList')) : [],
     organList: [],
     seriesStack: [],
     activeHangingAgreement: hangingAgreement[0],
@@ -30,30 +30,55 @@ const getDefaultState = () => {
     activeSeries: {},
     lastCanvasTaskId: '',
     imageQuality: null,
-    imageQualityIssues: null
+    imageQualityIssues: null,
+    currentLoadIns: []
   }
 }
 function getQuestions(questions) {
+  const criterionType = parseInt(localStorage.getItem('CriterionType'))
   questions.forEach(item => {
-    if (item.Type === 'table' && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
+    if ((item.Type === 'table' || item.Type === 'basicTable') && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
       item.TableQuestions.Answers.forEach(answerObj => {
-        answerObj.lesionPart = getQuestionAnswer(item.TableQuestions.Questions, 8, answerObj)
-        answerObj.loctation = getQuestionAnswer(item.TableQuestions.Questions, 6, answerObj)
-        answerObj.lesionLength = getQuestionAnswer(item.TableQuestions.Questions, 0, answerObj)
-        answerObj.lesionShort = getQuestionAnswer(item.TableQuestions.Questions, 1, answerObj)
         answerObj.isDicomReading = answerObj.IsDicomReading === 'True'
-        var isLymphLesion = getQuestionAnswer(item.TableQuestions.Questions, 2, answerObj)
-        isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
-        answerObj.isLymphLesion = isLymphLesion
-        answerObj.lesionState = getQuestionAnswer(item.TableQuestions.Questions, 7, answerObj)
-        var lesionNum = getQuestionAnswer(item.TableQuestions.Questions, 11, answerObj)
-        answerObj.lesionNum = lesionNum
+
         if (answerObj.RowId) {
-          var idx = item.TableQuestions.Questions.findIndex(i => i.QuestionMark === 11)
-          if (idx > -1) {
+          if (criterionType === 10) {
             // pcwg
+            var lesionNum = getQuestionAnswer(item.TableQuestions.Questions, 11, answerObj)
+            answerObj.lesionNum = lesionNum
             answerObj.saveTypeEnum = isNaN(parseInt(answerObj.lesionNum)) ? 1 : 2
+          } else if (criterionType === 19) {
+            // ivus
+            answerObj.area1 = getQuestionAnswer(item.TableQuestions.Questions, 1001, answerObj)
+            answerObj.area2 = getQuestionAnswer(item.TableQuestions.Questions, 1002, answerObj)
+            const v = getQuestionAnswer(item.TableQuestions.Questions, 1003, answerObj)
+            answerObj.diff = v
+            answerObj.saveTypeEnum = isNaN(parseFloat(v)) ? 1 : 2
+          } else if (criterionType === 20) {
+            // oct
+            if (item.LesionType === 101) {
+              answerObj.l1 = getQuestionAnswer(item.TableQuestions.Questions, 1011, answerObj)
+              answerObj.l2 = getQuestionAnswer(item.TableQuestions.Questions, 1012, answerObj)
+              answerObj.l3 = getQuestionAnswer(item.TableQuestions.Questions, 1013, answerObj)
+              const min = getQuestionAnswer(item.TableQuestions.Questions, 1014, answerObj)
+              answerObj.min = min
+              const mean = getQuestionAnswer(item.TableQuestions.Questions, 1015, answerObj)
+              answerObj.mean = mean
+              answerObj.saveTypeEnum = (isNaN(parseFloat(min)) || isNaN(parseFloat(mean))) ? 1 : 2
+            } else if (item.LesionType === 103) {
+              const angle = getQuestionAnswer(item.TableQuestions.Questions, 1016, answerObj)
+              answerObj.angle = angle
+              answerObj.saveTypeEnum = isNaN(parseFloat(angle)) ? 1 : 2
+            }
           } else {
+            answerObj.lesionPart = getQuestionAnswer(item.TableQuestions.Questions, 8, answerObj)
+            answerObj.loctation = getQuestionAnswer(item.TableQuestions.Questions, 6, answerObj)
+            answerObj.lesionLength = getQuestionAnswer(item.TableQuestions.Questions, 0, answerObj)
+            answerObj.lesionShort = getQuestionAnswer(item.TableQuestions.Questions, 1, answerObj)
+            let isLymphLesion = getQuestionAnswer(item.TableQuestions.Questions, 2, answerObj)
+            isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
+            answerObj.isLymphLesion = isLymphLesion
+            answerObj.lesionState = getQuestionAnswer(item.TableQuestions.Questions, 7, answerObj)
             answerObj.saveTypeEnum = isNaN(parseInt(answerObj.lesionState)) ? 1 : 2
           }
         } else {
@@ -69,7 +94,7 @@ function getQuestions(questions) {
 }
 function findQuestionAndRemoveLesion(questions, obj) {
   for (var i = 0; i < questions.length; i++) {
-    if (questions[i].Type === 'table' && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType) && questions[i].TableQuestions.Answers.length > 0) {
+    if ((questions[i].Type === 'table' || questions[i].Type === 'basicTable') && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType) && questions[i].TableQuestions.Answers.length > 0) {
       var idx = questions[i].TableQuestions.Answers.findIndex(i => String(i.RowIndex) === String(obj.rowIndex))
       if (idx > -1) {
         questions[i].TableQuestions.Answers.splice(idx, 1)
@@ -85,7 +110,7 @@ function findQuestionAndRemoveLesion(questions, obj) {
 function findQuestionAndUpdateLesion(questions, obj) {
   for (var i = 0; i < questions.length; i++) {
     var item = questions[i]
-    if (item.Type === 'table' && item.Id === obj.questionId) {
+    if ((item.Type === 'table' || item.Type === 'basicTable') && item.Id === obj.questionId) {
       var idx = item.TableQuestions.Answers.findIndex(i => i.RowIndex === obj.rowIndex)
       item.TableQuestions.Answers[idx].isLymphLesion = obj.isLymphLesion
       item.TableQuestions.Answers[idx].loctation = obj.lesionOrgan
@@ -114,10 +139,10 @@ function findQuestionAndUpdateLesion(questions, obj) {
 }
 function findQuestionAndAddLesion(questions, obj) {
   for (var i = 0; i < questions.length; i++) {
-    if (questions[i].Type === 'table' && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType)) {
+    if ((questions[i].Type === 'table' || questions[i].Type === 'basicTable') && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType)) {
       var sourceObj = {}
       questions[i].TableQuestions.Questions.forEach(item => {
-        sourceObj[item.Id] = ''
+        sourceObj[item.Id] = null
       })
       var targetObj = Object.assign(sourceObj, obj.lesionObj)
       targetObj.IsCurrentTaskAdd = 'True'
@@ -139,6 +164,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
 
@@ -166,7 +207,7 @@ const actions = {
           item.IsInit = false
         })
         state.visitTaskList = res.Result
-        sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+        // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
         const currentTaskIdx = res.Result.findIndex(item => item.IsCurrentTask)
         if (currentTaskIdx > -1) {
           state.currentTaskId = res.Result[currentTaskIdx].VisitTaskId
@@ -178,7 +219,7 @@ const actions = {
   },
   resetVisitTasks({ state }) {
     return new Promise(resolve => {
-      sessionStorage.setItem('visitTaskList', '')
+      // sessionStorage.setItem('visitTaskList', '')
       state.visitTaskList = []
       state.currentTaskId = ''
       state.activeSeries = {}
@@ -190,6 +231,7 @@ const actions = {
   },
   getMasterSeries({ state }, obj) {
     return new Promise(resolve => {
+      console.log('getMasterSeries')
       var seriesInfo = {}
       var i = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
       getReadingVisitStudyList(obj.trialId, obj.visitId, obj.visitTaskId).then(res => {
@@ -209,14 +251,28 @@ const actions = {
           var seriesList = []
           study.SeriesList.forEach((series, index) => {
             const imageIds = []
-
-            series.InstancePathList.forEach((path) => {
-              imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${path}`)
+            const instanceList = []
+            // series.InstancePathList.forEach((path) => {
+            //   imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${path}`)
+            // })
+            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=0|0`
+                  imageIds.push(imageId)
+                }
+              } 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=0|0`
+                imageIds.push(imageId)
+              }
+              instance.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=0|0`
+              instanceList.push(instance.Id)
             })
             seriesList.push({
               isDicom: study.IsDicom,
               imageIds: imageIds,
-              instanceList: series.InstanceList,
+              instanceInfoList: series.InstanceInfoList,
+              instanceList: instanceList,
               seriesId: series.Id,
               imageIdIndex: 0,
               seriesUid: series.SeriesInstanceUid,
@@ -287,7 +343,7 @@ const actions = {
           }
         }
 
-        sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+        // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
         resolve()
       }).catch(() => { resolve() })
     })
@@ -303,7 +359,7 @@ const actions = {
           })
         })
       }
-      sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       resolve()
     })
   },
@@ -322,7 +378,7 @@ const actions = {
           state.visitTaskList[index].Questions = res.Result
           state.visitTaskList[index].questionsInit = true
           state.visitTaskList[index].QuestionMarkInfoList = res.OtherInfo.QuestionMarkInfoList
-          sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+          // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
           resolve()
         }).catch(() => { resolve() })
       }
@@ -340,7 +396,7 @@ const actions = {
         state.visitTaskList[index].Questions = res.Result
         state.visitTaskList[index].questionsInit = true
         state.visitTaskList[index].QuestionMarkInfoList = res.OtherInfo.QuestionMarkInfoList
-        sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+        // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
         resolve()
       }).catch(() => { resolve() })
     })
@@ -359,7 +415,7 @@ const actions = {
           var list = getQuestions(res.Result.SinglePage)
           state.visitTaskList[index].ReadingQuestions = list
           state.visitTaskList[index].readingQuestionsInit = true
-          sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+          // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
           resolve()
         }).catch(() => { resolve() })
       }
@@ -376,7 +432,7 @@ const actions = {
         var list = getQuestions(res.Result.SinglePage)
         state.visitTaskList[index].ReadingQuestions = list
         state.visitTaskList[index].readingQuestionsInit = true
-        sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+        // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
         resolve()
       }).catch(() => { resolve() })
     })
@@ -387,7 +443,7 @@ const actions = {
       if (index > -1) {
         state.visitTaskList[index].ReadingQuestions = obj.questions
       }
-      sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       resolve()
     })
   },
@@ -399,7 +455,7 @@ const actions = {
         questions = findQuestionAndAddLesion(questions, obj)
         state.visitTaskList[index].ReadingQuestions = questions
       }
-      sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       resolve()
     })
   },
@@ -411,7 +467,7 @@ const actions = {
         questions = findQuestionAndUpdateLesion(questions, obj)
         state.visitTaskList[index].ReadingQuestions = questions
       }
-      sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       resolve()
     })
   },
@@ -423,7 +479,7 @@ const actions = {
         questions = findQuestionAndRemoveLesion(questions, obj)
         state.visitTaskList[index].ReadingQuestions = questions
       }
-      sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       resolve()
     })
   },
@@ -444,7 +500,7 @@ const actions = {
           })
           state.visitTaskList[index].MeasureData = arr
           state.visitTaskList[index].measureDataInit = true
-          sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+          // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
           resolve()
         }).catch(() => { resolve() })
       }
@@ -471,7 +527,7 @@ const actions = {
           })
           state.visitTaskList[index].MeasureData = arr
           state.visitTaskList[index].measureDataInit = true
-          sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+          // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
           resolve()
         }).catch(() => { resolve() })
       }
@@ -481,24 +537,28 @@ const actions = {
     return new Promise(async resolve => {
       var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
       var measureData = state.visitTaskList[index].MeasureData
-
+      console.log('removeCustomizeMeasuredData', obj, state.visitTaskList[index].MeasureData)
       // var uuid = obj.measureData.data.uuid
       // var idx = measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)
-      console.log(obj, measureData)
-      var idx = measureData.findIndex(item => item.Id === obj.questionInfo.Id)
-      console.log('idx', idx)
-      if (idx > -1) {
-        if (measureData[idx].FristAddTaskId) {
-          measureData[idx].MeasureData = ''
-          console.log('清除标记成功', idx)
-        } else {
-          measureData.splice(idx, 1)
-          console.log('移除标记成功', idx)
+      // console.log(obj, measureData)
+      if (obj.questionInfo.Id) {
+        var idx = measureData.findIndex(item => item.Id === obj.questionInfo.Id)
+        console.log('idx', idx)
+        if (idx > -1) {
+          if (measureData[idx].FristAddTaskId) {
+            measureData[idx].MeasureData = ''
+            console.log('清除标记成功', idx)
+          } else {
+            measureData.splice(idx, 1)
+            console.log('移除标记成功', idx)
+          }
+          if (obj.questionInfo.Id && state.currentReadingTaskState < 2) {
+            await deleteCustomTag(obj.questionInfo.Id)
+          }
+          state.visitTaskList[index].MeasureData = measureData
         }
-        await deleteCustomTag(obj.questionInfo.Id)
-        state.visitTaskList[index].MeasureData = measureData
       } else if (obj.orderMarkName) {
-        const i = measureData.findIndex(item => item.QuestionId === obj.questionId && item.OrderMarkName === obj.orderMarkName)
+        const i = measureData.findIndex(item => item.MeasureData.data.remark === obj.orderMarkName)
         if (i > -1) {
           if (measureData[i].FristAddTaskId) {
             measureData[i].MeasureData = ''
@@ -508,10 +568,12 @@ const actions = {
             console.log('移除标记成功', i)
           }
         }
-        await deleteCustomTag(obj.questionInfo.Id)
+        if (obj.questionInfo.Id && state.currentReadingTaskState < 2) {
+          await deleteCustomTag(obj.questionInfo.Id)
+        }
         state.visitTaskList[index].MeasureData = measureData
       }
-      sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       resolve()
     })
   },
@@ -529,7 +591,7 @@ const actions = {
         })
         state.visitTaskList[index].MeasureData = arr
         state.visitTaskList[index].measureDataInit = true
-        sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+        // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
         resolve()
       }).catch(() => { resolve() })
     })
@@ -548,7 +610,7 @@ const actions = {
         })
         state.visitTaskList[index].MeasureData = arr
         state.visitTaskList[index].measureDataInit = true
-        sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+        // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
         resolve()
       }).catch(() => { resolve() })
     })
@@ -580,7 +642,7 @@ const actions = {
         state.visitTaskList[index].MeasureData.push(obj.data)
         console.log('新增标记成功')
       }
-      sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       console.log(state.visitTaskList)
       resolve()
     })
@@ -590,6 +652,7 @@ const actions = {
       var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
       var measureData = state.visitTaskList[index].MeasureData
       console.log('addOrUpdateNonTargetMeasuredData')
+      // item.MeasureData.data.remark === obj.orderMarkName
       var idx = measureData.findIndex(item => item.QuestionId === obj.data.QuestionId && item.OrderMarkName === obj.data.OrderMarkName)
       if (idx > -1) {
         for (const k in state.visitTaskList[index].MeasureData[idx]) {
@@ -602,7 +665,7 @@ const actions = {
         state.visitTaskList[index].MeasureData.push(obj.data)
         console.log('新增标记成功')
       }
-      sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       resolve()
     })
   },
@@ -622,7 +685,7 @@ const actions = {
         }
         state.visitTaskList[index].MeasureData = measureData
       }
-      sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       resolve()
     })
   },
@@ -632,32 +695,42 @@ const actions = {
       var measureData = state.visitTaskList[index].MeasureData
       console.log(measureData, obj)
       // var idx = measureData.findIndex(item => item.MeasureData.uuid === obj.data.MeasureData.data.uuid)
-      if (!obj.questionInfo) {
-        state.visitTaskList[index].MeasureData.push({
-          MeasureData: obj,
-          SeriesId: obj.seriesId,
-          StudyId: obj.studyId,
-          InstanceId: obj.instanceId,
-          Id: obj.Id
-        })
-        console.log('新增标记成功')
-        sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
-        resolve()
-      }
-      var idx = measureData.findIndex(item => item.Id === obj.questionInfo.Id)
+      // if (!obj.questionInfo) {
+      //   state.visitTaskList[index].MeasureData.push({
+      //     MeasureData: obj,
+      //     SeriesId: obj.seriesId,
+      //     StudyId: obj.studyId,
+      //     InstanceId: obj.instanceId,
+      //     Id: obj.Id
+      //   })
+      //   console.log('新增标记成功')
+      //   resolve()
+      // }
+      var idx = measureData.findIndex(item => item.MeasureData.data.remark === obj.measureData.data.remark)
       if (idx > -1) {
-        for (const k in state.visitTaskList[index].MeasureData[idx]) {
-          if (k !== 'Id' && obj.MeasureData.data[k]) {
-            state.visitTaskList[index].MeasureData[idx][k] = obj.MeasureData.data[k]
-          }
-        }
+        // state.visitTaskList[index].MeasureData[idx].InstanceId = obj.instanceId
+        state.visitTaskList[index].MeasureData[idx].MeasureData = obj.measureData
+        // state.visitTaskList[index].MeasureData[idx].SeriesId = obj.seriesId
+        // state.visitTaskList[index].MeasureData[idx].StudyId = obj.studyId
+        // for (const k in state.visitTaskList[index].MeasureData[idx]) {
+        //   if (k !== 'Id' && obj.MeasureData.data[k]) {
+        //     state.visitTaskList[index].MeasureData[idx][k] = obj.MeasureData.data[k]
+        //   }
+        // }
         // state.visitTaskList[index].MeasureData[idx].MeasureData = obj.data.MeasureData
         console.log('更新标记成功', idx)
       } else {
-        state.visitTaskList[index].MeasureData.push(obj.MeasureData.data)
+        // state.visitTaskList[index].MeasureData.push(obj.MeasureData.data)
+        state.visitTaskList[index].MeasureData.push({
+          MeasureData: obj.measureData,
+          SeriesId: obj.measureData.seriesId,
+          StudyId: obj.measureData.studyId,
+          InstanceId: obj.measureData.instanceId,
+          Id: obj.id
+        })
         console.log('新增标记成功')
       }
-      sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       resolve()
     })
   },
@@ -702,7 +775,7 @@ const actions = {
 
       //   state.visitTaskList[index].MeasureData = measureData
       // }
-      sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       resolve()
     })
   },
@@ -715,20 +788,29 @@ const actions = {
         measureData[idx].MeasureData.data.status = obj.status
         state.visitTaskList[index].MeasureData = measureData
       }
-      sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       resolve()
     })
   },
   getStudyInfo({ state }, obj) {
+    console.log('getStudyInfo')
     return new Promise(resolve => {
       var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
       if (state.visitTaskList[index].studyListInit) {
         resolve()
       } else {
         var studyList = []
-        // getVisitStudyList
-        // getReadingVisitStudyList
+        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
@@ -743,19 +825,47 @@ const actions = {
             var seriesList = []
             study.SeriesList.forEach((series, seriesIndex) => {
               const imageIds = []
-              try {
-                // if (~window.location.href.indexOf('3c210000-3e2c-0016-4247-08dabf28e96b')) {
-                series.InstancePathList.forEach((path) => {
-                  // var path = id.split('/')[id.split('/').length - 1]
-                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${path}`)
-                })
-              } catch (e) {
-                console.log(e)
-              }
+              const instanceList = []
+              // try {
+              //   series.InstancePathList.forEach((path) => {
+              //     imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${path}`)
+              //   })
+              // } catch (e) {
+              //   console.log(e)
+              // }
+              series.InstanceInfoList.forEach(instance => {
+                if (instance.NumberOfFrames && instance.NumberOfFrames > 1) {
+                  if (study.IsCriticalSequence && instance.KeyFramesList.length > 0) {
+                    instance.KeyFramesList.map(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}|${index}`
+                      imageIds.push(imageId)
+                    })
+                  } else {
+                    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}|${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}|${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}|${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({
                 isDicom: study.IsDicom,
                 imageIds: imageIds,
-                instanceList: series.InstanceList,
+                instanceInfoList: series.InstanceInfoList,
+                instanceList: instanceList,
                 seriesId: series.Id,
                 imageIdIndex: 0,
                 seriesUid: series.SeriesInstanceUid,
@@ -782,7 +892,8 @@ const actions = {
                 isLoading: false,
                 isBeMark: series.IsBeMark,
                 ww: series.WindowWidth,
-                wc: series.WindowCenter
+                wc: series.WindowCenter,
+                isExistMutiFrames: series.IsExistMutiFrames
               })
             })
             data.SeriesList = seriesList
@@ -790,7 +901,8 @@ const actions = {
           })
           state.visitTaskList[index].StudyList = studyList
           state.visitTaskList[index].studyListInit = true
-          sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+          state.visitTaskList[index].KeyImages = keyImages
+          // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
           resolve()
         }).catch(() => { resolve() })
       }
@@ -823,7 +935,7 @@ const actions = {
           }
         }
         state.visitTaskList[index].StudyList = studyList
-        sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+        // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       } else {
         // console.log(obj)
       }
@@ -843,15 +955,124 @@ const actions = {
           studyList[obj.studyIndex].SeriesList[obj.seriesIndex].loadStatus = true
         }
         state.visitTaskList[obj.visitTaskindex].StudyList = studyList
-        sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+        // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       }
       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) {
+    console.log('setImageloadedInfo', obj)
+    // if(obj.instance === '20dd8fc9-51b0-ec63-942b-cb3006c72650')
+    // var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
+    // // const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount
+    // const instanceList = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].instanceList
+    // const idx = state.visitTaskList[index].StudyList.findIndex(i => i.IsCriticalSequence)
+
+    // if (!state.visitTaskList[index].StudyList[obj.studyIndex].IsCriticalSequence) {
+    //   // 当前下载的非关键序列
+    //   console.log('当前下载的非关键序列')
+    //   if (idx > -1) {
+    //     const keyInstance = state.visitTaskList[index].StudyList[idx].SeriesList[0].instanceList
+    //     obj.markedImages = getKeySeriesInfo(keyInstance, state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex])
+    //     instanceList.map(i => {
+    //       if (obj.markedImages.hasOwnProperty(i) && state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr.indexOf(i) < 0) {
+    //         state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr.push(i)
+    //         state.visitTaskList[index].StudyList[idx].SeriesList[0].prefetchInstanceCount = state.visitTaskList[index].StudyList[idx].SeriesList[0].prefetchInstanceCount + 100
+    //       }
+    //     })
+    //     if (state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr >= state.visitTaskList[index].StudyList[idx].SeriesList[0].instanceCount) {
+    //       state.visitTaskList[index].StudyList[idx].SeriesList[0].loadStatus = true
+    //     }
+    //   }
+    // }
+    // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].instanceCount * 100
+    // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr = instanceList
+    // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].loadStatus = true
+    // const imageloadedArr = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr
+    // if (imageloadedArr.indexOf())
+
+    // if (state.visitTaskList[index].StudyList[0].IsCriticalSequence){
+    //   state.visitTaskList[index].StudyList[0].SeriesList[0].prefetchInstanceCount = prefetchInstanceCount + 100
+    //   state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr.push(obj.imageId)
+    // }
+  },
   setStatus({ state }, obj) {
     var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
     state.visitTaskList[index].IsInit = true
-    sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+    // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
   },
   setActiveSeries({ state }, series) {
     return new Promise(resolve => {
@@ -861,7 +1082,15 @@ const actions = {
   },
   setLastCanvasTaskId({ state }, taskId) {
     return new Promise(resolve => {
-      state.lastCanvasTaskId = taskId
+      var isReadingTaskViewInOrder = localStorage.getItem('isReadingTaskViewInOrder')
+      if (parseInt(isReadingTaskViewInOrder) === 2) {
+        if (!state.lastCanvasTaskId) {
+          console.log('setLastCanvasTaskId')
+          state.lastCanvasTaskId = taskId
+        }
+      } else {
+        state.lastCanvasTaskId = taskId
+      }
       resolve()
     })
   },
@@ -896,7 +1125,7 @@ const actions = {
         state.visitTaskList[index].QuestionMarkInfoList.push(obj.data)
         console.log('新增标记成功')
       }
-      sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       resolve()
     })
   },
@@ -912,7 +1141,7 @@ const actions = {
         }
         state.visitTaskList[index].QuestionMarkInfoList = measureData
       }
-      sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
       resolve()
     })
   }

src/store/modules/trials.js

@@ -6,7 +6,13 @@ const getDefaultState = () => {
     subjectQuery: null,
     visitPlanQuery: null,
     visitPointQuery: null,
-    studyListQuery: null
+    studyListQuery: null,
+    unlock: false,
+    config: {},
+    uploadTip: '0.00KB/s',
+    timer: null,
+    whiteList: [],
+    checkTaskId: null
   }
 }
 
@@ -16,6 +22,12 @@ const mutations = {
   RESET_TRIALS: (state) => {
     Object.assign(state, getDefaultState())
   },
+  SET_UNLOCK: (state, unlock) => {
+    state.unlock = unlock
+  },
+  SET_CONFIG: (state, config) => {
+    state.config = config
+  },
   SET_ACTIVENAME: (state, activeName) => {
     state.trialDetailActiveName = activeName
   },
@@ -37,6 +49,12 @@ const mutations = {
 }
 
 const actions = {
+  setUnLock({ commit }, unlock) {
+    commit('SET_UNLOCK', unlock)
+  },
+  setConfig({ commit }, config) {
+    commit('SET_CONFIG', config)
+  },
   setActiveName({ commit }, activeName) {
     commit('SET_ACTIVENAME', activeName)
   },

src/store/modules/user.js

@@ -1,5 +1,5 @@
 import { getToken, setToken, removeToken, setName, removeName } from '@/utils/auth'
-import { login,loginOut,getUserMenuTree, getUserPermissions } from '@/api/user'
+import { login, loginOut, getUserMenuTree, getUserPermissions } from '@/api/user'
 
 import { resetRouter } from '@/router'
 import md5 from 'js-md5'
@@ -83,20 +83,28 @@ const actions = {
   },
   // user login
   login({ commit }, userInfo) {
-    const { username, password } = userInfo
+    const { username, password, UserId } = userInfo
     return new Promise((resolve, reject) => {
-      login({ UserName: username.trim(), Password: md5(password) }).then(async response => {
+      let data = {
+        UserName: username.trim(), Password: md5(password)
+      }
+      if (UserId) {
+        data.UserId = UserId;
+      }
+      login(data).then(async response => {
         if (response.IsSuccess) {
           zzSessionStorage.removeItem('lastWorkbench')
           zzSessionStorage.setItem('my_username', username.trim())
           zzSessionStorage.setItem('my_password', md5(password))
+          zzSessionStorage.setItem('my_EMail', response.Result.BasicInfo.EMail)
+          localStorage.setItem('CompanyInfo', JSON.stringify(response.Result.CompanyInfo))
           const data = response.Result
-          if (data.BasicInfo.IsFirstAdd) {
+          if (data.BasicInfo.IsFirstAdd || data.BasicInfo.LoginState === 1) {
             try {
               zzSessionStorage.setItem('userId', data.BasicInfo.Id)
               commit('SET_TOKEN', data.JWTStr)
               setToken(data.JWTStr)
-              resolve(false)
+              resolve(response.Result)
             } catch (e) {
               console.log(e)
             }
@@ -107,6 +115,7 @@ const actions = {
               zzSessionStorage.setItem('userName', data.BasicInfo.UserName)
               commit('SET_TOKEN', data.JWTStr)
               commit('SET_NAME', data.BasicInfo.RealName)
+              zzSessionStorage.setItem('realName', data.BasicInfo.RealName)
               zzSessionStorage.setItem('isTestUser', data.BasicInfo.IsTestUser)
               commit('SET_ISTESTUSER', data.BasicInfo.IsTestUser)
               commit('SET_USERNAME', data.BasicInfo.UserName)
@@ -161,13 +170,13 @@ const actions = {
     commit('SET_PERMISSIONS', JSON.parse(zzSessionStorage.getItem('permissions')))
     commit('SET_ISTESTUSER', zzSessionStorage.getItem('isTestUser'))
     const user = JSON.parse(userString)
-    commit('SET_NAME', user.realName)
+    commit('SET_NAME', zzSessionStorage.getItem('realName'))
     commit('SET_USERID', user.id)
     commit('SET_USERNAME', zzSessionStorage.getItem('userName'))
     commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')))
     commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignTrialDocCount')))
-    console.log( zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))
-    console.log( zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
+    console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))
+    console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
     zzSessionStorage.setItem('userName', user.name)
     zzSessionStorage.setItem('userId', user.id)
     zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
@@ -179,14 +188,16 @@ const actions = {
   },
   // user logout
   async logout({ commit, state }) {
-    try{
-      await loginOut()
+    try {
       removeToken() // must remove  token  first
+      await loginOut({
+        Userd: zzSessionStorage.getItem('userId')
+      })
       resetRouter()
       removeName()
       zzSessionStorage.clear()
       commit('RESET_STATE')
-    }catch(e){
+    } catch (e) {
       console.log(e)
     }
   },

src/styles/index.scss

@@ -9,7 +9,7 @@ body {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
-  font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
   // font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;
   // font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC",
   //   "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial,
@@ -52,6 +52,7 @@ a:hover {
 div:focus {
   outline: none;
 }
+
 body .el-table th.gutter {
   display: table-cell !important;
 }
@@ -66,6 +67,7 @@ body .el-table th.gutter {
     height: 0;
   }
 }
+
 .el-loading-mask {
   background-color: rgba(255, 255, 255, 0.5);
 }
@@ -80,6 +82,7 @@ body .el-table th.gutter {
   .table-container {
     height: calc(100% - 100px);
   }
+
   // .pagination-container{
   //   text-align: right;
   // }
@@ -92,10 +95,12 @@ body .el-table th.gutter {
       border-left: 3px solid #0fc8e0;
       font-size: 13px;
       margin-bottom: 10px;
+
       p {
         margin: 0;
         padding-left: 5px;
       }
+
       .add {
         position: absolute;
         right: 10px;
@@ -104,9 +109,11 @@ body .el-table th.gutter {
         margin-top: -15px;
       }
     }
+
     .el-dialog__body {
       padding: 0 10px;
     }
+
     .el-date-editor.el-input,
     .el-date-editor.el-input__inner,
     .el-select {
@@ -114,167 +121,232 @@ body .el-table th.gutter {
     }
   }
 }
+
 .data-list {
   display: flex;
   flex-direction: column;
   flex: 1;
+
   .toolbar {
     display: flex;
   }
+
   .data-table {
     flex: 1;
     padding: 5px 0px;
   }
+
   .pagination {
     height: 32px;
     text-align: right;
   }
 }
 
-.is-fullscreen{
-  .el-dialog__headerbtn{
-    top:10px;
+.is-fullscreen {
+  .el-dialog__headerbtn {
+    top: 10px;
     font-size: 30px;
   }
-  .el-dialog__body{
+
+  .el-dialog__body {
     height: calc(100% - 70px);
     padding: 0 20px;
-    .base-modal-body{
+
+    .base-modal-body {
       padding: 10px 20px;
       height: 100%;
       overflow-y: auto;
     }
   }
-  .el-dialog__footer{
+
+  .el-dialog__footer {
     padding: 10px;
   }
-  .link-breadcrumb{
+
+  .link-breadcrumb {
     cursor: pointer;
     color: #428bca;
   }
 }
 
-.base-dialog-wrapper{
-  .el-dialog__header{
+.base-dialog-wrapper {
+  .el-dialog__header {
     padding: 15px;
   }
-  .base-dialog-body{
+
+  .base-dialog-body {
     border: 1px solid #e0e0e0;
-    padding:10px;
-    max-height:600px;
+    padding: 10px;
+    max-height: 600px;
     overflow-y: auto;
   }
-  .base-dialog-footer{
-    text-align:right;
-    margin-top:10px;
+
+  .base-dialog-footer {
+    text-align: right;
+    margin-top: 10px;
   }
-  .el-dialog__body{
-    padding:10px;
+
+  .el-dialog__body {
+    padding: 10px;
   }
-  .el-dialog__footer{
-      padding: 10px;
+
+  .el-dialog__footer {
+    padding: 10px;
   }
 }
-.el-descriptions{
-  box-sizing:border-box;
-  font-size:14px;
-  color:#303133
+
+.el-descriptions {
+  box-sizing: border-box;
+  font-size: 14px;
+  color: #303133
 }
-.el-descriptions__header{
-  display:flex;
-  justify-content:space-between;
-  align-items:center;
-  margin-bottom:20px
+
+.el-descriptions__header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px
 }
-.el-descriptions__title{
-  font-size:16px;
-  font-weight:700
+
+.el-descriptions__title {
+  font-size: 16px;
+  font-weight: 700
 }
-.el-descriptions__body{
-  color:#606266;
-  background-color:#fff
+
+.el-descriptions__body {
+  color: #606266;
+  background-color: #fff
 }
-.el-descriptions__body .el-descriptions__table{
-  border-collapse:collapse;
-  width:100%;
-  table-layout:fixed
+
+.el-descriptions__body .el-descriptions__table {
+  border-collapse: collapse;
+  width: 100%;
+  table-layout: fixed
 }
-.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell{
-  box-sizing:border-box;
-  text-align:left;
-  font-weight:400;
-  line-height:1.5
+
+.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell {
+  box-sizing: border-box;
+  text-align: left;
+  font-weight: 400;
+  line-height: 1.5
 }
-.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-left{
-  text-align:left
+
+.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-left {
+  text-align: left
 }
-.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-center{
-  text-align:center
+
+.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-center {
+  text-align: center
 }
-.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-right{
-  text-align:right
+
+.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-right {
+  text-align: right
 }
-.el-descriptions .is-bordered{
-  table-layout:auto
+
+.el-descriptions .is-bordered {
+  table-layout: auto
 }
-.el-descriptions .is-bordered .el-descriptions-item__cell{
-  border:1px solid #ebeef5;
-  padding:12px 10px
+
+.el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #ebeef5;
+  padding: 12px 10px
 }
-.el-descriptions :not(.is-bordered) .el-descriptions-item__cell{
-  padding-bottom:12px
+
+.el-descriptions :not(.is-bordered) .el-descriptions-item__cell {
+  padding-bottom: 12px
 }
-.el-descriptions--medium.is-bordered .el-descriptions-item__cell{
-  padding:10px
+
+.el-descriptions--medium.is-bordered .el-descriptions-item__cell {
+  padding: 10px
 }
-.el-descriptions--medium:not(.is-bordered) .el-descriptions-item__cell{
-  padding-bottom:10px
+
+.el-descriptions--medium:not(.is-bordered) .el-descriptions-item__cell {
+  padding-bottom: 10px
 }
-.el-descriptions--small{
-  font-size:12px
+
+.el-descriptions--small {
+  font-size: 12px
 }
-.el-descriptions--small.is-bordered .el-descriptions-item__cell{
-  padding:8px 10px
+
+.el-descriptions--small.is-bordered .el-descriptions-item__cell {
+  padding: 8px 10px
 }
-.el-descriptions--small:not(.is-bordered) .el-descriptions-item__cell{
-  padding-bottom:8px
+
+.el-descriptions--small:not(.is-bordered) .el-descriptions-item__cell {
+  padding-bottom: 8px
 }
-.el-descriptions--mini{
-  font-size:12px
+
+.el-descriptions--mini {
+  font-size: 12px
 }
-.el-descriptions--mini.is-bordered .el-descriptions-item__cell{
-  padding:6px 10px
+
+.el-descriptions--mini.is-bordered .el-descriptions-item__cell {
+  padding: 6px 10px
 }
-.el-descriptions--mini:not(.is-bordered) .el-descriptions-item__cell{
-  padding-bottom:6px
+
+.el-descriptions--mini:not(.is-bordered) .el-descriptions-item__cell {
+  padding-bottom: 6px
 }
-.el-descriptions-item{
-  vertical-align:top
+
+.el-descriptions-item {
+  vertical-align: top
 }
-.el-descriptions-item__container{
-  display:flex
+
+.el-descriptions-item__container {
+  display: flex
 }
-.el-descriptions-item__container .el-descriptions-item__content,.el-descriptions-item__container .el-descriptions-item__label{
-  display:inline-flex;
-  align-items:baseline
+
+.el-descriptions-item__container .el-descriptions-item__content,
+.el-descriptions-item__container .el-descriptions-item__label {
+  display: inline-flex;
+  align-items: baseline
 }
-.el-descriptions-item__container .el-descriptions-item__content{
-  flex:1
+
+.el-descriptions-item__container .el-descriptions-item__content {
+  flex: 1
 }
-.el-descriptions-item__label.has-colon:after{
-  content:":";
-  position:relative;
-  top:-.5px
+
+.el-descriptions-item__label.has-colon:after {
+  content: ":";
+  position: relative;
+  top: -.5px
 }
-.el-descriptions-item__label.is-bordered-label{
-  font-weight:700;
-  color:#909399;
-  background:#fafafa
+
+.el-descriptions-item__label.is-bordered-label {
+  font-weight: 700;
+  color: #909399;
+  background: #fafafa
 }
-.el-descriptions-item__label:not(.is-bordered-label){
-  margin-right:10px
+
+.el-descriptions-item__label:not(.is-bordered-label) {
+  margin-right: 10px
 }
-.el-descriptions-item__content{
-  word-break:break-word;
-  overflow-wrap:break-word
+
+.el-descriptions-item__content {
+  word-break: break-word;
+  overflow-wrap: break-word
 }
+
+.feedBack-box {
+  .el-dialog__wrapper {
+    z-index: 3999 !important;
+  }
+}
+
+.feedBack-select-box {
+  z-index: 4000 !important;
+}
+
+.feedBack-box-modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  opacity: .5;
+  background: #000;
+  z-index: 3999;
+}
+.el-message-box__wrapper{
+  z-index: 9999 !important;
+}

src/utils/dcmUpload/anonymization.js

@@ -1,6 +1,5 @@
 import dicomParser from "dicom-parser";
 import dcmjs from './dcmjs'
-import {encoder} from "./encoder";
 
 export const anonymization = function (file, config) {
   return new Promise(async (resolve, reject) => {
@@ -32,7 +31,7 @@ export const anonymization = function (file, config) {
           if (AnonymizeNotFixed.Group + AnonymizeNotFixed.Element === '00100020') {
             console.log(`${DicomStoreInfo.TrialCode}_${DicomStoreInfo.SubjectCode}`)
             if (dataset.dict[AnonymizeNotFixed.Group + AnonymizeNotFixed.Element]) {
-              dataset.dict[AnonymizeNotFixed.Group + AnonymizeNotFixed.Element].Value[0] =  `${DicomStoreInfo.TrialCode}-${DicomStoreInfo.SubjectCode}`
+              dataset.dict[AnonymizeNotFixed.Group + AnonymizeNotFixed.Element].Value[0] = `${DicomStoreInfo.TrialCode}-${DicomStoreInfo.SubjectCode}`
             } else {
               dataset.dict[AnonymizeNotFixed.Group + AnonymizeNotFixed.Element] = {
                 vr: AnonymizeNotFixed.ValueRepresentation,
@@ -55,13 +54,20 @@ export const anonymization = function (file, config) {
           }
         }
         // console.log(dataset)
-        let newDicomFile = dataset.write()
-        const bufferArray = new Uint8Array(newDicomFile)
-        const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
-        resolve({blob, pixelDataElement})
+        try {
+          let newDicomFile = dataset.write()
+          const bufferArray = new Uint8Array(newDicomFile)
+          const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
+          resolve({ blob, pixelDataElement })
+        } catch (err) {
+          console.log(file, 'warning')
+          console.log(err)
+          resolve(false);
+        }
       };
       reader.readAsArrayBuffer(file);
     } catch (e) {
+      console.log(file, 'warning')
       console.log(e)
       reject(e)
     }

src/utils/dcmUpload/dcmUpload.js

@@ -1,13 +1,14 @@
 import Vue from 'vue'
-import { encoder } from './encoder'
 import { anonymization } from './anonymization'
-export const dcmUpload =  async function(name, file, config){
+export const dcmUpload = async function (data, config, progressFn) {
   return new Promise(async resolve => {
     try {
       // let blob = await encoder(file, config)
-      // let blob = await fileToBlob(file)
-      let blob = await anonymization(file, config)
-      let res = await Vue.prototype.OSSclient.put(name, blob.blob)
+      let blob = await fileToBlob(data.file)
+      if (config) {
+        blob = await anonymization(data.file, config)
+      }
+      let res = await Vue.prototype.OSSclient.multipartUpload(Object.assign(data, { file: blob.blob }), progressFn)
       resolve({
         ...res,
         image: blob.pixelDataElement
@@ -18,6 +19,7 @@ export const dcmUpload =  async function(name, file, config){
 
 
     } catch (e) {
+      console.log(data.file, 'warning')
       resolve(false)
       console.log(e)
     }
@@ -35,7 +37,7 @@ function fileToBlob(file) {
       } else {
         blob = e.target.result
       }
-      resolve(blob)
+      resolve({ blob })
     })
     // FileReader 以 ArrayBuffer 格式 读取 File 对象中数据
     reader.readAsArrayBuffer(file)

src/utils/dcmUpload/dcmjs.js

@@ -8359,6 +8359,7 @@
 	        allowInvalidVRLength: false
 	      };
 	      var allowInvalidVRLength = writeOptions.allowInvalidVRLength;
+				allowInvalidVRLength = true
 	      var valid = true,
 	          valarr = Array.isArray(value) ? value : [value],
 	          total = 0;

src/utils/encrypt/crypto.js

@@ -0,0 +1,44 @@
+// crypto.js
+import CryptoJS from 'crypto-js';
+import { JSEncrypt } from "jsencrypt";
+import { getPublicKey } from "@/api/user.js"
+export const Crypto = {
+    AES: {
+        encrypt: function (plaintext, secretKey) {
+            return CryptoJS.AES.encrypt(plaintext, CryptoJS.enc.Utf8.parse(secretKey), {
+                mode: CryptoJS.mode.ECB,
+                padding: CryptoJS.pad.Pkcs7,
+                iv: ''
+            }).ciphertext.toString(CryptoJS.enc.Base64);
+        },
+        decrypt: function (ciphertext, secretKey) {
+            const bytes = CryptoJS.AES.decrypt(ciphertext, secretKey);
+            return bytes.toString(CryptoJS.enc.Utf8);
+        }
+    }
+};
+export const Encrypt = {
+    encrypt: async function (plaintext) {
+        let PublicKey = null;
+        if (sessionStorage.getItem('PublicKey')) {
+            PublicKey = atob(sessionStorage.getItem('PublicKey'));
+        } else {
+            try {
+                let res = await getPublicKey();
+                if (res.IsSuccess) {
+                    PublicKey = atob(res.Result)
+                    sessionStorage.setItem('PublicKey', res.Result)
+                } else {
+                    return false;
+                }
+            } catch (err) {
+                console.log(err)
+            }
+        }
+        let encryptor = new JSEncrypt()
+        encryptor.setPublicKey(PublicKey)
+        return encryptor.encrypt(plaintext)
+
+    },
+
+};

src/utils/encrypt/index.js

@@ -0,0 +1,30 @@
+import { Encrypt, Crypto } from "./crypto";
+export const encryptConfig = async (config) => {
+    let secretKey = randomRange(32, 32);
+    let encryptSecretKey = await Encrypt.encrypt(secretKey); // 密钥进行非对称加密
+    if (encryptSecretKey) {
+        config.headers['X-Encrypted-Key'] = encryptSecretKey;
+    }
+    if (config.data && Object.prototype.toString.call(config.data) === '[object Object]') {
+        Object.keys(config.data).forEach(async key => {
+            config.data[key] = Crypto.AES.encrypt(config.data[key], secretKey)
+            console.log(config.data[key], 'KEY')
+            // config.data[key] = await Encrypt.encrypt(config.data[key])
+        })
+    }
+    return config;
+}
+const randomRange = (min, max, charStr) => {
+    var returnStr = "",
+        range;
+    if (typeof max == 'string') {
+        charStr = max;
+    }
+    range = ((max && typeof max == 'number') ? Math.round(Math.random() * (max - min)) + min : min);
+    charStr = charStr || 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    for (var i = 0; i < range; i++) {
+        var index = Math.round(Math.random() * (charStr.length - 1));
+        returnStr += charStr.substring(index, index + 1);
+    }
+    return returnStr;
+}

src/utils/multipartUpload/aws.js

@@ -0,0 +1,457 @@
+const {
+    CreateMultipartUploadCommand,
+    UploadPartCommand,
+    CompleteMultipartUploadCommand,
+    ListMultipartUploadsCommand,//bucket中正在上传的文件列表
+    ListPartsCommand,//列出文件已上传的分片
+    GetObjectCommand,//获取文件
+} = require("@aws-sdk/client-s3");
+import SparkMD5 from "./spark-md5.min.js";
+import store from "@/store";
+let timer = null,  // 网速定时器
+    bytesReceivedPerSecond = {}; // 时间节点上传文件总量
+export function AWSclose() {
+    if (timer) {
+        clearInterval(timer);
+        timer = null;
+        store.state.trials.uploadTip = '0KB/s'
+    }
+    bytesReceivedPerSecond = {};
+}
+//查询文件是否存在于bucket或者正在上传
+export async function exist(s3, bucket, fileInformation, progressFn, changeStatus) {
+    // 拿到上传到的file
+    const File = fileInformation.file;
+    // 拿到上传的size
+    const uploadFileSize = File.size; // 这里拿到的单位是字节(uploadFileSize/ 1024 / 1024
+    // = 多少兆)
+    // 设置每一片的大小,shardSize 指定上传的每个分片的大小，范围为100 KB~5 GB。
+    // 分片标准为5MB,文件总大小大于5GB分片为20MB
+    let shardSize = 5 * 1024 * 1024;
+    if (uploadFileSize < shardSize) {
+        shardSize = uploadFileSize;
+    }
+    if (uploadFileSize > 5 * 1024 * 1024 * 1024) {
+        shardSize = 20 * 1024 * 1024;
+    }
+    fileInformation = Object.assign({
+        shardSize,
+        sharding: []
+    }, fileInformation)
+    if (fileInformation.speed) {
+        setTimer();
+    }
+    // 1、查询该文件是否已上传到bucket
+    //判断sharding里面是否有东西，有东西证明已经上传过分片了，不需要再进行检测
+    if (fileInformation.sharding.length === 0) {
+        let existBucket = await existInBucket({ s3, bucket, fileInformation: fileInformation });
+        if (existBucket === 'true') {
+            progressFn(1, fileInformation.file, 0);
+            changeStatus(fileInformation.path, 'success');//直接告诉前端，状态
+            return;
+        } else if (existBucket === 'same key') {
+            console.log(fileInformation.path + "  bucket中存在同名不同内容的文件");
+        } else if (existBucket === 'not exist') {
+            console.log(fileInformation.path + "  bucket中不存在该文件");
+        }
+        //2、查询该文件是否存在上传事件
+        let upload = await existUpload({ s3, bucket: bucket, fileInformation: fileInformation });
+        if (upload.code === 0) {
+            //存在该上传事件并且已经上传了多个分片
+            console.log(fileInformation.path + "  存在上传事件，并已经上传多个分片");
+            //将分片存入sharding
+            const uploadId = upload.uploadId;
+            let parts = upload.parts;
+            let SIZE = 0;
+            for (let i = 0; i < parts.length; i++) {
+                SIZE += parts[i].Size;
+                fileInformation.sharding.push({ ETag: parts[i].ETag, PartNumber: parts[i].PartNumber, Size: parts[i].Size, UploadId: uploadId });
+            }
+            progressFn(SIZE / uploadFileSize, { fileSize: uploadFileSize }, 0);//告诉前端，加入分片
+            //重新上传
+            await uploadFile({ fileInformation: fileInformation, uploadId: uploadId, bucket, changeStatus, getSuspend, progressFn });
+        } else if (upload.code === 1) {
+            // //重名但是不同文件
+            console.log('err 重名文件')
+            changeStatus(fileInformation.path, 'same key');
+        } else if (upload.code === 2) {
+            //没有上传事件
+            console.log(fileInformation.path + "  不存在上传事件");
+            //建立分段上传事件
+            const connect = await createMultipartUpload({ s3, bucket: bucket, key: fileInformation.path, type: fileInformation.file.type });
+            //上传整个文件
+            await uploadFile({ s3, fileInformation: fileInformation, uploadId: connect.UploadId, bucket: bucket, changeStatus, progressFn });
+        }
+    } else {
+        //分片组里面有东西
+        //重新上传
+        await uploadFile({ s3, fileInformation: fileInformation, uploadId: fileInformation.sharding[0].UploadId, bucket, changeStatus, progressFn });
+    }
+}
+
+//上传文件未上传的所有分片
+async function uploadFile({ s3, fileInformation, uploadId, bucket, changeStatus, progressFn }) {//   file:上传文件,   uploadId  parts:已上传的分片
+    const chunkCount = Math.ceil(fileInformation.file.size / fileInformation.shardSize)//总分片数
+    //循环切片并上传
+    for (let i = 0; i < chunkCount; i++) {
+        let start = i * fileInformation.shardSize;//文件分片开始位置
+        let end = Math.min(fileInformation.file.size, start + fileInformation.shardSize)//文件分片结束位置
+        let _chunkFile = fileInformation.file.slice(start, end);//切片文件 即 待上传文件分片
+        //判断parts中是否存在该分片
+        let res1 = fileInformation.sharding.filter((part) => {
+            return part.PartNumber === (i + 1);
+        });
+        if (res1.length === 0) {
+            //不包含该分片
+            const upload = await uploadPart({ s3, f: _chunkFile, uploadId: uploadId, key: fileInformation.path, bucket: bucket, num: i + 1 });//将分片上传
+            //判断sharding中是否存在该分片，如果不存在的话，才判错
+            let res2 = fileInformation.sharding.filter((part) => {
+                return part.PartNumber === (i + 1);
+            });
+            if (res2.length === 0) {
+                if (upload !== 'err') {//上传分片成功，并且没有暂停上传
+                    //判断是否存在该分片
+                    //判断parts中是否存在该分片
+                    let res3 = fileInformation.sharding.filter((part) => {
+                        return part.PartNumber === (i + 1);
+                    });
+                    if (res3.length === 0) {
+                        let LASTSIZE = fileInformation.sharding.reduce((sum, item) => sum + item.Size, 0)
+                        fileInformation.sharding.push({ ETag: upload.ETag, PartNumber: i + 1, Size: _chunkFile.size, UploadId: uploadId });//上传成功，存到sharding
+                        let SIZE = fileInformation.sharding.reduce((sum, item) => sum + item.Size, 0)
+                        let lastPercentage = LASTSIZE / fileInformation.file.size, percentage = SIZE / fileInformation.file.size;
+                        progressFn(percentage, fileInformation.file, lastPercentage);
+                        if (fileInformation.speed) {
+                            let time = new Date().getTime();
+                            let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
+                            let bytesTime = timeList.find(item => time - item < 1000);
+                            if (bytesTime) {
+                                bytesReceivedPerSecond[bytesTime] += fileInformation.file.size * (percentage - lastPercentage);
+                            } else {
+                                console.log("未查询到时间")
+                                if (timeList.length > 0) {
+                                    bytesReceivedPerSecond[timeList[timeList.length - 1]] += fileInformation.file.size * (percentage - lastPercentage);
+                                } else {
+                                    bytesReceivedPerSecond[time] = fileInformation.file.size * (percentage - lastPercentage);
+                                }
+                            }
+                        }
+                    }
+                } else if (upload === 'err') {
+                    changeStatus(fileInformation.path, 'err');
+                    return;
+                }
+            }
+
+        }
+    }//for
+    if (fileInformation.sharding.length === chunkCount) {
+        //合并分片
+        const complete = await completeMultipartUpload({ s3, bucket: bucket, key: fileInformation.path, sharding: fileInformation.sharding, uploadId: uploadId });
+        if (complete !== 'err') {
+            changeStatus(fileInformation.path, 'success');//通知前端，上传成功
+        } else {
+            changeStatus(fileInformation.path, 'err');//通知前端，上传失败
+        }
+
+    }
+}
+
+// 判断该文件是否已经存在于bucket
+// bucket   file:上传文件
+// 返回值  'same key':同名不同文件 'not exist':不存在该文件  'true':该文件已存在bucket中
+async function existInBucket({ s3, bucket, fileInformation }) {
+    if (s3 === null) {
+        return console.log("未创建s3客户端，请先调用init事件");
+    }
+    //getObject 每次最多传回767448b的数据，所以要分段请求
+    let bucketFileUniArray = [];
+    // 分段
+    let count = Math.ceil(fileInformation.file.size / 767448);
+    if (count > 4) {
+        count = 4;
+    }
+    for (let i = 0; i < count; i++) {
+        const obj = await getObject({ s3, bucket: bucket, fileInformation: fileInformation, count: i });
+        if (obj !== 'err') {
+            //获取文件的文件体 计算某个分片的md5
+            const fileBody = obj.Body;
+            let fileUnitArray = await fileBody.transformToByteArray();
+            bucketFileUniArray = [...bucketFileUniArray, ...fileUnitArray];
+        } else {
+            return 'not exist';
+        }
+    }
+    let bucketFileBufferArray = new Uint8Array(bucketFileUniArray);
+    // 将传入文件的fileReader 转成  arrayBuffer
+    let fileArrayBuff = null;
+    fileArrayBuff = await new Promise((resolve) => {
+        let fileReader = new FileReader();
+        fileReader.readAsArrayBuffer(fileInformation.file.slice(0, count * 767448));
+        fileReader.onload = (e) => {
+            resolve(e.target.result);
+        };
+    });
+    if (fileArrayBuff.byteLength > count * 767448) {
+        fileArrayBuff = fileArrayBuff.slice(0, count * 767448);
+    }
+    let bodyMD5 = await getMD5({ arrayBuffer: bucketFileBufferArray.buffer });
+    let fileMD5 = await getMD5({ arrayBuffer: fileArrayBuff });
+    if (bodyMD5 === fileMD5) {
+        //证明是同一个文件 秒传
+        return 'true';
+    } else {
+        return 'same key';
+    }
+}
+
+//判断该文件是否正在上传
+// bucket:bucket   file:上传文件
+//返回值 'not exist upload':不存在上传事件  'same key':同名不同文件
+async function existUpload({ s3, bucket, fileInformation }) {
+    //判断该文件是否有上传事件
+    const listUploads = await listMultipartUploadsCommand({ s3, bucket: bucket, key: fileInformation.path });
+    if (listUploads !== 'err') {
+        if (listUploads.Uploads !== undefined && listUploads.Uploads.length > 0) {
+            //存在上传事件 获取上传的第一个分片的eTag，计算传入文件md5，相比较是否相同
+            const uploads = listUploads.Uploads;
+            for (const one in uploads) {//可能存在多个连接
+                let uploadOne = uploads[one];
+                const uploadId = uploadOne.UploadId;//UploadId
+                const key = uploadOne.Key;//key
+                //查询该文件已上传分片
+                const listParts = await listPartsCommand({ s3, bucket: bucket, key: key, uploadId: uploadId });
+                if (listParts !== 'err') {
+                    if (listParts.Parts !== undefined && listParts.Parts.length !== 0) {
+                        //存在分片
+                        let etag = listParts.Parts[0].ETag;
+                        //计算文件的第一个分片的md5
+                        let fileSlice = null;
+                        if (fileInformation.file.size > fileInformation.shardSize) {
+                            fileSlice = fileInformation.file.slice(0, fileInformation.shardSize);
+                        } else {
+                            fileSlice = fileInformation.file;
+                        }
+                        let fileMD5 = await new Promise((resolve) => {
+                            const fileReader = new FileReader();
+                            var spark = new SparkMD5.ArrayBuffer();
+                            fileReader.readAsArrayBuffer(fileSlice);
+                            fileReader.onload = (e) => {
+                                spark.append(e.target.result);
+                                var m = spark.end();
+                                resolve(m);
+                            };
+                        });
+                        if (etag.split('"')[1] === fileMD5) {
+                            //是同一个文件上传
+                            return {
+                                code: 0,
+                                message: 'true',
+                                uploadId: uploadId,
+                                key: key,
+                                parts: listParts.Parts
+                            }
+                        } else {
+                            //同名不同文件
+                            continue;
+                        }
+                    } else {
+                        //该文件有进行上传，但没有上传完成一个分片
+                        continue;
+                    }
+                } else {
+                    //有连接，没上传分片
+                    continue;
+                }
+            }//for
+            return {
+                code: 1,
+                message: 'same key'
+            }
+        } else {
+            //无连接
+            return {
+                code: 2,
+                message: 'not exist upload'
+            };
+        }
+    } else {
+        //无连接
+        return {
+            code: 2,
+            message: 'not exist upload'
+        };
+    }
+}
+
+//计算arrayBuffer的md5值
+async function getMD5({ arrayBuffer }) {
+    return await new Promise((resolve) => {
+        const spark = new SparkMD5.ArrayBuffer();
+        spark.append(arrayBuffer);
+        const m = spark.end();
+        resolve(m);
+    });
+}
+
+//建立文件上传事件
+async function createMultipartUpload({ s3, bucket, key, type }) {//bucket:bucket  key:文件名 type：文件类型
+    if (s3 === null) {
+        return console.log("未创建s3客户端，请先调用init事件");
+    }
+    const params = {
+        Bucket: bucket,
+        Key: key,
+        ContentType: type
+    };
+    const res = async () => {
+        try {
+            return await s3.send(new CreateMultipartUploadCommand(params));
+        } catch (err) {
+            console.log('建立上传事件失败：', err.message)
+            return 'err';
+        }
+    }
+    return res();
+}
+
+//上传一个分片
+async function uploadPart({ s3, f, uploadId, key, bucket, num }) { //f:文件分片，num：分片标号
+    if (s3 === null) {
+        return console.log("未创建s3客户端，请先调用init事件");
+    }
+    const params = {
+        Bucket: bucket,
+        Key: key,
+        PartNumber: num,
+        UploadId: uploadId,
+        Body: f,
+        // ContentDisposition: "attachment; filename=hahaha.dcm"
+    };
+    const res = async () => {
+        try {
+            return await s3.send(new UploadPartCommand(params));
+        } catch (err) {
+            console.log('上传分片第 ' + num + ' 片错误信息', err.message)
+            return 'err';
+        }
+    }
+    return res();
+}
+//将分片合并
+async function completeMultipartUpload({ s3, bucket, key, sharding, uploadId }) {
+    if (s3 === null) {
+        return console.log("未创建s3客户端，请先调用init事件");
+    }
+    let parts = [];
+    for (let i = 0; i < sharding.length; i++) {
+        parts.push({
+            "ETag": sharding[i].ETag,
+            "PartNumber": sharding[i].PartNumber,
+        })
+    }
+    const params = {
+        Bucket: bucket,
+        Key: key,
+        MultipartUpload: {
+            Parts: parts
+        },
+        UploadId: uploadId
+    };
+    const res = async () => {
+        try {
+            return await s3.send(new CompleteMultipartUploadCommand(params))
+        } catch (err) {
+            console.log("合并分片失败: ", err.message);
+            return 'err';
+        }
+    }
+    return res();
+}
+
+//查询某个文件已经上传的所有分片
+async function listPartsCommand({ s3, bucket, key, uploadId }) {
+    if (s3 === null) {
+        return console.log("未创建s3客户端，请先调用init事件");
+    }
+    const params = {
+        Bucket: bucket,
+        Key: key,
+        UploadId: uploadId
+    };
+    const res = async () => {
+        try {
+            return await s3.send(new ListPartsCommand(params));
+        } catch (err) {
+            console.log("查询该文件已上传分片失败: " + err.message);
+            return 'err';
+        }
+    }
+    return res();
+}
+//查询该文件是否存在上传事件
+async function listMultipartUploadsCommand({ s3, bucket, key }) {
+    if (s3 === null) {
+        return console.log("未创建s3客户端，请先调用init事件");
+    }
+    const params = {
+        Bucket: bucket,
+        Delimiter: '',
+        MaxUploads: 1000,
+        Prefix: key
+    };
+    const res = async () => {
+        try {
+            return await s3.send(new ListMultipartUploadsCommand(params));
+        } catch (err) {
+            console.log("查询 " + key + " 文件是否存在上传事件失败: " + err.message);
+            return 'err';
+        }
+    }
+    return res();
+}
+//获取文件
+async function getObject({ s3, bucket, fileInformation, count }) {
+    //一次请求最多 767448
+    if (s3 === null) {
+        return console.log("未创建s3客户端，请先调用init事件");
+    }
+    let byte1 = ((count + 1) * 767448 - 1) > fileInformation.file.size ? fileInformation.file.size : ((count + 1) * 767448 - 1);
+    let byte2 = (count * 767448) > fileInformation.file.size ? fileInformation.file.size : (count * 767448);
+    let range = "bytes=" + byte2 + "-" + byte1;
+    const params = {
+        Bucket: bucket,
+        Key: fileInformation.path,
+        Range: range
+    };
+    const res = async () => {
+        try {
+            return await s3.send(new GetObjectCommand(params));
+        } catch (err) {
+            console.log('获取 ' + fileInformation.path + ' 文件失败：', err.message);
+            return 'err';
+        }
+    }
+    return res();
+}
+function setTimer() {
+    if (timer) return false;
+    timer = setInterval(() => {
+        let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
+        if (timeList.length > 0) {
+            let totalBytes = timeList.reduce((sum, bytes) => sum + bytesReceivedPerSecond[bytes], 0) / (5 * 1024);
+            let unit = 'KB/s';
+            if (totalBytes > 1024) {
+                totalBytes = totalBytes / 1024;
+                unit = "MB/s";
+            }
+            store.state.trials.uploadTip = totalBytes.toFixed(2) + unit;
+        }
+        if (timeList.length >= 5) {
+            delete bytesReceivedPerSecond[timeList[0]]
+        }
+        let time = new Date().getTime();
+        bytesReceivedPerSecond[time] = 0;
+    }, 1000)
+}
+

src/utils/multipartUpload/oss.js

@@ -0,0 +1,161 @@
+import moment from "moment";
+import store from "@/store";
+let savaData = {},
+    checkData = {}, // 当前上传的节点文件和上一次提交进度
+    timer = null,  // 网速定时器
+    bytesReceivedPerSecond = {}; // 时间节点上传文件总量
+export function OSSclose() {
+    if (timer) {
+        clearInterval(timer);
+        timer = null;
+        store.state.trials.uploadTip = '0KB/s'
+    }
+    bytesReceivedPerSecond = {};
+    savaData = {};
+    checkData = {};
+    saveFinishedData(savaData);
+}
+export async function customerHttp(OSSclient, data, progressFn) {
+    // 拿到上传到的file
+    const uploadFile = data.file;
+    // 拿到上传的size
+    const uploadFileSize = uploadFile.size; // 这里拿到的单位是字节(uploadFileSize/ 1024 / 1024
+    // = 多少兆)
+    // 设置每一片的大小,partSize 指定上传的每个分片的大小，范围为100 KB~5 GB。
+    // 分片标准为5MB,文件总大小大于5GB分片为20MB
+    let partSize = 5 * 1024 * 1024;
+    if (uploadFileSize < partSize) {
+        partSize = uploadFileSize;
+    }
+    if (uploadFileSize > 5 * 1024 * 1024 * 1024) {
+        partSize = 20 * 1024 * 1024;
+    }
+    // 设置所有的文件上传所有的唯一的saveFileId
+    const saveFileId = `${uploadFileSize}_${data.path}`;
+    if (data.speed) {
+        setTimer();
+    }
+    initPage();
+    let res = await multipartUpload(OSSclient, partSize, saveFileId, uploadFile, data, progressFn);
+    return res;
+}
+
+async function multipartUpload(OSSclient, partSize, saveFileId, uploadFile, data, progressFn) {
+    try {
+        // object-name目前我是用的uploadFile.name,其实也是要根据你们的项目而定,
+        // 有没有具体的规定, 要不要加项目名, 要不要加对应的环境;
+        // 上传的参数
+        const uploadParams = {
+            partSize,
+            progress: (percentage, checkpoint) => {
+                savaData[saveFileId] = checkpoint;
+                if (!checkData[saveFileId]) {
+                    checkData[saveFileId] = 0
+                }
+                if (data.speed) {
+                    let time = new Date().getTime();
+                    let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
+                    let bytesTime = timeList.find(item => time - item < 1000);
+                    if (bytesTime) {
+                        bytesReceivedPerSecond[bytesTime] += data.file.size * (percentage - checkData[saveFileId]);
+                    } else {
+                        // console.log("未查询到时间")
+                        if (timeList.length > 0) {
+                            bytesReceivedPerSecond[timeList[timeList.length - 1]] += data.file.size * (percentage - checkData[saveFileId]);
+                        } else {
+                            bytesReceivedPerSecond[time] = data.file.size * (percentage - checkData[saveFileId]);
+                        }
+                    }
+                }
+                savaData["lastSaveTime"] = new Date();
+                progressFn(percentage, data.file, checkData[saveFileId])
+                checkData[saveFileId] = percentage;
+                if (percentage === 1) {
+                    delete checkData[saveFileId]
+                }
+                // 在上传过程中,把已经上传的数据存储下来
+                saveFinishedData(savaData);
+            },
+            // headers: {
+            //     "Content-Disposition": `attachment; filename=hahaha.dcm`,
+            //     "Cache-Control": "public, no-cache"
+            // }
+        };
+        // 断点续传
+        await resumeUpload(uploadParams, saveFileId);
+        const res = await OSSclient.multipartUpload(
+            data.path,
+            uploadFile,
+            uploadParams
+        );
+        if (res.res.status === 200) {
+            // 重新去掉某个缓存进行设置
+            delete savaData[saveFileId];
+            saveFinishedData(savaData);
+        } else if (res.res.status === 404) {
+            delete savaData[saveFileId];
+            saveFinishedData(savaData);
+        }
+        return res;
+    } catch (e) {
+        console.log(e);
+        delete savaData[saveFileId];
+        saveFinishedData(savaData);
+        // 捕获超时异常。
+        if (e.code === "ConnectionTimeoutError") {
+            console.log("TimeoutError");
+            // do ConnectionTimeoutError operation
+        }
+        return false;
+    }
+}
+async function resumeUpload(uploadParams, saveFileId) {
+    if (localStorage.getItem("upload-function-name")) {
+        const obj = JSON.parse(localStorage.getItem("upload-function-name"));
+        if (Object.keys(obj).includes(saveFileId)) {
+            uploadParams.checkpoint = obj[saveFileId];
+        }
+    }
+}
+// 存储到内存
+function saveFinishedData(finishedData) {
+    localStorage.setItem(
+        "upload-function-name",
+        JSON.stringify(finishedData)
+    );
+}
+function initPage() {
+    // 判断是不是有缓存
+    const localData = localStorage.getItem("upload-function-name");
+    if (!localData) return;
+    savaData = JSON.parse(localData);
+    // 当前时间 > 存储时间(1000 * 60 * 60表示1h,意思就是这些数据你要存多久,
+    // 可以是1h也可以是多少天,随意)
+    if (
+        moment(new Date()).diff(moment(savaData.lastSaveTime)) >
+        1000 * 60 * 60
+    ) {
+        localStorage.removeItem("upload-function-name");
+    }
+}
+function setTimer() {
+    if (timer) return false;
+    timer = setInterval(() => {
+        // console.log(Object.assign({}, bytesReceivedPerSecond))
+        let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
+        if (timeList.length > 0) {
+            let totalBytes = timeList.reduce((sum, bytes) => sum + bytesReceivedPerSecond[bytes], 0) / (5 * 1024);
+            let unit = 'KB/s';
+            if (totalBytes > 1024) {
+                totalBytes = totalBytes / 1024;
+                unit = "MB/s";
+            }
+            store.state.trials.uploadTip = totalBytes.toFixed(2) + unit;
+        }
+        if (timeList.length >= 5) {
+            delete bytesReceivedPerSecond[timeList[0]]
+        }
+        let time = new Date().getTime();
+        bytesReceivedPerSecond[time] = 0;
+    }, 1000)
+}

src/utils/oss.js

@@ -2,32 +2,40 @@ const OSS = require('ali-oss')
 const router = require('@/router');
 const Minio = require('minio')
 const stream = require('stream')
-console.log(Minio)
 import Vue from 'vue'
-const { GenerateSTS, GetObjectStoreToken } = require('../api/user.js')
-import { getToken } from '@/utils/auth'
+import { customerHttp, OSSclose } from "@/utils/multipartUpload/oss"
+import { exist, AWSclose } from "@/utils/multipartUpload/aws"
+const { GetObjectStoreToken } = require('../api/user.js')
+const {
+  S3Client,
+} = require("@aws-sdk/client-s3");
 
 Vue.prototype.OSSclientConfig = {
 }
 
-function blobToBuffer(blob, fileName) {
-  return new Promise((resolve, reject) => {
-    const file = new File([blob], fileName);
-    resolve(file)
-  })
-}
 
 async function ossGenerateSTS() {
-  let res = await GetObjectStoreToken()
+  let res = null;
+  if (localStorage.getItem('stsToken')) {
+    res = JSON.parse(localStorage.getItem('stsToken'))
+  } else {
+    res = await GetObjectStoreToken()
+    localStorage.setItem('stsToken', JSON.stringify(res))
+  }
+
+  // res.Result.ObjectStoreUse = 'AWS';
   Vue.prototype.OSSclientConfig = { ...res.Result[res.Result.ObjectStoreUse] }
+  Vue.prototype.OSSclientConfig.ObjectStoreUse = res.Result.ObjectStoreUse;
   Vue.prototype.OSSclientConfig.basePath = Vue.prototype.OSSclientConfig.viewEndpoint
   switch (res.Result.ObjectStoreUse) {
     case 'AliyunOSS':
       Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+      Vue.prototype.OSSclientConfig.stsToken = Vue.prototype.OSSclientConfig.securityToken
       Vue.prototype.OSSclientConfig.timeout = 10 * 60 * 1000
       let OSSclient = new OSS(Vue.prototype.OSSclientConfig)
       Vue.prototype.OSSclient = {
-        put: function (objectName, object) {
+        put: async function (objectName, object) {
+          OSSclient = await RefreshClient(OSSclient)
           return new Promise(async (resolve, reject) => {
             try {
               let _vm = router.default.app
@@ -40,7 +48,7 @@ async function ossGenerateSTS() {
               if (res && res.url) {
                 resolve({
                   name: objectName,
-                  url: Vue.prototype.OSSclientConfig.viewEndpoint + objectName
+                  url: res.url
                 })
               } else {
                 reject()
@@ -50,6 +58,46 @@ async function ossGenerateSTS() {
               reject()
             }
           })
+        },
+        multipartUpload: async (data, progress) => {
+          OSSclient = await RefreshClient(OSSclient)
+          return new Promise(async (resolve, reject) => {
+            try {
+              const { file, path } = data;
+              if (!file || !path) return reject('file and path be required');
+              let config = await getSTSToken(Vue.prototype.OSSclientConfig.expiration);
+              if (config) {
+                Vue.prototype.OSSclientConfig = { ...config.Result[config.Result.ObjectStoreUse] }
+                Vue.prototype.OSSclientConfig.ObjectStoreUse = config.Result.ObjectStoreUse;
+                Vue.prototype.OSSclientConfig.basePath = Vue.prototype.OSSclientConfig.viewEndpoint;
+                Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+                Vue.prototype.OSSclientConfig.stsToken = Vue.prototype.OSSclientConfig.securityToken
+                Vue.prototype.OSSclientConfig.timeout = 10 * 60 * 1000
+                OSSclient = new OSS(Vue.prototype.OSSclientConfig);
+              }
+              let _vm = router.default.app
+              if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
+                var objectItem = data.path.split('/')
+                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+                data.path = objectItem.join('/')
+              }
+              let res = await customerHttp(OSSclient, data, progress);
+              if (res) {
+                resolve({
+                  name: data.path,
+                  url: Vue.prototype.OSSclientConfig.viewEndpoint + decodeUtf8(res.name)
+                })
+              } else {
+                reject()
+              }
+            } catch (err) {
+              console.log(err)
+              reject(err)
+            }
+          })
+        },
+        close: () => {
+          OSSclose();
         }
       }
       break
@@ -70,14 +118,14 @@ async function ossGenerateSTS() {
               reader.onload = (ex) => {
                 const bufferStream = new stream.PassThrough()
                 bufferStream.end(Buffer.from(ex.target.result))
-                minioClient.putObject(Vue.prototype.OSSclientConfig.bucketName, objectName, bufferStream, function(err,etag) {
+                minioClient.putObject(Vue.prototype.OSSclientConfig.bucketName, objectName, bufferStream, function (err, etag) {
                   if (err) {
                     console.log(err)
                     reject()
                   } else {
                     resolve({
                       name: objectName,
-                      url: 'http://www.abc.com' + objectName
+                      url: Vue.prototype.OSSclientConfig.viewEndpoint + decodeUtf8(objectName)
                     })
                   }
                 })
@@ -87,49 +135,172 @@ async function ossGenerateSTS() {
               console.log(e)
             }
           })
+        },
+        close: () => {
+          return false
         }
       }
       break
     case 'AWS':
-      let aws = new Minio.Client(Vue.prototype.OSSclientConfig);
+      Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+      let aws = new S3Client({
+        endpoint: Vue.prototype.OSSclientConfig.viewEndpoint,
+        region: Vue.prototype.OSSclientConfig.region,
+        s3ForcePathStyle: true,
+        signatureVersion: 'v4',
+        forcePathStyle: true,
+        // SessionToken: '',
+        credentials: {
+          accessKeyId: Vue.prototype.OSSclientConfig.accessKeyId,
+          secretAccessKey: Vue.prototype.OSSclientConfig.secretAccessKey,
+          sessionToken: Vue.prototype.OSSclientConfig.sessionToken
+        }
+      });
       Vue.prototype.OSSclient = {
-        put: function (objectName, object) {
-          return new Promise(async (resolve, reject) => {
-            try {
-              var name = objectName.split('/')[objectName.split('/').length - 1]
-              let _vm = router.default.app
-              if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
-                var objectItem = objectName.split('/')
-                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
-                objectName = objectItem.join('/')
-              }
-              const reader = new FileReader();
-              reader.onload = (ex) => {
-                const bufferStream = new stream.PassThrough()
-                bufferStream.end(Buffer.from(ex.target.result))
-                aws.putObject(Vue.prototype.OSSclientConfig.bucketName, objectName, bufferStream, function(err,etag) {
-                  if (err) {
-                    console.log(err)
-                    reject()
-                  } else {
-                    resolve({
-                      name: objectName,
-                      url: 'http://www.abc.com' + objectName
-                    })
-                  }
-                })
-              };
-              reader.readAsArrayBuffer(object);
-            } catch (e) {
-              console.log(e)
-            }
-          })
+        put: async function (objectName, object) {
+          let data = {
+            file: object,
+            path: objectName
+          }
+          aws = await RefreshClient(aws);
+          return uploadAWS(aws, data, () => { });
+        },
+        multipartUpload: async (data, progress) => {
+          aws = await RefreshClient(aws);
+          return uploadAWS(aws, data, progress);
+        },
+        close: () => {
+          AWSclose();
         }
       }
   }
   return
 }
+// AWS上传函数
+function uploadAWS(aws, data, progress) {
+  return new Promise(async (resolve, reject) => {
+    try {
+      const { file, path } = data;
+      if (!file || !path) return reject('file and path be required');
+      let _vm = router.default.app
+      if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
+        var objectItem = data.path.split('/')
+        objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+        data.path = objectItem.join('/')
+      }
+      let bucketName = data.path.split("/")[1] || Vue.prototype.OSSclientConfig.bucket
+      let curPath = data.path;
+      data.path = data.path.replace(`/${bucketName}/`, '');
+      await exist(aws, bucketName, data, progress, (path, status) => {
+        if (status === 'success') {
+          resolve({
+            name: decodeUtf8(curPath),
+            url: Vue.prototype.OSSclientConfig.viewEndpoint + decodeUtf8(curPath)
+          })
+        } else {
+          reject()
+        }
+      });
 
+    } catch (err) {
+      console.log(err)
+      reject(err)
+    }
+  })
+}
+// client过期刷新
+async function RefreshClient(client) {
+  let config = await getSTSToken(Vue.prototype.OSSclientConfig.expiration);
+  if (config) {
+    // config.Result.ObjectStoreUse = 'AWS'
+    switch (config.Result.ObjectStoreUse) {
+      case 'AliyunOSS': {
+        Vue.prototype.OSSclientConfig = { ...config.Result[config.Result.ObjectStoreUse] }
+        Vue.prototype.OSSclientConfig.ObjectStoreUse = config.Result.ObjectStoreUse;
+        Vue.prototype.OSSclientConfig.basePath = Vue.prototype.OSSclientConfig.viewEndpoint;
+        Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+        Vue.prototype.OSSclientConfig.stsToken = Vue.prototype.OSSclientConfig.securityToken
+        Vue.prototype.OSSclientConfig.timeout = 10 * 60 * 1000
+        return new OSS(Vue.prototype.OSSclientConfig);
+      }
+      case "MinIO": {
+        return client;
+      }
+      case "AWS": {
+        Vue.prototype.OSSclientConfig = { ...config.Result[config.Result.ObjectStoreUse] }
+        Vue.prototype.OSSclientConfig.ObjectStoreUse = config.Result.ObjectStoreUse;
+        Vue.prototype.OSSclientConfig.basePath = Vue.prototype.OSSclientConfig.viewEndpoint;
+        Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+        return new S3Client({
+          endpoint: Vue.prototype.OSSclientConfig.viewEndpoint,
+          region: Vue.prototype.OSSclientConfig.region,
+          s3ForcePathStyle: true,
+          signatureVersion: 'v4',
+          forcePathStyle: true,
+          credentials: {
+            accessKeyId: Vue.prototype.OSSclientConfig.accessKeyId,
+            secretAccessKey: Vue.prototype.OSSclientConfig.secretAccessKey,
+            sessionToken: Vue.prototype.OSSclientConfig.sessionToken
+          }
+        });
+      }
+    }
 
+  } else {
+    return client;
+  }
+}
+function decodeUtf8(bytes) {
+  let str = bytes.split('?');
+  let str2 = str[0].split('/');
+  let name = str2[str2.length - 1];
+  name = encodeURIComponent(name);
+  str.shift();
+  str2.pop();
+  return str2.join("/") + '/' + name;
+}
+const queue = []
+let loading = false;
+// 获取凭证
+function getSTSToken(credentials) {
+  return new Promise(async (resolve, reject) => {
+    let isExpired = isCredentialsExpired(credentials);
+    if (isExpired) {
+      if (loading) {
+        queue.push({ resolve, reject })
+      }
+      if (!loading) {
+        loading = true;
+        let res = await GetObjectStoreToken();
+        loading = false;
+        localStorage.setItem('stsToken', JSON.stringify(res))
+        resolve(res)
+        let p = queue.shift();
+        while (p) {
+          p.resolve(res)
+          p = queue.shift();
+        }
+      }
+
+    } else {
+      // console.log("凭证未过期");
+      resolve(false)
+    }
+
+  })
+}
+/**
+* oss判断临时凭证是否到期。
+**/
+function isCredentialsExpired(credentials) {
+  if (!credentials) {
+    return true;
+  }
+  const expireDate = new Date(credentials);
+  const now = new Date();
+  // 如果有效期不足五分钟，视为过期。
+  return expireDate.getTime() - now.getTime() <= 300000;
+
+}
 
 export const OSSclient = ossGenerateSTS

src/utils/parseDicom.js

@@ -0,0 +1,202 @@
+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;
+import { convertBytes } from "@/utils/dicom-character-set";
+import Vue from 'vue';
+import { dcmUpload } from "@/utils/dcmUpload/dcmUpload";
+let dicom = {
+    PatientName: "x00100010", // 患者姓名
+    PatientId: "x00100020", // 患者ID
+    PatientBirthDate: "x00100030", // 患者出生日期
+    PatientBirthTime: "x00100032", // 患者出生时间
+    PatientSex: "x00100040", // 患者性别
+    PatientWeight: "x00101030", // 患者体重
+    PregnancyStatus: "x001021c0", // 怀孕状态
+    PatientAge: "x00101010", // 患者年龄(做检查时刻的患者年龄，而不是此刻患者的真实年龄)
+    AcquisitionTime: "x00080032",
+    AcquisitionNumber: "x00200012",
+    TriggerTime: "x00181060",
+    AccessionNumber: "x00080050", // 检查号
+    StudyId: "x00200010", // 检查ID
+    StudyInstanceUid: "x0020000d", // 检查实例号
+    StudyDate: "x00080020", // 检查日期
+    StudyTime: "x00080030", // 检查时间
+    Modalities: "x00080061", // 一个检查中含有的不同检查类型
+    BodyPartExamined: "x00080015", // 检查的部位
+    StudyDescription: "x00081030", // 检查的描述
+    InstitutionName: "x00080080",
+    SeriesNumber: "x00200011", // 序列号
+    SeriesInstanceUid: "x0020000e", // 序列实例号
+    Modality: "x00080060", // 检查模态
+    SeriesDescription: "x0008103e", // 检查描述和说明
+    SeriesDate: "x00080021", // 检查日期
+    SeriesTime: "x00080031", // 检查时间
+    SequenceName: "x00180024",
+    ProtocolName: "x00181030",
+    ImagePosition: "x00200032", // 图像位置
+    ImageOrientation: "x00200037", // 图像方位
+    ImagePixelSpacing: "x00181164",
+    SliceThickness: "x00180050", // 层厚
+    SpacingBetweenSlices: "x00180088", // 层间距
+    SliceLocation: "x00201041", // 相对位置
+    MRAcquisition: "x00180023",
+    seriesBodyPartExamined: "x00180015", // 身体部位
+    ImageType: "x00080008",
+    SopInstanceUid: "x00080018", // SOP实例UID
+    ContentDate: "x00080023", // 影像拍摄日期
+    ContentTime: "x00080033", // 影像拍摄时间
+    ImageOrInstanceNumber: "x00200013", // 图像码
+    SamplesPerPixel: "x00280002", // 图像采样率
+    PhotometricInterpretation: "x00280004", // 光度计（对于CT图像，用两个枚举值MONOCHROME1，MONOCHROME2 用来判断图像是否是彩色的；MONOCHROME 1/2是灰度图，RGB则是真彩色图）
+    Rows: "x00280010", // 行数
+    Columns: "x00280011", // 列数
+    NumberOfFrames: "x00280008",
+    PixelSpacing: "x00280030", // 像素间距
+    BitsAllocated: "x00280100", // 分配的位数
+    BitsStored: "x00280101", // 存储的位数
+    HighBit: "x00280102", // 高位
+    PixelRepresentation: "x00280103", // 像素数据的表现类型（一个枚举值，分别为十六进制数0000和0001.0000H = 无符号整型，0001H = 2的补码）
+    WindowCenter: "x00281050", // 窗位
+    WindowWidth: "x002811051", // 窗宽
+    RescaleIntercept: "x00281052", // 截距
+    RescaleSlope: "x00281053", // 斜率
+    RescaleType: "x00281054", // 输出值的单位
+    ParsingFormat: "x00080005",
+    FrameOfReferenceUID: "x00200052",
+};
+// 需要设置默认值
+let defaultKey = ['Rows', 'Columns', 'SliceLocation', 'NumberOfFrames'];
+let uintKey = ['Rows', 'Columns'];
+let intStringKey = ['SliceLocation', 'NumberOfFrames'];
+// 需要格式解析
+let pormatParseKey = ['PatientName', 'SeriesDescription', 'StudyDescription'];
+// 解析dicom文件
+export const parseDicom = (file, name = false) => {
+    return new Promise(function (resolve) {
+        let reader = new FileReader();
+        reader.onload = function (e) {
+            try {
+                let data = dicomParser.parseDicom(new Uint8Array(e.target.result));
+                let res = {};
+                if (name && Array.isArray(name)) {
+                    name.forEach((item) => {
+                        if (dicom[item]) {
+                            res[item] = data.string(dicom[item]) || '';
+                        }
+                    });
+                } else if (name) {
+                    if (dicom[name]) {
+                        res[name] = data.string(dicom[name]) || '';
+                    } else {
+                        console.log("name is inexistence");
+                        resolve(false)
+                    }
+                } else {
+                    Object.keys(dicom).forEach((key) => {
+                        res[key] = data.string(dicom[key]) || '';
+                    });
+                }
+                pormatParseKey.forEach(key => {
+                    if (res[key]) {
+                        const Element = data.elements[dicom[key]];
+                        const Bytes = new Uint8Array(
+                            data.byteArray.buffer,
+                            Element ? Element.dataOffset : 0,
+                            Element ? Element.length : 0
+                        );
+                        res[key] = convertBytes(
+                            res.ParsingFormat,
+                            Bytes
+                        );
+                    }
+                })
+                uintKey.forEach(key => {
+                    res[key] = data.uint16(dicom[key])
+                })
+                intStringKey.forEach(key => {
+                    res[key] = data.intString(dicom[key])
+                })
+                defaultKey.forEach(key => {
+                    if (!res[key] && res.hasOwnProperty(key)) {
+                        res[key] = 0;
+                    }
+                })
+                resolve(res);
+            } catch (error) {
+                console.log(error)
+                resolve(false);
+            }
+        };
+        reader.onerror = function (e) {
+            console.log(e)
+            resolve(false);
+        };
+        reader.readAsArrayBuffer(file);
+    });
+};
+// 影像上传
+// 影像上传
+export const dicomToOSS = async (file, path) => {
+    try {
+        let res = await dcmUpload(path, file);
+        if (!res || !res.url) return false;
+        return Vue.prototype.$getObjectName(res.url);
+    } catch (err) {
+        console.log(err);
+        return false;
+    }
+};
+// 获取缩略图
+export const getThumbnail = async (file, ossPath, dicomInfo) => {
+    try {
+        if (dicomInfo.modality !== "SR") {
+            let fileId = cornerstoneWADOImageLoader.wadouri.fileManager.add(file);
+            let blob = await dicomToPng(
+                fileId,
+                dicomInfo.Columns,
+                dicomInfo.Rows
+            );
+            if (!blob) return "";
+            let OSSclient = Vue.prototype.OSSclient;
+            let seriesRes = await OSSclient.put(ossPath, blob);
+            if (seriesRes && seriesRes.url) {
+                return Vue.prototype.$getObjectName(seriesRes.url);
+            } else {
+                return "";
+            }
+        } else {
+            return "";
+        }
+    } catch (err) {
+        console.log(err);
+        return "";
+    }
+};
+const canvasToBlob = (canvas) => {
+    return new Promise((resolve) => {
+        canvas.toBlob((blob) => {
+            resolve(blob);
+        });
+    });
+};
+const dicomToPng = (imageId, width, height) => {
+    return new Promise((resolve) => {
+        cornerstone.loadImage(imageId).then(async (image) => {
+            let canvas = document.createElement("canvas");
+            canvas.width = width;
+            canvas.height = height;
+            if (image) {
+                cornerstone.renderToCanvas(canvas, image);
+                // 将 Canvas 图像对象转换为 PNG 格式
+                let blob = await canvasToBlob(canvas);
+                resolve(blob);
+            } else {
+                resolve(false);
+            }
+        });
+    }).catch((reason) => {
+        reason();
+    });
+};

src/utils/request.js

@@ -2,9 +2,9 @@ import axios from 'axios'
 import { Message, MessageBox, Alert } from 'element-ui'
 import store from '@/store'
 import router from '@/router'
-import Vue from 'vue'
+import WHITELIST from "./whiteList"
 import moment from 'moment-timezone';
-console.log(moment.tz.guess())
+import { encryptConfig } from "@/utils/encrypt"
 axios.defaults.withCredentials = false
 const service = axios.create({
   baseURL: '/api',
@@ -16,24 +16,34 @@ var path
 // var lang = store.state.lang.language
 
 service.interceptors.request.use(
-  config => {
+  async config => {
     path = router && router.app && router.app._route && router.app._route.path
     config.headers['Content-Type'] = 'application/json;charset=UTF-8'
     var language = zzSessionStorage.getItem('lang')
-    config.headers['Accept-Language'] = language === 'en'?'en-US,en;q=0.5':'zh-CN,zh;q=0.9'
+    config.headers['Accept-Language'] = language === 'en' ? 'en-US,en;q=0.5' : 'zh-CN,zh;q=0.9'
     config.headers['TimeZoneId'] = moment.tz.guess()
-    if (store.getters.token) {
+    if (config.ENCRYPT) {
+      try {
+        config = await encryptConfig(config)
+      } catch (err) {
+        console.log(err)
+      }
+    }
+    if (store.getters.token && !config.clearToken) {
       config.headers.Authorization = `Bearer ${store.getters.token}`
     }
     try {
       if (eval(process.env.VUE_APP_LOGIN_FOR_PERMISSION)) {
-        if (!path || path === '/ReviewersResearchForm' || path === '/ReviewersResearch' || path === '/login' || path === '/researchForm' || path === '/researchLogin' || path === '/email-recompose' || path === '/recompose' || path === '/resetpassword' || path === '/error') {
+        // if (!path || path === '/ReviewersResearchForm' || path === '/ReviewersResearch' || path === '/login' || path === '/researchForm' || path === '/researchDetail_m' || path === '/researchLogin_m' || path === '/researchLogin' || path === '/email-recompose' || path === '/recompose' || path === '/resetpassword' || path === '/error') {
+        //   return config
+        // }
+        if (!path || WHITELIST.some(item => item === path)) {
           return config
         }
         if (store.state.user.userId !== zzSessionStorage.getItem('userId')) {
           window.location.href = `/login`
           zzSessionStorage.removeItem('lastWorkbench')
-          Alert(store.state.lang.language === 'en'? 'The same browser only allows one user account to be logged in at a time.' : '同一浏览器只允许同时登陆一个账户',  {
+          Alert(store.state.lang.language === 'en' ? 'The same browser only allows one user account to be logged in at a time.' : '同一浏览器只允许同时登陆一个账户', {
             type: 'warning',
           })
         }
@@ -49,21 +59,21 @@ service.interceptors.request.use(
   }
 )
 
-var isConfirm = true
+let timer = null;
+let time = 1000;
 
 service.interceptors.response.use(
   response => {
     const res = response.data
     if (res.IsSuccess) {
-      isConfirm = true
       return Promise.resolve(res)
     } else if (res.IsSuccess === false) {
       if (res.Code !== 5) {
-        MessageBox.confirm(res.ErrorMessage,  {
+        MessageBox.confirm(res.ErrorMessage, {
           type: 'warning',
           showCancelButton: false,
           callback: action => {
-            if(res.Code === 6) {
+            if (res.Code === 6) {
               window.close()
             }
           }
@@ -87,29 +97,29 @@ service.interceptors.response.use(
         })
       }
       switch (status) {
-        case 400: message = store.state.lang.language === 'en'? 'Request error' : '请求错误'; break
-        case 401: message = store.state.lang.language === 'en'? 'Not authorized or login timed out. Please log in again.' : '未授权或登陆超时,请重新登录'; break
+        case 400: message = store.state.lang.language === 'en' ? 'Request error' : '请求错误'; break
+        case 401: message = store.state.lang.language === 'en' ? 'Not authorized or login timed out. Please log in again.' : '未授权或登陆超时,请重新登录'; break
         case 403: message = error.response.data.ErrorMessage; break
-        case 404: message = store.state.lang.language === 'en'? 'Request address error' : `请求地址出错`; break
-        case 405: message = store.state.lang.language === 'en'? 'Interface parameter error or request method inconsistency' : `接口参数传递错误，或者请求方法不一致`; break
-        case 408: message = store.state.lang.language === 'en'? 'Request timed out' : '请求超时'; break
-        case 429: message = store.state.lang.language === 'en'? 'The application service limits the traffic. Your requests are too frequent. Please try again later.' : '应用服务限流，您的请求过于频繁，请稍后再试'; break
-        case 500: message = store.state.lang.language === 'en'? 'Internal server error, and unable to complete the request. Software release might be in process. Please contact the administrator.' : '服务器内部错误，无法完成请求；可能正在发布中，请联系管理员处理'; break
-        case 501: message = store.state.lang.language === 'en'? 'Service has not been implemented.' : '服务未实现'; break
-        case 502: message = store.state.lang.language === 'en'? 'System is being upgraded. Please wait patiently.' : '系统正在升级，请耐心等待。'; break
-        case 503: message = store.state.lang.language === 'en'? 'Service is not available' : '服务不可用'; break
-        case 504: message = store.state.lang.language === 'en'? 'Gateway timed out' : '网关超时'; break
-        case 505: message = store.state.lang.language === 'en'? 'HTTP version is not supported' : 'HTTP版本不受支持'; break
+        case 404: message = store.state.lang.language === 'en' ? 'Request address error' : `请求地址出错`; break
+        case 405: message = store.state.lang.language === 'en' ? 'Interface parameter error or request method inconsistency' : `接口参数传递错误，或者请求方法不一致`; break
+        case 408: message = store.state.lang.language === 'en' ? 'Request timed out' : '请求超时'; break
+        case 429: message = store.state.lang.language === 'en' ? 'The application service limits the traffic. Your requests are too frequent. Please try again later.' : '应用服务限流，您的请求过于频繁，请稍后再试'; break
+        case 500: message = store.state.lang.language === 'en' ? 'Internal server error, and unable to complete the request. Software release might be in process. Please contact the administrator.' : '服务器内部错误，无法完成请求；可能正在发布中，请联系管理员处理'; break
+        case 501: message = store.state.lang.language === 'en' ? 'Service has not been implemented.' : '服务未实现'; break
+        case 502: message = store.state.lang.language === 'en' ? 'System is being upgraded. Please wait patiently.' : '系统正在升级，请耐心等待。'; break
+        case 503: message = store.state.lang.language === 'en' ? 'Service is not available' : '服务不可用'; break
+        case 504: message = store.state.lang.language === 'en' ? 'Gateway timed out' : '网关超时'; break
+        case 505: message = store.state.lang.language === 'en' ? 'HTTP version is not supported' : 'HTTP版本不受支持'; break
         default: break
       }
       if (error.response.status === 401) {
         if (store.getters.token) {
-          if(message !== ''){
-            Message({
+          if (message !== '') {
+            setTimer({
               message: message,
               type: 'warning',
               showClose: true
-            })
+            }, 'message')
           }
           store.dispatch('user/logout').then(() => {
             router.push(`/login`)
@@ -118,34 +128,52 @@ service.interceptors.response.use(
             this.$updateDictionary()
           })
         } else {
-          Message({
-            message: store.state.lang.language === 'en'? 'You are not authorized to access the interface' : '您无权访问接口',
+          setTimer({
+            message: store.state.lang.language === 'en' ? 'You are not authorized to access the interface' : '您无权访问接口',
             type: 'warning',
             showClose: true
-          })
+          }, 'message')
         }
       } else {
-        if(message !== '' && isConfirm){
-          MessageBox.confirm(message, store.state.lang.language === 'en'? 'Warning' : '警告', {
+        if (message !== '') {
+          setTimer([message, store.state.lang.language === 'en' ? 'Warning' : '警告', {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
-          })
+            callback: action => { }
+          }], 'confirm')
         }
       }
     }
-    if (!window.navigator.onLine && isConfirm) {
-      MessageBox.confirm(store.state.lang.language === 'en'? 'Please check your network，and try again later！' : '请检查网络，稍后重试！', store.state.lang.language === 'en'? 'Warning' : '警告', {
-        type: 'warning',
-        showCancelButton: false,
-        callback: action => {}
-      })
-      isConfirm = false
+    if (!window.navigator.onLine) {
+      setTimer(
+        [store.state.lang.language === 'en' ? 'Please check your network，and try again later！' : '请检查网络，稍后重试！', store.state.lang.language === 'en' ? 'Warning' : '警告', {
+          type: 'warning',
+          showCancelButton: false,
+          callback: action => { }
+        }], "confirm"
+      )
     }
     return Promise.reject(new Error(message || 'Error'))
   }
 )
 
+const setTimer = (obj, type) => {
+  if (timer) {
+    clearTimeout(timer);
+    timer = null;
+  }
+  timer = setTimeout(() => {
+    if (type === 'message') {
+      Message(obj)
+    }
+    if (type === 'confirm') {
+      MessageBox.confirm(...obj)
+    }
+    clearTimeout(timer);
+    timer = null;
+  }, time)
+}
+
 
 
 

src/utils/stream.js

@@ -0,0 +1,106 @@
+import streamSaver from "streamsaver";
+import "streamsaver/examples/zip-stream.js";
+import store from '@/store'
+streamSaver.mitm = `${window.location.origin}/mitm.html?version=2.0.0`
+// 下载文件并压缩
+function zipFiles(zipName, files) {
+    return new Promise((resolve) => {
+        try {
+            console.log("同步下载打包开始时间：" + new Date());
+            store.dispatch('trials/setUnLock', true)
+            files = formatFiles(files)
+            // 创建压缩文件输出流  
+            const zipFileOutputStream = streamSaver.createWriteStream(zipName);
+            // 创建下载文件流  
+            const fileIterator = files.values();
+            const readableZipStream = new ZIP({
+                async pull(ctrl) {
+                    const fileInfo = fileIterator.next();
+                    if (fileInfo.done) {//迭代终止  
+                        ctrl.close();
+                    } else {
+                        let { name, url } = fileInfo.value;
+                        url = decodeUtf8(url);
+                        return fetch(url).then(res => {
+                            ctrl.enqueue({
+                                name,
+                                stream: () => res.body
+                            });
+                        })
+                    }
+                }
+            });
+            if (window.WritableStream && readableZipStream.pipeTo) {
+                // 开始下载  
+                readableZipStream
+                    .pipeTo(zipFileOutputStream)
+                    .then(() => {
+                        console.log("同步下载打包结束时间：" + new Date());
+                        store.dispatch('trials/setUnLock', false)
+                        resolve(true)
+                    }).catch(err => {
+                        console.log(err);
+                        resolve(false)
+                    });
+            } else {
+                resolve(false)
+            }
+        } catch (err) {
+            console.log(err);
+            resolve(false)
+        }
+    })
+
+}
+// 下载文件并修改名称
+async function updateFile(file, name) {
+    return new Promise(async resolve => {
+        try {
+            store.dispatch('trials/setUnLock', true)
+            const fileOutputStream = streamSaver.createWriteStream(name);
+            file = decodeUtf8(file);
+            let res = await fetch(file);
+            res.body.pipeTo(fileOutputStream).then(() => {
+                store.dispatch('trials/setUnLock', true)
+                resolve(true)
+            }).catch(err => {
+                console.log(err)
+                resolve(false)
+            });
+        } catch (err) {
+            console.log(err)
+            resolve(false)
+        }
+    })
+}
+//  同名文件修改名称
+function formatFiles(files) {
+    let fileObj = {};
+    files.forEach(file => {
+        let arr = Object.keys(fileObj);
+        if (!~arr.indexOf(file.name)) {
+            fileObj[file.name] = 1;
+        } else {
+            let name = file.name;
+            file.name = name.split(".")[0] + `(${fileObj[name]})` + name
+                .substring(name.lastIndexOf('.'))
+                .toLocaleLowerCase()
+            fileObj[name]++;
+        }
+    })
+    return files;
+}
+function decodeUtf8(bytes) {
+    let str = bytes.split('?');
+    let str2 = str[0].split('/');
+    let name = str2[str2.length - 1];
+    name = encodeURIComponent(name);
+    str.shift();
+    str2.pop();
+    return str2.join("/") + '/' + name;
+}
+export async function downLoadFile(file, name, type = 'file') {
+    if (type === 'zip') return await zipFiles(name, file);
+    return await updateFile(file, name)
+
+}

src/utils/version-polling.esm.js

@@ -0,0 +1,222 @@
+/*!
+  * version-polling v1.2.6
+  * (c) 2023 JoeshuTT
+  * @license MIT
+  */
+function _defineProperty(obj, key, value) {
+  key = _toPropertyKey(key);
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+function _toPrimitive(input, hint) {
+  if (typeof input !== "object" || input === null) return input;
+  var prim = input[Symbol.toPrimitive];
+  if (prim !== undefined) {
+    var res = prim.call(input, hint || "default");
+    if (typeof res !== "object") return res;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return (hint === "string" ? String : Number)(input);
+}
+function _toPropertyKey(arg) {
+  var key = _toPrimitive(arg, "string");
+  return typeof key === "symbol" ? key : String(key);
+}
+
+/**
+ * 是否有值
+ * @param {*} val
+ */
+/**
+ * 创建一个 Web Work 实例
+ * @param func
+ */
+function createWorker(func) {
+  const blob = new Blob(["(" + func.toString() + ")()"]);
+  const url = window.URL.createObjectURL(blob);
+  const worker = new Worker(url);
+  window.URL.revokeObjectURL(url);
+  return worker;
+}
+function createWorkerFunc() {
+  let timerId = null;
+  let options;
+  self.onmessage = event => {
+    let code = event.data["code"];
+    options = Object.assign({}, options, event.data["data"]);
+    const {
+      htmlFileUrl,
+      lastEtag,
+      appETagKey,
+      pollingInterval,
+      silentPollingInterval
+    } = options;
+    const runReq = () => {
+      fetch(htmlFileUrl, {
+        method: "HEAD",
+        cache: "no-cache"
+      }).then(response => {
+        if (Number(response.status) !== 200) {
+          return;
+        }
+        const etag = response.headers.get("etag");
+        if (lastEtag !== etag) {
+          self.postMessage({
+            appETagKey,
+            lastEtag,
+            etag
+          });
+        }
+      });
+    };
+    const startPollingTask = () => {
+      timerId = setInterval(runReq, pollingInterval);
+    };
+    const pausePollingTask = () => {
+      if (timerId) {
+        clearInterval(timerId);
+        timerId = null;
+      }
+    };
+    if (code === "pause") {
+      pausePollingTask();
+    } else {
+      runReq(); // 立即执行一次
+      if (!silentPollingInterval) {
+        startPollingTask();
+      }
+    }
+  };
+  return self;
+}
+function closeWorker(worker) {
+  worker.terminate();
+}
+
+let APP_ETAG_KEY = "__APP_ETAG__";
+let myWorker;
+const defaultOptions = {
+  appETagKey: APP_ETAG_KEY,
+  pollingInterval: 5 * 60 * 1000,
+  htmlFileUrl: `${location.origin}${location.pathname}`,
+  silent: false,
+  silentPollingInterval: false,
+  silentPageVisibility: false,
+  forceUpdate: false
+};
+let attached = false;
+/**
+ * 页面隐藏时停止轮询任务，页面再度可见时在继续
+ */
+function handleVisibilityChange() {
+  if (document.visibilityState === "visible") {
+    myWorker.postMessage({
+      code: "resume"
+    });
+  } else {
+    myWorker.postMessage({
+      code: "pause"
+    });
+  }
+}
+class VersionPolling {
+  constructor(options) {
+    _defineProperty(this, "options", void 0);
+    _defineProperty(this, "appEtag", "");
+    this.options = Object.assign({}, defaultOptions, options);
+    this.init();
+  }
+  async init() {
+    const {
+      htmlFileUrl
+    } = this.options;
+    if (!htmlFileUrl) {
+      throw new Error("[version-polling]: htmlFileUrl is required");
+    }
+    const response = await fetch(htmlFileUrl, {
+      method: "HEAD",
+      cache: "no-cache"
+    });
+    if (Number(response.status) !== 200) {
+      throw new Error(`[version-polling]: status is ${response.status}`);
+    }
+    const etag = response.headers.get("etag");
+    // eslint-disable-next-line no-eq-null
+    if (etag == null) {
+      throw new Error(`[version-polling]: etag is null`);
+    }
+    this.appEtag = etag;
+    localStorage.setItem(`${this.options.appETagKey}`, etag);
+    this.start();
+  }
+  start() {
+    const {
+      appETagKey,
+      pollingInterval,
+      htmlFileUrl,
+      silent,
+      silentPollingInterval,
+      silentPageVisibility
+    } = this.options;
+    if (silent) {
+      return;
+    }
+    myWorker = createWorker(createWorkerFunc);
+    myWorker.postMessage({
+      code: "start",
+      data: {
+        appETagKey,
+        pollingInterval,
+        htmlFileUrl,
+        silentPollingInterval,
+        lastEtag: this.appEtag
+      }
+    });
+    myWorker.onmessage = event => {
+      const {
+        lastEtag,
+        etag
+      } = event.data;
+      if (lastEtag !== etag) {
+        this.stop();
+        this.options.onUpdate(this);
+      }
+    };
+    if (!silentPageVisibility) {
+      if (!attached) {
+        document.addEventListener("visibilitychange", handleVisibilityChange);
+        attached = true;
+      }
+    }
+  }
+  stop() {
+    if (myWorker) {
+      closeWorker(myWorker);
+      if (attached) {
+        document.removeEventListener("visibilitychange", handleVisibilityChange);
+        attached = false;
+      }
+    }
+  }
+  onRefresh() {
+    window.location.reload();
+  }
+  onCancel() {
+    this.options.forceUpdate && this.start();
+  }
+}
+function createVersionPolling(options) {
+  const versionPolling = new VersionPolling(options);
+  return versionPolling;
+}
+
+export { VersionPolling, createVersionPolling };

src/utils/whiteList.js

@@ -0,0 +1,2 @@
+const WHITELIST = ['/', 'researchDetail_m', '/researchForm', '/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
+export default WHITELIST

src/views/blindResumeInfo/components/StatusInfo.vue

@@ -2,7 +2,7 @@
   <div class="status-info">
     <el-form :inline="true" :model="basicInfo" class="demo-form-inline" size="small">
       <el-row>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item :label="$t('resumeInfo:label:Pending')">
             <span v-if="statusList.Submitted" style="color:#428bca">
               <router-link
@@ -42,7 +42,7 @@
             </span>
             <span v-else>{{ statusList.Reading }}</span>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item :label="$t('resumeInfo:label:Vacation')">
             <span style="font-size:12px;margin-right:20px;">{{ holiday }}</span>

src/views/blindResumeInfo/info.vue

@@ -1,14 +1,14 @@
 <template>
   <div v-loading="pageLoading" style="height:100%;display:flex;flex-direction: column;">
     <div style="height:50px">
-      <div style="text-align:right;">
+      <!-- <div style="text-align:right;">
         <el-switch
           v-model="isEnglish"
           active-text="EN"
           inactive-text="中文"
           style="margin-right:20px;"
         />
-      </div>
+      </div> -->
       <div style="text-align:center;">
         <h3>{{ title }}</h3>
       </div>

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

@@ -8,10 +8,10 @@
               <!-- <div class="studyDesc" style="border-bottom:1px solid #9e9e9e;" @click="closeDialog()">
               <span style="font-size:14px;color:#d0d0d0;margin:5px 0px;line-height: 25px;">返回列表</span>
             </div> -->
-              <div class="studyDesc" style="line-height: 10px;">
+              <div class="studyDesc">
                 {{ studyTitle }}
               </div>
-              <div class="studyDesc" style="line-height: 10px">
+              <div class="studyDesc">
                 {{ seriesCount }} Series
               </div>
               <div class="viewerSidethumbs ps" style="position: relative;">
@@ -38,11 +38,12 @@
                     </span>
                   </span>-->
                     <div class="viewernavitextwrapper">
-                      <div style="padding: 1px;">#{{ item.seriesTitle }}</div>
+                      <div style="padding: 1px;">#{{ item.seriesNumber }}</div>
+                      <div style="padding: 1px;">{{ item.description }}</div>
                       <div
                         v-show="item.instanceCount"
                         style="padding: 1px;"
-                      >{{ item.instanceCount }} image
+                      >{{ item.modality }} : {{ item.instanceCount }} Series
                       </div>
                     </div>
                   </div>
@@ -63,20 +64,22 @@
 import * as dicomParser from 'dicom-parser'
 import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
-import dicomStore from '@/utils/dicom-store'
+// import dicomStore from '@/utils/dicom-store'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import dicomPreview from '@/components/Dicom/DicomPreview'
-
+var config = {
+  maxWebWorkers: 4,
+  startWebWorkersOnDemand: true,
+  taskConfiguration: {
+    decodeTask: {
+      initializeCodecsOnStartup: false
+    }
+  }
+}
+cornerstoneWADOImageLoader.webWorkerManager.initialize(config)
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-// cornerstoneWADOImageLoader.webWorkerManager.initialize({
-//   webWorkerPath: './webWorker.js',
-//   taskConfiguration: {
-//     decodeTask: {
-//       codecsPath: './dicomCodecs.js'
-//     }
-//   }
-// })
+
 export default {
   components: {
     dicomViewer,
@@ -89,6 +92,7 @@ export default {
     },
     studyList: {
       type: Array,
+      // eslint-disable-next-line vue/require-valid-default-prop
       default: []
     }
   },
@@ -131,8 +135,7 @@ export default {
       })
       if (!studyItem) return
 
-      this.studyTitle =
-        studyItem.dicomInfo.patientName || studyItem.dicomInfo.description
+      this.studyTitle = studyItem.dicomInfo.description
       this.seriesCount = studyItem.seriesList.length
       var scope = this
 
@@ -155,7 +158,8 @@ export default {
 
         scope.seriesList.push({
           seriesNumber: series.seriesNumber,
-          seriesTitle: series.description || series.modality || '(Anonymous)',
+          description: series.description,
+          modality: series.modality,
           instanceCount: series.instanceList.length,
           imageIds: imageIds,
           previewImageId: imageIds[0]
@@ -257,7 +261,7 @@ export default {
   text-align: center;
   background: rgb(88 84 83);
   color: #d0d0d0;
-  padding: 2px;
+  padding: 5px;
 }
 
 .ps {

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

@@ -43,28 +43,53 @@
                           fit="fill"
                         >
                         <div class="viewernavitextwrapper">
-                          <div v-if="item.keySeries" style="padding: 1px;color:red">
-                            Key Images
-                          </div>
-                          <div v-else style="padding: 1px;">
-                            #{{ item.seriesNumber }}
+                          <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
+                            <div v-if="item.keySeries" style="color:red">
+                              Key Images
+                            </div>
+                            <div v-else>
+                              #{{ item.seriesNumber }}
+                            </div>
+                            <div v-if="item.isExistMutiFrames && item.instanceCount > 1">
+                              <el-popover
+                                placement="right"
+                                trigger="hover"
+                                popper-class="instance_frame_wrapper"
+                              >
+                                <div class="frame_list">
+                                  <div
+                                    v-for="(instance, idx) in item.instanceInfoList"
+                                    :key="instance.Id"
+                                    class="frame_content"
+                                    :style="{'margin-bottom':idx<item.instanceInfoList.length-1? '5px':'0px'}"
+                                    @click="showMultiFrames(item, index, instance)"
+                                  >
+                                    <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>
+                            </div>
                           </div>
                           <div v-show="item.instanceCount" style="padding: 1px;">
                             {{ item.modality }}: {{ item.instanceCount }} image
                           </div>
                           <div v-show="!item.keySeries && item.sliceThickness" style="padding: 1px;">
-                            T: {{ item.sliceThickness }}
+                            T: {{ parseFloat(item.sliceThickness).toFixed(2) }}
                           </div>
                           <div v-show="!item.keySeries &&item.description" style="width: 120px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 1x;">
                             {{ item.description }}
                           </div>
                           <div v-if="!item.keySeries" style="padding: 1px;">
-                            {{ item.prefetchInstanceCount }}/{{ item.instanceCount }}
+                            {{ item.imageloadedArr.length }}/{{ item.instanceCount }}
                           </div>
 
                         </div>
                       </div>
-                      <div v-if="showDelete" @click.stop="" style="display: flex;flex-direction: row;justify-content: space-between;">
+                      <div v-if="showDelete" style="display: flex;flex-direction: row;justify-content: space-between;" @click.stop="">
 
                         <div>
                           <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isReading') }}</span>
@@ -83,8 +108,8 @@
                           />
                         </div>
                       </div>
-                      <div v-if="item.prefetchInstanceCount>0 && item.prefetchInstanceCount<item.instanceCount">
-                        <el-progress :percentage="parseInt(((item.prefetchInstanceCount/item.instanceCount)*100).toFixed(2))" />
+                      <div v-if="item.prefetchInstanceCount>0 && item.prefetchInstanceCount<item.instanceCount * 100">
+                        <el-progress :percentage="parseInt((item.prefetchInstanceCount/item.instanceCount).toFixed(2))" />
                       </div>
 
                     </div>
@@ -113,14 +138,25 @@ import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getStudyInfo, getSeriesList } from '@/api/reading'
-import { getInstanceList, setSeriesStatus } from '@/api/trials'
+import { getInstanceList, getPatientSeriesList, setSeriesStatus } from '@/api/trials'
 
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
+var config = {
+  maxWebWorkers: 4,
+  startWebWorkersOnDemand: true,
+  taskConfiguration: {
+    decodeTask: {
+      initializeCodecsOnStartup: false
+    }
+  }
+}
+cornerstoneWADOImageLoader.webWorkerManager.initialize(config)
 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
@@ -156,10 +192,13 @@ export default {
       showDelete: false,
       loading: false,
       imageList: [],
-      showSeriesList: []
+      showSeriesList: [],
+      currentLoadIns: [],
+      isFromCRCUpload: false
     }
   },
   created: function() {
+    requestPoolManager.resetRequestPool()
     this.type = this.$router.currentRoute.query.type ? this.$router.currentRoute.query.type : ''
 
     this.visitNum = this.$router.currentRoute.query.visitNum ? parseInt(this.$router.currentRoute.query.visitNum) : 0
@@ -170,6 +209,7 @@ export default {
       changeURLStatic('TokenKey', '')
     }
     this.studyId = this.$router.currentRoute.query.studyId
+    this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload
     if (this.type === 'Series') {
       // this.initStudy()
       this.showDelete = parseInt(this.$router.currentRoute.query.showDelete)
@@ -179,50 +219,65 @@ export default {
       this.loadStudy()
     } else if (this.type === 'Share') {
       this.loadStudy()
+    } else if (this.type === 'Patient') {
+      this.loadPatientStudy()
     }
+    cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
+    window.addEventListener('beforeunload', e => {
+      cornerstone.imageCache.purgeCache()
+      requestPoolManager.resetRequestPool()
+    })
   },
   beforeDestroy() {
     requestPoolManager.stopTaskTimer()
+    window.removeEventListener('beforeunload', e => {
+      cornerstone.imageCache.purgeCache()
+      requestPoolManager.resetRequestPool()
+    })
   },
   methods: {
-    loadStudy() {
-      var scope = this
-      getStudyInfo(scope.studyId).then(data => {
-        if (data.IsSuccess) {
-          scope.studyCode = data.Result.StudyCode
-          scope.modality = data.Result.Modalities
-          scope.seriesCount = data.Result.SeriesCount
-          scope.description = data.Result.Description
-          var url = `/series/list/${scope.studyId}`
-          scope.getSeriesList(url)
+    async loadStudy() {
+      const data = await getStudyInfo(this.studyId)
+      if (data.IsSuccess) {
+        if (data.Result) {
+          this.studyCode = data.Result.StudyCode
+          this.modality = data.Result.Modalities
+          this.seriesCount = data.Result.SeriesCount
+          this.description = data.Result.Description
         }
-      })
+        const url = `/series/list/${this.studyId}`
+        this.getSeriesList(url)
+      }
     },
-    getSeriesList(url) {
-      var scope = this
-      getSeriesList(url).then(data => {
+    async loadPatientStudy() {
+      try {
+        let data = await getPatientSeriesList(this.studyId);
         if (data.IsSuccess) {
           const { Result } = data
           var seriesList = []
-          Result.forEach(function(item) {
+          Result.forEach((item, index) => {
             const imageIds = []
-            // item.InstanceList.forEach(function(id) {
-            //   imageIds.push(`wadouri:/api/instance/content/${id}`)
-            // })
-            // item.InstanceList.forEach((id) => {
-            //   imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
-            // })
-            item.InstancePathList.forEach((path) => {
-              imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${path}`)
+            item.InstanceInfoList.forEach(i => {
+              if (i.NumberOfFrames && i.NumberOfFrames > 1) {
+                for (let j = 0; j < i.NumberOfFrames; j++) {
+                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&seriesIndex=${index}`)
+                }
+                i.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=0&instanceId=${i.Id}&seriesIndex=${index}`
+              } else {
+                const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&seriesIndex=${index}`
+                imageIds.push(imageId)
+                i.ImageId = imageId
+              }
             })
-            var subjectVisitId = scope.$router.currentRoute.query.subjectVisitId
-            var studyId = scope.$router.currentRoute.query.studyId
-            var trialId = scope.$router.currentRoute.query.trialId
+            var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
+            var studyId = this.$router.currentRoute.query.studyId
+            var trialId = this.$router.currentRoute.query.trialId
             seriesList.push({
               trialId,
               subjectVisitId,
               studyId,
               imageIds: imageIds,
+              instanceInfoList: item.InstanceInfoList,
               seriesId: item.Id,
               seriesUid: item.SeriesInstanceUid,
               seriesNumber: item.SeriesNumber,
@@ -231,71 +286,143 @@ export default {
               description: item.Description,
               isReading: item.IsReading,
               isDeleted: item.IsDeleted,
-              previewImageUrl: item.ImageResizePath ? scope.OSSclientConfig.basePath + item.ImageResizePath : `/api/series/preview/${item.Id}`,
+              previewImageUrl: item.ImageResizePath ? this.OSSclientConfig.basePath + item.ImageResizePath : `/api/series/preview/${item.Id}`,
               instanceCount: item.InstanceCount,
               prefetchInstanceCount: 0,
               hasLabel: item.HasLabel,
               keySeries: item.KeySeries,
-              tpCode: scope.tpCode,
+              tpCode: this.tpCode,
               loadStatus: false,
-              imageloadedArr: []
+              imageloadedArr: [],
+              isExistMutiFrames: item.IsExistMutiFrames
             })
           })
-          scope.seriesList = seriesList
-          if (scope.seriesList.length > 0) {
+          this.seriesList = seriesList
+          if (this.seriesList.length > 0) {
             this.loadAllImages()
-            scope.$refs.dicomViewer.loadImageStack(scope.seriesList[0], scope.labels[scope.tpCode])
-            scope.firstInstanceId = scope.seriesList[0].imageIds[0]
+            this.$refs.dicomViewer.loadImageStack(this.seriesList[0], this.labels[this.tpCode])
+            this.firstInstanceId = this.seriesList[0].imageIds[0]
           }
         }
-      })
+      } catch (err) {
+        console.log(err)
+      }
     },
-    initSeries() {
-      var scope = this
-      this.studyCode = this.$router.currentRoute.query.studyCode
-      this.modality = this.$router.currentRoute.query.modality
-      this.seriesCount = 1
-      this.description = this.$router.currentRoute.query.description
-      var seriesId = this.$router.currentRoute.query.seriesId
-      var seriesNumber = this.$router.currentRoute.query.seriesNumber
-      var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
-      var studyId = this.$router.currentRoute.query.studyId
-      var trialId = this.$router.currentRoute.query.trialId
-      getInstanceList(seriesId).then(res => {
+    async getSeriesList(url) {
+      try {
+        const data = await getSeriesList(url)
+        if (data.IsSuccess) {
+          const { Result } = data
+          var seriesList = []
+          Result.forEach((item, index) => {
+            const imageIds = []
+            item.InstanceInfoList.forEach(i => {
+              if (i.NumberOfFrames && i.NumberOfFrames > 1) {
+                for (let j = 0; j < i.NumberOfFrames; j++) {
+                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&seriesIndex=${index}`)
+                }
+                i.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=0&instanceId=${i.Id}&seriesIndex=${index}`
+              } else {
+                const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&seriesIndex=${index}`
+                imageIds.push(imageId)
+                i.ImageId = imageId
+              }
+            })
+            var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
+            var studyId = this.$router.currentRoute.query.studyId
+            var trialId = this.$router.currentRoute.query.trialId
+            seriesList.push({
+              trialId,
+              subjectVisitId,
+              studyId,
+              imageIds: imageIds,
+              instanceInfoList: item.InstanceInfoList,
+              seriesId: item.Id,
+              seriesUid: item.SeriesInstanceUid,
+              seriesNumber: item.SeriesNumber,
+              sliceThickness: item.SliceThickness,
+              modality: item.Modality,
+              description: item.Description,
+              isReading: item.IsReading,
+              isDeleted: item.IsDeleted,
+              previewImageUrl: item.ImageResizePath ? this.OSSclientConfig.basePath + item.ImageResizePath : `/api/series/preview/${item.Id}`,
+              instanceCount: item.InstanceCount,
+              prefetchInstanceCount: 0,
+              hasLabel: item.HasLabel,
+              keySeries: item.KeySeries,
+              tpCode: this.tpCode,
+              loadStatus: false,
+              imageloadedArr: [],
+              isExistMutiFrames: item.IsExistMutiFrames
+            })
+          })
+          this.seriesList = seriesList
+          if (this.seriesList.length > 0) {
+            this.loadAllImages()
+            this.$refs.dicomViewer.loadImageStack(this.seriesList[0], this.labels[this.tpCode])
+            this.firstInstanceId = this.seriesList[0].imageIds[0]
+          }
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    async initSeries() {
+      try {
+        this.studyCode = this.$router.currentRoute.query.studyCode
+        this.modality = this.$router.currentRoute.query.modality
+        this.seriesCount = 1
+        this.description = this.$router.currentRoute.query.description
+        var seriesId = this.$router.currentRoute.query.seriesId
+        var seriesNumber = this.$router.currentRoute.query.seriesNumber
+        var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
+        var studyId = this.$router.currentRoute.query.studyId
+        var trialId = this.$router.currentRoute.query.trialId
+        const res = await getInstanceList(seriesId)
         if (!res.Result || (res.Result && res.Result.length === 0)) return
         var seriesInstanceUid = res.Result[0].SeriesInstanceUid
-        var sliceLocation = res.Result[0].SliceLocation
+        var sliceThickness = res.Result[0].SliceThickness
         var isReading = res.Result[0].IsReading
         var isDeleted = res.Result[0].IsDeleted
         var seriesList = []
         var imageIds = []
+        let isExistMutiFrames = false
+        const instanceInfoList = []
         res.Result.forEach(instance => {
+          let imageId = ''
           if (instance.NumberOfFrames > 1) {
             for (let i = 0; i < instance.NumberOfFrames; i++) {
-              imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}?frame=${i}`)
+              imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&seriesIndex=0`)
             }
+            isExistMutiFrames = true
+            imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}?frame=0&instanceId=${instance.Id}&seriesIndex=0`
           } else {
-            imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}`)
+            const path = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&seriesIndex=0`
+            imageIds.push(path)
+            imageId = path
           }
+          instanceInfoList.push({ Id: instance.Id, InstanceNumber: instance.InstanceNumber, NumberOfFrames: instance.NumberOfFrames, Path: instance.Path, ImageId: imageId })
         })
         seriesList.push({
           trialId,
           subjectVisitId,
           studyId,
           imageIds: imageIds,
+          instanceInfoList,
           seriesId: seriesId,
           seriesUid: seriesInstanceUid,
           seriesNumber: seriesNumber,
-          sliceThickness: sliceLocation,
+          sliceThickness: sliceThickness,
           modality: this.modality,
           description: this.description,
           isReading,
           isDeleted,
-          previewImageUrl: res.OtherInfo.ImageResizePath ? scope.OSSclientConfig.basePath + res.OtherInfo.ImageResizePath : res.OtherInfo.ImageResizePath,
+          previewImageUrl: res.OtherInfo.ImageResizePath ? this.OSSclientConfig.basePath + res.OtherInfo.ImageResizePath : res.OtherInfo.ImageResizePath,
           instanceCount: res.Result.length,
           prefetchInstanceCount: 0,
           loadStatus: false,
-          imageloadedArr: []
+          imageloadedArr: [],
+          isExistMutiFrames: isExistMutiFrames
         })
         this.seriesList = seriesList
         if (this.seriesList.length > 0) {
@@ -305,7 +432,9 @@ export default {
             this.firstInstanceId = this.seriesList[0].imageIds[0]
           })
         }
-      })
+      } catch (e) {
+        console.log(e)
+      }
     },
     showSeriesImage(e, seriesIndex, series) {
       // if (seriesIndex === this.currentSeriesIndex) return
@@ -318,22 +447,102 @@ export default {
       this.currentSeriesIndex = seriesIndex
       this.$refs.dicomViewer.loadImageStack(this.seriesList[seriesIndex])
       if (!series.loadStatus) {
-        requestPoolManager.changePriority(series.seriesId)
-        // var isAddToTakPool = false
-        // if (this.showSeriesList.includes(`${seriesIndex}`)) {
-        //   isAddToTakPool = true
-        // } else {
-        //   this.showSeriesList.push(`${seriesIndex}`)
-        // }
-        // if (!isAddToTakPool) {
-        //   var priority = parseInt(new Date().getTime())
-        //   series.isLoading = true
-        //   series.imageIds.map((imageId) => {
-        //     this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
-        //   })
-        // } else {
-        //   requestPoolManager.changePriority(series.seriesId)
-        // }
+        series.isLoading = true
+        var isAddToTakPool = false
+        if (this.showSeriesList.includes(`0_${seriesIndex}`)) {
+          isAddToTakPool = true
+        } else {
+          this.showSeriesList.push(`0_${seriesIndex}`)
+        }
+        if (!isAddToTakPool) {
+          var priority = parseInt(new Date().getTime())
+          // var images = []
+          // if (series.isExistMutiFrames) {
+          //   images = series.imageIds.filter(i => i.includes('?frame=0'))
+          // } else {
+          //   images = series.imageIds
+          // }
+          // images.map(imageId => {
+          //   this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: 0, seriesIndex: seriesIndex, priority })
+          // })
+          if (series.isExistMutiFrames) {
+            series.instanceInfoList.map(image => {
+              this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
+            })
+          } else {
+            series.imageIds.map(imageId => {
+              this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+            })
+          }
+          if (this.imageList.length > 0) {
+            this.loopLoad()
+          }
+        } else {
+          requestPoolManager.changePriority(series.seriesId)
+        }
+      }
+    },
+    showMultiFrames(series, seriesIndex, instanceInfo) {
+      this.currentSeriesIndex = seriesIndex
+      const imageIds = []
+      if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
+        for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
+          imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&seriesIndex=${seriesIndex}`)
+        }
+      } else {
+        imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&seriesIndex=${seriesIndex}`)
+      }
+      const seriesInfo = {
+        trialId: series.trialId,
+        subjectVisitId: series.subjectVisitId,
+        studyId: series.studyId,
+        imageIds: imageIds,
+        seriesId: series.seriesId,
+        seriesUid: series.seriesUid,
+        seriesNumber: series.seriesNumber,
+        sliceThickness: series.sliceThickness,
+        modality: series.modality,
+        description: series.description,
+        isReading: series.isReading,
+        isDeleted: series.isDeleted,
+        previewImageUrl: series.previewImageUrl,
+        instanceCount: series.instanceCount
+      }
+      this.$refs.dicomViewer.loadImageStack(seriesInfo)
+      if (!series.loadStatus) {
+        var isAddToTakPool = false
+        if (this.showSeriesList.includes(`0_${seriesIndex}`)) {
+          isAddToTakPool = true
+        } else {
+          this.showSeriesList.push(`0_${seriesIndex}`)
+        }
+        if (!isAddToTakPool) {
+          var priority = parseInt(new Date().getTime())
+          // if (series.isExistMutiFrames) {
+          //   series.instanceInfoList.map(image => {
+          //     this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: 0, seriesIndex: seriesIndex, priority })
+          //   })
+          // } else {
+          //   series.imageIds.map((imageId) => {
+          //     this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: 0, seriesIndex: seriesIndex, priority })
+          //   })
+          // }
+          if (series.isExistMutiFrames) {
+            series.instanceInfoList.map(image => {
+              this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
+            })
+          } else {
+            series.imageIds.map(imageId => {
+              this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+            })
+          }
+
+          if (this.imageList.length > 0) {
+            this.loopLoad()
+          }
+        } else {
+          requestPoolManager.changePriority(series.seriesId)
+        }
       }
     },
     initStudy() {
@@ -345,13 +554,6 @@ export default {
         const seriesInfo = JSON.parse(this.$router.currentRoute.query.series)
         var seriesList = []
         const imageIds = []
-        // const scope = this
-        // seriesInfo.InstanceList.forEach(function(item) {
-        //   imageIds.push(`wadouri:/api/instance/content/${item}`)
-        // })
-        // seriesInfo.InstanceList.forEach((id) => {
-        //   imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
-        // })
         seriesInfo.InstancePathList.forEach((path) => {
           imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${path}`)
         })
@@ -381,22 +583,25 @@ export default {
         }
       }
     },
-    deleteSeries() {
+    async deleteSeries() {
       this.loading = true
       var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
       var studyId = this.$router.currentRoute.query.studyId
       var seriesId = this.$router.currentRoute.query.seriesId
-      // trialId, subjectVisitId, studyId, seriesId, state
-      setSeriesStatus(this.trialId, subjectVisitId, studyId, seriesId, 5).then(res => {
+      try {
+        const res = await setSeriesStatus(this.trialId, subjectVisitId, studyId, seriesId, 5)
         this.loading = false
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
 
           window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
         }
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        console.log(e)
+        this.loading = false
+      }
     },
-    changeReadingStatus(callback, data) {
+    async changeReadingStatus(callback, data) {
       let statusStr = ''
       if (callback) {
         statusStr = this.$t('trials:audit:label:setSeriesReading')
@@ -407,24 +612,30 @@ export default {
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
       message = message.replace('yyy', this.$fd('YesOrNo', !data.isReading))
-      this.$confirm(message, {
-        distinguishCancelAndClose: true,
-        type: 'warning'
-      }).then(() => {
-        const state = data.isReading ? 1 : 2
-        this.loading = true
-
-        setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            data.isReading = !data.isReading
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
-          }
-        }).catch(() => { this.loading = false })
-      }).catch(() => {})
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const state = data.isReading ? 1 : 2
+      this.loading = true
+      try {
+        const res = await setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          data.isReading = !data.isReading
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        console.log(e)
+        this.loading = false
+      }
     },
-    changeDeleteStatus(callback, data) {
+    async changeDeleteStatus(callback, data) {
       let statusStr = ''
       if (callback) {
         statusStr = this.$t('trials:audit:label:setSeriesDeleted')
@@ -435,111 +646,75 @@ export default {
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
       message = message.replace('yyy', this.$fd('YesOrNo', !data.isDeleted))
-      this.$confirm(message, {
-        distinguishCancelAndClose: true,
-        type: 'warning'
-      }).then(() => {
-        const state = data.isDeleted ? 5 : 4
-        this.loading = true
-        // var trialId = this.$router.currentRoute.query.trialId
-        // var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
-        // var studyId = this.$router.currentRoute.query.studyId
-        // var seriesId = this.$router.currentRoute.query.seriesId
-        setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            data.isDeleted = !data.isDeleted
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
-          }
-        }).catch(() => { this.loading = false })
-      }).catch(() => {})
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const state = data.isDeleted ? 5 : 4
+      this.loading = true
+      try {
+        const res = await setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          data.isDeleted = !data.isDeleted
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        console.log(e)
+        this.loading = false
+      }
     },
     loadAllImages() {
+      const seriesIndex = this.seriesList.findIndex(i => i.loadStatus === false)
+      if (seriesIndex === -1) return
+      const series = this.seriesList[seriesIndex]
       var priority = new Date().getTime()
-      this.seriesList.forEach((series, index) => {
-        series.imageIds.forEach(imageId => {
-          var p = null
-          if (this.firstInstanceId === imageId) {
-            p = priority * 100
-          } else {
-            p = priority - 1
-          }
-          // this.load(imageId, series.seriesId, priority)
-          this.imageList.push({ imageId: imageId, seriesId: series.seriesId, seriesIndex: index, priority: p })
+      // var images = []
+      // if (series.isExistMutiFrames) {
+      //   images = series.imageIds.filter(i => i.includes('?frame=0'))
+      // } else {
+      //   images = series.imageIds
+      // }
+      // images.map(imageId => {
+      //   this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: 0, seriesIndex: seriesIndex, priority })
+      // })
+      if (series.isExistMutiFrames) {
+        series.instanceInfoList.map(image => {
+          this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
         })
-      })
+      } else {
+        series.imageIds.map(imageId => {
+          this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+        })
+      }
       if (this.imageList.length > 0) {
         this.loopLoad()
       }
     },
+    getInstanceInfo(imageId) {
+      const params = {}
+      const searchParams = new URLSearchParams(imageId.split('?')[1])
+      for (const [key, value] of searchParams.entries()) {
+        params[key] = value
+      }
+      return params
+    },
     loopLoad() {
       if (this.imageList.length > 0) {
         requestPoolManager.startTaskTimer()
         console.log('loopLoad')
         this.imageList.map(image => {
-          requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority).then(res => {
-            this.imageLoaded(image, res.data.string('x0020000e'))
-          })
+          requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority)
         })
         requestPoolManager.sortTaskPool()
         this.imageList = []
       }
     },
-    load(imageId, seriesId, priority = 999) {
-      return new Promise((resolve, reject) => {
-        requestPoolManager.loadAndCacheImagePlus(imageId, seriesId, priority).then(res => {
-          if (!res) return
-          this.imageLoaded(imageId, res.data.string('x0020000e'))
-          resolve(res)
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
-    imageLoaded(image, seriesUid) {
-      var seriesIndex = image.seriesIndex
-      if (seriesIndex < 0) return
-      if (this.seriesList[seriesIndex].imageloadedArr.indexOf(image.imageId) < 0) {
-        ++this.seriesList[seriesIndex].prefetchInstanceCount
-        this.seriesList[seriesIndex].imageloadedArr.push(image.imageId)
-
-        if (this.seriesList[seriesIndex].prefetchInstanceCount >= this.seriesList[seriesIndex].instanceCount) {
-          this.seriesList[seriesIndex].prefetchInstanceCount = this.seriesList[seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.seriesList[seriesIndex].loadStatus = true
-          // if (!this.isLoadedAll) {
-          //   this.loadAllImages()
-          // }
-        }
-      }
-    },
-    imageLoaded2(imageId, seriesUid) {
-      var seriesIndex = -1
-      for (let i = 0; i < this.seriesList.length; ++i) {
-        if (this.seriesList[i].seriesUid === seriesUid) {
-          seriesIndex = i
-          break
-        }
-      }
-      if (seriesIndex < 0) return
-
-      const imageIdIndex = this.seriesList[seriesIndex].imageIds.indexOf(imageId)
-      if (imageIdIndex < 0) return
-      if (this.seriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
-        ++this.seriesList[seriesIndex].prefetchInstanceCount
-        this.seriesList[seriesIndex].imageloadedArr.push(imageId)
-
-        if (this.seriesList[seriesIndex].prefetchInstanceCount >= this.seriesList[seriesIndex].instanceCount) {
-          this.seriesList[seriesIndex].prefetchInstanceCount = this.seriesList[seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.seriesList[seriesIndex].loadStatus = true
-          // if (!this.isLoadedAll) {
-          //   this.loadAllImages()
-          // }
-        }
-      }
-    },
     datasetsCacheChanged(e) {
       // const uri = e.detail.uri
       const cacheInfo = e.detail.cacheInfo
@@ -563,48 +738,44 @@ export default {
 
       return 0
     },
-    cornerstoneImageLoaded(e) {
-      if (this.firstInstanceId === e.detail.image.imageId && !this.isStartLoad) {
-        // 初始化图像加载完成时，自动下载
-        this.loadAllImages()
-        this.isStartLoad = true
-        // requestPoolManager.executeTask()
+    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
       }
-      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()
-      }
-      // loadedDataSets[uri].dataSet.byteArray.length
-      // console.log(this.cachedImages.length)
-      // console.log(cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.getInfo().cacheSizeInBytes)
-      // const imageId = e.detail.image.imageId
-      var imageId = e.detail.image.imageId
-      var seriesUid = e.detail.image.data.string('x0020000e')
-      var seriesIndex = -1
-      for (let i = 0; i < this.seriesList.length; ++i) {
-        if (this.seriesList[i].seriesUid === seriesUid) {
-          seriesIndex = i
-          break
+      if (this.visitTaskId === params.visitTaskId) {
+        const seriesIndex = params.seriesIndex
+        var prefetchInstanceCount = this.seriesList[seriesIndex].prefetchInstanceCount
+        var instanceCount = this.seriesList[seriesIndex].instanceCount
+        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
+            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.seriesList[seriesIndex].prefetchInstanceCount = prefetchInstanceCount
+          if (percentComplete >= 100) {
+            this.seriesList[seriesIndex].imageloadedArr.push(imageId)
+          }
         }
-      }
-      if (seriesIndex < 0) return
-
-      const imageIdIndex = this.seriesList[seriesIndex].imageIds.indexOf(imageId)
-      if (imageIdIndex < 0) return
-      if (this.seriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
-        ++this.seriesList[seriesIndex].prefetchInstanceCount
-        this.seriesList[seriesIndex].imageloadedArr.push(imageId)
-
-        if (this.seriesList[seriesIndex].prefetchInstanceCount >= this.seriesList[seriesIndex].instanceCount) {
-          this.seriesList[seriesIndex].prefetchInstanceCount = this.seriesList[seriesIndex].instanceCount
+        if (prefetchInstanceCount >= instanceCount * 100) {
+          this.seriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
           // 设置当前序列状态为已下载完成
           this.seriesList[seriesIndex].loadStatus = true
-          // if (!this.isLoadedAll) {
-          //   this.loadAllImages()
-          // }
+          if (!this.isFromCRCUpload) {
+            this.loadAllImages()
+          }
         }
       }
     }
@@ -756,6 +927,41 @@ export default {
     color: #D0D0D0;
     font-size: 13px;
 }
+.instance_frame_wrapper{
+  min-width: 120px;
+  background-color: #2c2c2c;
+  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;
+  display: flex;
+  justify-content: flex-start;
+  color: #ddd;
+  font-size: 12px;
+  border: 1px solid #404040;
+}
+.frame_content:hover {
+  /* font-weight: bold; */
+  /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */
+  cursor: pointer;
+  /* color: #428bca; */
+  border-color: #213a54 !important;
+  background-color: #213a54;
+}
 /* .viewerRightSidePanel {
     width: 300px;
     height: 100%;

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

@@ -6,7 +6,7 @@
           <div class="sidePanelThumbs">
             <el-tabs v-model="activeName" type="border-card" @tab-click="handleTabClick">
               <el-tab-pane :label="$t('trials:dicom-show:currentVisit')" name="current-study">
-                <div class="text-desc" style="background:rgb(55 55 55);">
+                <div v-if="visitInfo" class="text-desc" style="background:rgb(55 55 55);">
                   {{ visitInfo }}
                 </div>
                 <div class="viewerSidethumbs ps" style="position: relative;">
@@ -46,13 +46,6 @@
                           @click="showSeriesImage($event,index,i,series)"
                         >
                           <div class="viewernavigatorwrapper">
-                            <!-- <el-image
-                            class="image-preview"
-                            style="height:72px;width:72px;"
-                            :src="series.previewImageUrl"
-                            fit="fill"
-                          /> -->
-
                             <img
                               class="image-preview"
                               :src="series.previewImageUrl"
@@ -62,8 +55,41 @@
                               fit="fill"
                             >
                             <div class="viewernavitextwrapper">
-                              <div style="padding: 1px;">
-                                #{{ series.seriesNumber }}
+                              <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
+                                <div>#{{ series.seriesNumber }}</div>
+                                <div v-if="series.isExistMutiFrames && series.instanceCount > 1">
+                                  <el-popover
+                                    placement="right"
+                                    trigger="hover"
+                                    popper-class="instance_frame_wrapper"
+                                  >
+                                    <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="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>
+                                    <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
+                                  </el-popover>
+                                </div>
+
                               </div>
                               <div v-show="series.InstanceCount" style="padding: 1px;">
                                 {{ series.modality }}: {{ series.instanceCount }} image
@@ -78,12 +104,12 @@
                                 </div>
                               </el-tooltip>
                               <div style="padding: 1px;">
-                                {{ series.prefetchInstanceCount }}/{{ series.instanceCount }}
+                                {{ series.imageloadedArr.length }}/{{ series.instanceCount }}
                               </div>
-
+                              <div />
                             </div>
                           </div>
-                          <div v-if="showDelete" @click.stop="" style="display: flex;flex-direction: row;justify-content: space-between;">
+                          <div v-if="showDelete" style="display: flex;flex-direction: row;justify-content: space-between;" @click.stop="">
 
                             <div>
                               <span style="font-size: 12px;">{{ $t('trials:audit:table:isReading') }}</span>
@@ -105,8 +131,8 @@
                           <!-- <div style="position: absolute;bottom: -10px;left: 0;width: 100%;">
                           <el-progress v-if="series.prefetchInstanceCount>0 && series.prefetchInstanceCount<series.instanceCount" :percentage="Number(series.prefetchInstanceCount/series.instanceCount)*100" />
                         </div> -->
-                          <div v-if="series.prefetchInstanceCount>0 && series.prefetchInstanceCount<series.instanceCount">
-                            <el-progress :percentage="parseInt(((series.prefetchInstanceCount/series.instanceCount)*100).toFixed(2))" />
+                          <div v-if="series.prefetchInstanceCount>0 && series.prefetchInstanceCount<series.instanceCount * 100">
+                            <el-progress :percentage="parseInt((series.prefetchInstanceCount/series.instanceCount).toFixed(2))" />
                           </div>
 
                         </div>
@@ -120,7 +146,7 @@
               <el-tab-pane :label="$t('trials:dicom-show:relatedVisit')" name="relation-study" class="pane-relation-wrapper">
                 <div class="viewerSidethumbinner">
                   <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
-                    <el-collapse-item v-for="(study) in relationStudyList" :key="`${study.StudyId}`" :name="`${study.StudyId}`">
+                    <el-collapse-item v-for="(study,studyIndex) in relationStudyList" :key="`${study.StudyId}`" :name="`${study.StudyId}`">
                       <template slot="title">
 
                         <div class="text-desc">
@@ -145,7 +171,7 @@
                             class="viewernavigatorwrapper"
                             style="position: relative;border:1px solid #434343;"
                             series-type="relation"
-                            @click="showRelationSeriesImage($event,seriesItem,index)"
+                            @click="showRelationSeriesImage($event,seriesItem,studyIndex,index)"
                           >
                             <!-- <el-image
                             class="image-preview"
@@ -163,13 +189,38 @@
                             >
 
                             <div class="viewernavitextwrapper">
-                              <div v-if="seriesItem.keySeries" style="padding: 1px;color:red">
-                                Key Images
+                              <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
+                                <div v-if="seriesItem.keySeries" style="color:red">
+                                  Key Images
+                                </div>
+                                <div v-else>#{{ seriesItem.seriesNumber }}</div>
+                                <div v-if="seriesItem.isExistMutiFrames && seriesItem.instanceCount > 1">
+                                  <el-popover
+                                    placement="right"
+                                    trigger="hover"
+                                    popper-class="instance_frame_wrapper"
+                                  >
+                                    <div class="frame_list">
+                                      <div
+                                        v-for="(instance, idx) in seriesItem.instanceInfoList"
+                                        :key="instance.Id"
+                                        class="frame_content"
+                                        :style="{'margin-bottom':idx<seriesItem.instanceInfoList.length-1? '5px':'0px'}"
+                                        @click="showMultiFrames(studyIndex,seriesItem, index, instance)"
+                                      >
+                                        <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>
+                                </div>
+
                               </div>
-                              <div v-else style="padding: 1px;">
-                                #{{ seriesItem.seriesNumber }}
-                              </div>
-                              <div v-show=" seriesItem.instanceCount" style="padding: 1px;">
+                              <div v-show="seriesItem.instanceCount" style="padding: 1px;">
                                 {{ seriesItem.modality }}: {{ seriesItem.instanceCount }} image
                               </div>
                               <div v-show="seriesItem.sliceThickness" style="padding: 1px;">
@@ -180,7 +231,6 @@
                                   {{ seriesItem.description }}
                                 </div>
                               </el-tooltip>
-
                             </div>
                           <!-- <div style="position: absolute;bottom: -10px;left: 0;width: 100%;">
                             <el-progress v-if="seriesItem.prefetchInstanceCount>0 && seriesItem.prefetchInstanceCount<seriesItem.instanceCount" :percentage="Number(seriesItem.prefetchInstanceCount/seriesItem.instanceCount)*100" />
@@ -211,12 +261,25 @@ import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getVisitStudyList, getAllRelationStudyList, getSeriesList } from '@/api/reading'
 import { setSeriesStatus } from '@/api/trials'
+import { getTaskUploadedDicomStudyList } from '@/api/reading'
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
+// import * as cornerstoneTools from 'cornerstone-tools'
+var config = {
+  maxWebWorkers: 4,
+  startWebWorkersOnDemand: true,
+  taskConfiguration: {
+    decodeTask: {
+      initializeCodecsOnStartup: false
+    }
+  }
+}
+cornerstoneWADOImageLoader.webWorkerManager.initialize(config)
 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: {
@@ -237,10 +300,15 @@ export default {
       imageList: [],
       activeNames: [],
       relationActiveName: [],
-      showSeriesList: []
+      showSeriesList: [],
+      currentLoadIns: [],
+      isFromCRCUpload: false,
+      visitTaskId: null
     }
   },
   mounted() {
+    requestPoolManager.resetRequestPool()
+    document.documentElement.style.userSelect = 'none'
     if (this.$router.currentRoute.query.TokenKey) {
       store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey)
       changeURLStatic('TokenKey', '')
@@ -251,72 +319,115 @@ export default {
     this.visitInfo = this.$router.currentRoute.query.visitInfo
     this.isReading = this.$router.currentRoute.query.isReading ? this.$router.currentRoute.query.isReading * 1 : 0
     this.showDelete = parseInt(this.$router.currentRoute.query.showDelete)
+    this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload
+    this.visitTaskId = this.$router.currentRoute.query.visitTaskId
     // cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded)
     this.getStudiesInfo()
+    cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
+    window.addEventListener('beforeunload', e => {
+      cornerstone.imageCache.purgeCache()
+      requestPoolManager.resetRequestPool()
+    })
   },
   beforeDestroy() {
     requestPoolManager.stopTaskTimer()
+    window.removeEventListener('beforeunload', e => {
+      cornerstone.imageCache.purgeCache()
+      requestPoolManager.resetRequestPool()
+    })
   },
   methods: {
     // 获取某个访视下所有的检查信息
-    getStudiesInfo() {
+    async getStudiesInfo() {
       this.studyList = []
-      getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading).then(res => {
-        res.Result.forEach((study) => {
-          const data = {}
-          data.StudyId = study.StudyId
-          data.StudyCode = study.StudyCode
-          data.Modalities = study.Modalities
-          data.SeriesCount = study.SeriesCount
-          data.InstanceCount = study.InstanceCount
-          data.InstanceCount = study.InstanceCount
-          data.PreviewImageCount = 0
-          var seriesList = []
-          study.SeriesList.forEach((series) => {
-            const imageIds = []
-
-            // series.InstanceList.forEach((id) => {
-            //   imageIds.push(`wadouri:/api/instance/content/${id}`)
-            // })
-            // series.InstanceList.forEach((id) => {
-            //   imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
-            // })
-            series.InstancePathList.forEach((path) => {
-              imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${path}`)
-            })
-            seriesList.push({
-              trialId: this.trialId,
-              subjectVisitId: this.subjectVisitId,
-              studyId: study.StudyId,
-              imageIds: imageIds,
-              seriesId: series.Id,
-              seriesUid: series.SeriesInstanceUid,
-              seriesNumber: series.SeriesNumber,
-              sliceThickness: series.SliceThickness,
-              modality: series.Modality,
-              description: series.Description,
-              isReading: series.IsReading,
-              isDeleted: series.IsDeleted,
-              previewImageUrl: series.ImageResizePath ? this.OSSclientConfig.basePath + series.ImageResizePath : `/api/series/preview/${series.Id}`,
-              instanceCount: series.InstanceCount,
-              prefetchInstanceCount: 0,
-              loadStatus: false,
-              imageloadedArr: []
-            })
-          })
-          data.SeriesList = seriesList
-          this.studyList.push(data)
-        })
-        if (this.studyList.length > 0) {
-          this.$refs.dicomViewer.loadImageStack(this.studyList[0].SeriesList[0])
-          const imageId = this.studyList[0].SeriesList[0].imageIds[0]
-          let instanceId = imageId.split('/')[imageId.split('/').length - 1]
-          instanceId = instanceId.split('.')[0]
-          this.firstInstanceId = instanceId
-          this.activeNames = [this.studyList[0].StudyId]
-          this.loadAllImages()
+      try {
+        let res = null
+        if (this.visitTaskId) {
+          res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId })
+        } else {
+          res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
         }
-      })
+        if (res.IsSuccess) {
+          res.Result.forEach((study, studyIndex) => {
+            const data = {}
+            data.StudyId = study.StudyId
+            data.StudyCode = study.StudyCode
+            data.Modalities = study.Modalities
+            data.SeriesCount = study.SeriesCount
+            data.InstanceCount = study.InstanceCount
+            data.InstanceCount = study.InstanceCount
+            data.PreviewImageCount = 0
+            var seriesList = []
+            study.SeriesList.forEach((series, seriesIndex) => {
+              const imageIds = []
+              series.InstanceInfoList.forEach(i => {
+                if (i.NumberOfFrames && i.NumberOfFrames > 1) {
+                  for (let j = 0; j < i.NumberOfFrames; j++) {
+                    imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&idx=${studyIndex}|${seriesIndex}`)
+                  }
+                  i.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=0&instanceId=${i.Id}&idx=${studyIndex}|${seriesIndex}`
+                  // imageIds.push(`${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}`)
+                } else {
+                  const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&idx=${studyIndex}|${seriesIndex}`
+                  imageIds.push(imageId)
+                  i.ImageId = imageId
+                  // imageIds.push(`${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}`)
+                }
+              })
+              seriesList.push({
+                trialId: this.trialId,
+                subjectVisitId: this.subjectVisitId,
+                studyId: study.StudyId,
+                imageIds: imageIds,
+                instanceInfoList: series.InstanceInfoList,
+                seriesId: series.Id,
+                seriesUid: series.SeriesInstanceUid,
+                seriesNumber: series.SeriesNumber,
+                sliceThickness: series.SliceThickness,
+                modality: series.Modality,
+                description: series.Description,
+                isReading: series.IsReading,
+                isDeleted: series.IsDeleted,
+                previewImageUrl: series.ImageResizePath ? this.OSSclientConfig.basePath + series.ImageResizePath : `/api/series/preview/${series.Id}`,
+                instanceCount: series.InstanceCount,
+                prefetchInstanceCount: 0,
+                loadStatus: false,
+                imageloadedArr: [],
+                isExistMutiFrames: series.IsExistMutiFrames
+              })
+            })
+            data.SeriesList = seriesList
+            this.studyList.push(data)
+          })
+          if (this.studyList.length > 0) {
+            this.$refs.dicomViewer.loadImageStack(this.studyList[0].SeriesList[0])
+            const imageId = this.studyList[0].SeriesList[0].imageIds[0]
+            let instanceId = imageId.split('/')[imageId.split('/').length - 1]
+            instanceId = instanceId.split('.')[0]
+            this.firstInstanceId = instanceId
+            this.activeNames = [this.studyList[0].StudyId]
+            this.loadImages(this.studyList[0].SeriesList[0], 0)
+          }
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+
+    loadImages(series, seriesIndex) {
+      var priority = parseInt(new Date().getTime())
+      if (series.isExistMutiFrames) {
+        series.instanceInfoList.map(image => {
+          this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
+        })
+      } else {
+        series.imageIds.map(imageId => {
+          this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+        })
+      }
+      if (this.imageList.length > 0) {
+        this.loopLoad()
+      }
     },
     showSeriesImage(e, studyIndex, seriesIndex, series) {
       const element = e.currentTarget
@@ -327,26 +438,91 @@ export default {
       element.classList.add('viewerSideActive')
       this.currentSeriesIndex = seriesIndex
       this.$refs.dicomViewer.loadImageStack(this.studyList[studyIndex].SeriesList[seriesIndex])
+      // if (!series.loadStatus) {
+      //   requestPoolManager.changePriority(series.seriesId)
+      // }
       if (!series.loadStatus) {
-        requestPoolManager.changePriority(series.seriesId)
-        // var isAddToTakPool = false
-        // if (this.showSeriesList.includes(`${studyIndex}_${seriesIndex}`)) {
-        //   isAddToTakPool = true
-        // } else {
-        //   this.showSeriesList.push(`${studyIndex}_${seriesIndex}`)
-        // }
-        // if (!isAddToTakPool) {
-        //   var priority = parseInt(new Date().getTime())
-        //   series.isLoading = true
-        //   series.imageIds.map((imageId, i) => {
-        //     this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
-        //   })
-        // } else {
-        //   requestPoolManager.changePriority(series.seriesId)
-        // }
+        series.isLoading = true
+        var isAddToTakPool = false
+        if (this.showSeriesList.includes(`${studyIndex}_${seriesIndex}`)) {
+          isAddToTakPool = true
+        } else {
+          this.showSeriesList.push(`${studyIndex}_${seriesIndex}`)
+        }
+        if (!isAddToTakPool) {
+          var priority = parseInt(new Date().getTime())
+          if (series.isExistMutiFrames) {
+            series.instanceInfoList.map(image => {
+              this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
+            })
+          } else {
+            series.imageIds.map(imageId => {
+              this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+            })
+          }
+          if (this.imageList.length > 0) {
+            this.loopLoad()
+          }
+        } else {
+          requestPoolManager.changePriority(series.seriesId)
+        }
       }
     },
-    changeReadingStatus(callback, data) {
+    showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) {
+      this.currentSeriesIndex = seriesIndex
+      const imageIds = []
+      if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
+        for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
+          imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&idx=${studyIndex}|${seriesIndex}`)
+        }
+      } else {
+        imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&idx=${studyIndex}|${seriesIndex}`)
+      }
+      const seriesInfo = {
+        trialId: series.trialId,
+        subjectVisitId: series.subjectVisitId,
+        studyId: series.studyId,
+        imageIds: imageIds,
+        seriesId: series.seriesId,
+        seriesUid: series.seriesUid,
+        seriesNumber: series.seriesNumber,
+        sliceThickness: series.sliceThickness,
+        modality: series.modality,
+        description: series.description,
+        isReading: series.isReading,
+        isDeleted: series.isDeleted,
+        previewImageUrl: series.previewImageUrl,
+        instanceCount: series.instanceCount
+      }
+      this.$refs.dicomViewer.loadImageStack(seriesInfo)
+      if (!series.loadStatus) {
+        var isAddToTakPool = false
+        if (this.showSeriesList.includes(`${studyIndex}_${seriesIndex}`)) {
+          isAddToTakPool = true
+        } else {
+          this.showSeriesList.push(`${studyIndex}_${seriesIndex}`)
+        }
+        if (!isAddToTakPool) {
+          var priority = parseInt(new Date().getTime())
+          if (series.isExistMutiFrames) {
+            series.instanceInfoList.map(image => {
+              this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
+            })
+          } else {
+            series.imageIds.map((imageId) => {
+              this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+            })
+          }
+
+          if (this.imageList.length > 0) {
+            this.loopLoad()
+          }
+        } else {
+          requestPoolManager.changePriority(series.seriesId)
+        }
+      }
+    },
+    async changeReadingStatus(callback, data) {
       let statusStr = ''
       if (callback) {
         statusStr = this.$t('trials:audit:label:setSeriesReading')
@@ -357,24 +533,29 @@ export default {
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
       message = message.replace('yyy', this.$fd('YesOrNo', !data.isReading))
-      this.$confirm(message, {
-        distinguishCancelAndClose: true,
-        type: 'warning'
-      }).then(() => {
-        const state = data.isReading ? 1 : 2
-        this.loading = true
-
-        setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            data.isReading = !data.isReading
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
-          }
-        }).catch(() => { this.loading = false })
-      }).catch(() => {})
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const state = data.isReading ? 1 : 2
+      this.loading = true
+      try {
+        const res = await setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          data.isReading = !data.isReading
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
     },
-    changeDeleteStatus(callback, data) {
+    async changeDeleteStatus(callback, data) {
       let statusStr = ''
       if (callback) {
         statusStr = this.$t('trials:audit:label:setSeriesDeleted')
@@ -385,24 +566,31 @@ export default {
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
       message = message.replace('yyy', this.$fd('YesOrNo', !data.isDeleted))
-      this.$confirm(message, {
-        distinguishCancelAndClose: true,
-        type: 'warning'
-      }).then(() => {
-        const state = data.isDeleted ? 5 : 4
-        this.loading = true
-        setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            data.isDeleted = !data.isDeleted
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
-          }
-        }).catch(() => { this.loading = false })
-      }).catch(() => {})
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+
+      const state = data.isDeleted ? 5 : 4
+      this.loading = true
+      try {
+        const res = await setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          data.isDeleted = !data.isDeleted
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
     },
     // 切换关联检查Tab时获取关联检查信息
-    handleTabClick(tab, event) {
+    async handleTabClick(tab, event) {
       if (tab.name === 'relation-study' && this.relationStudyList.length <= 0) {
         const loading = this.$loading({
           target: document.querySelector('.pane-relation-wrapper'),
@@ -412,11 +600,13 @@ export default {
           background: 'rgb(49 49 49 / 50%)',
           spinner: 'el-icon-loading'
         })
-        getAllRelationStudyList(this.subjectVisitId).then(res => {
+        try {
+          const res = await getAllRelationStudyList(this.subjectVisitId)
           loading.close()
           this.relationStudyList = res.Result
-          console.log(this.relationStudyList)
-        }).catch(() => { loading.close() })
+        } catch (e) {
+          loading.close()
+        }
       }
     },
     handelRelationActiveChange(v) {
@@ -428,8 +618,7 @@ export default {
       }
     },
     // 根据关联检查获取序列信息
-    getRelationSeriesByStudy(studyId, index) {
-      console.log('getRelationSeriesByStudy')
+    async getRelationSeriesByStudy(studyId, index) {
       if (this.relationStudyList[index].seriesCount) {
         this.relationStudyList[index].showSeries = !this.relationStudyList[index].showSeries
         this.$forceUpdate()
@@ -443,24 +632,26 @@ export default {
           background: 'rgb(49 49 49 / 50%)',
           spinner: 'el-icon-loading'
         })
-        getSeriesList(`/series/list/${studyId}`).then(data => {
+        try {
+          const data = await getSeriesList(`/series/list/${studyId}`)
           loading.close()
           if (data.Result != null && data.Result.length > 0) {
             var seriesList = []
             const res = data.Result
-            res.forEach(function(item) {
+            res.forEach((item, seriesIndex) => {
               const imageIds = []
-              // item.InstanceList.forEach(function(id) {
-              //   imageIds.push(`wadouri:/api/instance/content/${id}`)
-              // })
-              // item.InstanceList.forEach((id) => {
-              //   imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
-              // })
-              item.InstancePathList.forEach((path) => {
-                imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${path}`)
+              item.InstanceInfoList.forEach(i => {
+                if (i.NumberOfFrames && i.NumberOfFrames > 1) {
+                  for (let j = 0; j < i.NumberOfFrames; j++) {
+                    imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&idx=${index}|${seriesIndex}&isRelation=1`)
+                  }
+                } else {
+                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&idx=${index}|${seriesIndex}&isRelation=1`)
+                }
               })
               seriesList.push({
                 imageIds: imageIds,
+                instanceInfoList: item.InstanceInfoList,
                 seriesId: item.Id,
                 seriesUid: item.SeriesInstanceUid,
                 seriesNumber: item.SeriesNumber,
@@ -473,19 +664,21 @@ export default {
                 hasLabel: item.HasLabel,
                 keySeries: item.KeySeries,
                 loadStatus: false,
-                imageloadedArr: []
+                imageloadedArr: [],
+                isExistMutiFrames: item.IsExistMutiFrames
               })
             })
             scope.relationStudyList[index].seriesCount = seriesList.length
             scope.relationStudyList[index].seriesList = seriesList
             scope.relationStudyList[index].showSeries = true
-            console.log(scope.relationStudyList)
             scope.$forceUpdate()
           }
-        }).catch(() => { loading.close() })
+        } catch (e) {
+          loading.close()
+        }
       }
     },
-    showRelationSeriesImage(e, series, index) {
+    showRelationSeriesImage(e, series, studyIndex, index) {
       this.currentRelationIndex = index
       const element = e.currentTarget
       const elements = document.querySelectorAll('[series-type]')
@@ -496,80 +689,55 @@ export default {
       this.$refs.dicomViewer.loadImageStack(series)
       if (!series.loadStatus) {
         var priority = parseInt(new Date().getTime())
-        series.imageIds.map(imageId => {
-          this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
-        })
+        if (series.isExistMutiFrames) {
+          series.instanceInfoList.map(image => {
+            this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
+          })
+        } else {
+          series.imageIds.map((imageId) => {
+            this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+          })
+        }
       }
     },
     loadAllImages() {
+      var seriesList = this.studyList.map(s => s.SeriesList).flat()
+      const seriesIndex = seriesList.findIndex(i => i.loadStatus === false)
+      if (seriesIndex === -1) return
+      const series = seriesList[seriesIndex]
       var priority = parseInt(new Date().getTime())
-      this.studyList.map((study, studyIndex) => {
-        study.SeriesList.map((series, seriesIndex) => {
-          series.imageIds.map(imageId => {
-            var p = null
-            if (this.firstInstanceId === imageId) {
-              p = priority * 100
-            } else {
-              p = priority - 1
-            }
-            this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex, seriesIndex, priority: p })
-          })
-          // if (!series.loadStatus && series.seriesId !== this.firstSeriesId) {
-          //   series.imageIds.map(imageId => {
-          //     // imageIds.push({ imageId: image, seriesId: series.seriesId, priority })
-          //     this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex, seriesIndex, priority })
-          //   })
-          // }
+      if (series.isExistMutiFrames) {
+        series.instanceInfoList.map(image => {
+          this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
         })
-      })
+      } else {
+        series.imageIds.map((imageId) => {
+          this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+        })
+      }
       if (this.imageList.length > 0) {
         this.loopLoad()
       }
       // requestPoolManager.setPendingList(imageIds)
     },
+    getInstanceInfo(imageId) {
+      const params = {}
+      const searchParams = new URLSearchParams(imageId.split('?')[1])
+      for (const [key, value] of searchParams.entries()) {
+        params[key] = value
+      }
+      return params
+    },
     loopLoad() {
       if (this.imageList.length > 0) {
         requestPoolManager.startTaskTimer()
         this.imageList.map(image => {
-          requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority).then(res => {
-            this.imageLoaded(image, res.data.string('x0020000e'))
-          })
+          requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority)
         })
         requestPoolManager.sortTaskPool()
         this.imageList = []
       }
     },
-    load(imageId, seriesId, priority = 999) {
-      return new Promise((resolve, reject) => {
-        requestPoolManager.loadAndCacheImagePlus(imageId, seriesId, priority).then(res => {
-          if (!res) return
-          this.imageLoaded(imageId, res.data.string('x0020000e'))
-          resolve(res)
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
-    // load(imageId, priority = 999) {
-    //   return new Promise((resolve, reject) => {
-    //     const imageTask = this.buildImageRequestTask(imageId, { priority })
-    //     requestPoolManager.addTaskIntoPool(imageTask).then((res) => {
-    //       resolve(res)
-    //     }).catch(e => {
-    //       reject(e)
-    //       console.log(e)
-    //     })
-    //   })
-    // },
-    buildImageRequestTask(imageId, config = {}) {
-      return {
-        key: imageId,
-        ...config,
-        execute: () => {
-          return cornerstone.loadAndCacheImage(imageId)
-        }
-      }
-    },
     datasetsCacheChanged(e) {
       const cacheInfo = e.detail.cacheInfo
       const cacheSizeInBytes = cacheInfo.cacheSizeInBytes
@@ -577,62 +745,47 @@ export default {
         // 清理缓存的影像
       }
     },
-    imageLoaded(image, seriesUid) {
-      var studyIndex = image.studyIndex
-      var seriesIndex = image.seriesIndex
-      if (seriesIndex < 0 || studyIndex < 0) return
-      if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(image.imageId) < 0) {
-        ++this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount
-        this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.push(image.imageId)
-
-        if (this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount >= this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount) {
-          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
+      if (!imageId) return
+      const percentComplete = e.detail.percentComplete
+      const params = {}
+      const searchParams = new URLSearchParams(imageId.split('?')[1])
+      if (!searchParams) return
+      for (const [key, value] of searchParams.entries()) {
+        params[key] = value
       }
-    },
-    // instance下载成功回调
-    cornerstoneImageLoaded(e) {
-      if (e.detail.image.imageId.includes(this.firstInstanceId) && !this.isStartLoad) {
-        // 初始化图像加载完成时，自动下载
-        this.loadAllImages()
-        this.isStartLoad = true
-        // requestPoolManager.executeTask()
-      }
-      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
+      const studyIndex = params.idx.split('|')[0]
+      const seriesIndex = params.idx.split('|')[1]
+      var series = !params.isRelation ? this.studyList[studyIndex].SeriesList[seriesIndex] : null
+      if (!series) return
+      var prefetchInstanceCount = series.prefetchInstanceCount
+      var instanceCount = series.instanceCount
+      if (series.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
+        }
+        series.prefetchInstanceCount = prefetchInstanceCount
+        if (percentComplete >= 100) {
+          series.imageloadedArr.push(imageId)
         }
-        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) {
-        ++this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount
-        this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.push(imageId)
-
-        if (this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount >= this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount) {
-          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
+      if (prefetchInstanceCount >= instanceCount * 100) {
+        series.prefetchInstanceCount = instanceCount * 100
+        // 设置当前序列状态为已下载完成
+        series.loadStatus = true
+        if (!this.isFromCRCUpload) {
+          this.loadAllImages()
         }
       }
     }
@@ -694,16 +847,16 @@ export default {
     padding: 5px;
     /* height: 95%; */
     height: 99%;
-    overflow: hidden;
-    text-overflow: clip;
-    white-space: nowrap;
+    /* overflow: hidden;
+    text-overflow: clip; */
+    /* white-space: nowrap; */
 }
 .viewerContainer .viewerContentWrapper>div {
     display: inline-block;
     white-space: normal;
 }
 .viewerContainer .viewerLeftSidePanel {
-    width: 215px;
+    width: 220px;
     background-color: #323232;
     box-sizing: border-box;
     margin: 0;
@@ -740,7 +893,7 @@ export default {
 }
 .viewerContainer .viewerLeftSidePanel .viewernavigatorwrapper {
     display: flex;
-    width: 200px;
+    width: 220px;
     /* height: 84px; */
     padding: 1px 2px 1px 2px;
     margin: 2px 0 1px 1px;
@@ -813,6 +966,29 @@ export default {
   height: 40px;
   line-height: 20px;
 }
+.instance_frame_wrapper{
+  min-width: 120px;
+  background-color: #2c2c2c;
+  border: 1px solid #2c2c2c;
+  padding: 5px;
+}
+.frame_content{
+  height: 50px;
+  padding: 5px;
+  display: flex;
+  justify-content: flex-start;
+  color: #ddd;
+  font-size: 12px;
+  border: 1px solid #404040;
+}
+.frame_content:hover {
+  /* font-weight: bold; */
+  /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */
+  cursor: pointer;
+  /* color: #428bca; */
+  border-color: #213a54 !important;
+  background-color: #213a54;
+}
 
 /* .viewerRightSidePanel {
     width: 300px;

src/views/dictionary/attachment/components/ExportTemplate/TemplateForm.vue

@@ -3,7 +3,7 @@
     ref="sysTemplateFrom"
     v-loading="loading"
     :model="form"
-    label-width="90px"
+    label-width="140px"
     size="small"
     :rules="rules"
     class="upload-temporary-file"
@@ -12,10 +12,13 @@
       <el-form-item label="Code" prop="Code">
         <el-input v-model="form.Code" />
       </el-form-item>
-      <el-form-item label="业务场景: " prop="BusinessScenarioEnum">
+      <el-form-item
+        :label="$t('dictionary:attachment:export:form:business')"
+        prop="BusinessScenarioEnum"
+      >
         <el-select
           v-model="form.BusinessScenarioEnum"
-          style="width:100%;"
+          style="width: 100%"
           size="small"
           filterable
         >
@@ -27,7 +30,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="文件: ">
+      <el-form-item :label="$t('dictionary:attachment:export:form:file')">
         <div class="upload-container">
           <el-upload
             class="upload-demo"
@@ -43,84 +46,123 @@
             :on-exceed="handleExceed"
             :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum"
           >
-            <el-button size="small" type="primary" :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum" :loading="btnLoading">Select</el-button>
-            <span
-              slot="tip"
-              style="margin-left:10px;"
-              class="el-upload__tip"
+            <el-button
+              size="small"
+              type="primary"
+              :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum"
+              :loading="btnLoading"
+              >Select</el-button
             >
+            <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
               (must be in xlsx/xls/doc/docx format)
             </span>
           </el-upload>
         </div>
       </el-form-item>
-      <el-form-item label="文件名" prop="Name">
+      <el-form-item
+        :label="$t('dictionary:attachment:export:form:name')"
+        prop="Name"
+      >
         <el-input v-model="form.Name" />
       </el-form-item>
-      <el-form-item v-if="form.Id !== ''" label="是否废除: ">
+      <el-form-item
+        :label="$t('dictionary:attachment:export:form:nameCN')"
+        prop="NameCN"
+      >
+        <el-input v-model="form.NameCN" />
+      </el-form-item>
+      <el-form-item
+        v-if="form.Id !== ''"
+        :label="$t('dictionary:attachment:export:form:isDeleted')"
+      >
         <el-radio-group v-model="form.IsDeleted">
           <el-radio :label="true">是</el-radio>
           <el-radio :label="false">否</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="描述">
+      <el-form-item
+        :label="$t('dictionary:attachment:export:form:description')"
+      >
         <el-input
           v-model="form.Description"
           type="textarea"
-          :autosize="{ minRows: 2, maxRows: 4}"
-          placeholder="请输入内容"
+          :autosize="{ minRows: 2, maxRows: 4 }"
+          placeholder=""
         />
       </el-form-item>
     </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-      <el-form-item style="text-align:right;">
-        <el-button size="small" type="primary" :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum" :loading="saveBtnLoading" @click="handleSave">Save</el-button>
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+      <el-form-item style="text-align: right">
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum"
+          :loading="saveBtnLoading"
+          @click="handleSave"
+          >{{ $t("common:button:save") }}</el-button
+        >
       </el-form-item>
     </div>
   </el-form>
 </template>
 <script>
-import { addOrUpdateCommonDocument, uploadCommonDoc, Upload } from '@/api/dictionary'
-import { getBasicDataSelects } from '@/api/dictionary/dictionary'
+import {
+  addOrUpdateCommonDocument,
+  uploadCommonDoc,
+  Upload,
+} from "@/api/dictionary";
+import { getBasicDataSelects } from "@/api/dictionary/dictionary";
 export default {
-  name: 'TemplateForm',
+  name: "TemplateForm",
   props: {
     data: {
       type: Object,
-      default() { return {} }
-    }
+      default() {
+        return {};
+      },
+    },
   },
 
   data() {
     return {
       form: {
-        Id: '',
-        Code: '',
+        Id: "",
+        Code: "",
         FileTypeEnum: null,
         BusinessScenarioEnum: null,
-        Name: '',
-        Path: '',
-        Description: '',
-        IsDeleted: false
+        Name: "",
+        NameCN: "",
+        Path: "",
+        Description: "",
+        IsDeleted: false,
       },
       rules: {
-        Code: [{ required: true, message: 'Please specify', trigger: ['blur'] }],
-        Name: [{ required: true, message: 'Please specify', trigger: ['blur'] }],
-        BusinessScenarioEnum: [{ required: true, message: 'Please select', trigger: ['blur'] }]
+        Code: [
+          { required: true, message: "Please specify", trigger: ["blur"] },
+        ],
+        Name: [
+          { required: true, message: "Please specify", trigger: ["blur"] },
+        ],
+        NameCN: [
+          { required: true, message: "Please specify", trigger: ["blur"] },
+        ],
+        BusinessScenarioEnum: [
+          { required: true, message: "Please select", trigger: ["blur"] },
+        ],
       },
       fileList: [],
       btnLoading: false,
       saveBtnLoading: false,
       loading: false,
-      dictionaryList: {}
-    }
+      dictionaryList: {},
+    };
   },
   mounted() {
-    this.initForm()
+    this.initForm();
   },
   methods: {
     async initForm() {
-      await this.getDicData()
+      await this.getDicData();
       if (Object.keys(this.data).length > 0) {
         if (this.data.Path) {
           this.fileList = [
@@ -128,97 +170,111 @@ export default {
               name: this.data.Name,
               path: this.data.Path,
               url: this.data.Path,
-              type: this.data.Type
-            }
-          ]
+              type: this.data.Type,
+            },
+          ];
         }
         for (const k in this.form) {
           if (this.data.hasOwnProperty(k)) {
-            this.form[k] = this.data[k]
+            this.form[k] = this.data[k];
           }
         }
       }
     },
     // 获取文件类型下拉框
     getDicData() {
-      this.loading = true
-      getBasicDataSelects(['Common_File_ModuleType', 'Common_File_Type']).then(res => {
-        this.dictionaryList = { ...res.Result }
-        this.loading = false
-      }).catch(() => {
-        this.loading = false
-      })
+      this.loading = true;
+      getBasicDataSelects(["Common_File_ModuleType", "Common_File_Type"])
+        .then((res) => {
+          this.dictionaryList = { ...res.Result };
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     beforeUpload(file) {
       // 检测文件类型是否符合要求
       if (this.checkFileSuffix(file.name)) {
-        this.fileList = []
-        return true
+        this.fileList = [];
+        return true;
       } else {
-        this.$alert('必须是word/excel格式')
-
-        return false
+        // this.$alert("必须是word/excel格式");
+        this.$alert(this.$t("dictionary:attachment:export:alert:formatFile"));
+        return false;
       }
     },
     async handleUploadFile(param) {
-      this.loading = true
-      const formData = new FormData()
-      formData.append('file', param.file)
-      this.form.FileName = param.file.name
-      Upload(formData, 1).then(res => {
-        this.fileList.push({ name: param.file.name, path: res.Result.FilePath, fullPath: res.Result.FullFilePath, url: res.Result.FilePath })
-        this.form.Path = res.Result.FilePath
-        this.form.Name = param.file.name
-        this.loading = false
-        this.btnLoading = false
-      })
+      this.loading = true;
+      const formData = new FormData();
+      formData.append("file", param.file);
+      this.form.FileName = param.file.name;
+      Upload(formData, 1).then((res) => {
+        this.fileList.push({
+          name: param.file.name,
+          path: res.Result.FilePath,
+          fullPath: res.Result.FullFilePath,
+          url: res.Result.FilePath,
+        });
+        this.form.Path = res.Result.FilePath;
+        this.form.NameCN = param.file.name;
+        this.loading = false;
+        this.btnLoading = false;
+      });
     },
     handleSave() {
-      this.$refs.sysTemplateFrom.validate(valid => {
-        if (!valid) return
+      this.$refs.sysTemplateFrom.validate((valid) => {
+        if (!valid) return;
         if (!this.form.Name) {
-          this.$alert('Please select file.')
-          return
+          this.$alert("Please select file.");
+          return;
         }
-        this.saveBtnLoading = true
-        addOrUpdateCommonDocument(this.form).then(res => {
-          this.saveBtnLoading = false
-          this.$emit('closeDialog')
-          this.$emit('getList')
-          this.$message.success('Uploaded successfully')
-        }).catch(() => {
-          this.saveBtnLoading = false
-        })
-      })
+        this.saveBtnLoading = true;
+        addOrUpdateCommonDocument(this.form)
+          .then((res) => {
+            this.saveBtnLoading = false;
+            this.$emit("closeDialog");
+            this.$emit("getList");
+            this.$message.success(
+              this.$t("trials:uploadMonitor:table:uploadStatus")
+            );
+          })
+          .catch(() => {
+            this.saveBtnLoading = false;
+          });
+      });
     },
     handleRemoveFile() {
-      this.fileList = []
-      this.form.Path = ''
-      this.form.Name = ''
+      this.fileList = [];
+      this.form.Path = "";
+      this.form.NameCN = "";
+      this.form.Name = "";
     },
     handlePreview(file) {
       if (file.fullPath) {
-        window.open(file.fullPath, '_blank')
+        window.open(file.fullPath, "_blank");
       }
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`Upload is currently limited to 1 file`)
+      this.$message.warning(`Upload is currently limited to 1 file`);
     },
     checkFileSuffix(fileName) {
-      var typeArr = ['xls', 'xlsx', 'doc', 'docx']
-      var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
+      var typeArr = ["xls", "xlsx", "doc", "docx"];
+      var extendName = fileName
+        .substring(fileName.lastIndexOf(".") + 1)
+        .toLocaleLowerCase();
       if (typeArr.indexOf(extendName) !== -1) {
-        return true
+        return true;
       } else {
-        return false
+        return false;
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-.upload-temporary-file{
+.upload-temporary-file {
   .upload-container .el-upload--text {
     border: none;
     width: 80px;
@@ -231,8 +287,8 @@ export default {
     color: #428bca;
     font-size: 13px;
   }
-  .account_item_clear{
-    .el-tag__close{
+  .account_item_clear {
+    .el-tag__close {
       display: none !important;
     }
   }

src/views/dictionary/attachment/components/ExportTemplate/index.vue

@@ -2,10 +2,12 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true" size="small">
-        <el-form-item label="业务场景">
+        <el-form-item
+          :label="$t('dictionary:attachment:export:search:business')"
+        >
           <el-select
             v-model="searchData.BusinessScenarioEnum"
-            style="width:150px;"
+            style="width: 150px"
           >
             <el-option
               v-for="item of $d.Common_File_BusinessScenario"
@@ -13,41 +15,42 @@
               :label="item.label"
               :value="item.value"
             />
-
           </el-select>
         </el-form-item>
-        <el-form-item label="文件名称">
-          <el-input
-            v-model="searchData.Name"
-            style="width:130px;"
-            clearable
-          />
+        <el-form-item
+          :label="$t('dictionary:attachment:export:search:fileName')"
+        >
+          <el-input v-model="searchData.Name" style="width: 130px" clearable />
         </el-form-item>
 
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t('common:button:search') }}
+            {{ $t("common:button:search") }}
           </el-button>
           <!-- 重置 -->
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-            {{ $t('common:button:reset') }}
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t("common:button:reset") }}
           </el-button>
         </el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          style="float: right"
+          size="small"
+          @click="handleAdd"
+        >
+          {{ $t("common:button:new") }}
+        </el-button>
       </el-form>
-      <el-button
-        type="primary"
-        icon="el-icon-plus"
-        style="margin-left:auto;"
-        size="small"
-        @click="handleAdd"
-      >
-        {{ $t('common:button:new') }}
-      </el-button>
     </template>
     <template slot="main-container">
       <el-table
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
         v-loading="loading"
         :data="list"
         stripe
@@ -64,70 +67,81 @@
 
         <el-table-column
           prop="BusinessScenarioEnum"
-          label="业务场景"
+          :label="$t('dictionary:attachment:export:table:business')"
           show-overflow-tooltip
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ $fd('Common_File_BusinessScenario',scope.row.BusinessScenarioEnum) }}
+            {{
+              $fd(
+                "Common_File_BusinessScenario",
+                scope.row.BusinessScenarioEnum
+              )
+            }}
           </template>
-
         </el-table-column>
 
         <el-table-column
           prop="Name"
-          label="文件名称"
+          :label="$t('dictionary:attachment:export:table:name')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <el-table-column
+          prop="NameCN"
+          :label="$t('dictionary:attachment:export:table:nameCN')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="Description"
-          label="描述"
+          :label="$t('dictionary:attachment:export:table:description')"
           show-overflow-tooltip
         />
         <el-table-column
           prop="IsDeleted"
-          label="是否废除"
+          :label="$t('dictionary:attachment:export:table:isDeleted')"
           show-overflow-tooltip
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsDeleted" type="danger">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag>
-            <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag>
+            <el-tag v-if="scope.row.IsDeleted" type="danger">{{
+              $fd("YesOrNo", scope.row.IsDeleted)
+            }}</el-tag>
+            <el-tag v-else type="primary">{{
+              $fd("YesOrNo", scope.row.IsDeleted)
+            }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column
           prop="UpdateTime"
-          label="更新时间"
+          :label="$t('dictionary:attachment:export:table:updateTime')"
           show-overflow-tooltip
           sortable="custom"
         />
 
-        <el-table-column label="Action">
+        <el-table-column :label="$t('common:action:action')">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              @click="handleDownload(scope.row)"
-            >
-              下载
+            <el-button type="text" @click="handleDownload(scope.row)">
+              {{ $t("common:button:download") }}
             </el-button>
-            <el-button
-              type="text"
-              @click="handleEdit(scope.row)"
-            >
-              编辑
+            <el-button type="text" @click="handleEdit(scope.row)">
+              {{ $t("common:button:edit") }}
             </el-button>
-            <el-button
-              type="text"
-              @click="handleDelete(scope.row)"
-            >
-              删除
+            <el-button type="text" @click="handleDelete(scope.row)">
+              {{ $t("common:button:delete") }}
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
 
       <!-- 新增/编辑 -->
       <el-dialog
@@ -138,28 +152,36 @@
         width="600px"
         custom-class="base-dialog-wrapper"
       >
-        <TemplateForm :data="currentRow" @closeDialog="closeDialog" @getList="getList" />
+        <TemplateForm
+          :data="currentRow"
+          @closeDialog="closeDialog"
+          @getList="getList"
+        />
       </el-dialog>
     </template>
   </BaseContainer>
 </template>
 <script>
-import { getCommonDocumentList, DownloadCommonDoc, deleteCommonDocument } from '@/api/dictionary'
-import BaseContainer from '@/components/BaseContainer'
-import Pagination from '@/components/Pagination'
-import TemplateForm from './TemplateForm'
-const FileTypeEnum = 2
+import {
+  getCommonDocumentList,
+  DownloadCommonDoc,
+  deleteCommonDocument,
+} from "@/api/dictionary";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
+import TemplateForm from "./TemplateForm";
+const FileTypeEnum = 2;
 const searchDataDefault = () => {
   return {
     FileTypeEnum: FileTypeEnum,
     BusinessScenarioEnum: null,
-    Name: '',
+    Name: "",
     PageIndex: 1,
-    PageSize: 20
-  }
-}
+    PageSize: 20,
+  };
+};
 export default {
-  name: 'ExportTemplate',
+  name: "ExportTemplate",
   components: { BaseContainer, Pagination, TemplateForm },
   data() {
     return {
@@ -167,73 +189,86 @@ export default {
       list: [],
       total: 0,
       currentRow: {},
-      editDialog: { title: '', visible: false },
-      loading: false
-    }
+      editDialog: { title: "", visible: false },
+      loading: false,
+    };
   },
   mounted() {
-    this.getList()
+    this.getList();
   },
   methods: {
     handleDelete(row) {
-      this.$confirm('确定删除该模版？').then(() => {
+      this.$confirm(
+        this.$t("dictionary:attachment:export:confirm:delete")
+      ).then(() => {
         deleteCommonDocument(row.Id).then(() => {
-          this.$message.success('删除成功')
-          this.getList()
-        })
-      })
+          this.$message.success(this.$t("common:message:deletedSuccessfully"));
+          this.getList();
+        });
+      });
     },
     getList() {
-      this.loading = true
-      getCommonDocumentList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => {
-        this.loading = false
-      })
+      this.loading = true;
+      getCommonDocumentList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 新增
     handleAdd() {
-      this.editDialog.title = 'Add'
-      this.currentRow = { FileTypeEnum: FileTypeEnum }
-      this.editDialog.visible = true
+      this.editDialog.title = "Add";
+      this.currentRow = { FileTypeEnum: FileTypeEnum };
+      this.editDialog.visible = true;
     },
     // 下载
     handleDownload(row) {
-      this.loading = true
-      DownloadCommonDoc(row.Code).then(data => {
-        this.loading = false
-      }).catch(() => { this.loading = false })
+      this.loading = true;
+      DownloadCommonDoc(row.Code)
+        .then((data) => {
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 编辑
     handleEdit(row) {
-      this.editDialog.title = 'Edit'
-      this.currentRow = { ...row }
-      this.editDialog.visible = true
+      this.editDialog.title = "Edit";
+      this.currentRow = { ...row };
+      this.editDialog.visible = true;
     },
     handleSearch() {
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.PageIndex = 1;
+      this.getList();
     },
     handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
     },
     closeDialog() {
-      this.editDialog.visible = false
+      this.editDialog.visible = false;
     },
     // 排序
     handleSortChange(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
-    }
-  }
-}
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+  },
+};
 </script>
+<style lang="scss" scoped>
+::v-deep .search{
+  display: block;
+}
+</style>

src/views/dictionary/attachment/components/UploadTemplate/TemplateForm.vue

@@ -3,7 +3,7 @@
     ref="sysTemplateFrom"
     v-loading="loading"
     :model="form"
-    label-width="90px"
+    label-width="140px"
     size="small"
     :rules="rules"
     class="upload-temporary-file"
@@ -15,7 +15,7 @@
       <el-form-item label="业务场景: " prop="BusinessScenarioEnum">
         <el-select
           v-model="form.BusinessScenarioEnum"
-          style="width:100%;"
+          style="width: 100%"
           size="small"
           filterable
         >
@@ -44,12 +44,14 @@
             :on-exceed="handleExceed"
             :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum"
           >
-            <el-button size="small" type="primary" :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum" :loading="btnLoading">Select</el-button>
-            <span
-              slot="tip"
-              style="margin-left:10px;"
-              class="el-upload__tip"
+            <el-button
+              size="small"
+              type="primary"
+              :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum"
+              :loading="btnLoading"
+              >Select</el-button
             >
+            <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
               (must be in xlsx/xls/doc/docx format)
             </span>
           </el-upload>
@@ -58,37 +60,61 @@
       <el-form-item label="文件名" prop="Name">
         <el-input v-model="form.Name" />
       </el-form-item>
+      <el-form-item
+        :label="$t('dictionary:attachment:export:form:nameCN')"
+        prop="NameCN"
+      >
+        <el-input v-model="form.NameCN" />
+      </el-form-item>
       <el-form-item v-if="form.Id !== ''" label="是否废除: ">
         <el-radio-group v-model="form.IsDeleted">
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{item.label}}</el-radio>
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :label="item.value"
+            :key="item.id"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
       <el-form-item label="描述">
         <el-input
           v-model="form.Description"
           type="textarea"
-          :autosize="{ minRows: 2, maxRows: 4}"
+          :autosize="{ minRows: 2, maxRows: 4 }"
           placeholder="请输入内容"
         />
       </el-form-item>
     </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-      <el-form-item style="text-align:right;">
-        <el-button size="small" type="primary" :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum" :loading="saveBtnLoading" @click="handleSave">Save</el-button>
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+      <el-form-item style="text-align: right">
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum"
+          :loading="saveBtnLoading"
+          @click="handleSave"
+          >Save</el-button
+        >
       </el-form-item>
     </div>
   </el-form>
 </template>
 <script>
-import { addOrUpdateCommonDocument, uploadCommonDoc, Upload } from '@/api/dictionary'
+import {
+  addOrUpdateCommonDocument,
+  uploadCommonDoc,
+  Upload,
+} from '@/api/dictionary'
 import { getBasicDataSelects } from '@/api/dictionary/dictionary'
 export default {
   name: 'TemplateForm',
   props: {
     data: {
       type: Object,
-      default() { return {} }
-    }
+      default() {
+        return {}
+      },
+    },
   },
 
   data() {
@@ -99,20 +125,30 @@ export default {
         FileTypeEnum: null,
         BusinessScenarioEnum: null,
         Name: '',
+        NameCN: '',
         Path: '',
         Description: '',
-        IsDeleted: false
+        IsDeleted: false,
       },
       rules: {
-        Code: [{ required: true, message: 'Please specify', trigger: ['blur'] }],
-        Name: [{ required: true, message: 'Please specify', trigger: ['blur'] }],
-        BusinessScenarioEnum: [{ required: true, message: 'Please select', trigger: ['blur'] }]
+        Code: [
+          { required: true, message: 'Please specify', trigger: ['blur'] },
+        ],
+        Name: [
+          { required: true, message: 'Please specify', trigger: ['blur'] },
+        ],
+        NameCN: [
+          { required: true, message: 'Please specify', trigger: ['blur'] },
+        ],
+        BusinessScenarioEnum: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
       },
       fileList: [],
       btnLoading: false,
       saveBtnLoading: false,
       loading: false,
-      dictionaryList: {}
+      dictionaryList: {},
     }
   },
   mounted() {
@@ -128,8 +164,8 @@ export default {
               name: this.data.Name,
               path: this.data.Path,
               url: this.data.Path,
-              type: this.data.Type
-            }
+              type: this.data.Type,
+            },
           ]
         }
         for (const k in this.form) {
@@ -142,12 +178,14 @@ export default {
     // 获取文件类型下拉框
     getDicData() {
       this.loading = true
-      getBasicDataSelects(['Common_File_ModuleType', 'Common_File_Type']).then(res => {
-        this.dictionaryList = { ...res.Result }
-        this.loading = false
-      }).catch(() => {
-        this.loading = false
-      })
+      getBasicDataSelects(['Common_File_ModuleType', 'Common_File_Type'])
+        .then((res) => {
+          this.dictionaryList = { ...res.Result }
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     beforeUpload(file) {
       // 检测文件类型是否符合要求
@@ -165,35 +203,43 @@ export default {
       const formData = new FormData()
       formData.append('file', param.file)
       this.form.FileName = param.file.name
-      Upload(formData, 1).then(res => {
-        this.fileList.push({ name: param.file.name, path: res.Result.FilePath, fullPath: res.Result.FullFilePath, url: res.Result.FilePath })
+      Upload(formData, 1).then((res) => {
+        this.fileList.push({
+          name: param.file.name,
+          path: res.Result.FilePath,
+          fullPath: res.Result.FullFilePath,
+          url: res.Result.FilePath,
+        })
         this.form.Path = res.Result.FilePath
-        this.form.Name = param.file.name
+        this.form.NameCN = param.file.name
         this.loading = false
         this.btnLoading = false
       })
     },
     handleSave() {
-      this.$refs.sysTemplateFrom.validate(valid => {
+      this.$refs.sysTemplateFrom.validate((valid) => {
         if (!valid) return
         if (!this.form.Name) {
           this.$alert('Please select file.')
           return
         }
         this.saveBtnLoading = true
-        addOrUpdateCommonDocument(this.form).then(res => {
-          this.saveBtnLoading = false
-          this.$emit('closeDialog')
-          this.$emit('getList')
-          this.$message.success('Uploaded successfully')
-        }).catch(() => {
-          this.saveBtnLoading = false
-        })
+        addOrUpdateCommonDocument(this.form)
+          .then((res) => {
+            this.saveBtnLoading = false
+            this.$emit('closeDialog')
+            this.$emit('getList')
+            this.$message.success('Uploaded successfully')
+          })
+          .catch(() => {
+            this.saveBtnLoading = false
+          })
       })
     },
     handleRemoveFile() {
       this.fileList = []
       this.form.Path = ''
+      this.form.NameCN = ''
       this.form.Name = ''
     },
     handlePreview(file) {
@@ -206,19 +252,21 @@ export default {
     },
     checkFileSuffix(fileName) {
       var typeArr = ['xls', 'xlsx', 'doc', 'docx']
-      var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
+      var extendName = fileName
+        .substring(fileName.lastIndexOf('.') + 1)
+        .toLocaleLowerCase()
       if (typeArr.indexOf(extendName) !== -1) {
         return true
       } else {
         return false
       }
-    }
-  }
+    },
+  },
 }
 </script>
 
 <style lang="scss">
-.upload-temporary-file{
+.upload-temporary-file {
   .upload-container .el-upload--text {
     border: none;
     width: 80px;
@@ -231,8 +279,8 @@ export default {
     color: #428bca;
     font-size: 13px;
   }
-  .account_item_clear{
-    .el-tag__close{
+  .account_item_clear {
+    .el-tag__close {
       display: none !important;
     }
   }