样式调整

# Conflicts:
#	.env.usa
#	src/views/dicom-show/dicom-study.vue
#	src/views/login/index.vue
#	src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
#	src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
#	vue.config.js

.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'
+ENV = 'usa'
-NODE_ENV = 'production'
+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

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

package.json

@@ -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",
@@ -27,10 +28,10 @@
     "babel-eslint": "7.2.3",
     "copy-webpack-plugin": "^4.5.2",
     "core-js": "^3.8.3",
-    "cornerstone-core": "^2.3.0",
+    "cornerstone-core": "^2.6.1",
-    "cornerstone-math": "^0.1.8",
+    "cornerstone-math": "^0.1.10",
-    "cornerstone-tools": "^6.0.8",
+    "cornerstone-tools": "^6.0.10",
-    "cornerstone-wado-image-loader": "^3.1.2",
+    "cornerstone-wado-image-loader": "^4.13.2",
     "dcmjs": "^0.29.8",
     "dicom-parser": "^1.8.9",
     "dicomedit": "^0.1.0",
@@ -50,9 +51,11 @@
     "path-to-regexp": "2.4.0",
     "pdfobject": "^2.2.8",
     "popper.js": "^1.16.1",
+    "qrcodejs2": "0.0.2",
     "sass-loader": "^8.0.0",
     "screenfull": "^4.2.0",
     "sortablejs": "^1.15.0",
+    "streamsaver": "^2.0.6",
     "v-viewer": "^1.6.4",
     "vcrontab": "^0.3.5",
     "vue": "^2.6.11",

src/App.vue

@@ -1,169 +1,236 @@
 <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-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
+    <el-drawer title="国际化" :visible.sync="drawer" direction="rtl" size="80%">
-      title="国际化"
-      :visible.sync="drawer"
-      direction="rtl"
-      size="80%">
       <div style="width: 320px">
-        <el-form
+        <el-form label-width="100px" @submit.native.prevent size="small">
-          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%">
+        style="width: 100%"
-        <el-table-column
+      >
-          prop="Code"
+        <el-table-column prop="Code" label="标签" width="300">
-          label="标签"
-          width="300">
         </el-table-column>
-<!--        <el-table-column-->
+        <!--        <el-table-column-->
-<!--          prop="Description"-->
+        <!--          prop="Description"-->
-<!--          label="路由"-->
+        <!--          label="路由"-->
-<!--          show-overflow-tooltip-->
+        <!--          show-overflow-tooltip-->
-<!--          width="180">-->
+        <!--          width="180">-->
-<!--          <template slot-scope="scope">-->
+        <!--          <template slot-scope="scope">-->
-<!--            {{scope.row.Description}}-->
+        <!--            {{scope.row.Description}}-->
-<!--          </template>-->
+        <!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        </el-table-column>-->
-        <el-table-column
+        <el-table-column prop="Value" label="英文">
-          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
+        <el-table-column prop="ValueCN" label="中文">
-          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;">
+      <div style="text-align: right; padding-top: 10px; padding-right: 10px">
-        <el-button size="mini" @click="drawer = false">取消
+        <el-button size="mini" @click="drawer = false">取消 </el-button>
-        </el-button>
+        <el-button size="mini" type="primary" @click="handleSave"
-        <el-button size="mini" type="primary" @click="handleSave">保存</el-button>
+          >保存</el-button
+        >
       </div>
     </el-drawer>
   </div>
 </template>
 
 <script>
-import { batchAddOrUpdateFrontInternationalization, getFrontInternationalizationList } from '@/api/dictionary/dictionary'
+import {
+  batchAddOrUpdateFrontInternationalization,
+  getFrontInternationalizationList,
+} from "@/api/dictionary/dictionary";
+import { getTrialExtralConfig } from "@/api/trials";
 import Vue from "vue";
 import i18n from "./lang";
 export default {
-  name: 'App',
+  name: "App",
-  data () {
+  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
+        ) {
+          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(() => {
+      this.$confirm("确定修改当前页面国际化内容？").then(() => {
-        batchAddOrUpdateFrontInternationalization(this.tableData).then(async res => {
+        batchAddOrUpdateFrontInternationalization(this.tableData).then(
-          var zhMessages = {}, enMessages = {}
+          async (res) => {
-          var Internationalization = await getFrontInternationalizationList()
+            var zhMessages = {},
-          Vue.prototype.$tl = Internationalization.Result
+              enMessages = {};
-          this.tableData.forEach(v => {
+            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
+              zhMessages[v.Code] = v.ValueCN;
-            enMessages[v.Code] = v.Value
+              enMessages[v.Code] = v.Value;
-          })
+            });
-          i18n.mergeLocaleMessage('zh', zhMessages)
+            i18n.mergeLocaleMessage("zh", zhMessages);
-          i18n.mergeLocaleMessage('en', enMessages)
+            i18n.mergeLocaleMessage("en", enMessages);
-          this.drawer = false
+            this.drawer = false;
-          this.$message.success('国际化修改成功')
+            this.$message.success("国际化修改成功");
-        })
+          }
-      })
+        );
+      });
     },
     openI18n() {
-      this.tableData = []
+      this.tableData = [];
-      this.key = null
+      this.key = null;
-      this.drawer = true
+      this.drawer = true;
-      let arr = []
+      let arr = [];
-      let tableData = this.$tl.map(v => {
+      let tableData = this.$tl.map((v) => {
-        let a = {...v}
+        let a = { ...v };
         // if (!a.Description) {
         //   a.Description = this.$route.path
         // }
-        return a
+        return a;
-      })
+      });
-      tableData = tableData.filter(v => {
+      tableData = tableData.filter((v) => {
         // return  ~this.$path.indexOf(v.Description + '_' + v.Code)
-        return  ~this.$path.indexOf(v.Code)
+        return ~this.$path.indexOf(v.Code);
-      })
+      });
-      this.$path.forEach(v => {
+      this.$path.forEach((v) => {
-        let o = tableData.find(a => {
+        let o = tableData.find((a) => {
-          return a.Code === v
+          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{
+.my_multiple {
-  .el-input--medium .el-input__inner{
+  .el-input--medium .el-input__inner {
-    height: 36px!important;
+    height: 36px !important;
   }
-  .el-select__tags{
+  .el-select__tags {
     flex-wrap: nowrap;
     overflow: hidden;
     white-space: nowrap;
@@ -180,21 +247,32 @@ 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;
+}
 </style>

src/api/dictionary.js

@@ -1006,3 +1006,11 @@ export function deleteCommonDocument(commonDocumentId) {
     method: 'delete'
   })
 }
+//getTrialSiteList
+export function getTrialSiteList(params) {
+  return request({
+    url: `/site/getTrialSiteList`,
+    method: 'post',
+    data: 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/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,42 @@
+import request from '@/utils/request'
+// 下载打包影像
+export function requestPackageAndAnonymizImage(params) {
+    return request({
+        url: '/DownloadAndUpload/requestPackageAndAnonymizImage',
+        method: 'post',
+        params
+    })
+}
+// 获取影像上传列表
+export function getSubjectImageUploadList(params) {
+    return request({
+        url: '/DownloadAndUpload/getSubjectImageUploadList',
+        method: 'get',
+        params
+    })
+}
+// 预上传
+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
+    })
+}

src/api/reading.js

@@ -171,3 +171,19 @@ 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
+  })
+}

src/api/trials.js

@@ -1364,9 +1364,9 @@ export function getForwardList(param) {
   })
 }
 
-export function getNoneDicomStudyList(subjectVisitId, sudyId = '') {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false) {
   return request({
-    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}`,
+    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}`,
     method: 'get'
   })
 }
@@ -3667,3 +3667,19 @@ export function getDicomSeriesInfo(param) {
     data: param
   })
 }
+
+export function getTrialSiteSelectList(params) {
+  return request({
+    url: `/trialMaintenance/getTrialSiteSelectList`,
+    method: 'get',
+    params
+  })
+}
+// 获取项目配置
+export function getTrialExtralConfig(params) {
+  return request({
+    url: `/TrialConfig/getTrialExtralConfig`,
+    method: 'get',
+    params
+  })
+}

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

@@ -7,10 +7,11 @@ export function login(data) {
     data
   })
 }
-export function loginOut() {
+export function loginOut(params) {
   return request({
     url: `/User/loginOut`,
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 export function getAllDictionary() {
@@ -157,3 +158,30 @@ 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
+  })
+}

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-input
-        <!-- 下拉框 -->
+          v-if="item.type === 'Input'"
-        <el-select
-          v-if="item.type==='Select'"
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
-          :style="{width:item.width}"
+          :style="{ width: item.width }"
-
+          :readonly="item.readonly"
-          @change="item.change && item.change(that,searchData[item.prop])"
+        />
+        <!-- 下拉框 -->
+        <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}"
+          :style="{ width: item.width }"
-
+          @change="item.change && item.change(that, searchData[item.prop])"
-          @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-group
-          <el-radio v-for="ra in item.radios" :key="ra.value" :label="ra.value">{{ ra.label }}</el-radio>
+          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-group
-          <el-radio-button v-for="ra in item.radios" :key="ra.value" :label="ra.value">{{ ra.label }}</el-radio-button>
+          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-group
-          <el-checkbox v-for="ch in item.checkboxs" :key="ch.value" :label="ch.value">{{ ch.label }}</el-checkbox>
+          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="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          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{
+.base-search-form {
-    .el-form-item{
+  .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',
+          width: "100px",
-          fullscreen: false
+          fullscreen: false,
-        }
+        };
-      }
+      },
-    }
+    },
-  }
+  },
-}
+};
 </script>
 <style lang="scss">
-  .base-model-wrapper{
+.base-model-wrapper {
-    .el-dialog__header{
+  .el-dialog__header {
     padding: 10px;
-      .el-dialog__headerbtn{
+    .el-dialog__headerbtn {
       top: 10px;
       right: 10px;
     }
   }
-    .el-dialog__body{
+  .el-dialog__body {
-      padding:10px 10px 10px 10px;
+    padding: 10px 10px 10px 10px;
-      .base-modal-body{
+    .base-modal-body {
       min-height: 100px;
-        max-height:650px;
+      max-height: 650px;
       overflow-y: auto;
       padding: 10px;
       border: 1px solid #e0e0e0;
     }
   }
-    .el-dialog__footer{
+  .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;">
@@ -163,7 +162,9 @@ export default {
         isMove: false
       },
       mousePosition: { x: '', y: '', mo: '' },
-      markers: { top: '', right: '', bottom: '', left: '' }
+      markers: { top: '', right: '', bottom: '', left: '' },
+      orientationMarkers: [],
+      originalMarkers: []
     }
   },
 
@@ -186,6 +187,9 @@ export default {
     document.addEventListener('mouseup', () => {
       this.sliderMouseup()
     })
+    document.addEventListener('mousemove', (e) => {
+      this.sliderMousemove(e)
+    })
     this.canvas.addEventListener('cornerstonetoolsstackscroll', this.stackScrollCallback)
   },
 
@@ -205,15 +209,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
+            if (this.stack.imageIds.indexOf(image.imageId) !== -1) {
               this.onFirstImageLoaded(image)
+            }
           }).catch((error) => {
             this.loading = false
             if (error.error && error.error.message) {
@@ -356,6 +364,12 @@ export default {
       if (this.dicomInfo.thick) {
         this.dicomInfo.thick = this.dicomInfo.thick.toFixed(2)
       }
+      let 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 +417,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 +441,7 @@ export default {
       if (!markers) {
         return
       }
+      
       this.orientationMarkers = [oppositeColumn, row, column, oppositeRow]
       this.originalMarkers = [oppositeColumn, row, column, oppositeRow]
       this.setMarkers()
@@ -438,10 +454,10 @@ export default {
       }
     },
     onImageLoaded(e) {
-      var image = e.detail.image
+      // var image = e.detail.image
-      // var seriesIndex = -1
+      // // var seriesIndex = -1
-      var seriesUid = image.data.string('x0020000e')
+      // var seriesUid = image.data.string('x0020000e')
-      console.log(seriesUid)
+      // console.log(seriesUid)
     },
     getToolForElement(toolName) {
       var isExist = false
@@ -521,6 +537,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 +559,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 +636,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 +648,7 @@ export default {
     },
 
     toggleClipPlay() {
+      if(this.loading) return
       if (this.toolState.clipPlaying) {
         cornerstoneTools.stopClip(this.canvas)
         this.toolState.clipPlaying = false
@@ -675,8 +703,11 @@ export default {
     },
 
     resetRotate() {
+      if (this.originalMarkers.length > 0) {
         this.orientationMarkers = [...this.originalMarkers]
         this.setMarkers()
+      }
+      
       var viewport = cornerstone.getViewport(this.canvas)
       viewport.hflip = false
       viewport.vflip = false
@@ -685,6 +716,7 @@ export default {
     },
 
     setRotate(hflip, vflip, angle, type) {
+      if (this.orientationMarkers.length > 0) {
         var markers = [...this.orientationMarkers]
         if (type === 2) {
           // 垂直翻转
@@ -703,6 +735,7 @@ export default {
           this.orientationMarkers = [markers[3]].concat(markers.slice(0, 3))
         }
         this.setMarkers()
+      }
       var viewport = cornerstone.getViewport(this.canvas)
       if (hflip) viewport.hflip = !viewport.hflip
       if (vflip) viewport.vflip = !viewport.vflip
@@ -840,194 +873,197 @@ export default {
       synchronizer.remove(this.$refs.canvas)
       this.setAllToolsPassive()
     },
-    onContextmenu(event) {
+    onContextmenu(e) {
-      const colormapsList = cornerstone.colors.getColormapsList()
+      e.stopImmediatePropagation()
-      const colorItems = []
+      e.stopPropagation()
-      colorItems.push({
+      e.preventDefault()
-        label: '默认值',
+      // const colormapsList = cornerstone.colors.getColormapsList()
-        onClick: () => {
+      // const colorItems = []
-          this.setColormap()
+      // colorItems.push({
-        }
+      //   label: '默认值',
-      })
+      //   onClick: () => {
-      colormapsList.forEach(colormap => {
+      //     this.setColormap()
-        const item = {}
+      //   }
-        item.label = colormap.name
+      // })
-        item.onClick = () => {
+      // colormapsList.forEach(colormap => {
-          this.setColormap(colormap.id)
+      //   const item = {}
-        }
+      //   item.label = colormap.name
-        colorItems.push(item)
+      //   item.onClick = () => {
-      })
+      //     this.setColormap(colormap.id)
-      this.$contextmenu({
+      //   }
-        items: [
+      //   colorItems.push(item)
-          {
+      // })
-            label: '移动',
+      // this.$contextmenu({
-            divided: true,
+      //   items: [
-            onClick: () => {
+      //     {
-              this.setToolActive('Pan')
+      //       label: '移动',
-            }
+      //       divided: true,
-          },
+      //       onClick: () => {
-          {
+      //         this.setToolActive('Pan')
-            label: '缩放',
+      //       }
-            divided: true,
+      //     },
-            children: [
+      //     {
-              {
+      //       label: '缩放',
-                label: '自由缩放',
+      //       divided: true,
-                onClick: () => {
+      //       children: [
-                  this.setToolActive('Zoom')
+      //         {
-                }
+      //           label: '自由缩放',
-              },
+      //           onClick: () => {
-              {
+      //             this.setToolActive('Zoom')
-                label: '适应图像',
+      //           }
-                onClick: () => {
+      //         },
-                  this.fitToWindow()
+      //         {
-                }
+      //           label: '适应图像',
-              },
+      //           onClick: () => {
-              {
+      //             this.fitToWindow()
-                label: '适应窗口',
+      //           }
-                onClick: () => {
+      //         },
-                  this.fitToImage()
+      //         {
-                }
+      //           label: '适应窗口',
-              }
+      //           onClick: () => {
-            ]
+      //             this.fitToImage()
-          },
+      //           }
-          {
+      //         }
-            label: '透镜',
+      //       ]
-            divided: true,
+      //     },
-            onClick: () => {
+      //     {
-              this.setToolActive('Magnify')
+      //       label: '透镜',
-            }
+      //       divided: true,
-          },
+      //       onClick: () => {
-          {
+      //         this.setToolActive('Magnify')
-            label: '旋转',
+      //       }
-            divided: true,
+      //     },
-            children: [
+      //     {
-              {
+      //       label: '旋转',
-                label: '默认值',
+      //       divided: true,
-                onClick: () => {
+      //       children: [
-                  this.resetRotate()
+      //         {
-                }
+      //           label: '默认值',
-              },
+      //           onClick: () => {
-              {
+      //             this.resetRotate()
-                label: '自由旋转',
+      //           }
-                onClick: () => {
+      //         },
-                  this.setToolActive('Rotate')
+      //         {
-                }
+      //           label: '自由旋转',
-              },
+      //           onClick: () => {
-              {
+      //             this.setToolActive('Rotate')
-                label: '水平翻转',
+      //           }
-                onClick: () => {
+      //         },
-                  this.setRotate(true, false, 0)
+      //         {
-                }
+      //           label: '水平翻转',
-              },
+      //           onClick: () => {
-              {
+      //             this.setRotate(true, false, 0)
-                label: '垂直翻转',
+      //           }
-                onClick: () => {
+      //         },
-                  this.setRotate(false, true, 0)
+      //         {
-                }
+      //           label: '垂直翻转',
-              },
+      //           onClick: () => {
-              {
+      //             this.setRotate(false, true, 0)
-                label: '左转90度',
+      //           }
-                onClick: () => {
+      //         },
-                  this.setRotate(false, false, -90)
+      //         {
-                }
+      //           label: '左转90度',
-              },
+      //           onClick: () => {
-              {
+      //             this.setRotate(false, false, -90)
-                label: '右转90度',
+      //           }
-                onClick: () => {
+      //         },
-                  this.setRotate(false, false, 90)
+      //         {
-                }
+      //           label: '右转90度',
-              }
+      //           onClick: () => {
-            ]
+      //             this.setRotate(false, false, 90)
-          },
+      //           }
+      //         }
+      //       ]
+      //     },
 
-          {
+      //     {
-            label: '测量',
+      //       label: '测量',
-            divided: true,
+      //       divided: true,
-            minWidth: 0,
+      //       minWidth: 0,
-            children: [
+      //       children: [
-              {
+      //         {
-                label: '探针',
+      //           label: '探针',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('Probe')
+      //             this.setToolActive('Probe')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '长度测量',
+      //           label: '长度测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('Length')
+      //             this.setToolActive('Length')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '角度测量',
+      //           label: '角度测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('Angle')
+      //             this.setToolActive('Angle')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: 'Cobb测量',
+      //           label: 'Cobb测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('CobbAngle')
+      //             this.setToolActive('CobbAngle')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '椭圆测量',
+      //           label: '椭圆测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('EllipticalRoi')
+      //             this.setToolActive('EllipticalRoi')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '矩形测量',
+      //           label: '矩形测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('RectangleRoi')
+      //             this.setToolActive('RectangleRoi')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '多边形标记',
+      //           label: '多边形标记',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('FreehandRoi')
+      //             this.setToolActive('FreehandRoi')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '十字线',
+      //           label: '十字线',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('Bidirectional')
+      //             this.setToolActive('Bidirectional')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '文字标注',
+      //           label: '文字标注',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('ArrowAnnotate')
+      //             this.setToolActive('ArrowAnnotate')
-                }
+      //           }
-              }
+      //         }
-            ]
+      //       ]
-          },
+      //     },
-          {
+      //     {
-            label: '调窗',
+      //       label: '调窗',
-            divided: true,
+      //       divided: true,
-            onClick: () => {
+      //       onClick: () => {
-              this.setToolActive('Wwwc')
+      //         this.setToolActive('Wwwc')
-            }
+      //       }
-          },
+      //     },
-          {
+      //     {
-            label: '反色',
+      //       label: '反色',
-            divided: true,
+      //       divided: true,
-            onClick: () => {
+      //       onClick: () => {
-              this.toggleInvert()
+      //         this.toggleInvert()
-            }
+      //       }
-          },
+      //     },
-          {
+      //     {
-            label: '伪彩',
+      //       label: '伪彩',
-            children: colorItems
+      //       children: colorItems
-          }
+      //     }
-        ],
+      //   ],
-        event,
+      //   event,
-        // x: event.clientX,
+      //   // x: event.clientX,
-        // y: event.clientY,
+      //   // y: event.clientY,
-        customClass: 'class-a',
+      //   customClass: 'class-a',
-        zIndex: 3,
+      //   zIndex: 3,
-        minWidth: 100
+      //   minWidth: 100
-      })
+      // })
-      return false
+      // return false
     },
     getToolSate() {
       const toolROITypes = [

src/components/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>
       <!-- 测量标注 -->
@@ -247,7 +248,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 +262,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,20 +388,22 @@ 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)
       })
@@ -444,7 +448,7 @@ export default {
           this.colorList[this.currentDicomCanvasIndex] = ''
         }
         if (!this.wwwcList[this.currentDicomCanvasIndex]) {
-          this.wwwcList[this.currentDicomCanvasIndex] = '1'
+          this.wwwcList[this.currentDicomCanvasIndex] = '-1'
         }
       }
     },
@@ -565,6 +569,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 +887,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,26 @@
+import Vue from "vue";
+import MFACOMP from "./index.vue";
+
+const MFAConstructor = Vue.extend(MFACOMP);
+
+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();
+    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();
+    });
+    return instance.vm;
+}
+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,207 @@
+<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) {
+              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/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,766 @@
+<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";
+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() {
+      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;
+  },
+};
+</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,271 @@
+<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 { downloadImage } from "@/utils/uploadZip.js";
+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) {
+      try {
+        await downloadImage(
+          this.$route.query.trialId,
+          item.SourceSubjectVisitId
+        );
+      } catch (err) {
+        console.log(err);
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep .el-dialog {
+  .el-dialog__header {
+    padding-top: 15px;
+  }
+}
+.uploadImage {
+  background-color: #fff;
+}
+</style>

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

@@ -4,6 +4,7 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 
 import ElementUI, { MessageBox } from 'element-ui'
 import { getBasicDataAllSelect, getFrontInternationalizationList } from '@/api/dictionary/dictionary'
+import { sendMFAEmail } from "@/api/user.js";
 import { resetReadingRestTime } from '@/api/trials/reading'
 // import 'element-ui/lib/theme-chalk/index.css'
 import './assets/css/theme-blue/index.css' // 浅绿色主题
@@ -24,7 +25,6 @@ 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'
@@ -44,7 +44,6 @@ Viewer.setDefaults({
     'rotatable': true,
     'scalable': true,
     'transition': true,
-    'fullscreen': true,
     'keyboard': true,
     'url': 'data-source'
   }
@@ -57,14 +56,18 @@ 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 adaptive from '@/directive/adaptive/index'
 // 表格自适应指令
 Vue.use(adaptive)
 import dialogDrag from '@/directive/dialogDrag'
 // 窗口拖拽
 Vue.use(dialogDrag)
-if(!String.prototype.replaceAll){
+if (!String.prototype.replaceAll) {
-  String.prototype.replaceAll = function(str, newStr){
+  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)
+  // console.log(url,'url')
-  var value = url
+  // console.log(Vue.prototype.OSSclientConfig.viewEndpoint,'url')
-  var str = value.split("//"); //https://进行分割，
+  var value = url;
-  var index = str[1].indexOf("/")+1; //indexOf 获取第一个斜杠的索引,
+  let basePath = Vue.prototype.OSSclientConfig.viewEndpoint;
-  // console.log(str[1].substring(index)); //substring 截取，
+  if (Vue.prototype.OSSclientConfig.ObjectStoreUse === 'AliyunOSS') {
-  return '/' + str[1].substring(index)
+    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();
   }
@@ -158,7 +165,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 +186,24 @@ async function VueInit () {
     zhMessages[v.Code] = v.ValueCN
     enMessages[v.Code] = v.Value
   })
+  // 获取检查部位
+  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 +212,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 => {
           return {
             id: dict.Id,
-            label: lang==='zh' ? dict.ValueCN : dict.Value,
+            label: lang === 'zh' ? dict.ValueCN : dict.Value,
-            value: dict.DataTypeEnum === 3 ? eval(dict.Code) : dict.IsEnumInt ? parseInt(dict.Code): dict.Code,
+            value: dict.DataTypeEnum === 3 ? eval(dict.Code) : dict.IsEnumInt ? parseInt(dict.Code) : dict.Code,
             raw: Object.assign({}, dict),
             IsBaseLineUse: false,
             IsFollowVisitUse: false
@@ -202,35 +227,36 @@ 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 data[code].find(i => {
-      return d[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.$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 => {
             return {
               id: dict.raw.Id,
-              label: lang==='zh' ? dict.raw.ValueCN : dict.raw.Value,
+              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,
+              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 +264,7 @@ async function VueInit () {
           }) : []
           _vm.$set(dictInfo, code, dictList)
         }
-      } catch (e){
+      } catch (e) {
         console.error(e)
       }
       return dictInfo
@@ -274,14 +300,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'
+      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') {
+      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') {
         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',
         })
       }
@@ -334,23 +360,34 @@ async function VueInit () {
   /* eslint-disable */
   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'
+    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') {
+    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 === '/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`
+      // window.location.href = `/login`
-      })
+      if (_vm.$msgbox) {
-
+        _vm.$msgbox.close();
-      _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!',  {
+      }
+      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'
+      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') {
+      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')
         if (_vm.$route.path === '/login') {
@@ -366,25 +403,28 @@ async function VueInit () {
       isOpen = true
       zzSessionStorage.setItem('isLock', 'true')
       _vm.$msgbox({
-        title: lang === 'zh' ? '已锁定' : 'Locked',
+        title: _vm.$t("env:lock:msgBox:title"),
-        confirmButtonText: lang === 'zh' ? '解锁' : 'Unlock',
+        confirmButtonText: _vm.$t("env:lock:msgBox:confirmButtonText"),
         showClose: false,
         beforeClose: (action, instance, done) => {
           if (action === 'confirm') {
             if (!_vm.unlock.my_username) {
-              _vm.$alert(lang === 'zh' ? '请输入您的用户名解锁' : 'Please enter your user name to unlock.')
+              _vm.$alert(_vm.$t("env:lock:msgBox:iupUser"))
               return
             }
             if (!_vm.unlock.my_password) {
-              _vm.$alert(lang === 'zh' ? '请输入您的密码解锁' : 'Please enter the correct password to unlock.')
+              _vm.$alert(_vm.$t("env:lock:msgBox:inpPassword"))
               return
             }
             var my_username = zzSessionStorage.getItem('my_username')
             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.')
+              const closeLock = (_vm) => {
+                _vm.$message.success(_vm.$t("env:lock:msgBox:lockSuccess"))
                 _vm.unlock = {
                   my_username: null,
                   my_password: null
@@ -399,20 +439,38 @@ async function VueInit () {
                 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,7 +490,7 @@ async function VueInit () {
               })
             ]),
             h('el-form-item', {
-              props: {label: lang === 'zh' ? '密码' : 'Password'},
+              props: { label: _vm.$t("env:lock:msgBox:form:Password") },
             }, [
               h('input', {
                 props: {
@@ -457,7 +515,7 @@ async function VueInit () {
           ])
         ])
       })
-    } : () => {}, process.env.VUE_APP_LOCK_FOR_TIME)
+    } : () => { }, process.env.VUE_APP_LOCK_FOR_TIME)
 }
 VueInit()
 

src/permission.js

@@ -12,7 +12,7 @@ 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) => {
+router.beforeEach(async (to, from, next) => {
   NProgress.start()
   // 设置页面标题
   // document.title = getPageTitle(to.meta.title)
@@ -34,7 +34,7 @@ router.beforeEach(async(to, from, next) => {
       NProgress.done()
     } else {
       OSSclient()
-      const hasGetUserInfo = store.getters.name
+      const hasGetUserInfo = store.getters.userId
       if (hasGetUserInfo) {
         next()
       } else {
@@ -56,7 +56,7 @@ router.beforeEach(async(to, from, next) => {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录whiteList中，直接进入
-      if (to.path === '/readingDicoms' || to.path === '/noneDicomReading'){
+      if (to.path === '/readingDicoms' || to.path === '/noneDicomReading') {
         OSSclient()
       }
       next()

src/router/index.js

@@ -262,7 +262,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: [],
-    visitTaskList: sessionStorage.getItem('visitTaskList') ? JSON.parse(sessionStorage.getItem('visitTaskList')) : [],
+    // visitTaskList: sessionStorage.getItem('visitTaskList') ? JSON.parse(sessionStorage.getItem('visitTaskList')) : [],
     organList: [],
     seriesStack: [],
     activeHangingAgreement: hangingAgreement[0],
@@ -30,7 +30,8 @@ const getDefaultState = () => {
     activeSeries: {},
     lastCanvasTaskId: '',
     imageQuality: null,
-    imageQualityIssues: null
+    imageQualityIssues: null,
+    currentLoadIns: []
   }
 }
 function getQuestions(questions) {
@@ -139,6 +140,22 @@ function getQuestionAnswer(questions, questionMark, answers) {
     return ''
   }
 }
+// function getKeySeriesInfo(keyInstance, series) {
+//   const obj = {}
+//   const set = new Set()
+//   var instances = series.instanceList.concat(keyInstance).filter((item) => {
+//     if (set.has(item)) {
+//       return true
+//     } else {
+//       set.add(item)
+//       return false
+//     }
+//   })
+//   instances.map(item => {
+//     obj[item] = { seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex }
+//   })
+//   return obj
+// }
 
 const state = getDefaultState
 
@@ -166,7 +183,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 +195,7 @@ const actions = {
   },
   resetVisitTasks({ state }) {
     return new Promise(resolve => {
-      sessionStorage.setItem('visitTaskList', '')
+      // sessionStorage.setItem('visitTaskList', '')
       state.visitTaskList = []
       state.currentTaskId = ''
       state.activeSeries = {}
@@ -190,6 +207,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 +227,28 @@ const actions = {
           var seriesList = []
           study.SeriesList.forEach((series, index) => {
             const imageIds = []
-
+            const instanceList = []
-            series.InstancePathList.forEach((path) => {
+            // series.InstancePathList.forEach((path) => {
-              imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${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 +319,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 +335,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 +354,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 +372,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 +391,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 +408,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 +419,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 +431,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 +443,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 +455,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 +476,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 +503,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,10 +513,11 @@ 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)
+      // 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) {
@@ -495,10 +528,13 @@ const actions = {
             measureData.splice(idx, 1)
             console.log('移除标记成功', idx)
           }
+          if (obj.questionInfo.Id && state.currentReadingTaskState < 2) {
             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 +544,12 @@ const actions = {
             console.log('移除标记成功', i)
           }
         }
+        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 +567,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 +586,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 +618,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 +628,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 +641,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 +661,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 +671,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) {
+      // if (!obj.questionInfo) {
-        state.visitTaskList[index].MeasureData.push({
+      //   state.visitTaskList[index].MeasureData.push({
-          MeasureData: obj,
+      //     MeasureData: obj,
-          SeriesId: obj.seriesId,
+      //     SeriesId: obj.seriesId,
-          StudyId: obj.studyId,
+      //     StudyId: obj.studyId,
-          InstanceId: obj.instanceId,
+      //     InstanceId: obj.instanceId,
-          Id: obj.Id
+      //     Id: obj.Id
-        })
+      //   })
-        console.log('新增标记成功')
+      //   console.log('新增标记成功')
-        sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
+      //   resolve()
-        resolve()
+      // }
-      }
+      var idx = measureData.findIndex(item => item.MeasureData.data.remark === obj.measureData.data.remark)
-      var idx = measureData.findIndex(item => item.Id === obj.questionInfo.Id)
       if (idx > -1) {
-        for (const k in state.visitTaskList[index].MeasureData[idx]) {
+        // state.visitTaskList[index].MeasureData[idx].InstanceId = obj.instanceId
-          if (k !== 'Id' && obj.MeasureData.data[k]) {
+        state.visitTaskList[index].MeasureData[idx].MeasureData = obj.measureData
-            state.visitTaskList[index].MeasureData[idx][k] = obj.MeasureData.data[k]
+        // 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 +751,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 +764,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
+        var keyImages = []
-        // getReadingVisitStudyList
         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 +801,40 @@ const actions = {
             var seriesList = []
             study.SeriesList.forEach((series, seriesIndex) => {
               const imageIds = []
-              try {
+              const instanceList = []
-                // if (~window.location.href.indexOf('3c210000-3e2c-0016-4247-08dabf28e96b')) {
+              // try {
-                series.InstancePathList.forEach((path) => {
+              //   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}`)
-                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${path}`)
+              //   })
-                })
+              // } catch (e) {
-              } catch (e) {
+              //   console.log(e)
-                console.log(e)
+              // }
+              series.InstanceInfoList.forEach(instance => {
+                if (instance.NumberOfFrames && instance.NumberOfFrames > 1) {
+                  for (let i = 0; i < instance.NumberOfFrames; i++) {
+                    const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${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 +861,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 +870,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 +904,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 +924,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 +1051,12 @@ const actions = {
   },
   setLastCanvasTaskId({ state }, taskId) {
     return new Promise(resolve => {
+      var isReadingTaskViewInOrder = localStorage.getItem('isReadingTaskViewInOrder')
+      if (parseInt(isReadingTaskViewInOrder) === 2) {
+        if (!state.lastCanvasTaskId) state.lastCanvasTaskId = taskId
+      } else {
         state.lastCanvasTaskId = taskId
+      }
       resolve()
     })
   },
@@ -896,7 +1091,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 +1107,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,9 @@ const getDefaultState = () => {
     subjectQuery: null,
     visitPlanQuery: null,
     visitPointQuery: null,
-    studyListQuery: null
+    studyListQuery: null,
+    unlock: false,
+    config: {},
   }
 }
 
@@ -16,6 +18,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 +45,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,27 @@ 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)
           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 +114,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 +169,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('TotalNeedSignSystemDocCount'))
-    console.log( zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
+    console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
     zzSessionStorage.setItem('userName', user.name)
     zzSessionStorage.setItem('userId', user.id)
     zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
@@ -179,14 +187,16 @@ const actions = {
   },
   // user logout
   async logout({ commit, state }) {
-    try{
+    try {
-      await loginOut()
       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/utils/dcmUpload/anonymization.js

@@ -1,6 +1,6 @@
 import dicomParser from "dicom-parser";
 import dcmjs from './dcmjs'
-import {encoder} from "./encoder";
+import { encoder } from "./encoder";
 
 export const anonymization = function (file, config) {
   return new Promise(async (resolve, reject) => {
@@ -55,13 +55,20 @@ export const anonymization = function (file, config) {
           }
         }
         // console.log(dataset)
+        try {
           let newDicomFile = dataset.write()
           const bufferArray = new Uint8Array(newDicomFile)
           const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
-        resolve({blob, pixelDataElement})
+          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,12 +1,13 @@
 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 (name, file, config) {
   return new Promise(async resolve => {
     try {
       // let blob = await encoder(file, config)
-      // let blob = await fileToBlob(file)
+      let blob = await fileToBlob(file)
-      let blob = await anonymization(file, config)
+      if (config) {
+        blob = await anonymization(file, config)
+      }
       let res = await Vue.prototype.OSSclient.put(name, blob.blob)
       resolve({
         ...res,
@@ -18,6 +19,7 @@ export const dcmUpload =  async function(name, file, config){
 
 
     } catch (e) {
+      console.log(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/oss.js

@@ -2,10 +2,8 @@ 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')
+const { GetObjectStoreToken } = require('../api/user.js')
-import { getToken } from '@/utils/auth'
 
 Vue.prototype.OSSclientConfig = {
 }
@@ -20,6 +18,7 @@ function blobToBuffer(blob, fileName) {
 async function ossGenerateSTS() {
   let res = await GetObjectStoreToken()
   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':
@@ -40,7 +39,7 @@ async function ossGenerateSTS() {
               if (res && res.url) {
                 resolve({
                   name: objectName,
-                  url: Vue.prototype.OSSclientConfig.viewEndpoint + objectName
+                  url: res.url
                 })
               } else {
                 reject()
@@ -70,14 +69,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)
                     })
                   }
                 })
@@ -107,14 +106,15 @@ async function ossGenerateSTS() {
               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) {
+                aws.putObject(Vue.prototype.OSSclientConfig.bucketName, objectName, bufferStream, function (err, etag) {
                   if (err) {
                     console.log(err)
                     reject()
                   } else {
+                    console.log(objectName);
                     resolve({
                       name: objectName,
-                      url: 'http://www.abc.com' + objectName
+                      url: Vue.prototype.OSSclientConfig.viewEndpoint + decodeUtf8(objectName)
                     })
                   }
                 })
@@ -129,7 +129,15 @@ async function ossGenerateSTS() {
   }
   return
 }
-
+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 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

@@ -20,7 +20,7 @@ service.interceptors.request.use(
     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) {
       config.headers.Authorization = `Bearer ${store.getters.token}`
@@ -33,7 +33,7 @@ service.interceptors.request.use(
         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,13 +49,13 @@ 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) {
@@ -63,7 +63,7 @@ service.interceptors.response.use(
           type: 'warning',
           showCancelButton: false,
           callback: action => {
-            if(res.Code === 6) {
+            if (res.Code === 6) {
               window.close()
             }
           }
@@ -87,29 +87,29 @@ service.interceptors.response.use(
         })
       }
       switch (status) {
-        case 400: message = store.state.lang.language === 'en'? 'Request error' : '请求错误'; 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 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 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 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 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 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 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 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 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 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 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 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 !== ''){
+          if (message !== '') {
-            Message({
+            setTimer({
               message: message,
               type: 'warning',
               showClose: true
-            })
+            }, 'message')
           }
           store.dispatch('user/logout').then(() => {
             router.push(`/login`)
@@ -118,34 +118,52 @@ service.interceptors.response.use(
             this.$updateDictionary()
           })
         } else {
-          Message({
+          setTimer({
-            message: store.state.lang.language === 'en'? 'You are not authorized to access the interface' : '您无权访问接口',
+            message: store.state.lang.language === 'en' ? 'You are not authorized to access the interface' : '您无权访问接口',
             type: 'warning',
             showClose: true
-          })
+          }, 'message')
         }
       } else {
-        if(message !== '' && isConfirm){
+        if (message !== '') {
-          MessageBox.confirm(message, store.state.lang.language === 'en'? 'Warning' : '警告', {
+          setTimer([message, store.state.lang.language === 'en' ? 'Warning' : '警告', {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
-          })
+          }], 'confirm')
         }
       }
     }
-    if (!window.navigator.onLine && isConfirm) {
+    if (!window.navigator.onLine) {
-      MessageBox.confirm(store.state.lang.language === 'en'? 'Please check your network，and try again later！' : '请检查网络，稍后重试！', store.state.lang.language === 'en'? 'Warning' : '警告', {
+      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 => {}
+          callback: action => { }
-      })
+        }], "confirm"
-      isConfirm = false
+      )
     }
     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/uploadZip.js

@@ -0,0 +1,199 @@
+import JSZip from "jszip";
+import axios from "axios";
+import { saveAs } from "file-saver";
+import Vue from 'vue';
+import store from "@/store";
+import {
+    requestPackageAndAnonymizImage,
+} from "@/api/load.js";
+let flag = {};
+export const resetFlag = () => {
+    flag = {};
+    store.dispatch("trials/setUnLock", false);
+}
+export const downloadImage = async (id, id2, IsDicom = true) => {
+    if (flag[`${id2}_${IsDicom}`]) return Vue.prototype.$message.warning(Vue.prototype.$t('trials:upload:tip:uploading'));
+    flag[`${id2}_${IsDicom}`] = true
+    try {
+        let params = {
+            TrialId: id,
+            SubjectVisitId: id2,
+            IsDicom: IsDicom
+        }
+        store.dispatch("trials/setUnLock", true);
+        let res = await requestPackageAndAnonymizImage(params);
+        if (res.IsSuccess) {
+            if (!res.Result) {
+                flag[`${id2}_${IsDicom}`] = false;
+                Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not"))
+                return 1;
+            }
+            Vue.prototype.$message.success(Vue.prototype.$t("trials:upload:message:startUpload"));
+            let href = Vue.prototype.OSSclientConfig.basePath + res.Result;
+            download(href, res.OtherInfo.FileName, { id2, IsDicom })
+            return 2;
+            // let a = document.createElement("a");
+            // // let fileName =
+            // //     res.Result.split("/")[res.Result.split("/").length - 1];
+            // a.download = res.OtherInfo.FileName;
+            // a.href = href;
+            // a.click();
+            // URL.revokeObjectURL(href);
+            // let timer = setTimeout(() => {
+            //     a = null;
+            //     href = null;
+            //     timer = null;
+            // }, 500)
+            // return 2;
+        } else {
+            flag[`${id2}_${IsDicom}`] = false;
+            return false;
+        }
+    } catch (err) {
+        flag[`${id2}_${IsDicom}`] = false;
+        console.log(err);
+    }
+};
+const setfolder = async (item) => {
+    const zip = new JSZip(); // 创建实例对象
+    let patientIds = item.PatientList.map(i => i.PatientIdStr);
+    let zipName = `${item.SubjectCode}_${patientIds.join(',')}`;
+    let zipObj = {};
+    const promises = [];
+    for (let visit of item.VisitList) {
+        if (!zipObj[`${visit.VisitName}`]) {
+            zipObj[`${visit.VisitName}`] = zip.folder(visit.VisitName);
+        }
+        for (let study of visit.StudyList) {
+            let date = study.StudyTime.split(" ")[0];
+            for (let series of study.SeriesList) {
+                if (
+                    !zipObj[
+                    `${visit.VisitName}${series.Modality}`
+                    ]
+                ) {
+                    zipObj[
+                        `${visit.VisitName}${series.Modality}`
+                    ] = zipObj[`${visit.VisitName}`].folder(
+                        `${date}_${series.Modality}`
+                    );
+                }
+                for (let instance of series.InstancePathList) {
+                    let obj = {
+                        subjectCode: item.SubjectCode,
+                        visitName: visit.VisitName,
+                        date: study.StudyTime.split(" ")[0],
+                        modality: series.Modality,
+                        instancePath: instance.Path,
+                        dicomName: instance.Path.split("/Dicom/")[1],
+                    };
+                    const promise = handleBatchDown(
+                        obj,
+                        zipObj[
+                        `${visit.VisitName}${series.Modality}`
+                        ],
+                    );
+                    promises.push(promise);
+                }
+            }
+        }
+    }
+    // 生成 zip 文件
+    Promise.all(promises)
+        .then(() => {
+            // 生成zip 文件
+            zip
+                .generateAsync({
+                    type: "blob",
+                    compression: "DEFLATE", // STORE: 默认不压缩， DEFLATE：需要压缩
+                    compressionOptions: {
+                        level: 9, // 压缩等级 1~9   1 压缩速度最快， 9 最优压缩方式
+                    },
+                })
+                .then((res) => {
+                    saveAs(res, zipName + ".zip"); // 使用FileSaver.saveAs保存文件，文件名可自定义
+                    flag[`${id2}_${IsDicom}`] = false;
+                    zipObj = null;
+                });
+        })
+        .catch((reason) => { flag[`${id2}_${IsDicom}`] = false; });
+};
+const handleBatchDown = async (item, zip) => {
+    return new Promise((resolve) => {
+        getFileData(
+            Vue.prototype.OSSclientConfig.basePath + item.instancePath
+        ).then((res) => {
+            const fileName = item.dicomName + ".dcm";
+            zip.file(fileName, res.data, { binary: true });
+            resolve();
+        });
+    });
+};
+const getFileData = (fileUrl) => {
+    return new Promise((resolve, reject) => {
+        axios(fileUrl, {
+            method: "GET",
+            responseType: "blob", // 返回的数据会被强制转为blob类型 ，转换成arraybuffer 也行
+        })
+            .then((res) => {
+                resolve(res);
+            })
+            .catch((error) => {
+                reject(error);
+            });
+    });
+};
+export const fileDownload = (content, filename) => {
+    const eleLink = document.createElement("a");
+    eleLink.download = filename;
+    eleLink.style.display = "none";
+    const blob = new Blob([content]);
+    eleLink.href = URL.createObjectURL(blob);
+    document.body.appendChild(eleLink);
+    eleLink.click();
+    document.body.removeChild(eleLink);
+};
+let download = async (downloadUrl, downloadFileName, res) => {
+    const blob = await getBlob(downloadUrl);
+    flag[`${res.id2}_${res.IsDicom}`] = false;
+    store.dispatch("trials/setUnLock", false);
+    saveAsB(blob, downloadFileName);
+}
+
+let getBlob = (url) => {
+    return new Promise((resolve, reject) => {
+        const xhr = new XMLHttpRequest();
+
+        xhr.open('GET', url, true);
+        xhr.responseType = 'blob';
+        xhr.onload = () => {
+            if (xhr.status === 200) {
+                resolve(xhr.response);
+            } else {
+                reject(new Error(`Request failed with status ${xhr.status}`));
+            }
+        };
+        xhr.onerror = () => {
+            reject(new Error('Request failed'));
+        };
+
+        xhr.send();
+    });
+}
+
+let saveAsB = (blob, filename) => {
+    const link = document.createElement('a');
+    const body = document.body;
+
+    link.href = window.URL.createObjectURL(blob);
+    link.download = filename;
+
+    // hide the link
+    link.style.display = 'none';
+    body.appendChild(link);
+
+    link.click();
+    body.removeChild(link);
+
+    window.URL.revokeObjectURL(link.href);
+}

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

@@ -43,28 +43,55 @@
                           fit="fill"
                         >
                         <div class="viewernavitextwrapper">
-                          <div v-if="item.keySeries" style="padding: 1px;color:red">
+                          <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 style="padding: 1px;">
+                            <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 +110,8 @@
                           />
                         </div>
                       </div>
-                      <div v-if="item.prefetchInstanceCount>0 && item.prefetchInstanceCount<item.instanceCount">
+                      <div v-if="item.prefetchInstanceCount>0 && item.prefetchInstanceCount<item.instanceCount * 100">
-                        <el-progress :percentage="parseInt(((item.prefetchInstanceCount/item.instanceCount)*100).toFixed(2))" />
+                        <el-progress :percentage="parseInt((item.prefetchInstanceCount/item.instanceCount).toFixed(2))" />
                       </div>
 
                     </div>
@@ -120,7 +147,8 @@ import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
+const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
+cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
   components: {
     'dicom-viewer': dicomViewer
@@ -156,10 +184,12 @@ export default {
       showDelete: false,
       loading: false,
       imageList: [],
-      showSeriesList: []
+      showSeriesList: [],
+      currentLoadIns: []
     }
   },
   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
@@ -180,9 +210,18 @@ export default {
     } else if (this.type === 'Share') {
       this.loadStudy()
     }
+    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() {
@@ -204,16 +243,16 @@ export default {
         if (data.IsSuccess) {
           const { Result } = data
           var seriesList = []
-          Result.forEach(function(item) {
+          Result.forEach((item, index) => {
             const imageIds = []
-            // item.InstanceList.forEach(function(id) {
+            item.InstanceInfoList.forEach(i => {
-            //   imageIds.push(`wadouri:/api/instance/content/${id}`)
+              if (i.NumberOfFrames && i.NumberOfFrames > 1) {
-            // })
+                for (let j = 0; j < i.NumberOfFrames; j++) {
-            // item.InstanceList.forEach((id) => {
+                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&seriesIndex=${index}`)
-            //   imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
+                }
-            // })
+              } else {
-            item.InstancePathList.forEach((path) => {
+                imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&seriesIndex=${index}`)
-              imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${path}`)
+              }
             })
             var subjectVisitId = scope.$router.currentRoute.query.subjectVisitId
             var studyId = scope.$router.currentRoute.query.studyId
@@ -223,6 +262,7 @@ export default {
               subjectVisitId,
               studyId,
               imageIds: imageIds,
+              instanceInfoList: item.InstanceInfoList,
               seriesId: item.Id,
               seriesUid: item.SeriesInstanceUid,
               seriesNumber: item.SeriesNumber,
@@ -238,7 +278,8 @@ export default {
               keySeries: item.KeySeries,
               tpCode: scope.tpCode,
               loadStatus: false,
-              imageloadedArr: []
+              imageloadedArr: [],
+              isExistMutiFrames: item.IsExistMutiFrames
             })
           })
           scope.seriesList = seriesList
@@ -264,29 +305,34 @@ export default {
       getInstanceList(seriesId).then(res => {
         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 => {
           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
           } else {
-            imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}`)
+            imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&seriesIndex=0`)
           }
+          instanceInfoList.push({ Id: instance.Id, InstanceNumber: instance.InstanceNumber, NumberOfFrames: instance.NumberOfFrames, Path: instance.Path })
         })
         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,
@@ -295,7 +341,8 @@ export default {
           instanceCount: res.Result.length,
           prefetchInstanceCount: 0,
           loadStatus: false,
-          imageloadedArr: []
+          imageloadedArr: [],
+          isExistMutiFrames: isExistMutiFrames
         })
         this.seriesList = seriesList
         if (this.seriesList.length > 0) {
@@ -319,21 +366,37 @@ export default {
       this.$refs.dicomViewer.loadImageStack(this.seriesList[seriesIndex])
       if (!series.loadStatus) {
         requestPoolManager.changePriority(series.seriesId)
-        // var isAddToTakPool = false
+      }
-        // if (this.showSeriesList.includes(`${seriesIndex}`)) {
+    },
-        //   isAddToTakPool = true
+    showMultiFrames(series, seriesIndex, instanceInfo) {
-        // } else {
+      this.currentSeriesIndex = seriesIndex
-        //   this.showSeriesList.push(`${seriesIndex}`)
+      const imageIds = []
-        // }
+      if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
-        // if (!isAddToTakPool) {
+        for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
-        //   var priority = parseInt(new Date().getTime())
+          imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&seriesIndex=${seriesIndex}`)
-        //   series.isLoading = true
+        }
-        //   series.imageIds.map((imageId) => {
+      } else {
-        //     this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+        imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&seriesIndex=${seriesIndex}`)
-        //   })
+      }
-        // } else {
+      const seriesInfo = {
-        //   requestPoolManager.changePriority(series.seriesId)
+        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) {
+        requestPoolManager.changePriority(series.seriesId)
       }
     },
     initStudy() {
@@ -456,31 +519,44 @@ export default {
       }).catch(() => {})
     },
     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) => {
+      for (let i = 0; i < series.imageIds.length; i++) {
-        series.imageIds.forEach(imageId => {
+        const imageId = series.imageIds[i]
+        if (series.isExistMutiFrames) {
+          const params = this.getInstanceInfo(imageId)
+          if (params.frame && params.frame > 0) {
+            continue
+          }
+        }
         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: seriesIndex, priority: p })
-          this.imageList.push({ imageId: imageId, seriesId: series.seriesId, seriesIndex: index, priority: p })
+      }
-        })
-      })
       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 => {
+          requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority)
-            this.imageLoaded(image, res.data.string('x0020000e'))
-          })
         })
         requestPoolManager.sortTaskPool()
         this.imageList = []
@@ -563,6 +639,45 @@ export default {
 
       return 0
     },
+    cornerstoneimageloadprogress(e) {
+      const imageId = e.detail.imageId
+      const percentComplete = e.detail.percentComplete
+      const params = {}
+      const searchParams = new URLSearchParams(imageId.split('?')[1])
+      for (const [key, value] of searchParams.entries()) {
+        params[key] = value
+      }
+      if (this.visitTaskId === params.visitTaskId) {
+        const 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 (prefetchInstanceCount >= instanceCount * 100) {
+          this.seriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
+          // 设置当前序列状态为已下载完成
+          this.seriesList[seriesIndex].loadStatus = true
+          this.loadAllImages()
+        }
+      }
+    },
     cornerstoneImageLoaded(e) {
       if (this.firstInstanceId === e.detail.image.imageId && !this.isStartLoad) {
         // 初始化图像加载完成时，自动下载
@@ -756,6 +871,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

@@ -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;">
+                              <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
-                                #{{ series.seriesNumber }}
+                                <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">
+                          <div v-if="series.prefetchInstanceCount>0 && series.prefetchInstanceCount<series.instanceCount * 100">
-                            <el-progress :percentage="parseInt(((series.prefetchInstanceCount/series.instanceCount)*100).toFixed(2))" />
+                            <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">
@@ -163,13 +189,38 @@
                             >
 
                             <div class="viewernavitextwrapper">
-                              <div v-if="seriesItem.keySeries" style="padding: 1px;color:red">
+                              <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 style="padding: 1px;">
+                                <div v-else>#{{ seriesItem.seriesNumber }}</div>
-                                #{{ seriesItem.seriesNumber }}
+                                <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 v-show=" seriesItem.instanceCount" style="padding: 1px;">
+
+                                      </div>
+                                    </div>
+                                    <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
+                                  </el-popover>
+                                </div>
+
+                              </div>
+                              <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" />
@@ -216,7 +266,8 @@ import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
+const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
+cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
   name: 'DicomsOfVisit',
   components: {
@@ -237,10 +288,13 @@ export default {
       imageList: [],
       activeNames: [],
       relationActiveName: [],
-      showSeriesList: []
+      showSeriesList: [],
+      currentLoadIns: []
     }
   },
   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', '')
@@ -253,16 +307,25 @@ export default {
     this.showDelete = parseInt(this.$router.currentRoute.query.showDelete)
     // 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() {
       this.studyList = []
       getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading).then(res => {
-        res.Result.forEach((study) => {
+        res.Result.forEach((study,studyIndex) => {
           const data = {}
           data.StudyId = study.StudyId
           data.StudyCode = study.StudyCode
@@ -272,23 +335,23 @@ export default {
           data.InstanceCount = study.InstanceCount
           data.PreviewImageCount = 0
           var seriesList = []
-          study.SeriesList.forEach((series) => {
+          study.SeriesList.forEach((series,seriesIndex) => {
             const imageIds = []
-
+            series.InstanceInfoList.forEach(i => {
-            // series.InstanceList.forEach((id) => {
+              if (i.NumberOfFrames && i.NumberOfFrames > 1) {
-            //   imageIds.push(`wadouri:/api/instance/content/${id}`)
+                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}`)
-            // series.InstanceList.forEach((id) => {
+                }
-            //   imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
+              } else {
-            // })
+                imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&idx=${studyIndex}|${seriesIndex}`)
-            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,
+              instanceInfoList: series.InstanceInfoList,
               seriesId: series.Id,
               seriesUid: series.SeriesInstanceUid,
               seriesNumber: series.SeriesNumber,
@@ -301,7 +364,8 @@ export default {
               instanceCount: series.InstanceCount,
               prefetchInstanceCount: 0,
               loadStatus: false,
-              imageloadedArr: []
+              imageloadedArr: [],
+              isExistMutiFrames: series.IsExistMutiFrames
             })
           })
           data.SeriesList = seriesList
@@ -329,21 +393,37 @@ export default {
       this.$refs.dicomViewer.loadImageStack(this.studyList[studyIndex].SeriesList[seriesIndex])
       if (!series.loadStatus) {
         requestPoolManager.changePriority(series.seriesId)
-        // var isAddToTakPool = false
+      }
-        // if (this.showSeriesList.includes(`${studyIndex}_${seriesIndex}`)) {
+    },
-        //   isAddToTakPool = true
+    showMultiFrames(studyIndex,series, seriesIndex, instanceInfo) {
-        // } else {
+      this.currentSeriesIndex = seriesIndex
-        //   this.showSeriesList.push(`${studyIndex}_${seriesIndex}`)
+      const imageIds = []
-        // }
+      if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
-        // if (!isAddToTakPool) {
+        for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
-        //   var priority = parseInt(new Date().getTime())
+          imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&idx=${studyIndex}|${seriesIndex}`)
-        //   series.isLoading = true
+        }
-        //   series.imageIds.map((imageId, i) => {
+      } else {
-        //     this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+        imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&idx=${studyIndex}|${seriesIndex}`)
-        //   })
+      }
-        // } else {
+      const seriesInfo = {
-        //   requestPoolManager.changePriority(series.seriesId)
+        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) {
+        requestPoolManager.changePriority(series.seriesId)
       }
     },
     changeReadingStatus(callback, data) {
@@ -448,19 +528,20 @@ export default {
           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) {
+              item.InstanceInfoList.forEach(i => {
-              //   imageIds.push(`wadouri:/api/instance/content/${id}`)
+                if (i.NumberOfFrames && i.NumberOfFrames > 1) {
-              // })
+                  for (let j = 0; j < i.NumberOfFrames; j++) {
-              // item.InstanceList.forEach((id) => {
+                    imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&idx=${index}|${seriesIndex}`)
-              //   imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
+                  }
-              // })
+                } else {
-              item.InstancePathList.forEach((path) => {
+                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&idx=${index}|${seriesIndex}`)
-                imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${path}`)
+                }
               })
               seriesList.push({
                 imageIds: imageIds,
+                instanceInfoList: item.InstanceInfoList,
                 seriesId: item.Id,
                 seriesUid: item.SeriesInstanceUid,
                 seriesNumber: item.SeriesNumber,
@@ -473,7 +554,8 @@ export default {
                 hasLabel: item.HasLabel,
                 keySeries: item.KeySeries,
                 loadStatus: false,
-                imageloadedArr: []
+                imageloadedArr: [],
+                isExistMutiFrames: item.IsExistMutiFrames
               })
             })
             scope.relationStudyList[index].seriesCount = seriesList.length
@@ -502,54 +584,50 @@ export default {
       }
     },
     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) => {
+      for (let i = 0; i < series.imageIds.length; i++) {
-        study.SeriesList.map((series, seriesIndex) => {
+        const imageId = series.imageIds[i]
-          series.imageIds.map(imageId => {
+        if (series.isExistMutiFrames) {
+          const params = this.getInstanceInfo(imageId)
+          if (params.frame && params.frame > 0) {
+            continue
+          }
+        }
         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 })
+        this.imageList.push({ imageId: imageId, seriesId: series.seriesId, seriesIndex: 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 (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 => {
+          requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority)
-            this.imageLoaded(image, res.data.string('x0020000e'))
-          })
         })
         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 })
@@ -592,47 +670,43 @@ export default {
         }
       }
     },
-    // instance下载成功回调
+    cornerstoneimageloadprogress(e){
-    cornerstoneImageLoaded(e) {
+      const imageId = e.detail.imageId
-      if (e.detail.image.imageId.includes(this.firstInstanceId) && !this.isStartLoad) {
+      const percentComplete = e.detail.percentComplete
-        // 初始化图像加载完成时，自动下载
+      const params = {}
-        this.loadAllImages()
+      const searchParams = new URLSearchParams(imageId.split('?')[1])
-        this.isStartLoad = true
+      for (const [key, value] of searchParams.entries()) {
-        // requestPoolManager.executeTask()
+        params[key] = value
+      }
+      if (this.visitTaskId === params.visitTaskId) {
+        const studyIndex = params.idx.split('|')[0]
+        const seriesIndex = params.idx.split('|')[1]
+        var prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount
+        var instanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount
+        if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0 && this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.length < this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount) {
+          const i = this.currentLoadIns.findIndex(i => i.imageId === imageId)
+          if (i > -1) {
+            prefetchInstanceCount = prefetchInstanceCount - this.currentLoadIns[i].percentComplete + percentComplete
+            this.currentLoadIns[i].percentComplete = percentComplete
+            if (percentComplete === 100) {
+              this.currentLoadIns.splice(i, 1)
             }
-      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()
+            if (percentComplete !== 100) {
+              this.currentLoadIns.push({ imageId, percentComplete })
             }
-      var imageId = e.detail.image.imageId
+            prefetchInstanceCount = prefetchInstanceCount + percentComplete
-      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
           }
-        }
+          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = prefetchInstanceCount
-        if (studyIndex > 0) break
+          if (percentComplete >= 100) {
-      }
-      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
+        if (prefetchInstanceCount >= instanceCount * 100) {
+          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
           // 设置当前序列状态为已下载完成
           this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
+          this.loadAllImages()
         }
       }
     }
@@ -694,9 +768,9 @@ export default {
     padding: 5px;
     /* height: 95%; */
     height: 99%;
-    overflow: hidden;
+    /* overflow: hidden;
-    text-overflow: clip;
+    text-overflow: clip; */
-    white-space: nowrap;
+    /* white-space: nowrap; */
 }
 .viewerContainer .viewerContentWrapper>div {
     display: inline-block;
@@ -813,6 +887,41 @@ export default {
   height: 40px;
   line-height: 20px;
 }
+.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;

src/views/dictionary/checkConfig/index.vue

@@ -513,12 +513,27 @@
                 </el-col>
                 <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.EnumType === 'Dictionary'" :span="12">
                   <el-form-item label="字典表名">
-                    <el-input v-model="form.DictionaryCode" placeholder="请输入字典表名" />
+                    <!-- <el-input v-model="form.DictionaryCode" placeholder="请输入字典表名" /> -->
+                    <el-autocomplete
+                      clearable 
+                      class="inline-input"
+                      v-model="form.DictionaryCode"
+                      :fetch-suggestions="querySearch"
+                      placeholder="请输入字典表名"
+                    ></el-autocomplete>
                   </el-form-item>
                 </el-col>
                 <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.EnumType === 'Dictionary'" :span="12">
                   <el-form-item label="翻译字段">
-                    <el-input v-model="form.DictionaryType" placeholder="请输入翻译字段" />
+                    <!-- <el-input v-model="form.DictionaryType" placeholder="请输入翻译字段" /> -->
+                    <el-select v-model="form.DictionaryType" clearable placeholder="请选择翻译字段">
+                      <el-option
+                        v-for="item in $d.DictionaryType"
+                        :key="item.id"
+                        :label="item.label"
+                        :value="item.label">
+                      </el-option>
+                    </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.EnumType === 'Date'" :span="24">
@@ -696,7 +711,7 @@
 </template>
 
 <script>
-import { fullyReplicated, changeFrontAuditSort, copyFrontAuditConfigItem, getFrontAuditConfigList, addOrUpdateFrontAuditConfig, deleteFrontAuditConfig, copyOtherToThisItem, getAuditConfigChildList, setDictionaryValue } from '@/api/dictionary/checkConfig'
+import { fullyReplicated, changeFrontAuditSort, copyFrontAuditConfigItem, getFrontAuditConfigList, addOrUpdateFrontAuditConfig, deleteFrontAuditConfig, copyOtherToThisItem, getAuditConfigChildList, getDictionaryCodeList } from '@/api/dictionary/checkConfig'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import Sortable from 'sortablejs'
@@ -749,13 +764,41 @@ export default {
       },
       ChildGroup: null,
       tableShow: false,
-      rowDrop2TableIsShow: true
+      rowDrop2TableIsShow: true,
+      DictionaryCodeList:[]
     }
   },
   created() {
-    this.getList()
+    this.getList();
+    this.getDictionaryCodeList();
   },
   methods: {
+    querySearch(queryString, cb) {
+      var DictionaryCodeList = this.DictionaryCodeList;
+      var results = queryString ? DictionaryCodeList.filter(this.createFilter(queryString)) : DictionaryCodeList;
+      // 调用 callback 返回建议列表的数据
+      cb(results);
+    },
+    createFilter(queryString) {
+      return (DictionaryCodeList) => {
+        return (DictionaryCodeList.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+      };
+    },
+    // 获取字典表名
+    async getDictionaryCodeList(){
+      try{
+        let res = await getDictionaryCodeList();
+        if(res.IsSuccess){
+          this.DictionaryCodeList = res.Result.map(item=>{
+            return {
+              value:item
+            }
+          });
+        }
+      }catch(err){
+        console.log(err);
+      }
+    },
     addParameter() {
       this.form.UrlConfig.ParameterList.push({
         UrlParameterName: null,

src/views/dictionary/institutions/components/CROs.vue

@@ -3,26 +3,34 @@
     <div class="search">
       <el-form :inline="true" size="small" class="base-search-form">
         <el-form-item label="CRO Name:">
-          <el-input v-model="searchData.CROName" style="width:100px;" />
+          <el-input v-model="searchData.CROName" style="width: 100px" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">Search</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch"
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">Reset</el-button>
+            >Search</el-button
+          >
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+            >Reset</el-button
+          >
         </el-form-item>
       </el-form>
-      <span style="margin-left:auto;">
+      <span style="margin-left: auto">
         <el-button
           size="small"
           type="primary"
-          style="margin-left:auto;"
+          style="margin-left: auto"
           icon="el-icon-plus"
           @click="handleAddCro"
-        >New</el-button>
+          >New</el-button
+        >
       </span>
     </div>
     <el-table
       v-loading="loading"
-      v-adaptive="{bottomOffset:60}"
+      v-adaptive="{ bottomOffset: 60 }"
       :data="list"
       stripe
       height="100"
@@ -50,6 +58,16 @@
         show-overflow-tooltip
         sortable="custom"
       />
+      <el-table-column
+        prop="IsTrialLevel"
+        label="Level"
+        show-overflow-tooltip
+        sortable="custom"
+      >
+        <template slot-scope="scope">
+          <span>{{ $fd("IsTrialLevel", String(scope.row.IsTrialLevel)) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="Action" min-width="200">
         <template slot-scope="scope">
           <el-button
@@ -68,7 +86,13 @@
       </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
       v-if="editVisible"
@@ -78,26 +102,32 @@
       width="600px"
       custom-class="base-dialog-wrapper"
     >
-      <CroForm v-if="editVisible" :data="rowData" @close="close" @getList="getList" />
+      <CroForm
+        v-if="editVisible"
+        :data="rowData"
+        :IsTrialLevel="rowData.IsTrialLevel"
+        @close="close"
+        @getList="getList"
+      />
     </el-dialog>
   </box-content>
 </template>
 <script>
-import { getCROPageList, deleteCROCompany } from '@/api/dictionary'
+import { getCROPageList, deleteCROCompany } from "@/api/dictionary";
-import BoxContent from '@/components/BoxContent'
+import BoxContent from "@/components/BoxContent";
-import Pagination from '@/components/Pagination'
+import Pagination from "@/components/Pagination";
-import CroForm from './CroForm'
+import CroForm from "./CroForm";
 const searchDataDefault = () => {
   return {
-    CROName: '',
+    CROName: "",
     PageIndex: 1,
     PageSize: 20,
     Asc: true,
-    SortField: ''
+    SortField: "",
-  }
+  };
-}
+};
 export default {
-  name: 'Cros',
+  name: "Cros",
   components: { BoxContent, Pagination, CroForm },
   data() {
     return {
@@ -107,87 +137,93 @@ export default {
       loading: false,
       rowData: {},
       editVisible: false,
-      title: ''
+      title: "",
-    }
+    };
   },
   mounted() {
-    this.getList()
+    this.getList();
   },
   methods: {
     // 获取CRO列表信息
     getList() {
-      this.loading = true
+      this.loading = true;
-      getCROPageList(this.searchData).then(res => {
+      getCROPageList(this.searchData)
-        this.loading = false
+        .then((res) => {
-        this.list = res.Result.CurrentPageData
+          this.loading = false;
-        this.total = res.Result.TotalCount
+          this.list = res.Result.CurrentPageData;
-      }).catch(() => {
+          this.total = res.Result.TotalCount;
-        this.loading = false
         })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 新增CRO
     handleAddCro() {
-      this.rowData = {}
+      this.rowData = {};
-      this.title = 'Add'
+      this.title = "Add";
-      this.editVisible = true
+      this.editVisible = true;
     },
     // 编辑CRO
     handleEdit(row) {
-      this.rowData = row
+      this.rowData = row;
-      this.title = 'Edit'
+      this.title = "Edit";
-      this.editVisible = true
+      this.editVisible = true;
     },
     // 删除CRO
     handleDelete(row) {
-      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: 'warning',
+        type: "warning",
         distinguishCancelAndClose: true,
-
+      }).then(() => {
-      })
+        this.loading = true;
-        .then(() => {
-          this.loading = true
         deleteCROCompany(row.Id)
-            .then(res => {
+          .then((res) => {
-              this.loading = false
+            this.loading = false;
             if (res.IsSuccess) {
-                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
+              this.list.splice(
-                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+                this.list.findIndex((item) => item.Id === row.Id),
+                1
+              );
+              this.$message.success(
+                this.$t("common:message:deletedSuccessfully")
+              );
             }
-            }).catch(() => {
-              this.loading = false
-            })
           })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     // 重置列表
     handleReset() {
-      this.searchData = searchDataDefault()
+      this.searchData = searchDataDefault();
-      this.getList()
+      this.getList();
     },
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1
+      this.searchData.PageIndex = 1;
-      this.getList()
+      this.getList();
     },
     // 指定排序字段，对列表进行排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
+      if (column.order === "ascending") {
-        this.searchData.Asc = true
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
+      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1
+      this.searchData.PageIndex = 1;
-      this.getList()
+      this.getList();
     },
     // 关闭模态框
     close() {
-      this.editVisible = false
+      this.editVisible = false;
-    }
+    },
-  }
+  },
-}
+};
 </script>
 <style lang="scss" scoped>
-.cros{
+.cros {
   height: 100%;
 }
 </style>

src/views/dictionary/institutions/components/CroForm.vue

@@ -17,70 +17,98 @@
       <el-form-item label="CRO Code: " prop="CROCode">
         <el-input v-model="form.CROCode" />
       </el-form-item>
+      <el-form-item label="Level: ">
+        <el-switch
+          :disabled="!IsTrialLevel"
+          v-model="form.IsTrialLevel"
+          :active-text="$fd('IsTrialLevel', 'true')"
+          :inactive-text="$fd('IsTrialLevel', 'false')"
+        >
+        </el-switch>
+      </el-form-item>
     </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
-        <el-button :disabled="btnLoading" type="primary" @click="handleCancel">Cancel</el-button>
+        <el-button :disabled="btnLoading" type="primary" @click="handleCancel"
-        <el-button type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+          >Cancel</el-button
+        >
+        <el-button type="primary" :loading="btnLoading" @click="handleSave"
+          >Save</el-button
+        >
       </el-form-item>
     </div>
   </el-form>
 </template>
 <script>
-import { addOrUpdateCro } from '@/api/dictionary'
+import { addOrUpdateCro } from "@/api/dictionary";
 export default {
-  name: 'CroForm',
+  name: "CroForm",
   props: {
     data: {
       type: Object,
       default() {
-        return {}
+        return {};
-      }
+      },
-    }
+    },
+    IsTrialLevel: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
       btnLoading: false,
       form: {
-        Id: '',
+        Id: "",
-        CROName: '',
+        CROName: "",
-        CRONameCN: '',
+        CRONameCN: "",
-        CROCode: ''
+        CROCode: "",
+        IsTrialLevel: true,
       },
       rules: {
-        CROName: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
+        CROName: [
-        CRONameCN: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
+          { required: true, message: "Please specify", trigger: "blur" },
-        CROCode: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }]
+          { max: 500, message: "The maximum length is 500" },
-      }
+        ],
-    }
+        CRONameCN: [
+          { required: true, message: "Please specify", trigger: "blur" },
+          { max: 500, message: "The maximum length is 500" },
+        ],
+        CROCode: [
+          { required: true, message: "Please specify", trigger: "blur" },
+          { max: 50, message: "The maximum length is 50" },
+        ],
+      },
+    };
   },
   mounted() {
     if (Object.keys(this.data).length && this.data.Id) {
-      this.form = { ...this.data }
+      this.form = { ...this.data };
     }
   },
   methods: {
     handleSave() {
-      this.$refs.CROForm.validate(valid => {
+      this.$refs.CROForm.validate((valid) => {
-        if (!valid) return
+        if (!valid) return;
-        this.btnLoading = true
+        this.btnLoading = true;
-        addOrUpdateCro(this.form).then(res => {
+        addOrUpdateCro(this.form)
-          this.btnLoading = false
+          .then((res) => {
+            this.btnLoading = false;
             if (res.IsSuccess) {
-            this.$message.success('Saved successfully')
+              this.$message.success("Saved successfully");
-            this.$refs['CROForm'].resetFields()
+              this.$refs["CROForm"].resetFields();
-            this.$emit('getList')
+              this.$emit("getList");
-            this.$emit('close')
+              this.$emit("close");
             }
-        }).catch(() => {
-          this.btnLoading = false
-        })
           })
+          .catch(() => {
+            this.btnLoading = false;
+          });
+      });
     },
     handleCancel() {
-      this.$emit('close')
+      this.$emit("close");
-    }
+    },
-  }
+  },
-
+};
-}
 </script>

src/views/dictionary/institutions/components/Sites.vue

@@ -3,33 +3,50 @@
     <div class="search">
       <el-form :inline="true" size="small" class="base-search-form">
         <el-form-item label="Site Name:">
-          <el-input v-model="searchData.SiteName" style="width:120px;" />
+          <el-input v-model="searchData.SiteName" style="width: 120px" />
         </el-form-item>
         <el-form-item label="Alias Name:">
-          <el-input v-model="searchData.AliasName" style="width:120px;" />
+          <el-input v-model="searchData.AliasName" style="width: 120px" />
         </el-form-item>
         <el-form-item label="Country:">
-          <el-input v-model="searchData.Country" style="width:120px;" />
+          <el-input v-model="searchData.Country" style="width: 120px" />
         </el-form-item>
         <el-form-item label="City:">
-          <el-input v-model="searchData.City" style="width:120px;" />
+          <el-input v-model="searchData.City" style="width: 120px" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">Search</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch"
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">Reset</el-button>
+            >Search</el-button
+          >
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+            >Reset</el-button
+          >
         </el-form-item>
       </el-form>
+      <div style="margin-left: auto">
         <el-button
           type="primary"
           size="small"
-        style="margin-left:auto;"
+          icon="el-icon-plus"
+          @click="handleAddSystemSite"
+          >{{ $t("trial:dictionary:institutions:site:addSystemSite") }}
+        </el-button>
+        <el-button
+          type="primary"
+          size="small"
+          style="margin-left: 10px"
           icon="el-icon-plus"
           @click="handleAddSite"
-      >New</el-button>
+          >New
+        </el-button>
+      </div>
     </div>
     <el-table
       v-loading="loading"
-      v-adaptive="{bottomOffset:60}"
+      v-adaptive="{ bottomOffset: 60 }"
       :data="list"
       stripe
       height="100"
@@ -120,6 +137,13 @@
         show-overflow-tooltip
         sortable="custom"
       />
+      <el-table-column
+        prop="CreateTime"
+        label="CreateTime"
+        min-width="160"
+        show-overflow-tooltip
+        sortable="custom"
+      />
       <el-table-column label="Action" fixed="right" width="150">
         <template slot-scope="scope">
           <el-button
@@ -138,131 +162,362 @@
       </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
       v-if="editVisible"
       :visible.sync="editVisible"
       :close-on-click-modal="false"
       :title="title"
-      width="600px"
+      width="800px"
       custom-class="base-dialog-wrapper"
     >
-      <site-form v-if="editVisible" :data="rowData" @close="close" @getList="getList" />
+      <site-form
+        v-if="editVisible"
+        :data="rowData"
+        @close="close"
+        @getList="getList"
+      />
     </el-dialog>
-
+    <base-model
+      v-if="addSystemSite_model.visible"
+      :config="addSystemSite_model"
+    >
+      <template slot="dialog-body">
+        <div class="search">
+          <el-form :inline="true" size="small" class="base-search-form">
+            <el-form-item
+              :label="
+                $t(
+                  'trial:dictionary:institutions:site:table:addSystemSite:TrialCode'
+                )
+              "
+            >
+              <el-input
+                v-model="addSystemSiteSearchData.TrialCode"
+                style="width: 100px"
+              />
+            </el-form-item>
+            <el-form-item
+              :label="
+                $t(
+                  'trial:dictionary:institutions:site:table:addSystemSite:TrialSiteName'
+                )
+              "
+            >
+              <el-input
+                v-model="addSystemSiteSearchData.TrialSiteName"
+                style="width: 100px"
+              />
+            </el-form-item>
+            <el-form-item
+              :label="
+                $t(
+                  'trial:dictionary:institutions:site:table:addSystemSite:TrialSiteAliasName'
+                )
+              "
+            >
+              <el-input
+                v-model="addSystemSiteSearchData.TrialSiteAliasName"
+                style="width: 100px"
+              />
+            </el-form-item>
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                @click="getTrialSiteList"
+                >{{ $t("trial:dictionary:institutions:site:button:sreach") }}
+              </el-button>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh-left"
+                @click="handleResetAddSite"
+                >{{ $t("trial:dictionary:institutions:site:button:reset") }}
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <el-table
+          v-loading="addSystemSiteLoading"
+          :data="addSystemSiteList"
+          stripe
+          height="300"
+          @sort-change="handleSortByColumnAddSite"
+        >
+          <el-table-column type="index" width="40" />
+          <el-table-column
+            prop="TrialCode"
+            :label="
+              $t(
+                'trial:dictionary:institutions:site:table:addSystemSite:TrialCode'
+              )
+            "
+            show-overflow-tooltip
+            sortable="custom"
+          />
+          <el-table-column
+            prop="TrialSiteName"
+            :label="
+              $t(
+                'trial:dictionary:institutions:site:table:addSystemSite:TrialSiteName'
+              )
+            "
+            show-overflow-tooltip
+            sortable="custom"
+          />
+          <el-table-column
+            prop="TrialSiteAliasName"
+            :label="
+              $t(
+                'trial:dictionary:institutions:site:table:addSystemSite:TrialSiteAliasName'
+              )
+            "
+            show-overflow-tooltip
+            sortable="custom"
+          />
+          <el-table-column
+            :label="
+              $t(
+                'trial:dictionary:institutions:site:table:addSystemSite:Action'
+              )
+            "
+            fixed="right"
+            width="80"
+          >
+            <template slot-scope="scope">
+              <el-button
+                circle
+                type="text"
+                :title="$t('trial:dictionary:institutions:site:button:add')"
+                @click="addSystemSite(scope.row)"
+                >{{
+                  $t("trial:dictionary:institutions:site:button:add")
+                }}</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- 分页组件 -->
+        <pagination
+          class="page"
+          style="float: right"
+          :total="addSystemSiteSearchDataTotal"
+          :page.sync="addSystemSiteSearchData.PageIndex"
+          :limit.sync="addSystemSiteSearchData.PageSize"
+          @pagination="getTrialSiteList"
+        />
+      </template>
+    </base-model>
   </box-content>
 </template>
 <script>
-import { getSiteList, deleteSite } from '@/api/dictionary'
+import {
-
+  getSiteList,
-import BoxContent from '@/components/BoxContent'
+  deleteSite,
-import Pagination from '@/components/Pagination'
+  addOrUpdateSite,
-import SiteForm from './SiteForm'
+  getTrialSiteList,
+} from "@/api/dictionary";
+import BaseModel from "@/components/BaseModel";
+import BoxContent from "@/components/BoxContent";
+import Pagination from "@/components/Pagination";
+import SiteForm from "./SiteForm";
 const searchDataDefault = () => {
   return {
-    SiteName: '',
+    SiteName: "",
+    PageIndex: 1,
+    PageSize: 20,
+    Asc: false,
+    SortField: "CreateTime",
+    AliasName: "",
+    Country: null,
+    City: null,
+  };
+};
+const searchSiteDataDefault = () => {
+  return {
+    // SiteName: "",
     PageIndex: 1,
     PageSize: 20,
     Asc: true,
-    SortField: '',
+    SortField: "",
-    AliasName: '',
+    TrialCode: null,
-    Country: null,
+    TrialSiteName: null,
-    City: null
+    TrialSiteAliasName: null,
-  }
+  };
-}
+};
 export default {
-  name: 'Sites',
+  name: "Sites",
-  components: { BoxContent, Pagination, SiteForm },
+  components: { BoxContent, Pagination, SiteForm, BaseModel },
   data() {
     return {
       editVisible: false,
-      title: 'Add',
+      title: "Add",
       searchData: searchDataDefault(),
       list: [],
       total: 0,
       loading: false,
-      rowData: {}
+      rowData: {},
-    }
+      addSystemSite_model: {
+        visible: false,
+        title: this.$t("trial:dictionary:institutions:site:addSystemSite"),
+        width: "800px",
+        appendToBody: true,
+      },
+      addSystemSiteLoading: false,
+      addSystemSiteList: [],
+      addSystemSiteSearchData: searchSiteDataDefault(),
+      addSystemSiteSearchDataTotal: 0,
+    };
   },
   mounted() {
-    this.getList()
+    this.getList();
+    this.getTrialSiteList();
   },
   methods: {
+    // 获取项目级别列表
+    async getTrialSiteList() {
+      try {
+        this.addSystemSiteLoading = true;
+        let res = await getTrialSiteList(this.addSystemSiteSearchData);
+        if (res.IsSuccess) {
+          this.addSystemSiteLoading = false;
+          this.addSystemSiteList = res.Result.CurrentPageData;
+          this.addSystemSiteSearchDataTotal = res.Result.TotalCount;
+        }
+      } catch (err) {
+        this.addSystemSiteLoading = false;
+        console.log(err);
+      }
+    },
+    // 将项目级别中心转换为系统级别中心
+    async addSystemSite(item) {
+      try {
+        let data = {
+          SiteName: item.TrialSiteName,
+          SiteNameCN: item.TrialSiteName,
+          AliasName: item.TrialSiteAliasName,
+          SiteCode: item.TrialCode,
+          TrialSiteId: item.TrialSiteId,
+        };
+        this.addSystemSiteLoading = true;
+        let res = await addOrUpdateSite(data);
+        if (res.IsSuccess) {
+          this.getTrialSiteList();
+          this.getList();
+        }
+      } catch (err) {
+        this.addSystemSiteLoading = false;
+        console.log(err);
+      }
+    },
+    handleAddSystemSite() {
+      this.addSystemSite_model.visible = true;
+      this.addSystemSiteSearchData = searchSiteDataDefault();
+      this.addSystemSiteList = [];
+      this.addSystemSiteSearchDataTotal = 0;
+      this.getTrialSiteList();
+    },
     // 获取Site列表信息
     getList() {
-      this.loading = true
+      this.loading = true;
-      getSiteList(this.searchData).then(res => {
+      getSiteList(this.searchData)
-        this.loading = false
+        .then((res) => {
-        this.list = res.Result.CurrentPageData
+          this.loading = false;
-        this.total = res.Result.TotalCount
+          this.list = res.Result.CurrentPageData;
-      }).catch(() => {
+          this.total = res.Result.TotalCount;
-        this.loading = false
         })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 新增Site信息
     handleAddSite() {
-      this.rowData = {}
+      this.rowData = {};
-      this.title = 'Add'
+      this.title = "Add";
-      this.editVisible = true
+      this.editVisible = true;
     },
     // 编辑Site信息
     handleEdit(row) {
-      this.rowData = row
+      this.rowData = row;
-      this.title = 'Edit'
+      this.title = "Edit";
-      this.editVisible = true
+      this.editVisible = true;
     },
     // 删除Site
     handleDelete(row) {
-      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: 'warning',
+        type: "warning",
         distinguishCancelAndClose: true,
-
+      }).then(() => {
-      })
+        this.loading = true;
-        .then(() => {
-          this.loading = true
         deleteSite(row.Id)
-            .then(res => {
+          .then((res) => {
-              this.loading = false
+            this.loading = false;
             if (res.IsSuccess) {
-                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
+              this.list.splice(
-                this.$store.dispatch('global/setSite', {})
+                this.list.findIndex((item) => item.Id === row.Id),
-                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+                1
+              );
+              this.$store.dispatch("global/setSite", {});
+              this.$message.success(
+                this.$t("common:message:deletedSuccessfully")
+              );
             }
-            }).catch(() => {
-              this.loading = false
-            })
           })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     // 重置列表
     handleReset() {
-      this.searchData = searchDataDefault()
+      this.searchData = searchDataDefault();
-      this.getList()
+      this.getList();
+    },
+    handleResetAddSite() {
+      this.addSystemSiteSearchData = searchSiteDataDefault();
+      this.getTrialSiteList();
     },
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1
+      this.searchData.PageIndex = 1;
-      this.getList()
+      this.getList();
     },
     // 指定排序字段，对列表进行排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
+      if (column.order === "ascending") {
-        this.searchData.Asc = true
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
+      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1
+      this.searchData.PageIndex = 1;
-      this.getList()
+      this.getList();
+    },
+    handleSortByColumnAddSite(column) {
+      if (column.order === "ascending") {
+        this.addSystemSiteSearchData.Asc = true;
+      } else {
+        this.addSystemSiteSearchData.Asc = false;
+      }
+      this.addSystemSiteSearchData.SortField = column.prop;
+      this.addSystemSiteSearchData.PageIndex = 1;
+      this.getTrialSiteList();
     },
     // 关闭模态框
     close() {
-      this.editVisible = false
+      this.editVisible = false;
-    }
+    },
-  }
+  },
-}
+};
 </script>
 <style lang="scss" scoped>
-.Sites{
+.Sites {
   height: 100%;
 }
 </style>

src/views/dictionary/institutions/components/SponsorForm.vue

@@ -1,5 +1,4 @@
 <template>
-
   <el-form
     ref="sponsorForm"
     :model="form"
@@ -15,73 +14,109 @@
       <el-form-item label="Sponsor NameCN: " prop="SponsorName">
         <el-input v-model="form.SponsorNameCN" />
       </el-form-item>
-      <el-form-item label="Sponsor Code: " prop="SponsorName">
+      <el-form-item label="Sponsor Code: " prop="SponsorCode">
         <el-input v-model="form.SponsorCode" />
       </el-form-item>
+      <el-form-item label="Level: ">
+        <el-switch
+          :disabled="!IsTrialLevel"
+          v-model="form.IsTrialLevel"
+          :active-text="$fd('IsTrialLevel', 'true')"
+          :inactive-text="$fd('IsTrialLevel', 'false')"
+        >
+        </el-switch>
+      </el-form-item>
     </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
-        <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancel">Cancel</el-button>
+        <el-button
-        <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+          :disabled="btnLoading"
+          size="small"
+          type="primary"
+          @click="handleCancel"
+          >Cancel</el-button
+        >
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="handleSave"
+          >Save</el-button
+        >
       </el-form-item>
     </div>
   </el-form>
 </template>
 <script>
-import { addOrUpdateSponsor } from '@/api/dictionary'
+import { addOrUpdateSponsor } from "@/api/dictionary";
 export default {
-  name: 'SponsorForm',
+  name: "SponsorForm",
   props: {
     data: {
       type: Object,
       default() {
-        return {}
+        return {};
-      }
+      },
-    }
+    },
+    IsTrialLevel: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
       btnLoading: false,
       form: {
-        Id: '',
+        Id: "",
-        SponsorName: '',
+        SponsorName: "",
-        SponsorNameCN: '',
+        SponsorNameCN: "",
-        SponsorCode: '',
+        SponsorCode: "",
+        IsTrialLevel: true,
       },
       rules: {
-        SponsorName: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
+        SponsorName: [
-        SponsorNameCN: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
+          { required: true, message: "Please specify", trigger: "blur" },
-        SponsorCode: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }]
+          { max: 500, message: "The maximum length is 500" },
-      }
+        ],
-    }
+        SponsorNameCN: [
+          { required: true, message: "Please specify", trigger: "blur" },
+          { max: 500, message: "The maximum length is 500" },
+        ],
+        SponsorCode: [
+          { required: true, message: "Please specify", trigger: "blur" },
+          { max: 50, message: "The maximum length is 50" },
+        ],
+      },
+    };
   },
   mounted() {
     if (Object.keys(this.data).length && this.data.Id) {
-      this.form = { ...this.data }
+      this.form = { ...this.data };
     }
   },
   methods: {
     handleSave() {
-      this.$refs.sponsorForm.validate(valid => {
+      this.$refs.sponsorForm.validate((valid) => {
-        if (!valid) return
+        if (!valid) return;
-        this.btnLoading = true
+        this.btnLoading = true;
-        addOrUpdateSponsor(this.form).then(res => {
+        addOrUpdateSponsor(this.form)
-          this.btnLoading = false
+          .then((res) => {
+            this.btnLoading = false;
             if (res.IsSuccess) {
-            this.$message.success('Saved successfully')
+              this.$message.success("Saved successfully");
-            this.$refs['sponsorForm'].resetFields()
+              this.$refs["sponsorForm"].resetFields();
-            this.$emit('getList')
+              this.$emit("getList");
-            this.$emit('close')
+              this.$emit("close");
             }
-        }).catch(() => {
-          this.btnLoading = false
-        })
           })
+          .catch(() => {
+            this.btnLoading = false;
+          });
+      });
     },
     handleCancel() {
-      this.$emit('close')
+      this.$emit("close");
-    }
+    },
-  }
+  },
-
+};
-}
 </script>

src/views/dictionary/institutions/components/Sponsors.vue

@@ -3,26 +3,34 @@
     <div class="search">
       <el-form :inline="true" size="small" class="base-search-form">
         <el-form-item label="Sponsor Name:">
-          <el-input v-model="searchData.SponsorName" style="width:100px;" />
+          <el-input v-model="searchData.SponsorName" style="width: 100px" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">Search</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch"
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">Reset</el-button>
+            >Search</el-button
+          >
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+            >Reset</el-button
+          >
         </el-form-item>
       </el-form>
-      <span style="margin-left:auto;">
+      <span style="margin-left: auto">
         <el-button
           size="small"
           type="primary"
-          style="margin-left:auto;"
+          style="margin-left: auto"
           icon="el-icon-plus"
           @click="handleAddSponsor"
-        >New</el-button>
+          >New</el-button
+        >
       </span>
     </div>
     <el-table
       v-loading="loading"
-      v-adaptive="{bottomOffset:60}"
+      v-adaptive="{ bottomOffset: 60 }"
       :data="list"
       stripe
       height="100"
@@ -50,6 +58,16 @@
         show-overflow-tooltip
         sortable="custom"
       />
+      <el-table-column
+        prop="IsTrialLevel"
+        label="Level"
+        show-overflow-tooltip
+        sortable="custom"
+      >
+        <template slot-scope="scope">
+          <span>{{ $fd("IsTrialLevel", String(scope.row.IsTrialLevel)) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="Action" min-width="150">
         <template slot-scope="scope">
           <el-button
@@ -68,7 +86,13 @@
       </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
       v-if="editVisible"
@@ -78,26 +102,32 @@
       width="600px"
       custom-class="base-dialog-wrapper"
     >
-      <sponsor-form v-if="editVisible" :data="rowData" @close="close" @getList="getList" />
+      <sponsor-form
+        v-if="editVisible"
+        :IsTrialLevel="rowData.IsTrialLevel"
+        :data="rowData"
+        @close="close"
+        @getList="getList"
+      />
     </el-dialog>
   </box-content>
 </template>
 <script>
-import { getSponsorPageList, deleteSponsor } from '@/api/dictionary'
+import { getSponsorPageList, deleteSponsor } from "@/api/dictionary";
-import BoxContent from '@/components/BoxContent'
+import BoxContent from "@/components/BoxContent";
-import Pagination from '@/components/Pagination'
+import Pagination from "@/components/Pagination";
-import SponsorForm from './SponsorForm'
+import SponsorForm from "./SponsorForm";
 const searchDataDefault = () => {
   return {
-    SponsorName: '',
+    SponsorName: "",
     PageIndex: 1,
     PageSize: 20,
     Asc: true,
-    SortField: ''
+    SortField: "",
-  }
+  };
-}
+};
 export default {
-  name: 'Sponsors',
+  name: "Sponsors",
   components: { BoxContent, Pagination, SponsorForm },
   data() {
     return {
@@ -107,87 +137,93 @@ export default {
       loading: false,
       rowData: {},
       editVisible: false,
-      title: ''
+      title: "",
-    }
+    };
   },
   mounted() {
-    this.getList()
+    this.getList();
   },
   methods: {
     // 获取Sponsors列表
     getList() {
-      this.loading = true
+      this.loading = true;
-      getSponsorPageList(this.searchData).then(res => {
+      getSponsorPageList(this.searchData)
-        this.loading = false
+        .then((res) => {
-        this.list = res.Result.CurrentPageData
+          this.loading = false;
-        this.total = res.Result.TotalCount
+          this.list = res.Result.CurrentPageData;
-      }).catch(() => {
+          this.total = res.Result.TotalCount;
-        this.loading = false
         })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 新增Sponsor
     handleAddSponsor() {
-      this.rowData = {}
+      this.rowData = {};
-      this.title = 'Add'
+      this.title = "Add";
-      this.editVisible = true
+      this.editVisible = true;
     },
     // 编辑Sponsor
     handleEdit(row) {
-      this.rowData = row
+      this.rowData = row;
-      this.title = 'Edit'
+      this.title = "Edit";
-      this.editVisible = true
+      this.editVisible = true;
     },
     // 删除Sponsor
     handleDelete(row) {
-      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: 'warning',
+        type: "warning",
         distinguishCancelAndClose: true,
-
+      }).then(() => {
-      })
+        this.loading = true;
-        .then(() => {
-          this.loading = true
         deleteSponsor(row.Id)
-            .then(res => {
+          .then((res) => {
-              this.loading = false
+            this.loading = false;
             if (res.IsSuccess) {
-                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
+              this.list.splice(
-                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+                this.list.findIndex((item) => item.Id === row.Id),
+                1
+              );
+              this.$message.success(
+                this.$t("common:message:deletedSuccessfully")
+              );
             }
-            }).catch(() => {
-              this.loading = false
-            })
           })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     // 重置列表
     handleReset() {
-      this.searchData = searchDataDefault()
+      this.searchData = searchDataDefault();
-      this.getList()
+      this.getList();
     },
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1
+      this.searchData.PageIndex = 1;
-      this.getList()
+      this.getList();
     },
     // 指定排序字段，对列表进行排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
+      if (column.order === "ascending") {
-        this.searchData.Asc = true
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
+      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1
+      this.searchData.PageIndex = 1;
-      this.getList()
+      this.getList();
     },
     // 关闭模态框
     close() {
-      this.editVisible = false
+      this.editVisible = false;
-    }
+    },
-  }
+  },
-}
+};
 </script>
 <style lang="scss" scoped>
-.sponsors{
+.sponsors {
   height: 100%;
 }
 </style>

src/views/forgetpassword/index.vue

@@ -1,59 +1,86 @@
 <template>
   <div class="reset-wrapper">
-    <!-- Reset Password -->
     <el-page-header :content="$t('passwordReset:title:reset')" @back="goBack" />
-    <div class="box-wrapper">
+    <el-steps :active="active" align-center style="margin-top: 30px">
+      <el-step :title="$t('resetPassword:step:VerifyIdentity')"></el-step>
+      <el-step :title="$t('resetPassword:step:ResetPassword')"></el-step>
+      <el-step :title="$t('resetPassword:step:ResetSuccess')"></el-step>
+    </el-steps>
+    <!-- Reset Password -->
+
+    <div class="box-wrapper" v-if="active === 0">
       <el-form
         ref="resetForm"
         v-loading="formLoading"
         :model="form"
-        label-width="200px"
+        label-width="130px"
         :rules="rules"
         class="demo-ruleForm"
         size="small"
       >
         <!-- 邮箱 -->
-        <el-form-item :label="$t('passwordReset:form:email')" prop="EmailOrPhone">
+        <el-form-item
+          :label="$t('passwordReset:form:email')"
+          prop="EmailOrPhone"
+        >
           <el-col :span="18">
-            <el-input v-model="form.EmailOrPhone" autocomplete="off" @change="handleEmailChange" />
+            <el-input
-          </el-col>
+              v-model="form.EmailOrPhone"
-          <el-col :span="6" style="text-align:right;">
+              autocomplete="off"
-            <el-button
+              @change="handleEmailChange"
-              size="small"
+            />
-              type="primary"
-              style="width:80%;"
-              :disabled="sendDisabled"
-              @click="handleSendCode"
-            >{{ sendTitle }}</el-button>
           </el-col>
         </el-form-item>
         <!-- 验证码 -->
-        <el-form-item :label="$t('trials:researchForm:form:verifyCode')" required>
+        <el-form-item
+          :label="$t('trials:researchForm:form:verifyCode')"
+          required
+        >
           <el-col :span="18">
             <el-form-item prop="VerificationCode">
               <el-input v-model="form.VerificationCode" autocomplete="off" />
             </el-form-item>
           </el-col>
-          <el-col :span="6" style="text-align:right;">
+          <el-col :span="6" style="text-align: right">
+            <el-button
+              size="small"
+              type="primary"
+              style="width: 80%"
+              :disabled="sendDisabled"
+              @click="handleSendCode"
+              >{{ sendTitle }}</el-button
+            >
+          </el-col>
+        </el-form-item>
+      </el-form>
       <!-- 校验 -->
       <el-button
         size="small"
         type="primary"
-              style="width:80%;"
+        style="width: 50%; margin: auto; display: block"
         :disabled="form.VerificationCode === '' || form.EmailOrPhone === ''"
         @click="verifyCode"
       >
-              {{ $t('passwordReset:button:verify') }}
+        {{ $t("passwordReset:button:verify") }}
       </el-button>
-          </el-col>
+    </div>
-        </el-form-item>
+    <div class="box-wrapper" v-if="active === 1">
+      <el-form
+        ref="resetForm"
+        v-loading="formLoading"
+        :model="form"
+        label-width="100px"
+        :rules="rules"
+        class="demo-ruleForm"
+        size="small"
+      >
         <!-- 用户名 -->
         <el-form-item :label="$t('passwordReset:form:userName')" prop="UserId">
           <el-select
             v-model="form.UserId"
             clearable
             filterable
-            style="width:100%"
+            style="width: 100%"
             @change="handleUserChange"
           >
             <el-option
@@ -63,65 +90,102 @@
               :value="item.UserId"
             >
               <span style="float: left">{{ item.UserName }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.UserType }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{
+                item.UserType
+              }}</span>
             </el-option>
           </el-select>
         </el-form-item>
         <!-- 用户类型 -->
-        <el-form-item v-if="form.UserId" :label="$t('passwordReset:form:userType')">
+        <el-form-item
+          v-if="form.UserId"
+          :label="$t('passwordReset:form:userType')"
+        >
           <el-input v-model="form.UserType" disabled />
         </el-form-item>
         <!-- 新密码 -->
-        <el-form-item class="my_new_pwd" :label="$t('passwordReset:form:password')" prop="NewPwd" style="position: relative">
+        <el-form-item
+          class="my_new_pwd"
+          :label="$t('passwordReset:form:password')"
+          prop="NewPwd"
+          style="position: relative"
+        >
           <el-input v-model="form.NewPwd" show-password autocomplete="off" />
-          <span style="position: absolute;right: -30px">
+          <span style="position: absolute; right: -30px">
-            <el-tooltip :content="$t('passwordReset:form:passwordCentent')" placement="top">
+            <el-tooltip
+              :content="$t('passwordReset:form:passwordCentent')"
+              placement="top"
+            >
               <i class="el-icon-question" />
             </el-tooltip>
           </span>
         </el-form-item>
         <!-- 确认密码 -->
-        <el-form-item :label="$t('passwordReset:form:confirmPassword')" prop="CheckPass">
+        <el-form-item
+          :label="$t('passwordReset:form:confirmPassword')"
+          prop="CheckPass"
+        >
           <el-input v-model="form.CheckPass" show-password autocomplete="off" />
         </el-form-item>
-        <el-form-item style="text-align:right;">
+      </el-form>
+      <div style="width: 50%; margin: auto; display: flex">
         <!-- 取消 -->
-          <el-button size="small" @click="onCancel">
+        <el-button size="small" @click="onCancel" style="width: 46%">
-            {{ $t('passwordReset:button:cancel') }}
+          {{ $t("passwordReset:button:cancel") }}
         </el-button>
         <!-- 提交 -->
-          <el-button size="small" type="primary" @click="onSubmit">
+        <el-button
-            {{ $t('passwordReset:button:submit') }}
+          size="small"
+          type="primary"
+          @click="onSubmit"
+          style="width: 46%"
+        >
+          {{ $t("passwordReset:button:submit") }}
+        </el-button>
+      </div>
+    </div>
+    <div class="box-wrapper flexBox" v-if="active === 3">
+      <svg-icon icon-class="resetSuccess" style="width: 300px; height: 300px" />
+      <p style="width: 100%; text-align: center">
+        {{ $t("resetPassword:successTip") }}
+      </p>
+      <el-button size="small" type="primary" @click="goBack">
+        {{ $t("passwordReset:button:back") }}
       </el-button>
-        </el-form-item>
-      </el-form>
     </div>
   </div>
 </template>
 <script>
-
+import {
-import { anonymousSendVerificationCode, verifyAnonymousVerifyCode, anonymousSetPassword } from '@/api/user'
+  anonymousSendVerificationCode,
-import md5 from 'js-md5'
+  verifyAnonymousVerifyCode,
-var timer = ''
+  anonymousSetPassword,
-var countdown = 60
+} from "@/api/user";
+import md5 from "js-md5";
+import Img from "@/assets/icons/svg/resetSuccess.svg";
+var timer = "";
+var countdown = 60;
 export default {
   data() {
     var validateEmail = (rule, value, callback) => {
-      if (value === '') {
+      if (value === "") {
         // 请输入邮箱
-        callback(new Error(this.$t('passwordReset:formRule:email')))
+        callback(new Error(this.$t("passwordReset:formRule:email")));
       } else {
-        var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        var reg =
+          /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/;
         if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
-          this.sendDisabled = false
+          this.sendDisabled = false;
-          callback()
+          callback();
         } else {
           // 邮箱无效
-          callback(new Error(this.$t('passwordReset:formRule:passwordinvalid')))
+          callback(
-          this.sendDisabled = true
+            new Error(this.$t("passwordReset:formRule:passwordinvalid"))
-        }
+          );
+          this.sendDisabled = true;
         }
       }
+    };
     // var validatePass = (rule, value, callback) => {
     //   if (value === '') {
     //     // 请输入密码
@@ -134,119 +198,181 @@ export default {
     //   }
     // }
     var validatePass2 = (rule, value, callback) => {
-      if (value === '' || value === undefined) {
+      if (value === "" || value === undefined) {
         // 请再次输入密码
-        callback(new Error(this.$t('passwordReset:formRule:confirmPassword')))
+        callback(new Error(this.$t("passwordReset:formRule:confirmPassword")));
       } else if (value !== undefined && value !== this.form.NewPwd) {
         // 两次密码不一致
-        callback(new Error(this.$t('passwordReset:formRule:passwordsDiffer')))
+        callback(new Error(this.$t("passwordReset:formRule:passwordsDiffer")));
       } else {
-        callback()
+        callback();
-      }
       }
+    };
     return {
+      active: 0,
+      Img,
       form: {
-        EmailOrPhone: '',
+        EmailOrPhone: "",
-        VerificationCode: '',
+        VerificationCode: "",
-        NewPwd: '',
+        NewPwd: "",
-        UserId: '',
+        UserId: "",
-        UserType: ''
+        UserType: "",
       },
       users: [],
-      CheckPass: '',
+      CheckPass: "",
       rules: {
         EmailOrPhone: [
-          { required: true, validator: validateEmail, trigger: ['blur', 'change'] }
+          {
+            required: true,
+            validator: validateEmail,
+            trigger: ["blur", "change"],
+          },
+        ],
+        VerificationCode: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        NewPwd: [
+          {
+            required: true,
+            validator: this.$validatePassword,
+            trigger: ["blur", "change"],
+          },
+        ],
+        CheckPass: [
+          {
+            required: true,
+            validator: validatePass2,
+            trigger: ["blur", "change"],
+          },
+        ],
+        UserId: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: ["blur", "change"],
+          },
         ],
-        VerificationCode: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }],
-        NewPwd: [{ required: true, validator: this.$validatePassword, trigger: ['blur', 'change'] }],
-        CheckPass: [{ required: true, validator: validatePass2, trigger: ['blur', 'change'] }],
-        UserId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }]
       },
       sendDisabled: true,
-      sendTitle: this.$t('passwordReset:button:send'),
+      sendTitle: this.$t("passwordReset:button:send"),
-      formLoading: false
+      formLoading: false,
-    }
+    };
   },
   methods: {
     onSubmit() {
-      this.$refs['resetForm'].validate(valid => {
+      this.$refs["resetForm"].validate((valid) => {
         if (valid) {
-          this.formLoading = true
+          this.formLoading = true;
-          anonymousSetPassword(this.form.UserId, md5(this.form.NewPwd)).then(res => {
+          anonymousSetPassword(this.form.UserId, md5(this.form.NewPwd))
+            .then((res) => {
               if (res.IsSuccess) {
                 // 修改成功
-              this.$message.success(this.$t('passwordReset:message:updatedSuccessfully'))
+                this.$message.success(
-              this.formLoading = false
+                  this.$t("passwordReset:message:updatedSuccessfully")
-              this.goBack()
+                );
+                this.formLoading = false;
+                this.active = 3;
+                // this.goBack();
               } else {
-              this.$alert(res.ErrorMessage)
+                this.$alert(res.ErrorMessage);
-            }
-          }).catch(() => { this.formLoading = false })
               }
             })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
     },
     handleSendCode() {
-      const that = this
+      const that = this;
-      this.sendDisabled = true
+      this.sendDisabled = true;
       // var isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer'))
-      anonymousSendVerificationCode(this.form.EmailOrPhone).then(res => {
+      anonymousSendVerificationCode(this.form.EmailOrPhone)
+        .then((res) => {
           if (res.IsSuccess) {
-          that.settime(that)
+            let msg = this.$t('passwordReset:message:tip:sendCode').replace("xxx", this.form.EmailOrPhone)
+            this.$message.success(msg)
+            that.settime(that);
           } else {
-          that.$alert(res.ErrorMessage)
+            that.$alert(res.ErrorMessage);
           }
-      }).catch(() => {
-        this.sendDisabled = false
         })
+        .catch(() => {
+          this.sendDisabled = false;
+        });
     },
     verifyCode() {
-      this.formLoading = true
+      this.formLoading = true;
-      verifyAnonymousVerifyCode(this.form.EmailOrPhone, this.form.VerificationCode).then(res => {
+      verifyAnonymousVerifyCode(
-        this.formLoading = false
+        this.form.EmailOrPhone,
-        this.users = res.Result
+        this.form.VerificationCode
+      )
+        .then((res) => {
+          this.formLoading = false;
+          this.users = res.Result;
+          if (this.users.length === 1) {
+            this.form.UserId = this.users[0].UserId;
+            this.form.UserType = this.users[0].UserType;
+          }
           // 验证成功
-        this.$message.success(this.$t('passwordReset:message:verifiedSuccessfully'))
+          this.$message.success(
-      }).catch(() => { this.formLoading = false })
+            this.$t("passwordReset:message:verifiedSuccessfully")
+          );
+          this.active = 1;
+        })
+        .catch(() => {
+          this.formLoading = false;
+        });
     },
     handleEmailChange() {
-      var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+      var reg =
+        /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/;
       if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
-        this.sendDisabled = false
+        this.sendDisabled = false;
       }
     },
     handleUserChange(val) {
-      const seleted = this.users.findIndex(user => user.UserId === val)
+      const seleted = this.users.findIndex((user) => user.UserId === val);
       if (seleted > -1) {
-        this.form.UserType = this.users[seleted].UserType
+        this.form.UserType = this.users[seleted].UserType;
       }
     },
     settime(obj) {
       if (countdown === 0) {
-        obj.sendDisabled = false
+        obj.sendDisabled = false;
-        obj.sendTitle = this.$t('passwordReset:button:send')
+        obj.sendTitle = this.$t("passwordReset:button:send");
-        countdown = 60
+        countdown = 60;
-        clearTimeout(timer)
+        clearTimeout(timer);
-        return
+        return;
       } else {
-        obj.sendDisabled = true
+        obj.sendDisabled = true;
-        obj.sendTitle = `${this.$t('passwordReset:button:wait')}(${countdown}s)`
+        obj.sendTitle = `${this.$t(
-        countdown--
+          "passwordReset:button:wait"
+        )}(${countdown}s)`;
+        countdown--;
         // eslint-disable-next-line no-self-assign
-        countdown = countdown
+        countdown = countdown;
-        timer = setTimeout(function() {
+        timer = setTimeout(function () {
-          obj.settime(obj)
+          obj.settime(obj);
-        }, 1000)
+        }, 1000);
       }
     },
     onCancel() {
-      this.$refs['resetForm'].resetFields()
+      this.$refs["resetForm"].resetFields();
+      Object.keys(this.form).forEach((key) => {
+        this.form[key] = "";
+      });
+      this.active = 0;
     },
     goBack() {
-      this.$router.push('/login')
+      this.$router.push("/login");
-    }
+    },
-  }
+  },
-}
+};
 </script>
 <style>
 .reset-wrapper {
@@ -270,7 +396,12 @@ export default {
 /*/deep/ .is-error{*/
 /*  margin-bottom: 40px;*/
 /*}*/
-.is-error.my_new_pwd{
+.is-error.my_new_pwd {
   margin-bottom: 40px;
 }
+.flexBox {
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+}
 </style>

src/views/login/index.vue

@@ -6,17 +6,39 @@
     <div class="login-body">
       <div class="login-l">
         <div class="login-logo">
-          <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="">
+          <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
-          <img v-else src="@/assets/zzlogo4.png" alt="">
+          <img
+            v-else-if="NODE_ENV === 'usa'"
+            src="@/assets/zzlogo-usa.png"
+            alt=""
+            class="usa-logo"
+          />
+          <img v-else src="@/assets/zzlogo4.png" alt="" />
         </div>
-        <div class="login-image">
+        <div
-          <img src="@/assets/login-bg.png">
+          :class="{
+            'login-image': true,
+            'login-image-usa': NODE_ENV === 'usa',
+          }"
+        >
+          <svg-icon
+            icon-class="login-bg"
+            style="width: 90%; height: 90%"
+            v-if="NODE_ENV === 'usa'"
+          />
+          <img src="@/assets/login-bg.png" v-else />
         </div>
       </div>
       <div class="login-r">
         <div class="title-container">
           <!-- IRC Management System -->
-          <div class="title">{{ $t('login:title:system') }}</div>
+          <div v-if="NODE_ENV === 'usa'">
+            <svg-icon
+              icon-class="login-logo"
+              style="width: 300px; height: 94px"
+            />
+          </div>
+          <div class="title" v-else>{{ $t("login:title:system") }}</div>
         </div>
         <el-form
           ref="loginForm"
@@ -29,7 +51,11 @@
           <el-form-item
             prop="username"
             :rules="[
-              { required: true, message: this.$t('login:formRule:userName'), trigger: 'blur' }
+              {
+                required: true,
+                message: this.$t('login:formRule:userName'),
+                trigger: 'blur',
+              },
             ]"
           >
             <span class="svg-container">
@@ -50,7 +76,11 @@
           <el-form-item
             prop="password"
             :rules="[
-              { required: true, message: this.$t('login:formRule:password'), trigger: 'blur' }
+              {
+                required: true,
+                message: this.$t('login:formRule:password'),
+                trigger: 'blur',
+              },
             ]"
           >
             <span class="svg-container">
@@ -69,101 +99,139 @@
               @keyup.enter.native="handleLogin"
             />
             <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
+              <svg-icon
+                :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"
+              />
             </span>
           </el-form-item>
           <!-- Login -->
           <el-button
             :loading="loading"
             type="primary"
-            style="width:100%;margin-bottom:10px;"
+            style="
+              width: 100%;
+              margin-bottom: 10px;
+              background-color: rgb(0, 147, 221);
+            "
             size="medium"
             @click.native.prevent="handleLogin"
           >
-            {{ $t('login:button:login') }}
+            {{ $t("login:button:login") }}
           </el-button>
-          <div style="text-align: right;">
+          <div style="text-align: right">
-            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
+            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
             <!-- Forget password? -->
-            <el-button type="text" size="medium" @click.native.prevent="handleResetPwd">
+            <el-button
-              {{ $t('login:button:forgetPassword') }}
+              type="text"
+              size="medium"
+              @click.native.prevent="handleResetPwd"
+              style="color: rgb(0, 147, 221)"
+            >
+              {{ $t("login:button:forgetPassword") }}
             </el-button>
           </div>
         </el-form>
       </div>
     </div>
     <div v-if="language === 'zh'" class="login-footer">
-      <span>Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司 版权所有</span>
+      <span
+        >Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
+        版权所有</span
+      >
       <span> | </span>
       <a target="_blank" href="https://beian.miit.gov.cn/">
-        <span>
+        <span> 沪ICP备2021037850-2 </span>
-          沪ICP备2021037850-2
-        </span>
       </a>
       <span> | </span>
-      <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=31011002005859">
+      <a
-        <img src="@/assets/filing.png">
+        target="_blank"
+        href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=31011002005859"
+      >
+        <img src="@/assets/filing.png" />
         <span>沪公网安备 31011002005859号</span>
       </a>
       <a @click="openAbout">
-        <span style="color:#428bca">关于</span>
+        <span style="color: #428bca">关于</span>
       </a>
     </div>
-    <Vcode :show="isShow" :fail-text="$t('login:button:failText')" :success-text="$t('login:button:successText')" :slider-text="$t('login:button:sliderText')" :imgs="[Img1]" @success="onSuccess" />
+    <Vcode
+      :show="isShow"
+      :fail-text="$t('login:button:failText')"
+      :success-text="$t('login:button:successText')"
+      :slider-text="$t('login:button:sliderText')"
+      :imgs="[Img1]"
+      @success="onSuccess"
+    />
     <el-dialog
       v-if="aboutVisible"
       :visible.sync="aboutVisible"
       width="680px"
-      style="margin-top: 0;"
+      style="margin-top: 0"
       :close-on-click-modal="false"
       size="small"
     >
-      <div style="margin: 0 auto;width: 600px;line-height: 28px;text-align: center" >
+      <div
-        <h1 style="text-align: center;margin-bottom: 20px">关于</h1>
+        style="
-        <p style="margin-bottom: 20px">
+          margin: 0 auto;
-          IRC Imaging System
+          width: 600px;
-        </p>
+          line-height: 28px;
-        <p style="margin-bottom: 20px">
+          text-align: center;
-          V1.3.1.001
+        "
+      >
+        <h1 style="text-align: center; margin-bottom: 20px">关于</h1>
+        <p style="margin-bottom: 20px" v-if="NODE_ENV === 'usa'">
+          {{ $t("login:title:system_title") }}
         </p>
+        <p style="margin-bottom: 20px" v-else>{{ $t("login:title:system") }}</p>
+        <p style="margin-bottom: 20px">V1.5.4.001</p>
         <p style="margin-bottom: 20px" v-if="language === 'zh'">
-          Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司 版权所有
+          Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
+          版权所有
         </p>
         <p style="margin-bottom: 20px" v-else>
-          Copyright © {{ new Date().getFullYear() }} Shanghai Extensive Imaging Inc.
+          Copyright © {{ new Date().getFullYear() }} Shanghai Extensive Imaging
+          Inc.
         </p>
         <div style="margin-bottom: 20px">
-          <img style="width: 180px" src="@/assets/zzlogo2.png" alt="">
+          <img style="width: 180px" src="@/assets/zzlogo2.png" alt="" />
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" size="mini" @click="aboutVisible = false">关闭</el-button>
+        <el-button type="primary" size="mini" @click="aboutVisible = false"
+          >关闭</el-button
+        >
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { mapGetters, mapMutations } from 'vuex'
+import { mapGetters, mapMutations } from "vuex";
-import TopLang from './topLang'
+import TopLang from "./topLang";
 // import NoticeMarquee from '../trials/trials-layout/components/noticeMarquee'
-import Vcode from 'vue-puzzle-vcode'
+import Vcode from "vue-puzzle-vcode";
-import Img1 from '@/assets/pic-2.png'
+import Img1 from "@/assets/pic-2.png";
 export default {
-  name: 'Login',
+  name: "Login",
   components: { TopLang, Vcode },
   data() {
     return {
+      NODE_ENV: process.env.NODE_ENV,
       VUE_APP_OSS_CONFIG_REGION: process.env.VUE_APP_OSS_CONFIG_REGION,
       aboutVisible: false,
       loginForm: {
-        username: '',
+        username: "",
-        password: ''
+        password: "",
+        UserId: null,
       },
       loginRules: {
         username: [
-          { required: true, message: this.$t('login:formRule:userName'), trigger: 'blur' },
+          {
-          { max: 20, message: `${this.$t('common:ruleMessage:maxLength')} 20` }
+            required: true,
+            message: this.$t("login:formRule:userName"),
+            trigger: "blur",
+          },
+          { max: 20, message: `${this.$t("common:ruleMessage:maxLength")} 20` },
         ],
         password: [
           // {
@@ -171,40 +239,40 @@ export default {
           //   trigger: "blur",
           //   validator: this.$validatePassword
           // },
-          { required: true, message: this.$t('login:formRule:password'), trigger: 'blur' },
+          {
-          { max: 20, message: `${this.$t('common:ruleMessage:maxLength')} 20` }
+            required: true,
-        ]
+            message: this.$t("login:formRule:password"),
+            trigger: "blur",
+          },
+          { max: 20, message: `${this.$t("common:ruleMessage:maxLength")} 20` },
+        ],
       },
       loading: false,
-      passwordType: 'password',
+      passwordType: "password",
       loginType: null,
       location: null,
       isShow: false,
       showCode: false,
-      Img1
+      Img1,
-    }
+    };
   },
   computed: {
-    ...mapGetters([
+    ...mapGetters(["asyncRoutes", "routes", "language"]),
-      'asyncRoutes',
-      'routes',
-      'language'
-    ])
   },
   mounted() {
-    this.loginType = this.$route.query.loginType
+    this.loginType = this.$route.query.loginType;
-    this.location = this.$route.query.location
+    this.location = this.$route.query.location;
-    zzSessionStorage.setItem('loginType', this.loginType)
+    zzSessionStorage.setItem("loginType", this.loginType);
-    localStorage.setItem('location', this.location)
+    localStorage.setItem("location", this.location);
-    if (process.env.VUE_APP_OSS_CONFIG_REGION === 'oss-us-west-1') {
+    if (process.env.VUE_APP_OSS_CONFIG_REGION === "oss-us-west-1") {
-      this.$i18n.locale = 'en'
+      this.$i18n.locale = "en";
-      this.setLanguage('en')
+      this.setLanguage("en");
-      this.$updateDictionary()
+      this.$updateDictionary();
     } else {
-      if (this.location === 'USA') {
+      if (this.location === "USA" || this.NODE_ENV === "usa") {
-        this.$i18n.locale = 'en'
+        this.$i18n.locale = "en";
-        this.setLanguage('en')
+        this.setLanguage("en");
-        this.$updateDictionary()
+        this.$updateDictionary();
       } else {
         // this.$i18n.locale = 'zh'
         // this.setLanguage('zh')
@@ -213,85 +281,122 @@ export default {
     }
   },
   methods: {
-    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    ...mapMutations({ setLanguage: "lang/setLanguage" }),
     openAbout() {
-      this.aboutVisible = true
+      this.aboutVisible = true;
     },
     showPwd() {
-      if (this.passwordType === 'password') {
+      if (this.passwordType === "password") {
-        this.passwordType = ''
+        this.passwordType = "";
       } else {
-        this.passwordType = 'password'
+        this.passwordType = "password";
       }
       this.$nextTick(() => {
-        this.$refs.password.focus()
+        this.$refs.password.focus();
-      })
+      });
     },
     handleLogin() {
-      this.loginType = this.$route.query.loginType
+      this.loginType = this.$route.query.loginType;
-      this.$refs.loginForm.validate(valid => {
+      this.$refs.loginForm.validate((valid) => {
         if (valid) {
           if (this.showCode) {
-            this.isShow = true
+            this.isShow = true;
           } else {
-            this.onSuccess()
+            this.onSuccess();
           }
         } else {
           // console.log('error submit!!')
-          return false
+          return false;
         }
-      })
+      });
     },
-    loginIn() {
+    loginIn(Id) {
-      this.loading = true
+      this.loading = true;
-      this.showCode = false
+      this.showCode = false;
-      this.$store.dispatch('user/login', this.loginForm).then((res) => {
+      if (Id) this.loginForm.UserId = Id;
-        if (!res) {
+      this.$store
+        .dispatch("user/login", this.loginForm)
+        .then((res) => {
+          if (res.BasicInfo.IsFirstAdd) {
             // 当前用户为首次登录,请先修改密码之后再次登录
-          this.$message.success(this.$t('login:message:login1'))
+            this.$message.success(this.$t("login:message:login1"));
             setTimeout(() => {
-            this.$router.push({ path: `/recompose?userName=${this.loginForm.username}` })
+              this.$router.push({
-          }, 500)
+                path: `/recompose?userName=${this.loginForm.username}`,
-          return
+              });
+            }, 500);
+            return;
+          } else if (res.BasicInfo.LoginState === 1) {
+            // 请先修改密码后再登录！
+            this.$alert(
+              this.$t("login:message:login3"),
+              this.$t("common:title:warning"),
+              {
+                callback: (action) => {
+                  this.$router.push({
+                    path: `/recompose?userName=${this.loginForm.username}`,
+                  });
+                  return;
+                },
               }
-        this.$store.dispatch('permission/generateRoutes').then(res => {
+            );
-          this.loading = false
+            return;
+          } else if (res.IsMFA) {
+            this.$MFA({
+              UserId: res.BasicInfo.Id,
+              EMail: res.BasicInfo.EMail,
+              username: this.loginForm.username,
+              callBack: this.loginIn,
+              cancelBack: () => {
+                this.loading = false;
+              },
+            });
+            return;
+          } else if (res.BasicInfo.LoginState === 2) {
+            // 本次登录的IP或设备与上次不一致，请确认'
+            // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
+            this.$message.warning(this.$t("login:message:login4"));
+          }
+          this.$store.dispatch("permission/generateRoutes").then((res) => {
+            this.loading = false;
             if (res && res.length > 0) {
-            this.$store.dispatch('global/getNoticeList')
+              this.$store.dispatch("global/getNoticeList");
-            this.$router.addRoutes(res)
+              this.$router.addRoutes(res);
-            if (this.loginType === 'DevOps') {
+              if (this.loginType === "DevOps") {
-              this.$router.replace({ path: res[0].path })
+                this.$router.replace({ path: res[0].path });
-              return
+                return;
               }
-            if (this.hasPermi(['role:radmin'])) {
+              if (this.hasPermi(["role:radmin"])) {
-              this.$router.replace({ path: res[0].path })
+                this.$router.replace({ path: res[0].path });
-              return
+                return;
               }
-            if (this.hasPermi(['role:air', 'role:rpm', 'role:rcrc', 'role:rir'])) {
+              if (
-              this.$router.replace({ path: '/trials/trials-list' })
+                this.hasPermi(["role:air", "role:rpm", "role:rcrc", "role:rir"])
+              ) {
+                this.$router.replace({ path: "/trials/trials-list" });
               } else {
-              this.$router.replace({ path: '/trials' })
+                this.$router.replace({ path: "/trials" });
               }
             } else {
               // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
-            this.$message.warning(this.$t('login:message:login2'))
+              this.$message.warning(this.$t("login:message:login2"));
             }
-        })
+          });
         })
         .catch(() => {
-          this.showCode = true
+          this.showCode = true;
-          this.loading = false
+          this.loading = false;
-        })
+        });
     },
     onSuccess() {
-      this.isShow = false
+      this.isShow = false;
-      this.loginIn()
+      this.loginIn();
     },
     handleResetPwd() {
-      this.$router.push({ name: 'Resetpassword' })
+      this.$router.push({ name: "Resetpassword" });
-    }
+    },
-  }
+  },
-}
+};
 </script>
 
 <style lang="scss">
@@ -309,7 +414,7 @@ $cursor: #fff;
 
 /* reset element-ui css */
 .login-container {
-  .el-input {
+  .login-r .el-input {
     display: inline-block;
     height: 47px;
     width: 85%;
@@ -330,26 +435,30 @@ $cursor: #fff;
       // }
     }
   }
-
+  .login-r {
     .el-form-item {
       border: 1px solid rgba(255, 255, 255, 0.1);
       background: #f4f4f5;
       border-radius: 5px;
       color: #454545;
     }
+  }
 }
 </style>
 
 <style lang="scss" scoped>
-$bg:#2d3a4b;
+$bg: #2d3a4b;
-$dark_gray:#889aa4;
+$dark_gray: #889aa4;
-$light_gray:#606266;
+$light_gray: #606266;
 .login-container {
   position: relative;
   width: 100%;
   height: 100%;
   overflow: auto;
   background: rgb(249, 249, 249);
+  ::v-deep .el-input__inner::placeholder {
+    color: $dark_gray;
+  }
   .login-header {
     margin: 10px 0px 20px 10px;
     height: 3rem;
@@ -362,10 +471,10 @@ $light_gray:#606266;
     position: absolute;
     left: 50%;
     top: 50%;
-    transform: translate(-50%,-50%);
+    transform: translate(-50%, -50%);
     // margin-top: -230px;
     // margin-left: -400px;
-    width: 1200px;
+    width: 1100px;
     height: 600px;
     // margin: 30px auto;
     box-sizing: border-box;
@@ -376,17 +485,20 @@ $light_gray:#606266;
       float: left;
       width: 50%;
       height: 100%;
-      .login-logo{
+      .login-logo {
         position: absolute;
-        top:35px;
+        top: 35px;
         left: 50px;
-        img{
+        img {
           height: 40px;
         }
+        .usa-logo {
+          height: 60px;
         }
-      .login-image{
+      }
+      .login-image {
         position: absolute;
-        top:10px;
+        top: 10px;
         left: 0px;
         // transform: translateY(-50%);
         height: 100%;
@@ -394,7 +506,12 @@ $light_gray:#606266;
           height: 100%;
         }
       }
-
+      .login-image-usa {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+      }
     }
     .login-r {
       position: relative;
@@ -404,25 +521,31 @@ $light_gray:#606266;
 
       .login-form {
         position: absolute;
-        top: 50%;
+        top: 55%;
         // transform: translateY(-50%);
         left: 50%;
-        transform:translate(-50%,-50%);
+        transform: translate(-50%, -50%);
         width: 80%;
         padding: 10px;
         margin: 0 auto;
         overflow: hidden;
-
       }
       .title-container {
         // margin-bottom: 50px;
-        margin-top: 15%;
+        text-align: center;
+        margin-top: 20%;
         .title {
           font-size: 35px;
           color: $light_gray;
           text-align: center;
           font-weight: bold;
         }
+        .title-logo-message {
+          font-size: 26px;
+          color: $light_gray;
+          text-align: center;
+          margin-top: 20px;
+        }
       }
 
       .tips {
@@ -456,7 +579,7 @@ $light_gray:#606266;
       }
     }
   }
-  .login-footer{
+  .login-footer {
     position: absolute;
     bottom: 50px;
     left: 0px;
@@ -469,21 +592,20 @@ $light_gray:#606266;
     align-items: center;
     // color: rgb(180, 190, 199);
     color: #909399;
-    a{
+    a {
-      display:inline-block;
+      display: inline-block;
-      text-decoration:none;
+      text-decoration: none;
-      height:20px;
+      height: 20px;
-      line-height:20px;
+      line-height: 20px;
       display: flex;
       justify-content: center;
     }
-    span{
+    span {
       margin: 0 2px;
-
     }
-    img{
+    img {
-      height:20px;
+      height: 20px;
-      line-height:20px;
+      line-height: 20px;
     }
     // p{
     //   display: inline-block;
@@ -494,5 +616,4 @@ $light_gray:#606266;
     // }
   }
 }
-
 </style>

src/views/none-dicom-show/components/image-viewer.vue

@@ -50,7 +50,7 @@
             :ref="`img${i}`"
             :key="item.Id"
             crossorigin="anonymous"
-            :src="`${OSSclientConfig.basePath}${item.Path}`"
+            :src="item.FileType&&item.FileType.indexOf('zip')>=0?zipImg:`${OSSclientConfig.basePath}${item.Path}`"
             :style="imgStyle"
             style="max-width:100%;max-height: 100%;"
             @load="handleImgLoad"
@@ -68,7 +68,7 @@
 
 <script>
 import { on, off } from 'element-ui/src/utils/dom'
-import { rafThrottle, isFirefox } from 'element-ui/src/utils/util'
+import { rafThrottle, isFirefox } from 'element-ui/src/utils/util';
 
 const mousewheelEventName = isFirefox() ? 'DOMMouseScroll' : 'mousewheel'
 
@@ -102,6 +102,10 @@ export default {
     initialIndex: {
       type: Number,
       default: 0
+    },
+    zipImg:{
+      required:true,
+      default:''
     }
   },
 
@@ -117,7 +121,7 @@ export default {
         offsetX: 0,
         offsetY: 0,
         enableTransition: false
-      }
+      },
     }
   },
   computed: {

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

@@ -15,6 +15,7 @@
         :study-code="previewImage.studyCode"
         :body-part="previewImage.bodyPart"
         :modality="previewImage.modality"
+        :zip-img='zipImg'
       />
     </div>
     <div class="thumbnail-wrapper" style="z-index:999;background-color:#fff;">
@@ -42,7 +43,7 @@
                 }"
                 @click="selected(index)"
               >
-                <img :title="item.FileName" crossorigin="anonymous" :src="`${OSSclientConfig.basePath + item.Path}`">
+                <img :title="item.FileName" crossorigin="anonymous" :src="item.FileType&&item.FileType.indexOf('zip')>=0?zipImg:`${OSSclientConfig.basePath}${item.Path}`">
                 <p v-if="item.FileName" class="item-date">
                   {{ `${index+1}` }}
                 </p>
@@ -62,7 +63,8 @@
   </div>
 </template>
 <script>
-import ImageViewer from './image-viewer'
+import ImageViewer from './image-viewer';
+import zipImg from "@/assets/zip.png";
 export default {
   name: 'Preview',
   components: {
@@ -104,7 +106,8 @@ export default {
       previewVisible: true,
       translateX: 0,
       pageSize: 0, // 一页展示的图片数
-      urlList: []
+      urlList: [],
+      zipImg
     }
   },
   computed: {

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

@@ -82,10 +82,14 @@ export default {
       studyList: [],
       subjectVisitId: '',
       sudyId: '',
-      loading: false
+      loading: false,
+      bp:[]
     }
   },
-  mounted() {
+  async created(){
+    this.bp = await this.$getBodyPart(this.$route.query.trialId);
+  },
+  async mounted() {
     if (this.$router.currentRoute.query.TokenKey) {
       store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey)
       changeURLStatic('TokenKey', '')
@@ -97,6 +101,7 @@ export default {
   },
   methods: {
     getBodyPart(bodyPart) {
+      console.log(bodyPart)
       if (!bodyPart) return ''
       var separator = ','
       if (bodyPart.indexOf('|') > -1) {
@@ -108,8 +113,9 @@ export default {
       }
       var arr = bodyPart.split(separator)
       var newArr = arr.map(i => {
-        return this.$fd('Bodypart', i.trim())
+        return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:this.bp},'Name')
       })
+      console.log(newArr,this.bp)
       return newArr.join(' | ')
     },
     // 获取非Dicom检查信息

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

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

src/views/recompose/index.vue

@@ -146,7 +146,7 @@ export default {
   }
 </style>
 <style scoped>
-/deep/ .is-error{
+::v-deep .is-error{
   margin-bottom: 40px;
 }
 input:-webkit-autofill {

src/views/research/components/BaseInfo.vue

@@ -17,9 +17,9 @@
       <el-input v-model="form.IndicationType" disabled />
     </el-form-item>
     <!-- 中心名称 -->
-    <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="SiteId">
+    <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="TrialSiteId">
       <el-select
-        v-model="form.SiteId"
+        v-model="form.TrialSiteId"
         filterable
         style="width:100%;"
         :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
@@ -29,12 +29,12 @@
           v-for="(item,index) of siteOptions"
           :key="index"
           :label="item.TrialSiteAliasName"
-          :value="item.SiteId"
+          :value="item.TrialSiteId"
         />
       </el-select>
     </el-form-item>
     <!-- 中心编号 -->
-    <el-form-item v-if="form.SiteId" :label="$t('trials:researchForm:form:siteId')">
+    <el-form-item v-if="form.TrialSiteId" :label="$t('trials:researchForm:form:siteId')">
       <el-input v-model="form.TrialSiteCode" disabled />
     </el-form-item>
     <!-- 联系人 -->
@@ -59,7 +59,7 @@
       <el-input-number v-model="form.AverageEngravingCycle" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" controls-position="right" :min="0" />
     </el-form-item>
     <!-- 请确认参与本项目影像采集的影像技师具备对应的资质（如：“技师证”，对应设备的“大型设备上岗证”） -->
-    <el-form-item :label="$t('trials:researchForm:form:isQualified')">
+    <el-form-item v-if="!notShowFieldList.includes('IsConfirmImagingTechnologist')" :label="$t('trials:researchForm:form:isQualified')">
       <el-radio-group v-model="form.IsConfirmImagingTechnologist" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
         <el-radio
           v-for="item of $d.YesOrNo"
@@ -70,7 +70,7 @@
     </el-form-item>
     <!-- 原因 -->
     <el-form-item
-      v-if="form.IsConfirmImagingTechnologist === false"
+      v-if="!notShowFieldList.includes('NotConfirmReson') && form.IsConfirmImagingTechnologist === false"
       :label="$t('trials:researchForm:form:notQualifiedReason')"
     >
       <el-input
@@ -81,13 +81,13 @@
       />
     </el-form-item>
     <!-- 研究单位疗效评估人员类型 -->
-    <el-form-item :label="$t('trials:researchForm:form:staffType')">
+    <el-form-item v-if="!notShowFieldList.includes('EfficacyEvaluatorType')" :label="$t('trials:researchForm:form:staffType')">
       <el-radio-group v-model="form.EfficacyEvaluatorType" :disabled="!(state === 0 && userTypeEnumInt === 0)|| isHistory">
         <el-radio v-for="item of $d.EfficacyEvaluatorType" :key="`EfficacyEvaluatorType${item.value}`" :label="item.value">{{ item.label }}</el-radio>
       </el-radio-group>
     </el-form-item>
     <!-- 是否严格按照研究单位影像手册参数完成图像采集 -->
-    <el-form-item>
+    <el-form-item v-if="!notShowFieldList.includes('IsFollowStudyParameters')">
       <span slot="label" v-html="$t('trials:researchForm:form:isFollowStudyParam')" />
       <el-radio-group v-model="form.IsFollowStudyParameters" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
         <el-radio v-for="item of $d.YesOrNo" :key="`IsFollowStudyParameters${item.value}`" :label="item.value">{{ item.label }}</el-radio>
@@ -95,7 +95,7 @@
     </el-form-item>
     <!-- 不能严格按照研究单位影像手册参数采集图像原因 -->
     <el-form-item
-      v-if="!form.IsFollowStudyParameters"
+      v-if="!notShowFieldList.includes('NotFollowReson') && !form.IsFollowStudyParameters"
     >
       <span slot="label" v-html="$t('trials:researchForm:form:notFollowStudyParam')" />
       <el-input
@@ -162,7 +162,7 @@ export default {
         TrialSiteCode: '',
         TrialSiteAliasName: '',
         IndicationType: '', // 适应症
-        SiteId: '', // 研究单位名称
+        TrialSiteId: '', // 研究单位名称
         UserName: '', // 联系人
         Phone: '', // 联系人电话
         Email: '', // 联系人邮箱
@@ -174,11 +174,11 @@ export default {
         NotFollowReson: ''
       },
       rules: {
-        SiteId: [
+        TrialSiteId: [
           { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' }
         ],
         UserName: [
-          { required: true, validator: (rule, value, callback) => {!value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback()}, trigger: 'blur' },
+          { required: true, validator: (rule, value, callback) => { !value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback() }, trigger: 'blur' },
           { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: ['blur', 'change'] }
         ],
         Phone: [
@@ -189,7 +189,8 @@ export default {
       btnLoading: false,
       state: null,
       userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
-      isShow: false
+      isShow: false,
+      notShowFieldList: []
     }
   },
   methods: {
@@ -202,7 +203,7 @@ export default {
             const param = {
               id: this.form.Id,
               trialId: this.$route.query.trialId,
-              siteId: this.form.SiteId,
+              trialSiteId: this.form.TrialSiteId,
               userName: this.form.UserName,
               phone: this.form.Phone,
               email: this.form.Email,
@@ -234,7 +235,7 @@ export default {
     },
 
     // 初始化
-    async initForm(trialInfo, trialSiteSurvey) {
+    async initForm(trialInfo, trialSiteSurvey, notShowFieldList) {
       // 获取项目下的site
       const { Result } = await getTrialSiteSelect(this.$route.query.trialId)
       this.siteOptions = Result
@@ -246,7 +247,7 @@ export default {
       this.form.TrialSiteCode = trialSiteSurvey.TrialSiteCode
       this.form.TrialSiteAliasName = trialSiteSurvey.TrialSiteAliasName // 项目别称
       this.form.IndicationType = trialInfo.IndicationType // 适应症
-      this.form.SiteId = trialSiteSurvey.SiteId
+      this.form.TrialSiteId = trialSiteSurvey.TrialSiteId
       this.form.UserName = trialSiteSurvey.UserName // 联系人
       this.form.Phone = trialSiteSurvey.Phone // 联系人电话
       this.form.Email = trialSiteSurvey.Email // 联系人邮箱
@@ -258,9 +259,11 @@ export default {
       this.form.NotFollowReson = trialSiteSurvey.NotFollowReson
       this.state = trialSiteSurvey.State
       this.isShow = true
+      if (!notShowFieldList) return
+      this.notShowFieldList = notShowFieldList
     },
     handleSiteChange(val) {
-      var selected = this.siteOptions.find(item => item.SiteId === val)
+      var selected = this.siteOptions.find(item => item.TrialSiteId === val)
       if (selected) {
         this.form.TrialSiteCode = selected.TrialSiteCode
       }

src/views/research/components/EquipmentForm.vue

@@ -14,7 +14,7 @@
             :value="item.Id"
           /> -->
           <el-option
-            v-for="item of $d.Modality"
+            v-for="item of $d.SiteSurvey_ScanEquipmentType"
             :key="item.id"
             :label="item.label"
             :value="item.id"
@@ -22,7 +22,7 @@
         </el-select>
       </el-form-item>
       <!-- 扫描参数 -->
-      <el-form-item :label="$t('trials:equiptResearch:form:param')">
+      <el-form-item v-if="isShowParameters" :label="$t('trials:equiptResearch:form:param')">
         <el-input v-model="form.Parameters" />
       </el-form-item>
       <!-- 扫描仪器制造商名称 -->
@@ -68,6 +68,10 @@ export default {
     trialSiteSurveyEquipmentType: {
       type: String,
       default: ''
+    },
+    isShowParameters: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

src/views/research/components/EquipmentList.vue

@@ -21,28 +21,37 @@
       <el-table-column
         prop="EquipmentType"
         :label="$t('trials:equiptResearch:form:equipment')"
-        width="180"
+        min-width="120"
+        show-overflow-tooltip
       />
       <!-- 扫描参数 -->
       <el-table-column
+        v-if="isShowParameters"
         prop="Parameters"
         :label="$t('trials:equiptResearch:form:param')"
-        width="180"
+        min-width="100"
+        show-overflow-tooltip
       />
       <!-- 扫描仪器制造商名称 -->
       <el-table-column
+        min-width="120"
         prop="ManufacturerName"
         :label="$t('trials:equiptResearch:form:manufacturer')"
+        show-overflow-tooltip
       />
       <!-- 扫描仪型号 -->
       <el-table-column
+        min-width="120"
         prop="ScannerType"
         :label="$t('trials:equiptResearch:form:model')"
+        show-overflow-tooltip
       />
       <!-- 备注 -->
       <el-table-column
+        min-width="120"
         prop="Note"
         :label="$t('trials:equiptResearch:form:precautions')"
+        show-overflow-tooltip
       />
       <el-table-column
         v-if="state === 0 && userTypeEnumInt === 0 && !isHistory"
@@ -73,7 +82,7 @@
       custom-class="base-dialog-wrapper"
       :append-to-body="userTypeEnumInt !== 0"
     >
-      <EquipmentForm :data="rowData" :trial-site-survey-equipment-type="trialSiteSurveyEquipmentType" @getList="getList" @close="closeDialog" />
+      <EquipmentForm :data="rowData" :trial-site-survey-equipment-type="trialSiteSurveyEquipmentType" :is-show-parameters="isShowParameters" @getList="getList" @close="closeDialog" />
     </el-dialog>
 
   </div>
@@ -105,7 +114,8 @@ export default {
       userTypeEnumInt: 0,
       state: null,
       trialSiteSurveyId: '',
-      trialId: ''
+      trialId: '',
+      isShowParameters: false
     }
   },
   mounted() {
@@ -152,7 +162,8 @@ export default {
         }).catch(() => { this.loading = false })
       }).catch(() => {})
     },
-    initList(TrialSiteEquipmentSurveyList, trialSiteSurvey) {
+    initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, isShowParameters) {
+      this.isShowParameters = isShowParameters
       this.list = TrialSiteEquipmentSurveyList
       this.state = trialSiteSurvey.State
       this.$forceUpdate()

src/views/research/components/HistoricalRecord.vue

@@ -49,7 +49,7 @@ export default {
       this.loading = true
       var param = {
         trialId: this.trialId,
-        siteId: this.siteId,
+        trialSiteId: this.siteId,
         trialSiteSurveyId: this.trialSiteSurveyId
       }
       getTrialSiteSurveySelectList(param).then(res => {

src/views/research/components/ResearchForm.vue

@@ -175,7 +175,7 @@ export default {
             }
           })
           this.state = res.Result.TrialSiteSurvey.State
-          this.siteId = res.Result.TrialSiteSurvey.SiteId
+          this.siteId = res.Result.TrialSiteSurvey.TrialSiteId
           this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey)
           this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
           this.$refs['researchParticipants'].initList(newArr, res.Result.TrialSiteSurvey)

src/views/research/form.vue

@@ -93,7 +93,11 @@
       <el-card shadow="hover" class="mt10">
         <!-- 注意事项 -->
         <h4>{{ $t('trials:equiptResearch:form:precautions') }}</h4>
-        <ol>
+        <ol v-if="siteSurveyNoteInfo">
+          <div v-if="$i18n.locale === 'zh'" v-html="siteSurveyNoteInfo.ReplaceContentCN" />
+          <div v-else v-html="siteSurveyNoteInfo.ReplaceContent" />
+        </ol>
+        <ol v-else>
           <!-- 只要有可能，请确保受试者使用上述指定的扫描仪器采集影像。 -->
           <li>{{ $t('trials:equiptResearch:form:item1') }}</li>
           <!-- 请确保对每位受试者的扫描参数在整个研究过程中保持一致。 -->
@@ -203,7 +207,8 @@ export default {
       rejectForm: { reason: '' },
       btnLoading: false,
       isFullscreen: false,
-      historyVisible: false
+      historyVisible: false,
+      siteSurveyNoteInfo: null
     }
   },
   mounted() {
@@ -221,9 +226,12 @@ export default {
         if (res.Result) {
           // this.trialSiteSurveyEquipmentType = res.Result.TrialInfo.TrialSiteSurveyEquipmentType
           // this.trialSiteSurveyUserRoles = res.Result.TrialInfo.TrialSiteSurveyUserRoles
+          if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
+            this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
+          }
           this.state = res.Result.TrialSiteSurvey.State
-          this.siteId = res.Result.TrialSiteSurvey.SiteId
+          this.siteId = res.Result.TrialSiteSurvey.TrialSiteId
-          this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey)
+          this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig ? res.Result.SiteSurveyFiledConfig.NotShowFieldList : null)
           var historicalArr = []
           var newArr = []
           res.Result.TrialSiteUserSurveyList.map(i => {
@@ -236,7 +244,7 @@ export default {
 
           this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
           this.$refs['researchParticipants'].initList(newArr, res.Result.TrialSiteSurvey)
-          this.$refs['researchEquipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey)
+          this.$refs['researchEquipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey, !(res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0))
           this.isExistIncorrect = res.Result.TrialSiteUserSurveyList.every(item => item.IsCorrect === false)
         }
         this.loading = false
@@ -256,7 +264,7 @@ export default {
         this.submit(type)
       }
     },
-    submit() {
+    submit(type) {
       // 是否确认提交
       this.$confirm(this.userTypeEnumInt === 0 ? this.$t('trials:researchForm:message:submitWarning') : this.$t('trials:researchForm:message:submitWarning2'), {
         type: 'warning',
@@ -275,9 +283,9 @@ export default {
               this.$emit('refreshPage')
             }
             // this.$message.success(this.$t('common:message:savedSuccessfully'))
-            if(type === 'approve'){
+            if (type === 'approve') {
               this.$message.success(this.$t('common:message:approvedSuccessfully'))
-            }else{
+            } else {
               this.$message.success(this.$t('trials:researchForm:message:savedSuccessfully'))
             }
           }

src/views/research/login.vue

@@ -35,20 +35,20 @@
           </el-form-item>
           <!-- 中心名称 -->
           <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="SiteId">
-            <el-select v-model="form.SiteId" filterable style="width:100%;" @change="handleSiteChange">
+            <el-select v-model="form.TrialSiteId" filterable style="width:100%;" @change="handleSiteChange">
               <el-option
                 v-for="(item,index) of siteOptions"
                 :key="index"
                 :label="item.TrialSiteAliasName"
-                :value="item.SiteId"
+                :value="item.TrialSiteId"
               />
             </el-select>
           </el-form-item>
           <!-- 中心编号 -->
-          <el-form-item v-if="form.SiteId" :label="$t('trials:researchForm:form:siteId')">
+          <el-form-item v-if="form.TrialSiteId" :label="$t('trials:researchForm:form:siteId')">
             <el-input v-model="form.TrialSiteCode" disabled />
           </el-form-item>
-          <el-form-item v-if="form.SiteId && isHaveSiteSurveyRecord" label="" style="text-align:right;">
+          <el-form-item v-if="form.TrialSiteId && isHaveSiteSurveyRecord" label="" style="text-align:right;">
             <!-- 更新调研表 -->
             <el-link v-if="!form.IsUpdate" type="primary" @click="form.IsUpdate = true">
               {{ $t('trials:researchForm:button:updateQsForm') }}
@@ -160,7 +160,7 @@ export default {
         TrialCode: null, // 项目编号
         IndicationType: null, // 适应症
         ExperimentName: '',
-        SiteId: null, // 研究单位名称
+        TrialSiteId: null, // 研究单位名称
         UserName: null, // 联系人
         Phone: '', // 联系人电话
         EmailOrPhone: '',
@@ -170,7 +170,7 @@ export default {
         VerificationCode: ''
       },
       rules: {
-        SiteId: [
+        TrialSiteId: [
           { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: ['blur'] }
         ],
         UserName: [
@@ -243,7 +243,7 @@ export default {
             this.form.ReplaceUserEmailOrPhone = ''
           }
           const param = {
-            siteId: this.form.SiteId,
+            trialSiteId: this.form.TrialSiteId,
             userName: this.form.UserName,
             phone: this.form.Phone,
             verificationType: 0,
@@ -276,7 +276,7 @@ export default {
     },
     handleSiteChange(val) {
       this.isHaveSiteSurveyRecord = false
-      var selected = this.siteOptions.find(item => item.SiteId === val)
+      var selected = this.siteOptions.find(item => item.TrialSiteId === val)
       if (selected) {
         this.form.TrialSiteCode = selected.TrialSiteCode
         this.isHaveSiteSurveyRecord = selected.IsHaveSiteSurveyRecord
@@ -294,6 +294,8 @@ export default {
         if (res.IsSuccess) {
           this.getCode()
           this.loading = false
+          const msg = this.$t('trials:researchForm:tip:sendCode').replace('xxx', this.form.EmailOrPhone)
+          this.$message.success(msg)
         } else {
           this.$alert(res.ErrorMessage)
         }

src/views/reviewers/components/TrialExperience.vue

@@ -106,6 +106,7 @@
           <el-date-picker
             v-model="clinicalTrialForm.StartTime"
             type="year"
+            value-format="yyyy"
             >
           </el-date-picker>
         </el-form-item>
@@ -113,6 +114,7 @@
           <el-date-picker
             v-model="clinicalTrialForm.EndTime"
             type="year"
+            value-format="yyyy"
             >
           </el-date-picker>
         </el-form-item>
@@ -134,6 +136,7 @@
 import { getTrialExperience, addOrUpdateTrialExperience, deleteTrialExperience, updateOtherExperience } from '@/api/reviewers'
 import { getBasicDataSelects } from '@/api/dictionary/dictionary'
 import GcpCertificate from './GcpCertificate.vue'
+import moment from 'moment'
 const getClinicalTrialDefault = () => {
   return {
     PhaseId: '',
@@ -234,11 +237,11 @@ export default {
           var dateTime
           if (this.clinicalTrialForm.StartTime) {
             dateTime = new Date(this.clinicalTrialForm.StartTime)
-            this.clinicalTrialForm.StartTime = new Date(dateTime.setDate(dateTime.getDate()+1))
+            this.clinicalTrialForm.StartTime = moment(new Date(dateTime.setDate(dateTime.getDate()+1))).format('YYYY') + "-01"
           }
           if (this.clinicalTrialForm.EndTime) {
             dateTime = new Date(this.clinicalTrialForm.EndTime)
-            this.clinicalTrialForm.EndTime = new Date(dateTime.setDate(dateTime.getDate()+1))
+            this.clinicalTrialForm.EndTime = moment(new Date(dateTime.setDate(dateTime.getDate()+1))).format("YYYY") + "-01"
           }
           addOrUpdateTrialExperience(this.clinicalTrialForm).then(res => {
             this.isDisabled = false

src/views/system/log/components/LogForm.vue

@@ -26,6 +26,7 @@
           <el-date-picker
             v-model="form.PublishTime"
             type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
           />
         </el-form-item>
       </el-form>

src/views/system/log/index.vue

@@ -48,6 +48,7 @@
         :data="list"
         class="table"
         @sort-change="handleSortByColumn"
+        :default-sort="{prop:'PublishTime',order:'descending'}"
       >
         <el-table-column
           type="index"
@@ -130,8 +131,8 @@ const searchDataDefault = () => {
   return {
     Version: null,
     UpdateContent: null,
-    Asc: true,
+    Asc: false,
-    SortField: '',
+    SortField: 'PublishTime',
     PageIndex: 1,
     PageSize: 20
   }

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

@@ -6,7 +6,11 @@
           :label="$t('system:loginLog:label:OptType')"
           prop="OptType"
         >
-          <el-select v-model="searchData.OptType" clearable style="width:120px;">
+          <el-select
+            v-model="searchData.OptType"
+            clearable
+            style="width: 120px"
+          >
             <el-option
               v-for="item of $d.UserOptType"
               :key="'UserOptType' + item.label"
@@ -15,15 +19,12 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item
+        <el-form-item label="IP" prop="IP">
-          label="IP"
-          prop="IP"
-        >
           <el-input
             v-model="searchData.IP"
             size="small"
             clearable
-            style="width:120px;"
+            style="width: 120px"
           />
         </el-form-item>
         <el-form-item
@@ -34,12 +35,10 @@
             v-model="searchData.LoginFaildName"
             size="small"
             clearable
-            style="width:120px;"
+            style="width: 120px"
           />
         </el-form-item>
-        <el-form-item
+        <el-form-item :label="$t('system:loginLog:label:CreateTime')">
-          :label="$t('system:loginLog:label:CreateTime')"
-        >
           <el-date-picker
             v-model="datetimerange"
             type="datetimerange"
@@ -55,22 +54,19 @@
             size="mini"
             @click="getList"
           >
-            {{ $t('common:button:search') }}
+            {{ $t("common:button:search") }}
           </el-button>
         </el-form-item>
       </el-form>
       <el-table
         v-loading="loading"
-        v-adaptive="{bottomOffset:45}"
+        v-adaptive="{ bottomOffset: 45 }"
         height="100"
         :data="list"
         class="table"
         @sort-change="handleSortByColumn"
       >
-        <el-table-column
+        <el-table-column type="index" width="50" />
-          type="index"
-          width="50"
-        />
         <el-table-column
           :label="$t('system:loginLog:table:OptType')"
           prop="OptType"
@@ -79,7 +75,7 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ $fd('UserOptType',scope.row.OptType) }}
+            {{ $fd("UserOptType", scope.row.OptType) }}
           </template>
         </el-table-column>
         <el-table-column
@@ -89,6 +85,13 @@
           sortable="custom"
           show-overflow-tooltip
         />
+        <!-- <el-table-column
+          :label="$t('trials:loginLog:table:IPRegion')"
+          prop="IPRegion"
+          min-width="120"
+          show-overflow-tooltip
+          sortable="custom"
+        /> -->
         <el-table-column
           :label="$t('system:loginLog:table:LoginFaildName')"
           prop="LoginFaildName"
@@ -111,7 +114,7 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{ $fd('UserType',scope.row.LoginUserTypeEnum) }}
+            {{ $fd("UserType", scope.row.LoginUserTypeEnum) }}
           </template>
         </el-table-column>
         <el-table-column
@@ -129,7 +132,7 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{ $fd('UserType',scope.row.OptUserTypeEnum) }}
+            {{ $fd("UserType", scope.row.OptUserTypeEnum) }}
           </template>
         </el-table-column>
         <el-table-column
@@ -140,7 +143,7 @@
           show-overflow-tooltip
         />
       </el-table>
-      <div class="pagination" style="text-align: right;margin-top:5px;">
+      <div class="pagination" style="text-align: right; margin-top: 5px">
         <pagination
           :total="total"
           :page.sync="searchData.PageIndex"
@@ -148,27 +151,26 @@
           @pagination="getList"
         />
       </div>
-
     </div>
   </div>
 </template>
 <script>
-import { getUserLogList } from '@/api/user'
+import { getUserLogList } from "@/api/user";
-import Pagination from '@/components/Pagination'
+import Pagination from "@/components/Pagination";
-import moment from 'moment'
+import moment from "moment";
 const searchDataDefault = () => {
   return {
     OptType: null,
-    Ip: '',
+    Ip: "",
-    LoginFaildName: '',
+    LoginFaildName: "",
-    BeginDate: '',
+    BeginDate: "",
-    EndDate: '',
+    EndDate: "",
     Asc: false,
-    SortField: 'CreateTime',
+    SortField: "CreateTime",
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
-  }
+  };
-}
+};
 export default {
   components: { Pagination },
   data() {
@@ -178,53 +180,55 @@ export default {
       list: [],
       total: 0,
       loading: false,
-      datetimerange: []
+      datetimerange: [],
-    }
+    };
   },
   mounted() {
-    this.getList()
+    this.getList();
   },
   methods: {
     getList() {
-      this.loading = true
+      this.loading = true;
-      getUserLogList(this.searchData).then((res) => {
+      getUserLogList(this.searchData)
-        this.loading = false
+        .then((res) => {
-        this.list = res.Result.CurrentPageData
+          this.loading = false;
-        this.total = res.Result.TotalCount
+          this.list = res.Result.CurrentPageData;
-      }).catch(() => {
+          this.total = res.Result.TotalCount;
-        this.loading = false
         })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     handleDatetimeChange(val) {
       if (val) {
-        this.searchData.BeginDate = val[0]
+        this.searchData.BeginDate = val[0];
-        this.searchData.EndDate = val[1]
+        this.searchData.EndDate = val[1];
       } else {
-        this.searchData.BeginDate = ''
+        this.searchData.BeginDate = "";
-        this.searchData.EndDate = ''
+        this.searchData.EndDate = "";
       }
     },
     // 重置列表查询
     handleReset() {
-      this.searchData = searchDataDefault()
+      this.searchData = searchDataDefault();
-      this.getList()
+      this.getList();
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
+      if (column.order === "ascending") {
-        this.searchData.Asc = true
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
+      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1
+      this.searchData.PageIndex = 1;
-      this.getList()
+      this.getList();
-    }
+    },
-  }
+  },
-}
+};
 </script>
 <style lang="scss">
-  .log {
+.log {
   height: 100%;
   box-sizing: border-box;
   display: flex;
@@ -249,5 +253,5 @@ export default {
       text-align: right;
     }
   }
-  }
+}
 </style>

src/views/system/menu/index.vue

@@ -1,21 +1,38 @@
 <template>
   <div class="app-container my_menu">
     <el-form :inline="true">
-      <el-form-item label="菜单名称">
+      <el-form-item :label="$t('system:menu:search:menuName')">
         <el-input
           v-model="queryParams.menuName"
-          placeholder="请输入菜单名称"
+          placeholder=""
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态">
+      <el-form-item :label="$t('system:menu:search:visible')">
-        <el-select v-model="queryParams.visible" placeholder="菜单状态" clearable size="small" />
+        <el-select
+          v-model="queryParams.visible"
+          placeholder=""
+          clearable
+          size="small"
+        />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >{{ $t("system:menu:button:search") }}</el-button
+        >
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >{{ $t("system:menu:button:add") }}</el-button
+        >
       </el-form-item>
     </el-form>
     <div>
@@ -25,7 +42,8 @@
         icon="el-icon-sort"
         size="mini"
         @click="toggleExpandAll"
-      >展开/折叠</el-button>
+        >{{ $t("system:menu:button:foldAndExpand") }}</el-button
+      >
     </div>
     <el-table
       v-if="refreshTable"
@@ -33,38 +51,106 @@
       :data="menuList"
       :default-expand-all="isExpandAll"
       row-key="MenuId"
-      :tree-props="{children: 'Children', hasChildren: 'hasChildren'}"
+      :tree-props="{ children: 'Children', hasChildren: 'hasChildren' }"
+    >
+      <el-table-column
+        prop="MenuName"
+        :label="$t('system:menu:table:menuName')"
+        :show-overflow-tooltip="true"
+        min-width="130px"
+      />
+      <el-table-column
+        prop="icon"
+        :label="$t('system:menu:table:icon')"
+        align="center"
+        min-width="100px"
       >
-      <el-table-column prop="MenuName" label="菜单名称" :show-overflow-tooltip="true" min-width="130px" />
-      <el-table-column prop="icon" label="图标" align="center" min-width="100px">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.MenuIcon" />
         </template>
       </el-table-column>
-      <el-table-column prop="ShowOrder" label="排序" min-width="60px" />
+      <el-table-column
-      <el-table-column prop="Path" label="路由" min-width="120px" show-overflow-tooltip />
+        prop="ShowOrder"
-      <el-table-column prop="ApiPath" label="接口名" min-width="180px" show-overflow-tooltip />
+        :label="$t('system:menu:table:showOrder')"
-      <el-table-column prop="Component" label="组件路径" min-width="180px" :show-overflow-tooltip="true" />
+        min-width="60px"
-<!--      <el-table-column prop="Redirect" label="重定向" min-width="180px" :show-overflow-tooltip="true" />-->
+      />
-      <el-table-column prop="PermissionStr" label="权限标识" min-width="130px" :show-overflow-tooltip="true" />
+      <el-table-column
-      <el-table-column prop="PermissionStr" label="类型" min-width="80px" :show-overflow-tooltip="true">
+        prop="Path"
+        :label="$t('system:menu:table:path')"
+        min-width="120px"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ApiPath"
+        :label="$t('system:menu:table:apiPath')"
+        min-width="180px"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="Component"
+        :label="$t('system:menu:table:component')"
+        min-width="180px"
+        :show-overflow-tooltip="true"
+      />
+      <!--      <el-table-column prop="Redirect" label="重定向" min-width="180px" :show-overflow-tooltip="true" />-->
+      <el-table-column
+        prop="PermissionStr"
+        :label="$t('system:menu:table:permissionStr')"
+        min-width="130px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        prop="PermissionStr"
+        :label="$t('system:menu:table:type')"
+        min-width="80px"
+        :show-overflow-tooltip="true"
+      >
         <template slot-scope="scope">
-          {{ scope.row.MenuType === 'M' ? '目录' : scope.row.MenuType === 'C' ? '菜单' : '权限点' }}
+          {{
+            scope.row.MenuType === "M"
+              ? $t("system:menu:template:message:directttory")
+              : scope.row.MenuType === "C"
+              ? $t("system:menu:template:message:menu")
+              : $t("system:menu:template:message:permission")
+          }}
         </template>
       </el-table-column>
-      <el-table-column label="显影" align="center" prop="CreateTime" min-width="80">
+      <el-table-column
+        :label="$t('system:menu:table:showOrNone')"
+        align="center"
+        prop="CreateTime"
+        min-width="80"
+      >
         <template slot-scope="scope">
-          <el-tag v-if="!scope.row.IsDisplay" size="medium">显示</el-tag>
+          <el-tag v-if="!scope.row.IsDisplay" size="medium">{{
-          <el-tag v-else size="warning">隐藏</el-tag>
+            $t("system:menu:tag:show")
+          }}</el-tag>
+          <el-tag v-else size="warning">{{
+            $t("system:menu:tag:none")
+          }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="启用" align="center" prop="CreateTime" min-width="80">
+      <el-table-column
+        :label="$t('system:menu:table:enable')"
+        align="center"
+        prop="CreateTime"
+        min-width="80"
+      >
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.IsEnable" size="success">启用</el-tag>
+          <el-tag v-if="scope.row.IsEnable" size="success">{{
-          <el-tag v-else size="danger">禁用</el-tag>
+            $t("system:menu:tag:enable")
+          }}</el-tag>
+          <el-tag v-else size="danger">{{
+            $t("system:menu:tag:disable")
+          }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" min-width="180" class-name="small-padding fixed-width">
+      <el-table-column
+        :label="$t('system:menu:table:action')"
+        align="center"
+        min-width="180"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             v-hasPermi="['system:menu:edit']"
@@ -72,51 +158,72 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-          >修改</el-button>
+            >{{ $t("system:menu:button:edit") }}</el-button
+          >
           <el-button
             v-hasPermi="['system:menu:add']"
             size="mini"
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
-          >新增</el-button>
+            >{{ $t("system:menu:button:add") }}</el-button
+          >
           <el-button
             v-hasPermi="['system:menu:delete']"
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-          >删除</el-button>
+            >{{ $t("system:menu:button:remove") }}</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog
+      :title="title"
+      :close-on-click-modal="false"
+      :visible.sync="open"
+      width="680px"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="上级菜单">
+            <el-form-item :label="$t('system:menu:form:lastMenu')">
               <treeselect
                 v-model="form.ParentId"
                 :options="menuOptions"
                 :normalizer="normalizer"
                 :show-count="true"
-                placeholder="选择上级菜单"
+                placeholder=""
               />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="菜单类型" prop="menuType">
+            <el-form-item
+              :label="$t('system:menu:form:menuType')"
+              prop="menuType"
+            >
               <el-radio-group v-model="form.MenuType">
-                <el-radio label="M">目录</el-radio>
+                <el-radio label="M">{{
-                <el-radio label="C">菜单</el-radio>
+                  $t("system:menu:template:message:directttory")
-                <el-radio label="F">权限点</el-radio>
+                }}</el-radio>
+                <el-radio label="C">{{
+                  $t("system:menu:template:message:menu")
+                }}</el-radio>
+                <el-radio label="F">{{
+                  $t("system:menu:template:message:permission")
+                }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item v-if="form.MenuType != 'F'" label="菜单图标">
+            <el-form-item
+              v-if="form.MenuType != 'F'"
+              :label="$t('system:menu:form:menuIcon')"
+            >
               <el-popover
                 placement="bottom-start"
                 width="460"
@@ -124,118 +231,182 @@
                 @show="$refs['iconSelect'].reset()"
               >
                 <IconSelect ref="iconSelect" @selected="selected" />
-                <el-input slot="reference" v-model="form.MenuIcon" placeholder="点击选择图标" readonly>
+                <el-input
+                  slot="reference"
+                  v-model="form.MenuIcon"
+                  placeholder="点击选择图标"
+                  readonly
+                >
                   <svg-icon
                     v-if="form.MenuIcon"
                     slot="prefix"
                     :icon-class="form.MenuIcon"
                     class="el-input__icon"
-                    style="height: 28px;width: 16px;margin-left: 6px;"
+                    style="height: 28px; width: 16px; margin-left: 6px"
+                  />
+                  <i
+                    v-else
+                    slot="prefix"
+                    class="el-icon-search el-input__icon"
                   />
-                  <i v-else slot="prefix" class="el-icon-search el-input__icon" />
                 </el-input>
               </el-popover>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="菜单名称" prop="MenuName">
+            <el-form-item
-              <el-input v-model="form.MenuName" placeholder="请输入菜单名称" />
+              :label="$t('system:menu:form:menuName')"
+              prop="MenuName"
+            >
+              <el-input v-model="form.MenuName" placeholder="" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="显示排序" prop="ShowOrder">
+            <el-form-item
-              <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0" />
+              :label="$t('system:menu:form:showOrder')"
+              prop="ShowOrder"
+            >
+              <el-input-number
+                v-model="form.ShowOrder"
+                controls-position="right"
+                :min="0"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.MenuType != 'F'">
               <span slot="label">
-                <el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
+                <!--选择是外链则路由地址需要以`http(s)://`开头-->
+                <el-tooltip
+                  :content="$t('system:menu:form:isExternalLinkMessage')"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
-                是否外链
+                {{ $t("system:menu:form:isExternalLink") }}
               </span>
               <el-radio-group v-model="form.IsExternalLink">
-                <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-col>
           <el-col :span="12">
             <el-form-item v-if="form.MenuType != 'F'" prop="path">
               <span slot="label">
-                <el-tooltip content="访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头" placement="top">
+                <!--访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头-->
+                <el-tooltip
+                  :content="$t('system:menu:form:pathMessage')"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
-                路由地址
+                {{ $t("system:menu:form:path") }}
               </span>
-              <el-input v-model="form.Path" placeholder="请输入路由地址" />
+              <el-input v-model="form.Path" placeholder="" />
             </el-form-item>
           </el-col>
           <el-col v-if="form.MenuType == 'C'" :span="12">
             <el-form-item prop="component">
               <span slot="label">
-                <el-tooltip content="访问的组件路径，如：`system/user/index`，默认在`views`目录下" placement="top">
+                <!--访问的组件路径，如：`system/user/index`，默认在`views`目录下-->
+                <el-tooltip
+                  :content="$t('system:menu:form:componentMessage')"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
-                组件路径
+                {{ $t("system:menu:form:component") }}
               </span>
-              <el-input v-model="form.Component" placeholder="请输入组件路径" />
+              <el-input v-model="form.Component" placeholder="" />
             </el-form-item>
           </el-col>
           <el-col v-if="form.MenuType != 'F'" :span="12">
             <el-form-item prop="Redirect Path">
               <span slot="label">
-                <el-tooltip content="重定向路由，如：`/system/user/index`" placement="top">
+                <!--重定向路由，如：`/system/user/index`-->
+                <el-tooltip
+                  :content="$t('system:menu:form:redirectPathMessage')"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
-                重定向
+                {{ $t("system:menu:form:redirectPath") }}
               </span>
-              <el-input v-model="form.Redirect" placeholder="请输入重定向路由" />
+              <el-input v-model="form.Redirect" placeholder="" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.MenuType != 'M'">
-              <el-input v-model="form.PermissionStr" placeholder="请输入权限标识" maxlength="100" />
+              <el-input
+                v-model="form.PermissionStr"
+                placeholder=""
+                maxlength="100"
+              />
               <span slot="label">
-                <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
+                <!--控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)-->
+                <el-tooltip
+                  :content="$t('system:menu:form:permissionStrMessage')"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
-                权限字符
+                {{ $t("system:menu:form:permissionStr") }}
               </span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.MenuType != 'M'">
-              <el-input v-model="form.ApiPath" placeholder="接口名" />
+              <el-input v-model="form.ApiPath" placeholder="" />
               <span slot="label">
-                <el-tooltip content="接口名" placement="top">
+                <!--接口名-->
+                <el-tooltip
+                  :content="$t('system:menu:form:apiPathMessage')"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
-                接口名
+                {{ $t("system:menu:form:apiPath") }}
               </span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.MenuType == 'C'">
               <span slot="label">
-                <el-tooltip content="选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致" placement="top">
+                <!--选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致-->
+                <el-tooltip
+                  :content="$t('system:menu:form:isCacheMessage')"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
-                是否缓存
+                {{ $t("system:menu:form:isCache") }}
               </span>
               <el-radio-group v-model="form.IsCache">
-                <el-radio :label="true">缓存</el-radio>
+                <el-radio :label="true">{{
-                <el-radio :label="false">不缓存</el-radio>
+                  $t("system:menu:form:radio:cache")
+                }}</el-radio>
+                <el-radio :label="false">{{
+                  $t("system:menu:form:radio:notCache")
+                }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.MenuType != 'F'">
               <span slot="label">
-                <el-tooltip content="选择隐藏则路由将不会出现在侧边栏，但仍然可以访问" placement="top">
+                <!--选择隐藏则路由将不会出现在侧边栏，但仍然可以访问-->
+                <el-tooltip
+                  :content="$t('system:menu:form:isDisplayMessage')"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
-                是否隐藏
+                {{ $t("system:menu:form:isDisplay") }}
               </span>
               <el-switch
                 v-model="form.IsDisplay"
@@ -247,10 +418,14 @@
           <el-col :span="12">
             <el-form-item v-if="form.MenuType != 'F'">
               <span slot="label">
-                <el-tooltip content="选择隐藏则不会在trials模块的TAB中显示，但仍然可以访问" placement="top">
+                <!--c-->
+                <el-tooltip
+                  :content="$t('system:menu:form:isInTabDisplayMessage')"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
-                Tab显隐
+                {{ $t("system:menu:form:isInTabDisplay") }}
               </span>
               <el-switch
                 v-model="form.IsInTabDisplay"
@@ -262,10 +437,14 @@
           <el-col :span="12">
             <el-form-item v-if="form.MenuType != 'F'">
               <span slot="label">
-                <el-tooltip content="选择停用则路由将不会出现在侧边栏，也不能被访问" placement="top">
+                <!--选择停用则路由将不会出现在侧边栏，也不能被访问-->
+                <el-tooltip
+                  :content="$t('system:menu:form:isEnablesMessage')"
+                  placement="top"
+                >
                   <i class="el-icon-question" />
                 </el-tooltip>
-                菜单状态
+                {{ $t("system:menu:form:isEnable") }}
               </span>
               <el-switch
                 v-model="form.IsEnable"
@@ -275,33 +454,41 @@
             </el-form-item>
           </el-col>
           <el-col v-if="form.MenuType != 'F'" :span="24">
-            <el-form-item label="LangMark">
+            <el-form-item :label="$t('system:menu:form:LangMark')">
               <el-input v-model="form.LanguageMark" placeholder="LangMark" />
             </el-form-item>
           </el-col>
           <el-col v-if="form.MenuType != 'F'" :span="24">
-            <el-form-item label="mate">
+            <el-form-item :label="$t('system:menu:form:meta')">
-              <el-input v-model="form.Meta" type="textarea" placeholder="{ title: 'Setting', breadcrumb: false, role: [8, 1, 2, 3, 10] }" />
+              <el-input
+                v-model="form.Meta"
+                type="textarea"
+                placeholder="{ title: 'Setting', breadcrumb: false, role: [8, 1, 2, 3, 10] }"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">{{
-        <el-button @click="cancel">取 消</el-button>
+          $t("system:menu:button:save")
+        }}</el-button>
+        <el-button @click="cancel">{{
+          $t("system:menu:button:canel")
+        }}</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { getMenuList, addOrUpdateMenu, deleteMenu } from '@/api/system/menu'
+import { getMenuList, addOrUpdateMenu, deleteMenu } from "@/api/system/menu";
-import Treeselect from '@riophae/vue-treeselect'
+import Treeselect from "@riophae/vue-treeselect";
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import IconSelect from '@/components/IconSelect'
+import IconSelect from "@/components/IconSelect";
 
 export default {
-  name: 'Menu',
+  name: "Menu",
   components: { Treeselect, IconSelect },
   data() {
     return {
@@ -312,7 +499,7 @@ export default {
       // 菜单树选项
       menuOptions: [],
       // 弹出层标题
-      title: '',
+      title: "",
       // 是否显示弹出层
       open: false,
       // 菜单状态数据字典
@@ -320,7 +507,7 @@ export default {
       // 查询参数
       queryParams: {
         menuName: undefined,
-        visible: undefined
+        visible: undefined,
       },
       // 是否展开，默认全部折叠
       isExpandAll: false,
@@ -331,168 +518,207 @@ export default {
       // 表单校验
       rules: {
         MenuName: [
-          { required: true, message: '菜单名称不能为空', trigger: 'blur' }
+          {
+            required: true,
+            message: this.$t("system:menu:form:rule:notMenuName"),
+            trigger: "blur",
+          }, // 菜单名称不能为空
         ],
         ShowOrder: [
-          { required: true, message: '菜单顺序不能为空', trigger: 'blur' }
+          {
-        ]
+            required: true,
-      }
+            message: this.$t("system:menu:form:rule:notShowOrder"),
-    }
+            trigger: "blur",
+          }, // 菜单顺序不能为空
+        ],
+      },
+    };
   },
   created() {
-    console.log(this.hasPermi(['trials:trials-list:new', 'trials:trials-list:export1'], '&&'))
+    console.log(
-    this.getList()
+      this.hasPermi(
+        ["trials:trials-list:new", "trials:trials-list:export1"],
+        "&&"
+      )
+    );
+    this.getList();
     // this.getDicts("sys_show_hide").then(response => {
     //   this.visibleOptions = response.data;
     // });
   },
   methods: {
     toggleExpandAll() {
-      this.refreshTable = false
+      this.refreshTable = false;
-      this.isExpandAll = !this.isExpandAll
+      this.isExpandAll = !this.isExpandAll;
       this.$nextTick(() => {
-        this.refreshTable = true
+        this.refreshTable = true;
-      })
+      });
     },
     normalizer(node) {
       if (node.Children && !node.Children.length) {
-        delete node.Children
+        delete node.Children;
       }
       return {
         id: node.MenuId,
         label: node.MenuName,
-        children: node.Children
+        children: node.Children,
-      }
+      };
     },
     toTree(arr, ParentId) {
       function loop(ParentId) {
-        const res = []
+        const res = [];
         for (let i = 0; i < arr.length; i++) {
-          const item = arr[i]
+          const item = arr[i];
-          item.hasChildren = false
+          item.hasChildren = false;
           if (item.ParentId !== ParentId) {
-            continue
+            continue;
           }
-          item.Children = loop(item.MenuId)
+          item.Children = loop(item.MenuId);
-          res.push(item)
+          res.push(item);
         }
-        return res
+        return res;
       }
-      return loop(ParentId)
+      return loop(ParentId);
     },
     // 选择图标
     selected(name) {
-      this.form.MenuIcon = name
+      this.form.MenuIcon = name;
     },
     /** 查询菜单列表 */
     getList() {
-      this.loading = true
+      this.loading = true;
-      getMenuList(this.queryParams).then(res => {
+      getMenuList(this.queryParams)
-        this.menuList = this.toTree(res.Result, '00000000-0000-0000-0000-000000000000')
+        .then((res) => {
-        const menu = { MenuId: '00000000-0000-0000-0000-000000000000', MenuName: '主类目', Children: [] }
+          this.menuList = this.toTree(
-        menu.Children = this.menuList
+            res.Result,
-        this.menuOptions = Object.assign([], [menu])
+            "00000000-0000-0000-0000-000000000000"
-        this.loading = false
+          );
-      }).catch(function() {})
+          const menu = {
+            MenuId: "00000000-0000-0000-0000-000000000000",
+            MenuName: "主类目",
+            Children: [],
+          };
+          menu.Children = this.menuList;
+          this.menuOptions = Object.assign([], [menu]);
+          this.loading = false;
+        })
+        .catch(function () {});
     },
     /** 查询菜单下拉树结构 */
     getTreeselect() {
-      this.loading = true
+      this.loading = true;
-      getMenuList({}).then(res => {
+      getMenuList({})
-        const menu = { MenuId: '00000000-0000-0000-0000-000000000000', MenuName: '主类目', Children: [] }
+        .then((res) => {
-        menu.Children = this.toTree(res.Result, '00000000-0000-0000-0000-000000000000')
+          const menu = {
-        this.menuOptions = Object.assign([], [menu])
+            MenuId: "00000000-0000-0000-0000-000000000000",
-        this.loading = false
+            MenuName: "主类目",
-      }).catch(function() {})
+            Children: [],
+          };
+          menu.Children = this.toTree(
+            res.Result,
+            "00000000-0000-0000-0000-000000000000"
+          );
+          this.menuOptions = Object.assign([], [menu]);
+          this.loading = false;
+        })
+        .catch(function () {});
     },
     // 菜单显示状态字典翻译
     visibleFormat(row, column) {
-      if (row.MenuType === 'F') {
+      if (row.MenuType === "F") {
-        return ''
+        return "";
       }
-      return this.selectDictLabel(this.visibleOptions, row.visible)
+      return this.selectDictLabel(this.visibleOptions, row.visible);
     },
     // 取消按钮
     cancel() {
-      this.open = false
+      this.open = false;
-      this.reset()
+      this.reset();
     },
     // 表单重置
     reset() {
       this.form = {
         MenuId: null,
         ParentId: null,
-        MenuType: 'M',
+        MenuType: "M",
-        MenuIcon: '',
+        MenuIcon: "",
-        MenuName: '',
+        MenuName: "",
-        Path: '',
+        Path: "",
-        Component: '',
+        Component: "",
         ShowOrder: null,
         IsEnable: true,
         IsCache: false,
         IsDisplay: false,
         IsInTabDisplay: false,
         IsExternalLink: false,
-        PermissionStr: '',
+        PermissionStr: "",
-        Note: '',
+        Note: "",
-        CreateTime: '',
+        CreateTime: "",
         LanguageMark: null,
-        Apipath: null
+        Apipath: null,
-      }
+      };
-      this.resetForm('form')
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.getList()
+      this.getList();
     },
     /** 新增按钮操作 */
     handleAdd(row) {
-      this.reset()
+      this.reset();
-      this.getTreeselect()
+      this.getTreeselect();
       if (row != null) {
-        this.form.ParentId = row.MenuId
+        this.form.ParentId = row.MenuId;
       }
-      this.open = true
+      this.open = true;
-      this.title = '添加菜单'
+      this.title = this.$t("system:menu:form:title:addMenu");
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
+      this.reset();
-      this.getTreeselect()
+      this.getTreeselect();
-      this.form = Object.assign({}, row)
+      this.form = Object.assign({}, row);
-      this.open = true
+      this.open = true;
-      this.title = '修改菜单'
+      this.title = this.$t("system:menu:form:title:editMenu");
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
-      this.$refs['form'].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
-          addOrUpdateMenu(this.form).then(response => {
+          addOrUpdateMenu(this.form).then((response) => {
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
-            this.open = false
+            this.open = false;
-            this.getList()
+            this.getList();
-          })
+          });
         }
-      })
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$confirm('是否确认删除名称为"' + row.MenuName + '"的数据项?', '警告', {
+      let message = this.$t("system:menu:confirm:message:delete").replace(
-        confirmButtonText: '确定',
+        "xxx",
-        cancelButtonText: '取消',
+        row.MenuName
-        type: 'warning'
+      );
-      }).then(function() {
+      //'是否确认删除名称为"' + row.MenuName + '"的数据项?'
-        return deleteMenu(row.MenuId)
+      this.$confirm(message, this.$t("system:menu:confirm:title:warning"), {
-      }).then(() => {
+        confirmButtonText: this.$t("system:menu:button:save"),
-        this.getList()
+        cancelButtonText: this.$t("system:menu:button:canel"),
-        this.$message.success('删除成功')
+        type: "warning",
-      }).catch(function() {})
+      })
-    }
+        .then(function () {
-  }
+          return deleteMenu(row.MenuId);
-}
+        })
+        .then(() => {
+          this.getList();
+          this.$message.success(this.$t("common:message:deletedSuccessfully"));
+        })
+        .catch(function () {});
+    },
+  },
+};
 </script>
 <style lang="scss">
-  .vue-treeselect div{
+.vue-treeselect div {
   line-height: 40px;
-  }
+}
 </style>

src/views/system/role/components/RoleForm.vue

@@ -16,13 +16,17 @@
         <el-form-item label="Shortname: " prop="UserTypeShortName">
           <el-input v-model="form.UserTypeShortName" />
         </el-form-item>
-        <el-form-item label="是否内部角色: " prop="IsInternal">
+        <el-form-item
+          :label="$t('system:role:form:isInternal')"
+          prop="IsInternal"
+        >
           <el-radio-group v-model="form.IsInternal">
             <el-radio
               v-for="item of $d.YesOrNo"
               :key="`IsInternal${item.value}`"
               :label="item.value"
-            >{{ item.label }}</el-radio>
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
 
@@ -38,7 +42,11 @@
         </el-form-item>
 
         <el-form-item label="Order: ">
-          <el-input-number v-model="form.Order" controls-position="right" :min="0" />
+          <el-input-number
+            v-model="form.Order"
+            controls-position="right"
+            :min="0"
+          />
         </el-form-item>
         <el-form-item label="PermissionStr: " prop="PermissionStr">
           <el-input v-model="form.PermissionStr" />
@@ -58,9 +66,23 @@
           <el-input v-model="form.Description" type="textarea" :rows="5" />
         </el-form-item>
         <el-form-item label="role: ">
-          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event)">展开/折叠</el-checkbox>
+          <el-checkbox
-          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event)">全选/全不选</el-checkbox>
+            v-model="menuExpand"
-          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event)">父子联动</el-checkbox>
+            @change="handleCheckedTreeExpand($event)"
+            >{{ $t("system:role:form:checkbox:menuExpand") }}</el-checkbox
+          >
+          <el-checkbox
+            v-model="menuNodeAll"
+            @change="handleCheckedTreeNodeAll($event)"
+            >{{ $t("system:role:form:checkbox:menuNodeAll") }}</el-checkbox
+          >
+          <el-checkbox
+            v-model="form.menuCheckStrictly"
+            @change="handleCheckedTreeConnect($event)"
+            >{{
+              $t("system:role:form:checkbox:menuCheckStrictly")
+            }}</el-checkbox
+          >
           <el-tree
             ref="menu"
             class="tree-border"
@@ -76,155 +98,186 @@
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="model_cfg.visible = false">Cancel
+      <el-button
+        :disabled="btnLoading"
+        size="small"
+        type="primary"
+        @click="model_cfg.visible = false"
+        >Cancel
       </el-button>
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+      <el-button
+        size="small"
+        type="primary"
+        :loading="btnLoading"
+        @click="handleSave"
+        >Save</el-button
+      >
     </template>
   </base-model>
 </template>
 <script>
-import { addOrUpdateUserType } from '@/api/admin'
+import { addOrUpdateUserType } from "@/api/admin";
 // import { addOrUpdateUserType } from '@/api/system/role'
 // import { getMenuList } from '@/api/system/menu'
-import { getMenuList } from '@/api/system/menu'
+import { getMenuList } from "@/api/system/menu";
-import { model_cfg } from '../role'
+import { model_cfg } from "../role";
-import BaseModel from '@/components/BaseModel'
+import BaseModel from "@/components/BaseModel";
 
 export default {
   components: { BaseModel },
-  dicts: ['UserTypeGroup'],
+  dicts: ["UserTypeGroup"],
   props: {
     data: {
       type: Object,
       default() {
         return {
-          Id: '',
+          Id: "",
-          UserTypeName: '',
+          UserTypeName: "",
           IsInternal: true,
-          UserTypeShortName: '',
+          UserTypeShortName: "",
-          Order: '',
+          Order: "",
-          Description: '',
+          Description: "",
-          PermissionStr: '',
+          PermissionStr: "",
-          UserTypeEnum: null
+          UserTypeEnum: null,
-        }
+        };
-      }
+      },
-    }
+    },
   },
   data() {
     return {
       menuExpand: false,
       menuNodeAll: false,
-      userTypeGroupOptions: [{ value: 1, label: 'Trial' }, { value: 2, label: 'Reviewer' }, { value: 3, label: 'Other' }],
+      userTypeGroupOptions: [
+        { value: 1, label: "Trial" },
+        { value: 2, label: "Reviewer" },
+        { value: 3, label: "Other" },
+      ],
       model_cfg,
       defaultProps: {
-        children: 'Children',
+        children: "Children",
-        label: 'MenuName'
+        label: "MenuName",
       },
       form: {
-        Id: '',
+        Id: "",
-        UserType: '',
+        UserType: "",
         IsInternal: true,
-        UserTypeShortName: '',
+        UserTypeShortName: "",
         Type: null,
-        Description: '',
+        Description: "",
         UserTypeGroupIdList: [],
-        menuCheckStrictly: true
+        menuCheckStrictly: true,
       },
       rules: {
-        UserTypeName: [{ required: true, message: 'Please specify', trigger: 'blur' }, {
+        UserTypeName: [
+          { required: true, message: "Please specify", trigger: "blur" },
+          {
             max: 50,
-          message: 'The maximum length is 50'
+            message: "The maximum length is 50",
-        }],
+          },
-        UserTypeShortName: [{ required: true, message: 'Please specify', trigger: 'blur' }, {
+        ],
+        UserTypeShortName: [
+          { required: true, message: "Please specify", trigger: "blur" },
+          {
             max: 50,
-          message: 'The maximum length is 50',
+            message: "The maximum length is 50",
-          trigger: 'blur'
+            trigger: "blur",
-        }],
+          },
-        Description: [{ max: 500, message: 'The maximum length is 500' }],
+        ],
-        UserTypeGroupIdList: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        Description: [{ max: 500, message: "The maximum length is 500" }],
-        UserTypeEnum: [{ required: true, message: 'Please select', trigger: 'blur' }]
+        UserTypeGroupIdList: [
+          { required: true, message: "Please specify", trigger: "blur" },
+        ],
+        UserTypeEnum: [
+          { required: true, message: "Please select", trigger: "blur" },
+        ],
       },
       menuOptions: [],
-      btnLoading: false
+      btnLoading: false,
-    }
+    };
   },
   mounted() {
-    this.getMenuList()
+    this.getMenuList();
     if (Object.keys(this.data).length && this.data.Id) {
-      this.form = { ...this.data }
+      this.form = { ...this.data };
     }
   },
   methods: {
     handleCheckedTreeConnect(value) {
-      this.form.menuCheckStrictly = !!value
+      this.form.menuCheckStrictly = !!value;
     },
     getMenuAllCheckedKeys() {
       // 目前被选中的菜单节点
-      const checkedKeys = this.$refs.menu.getCheckedKeys()
+      const checkedKeys = this.$refs.menu.getCheckedKeys();
       // 半选中的菜单节点
-      const halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys()
+      const halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
+      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-      return checkedKeys
+      return checkedKeys;
     },
 
     handleCheckedTreeExpand(value) {
-      const treeList = this.menuOptions
+      const treeList = this.menuOptions;
       for (let i = 0; i < treeList.length; i++) {
-        this.$refs.menu.store.nodesMap[treeList[i].MenuId].expanded = value
+        this.$refs.menu.store.nodesMap[treeList[i].MenuId].expanded = value;
       }
     },
     handleCheckedTreeNodeAll(value, type) {
-      this.$refs.menu.setCheckedNodes(value ? this.menuOptions : [])
+      this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
     },
     toTree(arr, ParentId) {
       function loop(ParentId) {
-        const res = []
+        const res = [];
         for (let i = 0; i < arr.length; i++) {
-          const item = arr[i]
+          const item = arr[i];
-          item.hasChildren = false
+          item.hasChildren = false;
           if (item.ParentId !== ParentId) {
-            continue
+            continue;
           }
-          item.Children = loop(item.MenuId)
+          item.Children = loop(item.MenuId);
-          res.push(item)
+          res.push(item);
         }
-        return res
+        return res;
       }
 
-      return loop(ParentId)
+      return loop(ParentId);
     },
     getMenuList() {
-      getMenuList({}).then(res => {
+      getMenuList({})
-        const menu = this.toTree(res.Result, '00000000-0000-0000-0000-000000000000')
+        .then((res) => {
-        this.menuOptions = menu
+          const menu = this.toTree(
-        console.log(this.menuOptions)
+            res.Result,
+            "00000000-0000-0000-0000-000000000000"
+          );
+          this.menuOptions = menu;
+          console.log(this.menuOptions);
           this.$nextTick(() => {
-          this.form.MenuIds.forEach(v => {
+            this.form.MenuIds.forEach((v) => {
-            this.$refs.menu.setChecked(v, true, false)
+              this.$refs.menu.setChecked(v, true, false);
-          })
+            });
-        })
+          });
-      }).catch(function() {
         })
+        .catch(function () {});
     },
     handleSave() {
-      this.$refs.roleForm.validate(valid => {
+      this.$refs.roleForm.validate((valid) => {
-        if (!valid) return
+        if (!valid) return;
-        this.btnLoading = true
+        this.btnLoading = true;
-        this.model_cfg.showClose = false
+        this.model_cfg.showClose = false;
-        this.form.MenuIds = this.getMenuAllCheckedKeys()
+        this.form.MenuIds = this.getMenuAllCheckedKeys();
-        console.log(this.form.MenuIds)
+        console.log(this.form.MenuIds);
-        addOrUpdateUserType(this.form).then(res => {
+        addOrUpdateUserType(this.form)
-          this.btnLoading = false
+          .then((res) => {
-          this.$refs['roleForm'].resetFields()
+            this.btnLoading = false;
-          this.$emit('close')
+            this.$refs["roleForm"].resetFields();
-          this.model_cfg.showClose = true
+            this.$emit("close");
-          this.$message.success('Saved successfully!')
+            this.model_cfg.showClose = true;
-        }).catch(() => {
+            this.$message.success("Saved successfully!");
-          this.btnLoading = false
-          this.model_cfg.showClose = true
           })
-      })
+          .catch(() => {
-    }
+            this.btnLoading = false;
-  }
+            this.model_cfg.showClose = true;
-}
+          });
+      });
+    },
+  },
+};
 </script>

src/views/system/user/list/index.vue

@@ -11,12 +11,6 @@
         @reset="handleReset"
         @new="handleAddUser"
       />
-<!--      <el-button-->
-<!--        type="primary"-->
-<!--        size="mini"-->
-<!--        style="margin-left:auto;height: 28px;position: absolute;bottom: 0;right: 10px"-->
-<!--        @click="handleAddUser"-->
-<!--      >{{$t('common:button:new')}}</el-button>-->
     </div>
     <base-table
       v-loading="loading"
@@ -68,9 +62,12 @@ const searchDataDefault = () => {
     UserType: null,
     PageIndex: 1,
     PageSize: 20,
-    Asc: true,
+    Asc: false,
     RealName: '',
-    SortField: ''
+    BeginCreateTime: '',
+    EndCreateTime: '',
+    CreateTimeArr: [],
+    SortField: 'CreateTime'
   }
 }
 export default {
@@ -163,6 +160,13 @@ export default {
           minWidth: 100,
           sortable: 'custom',
           showOverflowTooltip: true },
+        {
+          prop: "CreateTime",
+          label: this.$t("system:userlist:table:createTime"),
+          minWidth: 200,
+          sortable: "custom",
+          showOverflowTooltip: true,
+        },
         { type: 'operate',
           label: this.$t('common:action:action'),
           minWidth: 200,
@@ -193,6 +197,13 @@ export default {
           width: '120px',
           placeholder: ''
         },
+        {
+          type: "Input",
+          label: this.$t("system:userlist:label:EMail"),
+          prop: "EMail",
+          width: "120px",
+          placeholder: "",
+        },
         {
           type: 'Input',
           label: this.$t('system:userlist:label:Organization'),
@@ -247,7 +258,14 @@ export default {
           options: [], // 下拉选项
           props: { label: 'UserType', value: 'Id' }, // 下拉选项配置信息，必填
           placeholder: ''
-        }
+        },
+        {
+          type: "Daterange",
+          label: this.$t("system:userlist:label:CreateTime"),
+          prop: "CreateTimeArr",
+          width: "400px",
+          placeholder: "",
+        },
       ],
       searchHandle: [
         { label: this.$t('common:button:reset'), type: 'primary', emitKey: 'reset' },
@@ -314,7 +332,14 @@ export default {
     handleReset() {
       this.searchData = searchDataDefault()
       this.getList()
+    },
+    handleSearch() {
+      if (this.searchData.CreateTimeArr.length > 0) {
+        this.searchData.BeginCreateTime = this.searchData.CreateTimeArr[0]
+        this.searchData.EndCreateTime = this.searchData.CreateTimeArr[1]
       }
+      this.getList()
+    },
   }
 }
 </script>

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

@@ -1,6 +1,6 @@
 <template>
   <div class="notice-marquee_wrapper">
-    <marquee ref="mar" hspace="0" direction="left" width="500" @mouseout="start()" @mouseover="stop()">
+    <marquee ref="mar" hspace="0" direction="left" width="100%" @mouseout="start()" @mouseover="stop()">
       <!-- <i class="el-icon-message-solid" /> -->
       <svg-icon v-if="noticeList.length > 0" icon-class="speaker" />
       <span v-for="item in noticeList" :key="item.Id" style="cursor:pointer;" @click="showDetail(item)">
@@ -70,6 +70,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .notice-marquee_wrapper{
+  width: 100%;
   /deep/ .el-dialog__header{
     padding: 10px;
   }

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

@@ -1,11 +1,17 @@
 <template>
   <div class="trials-navbar" style="position: relative">
     <div class="leftMenu">
-      <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="">
+      <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
-      <img v-else src="@/assets/zzlogo4.png" alt="">
+      <img
-      <span style="white-space:nowrap;">
+        v-else-if="NODE_ENV === 'usa'"
+        src="@/assets/title-logo.png"
+        alt=""
+        class="title-logo"
+      />
+      <img v-else src="@/assets/zzlogo4.png" alt="" />
+      <span style="white-space: nowrap" v-if="NODE_ENV !== 'usa'">
         <!-- 中心影像系统（EICS） -->
-        {{ $t('trials:trials:title:eics') }}
+        {{ $t("trials:trials:title:eics") }}
       </span>
     </div>
     <div class="center-menu">
@@ -19,22 +25,49 @@
         size="mini"
         @select="handleSelect"
       >
-        <el-menu-item v-if="!hasPermi(['role:air', 'role:rpm', 'role:radmin', 'role:rcrc', 'role:rir'])" index="1">
+        <el-menu-item
+          v-if="
+            !hasPermi([
+              'role:air',
+              'role:rpm',
+              'role:radmin',
+              'role:rcrc',
+              'role:rir',
+            ])
+          "
+          index="1"
+        >
           <i class="el-icon-odometer" />
           <!-- 工作台 -->
-          <span slot="title">{{ $t('trials:menuTitle:workbench') }}</span>
+          <span slot="title">{{ $t("trials:menuTitle:workbench") }}</span>
         </el-menu-item>
-        <el-menu-item v-if="!hasPermi(['role:zys'])" index="2" :disabled="TotalNeedSignSystemDocCount !== 0">
+        <el-menu-item
+          v-if="!hasPermi(['role:zys'])"
+          index="2"
+          :disabled="TotalNeedSignSystemDocCount !== 0"
+        >
           <i class="el-icon-box" />
           <!-- 我的项目 -->
           <span slot="title">
-            {{ $t('trials:tab:trials') }}
+            {{ $t("trials:tab:trials") }}
           </span>
         </el-menu-item>
-        <el-menu-item v-if="!hasPermi(['role:air', 'role:rpm', 'role:radmin', 'role:rcrc', 'role:rir', 'role:zys'])" index="3">
+        <el-menu-item
+          v-if="
+            !hasPermi([
+              'role:air',
+              'role:rpm',
+              'role:radmin',
+              'role:rcrc',
+              'role:rir',
+              'role:zys',
+            ])
+          "
+          index="3"
+        >
           <i class="el-icon-chat-dot-square" />
           <!-- 通知消息 -->
-          <span slot="title">{{ $t('trials:tab:notice') }}</span>
+          <span slot="title">{{ $t("trials:tab:notice") }}</span>
         </el-menu-item>
 
         <el-submenu index="4" class="my_info">
@@ -45,108 +78,133 @@
             <span v="userTypeShortName">({{ userTypeShortName }})</span> -->
           </span>
           <!-- 账户信息 -->
-          <el-menu-item v-if="!hasPermi(['role:air'])" index="4-2">{{ $t('trials:trials-myinfo:title:accountInfo') }}</el-menu-item>
+          <el-menu-item v-if="!hasPermi(['role:air'])" index="4-2">{{
+            $t("trials:trials-myinfo:title:accountInfo")
+          }}</el-menu-item>
+          <!-- 管理后台 -->
+          <el-menu-item
+            v-if="hasPermi(['role:dev', 'role:oa', 'role:admin'])"
+            index="4-4"
+            >{{ $t("trials:trials-myinfo:title:system") }}</el-menu-item
+          >
           <!-- 退出 -->
-          <el-menu-item index="4-3">{{ $t('trials:trials-myinfo:button:loginout') }}</el-menu-item>
+          <el-menu-item index="4-3">{{
+            $t("trials:trials-myinfo:button:loginout")
+          }}</el-menu-item>
         </el-submenu>
       </el-menu>
-      <TopLang />
+      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
     </div>
   </div>
 </template>
 
 <script>
-import { mapGetters, mapMutations } from 'vuex'
+import { mapGetters, mapMutations } from "vuex";
-import TopLang from './topLang'
+import TopLang from "./topLang";
-import NoticeMarquee from './noticeMarquee'
+import NoticeMarquee from "./noticeMarquee";
 export default {
   components: { TopLang, NoticeMarquee },
   data() {
     return {
-      activeIndex: '2',
+      activeIndex: "2",
       isReviewer: false,
-      userTypeShortName: zzSessionStorage.getItem('userTypeShortName'),
+      userTypeShortName: zzSessionStorage.getItem("userTypeShortName"),
-      notice: ''
+      notice: "",
-    }
+      VUE_APP_OSS_CONFIG_REGION: process.env.VUE_APP_OSS_CONFIG_REGION,
+      NODE_ENV: process.env.NODE_ENV,
+    };
   },
   computed: {
-    ...mapGetters(['sidebar', 'name', 'userName', 'device', 'TotalNeedSignSystemDocCount', 'language'])
+    ...mapGetters([
+      "sidebar",
+      "name",
+      "userName",
+      "device",
+      "TotalNeedSignSystemDocCount",
+      "language",
+    ]),
   },
   watch: {
     $route(v) {
-      this.changeRoute(v)
+      this.changeRoute(v);
-    }
+    },
   },
   created() {
-    console.log(!this.hasPermi(['role:air']))
+    console.log(!this.hasPermi(["role:air"]));
-    this.isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer'))
+    this.isReviewer = JSON.parse(zzSessionStorage.getItem("IsReviewer"));
-    this.changeRoute(this.$route)
+    this.changeRoute(this.$route);
   },
   methods: {
-    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    ...mapMutations({ setLanguage: "lang/setLanguage" }),
     changeRoute(v) {
-      if (v.path === '/trials/trials-workbench') {
+      if (v.path === "/trials/trials-workbench") {
-        this.activeIndex = '1'
+        this.activeIndex = "1";
       }
-      if (v.path === '/trials/trials-list' || ~v.path.indexOf('/trials/trials-panel')) {
+      if (
-        this.activeIndex = '2'
+        v.path === "/trials/trials-list" ||
+        ~v.path.indexOf("/trials/trials-panel")
+      ) {
+        this.activeIndex = "2";
       }
-      if (v.path === '/trials/trials-notice') {
+      if (v.path === "/trials/trials-notice") {
-        this.activeIndex = '3'
+        this.activeIndex = "3";
       }
-      if (v.path === '/trials/trials-myinfo') {
+      if (v.path === "/trials/trials-myinfo") {
-        this.activeIndex = '4-2'
+        this.activeIndex = "4-2";
       }
     },
     handleSelect(key, keyPath) {
       switch (key) {
-        case '4-2':
+        case "4-2":
-          this.go('/trials/trials-myinfo')
+          this.go("/trials/trials-myinfo");
-          break
+          break;
-        case '4-3':
+        case "4-3":
-          this.logout()
+          this.logout();
-          break
+          break;
-        case '1':
+        case "4-4":
-          this.go('/trials/trials-workbench')
+          this.go("/dashboard/list");
-          break
+          break;
-        case '2':
+        case "1":
-          if (~this.$route.path.indexOf('/trials/trials-panel')) {
+          this.go("/trials/trials-workbench");
-            return
+          break;
+        case "2":
+          if (~this.$route.path.indexOf("/trials/trials-panel")) {
+            return;
           }
-          var lastWorkbench = zzSessionStorage.getItem('lastWorkbench')
+          var lastWorkbench = zzSessionStorage.getItem("lastWorkbench");
           if (lastWorkbench) {
-            this.go(lastWorkbench)
+            this.go(lastWorkbench);
           } else {
-            this.go('/trials/trials-list')
+            this.go("/trials/trials-list");
           }
-          break
+          break;
-        case '3':
+        case "3":
-          this.go('/trials/trials-notice')
+          this.go("/trials/trials-notice");
-          break
+          break;
       }
     },
     toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
+      this.$store.dispatch("app/toggleSideBar");
     },
     async logout() {
-      await this.$store.dispatch('user/logout') 
+      await this.$store.dispatch("user/logout");
-      this.$router.push(`/login`)
+      this.$router.push(`/login`);
-      this.$i18n.locale = 'zh'
+      this.$i18n.locale = "zh";
-      this.setLanguage('zh')
+      this.setLanguage("zh");
-      this.$updateDictionary()
+      this.$updateDictionary();
     },
     go(value) {
-      this.$router.push({ path: value })
+      this.$router.push({ path: value });
     },
     account() {
-      this.$router.push({ name: 'Account' })
+      this.$router.push({ name: "Account" });
-    }
+    },
-  }
+  },
-}
+};
 </script>
 
 <style lang="scss" scoped>
-.trials-navbar{
+.trials-navbar {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
@@ -154,24 +212,29 @@ export default {
   overflow: hidden;
   background: #fff;
   box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
-  .el-breadcrumb__item{
+  .el-breadcrumb__item {
     font-size: 16px;
   }
-  .leftMenu{
+  .leftMenu {
     display: flex;
-    align-items: center;
+    align-items: flex-end;
     padding-left: 20px;
-    img{
+    padding-bottom: 20px;
+    img {
       height: 28px;
       margin-right: 10px;
     }
-    span{
+    .title-logo {
+      height: 36px;
+    }
+    span {
       font-size: 20px;
       position: relative;
-      top: -1px;
+      bottom: -3px;
     }
   }
-  .right-menu, .center-menu {
+  .right-menu,
+  .center-menu {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
@@ -218,10 +281,13 @@ export default {
       cursor: pointer;
     }
   }
+  .center-menu {
+    width: calc(100% - 1200px);
+  }
 }
 </style>
 <style>
-  .el-menu--horizontal>.my_info.el-submenu .el-submenu__icon-arrow {
+.el-menu--horizontal > .my_info.el-submenu .el-submenu__icon-arrow {
   margin-top: 0;
-  }
+}
 </style>

src/views/trials/trials-list/components/TrialForm.vue

@@ -12,29 +12,61 @@
   >
     <el-row>
       <!-- 项目编号 -->
-      <el-form-item v-if="trialForm.Id!== ''" :label="$t('trials:trials-list:form:trialId')">
+      <el-form-item
-        <el-input v-model="trialForm.TrialCode" disabled />
+        v-if="trialForm.Id !== ''"
+        :label="$t('trials:trials-list:form:trialId')"
+        prop="TrialCode"
+      >
+        <el-input
+          v-model="trialForm.TrialCode"
+          @keyup.native="trialCodekeyUp"
+        />
       </el-form-item>
       <!-- 项目类型 -->
-      <el-form-item :label="$t('trials:trials-list:form:trialType')" prop="TrialType">
+      <el-form-item
-        <el-radio-group v-model="trialForm.TrialType " :disabled="trialForm.Id!== ''">
+        :label="$t('trials:trials-list:form:trialType')"
-          <el-radio v-for="item of $d.TrialType" :disabled="isTestUser && (item.value === 1 || item.value === 2)" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+        prop="TrialType"
+      >
+        <el-radio-group
+          v-model="trialForm.TrialType"
+          :disabled="trialForm.Id !== ''"
+        >
+          <el-radio
+            v-for="item of $d.TrialType"
+            :disabled="isTestUser && (item.value === 1 || item.value === 2)"
+            :key="item.id"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
     </el-row>
     <el-row>
       <!-- 试验名称 -->
-      <el-form-item :label="$t('trials:trials-list:form:experimentName')" prop="ExperimentName">
+      <el-form-item
-        <el-input v-model="trialForm.ExperimentName" type="textarea" :autosize="{ minRows: 1, maxRows: 4}" />
+        :label="$t('trials:trials-list:form:experimentName')"
+        prop="ExperimentName"
+      >
+        <el-input
+          v-model="trialForm.ExperimentName"
+          type="textarea"
+          :autosize="{ minRows: 1, maxRows: 4 }"
+        />
       </el-form-item>
       <!-- 研究方案号 -->
-      <el-form-item :label="$t('trials:trials-list:form:researchNumber')" prop="ResearchProgramNo">
+      <el-form-item
+        :label="$t('trials:trials-list:form:researchNumber')"
+        prop="ResearchProgramNo"
+      >
         <el-input v-model="trialForm.ResearchProgramNo" />
       </el-form-item>
     </el-row>
     <el-row>
       <!-- 主研单位 -->
-      <el-form-item :label="$t('trials:trials-list:form:researchUnit')" prop="MainResearchUnit">
+      <el-form-item
+        :label="$t('trials:trials-list:form:researchUnit')"
+        prop="MainResearchUnit"
+      >
         <el-input v-model="trialForm.MainResearchUnit" />
       </el-form-item>
       <!-- 负责人PI -->
@@ -45,9 +77,18 @@
     <el-row>
       <!-- 申办方 -->
       <el-form-item :label="$t('trials:trials-list:form:sponsor')">
-        <el-select v-model="trialForm.SponsorId">
+        <el-select
+          v-model="trialForm.SponsorId"
+          filterable
+          allow-create
+          default-first-option
+          @change="(value) => handleSelectChange(value, 'sponsor')"
+          @visible-change="
+            (flag) => handleSelectVisibbleChange(flag, 'sponsor')
+          "
+        >
           <el-option
-            v-for="(item) in sponsorList"
+            v-for="item in sponsorList"
             :key="item.Id"
             :label="item.SponsorName"
             :value="item.Id"
@@ -56,9 +97,16 @@
       </el-form-item>
       <!-- CRO -->
       <el-form-item :label="$t('trials:trials-list:form:cro')">
-        <el-select v-model="trialForm.CROId">
+        <el-select
+          v-model="trialForm.CROId"
+          filterable
+          allow-create
+          default-first-option
+          @change="(value) => handleSelectChange(value, 'cro')"
+          @visible-change="(flag) => handleSelectVisibbleChange(flag, 'cro')"
+        >
           <el-option
-            v-for="(item) of croList"
+            v-for="item of croList"
             :key="item.Id"
             :label="item.CROName"
             :value="item.Id"
@@ -68,7 +116,10 @@
     </el-row>
     <el-row>
       <!-- DeclarationType -->
-      <el-form-item :label="$t('trials:trials-list:form:declarationType')" prop="DeclarationTypeEnumList">
+      <el-form-item
+        :label="$t('trials:trials-list:form:declarationType')"
+        prop="DeclarationTypeEnumList"
+      >
         <el-select
           v-model="trialForm.DeclarationTypeEnumList"
           size="small"
@@ -77,7 +128,12 @@
           @change="handleDeclarationTypeChange"
           style="width: 100%"
         >
-          <el-option v-for="item of $d.DeclarationType" :key="item.value" :value="item.value" :label="item.label" />
+          <el-option
+            v-for="item of $d.DeclarationType"
+            :key="item.value"
+            :value="item.value"
+            :label="item.label"
+          />
         </el-select>
       </el-form-item>
       <!-- Phase -->
@@ -100,8 +156,14 @@
     </el-row>
     <el-row>
       <!-- 适应症类型 IndicationType -->
-      <el-form-item :label="$t('trials:trials-list:form:indicationType')" prop="IndicationTypeId">
+      <el-form-item
-        <el-select v-model="trialForm.IndicationTypeId" @change="handleIndicationTypeChange">
+        :label="$t('trials:trials-list:form:indicationType')"
+        prop="IndicationTypeId"
+      >
+        <el-select
+          v-model="trialForm.IndicationTypeId"
+          @change="handleIndicationTypeChange"
+        >
           <!-- <el-option
             v-for="item of dictionaryList.IndicationType"
             :key="item.Id"
@@ -117,9 +179,16 @@
         </el-select>
       </el-form-item>
       <!-- Indication -->
-      <el-form-item  :label="$t('trials:trials-list:form:indication')" prop="IndicationEnum">
+      <el-form-item
+        :label="$t('trials:trials-list:form:indication')"
+        prop="IndicationEnum"
+      >
         <!--        <el-input v-model="trialForm.Indication" />-->
-        <el-select :disabled="!trialForm.IndicationTypeId" v-if="![37, 38, 39].includes(trialForm.IndicationEnum)" v-model="trialForm.IndicationEnum">
+        <el-select
+          :disabled="!trialForm.IndicationTypeId"
+          v-if="![37, 38, 39].includes(trialForm.IndicationEnum)"
+          v-model="trialForm.IndicationEnum"
+        >
           <el-option
             v-for="item of $d.Indication"
             v-show="indicationGrouping === item.raw.ChildGroup"
@@ -130,7 +199,11 @@
         </el-select>
         <el-row v-if="[37, 38, 39].includes(trialForm.IndicationEnum)">
           <el-col :span="12">
-            <el-select :disabled="!trialForm.IndicationTypeId" v-model="trialForm.IndicationEnum" style="width: 100%;margin-right: 10px;">
+            <el-select
+              :disabled="!trialForm.IndicationTypeId"
+              v-model="trialForm.IndicationEnum"
+              style="width: 100%; margin-right: 10px"
+            >
               <el-option
                 v-for="item of $d.Indication"
                 v-show="indicationGrouping === item.raw.ChildGroup"
@@ -141,7 +214,10 @@
             </el-select>
           </el-col>
           <el-col :span="12">
-            <el-input :disabled="!trialForm.IndicationTypeId" v-model="trialForm.Indication" />
+            <el-input
+              :disabled="!trialForm.IndicationTypeId"
+              v-model="trialForm.Indication"
+            />
           </el-col>
         </el-row>
       </el-form-item>
@@ -166,9 +242,12 @@
       </el-form-item>
       <!-- Sites -->
       <el-form-item :label="$t('trials:trials-list:form:siteCount')">
-        <el-input-number v-model="trialForm.PlanSiteCount" controls-position="right" :min="0" />
+        <el-input-number
+          v-model="trialForm.PlanSiteCount"
+          controls-position="right"
+          :min="0"
+        />
       </el-form-item>
-
     </el-row>
     <el-row>
       <!-- Expected Patients Num -->
@@ -193,14 +272,19 @@
     <el-row>
       <!-- Visits -->
       <el-form-item :label="$t('trials:trials-list:form:visitCount')">
-        <el-input-number v-model="trialForm.PlanVisitCount" controls-position="right" :min="0" />
+        <el-input-number
+          v-model="trialForm.PlanVisitCount"
+          controls-position="right"
+          :min="0"
+        />
       </el-form-item>
-
     </el-row>
     <el-row>
-
       <!-- Expedited -->
-      <el-form-item :label="$t('trials:trials-list:form:expedited')" prop="Expedited">
+      <el-form-item
+        :label="$t('trials:trials-list:form:expedited')"
+        prop="Expedited"
+      >
         <el-select v-model="trialForm.Expedited">
           <el-option
             v-for="item in expeditedOption"
@@ -211,15 +295,21 @@
         </el-select>
       </el-form-item>
       <!-- Turnaround Time -->
-      <el-form-item :label="$t('trials:trials-list:form:projectCycle')" prop="ProjectCycle">
+      <el-form-item
+        :label="$t('trials:trials-list:form:projectCycle')"
+        prop="ProjectCycle"
+      >
         <el-input v-model="trialForm.ProjectCycle" />
       </el-form-item>
     </el-row>
     <el-row>
-
       <!-- Total Reviewers -->
       <el-form-item :label="$t('trials:trials-list:form:totalReviewers')">
-        <el-input-number v-model="trialForm.TotalReviewers" controls-position="right" :min="0" />
+        <el-input-number
+          v-model="trialForm.TotalReviewers"
+          controls-position="right"
+          :min="0"
+        />
       </el-form-item>
       <!-- Type of Reviewers -->
       <el-form-item :label="$t('trials:trials-list:form:typeofReviewers')">
@@ -229,106 +319,95 @@
           multiple
           clearable
         >
-          <el-option v-for="item of $d.AttendedReviewerType" :key="item.value" :value="item.value" :label="item.label" />
+          <el-option
+            v-for="item of $d.AttendedReviewerType"
+            :key="item.value"
+            :value="item.value"
+            :label="item.label"
+          />
         </el-select>
-<!--        <el-row v-if="trialForm.AttendedReviewerTypeEnumList.includes(2)">-->
+        <!--        <el-row v-if="trialForm.AttendedReviewerTypeEnumList.includes(2)">-->
-<!--          <el-col :span="12">-->
+        <!--          <el-col :span="12">-->
-<!--            <el-select-->
+        <!--            <el-select-->
-<!--              v-model="trialForm.AttendedReviewerTypeEnumList"-->
+        <!--              v-model="trialForm.AttendedReviewerTypeEnumList"-->
-<!--              size="small"-->
+        <!--              size="small"-->
-<!--              multiple-->
+        <!--              multiple-->
-<!--              clearable-->
+        <!--              clearable-->
-<!--              style="width: 100%"-->
+        <!--              style="width: 100%"-->
-<!--            >-->
+        <!--            >-->
-<!--              <el-option v-for="item of $d.AttendedReviewerType" :key="item.value" :value="item.value" :label="item.label" />-->
+        <!--              <el-option v-for="item of $d.AttendedReviewerType" :key="item.value" :value="item.value" :label="item.label" />-->
-<!--            </el-select>-->
+        <!--            </el-select>-->
-<!--          </el-col>-->
+        <!--          </el-col>-->
-<!--          <el-col :span="12">-->
+        <!--          <el-col :span="12">-->
-<!--            <el-input  size="small" v-model="trialForm.AttendedReviewerTypeOther"/>-->
+        <!--            <el-input  size="small" v-model="trialForm.AttendedReviewerTypeOther"/>-->
-<!--          </el-col>-->
+        <!--          </el-col>-->
-<!--        </el-row>-->
+        <!--        </el-row>-->
       </el-form-item>
     </el-row>
-    <el-row style="margin-left:190px">
+    <el-row style="margin-left: 190px">
       <el-form-item label="">
         <el-button type="primary" :disabled="btnLoading" @click="handleCancel">
-          {{ $t('trials:trials-list:form:cancel') }}
+          {{ $t("trials:trials-list:form:cancel") }}
         </el-button>
         <el-button type="primary" :loading="btnLoading" @click="handleSave">
-          {{ $t('trials:trials-list:form:save') }}
+          {{ $t("trials:trials-list:form:save") }}
         </el-button>
       </el-form-item>
     </el-row>
   </el-form>
 </template>
 <script>
-import store from '@/store'
+import { mapState } from "vuex";
-import { mapGetters, mapState } from 'vuex'
+import { getTrialInfo, addOrUpdateTrial } from "@/api/trials";
-import { getTrialInfo, addOrUpdateTrial } from '@/api/trials'
+import { getBasicDataSelects } from "@/api/dictionary/dictionary";
-import { getBasicDataSelects } from '@/api/dictionary/dictionary'
+import { addOrUpdateSponsor, addOrUpdateCro } from "@/api/dictionary";
+import { getAllSponsorList, getAllCROList } from "@/api/global";
 export default {
-  name: 'TrialForm',
+  name: "TrialForm",
   props: {
     trialId: {
       type: String,
-      default: ''
+      default: "",
-    }
+    },
   },
   data() {
     const comfirmIndication = (rule, value, callback) => {
       if ([37, 38, 39].includes(value)) {
         if (!this.trialForm.Indication) {
-          return callback(new Error(this.$t('common:ruleMessage:specify')))
+          return callback(new Error(this.$t("common:ruleMessage:specify")));
         }
       }
-      callback()
+      callback();
-    }
+    };
-    // const comfirmDeclarationType = (rule, value, callback) => {
-    //   console.log(value)
-    //   if (value.includes(-1)) {
-    //     if (!this.trialForm.DeclarationTypeOther) {
-    //       return callback(new Error(this.$t('common:ruleMessage:specify')))
-    //     }
-    //   }
-    //   callback()
-    // }
-    // const comfirmAttendedReviewerType = (rule, value, callback) => {
-    //   if (value.includes(2)) {
-    //     if (!this.trialForm.AttendedReviewerTypeOther) {
-    //       return callback(new Error(this.$t('common:ruleMessage:specify')))
-    //     }
-    //   }
-    //   callback()
-    // }
     return {
       trialForm: {
-        Id: '',
+        Id: "",
-        TrialCode: '',
+        TrialCode: "",
         TrialType: null,
-        SponsorId: '',
+        SponsorId: "",
         // CriterionIds: [],
-        CROId: '',
+        CROId: "",
-        ReviewModeId: '',
+        ReviewModeId: "",
         ReviewTypeIds: [],
 
         // 默认值0
-        Expedited: '',
+        Expedited: "",
 
         ModalityIds: [],
-        Note: '',
+        Note: "",
-        ExpectedPatients: '',
+        ExpectedPatients: "",
-        TimePointsPerPatient: '',
+        TimePointsPerPatient: "",
-        ProjectCycle: '',
+        ProjectCycle: "",
-        TotalReviewers: '',
+        TotalReviewers: "",
-        DeclarationTypeId: '',
+        DeclarationTypeId: "",
-        IndicationTypeId: '',
+        IndicationTypeId: "",
-        PhaseId: '',
+        PhaseId: "",
-        AttendedReviewerType: '',
+        AttendedReviewerType: "",
         IsLocked: false,
-        ResearchProgramNo: '',
+        ResearchProgramNo: "",
-        ExperimentName: '',
+        ExperimentName: "",
-        MainResearchUnit: '',
+        MainResearchUnit: "",
-        HeadPI: '',
+        HeadPI: "",
         PlanSiteCount: null,
         PlanVisitCount: null,
         IndicationEnum: null,
@@ -336,48 +415,113 @@ export default {
         AttendedReviewerTypeEnumList: [],
         DeclarationTypeEnumList: [],
         DeclarationTypeOther: null,
-        AttendedReviewerTypeOther: null
+        AttendedReviewerTypeOther: null,
       },
       indicationGrouping: null,
       trialFormRules: {
-        Code: [
+        TrialCode: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
-          { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` }
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          { max: 10, message: `${this.$t("common:ruleMessage:maxLength")} 10` },
         ],
         TrialType: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
         ],
         ResearchProgramNo: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
-          { max: 100, message: `${this.$t('common:ruleMessage:maxLength')} 100` }
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            max: 100,
+            message: `${this.$t("common:ruleMessage:maxLength")} 100`,
+          },
         ],
         ExperimentName: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
-          { max: 100, message: `${this.$t('common:ruleMessage:maxLength')} 100` }
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            max: 500,
+            message: `${this.$t("common:ruleMessage:maxLength")} 500`,
+          },
         ],
         IndicationEnum: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
-          { validator: comfirmIndication, trigger: 'blur' }
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          { validator: comfirmIndication, trigger: "blur" },
+        ],
+        ProjectCycle: [
+          { max: 50, message: `${this.$t("common:ruleMessage:maxLength")} 50` },
         ],
-        ProjectCycle: [{ max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` }],
         ReviewModeId: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: ["blur", "change"],
+          },
         ],
         Expedited: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        Note: [
+          {
+            max: 500,
+            message: `${this.$t("common:ruleMessage:maxLength")} 500`,
+          },
         ],
-        Note: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500` }],
         ModalityIds: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        PhaseId: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        IndicationTypeId: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: ["blur", "change"],
+          },
         ],
-        PhaseId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
-        IndicationTypeId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
         DeclarationTypeEnumList: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: ["blur", "change"],
+          },
         ],
         ReviewTypeIds: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }
+          {
-        ]
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: ["blur", "change"],
+          },
+        ],
       },
       btnLoading: false,
       isLock: false,
@@ -386,132 +530,255 @@ export default {
       declarationNum: null,
       indicationNum: null,
       phaseNum: null,
-      dictionaryList: {}
+      dictionaryList: {},
-    }
+
+      sponsorList: [],
+      croList: [],
+    };
   },
   computed: {
-    ...mapGetters(['sponsorList', 'croList']),
+    ...mapState("user", ["isTestUser"]),
-    ...mapState('user', ['isTestUser'])
   },
   mounted() {
-    this.initPage()
+    this.initPage();
-    console.log(this.isTestUser, 'isTestUser')
+    console.log(this.isTestUser, "isTestUser");
   },
   methods: {
+    // 更新申办方与CRO列表
+    handleSelectVisibbleChange(flag, key) {
+      if (flag) {
+        if (key === "sponsor") {
+          this.getAllSponsorList();
+        }
+        if (key === "cro") {
+          this.getAllCROList();
+        }
+      }
+    },
+    // 申办方与CRO新增
+    async handleSelectChange(value, key) {
+      let arr = key == "sponsor" ? this.sponsorList : this.croList;
+      let has = arr.some((item) => item.Id === value);
+      if (!has) {
+        let res = null;
+        try {
+          if (key === "sponsor") {
+            let data = {
+              SponsorName: value,
+              SponsorNameCN: value,
+              IsTrialLevel: true,
+              TrialId: this.trialId,
+            };
+            res = await addOrUpdateSponsor(data);
+          }
+          if (key === "cro") {
+            let data = {
+              CroName: value,
+              CroNameCN: value,
+              IsTrialLevel: true,
+              TrialId: this.trialId,
+            };
+            res = await addOrUpdateCro(data);
+          }
+          if (res.IsSuccess) {
+            let obj = {
+              Id: res.Result,
+              CROName: value,
+              SponsorName: value,
+            };
+            arr.unshift(obj);
+            this.$nextTick(() => {
+              if (key === "sponsor") {
+                this.trialForm.SponsorId = res.Result;
+              }
+              if (key === "cro") {
+                this.trialForm.CROId = res.Result;
+              }
+            });
+          }
+        } catch (err) {
+          console.log(err);
+          if (key === "sponsor") {
+            this.trialForm.SponsorId = null;
+          }
+          if (key === "cro") {
+            this.trialForm.CROId = null;
+          }
+        }
+      }
+    },
+    async getAllSponsorList() {
+      try {
+        let params = {
+          TrialId: this.trialId,
+        };
+        let res = await getAllSponsorList(params);
+        if (res.IsSuccess) {
+          this.sponsorList = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    async getAllCROList() {
+      try {
+        let params = {
+          TrialId: this.trialId,
+        };
+        let res = await getAllCROList(params);
+        if (res.IsSuccess) {
+          this.croList = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
     initForm() {
-      this.loading = true
+      this.loading = true;
-      getTrialInfo(this.trialId).then(res => {
+      getTrialInfo(this.trialId)
-        this.loading = false
+        .then((res) => {
+          this.loading = false;
           if (res.IsSuccess) {
             for (var item in this.trialForm) {
-            res.Result[item] === '00000000-0000-0000-0000-000000000000' ? '' : this.$set(this.trialForm, item, res.Result[item])
+              res.Result[item] === "00000000-0000-0000-0000-000000000000"
-            if (item === 'IndicationTypeId') {
+                ? ""
-              this.indicationGrouping = this.$d.IndicationType.filter(v => v.id === res.Result[item])[0].raw.ChildGroup
+                : this.$set(this.trialForm, item, res.Result[item]);
+              if (item === "IndicationTypeId") {
+                this.indicationGrouping = this.$d.IndicationType.filter(
+                  (v) => v.id === res.Result[item]
+                )[0].raw.ChildGroup;
               }
             }
           }
-      }).catch(() => { this.loading = false })
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     handleSave() {
-      this.$refs.trialForm.validate(valid => {
+      this.$refs.trialForm.validate((valid) => {
         if (valid) {
-          this.btnLoading = true
+          this.btnLoading = true;
           if (!this.trialForm.Id) {
-            this.trialForm.TrialCode = `${this.declarationNum}${this.indicationNum}${this.phaseNum}`
+            this.trialForm.TrialCode = `${this.declarationNum}${this.indicationNum}${this.phaseNum}`;
-            console.log(this.trialForm.TrialCode)
+            console.log(this.trialForm.TrialCode);
           }
-          var params = JSON.parse(JSON.stringify(this.trialForm))
+          var params = JSON.parse(JSON.stringify(this.trialForm));
-          console.log(params)
+          console.log(params);
-          addOrUpdateTrial(params).then(res => {
+          addOrUpdateTrial(params)
-            this.btnLoading = false
+            .then((res) => {
+              this.btnLoading = false;
               if (!this.trialForm.Id) {
-              this.trialForm.Id = res.Result
+                this.trialForm.Id = res.Result;
-              this.$message.success(this.$t('trials:trials-list:message:addedSuccessfully'))
+                this.$message.success(
+                  this.$t("trials:trials-list:message:addedSuccessfully")
+                );
               } else {
-              this.$message.success(this.$t('trials:trials-list:message:updatedSuccessfully'))
+                this.$message.success(
+                  this.$t("trials:trials-list:message:updatedSuccessfully")
+                );
               }
 
-            this.$emit('getList')
+              this.$emit("getList");
-            this.$emit('closeDialog')
+              this.$emit("closeDialog");
-          }).catch(() => {
-            this.btnLoading = false
             })
+            .catch(() => {
+              this.btnLoading = false;
+            });
         }
-      })
+      });
     },
     handleCancel() {
-      this.$emit('closeDialog')
+      this.$emit("closeDialog");
       // this.$refs['trialForm'].resetFields()
     },
     handleDeclarationTypeChange(val) {
-      console.log(val)
+      console.log(val);
       if (val.length === 1) {
         // this.declarationNum = this.dictionaryList.DeclarationType.filter(item => item.Idd === val)[0].ShowOrder
-        this.declarationNum = this.$d.DeclarationType.filter(item => item.value === val[0])[0].raw.ShowOrder
+        this.declarationNum = this.$d.DeclarationType.filter(
+          (item) => item.value === val[0]
+        )[0].raw.ShowOrder;
         if (this.trialForm.Id) {
-          const ids = [...this.trialForm.TrialCode]
+          const ids = [...this.trialForm.TrialCode];
-          ids[2] = this.declarationNum
+          ids[2] = this.declarationNum;
-          this.trialForm.TrialCode = ids.join('')
+          this.trialForm.TrialCode = ids.join("");
         }
       } else {
-        this.declarationNum = 'X'
+        this.declarationNum = "X";
         if (this.trialForm.Id) {
-          const ids = [...this.trialForm.TrialCode]
+          const ids = [...this.trialForm.TrialCode];
-          ids[2] = this.declarationNum
+          ids[2] = this.declarationNum;
-          this.trialForm.TrialCode = ids.join('')
+          this.trialForm.TrialCode = ids.join("");
         }
       }
     },
     handleIndicationTypeChange(val) {
-      this.indicationGrouping = null
+      this.indicationGrouping = null;
       if (val) {
         // this.indicationNum = this.dictionaryList.IndicationType.filter(item => item.Id === val)[0].ShowOrder
-        this.indicationNum = this.$d.IndicationType.filter(item => item.id === val)[0].raw.ShowOrder
+        this.indicationNum = this.$d.IndicationType.filter(
+          (item) => item.id === val
+        )[0].raw.ShowOrder;
         if (this.trialForm.Id) {
-          const ids = [...this.trialForm.TrialCode]
+          const ids = [...this.trialForm.TrialCode];
-          ids[3] = this.indicationNum
+          ids[3] = this.indicationNum;
-          this.trialForm.TrialCode = ids.join('')
+          this.trialForm.TrialCode = ids.join("");
         }
-        this.indicationGrouping = this.$d.IndicationType.filter(item => item.id === val)[0].raw.ChildGroup
+        this.indicationGrouping = this.$d.IndicationType.filter(
+          (item) => item.id === val
+        )[0].raw.ChildGroup;
       }
-      this.trialForm.Indication = null
+      this.trialForm.Indication = null;
     },
     handlePhaseChange(val) {
       if (val) {
         // const phase = this.dictionaryList['Trial_Phase']
         // this.phaseNum = phase.filter(item => item.Id === val)[0].ShowOrder
-        this.phaseNum = this.$d.Trial_Phase.filter(item => item.id === val)[0].raw.ShowOrder
+        this.phaseNum = this.$d.Trial_Phase.filter(
+          (item) => item.id === val
+        )[0].raw.ShowOrder;
         if (this.trialForm.Id) {
-          const ids = [...this.trialForm.TrialCode]
+          const ids = [...this.trialForm.TrialCode];
-          ids[4] = this.phaseNum
+          ids[4] = this.phaseNum;
-          this.trialForm.TrialCode = ids.join('')
+          this.trialForm.TrialCode = ids.join("");
         }
       }
     },
     handleExpectedPatientsChange(val) {
-      this.trialForm.PlanVisitCount = val * this.trialForm.TimePointsPerPatient
+      this.trialForm.PlanVisitCount = val * this.trialForm.TimePointsPerPatient;
     },
     handleTpPerPatientChange(val) {
-      this.trialForm.PlanVisitCount = val * this.trialForm.ExpectedPatients
+      this.trialForm.PlanVisitCount = val * this.trialForm.ExpectedPatients;
+    },
+    trialCodekeyUp(e) {
+      e.target.value = e.target.value.replace(/[%]/g, "");
     },
     async initPage() {
-      this.loading = true
+      this.loading = true;
-      await this.getDicData()
+      await this.getDicData();
-      await store.dispatch('global/getSponsorList')
+      await this.getAllSponsorList();
-      await store.dispatch('global/getCROList')
+      await this.getAllCROList();
       if (this.trialId) {
-        this.trialForm.Id = this.trialId
+        this.trialForm.Id = this.trialId;
-        this.initForm()
+        this.initForm();
       }
-      this.loading = false
+      this.loading = false;
     },
     getDicData() {
-      getBasicDataSelects(['DeclarationType', 'IndicationType', 'Modality', 'ReviewMode', 'ReviewType', 'Trial_Phase']).then(res => {
+      getBasicDataSelects([
-        this.dictionaryList = { ...res.Result }
+        "DeclarationType",
-      })
+        "IndicationType",
-    }
+        "Modality",
-  }
+        "ReviewMode",
-}
+        "ReviewType",
+        "Trial_Phase",
+      ]).then((res) => {
+        this.dictionaryList = { ...res.Result };
+      });
+    },
+  },
+};
 </script>
 <style>
 .trial-Form .el-input,
@@ -521,7 +788,7 @@ export default {
 .trial-Form .el-textarea {
   width: 340px;
 }
-.trial-Form .el-col .el-input{
+.trial-Form .el-col .el-input {
   width: 165px;
   margin-right: 10px;
 }

src/views/trials/trials-myinfo/account.vue

@@ -0,0 +1,245 @@
+<template>
+  <div class="trial-myinfo-right">
+    <div class="trial-myinfo-right-box">
+      <div class="trial-myinfo-head">
+        <!-- 账号信息 -->
+        {{ $t("trials:trials-myinfo:title:accountInfo") }}
+      </div>
+      <el-form label-position="right" label-width="100px">
+        <!-- 用户名 -->
+        <el-form-item
+          :label="$t('trials:trials-myinfo:form:userName')"
+          style="margin-bottom: 5px"
+          prop="UserName"
+        >
+          <span>{{ user.UserName }}</span>
+        </el-form-item>
+        <el-form-item label="" style="position: relative" prop="UserName">
+          <el-input
+            v-model="userForm.UserName"
+            :placeholder="$t('trials:trials-myinfo:form:userName')"
+          />
+          <!-- 修改 -->
+          <el-button
+            :disabled="!userForm.UserName"
+            class="saveBtn"
+            type="primary"
+            size="small"
+            @click="setNewUserName"
+          >
+            {{ $t("trials:trials-myinfo:button:update") }}
+          </el-button>
+        </el-form-item>
+        <!-- 电话 -->
+        <el-form-item
+          :label="$t('trials:trials-myinfo:form:phone')"
+          style="margin-bottom: 5px"
+          prop="UserName"
+        >
+          <span>{{ user.Phone }}</span>
+        </el-form-item>
+        <el-form-item label="" style="position: relative" prop="UserName">
+          <el-input
+            v-model="userForm.Phone"
+            :placeholder="$t('trials:trials-myinfo:form:phone')"
+          />
+          <!-- 修改 -->
+          <el-button
+            :disabled="!userForm.Phone"
+            class="saveBtn"
+            type="primary"
+            size="small"
+            @click="setNewPhone"
+          >
+            {{ $t("trials:trials-myinfo:button:update") }}
+          </el-button>
+        </el-form-item>
+        <!-- 邮箱 -->
+        <el-form-item
+          :label="$t('trials:trials-myinfo:form:email')"
+          style="margin-bottom: 5px"
+          prop="UserName"
+        >
+          <span>{{ user.EMail }}</span>
+        </el-form-item>
+        <el-form-item
+          label=""
+          style="margin-bottom: 10px; position: relative"
+          prop="EMail"
+          v-if="IsCanConnectInternet"
+        >
+          <el-input
+            v-model="userForm.EMail"
+            @input="handleEmailChange"
+            :placeholder="$t('trials:trials-myinfo:form:email')"
+          />
+          <el-button
+            class="sendCode"
+            :disabled="sendDisabled"
+            type="primary"
+            size="mini"
+            @click="sendVerificationCode"
+            >{{ sendTitle }}</el-button
+          >
+        </el-form-item>
+        <el-form-item
+          label=""
+          style="position: relative"
+          prop="VerificationCode"
+          v-if="IsCanConnectInternet"
+        >
+          <el-input
+            v-model="userForm.VerificationCode"
+            :placeholder="$t('trials:researchForm:form:verifyCode')"
+          />
+          <!-- 修改 -->
+          <el-button
+            :disabled="!userForm.EMail || !userForm.VerificationCode"
+            class="saveBtn"
+            type="primary"
+            size="small"
+            @click="setNewEmail"
+          >
+            {{ $t("trials:trials-myinfo:button:update") }}
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <password />
+  </div>
+</template>
+<script>
+import {
+  sendVerificationCode,
+  setNewEmail,
+  setNewPhone,
+  setNewUserName,
+} from "@/api/system/user.js";
+import { removeToken } from "@/utils/auth";
+import password from "./password.vue";
+var timer = "";
+var countdown = 60;
+export default {
+  name: "account",
+  components: { password },
+  props: {
+    user: {
+      required: true,
+      default: () => {
+        return {};
+      },
+    },
+    IsCanConnectInternet: {
+      required: true,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      userForm: {},
+      sendDisabled: true,
+      sendTitle: this.$t("trials:trials-myinfo:button:getVCode"),
+    };
+  },
+  methods: {
+    setNewEmail() {
+      setNewEmail(this.userForm.EMail, this.userForm.VerificationCode).then(
+        () => {
+          this.userForm.EMail = "";
+          this.userForm.VerificationCode = "";
+          this.$message.success(
+            this.$t("trials:trials-myinfo:message:updateSuccessfully")
+          );
+          this.$emit("getUserInfo");
+        }
+      );
+    },
+    async setNewUserName() {
+      try {
+        let confirm = await this.$confirm(
+          this.$t("trials:trials-myInfo:confirmMessage:updateUserName"),
+          {
+            type: "warning",
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t("common:button:confirm"),
+            cancelButtonText: this.$t("common:button:cancel"),
+          }
+        );
+        if (confirm !== "confirm") return;
+        let res = await setNewUserName(this.userForm.UserName);
+        if (res.IsSuccess) {
+          this.userForm.UserName = "";
+          this.$message.success(
+            this.$t("trials:trials-myinfo:message:updateSuccessfully")
+          );
+          this.$emit("getUserInfo");
+          removeToken();
+          this.logout();
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    setNewPhone() {
+      setNewPhone(this.userForm.Phone).then(() => {
+        this.userForm.Phone = "";
+        this.$message.success(
+          this.$t("trials:trials-myinfo:message:updateSuccessfully")
+        );
+        this.$emit("getUserInfo");
+      });
+    },
+    handleEmailChange() {
+      var reg =
+        /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/;
+      if (this.userForm.EMail && reg.test(this.userForm.EMail)) {
+        this.sendDisabled = false;
+      } else {
+        this.sendDisabled = true;
+      }
+    },
+    sendVerificationCode() {
+      sendVerificationCode(this.userForm.EMail).then(() => {
+        this.settime(this);
+        // 发送成功
+        this.$message.success(
+          this.$t("trials:trials-myinfo:message:sendSuccessfully")
+        );
+      });
+    },
+    settime(obj) {
+      if (countdown === 0) {
+        obj.sendDisabled = false;
+        obj.sendTitle = this.$t("trials:trials-myinfo:button:getVCode"); // '获取验证码'
+        countdown = 60;
+        clearTimeout(timer);
+        return;
+      } else {
+        obj.sendDisabled = true;
+        obj.sendTitle = `${this.$t(
+          "trials:trials-myinfo:button:wait"
+        )}(${countdown}s)`;
+        countdown--;
+        // eslint-disable-next-line no-self-assign
+        countdown = countdown;
+        timer = setTimeout(function () {
+          obj.settime(obj);
+        }, 1000);
+      }
+    },
+    async logout() {
+      /* eslint-disable */
+      var loginType = zzSessionStorage.getItem("loginType");
+      await this.$store.dispatch("user/logout");
+      if (loginType) {
+        this.$router.push(`/login?loginType=${loginType}`);
+      } else {
+        this.$router.push(`/login`);
+      }
+      this.$i18n.locale = "zh";
+      this.setLanguage("zh");
+      this.$updateDictionary();
+    },
+  },
+};
+</script>

src/views/trials/trials-myinfo/index.vue

@@ -1,390 +1,187 @@
 <template>
   <div class="trial-myinfo">
-    <div class="trial-myinfo-left">
+    <el-menu
-      <div class="trial-myinfo-left-top">
+      :default-active="activeIndex"
-        <div class="trial-myinfo-head">
+      @select="handleSelect"
-          <!-- 个人头像 -->
+      class="el-menu-demo"
-          {{ $t('trials:trials-myinfo:title:avater') }}
+      style="width: 200px"
-        </div>
-        <div class="trial-myinfo-body">
-          <div>
-            {{ user.LastName }}
-          </div>
-        </div>
-      </div>
-      <div class="trial-myinfo-left-bottom">
-        <div class="trial-myinfo-head">
-          <!-- 用户基本信息 -->
-          {{ $t('trials:trials-myinfo:title:basicInfo') }}
-        </div>
-        <el-form ref="userForm" label-position="right" :model="user" :rules="userFormRules" label-width="120px">
-          <el-form-item v-if="user.Code" label="ID: " prop="Code">
-            <el-input v-model="user.Code" disabled />
-          </el-form-item>
-          <!-- 姓 -->
-          <el-form-item :disabled="user.UserTypeEnum === 8" :label="$t('trials:trials-myinfo:form:surname')" prop="LastName">
-            <el-input v-model="user.LastName" :placeholder="$t('trials:trials-myinfo:form:surname')"/>
-          </el-form-item>
-          <!-- 名 -->
-          <el-form-item :disabled="user.UserTypeEnum === 8" :label="$t('trials:trials-myinfo:form:givenname')" prop="FirstName">
-            <el-input v-model="user.FirstName" :placeholder="$t('trials:trials-myinfo:form:givenname')"/>
-          </el-form-item>
-          <!-- 性别 -->
-          <el-form-item :label="$t('trials:trials-myinfo:form:gender')" prop="Sex" style="margin-right:40px;">
-            <el-radio-group v-model="user.Sex">
-              <el-radio :label="1">Male</el-radio>
-              <el-radio :label="0">Female</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <!-- 单位 -->
-          <el-form-item :label="$t('trials:trials-myinfo:form:organization')" prop="OrganizationName">
-            <el-input v-model="user.OrganizationName" :placeholder="$t('trials:trials-myinfo:form:organization')"/>
-          </el-form-item>
-          <!-- 部门 -->
-          <el-form-item :label="$t('trials:trials-myinfo:form:department')" prop="DepartmentName">
-            <el-input v-model="user.DepartmentName" :placeholder="$t('trials:trials-myinfo:form:organization')"/>
-          </el-form-item>
-          <!-- 职位 -->
-          <el-form-item :label="$t('trials:trials-myinfo:form:position')" prop="PositionName">
-            <el-input v-model="user.PositionName" :placeholder="$t('trials:trials-myinfo:form:position')"/>
-          </el-form-item>
-        </el-form>
-        <!-- 保存 -->
-        <el-button
-          class="trial-info-btn"
-          type="primary"
-          size="small"
-          @click="handleSave"
     >
-          {{ $t('trials:trials-myinfo:button:save') }}
+      <el-menu-item index="1">{{
-        </el-button>
+        $t("trials:trials-myinfo:menuTitle:mine")
-      </div>
+      }}</el-menu-item>
-    </div>
+      <el-menu-item index="2">{{
-    <div class="trial-myinfo-right">
+        $t("trials:trials-myinfo:menuTitle:account")
-      <div class="trial-myinfo-right-box">
+      }}</el-menu-item>
-        <div class="trial-myinfo-head">
+      <el-menu-item index="3">{{
-          <!-- 账号信息 -->
+        $t("trials:trials-myinfo:menuTitle:loginLog")
-          {{ $t('trials:trials-myinfo:title:accountInfo') }}
+      }}</el-menu-item>
-        </div>
+    </el-menu>
-        <el-form label-position="right" label-width="180px">
+    <div class="contentBox">
-          <!-- 用户名 -->
+      <mine
-          <el-form-item :label="$t('trials:trials-myinfo:form:userName')" style="margin-bottom: 5px;" prop="UserName">
+        :user="user"
-            <span>{{ user.UserName }}</span>
+        :userTypeOptions="userTypeOptions"
-          </el-form-item>
+        v-if="activeIndex === '1'"
-          <el-form-item label="" style="position: relative" prop="UserName">
+        @getUserInfo="getUserInfo"
-            <el-input v-model="userForm.UserName" :placeholder="$t('trials:trials-myinfo:form:userName')"/>
+      />
-            <!-- 修改 -->
+      <account
-            <el-button :disabled="!userForm.UserName" class="saveBtn" type="primary" size="small" @click="setNewUserName">
+        :user="user"
-              {{ $t('trials:trials-myinfo:button:update') }}
+        @getUserInfo="getUserInfo"
-            </el-button>
+        :IsCanConnectInternet="IsCanConnectInternet"
-          </el-form-item>
+        v-if="activeIndex === '2'"
-          <!-- 电话 -->
+      />
-          <el-form-item :label="$t('trials:trials-myinfo:form:phone')" style="margin-bottom: 5px;" prop="UserName">
+      <login-log v-if="activeIndex === '3'" :id="userId" :isMine="true" />
-            <span>{{ user.Phone }}</span>
-          </el-form-item>
-          <el-form-item label="" style="position: relative" prop="UserName">
-            <el-input v-model="userForm.Phone" :placeholder="$t('trials:trials-myinfo:form:phone')"/>
-            <!-- 修改 -->
-            <el-button :disabled="!userForm.Phone" class="saveBtn" type="primary" size="small" @click="setNewPhone">
-              {{ $t('trials:trials-myinfo:button:update') }}
-            </el-button>
-          </el-form-item>
-          <!-- 邮箱 -->
-          <el-form-item :label="$t('trials:trials-myinfo:form:email')" style="margin-bottom: 5px;" prop="UserName">
-            <span>{{ user.EMail }}</span>
-          </el-form-item>
-          <el-form-item label="" style="margin-bottom: 10px;position: relative" prop="EMail">
-            <el-input v-model="userForm.EMail" @input="handleEmailChange" :placeholder="$t('trials:trials-myinfo:form:email')"/>
-            <el-button class="sendCode" :disabled="sendDisabled" type="primary" size="mini" @click="sendVerificationCode">{{ sendTitle }}</el-button>
-          </el-form-item>
-          <el-form-item label="" style="position: relative" prop="VerificationCode">
-            <el-input v-model="userForm.VerificationCode" :placeholder="$t('trials:researchForm:form:verifyCode')"/>
-            <!-- 修改 -->
-            <el-button :disabled="!userForm.EMail || !userForm.VerificationCode" class="saveBtn" type="primary" size="small" @click="setNewEmail">
-              {{ $t('trials:trials-myinfo:button:update') }}
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div class="trial-myinfo-right-box">
-        <div class="trial-myinfo-head">
-          <!-- 修改密码 -->
-          {{ $t('trials:trials-myinfo:title:updatePaasord') }}
-        </div>
-        <el-form ref="passwordForm" label-position="right" :model="password" :rules="passwordFormRules" label-width="180px">
-          <!-- 旧密码 -->
-          <el-form-item :label="$t('recompose:form:oldPassword')" prop="OldPassWord">
-            <el-input v-model="password.OldPassWord" type="password" show-password auto-complete="new-password" :placeholder="$t('recompose:form:oldPassword')"/>
-          </el-form-item>
-          <!-- 新密码 -->
-          <el-form-item class="my_new_pwd" :label="$t('recompose:form:newPassword')" prop="NewPassWord">
-            <el-input v-model="password.NewPassWord" type="password" show-password auto-complete="new-password" :placeholder="$t('recompose:form:newPassword')"/>
-          </el-form-item>
-          <!-- 确认密码 -->
-          <el-form-item :label="$t('recompose:form:confirmPassword')" prop="ConfirmPassWord">
-            <el-input v-model="password.ConfirmPassWord" type="password" show-password auto-complete="new-password" :placeholder="$t('recompose:form:confirmPassword')"/>
-          </el-form-item>
-        </el-form>
-        <el-button
-          type="primary"
-          size="small"
-          class="trial-info-btn"
-          @click="save"
-        >
-          {{ $t('trials:trials-myinfo:button:save') }}
-        </el-button>
-      </div>
     </div>
   </div>
 </template>
 
 <script>
-import { getUserTypeList, getUser, updateUser, modifyPassword } from '@/api/admin.js'
+import mine from "./mine.vue";
-import { sendVerificationCode, setNewEmail, setNewPhone, setNewUserName } from '@/api/system/user.js'
+import account from "./account.vue";
-import md5 from 'js-md5'
+import loginLog from "@/views/trials/trials-panel/trial-summary/login-log";
-var timer = ''
+import { getUserTypeList, getUser } from "@/api/admin.js";
-var countdown = 60
+import store from "@/store";
-import store from '@/store'
+import { mapGetters } from "vuex";
-import {mapGetters, mapMutations} from 'vuex'
 
 export default {
-
+  name: "TrialsMyinfo",
-  name: 'TrialsMyinfo',
+  components: { mine, account, "login-log": loginLog },
   data() {
     return {
+      activeIndex: "1",
+
       userTypeOptions: [],
       user: {},
-      password: {},
+      IsCanConnectInternet: true, // 是否可以链接互联网
-      userForm: {},
+    };
-      sendDisabled: true,
-      sendTitle: this.$t('trials:trials-myinfo:button:getVCode'),
-      userFormRules: {
-        UserName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        UserTypeId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
-        IsZhiZhun: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
-        OrganizationName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        LastName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }, { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` }],
-        FirstName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }, { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` }],
-        Sex: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        Status: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
-      },
-      passwordFormRules: {
-        OldPassWord: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        NewPassWord: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-          {
-            required: true,
-            trigger: 'blur',
-            validator: this.$validatePassword
-          },
-        ],
-        ConfirmPassWord: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-          {
-            required: true,
-            trigger: 'blur',
-            validator: this.$validatePassword
-          },
-        ]
-      }
-    }
   },
   computed: {
-    ...mapGetters(['userId', 'name'])
+    ...mapGetters(["userId", "userName"]),
   },
   mounted() {
-    this.getUserInfo()
+    this.getUserInfo();
-    this.getUserTypeList()
+    this.getUserTypeList();
   },
   methods: {
-    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    handleSelect(index) {
-    handleSave() {
+      this.activeIndex = index;
-      this.$refs.userForm.validate(valid => {
-        console.log(valid)
-        if (valid) {
-          this.isDisabled = true
-          const selectedUserType = this.userTypeOptions.filter((item) => {
-            return item.Id === this.user.UserTypeId
-          })
-          if (selectedUserType.length > 0) {
-            this.user.userTypeEnum = selectedUserType[0].UserTypeEnum
-          }
-          // if (this.user.IsZhiZhun === true) {
-          //   this.user.OrganizationName = 'ZhiZhun'
-          // }
-          if (this.user.Id) {
-            updateUser(this.user).then(res => {
-              this.isDisabled = false
-              this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))
-              this.getUserInfo()
-            }).catch(() => { this.isDisabled = false })
-          }
-        }
-      })
-    },
-    handleEmailChange() {
-      var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
-      if (this.userForm.EMail && reg.test(this.userForm.EMail)) {
-        this.sendDisabled = false
-      } else {
-        this.sendDisabled = true
-      }
-    },
-    sendVerificationCode() {
-      sendVerificationCode(this.userForm.EMail).then(() => {
-        this.settime(this)
-        // 发送成功
-        this.$message.success(this.$t('trials:trials-myinfo:message:sendSuccessfully'))
-      })
-    },
-    save() {
-      this.$refs.passwordForm.validate(valid => {
-        if (valid) {
-          if (this.password.NewPassWord !== this.password.ConfirmPassWord) {
-            this.$alert(this.$t('passwordReset:formRule:passwordsDiffer'))
-            return
-          }
-          const param = {
-            UserId: this.userId,
-            NewPassWord: md5(this.password.NewPassWord),
-            OldPassWord: md5(this.password.OldPassWord)
-          }
-          modifyPassword(param).then(res => {
-            if (res.IsSuccess) {
-              // 修改成功,请重新登录账号
-              this.$message.success(this.$t('trials:trials-myinfo:message:modifyPWSuccessfully'))
-              setTimeout(() => {
-                this.logout()
-              }, 1000)
-            }
-          })
-        }
-      })
-    },
-    setNewEmail() {
-      setNewEmail(this.userForm.EMail, this.userForm.VerificationCode).then(() => {
-        this.userForm.EMail = ''
-        this.userForm.VerificationCode = ''
-        this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))
-        this.getUserInfo()
-      })
-    },
-    setNewUserName() { 
-      setNewUserName(this.userForm.UserName).then(() => {
-        this.$store.dispatch('user/changeUserName', this.userForm.UserName).then((res) => {
-          this.user.UserName = this.userForm.UserName
-          this.userForm.UserName = ''
-          this.$message.success(this.$t('trials:trials-myinfo:message:modifyPWSuccessfully'))
-          this.logout()
-        })
-      })
-    },
-    setNewPhone() {
-      setNewPhone(this.userForm.Phone).then(() => {
-        this.userForm.Phone = ''
-        this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))
-        this.getUserInfo()
-      })
     },
     getUserInfo() {
       const loading = this.$loading({
         fullscreen: false,
         lock: true,
-        text: 'Loading',
+        text: "Loading",
-        spinner: 'el-icon-loading',
+        spinner: "el-icon-loading",
-        background: 'rgba(0, 0, 0, 0.07)'
+        background: "rgba(0, 0, 0, 0.07)",
-      })
+      });
-      getUser(this.userId).then(async res => {
+      getUser(this.userId)
-        this.user = res.Result
+        .then(async (res) => {
+          this.user = res.Result;
           /* eslint-disable */
-        zzSessionStorage.setItem('realName', this.user.RealName)
+          zzSessionStorage.setItem("realName", this.user.RealName);
-        await store.dispatch('user/updateInfo')
+          await store.dispatch("user/updateInfo");
-        loading.close()
+          loading.close();
-      }).catch(() => { loading.close() })
+        })
-    },
+        .catch(() => {
-    settime(obj) {
+          loading.close();
-      if (countdown === 0) {
+        });
-        obj.sendDisabled = false
-        obj.sendTitle = this.$t('trials:trials-myinfo:button:getVCode')// '获取验证码'
-        countdown = 60
-        clearTimeout(timer)
-        return
-      } else {
-        obj.sendDisabled = true
-        obj.sendTitle = `${this.$t('trials:trials-myinfo:button:wait')}(${countdown}s)`
-        countdown--
-        // eslint-disable-next-line no-self-assign
-        countdown = countdown
-        timer = setTimeout(function() {
-          obj.settime(obj)
-        }, 1000)
-      }
     },
     getUserTypeList() {
-      getUserTypeList().then(res => {
+      getUserTypeList().then((res) => {
         if (res.IsSuccess) {
-          this.userTypeOptions = res.Result
+          this.userTypeOptions = res.Result;
         }
-      })
+      });
     },
-    async logout() {
+  },
-      /* eslint-disable */
+};
-      var loginType = zzSessionStorage.getItem('loginType')
-      await this.$store.dispatch('user/logout')
-      if (loginType) {
-        this.$router.push(`/login?loginType=${loginType}`)
-      } else {
-        this.$router.push(`/login`)
-      }
-      this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
-      this.$updateDictionary()
-    }
-  }
-}
 </script>
 
 <style lang="scss">
-  .trial-myinfo{
+.trial-myinfo {
-    flex: 1;overflow: auto;display: flex;flex-direction: row;justify-content: space-around;
+  flex: 1;
-    .trial-myinfo-head{
-      position: absolute;top: 40px;left: -10%;font-size: 14px;
-    }
-    .trial-myinfo-left{
   overflow: auto;
-      background: #fff;width: calc(50% - 9px);margin: 6px 0;
+  display: flex;
-      padding-bottom: 50px;
+  flex-direction: row;
-      .trial-myinfo-left-top{
+  justify-content: space-around;
-        width: 70%;padding-top: 100px;position: relative;margin: 0 auto;margin-bottom: 10px;
+  .contentBox {
-      }
+    width: calc(100% - 220px);
-    }
+    background-color: #fff;
-    .trial-myinfo-body{
+    padding: 0 20px;
-      width:160px;height:160px;border-radius: 50%;background: #428bca;display: flex;justify-content: center;align-items: center;
+    height: 100%;
-      div{
-        color:#fff;font-size: 30px;
-      }
-    }
-    .saveBtn{
-      position: absolute;right: -10px;top:2px;transform: translateX(100%)
-    }
-    .trial-info-btn{
-      position: absolute;bottom: -60px;left: calc(100% + 10px);min-width: 97px;
-    }
-    .trial-myinfo-left-bottom{
-      width: 70%;padding-top: 100px;position: relative;margin: 0 auto;
-    }
-    .trial-myinfo-right{
     overflow: auto;
-      background: #fff;width: calc(50% - 9px);margin: 6px 0;
+    // padding-bottom: 50px;
-      padding-bottom: 50px;
+  }
+  .trial-myinfo-head {
+    position: absolute;
+    top: 40px;
+    left: 20px;
+    font-size: 14px;
+  }
+  .trial-myinfo-left {
+    overflow: auto;
+    background: #fff;
+    // width: calc(50% - 9px);
+    // margin: 6px 0;
+    height: 100%;
+    // padding-bottom: 50px;
+    .trial-myinfo-left-top {
+      width: 70%;
+      padding-top: 100px;
+      position: relative;
+      // margin: 0 auto;
+      margin-bottom: 10px;
+      .trial-myinfo-body {
+        width: 160px;
+        height: 160px;
+        border-radius: 50%;
+        background: #428bca;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-left: 30px;
+        div {
+          color: #fff;
+          font-size: 30px;
+        }
+      }
+    }
+  }
+  .saveBtn {
+    position: absolute;
+    right: -10px;
+    top: 2px;
+    transform: translateX(100%);
+  }
+  .trial-info-btn {
+    position: absolute;
+    bottom: -60px;
+    left: 10px;
+    min-width: 97px;
+  }
+  .trial-myinfo-left-bottom {
+    width: 40%;
+    padding-top: 100px;
+    position: relative;
+    // margin: 0 auto;
+  }
+  .trial-myinfo-right {
+    overflow: auto;
+    background: #fff;
+    // width: calc(50% - 9px);
+    // margin: 6px 0;
+    height: 100%;
     .sendCode {
-        position: absolute;right: -10px;top: 50%;transform: translate(100%, -50%);
+      position: absolute;
-      }
+      right: -10px;
-      .trial-myinfo-right-box{
+      top: 50%;
-        width: 70%;padding-top: 100px;position: relative;margin: 0 auto;
+      transform: translate(100%, -50%);
     }
+    .trial-myinfo-right-box {
+      width: 40%;
+      padding-top: 100px;
+      position: relative;
+      // margin: 0 auto;
     }
   }
-</style>
+}
-<style scoped>
 </style>

src/views/trials/trials-myinfo/mine.vue

@@ -0,0 +1,199 @@
+<template>
+  <div class="trial-myinfo-left">
+    <div class="trial-myinfo-left-bottom">
+      <div class="trial-myinfo-head">
+        <!-- 用户基本信息 -->
+        {{ $t("trials:trials-myinfo:title:basicInfo") }}
+      </div>
+      <el-form
+        ref="userForm"
+        label-position="right"
+        :model="user"
+        :rules="userFormRules"
+        label-width="120px"
+      >
+        <el-form-item v-if="user.Code" label="ID: " prop="Code">
+          <el-input v-model="user.Code" disabled />
+        </el-form-item>
+        <!-- 姓 -->
+        <el-form-item
+          :disabled="user.UserTypeEnum === 8"
+          :label="$t('trials:trials-myinfo:form:surname')"
+          prop="LastName"
+        >
+          <el-input
+            v-model="user.LastName"
+            :placeholder="$t('trials:trials-myinfo:form:surname')"
+          />
+        </el-form-item>
+        <!-- 名 -->
+        <el-form-item
+          :disabled="user.UserTypeEnum === 8"
+          :label="$t('trials:trials-myinfo:form:givenname')"
+          prop="FirstName"
+        >
+          <el-input
+            v-model="user.FirstName"
+            :placeholder="$t('trials:trials-myinfo:form:givenname')"
+          />
+        </el-form-item>
+        <!-- 单位 -->
+        <el-form-item
+          :label="$t('trials:trials-myinfo:form:organization')"
+          prop="OrganizationName"
+        >
+          <el-input
+            :disabled="user.IsZhiZhun"
+            v-model="user.OrganizationName"
+            :placeholder="$t('trials:trials-myinfo:form:organization')"
+          />
+        </el-form-item>
+        <!-- 部门 -->
+        <el-form-item
+          :label="$t('trials:trials-myinfo:form:department')"
+          prop="DepartmentName"
+        >
+          <el-input
+            v-model="user.DepartmentName"
+            :placeholder="$t('trials:trials-myinfo:form:organization')"
+          />
+        </el-form-item>
+        <!-- 职位 -->
+        <el-form-item
+          :label="$t('trials:trials-myinfo:form:position')"
+          prop="PositionName"
+        >
+          <el-input
+            v-model="user.PositionName"
+            :placeholder="$t('trials:trials-myinfo:form:position')"
+          />
+        </el-form-item>
+      </el-form>
+      <!-- 保存 -->
+      <el-button
+        class="trial-info-btn"
+        type="primary"
+        size="small"
+        @click="handleSave"
+      >
+        {{ $t("trials:trials-myinfo:button:save") }}
+      </el-button>
+    </div>
+  </div>
+</template>
+<script>
+import { updateUser } from "@/api/admin.js";
+export default {
+  name: "mine",
+  props: {
+    user: {
+      required: true,
+      default: () => {
+        return {};
+      },
+    },
+    userTypeOptions: {
+      required: true,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      userFormRules: {
+        UserName: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        UserTypeId: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        IsZhiZhun: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        OrganizationName: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        LastName: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          { max: 50, message: `${this.$t("common:ruleMessage:maxLength")} 50` },
+        ],
+        FirstName: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          { max: 50, message: `${this.$t("common:ruleMessage:maxLength")} 50` },
+        ],
+        Sex: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        Status: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    handleSave() {
+      this.$refs.userForm.validate((valid) => {
+        console.log(valid);
+        if (valid) {
+          this.isDisabled = true;
+          const selectedUserType = this.userTypeOptions.filter((item) => {
+            return item.Id === this.user.UserTypeId;
+          });
+          if (selectedUserType.length > 0) {
+            this.user.userTypeEnum = selectedUserType[0].UserTypeEnum;
+          }
+          // if (this.user.IsZhiZhun === true) {
+          //   this.user.OrganizationName = 'ZhiZhun'
+          // }
+          if (this.user.Id) {
+            updateUser(this.user)
+              .then((res) => {
+                this.isDisabled = false;
+                this.$message.success(
+                  this.$t("trials:trials-myinfo:message:updateSuccessfully")
+                );
+                this.$emit("getUserInfo");
+              })
+              .catch(() => {
+                this.isDisabled = false;
+              });
+          }
+        }
+      });
+    },
+  },
+};
+</script>

src/views/trials/trials-myinfo/password.vue

@@ -0,0 +1,160 @@
+<template>
+  <div class="trial-myinfo-right-box">
+    <div class="trial-myinfo-head">
+      <!-- 修改密码 -->
+      {{ $t("trials:trials-myinfo:title:updatePaasord") }}
+    </div>
+    <el-form
+      ref="passwordForm"
+      label-position="right"
+      :model="password"
+      :rules="passwordFormRules"
+      label-width="180px"
+    >
+      <!-- 旧密码 -->
+      <el-form-item
+        :label="$t('recompose:form:oldPassword')"
+        prop="OldPassWord"
+      >
+        <el-input
+          v-model="password.OldPassWord"
+          type="password"
+          show-password
+          auto-complete="new-password"
+          :placeholder="$t('recompose:form:oldPassword')"
+        />
+      </el-form-item>
+      <!-- 新密码 -->
+      <el-form-item
+        :label="$t('recompose:form:newPassword')"
+        prop="NewPassWord"
+      >
+        <el-input
+          v-model="password.NewPassWord"
+          type="password"
+          show-password
+          auto-complete="new-password"
+          :placeholder="$t('recompose:form:newPassword')"
+        />
+      </el-form-item>
+      <!-- 确认密码 -->
+      <el-form-item
+        :label="$t('recompose:form:confirmPassword')"
+        prop="ConfirmPassWord"
+      >
+        <el-input
+          v-model="password.ConfirmPassWord"
+          type="password"
+          show-password
+          auto-complete="new-password"
+          :placeholder="$t('recompose:form:confirmPassword')"
+        />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" size="small" class="trial-info-btn" @click="save">
+      {{ $t("trials:trials-myinfo:button:save") }}
+    </el-button>
+  </div>
+</template>
+<script>
+import md5 from "js-md5";
+import { mapGetters, mapMutations } from "vuex";
+import { modifyPassword } from "@/api/admin.js";
+import { removeToken } from "@/utils/auth";
+export default {
+  name: "password",
+  data() {
+    return {
+      password: {},
+      passwordFormRules: {
+        OldPassWord: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        NewPassWord: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            required: true,
+            trigger: "blur",
+            validator: this.$validatePassword,
+          },
+        ],
+        ConfirmPassWord: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            required: true,
+            trigger: "blur",
+            validator: this.$validatePassword,
+          },
+        ],
+      },
+    };
+  },
+  computed: {
+    ...mapGetters(["userId"]),
+  },
+  methods: {
+    ...mapMutations({ setLanguage: "lang/setLanguage" }),
+    async save() {
+      try {
+        let validate = await this.$refs.passwordForm.validate();
+        if (!validate) return;
+        if (this.password.NewPassWord !== this.password.ConfirmPassWord) {
+          this.$alert(this.$t("passwordReset:formRule:passwordsDiffer"));
+          return;
+        }
+        let confirm = await this.$confirm(
+          this.$t("trials:trials-myInfo:confirmMessage:updatePassWord"),
+          {
+            type: "warning",
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t("common:button:confirm"),
+            cancelButtonText: this.$t("common:button:cancel"),
+          }
+        );
+        if (confirm !== "confirm") return;
+        const param = {
+          UserId: this.userId,
+          NewPassWord: md5(this.password.NewPassWord),
+          OldPassWord: md5(this.password.OldPassWord),
+        };
+        let res = await modifyPassword(param);
+        if (res.IsSuccess) {
+          // 修改成功,请重新登录账号
+          this.$message.success(
+            this.$t("trials:trials-myinfo:message:modifyPWSuccessfully")
+          );
+          removeToken();
+          this.logout();
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    async logout() {
+      /* eslint-disable */
+      var loginType = zzSessionStorage.getItem("loginType");
+      await this.$store.dispatch("user/logout");
+      if (loginType) {
+        this.$router.push(`/login?loginType=${loginType}`);
+      } else {
+        this.$router.push(`/login`);
+      }
+      this.$i18n.locale = "zh";
+      this.setLanguage("zh");
+      this.$updateDictionary();
+    },
+  },
+};
+</script>

src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue

@@ -36,13 +36,13 @@
           sortable="custom"
         />
         <!-- 中文名 -->
-        <el-table-column
+        <!-- <el-table-column
           prop="BlindNameCN"
           :label="$t('trials:spmEnroll:table:blindNameCN')"
           show-overflow-tooltip
           min-width="120"
           sortable="custom"
-        />
+        /> -->
         <!-- 专业 -->
         <el-table-column
           prop="SpecialityId"

src/views/trials/trials-panel/attachments/attachment-management/index.vue

@@ -47,6 +47,7 @@
           >
             <el-option
               v-for="item of userTypeOptions"
+              v-show="item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27"
               :key="item.Id"
               :label="item.UserTypeShortName"
               :value="item.Id"

src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue

@@ -31,13 +31,13 @@
           </template>
         </el-table-column>
         <!-- Name CN -->
-        <el-table-column
+        <!-- <el-table-column
           prop="ChineseName"
           :label="$t('trials:seletctedReviews:table:nameCN')"
           show-overflow-tooltip
           min-width="120"
           sortable="custom"
-        />
+        /> -->
         <!-- ID -->
         <el-table-column
           prop="Code"

src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue

@@ -42,13 +42,13 @@
           </template>
         </el-table-column>
         <!-- Name CN -->
-        <el-table-column
+        <!-- <el-table-column
           prop="ChineseName"
           :label="$t('trials:seletctedReviews:table:nameCN')"
           show-overflow-tooltip
           min-width="120"
           sortable="custom"
-        />
+        /> -->
         <!-- ID -->
         <el-table-column
           prop="Code"

src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue

@@ -2,6 +2,15 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true">
+        <!-- Name -->
+        <el-form-item :label="$t('trials:seletctedReviews:table:name')">
+          <el-input
+            v-model="listQuery.Name"
+            size="small"
+            clearable
+            style="width: 120px"
+          />
+        </el-form-item>
         <!-- Modality -->
         <el-form-item :label="$t('trials:seletctedReviews:form:modality')">
           <el-select
@@ -137,21 +146,21 @@
           </template>
         </el-table-column>
         <!-- Name CN -->
-        <el-table-column
+        <!-- <el-table-column
           prop="ChineseName"
           :label="$t('trials:seletctedReviews:table:nameCN')"
           show-overflow-tooltip
           sortable="custom"
           width="120"
+        /> -->
+        
+        <el-table-column
+          prop="DoctorUserName"
+          :label="$t('trials:seletctedReviews:table:doctorUserName')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="120"
         />
-        <!-- ID -->
-        <!--        <el-table-column-->
-        <!--          prop="ReviewerCode"-->
-        <!--          :label="$t('trials:seletctedReviews:table:id')"-->
-        <!--          show-overflow-tooltip-->
-        <!--          sortable="custom"-->
-        <!--          width="120"-->
-        <!--        />-->
         <!-- Status -->
         <el-table-column
           prop="DoctorTrialState"
@@ -266,6 +275,7 @@ import { getSelectionReviewerList, selectReviewers } from '@/api/trials'
 const getListQueryDefault = () => {
   return {
     TrialId: '',
+    Name:'',
     ReadingTypeIds: [],
     SubspecialityIds: [],
     PageIndex: 1,

src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue

@@ -52,13 +52,13 @@
           </template>
         </el-table-column>
         <!-- Name CN -->
-        <el-table-column
+        <!-- <el-table-column
           prop="ChineseName"
           :label="$t('trials:seletctedReviews:table:nameCN')"
           show-overflow-tooltip
           sortable="custom"
           min-width="120"
-        />
+        /> -->
         <!-- ID -->
         <el-table-column
           prop="Code"
@@ -192,7 +192,11 @@ export default {
             this.getList()
             // 保存成功
             this.$message.success(this.$t('common:message:savedSuccessfully'))
+            if(res.Result.IsHaveSPMOrCPM){
               this.$emit('nextStep', 'approval')
+            }else{
+              this.$emit('nextStep', 'confirmation')
+            }
           }
         }).catch(() => {
           this.loading = false

src/views/trials/trials-panel/attachments/enrollment/index.vue

@@ -11,28 +11,37 @@
             <label class="el-label">{{ $t('trials:trials-list:form:indication:') }}</label>
             <span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span>
           </div>
+         
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:criterion:') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:declarationType:') }}</label>
-            <span>{{ (trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): '' }}</span>
-          </div>
-          <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:modality:') }}</label>
             <el-tooltip
               class="item"
-              :content="trialInfo.Modalitys"
+              :content="trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).join(', ')"
               placement="top"
             >
-              <span>{{ trialInfo.Modalitys }}</span>
+              <span>{{ trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).join(', ') }}</span>
             </el-tooltip>
           </div>
+           <div class="div-col">
+            <label class="el-label">{{ $t('trials:trials-list:form:criterion:') }}</label>
+            <el-tooltip
+              class="item"
+              :content="(trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): ''"
+              placement="top"
+            >
+              <span>{{ (trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): '' }}</span>
+            </el-tooltip>
+            
+          </div>
+          <div class="div-col">
+          </div>
 
         </div>
         <div class="div-row">
-<!--          <div class="div-col">-->
+          <div class="div-col">
-<!--            <label class="el-label">{{ $t('trials:trials-list:form:reviewMode') }}:</label>-->
+            <label class="el-label">{{ $t('trials:trials-list:form:expedited:') }}</label>
-<!--            &lt;!&ndash; <span>{{ trialInfo.ReadingType }}</span> &ndash;&gt;-->
+            <span>{{$fd('YesOrNoForInt', trialInfo.Expedited)}}</span>
-<!--            <span>{{ $fd('ReadingMethod', trialInfo.ReadingType) }}</span>-->
+          </div>
-<!--          </div>-->
           <div class="div-col">
             <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers:') }}</label>
             <span>{{ trialInfo.TotalReviewers }}</span>
@@ -40,7 +49,6 @@
           <div class="div-col">
             <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers:') }}</label>
             <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).join(', ') }}</span>
-<!--            <span>{{ $fd('AttendedReviewerType', trialInfo.AttendedReviewerType) }}</span>-->
           </div>
           <div class="div-col">
           </div>
@@ -139,7 +147,10 @@ export default {
       this.activeStatus = step
     },
     nextStep(stepName) {
-      this.activeStatus = this.activeStatus === 3 ? 3 : this.activeStatus + 1
+      this.activeStatus = this.activeStatus === 3 ? 3 : this.activeStatus + 1;
+      if(stepName==='confirmation'){
+        this.activeStatus = 3;
+      }
       this.TrialMaxState = this.activeStatus
       this.$nextTick(
         function() {