自定义阅片样式更改

# Conflicts:
#	src/views/trials/trials-panel/setting/personnel-manage/components/site.vue

.env.usa

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

.env.usa_prod

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

irc_vue_drone.yml

@@ -1,3 +1,32 @@
+kind: pipeline
+type: ssh
+name: ssh-linux-uat-irc-publish
+
+platform:
+  os: Linux
+  arch: 386
+  
+clone:
+  disable: true  #禁用默认克隆
+  
+server:
+  host: 47.117.164.182
+  user: root
+  password:
+    from_secret: local_pwd
+
+steps:
+- name: uat-branch-publish-irc-vue
+  commands:
+  - cd /opt/1panel/vue-devops/Uat_IRC/Uat-To-Uat
+  - sh uat-to-uat.sh v${DRONE_BUILD_NUMBER}
+  
+trigger:
+  branch:
+    - uat    
+    
+---    
+    
 kind: pipeline
 type: ssh
 name: ssh-linux-test-irc-publish
@@ -26,35 +55,7 @@ trigger:
   branch:
     - main    
        
----
 
-      
-kind: pipeline
-type: ssh
-name: ssh-linux-test-study-publish
+       
 
-platform:
-  os: Linux
-  arch: 386
-
-clone:
-  disable: true  #禁用默认克隆
-  
-server:
-  host: 106.14.89.110
-  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

@@ -19,7 +19,6 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.1.tgz",
       "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
-      "dev": true,
       "requires": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
@@ -29,7 +28,6 @@
       "version": "7.23.5",
       "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.23.5.tgz",
       "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
-      "dev": true,
       "requires": {
         "@babel/highlight": "^7.23.4",
         "chalk": "^2.4.2"
@@ -38,14 +36,12 @@
     "@babel/compat-data": {
       "version": "7.23.5",
       "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.23.5.tgz",
-      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
-      "dev": true
+      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw=="
     },
     "@babel/core": {
       "version": "7.23.6",
       "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.23.6.tgz",
       "integrity": "sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==",
-      "dev": true,
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.23.5",
@@ -67,14 +63,34 @@
         "json5": {
           "version": "2.2.3",
           "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
-          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-          "dev": true
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
         },
         "semver": {
           "version": "6.3.1",
           "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+        }
+      }
+    },
+    "@babel/eslint-parser": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmmirror.com/@babel/eslint-parser/-/eslint-parser-7.24.8.tgz",
+      "integrity": "sha512-nYAikI4XTGokU2QX7Jx+v4rxZKhKivaQaREZjuW3mrJrbdWJ5yUfohnoUULge+zEEaKjPYNxhoRgUKktjXtbwA==",
+      "requires": {
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.1"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
+        },
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
         }
       }
     },
@@ -82,7 +98,6 @@
       "version": "7.23.6",
       "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.23.6.tgz",
       "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.23.6",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -112,7 +127,6 @@
       "version": "7.23.6",
       "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
       "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
-      "dev": true,
       "requires": {
         "@babel/compat-data": "^7.23.5",
         "@babel/helper-validator-option": "^7.23.5",
@@ -125,7 +139,6 @@
           "version": "5.1.1",
           "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz",
           "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
           "requires": {
             "yallist": "^3.0.2"
           }
@@ -133,14 +146,12 @@
         "semver": {
           "version": "6.3.1",
           "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
         },
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
         }
       }
     },
@@ -204,14 +215,12 @@
     "@babel/helper-environment-visitor": {
       "version": "7.22.20",
       "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
     },
     "@babel/helper-function-name": {
       "version": "7.23.0",
       "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
       "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dev": true,
       "requires": {
         "@babel/template": "^7.22.15",
         "@babel/types": "^7.23.0"
@@ -221,7 +230,6 @@
       "version": "7.22.5",
       "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
       "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.22.5"
       }
@@ -239,7 +247,6 @@
       "version": "7.22.15",
       "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
       "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.22.15"
       }
@@ -248,7 +255,6 @@
       "version": "7.23.3",
       "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
       "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
-      "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-module-imports": "^7.22.15",
@@ -298,7 +304,6 @@
       "version": "7.22.5",
       "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
       "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.22.5"
       }
@@ -316,7 +321,6 @@
       "version": "7.22.6",
       "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
       "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.22.5"
       }
@@ -324,20 +328,17 @@
     "@babel/helper-string-parser": {
       "version": "7.23.4",
       "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
-      "dev": true
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ=="
     },
     "@babel/helper-validator-identifier": {
       "version": "7.22.20",
       "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-      "dev": true
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
     },
     "@babel/helper-validator-option": {
       "version": "7.23.5",
       "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
-      "dev": true
+      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw=="
     },
     "@babel/helper-wrap-function": {
       "version": "7.22.20",
@@ -354,7 +355,6 @@
       "version": "7.23.6",
       "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.23.6.tgz",
       "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==",
-      "dev": true,
       "requires": {
         "@babel/template": "^7.22.15",
         "@babel/traverse": "^7.23.6",
@@ -365,7 +365,6 @@
       "version": "7.23.4",
       "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.23.4.tgz",
       "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
-      "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
@@ -375,8 +374,7 @@
         "js-tokens": {
           "version": "4.0.0",
           "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-          "dev": true
+          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
         }
       }
     },
@@ -1326,7 +1324,6 @@
       "version": "7.22.15",
       "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.22.15.tgz",
       "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
-      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.22.13",
         "@babel/parser": "^7.22.15",
@@ -1337,7 +1334,6 @@
       "version": "7.23.6",
       "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.23.6.tgz",
       "integrity": "sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==",
-      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.23.5",
         "@babel/generator": "^7.23.6",
@@ -1354,8 +1350,7 @@
         "globals": {
           "version": "11.12.0",
           "resolved": "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
+          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
         }
       }
     },
@@ -1363,7 +1358,6 @@
       "version": "7.23.6",
       "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.23.6.tgz",
       "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
-      "dev": true,
       "requires": {
         "@babel/helper-string-parser": "^7.23.4",
         "@babel/helper-validator-identifier": "^7.22.20",
@@ -1373,8 +1367,7 @@
         "to-fast-properties": {
           "version": "2.0.0",
           "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-          "dev": true
+          "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
         }
       }
     },
@@ -1581,11 +1574,15 @@
         }
       }
     },
+    "@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmmirror.com/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="
+    },
     "@jridgewell/gen-mapping": {
       "version": "0.3.3",
       "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
       "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
-      "dev": true,
       "requires": {
         "@jridgewell/set-array": "^1.0.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -1595,31 +1592,61 @@
     "@jridgewell/resolve-uri": {
       "version": "3.1.1",
       "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
-      "dev": true
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="
     },
     "@jridgewell/set-array": {
       "version": "1.1.2",
       "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "dev": true
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
     },
     "@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
       "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
     "@jridgewell/trace-mapping": {
       "version": "0.3.20",
       "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
       "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
-      "dev": true,
       "requires": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "@jsdevtools/coverage-istanbul-loader": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmmirror.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz",
+      "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==",
+      "requires": {
+        "convert-source-map": "^1.7.0",
+        "istanbul-lib-instrument": "^4.0.3",
+        "loader-utils": "^2.0.0",
+        "merge-source-map": "^1.1.0",
+        "schema-utils": "^2.7.0"
+      },
+      "dependencies": {
+        "convert-source-map": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-1.9.0.tgz",
+          "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+        },
+        "json5": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
+        },
+        "loader-utils": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        }
+      }
+    },
     "@kitware/vtk.js": {
       "version": "27.3.1",
       "resolved": "https://registry.npmmirror.com/@kitware/vtk.js/-/vtk.js-27.3.1.tgz",
@@ -1718,6 +1745,25 @@
         "glob-to-regexp": "^0.3.0"
       }
     },
+    "@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmmirror.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "requires": {
+        "eslint-scope": "5.1.1"
+      },
+      "dependencies": {
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
+          }
+        }
+      }
+    },
     "@node-ipc/js-queue": {
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/@node-ipc/js-queue/-/js-queue-2.0.3.tgz",
@@ -2820,6 +2866,36 @@
             }
           }
         },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          },
+          "dependencies": {
+            "has-flag": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+              "dev": true,
+              "optional": true
+            },
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
         "chokidar": {
           "version": "2.1.8",
           "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-2.1.8.tgz",
@@ -3054,7 +3130,6 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
         },
@@ -3199,6 +3274,13 @@
             }
           }
         },
+        "json5": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+          "dev": true,
+          "optional": true
+        },
         "locate-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-3.0.0.tgz",
@@ -3442,6 +3524,32 @@
           "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
           "dev": true
         },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.8.3",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          },
+          "dependencies": {
+            "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==",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+              }
+            }
+          }
+        },
         "webpack-dev-middleware": {
           "version": "3.7.3",
           "resolved": "https://registry.npmmirror.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz",
@@ -5072,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",
@@ -5365,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",
@@ -5645,8 +5742,7 @@
     "caniuse-lite": {
       "version": "1.0.30001568",
       "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001568.tgz",
-      "integrity": "sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A==",
-      "dev": true
+      "integrity": "sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A=="
     },
     "case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
@@ -6407,8 +6503,7 @@
     "convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
     "cookie": {
       "version": "0.5.0",
@@ -6518,12 +6613,32 @@
       }
     },
     "cornerstone-wado-image-loader": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmmirror.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-3.3.2.tgz",
-      "integrity": "sha512-Yy0DtfSMlflMS5RMQhX9YnXiYYkZz99nnXG2qtBRvzvSdwqiElIpE13sKw0Ohi4mqNwrWRx0xt8utk0HKnAXyw==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmmirror.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-4.13.2.tgz",
+      "integrity": "sha512-NGqH44bY1VMY8OYuVykkLriNtZQrmoZU/S6f/1t1xX3rMc+WUMNN+yi4Nu3jp6nckLdH/bVGiigoJXrp0dTrAg==",
       "requires": {
-        "dicom-parser": "^1.8.3",
-        "pako": "^1.0.10"
+        "@babel/eslint-parser": "^7.19.1",
+        "@cornerstonejs/codec-charls": "^1.2.3",
+        "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
+        "@cornerstonejs/codec-openjpeg": "^1.2.2",
+        "@cornerstonejs/codec-openjph": "^2.4.2",
+        "coverage-istanbul-loader": "^3.0.5",
+        "date-format": "^4.0.14",
+        "dicom-parser": "^1.8.9",
+        "pako": "^2.0.4",
+        "uuid": "^9.0.0"
+      },
+      "dependencies": {
+        "pako": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmmirror.com/pako/-/pako-2.1.0.tgz",
+          "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug=="
+        },
+        "uuid": {
+          "version": "9.0.1",
+          "resolved": "https://registry.npmmirror.com/uuid/-/uuid-9.0.1.tgz",
+          "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
+        }
       }
     },
     "cosmiconfig": {
@@ -6550,6 +6665,14 @@
         }
       }
     },
+    "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",
@@ -7043,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",
@@ -7555,8 +7683,7 @@
     "electron-to-chromium": {
       "version": "1.4.611",
       "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.611.tgz",
-      "integrity": "sha512-ZtRpDxrjHapOwxtv+nuth5ByB8clyn8crVynmRNGO3wG3LOp8RTcyZDqwaI6Ng6y8FCK2hVZmJoqwCskKbNMaw==",
-      "dev": true
+      "integrity": "sha512-ZtRpDxrjHapOwxtv+nuth5ByB8clyn8crVynmRNGO3wG3LOp8RTcyZDqwaI6Ng6y8FCK2hVZmJoqwCskKbNMaw=="
     },
     "elegant-spinner": {
       "version": "1.0.1",
@@ -7763,8 +7890,7 @@
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
     "escape-html": {
       "version": "1.0.3",
@@ -8027,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"
       },
@@ -8035,16 +8160,14 @@
         "estraverse": {
           "version": "5.3.0",
           "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
         }
       }
     },
     "estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
     },
     "esutils": {
       "version": "2.0.3",
@@ -8484,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",
@@ -8820,8 +8936,7 @@
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmmirror.com/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
     },
     "get-caller-file": {
       "version": "2.0.5",
@@ -10409,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",
@@ -10460,8 +10598,7 @@
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
     },
     "json-parse-better-errors": {
       "version": "1.0.2",
@@ -11139,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"
       },
@@ -11147,8 +11283,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -11864,8 +11999,7 @@
     "node-releases": {
       "version": "2.0.14",
       "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-      "dev": true
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
     },
     "node-sass": {
       "version": "4.14.1",
@@ -17112,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"
@@ -17460,94 +17593,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "json5": {
-          "version": "2.2.3",
-          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
-          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-          "dev": true,
-          "optional": true
-        },
-        "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==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-pdf": {
       "version": "4.3.0",
       "resolved": "https://registry.npmmirror.com/vue-pdf/-/vue-pdf-4.3.0.tgz",
@@ -17807,7 +17852,6 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
         },

package.json

@@ -7,6 +7,7 @@
     "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-math": "^0.1.8",
-    "cornerstone-tools": "^6.0.8",
-    "cornerstone-wado-image-loader": "^3.1.2",
+    "cornerstone-core": "^2.6.1",
+    "cornerstone-math": "^0.1.10",
+    "cornerstone-tools": "^6.0.10",
+    "cornerstone-wado-image-loader": "^4.13.2",
     "dcmjs": "^0.29.8",
     "dicom-parser": "^1.8.9",
     "dicomedit": "^0.1.0",

src/App.vue

@@ -3,6 +3,7 @@
     <router-view />
     <div
       v-show="show"
+      v-if="$route.matched.length > 0"
       v-adaptive
       @click="openI18n"
       style="
@@ -81,6 +82,7 @@
         >
       </div>
     </el-drawer>
+    <feedBack v-if="$route.matched.length > 0" />
   </div>
 </template>
 
@@ -89,10 +91,13 @@ import {
   batchAddOrUpdateFrontInternationalization,
   getFrontInternationalizationList,
 } from "@/api/dictionary/dictionary";
+import { getTrialExtralConfig } from "@/api/trials";
+import feedBack from "@/views/trials/trials-layout/components/feedBack";
 import Vue from "vue";
 import i18n from "./lang";
 export default {
   name: "App",
+  components: { feedBack },
   data() {
     return {
       drawer: false,
@@ -105,6 +110,30 @@ export default {
   mounted() {
     this.show = process.env.VUE_APP_OSS_PATH === "/test/dist";
   },
+  watch: {
+    "$route.query": {
+      async handler() {
+        if (
+          this.$route.query.trialId &&
+          this.$route.query.trialId !==
+            this.$store.state.trials.config.trialId &&
+          this.$store.state.trials.whiteList.indexOf(this.$route.path) === -1
+        ) {
+          let res = await getTrialExtralConfig({
+            TrialId: this.$route.query.trialId,
+          });
+          if (res.IsSuccess) {
+            this.$store.dispatch("trials/setConfig", {
+              trialId: this.$route.query.trialId,
+              ...res.Result,
+            });
+          }
+        }
+      },
+      immediate: true,
+      deep: true,
+    },
+  },
   methods: {
     changeValue(target, attr, e) {
       this.$set(target, attr, e);

src/api/export.js

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

src/api/reading.js

@@ -171,3 +171,26 @@ export function getCustomTag(param) {
     data: param
   })
 }
+
+export function clearSkipReadingCache(param) {
+  return request({
+    url: `/ReadingImageTask/clearSkipReadingCache`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function setSkipReadingCache(param) {
+  return request({
+    url: `/ReadingImageTask/setSkipReadingCache`,
+    method: 'post',
+    data: param
+  })
+}
+export function resetReadingTask(param) {
+  return request({
+    url: `/ReadingImageTask/resetReadingTask`,
+    method: 'post',
+    data: param
+  })
+}

src/api/trials.js

@@ -3712,7 +3712,7 @@ export function addOrUpdateTrialSiteDicomAE(param) {
 export function deleteTrialSiteDicomAE(id) {
   return request({
     url: `/TrialSiteDicomAE/deleteTrialSiteDicomAE/${id}`,
-    method: 'delete',
+    method: 'delete'
   })
 }
 // 获取项目中dicomAE配置
@@ -3723,6 +3723,14 @@ export function getTrialDicomAE(params) {
     params
   })
 }
+// 获取项目配置
+export function getTrialExtralConfig(params) {
+  return request({
+    url: `/TrialConfig/getTrialExtralConfig`,
+    method: 'get',
+    params
+  })
+}
 // 项目新增或修改dicomAE配置
 export function addOrUpdateDicomAE(data) {
   return request({
@@ -3732,10 +3740,19 @@ export function addOrUpdateDicomAE(data) {
   })
 }
 // 测试dicomAE链接
-export function testSCPServerConnect(id) {
+export function testSCPServerConnect(data) {
   return request({
-    url: `/TrialDicomAE/testSCPServerConnect/${id}`,
+    url: `/TrialDicomAE/testSCPServerConnect`,
+    method: 'post',
+    data
+  })
+}
+// 获取dicomAE默认值
+export function getTrialPacsConfigInfo(params) {
+  return request({
+    url: `/TrialConfig/getTrialPacsConfigInfo`,
     method: 'get',
+    params
   })
 }
 // dicomAE配置签名
@@ -3785,4 +3802,107 @@ export function getDicomCallingAEList(params) {
     method: 'get',
     params
   })
+}
+// CRCpacs上传检查列表
+export function getVisitPatientStudyFilterList(data) {
+  return request({
+    url: `/Patient/getVisitPatientStudyFilterList`,
+    method: 'post',
+    data
+  })
+}
+// CRCpacs上传检查校验
+export function verifyPacsImage(data) {
+  return request({
+    url: `/Patient/verifyPacsImage`,
+    method: 'post',
+    data
+  })
+}
+// CRCpacs上传检查
+export function submitVisitStudyBinding(data) {
+  return request({
+    url: `/Patient/submitVisitStudyBinding`,
+    method: 'post',
+    data
+  })
+}
+// 获取pacs检查技术
+export function getDicomModalityList(params) {
+  return request({
+    url: `/Patient/getDicomModalityList`,
+    method: 'get',
+    params
+  })
+}
+// 获取患者序列信息
+export function getPatientSeriesList(scpStudyId) {
+  return request({
+    url: `/Patient/getPatientSeriesList?scpStudyId=${scpStudyId}`,
+    method: 'get'
+  })
+}
+// 获取反馈列表
+export function getUserFeedBackList(data) {
+  return request({
+    url: `/UserFeedBack/getUserFeedBackList`,
+    method: 'post',
+    data
+  })
+}
+// 更新反馈状态
+export function batchUpdateFeedBackState(data) {
+  return request({
+    url: `/UserFeedBack/batchUpdateFeedBackState`,
+    method: 'put',
+    data
+  })
+}
+// 新增或修改意见反馈
+export function addOrUpdateUserFeedBack(data) {
+  return request({
+    url: `/UserFeedBack/addOrUpdateUserFeedBack`,
+    method: 'post',
+    data
+  })
+}
+// 获取反馈详情
+export function getUserFeedBackInfo(data) {
+  return request({
+    url: `/UserFeedBack/getUserFeedBackInfo`,
+    method: 'post',
+    data
+  })
+}
+//  一致性分析获取临床数据列表
+export function getConsistencyAnalysisReadingClinicalDataList(data) {
+  return request({
+    url: `/ReadingClinicalData/getConsistencyAnalysisReadingClinicalDataList`,
+    method: 'post',
+    data
+  })
+}
+//  新增或修改一致性分析临床数据
+export function addOrUpdateConsistencyAnalysisReadingClinicalData(data) {
+  return request({
+    url: `/ReadingClinicalData/addOrUpdateConsistencyAnalysisReadingClinicalData`,
+    method: 'post',
+    data
+  })
+}
+//  一致性分析临床数据签名
+export function signConsistencyAnalysisReadingClinicalData(data) {
+  return request({
+    url: `/Inspection/ReadingClinicalData/SignConsistencyAnalysisReadingClinicalData`,
+    method: 'post',
+    data
+  })
+}
+//  一致性分析临床数据设置任务为有效
+export function setTaskValid(data) {
+  return request({
+    url: `/ReadingClinicalData/setTaskValid`,
+    method: 'post',
+    data
+  })
 }

src/components/BaseForm/search-form.vue

@@ -120,9 +120,9 @@
           v-if="item.type === 'Daterange'"
           v-model="searchData[item.prop]"
           type="datetimerange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
+          :range-separator="$t('baseForm:daterange:rangeSeparator')"
+          :start-placeholder="$t('baseForm:daterange:startPlaceholder')"
+          :end-placeholder="$t('baseForm:daterange:startendPlaceholder')"
           value-format="yyyy-MM-dd HH:mm:ss"
           format="yyyy-MM-dd HH:mm:ss"
           :style="{ width: item.width }"

src/components/Dicom/DicomCanvas.vue

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

src/components/Dicom/DicomViewer.vue

@@ -405,7 +405,8 @@ export default {
     loadImageStack(dicomSeries) {
       this.currentDicomCanvas.toolState.clipPlaying = false
       this.$nextTick(() => {
-        this.currentDicomCanvas.loadImageStack(dicomSeries)
+        let series = Object.assign({}, dicomSeries)
+        this.currentDicomCanvas.loadImageStack(series)
       })
     },
     loadOtherImageStack(seriesList) {
@@ -415,7 +416,8 @@ export default {
         Array.from(elements).forEach((element, index) => {
           const canvasIndex = element.getAttribute('data-index')
           if (index < seriesList.length && element.style.display !== 'none') {
-            this.$refs[`dicomCanvas${canvasIndex}`].loadImageStack(seriesList[index])
+            let series = Object.assign({}, seriesList[index])
+            this.$refs[`dicomCanvas${canvasIndex}`].loadImageStack(series)
           }
         })
       })

src/components/MFA/fun.js

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

src/components/MFA/index.vue

@@ -91,21 +91,21 @@ export default {
         Code: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
+            message: this.$t("mfa:ruleMessage:specify"),
             trigger: "blur",
           },
         ],
         EMail: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
+            message: this.$t("mfa:ruleMessage:specify"),
             trigger: "blur",
           },
         ],
         username: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
+            message: this.$t("mfa:ruleMessage:specify"),
             trigger: "blur",
           },
         ],
@@ -167,6 +167,7 @@ export default {
           this.timer = setInterval(() => {
             this.second--;
             if (this.second <= 0) {
+              this.flag = false;
               clearInterval(this.timer);
               this.timer = null;
             }
@@ -201,4 +202,7 @@ export default {
     margin-right: 5px;
   }
 }
+::v-deep .el-dialog__header {
+  font-weight: bold;
+}
 </style>

src/components/UploadFile/index.vue

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

src/components/feedBack/fun.js

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

src/components/feedBack/index.js

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

src/components/feedBack/index.vue

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

src/components/feedBack/uploadImage.vue

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

src/components/feedBackTable/fun.js

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

src/components/feedBackTable/index.js

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

src/components/feedBackTable/index.vue

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

src/components/videos/index.vue

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

src/const/sign-code.vue

@@ -8,6 +8,8 @@ export default {
     ProcessConfigUpdates: 105, // 流程配置更新：流程配置更新操作
     ExpeditedConfigUpdates: 106, // 加急配置更新：加急配置更新操作
     QCConfirmation: 107, // 质控问题配置：质控问题配置确认操作
+    DicomConfigConfirmation: 110, // DICOM AE配置确认
+    DicomConfigUpdates: 111, // DICOM AE配置更新
     ClinicalDataConfirmation: 201, // 临床数据完整性确认：临床数据完整性确认操作
     AgreeToRetransmit: 202, // 同意重传：同意重传操作
     QCSingleReviewPassed: 203, // 影像质控单审通过：影像质控审核操作
@@ -27,8 +29,6 @@ export default {
     MedicalAudit: 215, // 医学审核
     HeavyReadingApproval: 216, // 重阅审批
     ResetAndAsyncCriterion: 218, //同步签名
-    DicomConfigConfirmation: 219, // DICOM AE配置确认
-    DicomConfigUpdates: 220, // DICOM AE配置更新
   },
 };
 </script>

src/icons/svg/login-logo.svg

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

src/main.js

@@ -1,10 +1,9 @@
 
 import Vue from 'vue'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
-
+// import { createVersionPolling } from "@/utils/version-polling.esm.js";
 import ElementUI, { MessageBox } from 'element-ui'
 import { getBasicDataAllSelect, getFrontInternationalizationList, getCurrentPublishInfo } 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' // 浅绿色主题
@@ -44,7 +43,6 @@ Viewer.setDefaults({
     'rotatable': true,
     'scalable': true,
     'transition': true,
-    'fullscreen': true,
     'keyboard': true,
     'url': 'data-source'
   }
@@ -61,6 +59,10 @@ import Preview from '@/components/Preview/index'
 Vue.use(Preview)
 import MFA from '@/components/MFA/index'
 Vue.use(MFA)
+import FB from '@/components/feedBack/index'
+Vue.use(FB)
+import FBT from '@/components/feedBackTable/index'
+Vue.use(FBT)
 import adaptive from '@/directive/adaptive/index'
 // 表格自适应指令
 Vue.use(adaptive)
@@ -131,7 +133,8 @@ Vue.prototype.$validatePassword = (rule, value, callback) => {
   /* eslint-disable */
   var reg1 = eval(process.env.VUE_APP_PASSWORD_FOR_PERMISSION) ? new RegExp(`${process.env.VUE_APP_PASSWORD_FOR_REGULAR}`) : /.*/g; //密码必须是8位以上、必须含有字母、数字、特殊符号
   if (!reg1.test(value)) {
-    callback(lang === 'zh' ? new Error("密码必须包含：1）8 – 32 个字符；2）至少1个数字；3) 至少1个大写字母；4）至少1个小写字母；5）至少1个特殊字符 (~!-@#$%^&*_+?)") : new Error('Passwords must have: 1) 8 - 32 characters; 2) At least 1 number; 3) At least 1 uppercase letter; 4) At least 1 lowercase letter; 5) At least 1 special character (~!-@#$%^&*_+?) '))
+    callback(
+      new Error(_vm.$t('env:regExp:formatPassword')))
   } else {
     callback();
   }
@@ -304,13 +307,13 @@ async function VueInit() {
   if (eval(process.env.VUE_APP_LOGIN_FOR_PERMISSION)) {
     setInterval(() => {
       var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-      if (_vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      if (_vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
         return
       }
       if (_vm.$store.state.user.userId !== zzSessionStorage.getItem('userId')) {
         window.location.href = `/login`
         zzSessionStorage.removeItem('lastWorkbench')
-        _vm.$alert(lang === 'en' ? 'The same browser only allows one user account to be logged in at a time.' : '同一浏览器只允许同时登陆一个账户', {
+        _vm.$alert(_vm.$t("env:sso:tip"), {
           type: 'warning',
         })
       }
@@ -368,20 +371,28 @@ async function VueInit() {
   window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME;
   waitOperate(eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION) ? () => {
     var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-    if (_vm.$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') {
+    if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
       count = 0;
       localStorage.setItem('count', '0')
       return
     }
     _vm.$store.dispatch('user/logout').then(res => {
       // window.location.href = `/login`
-      _vm.$msgbox.close();
+      if (_vm.$msgbox) {
+        _vm.$msgbox.close();
+      }
+      _vm.$FB.close();
+      _vm.$FBT.close();
+      _vm.$MFA.close();
       isOpen = false
       isLock = null
       zzSessionStorage.removeItem('isLock')
       router.push("/login")
     }).then(() => {
-      _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登录！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', {
+      // _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',
       })
     })
@@ -389,7 +400,7 @@ async function VueInit() {
   } : () => { }, process.env.VUE_APP_LOGOUT_FOR_TIME,
     eval(process.env.VUE_APP_LOCK_FOR_PERMISSION) ? () => {
       var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-      if (_vm.$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') {
+      if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
         count = 0;
         localStorage.setItem('count', '0')
         if (_vm.$route.path === '/login') {
@@ -405,17 +416,17 @@ async function VueInit() {
       isOpen = true
       zzSessionStorage.setItem('isLock', 'true')
       _vm.$msgbox({
-        title: lang === 'zh' ? '已锁定' : 'Locked',
-        confirmButtonText: lang === 'zh' ? '解锁' : 'Unlock',
+        title: _vm.$t("env:lock:msgBox:title"),
+        confirmButtonText: _vm.$t("env:lock:msgBox:confirmButtonText"),
         showClose: false,
         beforeClose: (action, instance, done) => {
           if (action === 'confirm') {
             if (!_vm.unlock.my_username) {
-              _vm.$alert(lang === 'zh' ? '请输入您的用户名解锁' : 'Please enter your user name to unlock.')
+              _vm.$alert(_vm.$t("env:lock:msgBox:iupUser"))
               return
             }
             if (!_vm.unlock.my_password) {
-              _vm.$alert(lang === 'zh' ? '请输入您的密码解锁' : 'Please enter the correct password to unlock.')
+              _vm.$alert(_vm.$t("env:lock:msgBox:inpPassword"))
               return
             }
             var my_username = zzSessionStorage.getItem('my_username')
@@ -426,7 +437,7 @@ async function VueInit() {
               resetReadingRestTime().then(() => {
               })
               const closeLock = (_vm) => {
-                _vm.$message.success(lang === 'zh' ? '解锁成功，请继续操作' : 'Unlocked successfully. Please continue operation.')
+                _vm.$message.success(_vm.$t("env:lock:msgBox:lockSuccess"))
                 _vm.unlock = {
                   my_username: null,
                   my_password: null
@@ -442,26 +453,26 @@ async function VueInit() {
                   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: my_EMail,
-                    username: my_username,
-                    callBack: () => {
-                      closeLock(_vm)
-                    },
-                  })
-                })
-              } else {
-                closeLock(_vm)
-              }
+              // 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'))
             }
           }
         },
@@ -470,7 +481,7 @@ async function VueInit() {
             props: { labelWidth: "80px" }
           }, [
             h('el-form-item', {
-              props: { label: lang === 'zh' ? '用户名' : 'Username' },
+              props: { label: _vm.$t("env:lock:msgBox:form:username") },
             }, [
               h('input', {
                 props: {
@@ -492,7 +503,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: {
@@ -520,5 +531,21 @@ async function VueInit() {
     } : () => { }, process.env.VUE_APP_LOCK_FOR_TIME)
 }
 VueInit()
+// createVersionPolling({
+//   appETagKey: "__APP_ETAG__",
+//   pollingInterval: 5 * 60 * 1000, // 单位为毫秒
+//   silent: process.env.NODE_ENV === false, // 开发环境下不检测
+//   onUpdate: (self) => {
+//     // 当检测到有新版本时，执行的回调函数，可以在这里提示用户刷新页面
+//     const result = confirm(_vm.$t("versionPolling:tip"));
+//     if (result) {
+//       self.onRefresh();
+//     } else {
+//       self.onCancel();
+//     }
+//     // 强制更新可以用alert
+//     // alert('有新版本，请刷新页面');
+//   },
+// });
 
 

src/permission.js

@@ -11,8 +11,8 @@ import { OSSclient } from './utils/oss'
 NProgress.configure({ showSpinner: false })
 
 const whiteList = ['/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
-
-router.beforeEach(async(to, from, next) => {
+store.state.trials.whiteList = whiteList;
+router.beforeEach(async (to, from, next) => {
   NProgress.start()
   // 设置页面标题
   // document.title = getPageTitle(to.meta.title)
@@ -81,7 +81,7 @@ router.beforeEach(async(to, from, next) => {
         next(`/ReviewersResearch?`)
         NProgress.done()
       } else {
-      // 其他无权访问的页面将重定向到登录页面。
+        // 其他无权访问的页面将重定向到登录页面。
         next(`/login?`)
         NProgress.done()
       }

src/store/getters.js

@@ -41,6 +41,7 @@ const getters = {
   lastCanvasTaskId: state => state.reading.lastCanvasTaskId,
   imageQuality: state => state.reading.imageQuality,
   imageQualityIssues: state => state.reading.imageQualityIssues,
+  currentLoadIns: state => state.reading.currentLoadIns,
   language: state => state.lang.language,
   TotalNeedSignSystemDocCount: state => state.user.TotalNeedSignSystemDocCount,
   TotalNeedSignTrialDocCount: state => state.user.TotalNeedSignTrialDocCount,

src/store/modules/reading.js

@@ -30,7 +30,8 @@ const getDefaultState = () => {
     activeSeries: {},
     lastCanvasTaskId: '',
     imageQuality: null,
-    imageQualityIssues: null
+    imageQualityIssues: null,
+    currentLoadIns: []
   }
 }
 function getQuestions(questions) {
@@ -139,6 +140,22 @@ function getQuestionAnswer(questions, questionMark, answers) {
     return ''
   }
 }
+// function getKeySeriesInfo(keyInstance, series) {
+//   const obj = {}
+//   const set = new Set()
+//   var instances = series.instanceList.concat(keyInstance).filter((item) => {
+//     if (set.has(item)) {
+//       return true
+//     } else {
+//       set.add(item)
+//       return false
+//     }
+//   })
+//   instances.map(item => {
+//     obj[item] = { seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex }
+//   })
+//   return obj
+// }
 
 const state = getDefaultState
 
@@ -759,7 +776,17 @@ const actions = {
         resolve()
       } else {
         var studyList = []
+        var keyImages = []
         getReadingVisitStudyList(obj.trialId, obj.subjectVisitId, obj.visitTaskId).then(res => {
+          const i = res.Result.findIndex(i => i.IsCriticalSequence)
+          if (i > -1) {
+            const seriesList = res.Result[i].SeriesList && res.Result[i].SeriesList
+            seriesList.map(i => {
+              i.InstanceInfoList.map(k => {
+                keyImages.push({ instanceId: k.Id })
+              })
+            })
+          }
           res.Result.forEach((study, studyIndex) => {
             const data = {}
             data.StudyId = study.StudyId
@@ -785,16 +812,22 @@ const actions = {
               series.InstanceInfoList.forEach(instance => {
                 if (instance.NumberOfFrames && instance.NumberOfFrames > 1) {
                   for (let i = 0; i < instance.NumberOfFrames; i++) {
-                    const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}`
+                    const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
                     imageIds.push(imageId)
                   }
-                  instance.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${0}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}`
+                  instance.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${0}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
                 } else {
-                  const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}`
+                  const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
                   imageIds.push(imageId)
                   instance.ImageId = imageId
                 }
-
+                if (!study.IsCriticalSequence && series.IsBeMark) {
+                  const i = keyImages.findIndex(i => i.instanceId === instance.Id)
+                  if (i > -1) {
+                    keyImages[i].studyIndex = studyIndex
+                    keyImages[i].seriesIndex = seriesIndex
+                  }
+                }
                 instanceList.push(instance.Id)
               })
               seriesList.push({
@@ -837,6 +870,7 @@ const actions = {
           })
           state.visitTaskList[index].StudyList = studyList
           state.visitTaskList[index].studyListInit = true
+          state.visitTaskList[index].KeyImages = keyImages
           // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
           resolve()
         }).catch(() => { resolve() })
@@ -895,11 +929,114 @@ const actions = {
       resolve()
     })
   },
+  setImageLoadedProgress({ state }, obj) {
+    const studyIndex = parseInt(obj.idx.split('|')[0])
+    const seriesIndex = parseInt(obj.idx.split('|')[1])
+    const visitTaskIndex = parseInt(obj.idx.split('|')[2])
+    let pStudyIndex = null
+    let pSeriesIndex = null
+    let pSeries = null
+    try {
+      const study = state.visitTaskList[visitTaskIndex].StudyList[studyIndex]
+      const series = state.visitTaskList[visitTaskIndex].StudyList[studyIndex].SeriesList[seriesIndex]
+      const keyImages = state.visitTaskList[visitTaskIndex].KeyImages
+      if (study.IsCriticalSequence) {
+        const i = keyImages.findIndex(i => i.instanceId === obj.instanceId)
+        if (i > -1) {
+          pStudyIndex = keyImages[i].studyIndex
+          pSeriesIndex = keyImages[i].seriesIndex
+        }
+      } else if (series.isBeMark) {
+        if (keyImages.length > 0) {
+          pStudyIndex = 0
+          pSeriesIndex = 0
+        }
+      }
+      if (pStudyIndex !== null && pSeriesIndex !== null) {
+        pSeries = state.visitTaskList[visitTaskIndex].StudyList[pStudyIndex].SeriesList[pSeriesIndex]
+      }
+
+      var prefetchInstanceCount = series.prefetchInstanceCount
+      var instanceCount = series.instanceCount
+      var prefetchInstanceCount2 = pSeries ? pSeries.prefetchInstanceCount : null
+      var instanceCount2 = pSeries ? pSeries.instanceCount : null
+      if (series.imageloadedArr.indexOf(obj.instanceId) < 0) {
+        const i = state.currentLoadIns.findIndex(i => i.instanceId === obj.instanceId)
+        if (i > -1) {
+          prefetchInstanceCount = prefetchInstanceCount + obj.percentComplete - state.currentLoadIns[i].percentComplete
+          prefetchInstanceCount2 = prefetchInstanceCount2 !== null ? prefetchInstanceCount2 + obj.percentComplete - state.currentLoadIns[i].percentComplete : null
+          state.currentLoadIns[i].percentComplete = obj.percentComplete
+          if (obj.percentComplete >= 100) {
+            state.currentLoadIns.splice(i, 1)
+          }
+        } else {
+          if (obj.percentComplete !== 100) {
+            state.currentLoadIns.push({ instanceId: obj.instanceId, percentComplete: obj.percentComplete })
+          }
+          prefetchInstanceCount = prefetchInstanceCount + obj.percentComplete
+          prefetchInstanceCount2 = prefetchInstanceCount2 !== null ? prefetchInstanceCount2 + obj.percentComplete : null
+        }
+        series.prefetchInstanceCount = prefetchInstanceCount
+        if (pSeries) {
+          pSeries.prefetchInstanceCount = prefetchInstanceCount2
+        }
+        if (obj.percentComplete >= 100) {
+          series.imageloadedArr.push(obj.instanceId)
+          if (pSeries) {
+            pSeries.imageloadedArr.push(obj.instanceId)
+          }
+        }
+      }
+
+      if (prefetchInstanceCount >= instanceCount * 100) {
+        series.prefetchInstanceCount = instanceCount * 100
+        // 设置当前序列状态为已下载完成
+        series.loadStatus = true
+      }
+      if (prefetchInstanceCount2 !== null && instanceCount2 !== null && prefetchInstanceCount2 >= instanceCount2 * 100) {
+        pSeries.prefetchInstanceCount = instanceCount2 * 100
+        // 设置当前序列状态为已下载完成
+        pSeries.loadStatus = true
+      }
+    } catch (e) {
+      console.log('error')
+    }
+  },
   setImageloadedInfo({ state }, obj) {
-    var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
-    const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount
-    state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount = prefetchInstanceCount + 100
-    state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr.push(obj.imageId)
+    console.log('setImageloadedInfo', obj)
+    // if(obj.instance === '20dd8fc9-51b0-ec63-942b-cb3006c72650')
+    // var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
+    // // const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount
+    // const instanceList = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].instanceList
+    // const idx = state.visitTaskList[index].StudyList.findIndex(i => i.IsCriticalSequence)
+
+    // if (!state.visitTaskList[index].StudyList[obj.studyIndex].IsCriticalSequence) {
+    //   // 当前下载的非关键序列
+    //   console.log('当前下载的非关键序列')
+    //   if (idx > -1) {
+    //     const keyInstance = state.visitTaskList[index].StudyList[idx].SeriesList[0].instanceList
+    //     obj.markedImages = getKeySeriesInfo(keyInstance, state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex])
+    //     instanceList.map(i => {
+    //       if (obj.markedImages.hasOwnProperty(i) && state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr.indexOf(i) < 0) {
+    //         state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr.push(i)
+    //         state.visitTaskList[index].StudyList[idx].SeriesList[0].prefetchInstanceCount = state.visitTaskList[index].StudyList[idx].SeriesList[0].prefetchInstanceCount + 100
+    //       }
+    //     })
+    //     if (state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr >= state.visitTaskList[index].StudyList[idx].SeriesList[0].instanceCount) {
+    //       state.visitTaskList[index].StudyList[idx].SeriesList[0].loadStatus = true
+    //     }
+    //   }
+    // }
+    // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].instanceCount * 100
+    // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr = instanceList
+    // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].loadStatus = true
+    // const imageloadedArr = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr
+    // if (imageloadedArr.indexOf())
+
+    // if (state.visitTaskList[index].StudyList[0].IsCriticalSequence){
+    //   state.visitTaskList[index].StudyList[0].SeriesList[0].prefetchInstanceCount = prefetchInstanceCount + 100
+    //   state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr.push(obj.imageId)
+    // }
   },
   setStatus({ state }, obj) {
     var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)

src/store/modules/trials.js

@@ -8,6 +8,11 @@ const getDefaultState = () => {
     visitPointQuery: null,
     studyListQuery: null,
     unlock: false,
+    config: {},
+    uploadTip: null,
+    timer: null,
+    whiteList: [],
+    checkTaskId: null
   }
 }
 
@@ -20,6 +25,9 @@ const mutations = {
   SET_UNLOCK: (state, unlock) => {
     state.unlock = unlock
   },
+  SET_CONFIG: (state, config) => {
+    state.config = config
+  },
   SET_ACTIVENAME: (state, activeName) => {
     state.trialDetailActiveName = activeName
   },
@@ -44,6 +52,9 @@ const actions = {
   setUnLock({ commit }, unlock) {
     commit('SET_UNLOCK', unlock)
   },
+  setConfig({ commit }, config) {
+    commit('SET_CONFIG', config)
+  },
   setActiveName({ commit }, activeName) {
     commit('SET_ACTIVENAME', activeName)
   },

src/styles/index.scss

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

src/utils/dcmUpload/anonymization.js

@@ -60,12 +60,14 @@ export const anonymization = function (file, config) {
           const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
           resolve({ blob, pixelDataElement })
         } catch (err) {
+          console.log(file, 'warning')
           console.log(err)
           resolve(false);
         }
       };
       reader.readAsArrayBuffer(file);
     } catch (e) {
+      console.log(file, 'warning')
       console.log(e)
       reject(e)
     }

src/utils/dcmUpload/dcmUpload.js

@@ -19,6 +19,7 @@ export const dcmUpload = async function (name, file, config) {
 
 
     } catch (e) {
+      console.log(file, 'warning')
       resolve(false)
       console.log(e)
     }

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')
-import { getToken } from '@/utils/auth'
+const { GetObjectStoreToken } = require('../api/user.js')
 
 Vue.prototype.OSSclientConfig = {
 }

src/utils/request.js

@@ -27,7 +27,7 @@ service.interceptors.request.use(
     }
     try {
       if (eval(process.env.VUE_APP_LOGIN_FOR_PERMISSION)) {
-        if (!path || path === '/ReviewersResearchForm' || path === '/ReviewersResearch' || path === '/login' || path === '/researchForm' || path === '/researchLogin' || path === '/email-recompose' || path === '/recompose' || path === '/resetpassword' || path === '/error') {
+        if (!path || path === '/ReviewersResearchForm' || path === '/ReviewersResearch' || path === '/login' || path === '/researchForm' || path === '/researchDetail_m' || path === '/researchLogin_m' || path === '/researchLogin' || path === '/email-recompose' || path === '/recompose' || path === '/resetpassword' || path === '/error') {
           return config
         }
         if (store.state.user.userId !== zzSessionStorage.getItem('userId')) {

src/utils/uploadZip.js

@@ -1,6 +1,138 @@
+import Vue from 'vue';
+import store from "@/store";
+import {
+    requestPackageAndAnonymizImage,
+} from "@/api/load.js";
 import streamSaver from "streamsaver";
 import "streamsaver/examples/zip-stream.js"
-export const downloadImage = (zipName, files) => {
+let flag = {};
+export const resetFlag = () => {
+    flag = {};
+    store.state.trials.uploadTip = null;
+    if (store.state.trials.timer) {
+        clearInterval(store.state.trials.timer);
+        store.state.trials.timer = null;
+    }
+    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'));
+    if (flag[`${id2}_${IsDicom}`]) return false;
+    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"))
+                let message = Vue.prototype.$t('trials:upload:tip:uploading').replace("xxx", res.OtherInfo.FileName);
+                store.state.trials.uploadTip = message;
+                if (!store.state.trials.timer) {
+                    store.state.trials.timer = setInterval(() => {
+                        downloadImage(id, id2, IsDicom);
+                    }, 2000);
+                }
+                return false;
+            }
+            if (store.state.trials.timer) {
+                clearInterval(store.state.trials.timer);
+                store.state.trials.timer = null;
+            }
+            let fileName = res.Result.split("/").pop();
+            let href = Vue.prototype.OSSclientConfig.basePath + res.Result;
+            if (fileName !== res.OtherInfo.FileName) {
+                let message = Vue.prototype.$t('trials:upload:tip:uploading').replace("xxx", res.OtherInfo.FileName);
+                store.state.trials.uploadTip = message;
+                // Vue.prototype.$message.success(Vue.prototype.$t("trials:upload:message:startUpload"));
+                return download(href, res.OtherInfo.FileName, { id2, IsDicom });
+
+            }
+            let a = document.createElement("a");
+            a.download = res.OtherInfo.FileName;
+            a.href = href;
+            a.click();
+            URL.revokeObjectURL(href);
+            let timer = setTimeout(() => {
+                a = null;
+                href = null;
+                timer = null;
+            }, 500)
+            store.state.trials.uploadTip = null;
+            return true;
+        } else {
+            flag[`${id2}_${IsDicom}`] = false;
+            return false;
+        }
+    } catch (err) {
+        flag[`${id2}_${IsDicom}`] = false;
+        console.log(err);
+    }
+};
+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.state.trials.uploadTip = null;
+    store.dispatch("trials/setUnLock", false);
+    saveAsB(blob, downloadFileName);
+    return true;
+}
+
+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);
+}
+
+// 前端流式打包下载
+const handleBatchDown = async (item, zip) => {
     return new Promise((resolve) => {
         console.log("同步下载打包开始时间：" + new Date());
         // 创建压缩文件输出流  

src/utils/version-polling.esm.js

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

src/views/blindResumeInfo/components/StatusInfo.vue

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

src/views/blindResumeInfo/info.vue

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

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

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

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

@@ -56,33 +56,23 @@
                                 trigger="hover"
                                 popper-class="instance_frame_wrapper"
                               >
-                                <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>
-                                        <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 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
@@ -148,14 +138,25 @@ import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getStudyInfo, getSeriesList } from '@/api/reading'
-import { getInstanceList, setSeriesStatus } from '@/api/trials'
+import { getInstanceList, getPatientSeriesList, setSeriesStatus } from '@/api/trials'
 
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
+var config = {
+  maxWebWorkers: 4,
+  startWebWorkersOnDemand: true,
+  taskConfiguration: {
+    decodeTask: {
+      initializeCodecsOnStartup: false
+    }
+  }
+}
+cornerstoneWADOImageLoader.webWorkerManager.initialize(config)
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
+const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
+cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
   components: {
     'dicom-viewer': dicomViewer
@@ -192,7 +193,8 @@ export default {
       loading: false,
       imageList: [],
       showSeriesList: [],
-      currentLoadIns: []
+      currentLoadIns: [],
+      isFromCRCUpload: false
     }
   },
   created: function() {
@@ -207,6 +209,7 @@ export default {
       changeURLStatic('TokenKey', '')
     }
     this.studyId = this.$router.currentRoute.query.studyId
+    this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload
     if (this.type === 'Series') {
       // this.initStudy()
       this.showDelete = parseInt(this.$router.currentRoute.query.showDelete)
@@ -216,6 +219,8 @@ export default {
       this.loadStudy()
     } else if (this.type === 'Share') {
       this.loadStudy()
+    } else if (this.type === 'Patient') {
+      this.loadPatientStudy()
     }
     cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
     window.addEventListener('beforeunload', e => {
@@ -231,22 +236,22 @@ export default {
     })
   },
   methods: {
-    loadStudy() {
-      var scope = this
-      getStudyInfo(scope.studyId).then(data => {
-        if (data.IsSuccess) {
-          scope.studyCode = data.Result.StudyCode
-          scope.modality = data.Result.Modalities
-          scope.seriesCount = data.Result.SeriesCount
-          scope.description = data.Result.Description
-          var url = `/series/list/${scope.studyId}`
-          scope.getSeriesList(url)
+    async loadStudy() {
+      const data = await getStudyInfo(this.studyId)
+      if (data.IsSuccess) {
+        if (data.Result) {
+          this.studyCode = data.Result.StudyCode
+          this.modality = data.Result.Modalities
+          this.seriesCount = data.Result.SeriesCount
+          this.description = data.Result.Description
         }
-      })
+        const url = `/series/list/${this.studyId}`
+        this.getSeriesList(url)
+      }
     },
-    getSeriesList(url) {
-      var scope = this
-      getSeriesList(url).then(data => {
+    async loadPatientStudy() {
+      try {
+        let data = await getPatientSeriesList(this.studyId);
         if (data.IsSuccess) {
           const { Result } = data
           var seriesList = []
@@ -255,15 +260,18 @@ export default {
             item.InstanceInfoList.forEach(i => {
               if (i.NumberOfFrames && i.NumberOfFrames > 1) {
                 for (let j = 0; j < i.NumberOfFrames; j++) {
-                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&seriesIndex=${index}`)
+                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&seriesIndex=${index}`)
                 }
+                i.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=0&instanceId=${i.Id}&seriesIndex=${index}`
               } else {
-                imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&seriesIndex=${index}`)
+                const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&seriesIndex=${index}`
+                imageIds.push(imageId)
+                i.ImageId = imageId
               }
             })
-            var subjectVisitId = scope.$router.currentRoute.query.subjectVisitId
-            var studyId = scope.$router.currentRoute.query.studyId
-            var trialId = scope.$router.currentRoute.query.trialId
+            var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
+            var studyId = this.$router.currentRoute.query.studyId
+            var trialId = this.$router.currentRoute.query.trialId
             seriesList.push({
               trialId,
               subjectVisitId,
@@ -278,38 +286,99 @@ export default {
               description: item.Description,
               isReading: item.IsReading,
               isDeleted: item.IsDeleted,
-              previewImageUrl: item.ImageResizePath ? scope.OSSclientConfig.basePath + item.ImageResizePath : `/api/series/preview/${item.Id}`,
+              previewImageUrl: item.ImageResizePath ? this.OSSclientConfig.basePath + item.ImageResizePath : `/api/series/preview/${item.Id}`,
               instanceCount: item.InstanceCount,
               prefetchInstanceCount: 0,
               hasLabel: item.HasLabel,
               keySeries: item.KeySeries,
-              tpCode: scope.tpCode,
+              tpCode: this.tpCode,
               loadStatus: false,
               imageloadedArr: [],
               isExistMutiFrames: item.IsExistMutiFrames
             })
           })
-          scope.seriesList = seriesList
-          if (scope.seriesList.length > 0) {
+          this.seriesList = seriesList
+          if (this.seriesList.length > 0) {
             this.loadAllImages()
-            scope.$refs.dicomViewer.loadImageStack(scope.seriesList[0], scope.labels[scope.tpCode])
-            scope.firstInstanceId = scope.seriesList[0].imageIds[0]
+            this.$refs.dicomViewer.loadImageStack(this.seriesList[0], this.labels[this.tpCode])
+            this.firstInstanceId = this.seriesList[0].imageIds[0]
           }
         }
-      })
+      } catch (err) {
+        console.log(err)
+      }
     },
-    initSeries() {
-      var scope = this
-      this.studyCode = this.$router.currentRoute.query.studyCode
-      this.modality = this.$router.currentRoute.query.modality
-      this.seriesCount = 1
-      this.description = this.$router.currentRoute.query.description
-      var seriesId = this.$router.currentRoute.query.seriesId
-      var seriesNumber = this.$router.currentRoute.query.seriesNumber
-      var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
-      var studyId = this.$router.currentRoute.query.studyId
-      var trialId = this.$router.currentRoute.query.trialId
-      getInstanceList(seriesId).then(res => {
+    async getSeriesList(url) {
+      try {
+        const data = await getSeriesList(url)
+        if (data.IsSuccess) {
+          const { Result } = data
+          var seriesList = []
+          Result.forEach((item, index) => {
+            const imageIds = []
+            item.InstanceInfoList.forEach(i => {
+              if (i.NumberOfFrames && i.NumberOfFrames > 1) {
+                for (let j = 0; j < i.NumberOfFrames; j++) {
+                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&seriesIndex=${index}`)
+                }
+                i.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=0&instanceId=${i.Id}&seriesIndex=${index}`
+              } else {
+                const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&seriesIndex=${index}`
+                imageIds.push(imageId)
+                i.ImageId = imageId
+              }
+            })
+            var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
+            var studyId = this.$router.currentRoute.query.studyId
+            var trialId = this.$router.currentRoute.query.trialId
+            seriesList.push({
+              trialId,
+              subjectVisitId,
+              studyId,
+              imageIds: imageIds,
+              instanceInfoList: item.InstanceInfoList,
+              seriesId: item.Id,
+              seriesUid: item.SeriesInstanceUid,
+              seriesNumber: item.SeriesNumber,
+              sliceThickness: item.SliceThickness,
+              modality: item.Modality,
+              description: item.Description,
+              isReading: item.IsReading,
+              isDeleted: item.IsDeleted,
+              previewImageUrl: item.ImageResizePath ? this.OSSclientConfig.basePath + item.ImageResizePath : `/api/series/preview/${item.Id}`,
+              instanceCount: item.InstanceCount,
+              prefetchInstanceCount: 0,
+              hasLabel: item.HasLabel,
+              keySeries: item.KeySeries,
+              tpCode: this.tpCode,
+              loadStatus: false,
+              imageloadedArr: [],
+              isExistMutiFrames: item.IsExistMutiFrames
+            })
+          })
+          this.seriesList = seriesList
+          if (this.seriesList.length > 0) {
+            this.loadAllImages()
+            this.$refs.dicomViewer.loadImageStack(this.seriesList[0], this.labels[this.tpCode])
+            this.firstInstanceId = this.seriesList[0].imageIds[0]
+          }
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    async initSeries() {
+      try {
+        this.studyCode = this.$router.currentRoute.query.studyCode
+        this.modality = this.$router.currentRoute.query.modality
+        this.seriesCount = 1
+        this.description = this.$router.currentRoute.query.description
+        var seriesId = this.$router.currentRoute.query.seriesId
+        var seriesNumber = this.$router.currentRoute.query.seriesNumber
+        var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
+        var studyId = this.$router.currentRoute.query.studyId
+        var trialId = this.$router.currentRoute.query.trialId
+        const res = await getInstanceList(seriesId)
         if (!res.Result || (res.Result && res.Result.length === 0)) return
         var seriesInstanceUid = res.Result[0].SeriesInstanceUid
         var sliceThickness = res.Result[0].SliceThickness
@@ -320,15 +389,19 @@ export default {
         let isExistMutiFrames = false
         const instanceInfoList = []
         res.Result.forEach(instance => {
+          let imageId = ''
           if (instance.NumberOfFrames > 1) {
             for (let i = 0; i < instance.NumberOfFrames; i++) {
               imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&seriesIndex=0`)
             }
             isExistMutiFrames = true
+            imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}?frame=0&instanceId=${instance.Id}&seriesIndex=0`
           } else {
-            imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&seriesIndex=0`)
+            const path = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&seriesIndex=0`
+            imageIds.push(path)
+            imageId = path
           }
-          instanceInfoList.push({ Id: instance.Id, InstanceNumber: instance.InstanceNumber, NumberOfFrames: instance.NumberOfFrames, Path: instance.Path })
+          instanceInfoList.push({ Id: instance.Id, InstanceNumber: instance.InstanceNumber, NumberOfFrames: instance.NumberOfFrames, Path: instance.Path, ImageId: imageId })
         })
         seriesList.push({
           trialId,
@@ -344,7 +417,7 @@ export default {
           description: this.description,
           isReading,
           isDeleted,
-          previewImageUrl: res.OtherInfo.ImageResizePath ? scope.OSSclientConfig.basePath + res.OtherInfo.ImageResizePath : res.OtherInfo.ImageResizePath,
+          previewImageUrl: res.OtherInfo.ImageResizePath ? this.OSSclientConfig.basePath + res.OtherInfo.ImageResizePath : res.OtherInfo.ImageResizePath,
           instanceCount: res.Result.length,
           prefetchInstanceCount: 0,
           loadStatus: false,
@@ -359,7 +432,9 @@ export default {
             this.firstInstanceId = this.seriesList[0].imageIds[0]
           })
         }
-      })
+      } catch (e) {
+        console.log(e)
+      }
     },
     showSeriesImage(e, seriesIndex, series) {
       // if (seriesIndex === this.currentSeriesIndex) return
@@ -372,7 +447,39 @@ export default {
       this.currentSeriesIndex = seriesIndex
       this.$refs.dicomViewer.loadImageStack(this.seriesList[seriesIndex])
       if (!series.loadStatus) {
-        requestPoolManager.changePriority(series.seriesId)
+        series.isLoading = true
+        var isAddToTakPool = false
+        if (this.showSeriesList.includes(`0_${seriesIndex}`)) {
+          isAddToTakPool = true
+        } else {
+          this.showSeriesList.push(`0_${seriesIndex}`)
+        }
+        if (!isAddToTakPool) {
+          var priority = parseInt(new Date().getTime())
+          // var images = []
+          // if (series.isExistMutiFrames) {
+          //   images = series.imageIds.filter(i => i.includes('?frame=0'))
+          // } else {
+          //   images = series.imageIds
+          // }
+          // images.map(imageId => {
+          //   this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: 0, seriesIndex: seriesIndex, priority })
+          // })
+          if (series.isExistMutiFrames) {
+            series.instanceInfoList.map(image => {
+              this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
+            })
+          } else {
+            series.imageIds.map(imageId => {
+              this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+            })
+          }
+          if (this.imageList.length > 0) {
+            this.loopLoad()
+          }
+        } else {
+          requestPoolManager.changePriority(series.seriesId)
+        }
       }
     },
     showMultiFrames(series, seriesIndex, instanceInfo) {
@@ -403,7 +510,39 @@ export default {
       }
       this.$refs.dicomViewer.loadImageStack(seriesInfo)
       if (!series.loadStatus) {
-        requestPoolManager.changePriority(series.seriesId)
+        var isAddToTakPool = false
+        if (this.showSeriesList.includes(`0_${seriesIndex}`)) {
+          isAddToTakPool = true
+        } else {
+          this.showSeriesList.push(`0_${seriesIndex}`)
+        }
+        if (!isAddToTakPool) {
+          var priority = parseInt(new Date().getTime())
+          // if (series.isExistMutiFrames) {
+          //   series.instanceInfoList.map(image => {
+          //     this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: 0, seriesIndex: seriesIndex, priority })
+          //   })
+          // } else {
+          //   series.imageIds.map((imageId) => {
+          //     this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: 0, seriesIndex: seriesIndex, priority })
+          //   })
+          // }
+          if (series.isExistMutiFrames) {
+            series.instanceInfoList.map(image => {
+              this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
+            })
+          } else {
+            series.imageIds.map(imageId => {
+              this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+            })
+          }
+
+          if (this.imageList.length > 0) {
+            this.loopLoad()
+          }
+        } else {
+          requestPoolManager.changePriority(series.seriesId)
+        }
       }
     },
     initStudy() {
@@ -415,13 +554,6 @@ export default {
         const seriesInfo = JSON.parse(this.$router.currentRoute.query.series)
         var seriesList = []
         const imageIds = []
-        // const scope = this
-        // seriesInfo.InstanceList.forEach(function(item) {
-        //   imageIds.push(`wadouri:/api/instance/content/${item}`)
-        // })
-        // seriesInfo.InstanceList.forEach((id) => {
-        //   imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
-        // })
         seriesInfo.InstancePathList.forEach((path) => {
           imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${path}`)
         })
@@ -451,22 +583,25 @@ export default {
         }
       }
     },
-    deleteSeries() {
+    async deleteSeries() {
       this.loading = true
       var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
       var studyId = this.$router.currentRoute.query.studyId
       var seriesId = this.$router.currentRoute.query.seriesId
-      // trialId, subjectVisitId, studyId, seriesId, state
-      setSeriesStatus(this.trialId, subjectVisitId, studyId, seriesId, 5).then(res => {
+      try {
+        const res = await setSeriesStatus(this.trialId, subjectVisitId, studyId, seriesId, 5)
         this.loading = false
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
 
           window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
         }
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        console.log(e)
+        this.loading = false
+      }
     },
-    changeReadingStatus(callback, data) {
+    async changeReadingStatus(callback, data) {
       let statusStr = ''
       if (callback) {
         statusStr = this.$t('trials:audit:label:setSeriesReading')
@@ -477,24 +612,30 @@ export default {
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
       message = message.replace('yyy', this.$fd('YesOrNo', !data.isReading))
-      this.$confirm(message, {
-        distinguishCancelAndClose: true,
-        type: 'warning'
-      }).then(() => {
-        const state = data.isReading ? 1 : 2
-        this.loading = true
-
-        setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            data.isReading = !data.isReading
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
-          }
-        }).catch(() => { this.loading = false })
-      }).catch(() => {})
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const state = data.isReading ? 1 : 2
+      this.loading = true
+      try {
+        const res = await setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          data.isReading = !data.isReading
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        console.log(e)
+        this.loading = false
+      }
     },
-    changeDeleteStatus(callback, data) {
+    async changeDeleteStatus(callback, data) {
       let statusStr = ''
       if (callback) {
         statusStr = this.$t('trials:audit:label:setSeriesDeleted')
@@ -505,46 +646,51 @@ export default {
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
       message = message.replace('yyy', this.$fd('YesOrNo', !data.isDeleted))
-      this.$confirm(message, {
-        distinguishCancelAndClose: true,
-        type: 'warning'
-      }).then(() => {
-        const state = data.isDeleted ? 5 : 4
-        this.loading = true
-        // var trialId = this.$router.currentRoute.query.trialId
-        // var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
-        // var studyId = this.$router.currentRoute.query.studyId
-        // var seriesId = this.$router.currentRoute.query.seriesId
-        setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            data.isDeleted = !data.isDeleted
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
-          }
-        }).catch(() => { this.loading = false })
-      }).catch(() => {})
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const state = data.isDeleted ? 5 : 4
+      this.loading = true
+      try {
+        const res = await setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          data.isDeleted = !data.isDeleted
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        console.log(e)
+        this.loading = false
+      }
     },
     loadAllImages() {
       const seriesIndex = this.seriesList.findIndex(i => i.loadStatus === false)
       if (seriesIndex === -1) return
       const series = this.seriesList[seriesIndex]
       var priority = new Date().getTime()
-      for (let i = 0; i < series.imageIds.length; i++) {
-        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.imageList.push({ imageId: imageId, seriesId: series.seriesId, seriesIndex: seriesIndex, priority: p })
+      // var images = []
+      // if (series.isExistMutiFrames) {
+      //   images = series.imageIds.filter(i => i.includes('?frame=0'))
+      // } else {
+      //   images = series.imageIds
+      // }
+      // images.map(imageId => {
+      //   this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: 0, seriesIndex: seriesIndex, priority })
+      // })
+      if (series.isExistMutiFrames) {
+        series.instanceInfoList.map(image => {
+          this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
+        })
+      } else {
+        series.imageIds.map(imageId => {
+          this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+        })
       }
       if (this.imageList.length > 0) {
         this.loopLoad()
@@ -569,60 +715,6 @@ export default {
         this.imageList = []
       }
     },
-    load(imageId, seriesId, priority = 999) {
-      return new Promise((resolve, reject) => {
-        requestPoolManager.loadAndCacheImagePlus(imageId, seriesId, priority).then(res => {
-          if (!res) return
-          this.imageLoaded(imageId, res.data.string('x0020000e'))
-          resolve(res)
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
-    imageLoaded(image, seriesUid) {
-      var seriesIndex = image.seriesIndex
-      if (seriesIndex < 0) return
-      if (this.seriesList[seriesIndex].imageloadedArr.indexOf(image.imageId) < 0) {
-        ++this.seriesList[seriesIndex].prefetchInstanceCount
-        this.seriesList[seriesIndex].imageloadedArr.push(image.imageId)
-
-        if (this.seriesList[seriesIndex].prefetchInstanceCount >= this.seriesList[seriesIndex].instanceCount) {
-          this.seriesList[seriesIndex].prefetchInstanceCount = this.seriesList[seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.seriesList[seriesIndex].loadStatus = true
-          // if (!this.isLoadedAll) {
-          //   this.loadAllImages()
-          // }
-        }
-      }
-    },
-    imageLoaded2(imageId, seriesUid) {
-      var seriesIndex = -1
-      for (let i = 0; i < this.seriesList.length; ++i) {
-        if (this.seriesList[i].seriesUid === seriesUid) {
-          seriesIndex = i
-          break
-        }
-      }
-      if (seriesIndex < 0) return
-
-      const imageIdIndex = this.seriesList[seriesIndex].imageIds.indexOf(imageId)
-      if (imageIdIndex < 0) return
-      if (this.seriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
-        ++this.seriesList[seriesIndex].prefetchInstanceCount
-        this.seriesList[seriesIndex].imageloadedArr.push(imageId)
-
-        if (this.seriesList[seriesIndex].prefetchInstanceCount >= this.seriesList[seriesIndex].instanceCount) {
-          this.seriesList[seriesIndex].prefetchInstanceCount = this.seriesList[seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.seriesList[seriesIndex].loadStatus = true
-          // if (!this.isLoadedAll) {
-          //   this.loadAllImages()
-          // }
-        }
-      }
-    },
     datasetsCacheChanged(e) {
       // const uri = e.detail.uri
       const cacheInfo = e.detail.cacheInfo
@@ -658,7 +750,7 @@ export default {
         const seriesIndex = params.seriesIndex
         var prefetchInstanceCount = this.seriesList[seriesIndex].prefetchInstanceCount
         var instanceCount = this.seriesList[seriesIndex].instanceCount
-        if (this.seriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
+        if (this.seriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0 && this.seriesList[seriesIndex].imageloadedArr.length < this.seriesList[seriesIndex].instanceCount) {
           const i = this.currentLoadIns.findIndex(i => i.imageId === imageId)
           if (i > -1) {
             prefetchInstanceCount = prefetchInstanceCount - this.currentLoadIns[i].percentComplete + percentComplete
@@ -681,52 +773,9 @@ export default {
           this.seriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
           // 设置当前序列状态为已下载完成
           this.seriesList[seriesIndex].loadStatus = true
-          this.loadAllImages()
-        }
-      }
-    },
-    cornerstoneImageLoaded(e) {
-      if (this.firstInstanceId === e.detail.image.imageId && !this.isStartLoad) {
-        // 初始化图像加载完成时，自动下载
-        this.loadAllImages()
-        this.isStartLoad = true
-        // requestPoolManager.executeTask()
-      }
-      const uri = e.detail.image.sharedCacheKey
-      const index = this.cachedImages.findIndex(item => item.uri === uri)
-      if (index === -1) {
-        this.cachedImages.push({ uri: uri, timestamp: new Date().getTime() })
-      } else {
-        this.cachedImages[index].timestamp = new Date().getTime()
-      }
-      // loadedDataSets[uri].dataSet.byteArray.length
-      // console.log(this.cachedImages.length)
-      // console.log(cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.getInfo().cacheSizeInBytes)
-      // const imageId = e.detail.image.imageId
-      var imageId = e.detail.image.imageId
-      var seriesUid = e.detail.image.data.string('x0020000e')
-      var seriesIndex = -1
-      for (let i = 0; i < this.seriesList.length; ++i) {
-        if (this.seriesList[i].seriesUid === seriesUid) {
-          seriesIndex = i
-          break
-        }
-      }
-      if (seriesIndex < 0) return
-
-      const imageIdIndex = this.seriesList[seriesIndex].imageIds.indexOf(imageId)
-      if (imageIdIndex < 0) return
-      if (this.seriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
-        ++this.seriesList[seriesIndex].prefetchInstanceCount
-        this.seriesList[seriesIndex].imageloadedArr.push(imageId)
-
-        if (this.seriesList[seriesIndex].prefetchInstanceCount >= this.seriesList[seriesIndex].instanceCount) {
-          this.seriesList[seriesIndex].prefetchInstanceCount = this.seriesList[seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.seriesList[seriesIndex].loadStatus = true
-          // if (!this.isLoadedAll) {
-          //   this.loadAllImages()
-          // }
+          if (!this.isFromCRCUpload) {
+            this.loadAllImages()
+          }
         }
       }
     }
@@ -884,6 +933,18 @@ export default {
   border: 1px solid #2c2c2c;
   padding: 5px;
 }
+.frame_list{
+  max-height: 500px;
+  overflow-y: auto;
+}
+.instance_frame_wrapper ::-webkit-scrollbar {
+  width: 7px;
+  height: 7px;
+}
+.instance_frame_wrapper  ::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background: #d0d0d0;
+}
 .frame_content{
   height: 50px;
   padding: 5px;

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

@@ -171,7 +171,7 @@
                             class="viewernavigatorwrapper"
                             style="position: relative;border:1px solid #434343;"
                             series-type="relation"
-                            @click="showRelationSeriesImage($event,seriesItem,index)"
+                            @click="showRelationSeriesImage($event,seriesItem,studyIndex,index)"
                           >
                             <!-- <el-image
                             class="image-preview"
@@ -200,28 +200,20 @@
                                     trigger="hover"
                                     popper-class="instance_frame_wrapper"
                                   >
-                                    <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>
-                                        <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 class="frame_list">
+                                      <div
+                                        v-for="(instance, idx) in seriesItem.instanceInfoList"
+                                        :key="instance.Id"
+                                        class="frame_content"
+                                        :style="{'margin-bottom':idx<seriesItem.instanceInfoList.length-1? '5px':'0px'}"
+                                        @click="showMultiFrames(studyIndex,seriesItem, index, instance)"
+                                      >
+                                        <div>
+                                          <div>{{ instance.InstanceNumber }}</div>
+                                          <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
+                                        </div>
 
+                                      </div>
                                     </div>
                                     <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
                                   </el-popover>
@@ -272,9 +264,21 @@ import { setSeriesStatus } from '@/api/trials'
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
+// import * as cornerstoneTools from 'cornerstone-tools'
+var config = {
+  maxWebWorkers: 4,
+  startWebWorkersOnDemand: true,
+  taskConfiguration: {
+    decodeTask: {
+      initializeCodecsOnStartup: false
+    }
+  }
+}
+cornerstoneWADOImageLoader.webWorkerManager.initialize(config)
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
+const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
+cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
   name: 'DicomsOfVisit',
   components: {
@@ -296,7 +300,8 @@ export default {
       activeNames: [],
       relationActiveName: [],
       showSeriesList: [],
-      currentLoadIns: []
+      currentLoadIns: [],
+      isFromCRCUpload: false
     }
   },
   mounted() {
@@ -312,6 +317,7 @@ export default {
     this.visitInfo = this.$router.currentRoute.query.visitInfo
     this.isReading = this.$router.currentRoute.query.isReading ? this.$router.currentRoute.query.isReading * 1 : 0
     this.showDelete = parseInt(this.$router.currentRoute.query.showDelete)
+    this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload
     // cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded)
     this.getStudiesInfo()
     cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
@@ -322,72 +328,98 @@ export default {
   },
   beforeDestroy() {
     requestPoolManager.stopTaskTimer()
-    window.removeEventListener('beforeunload', e => { 
-      cornerstone.imageCache.purgeCache() 
+    window.removeEventListener('beforeunload', e => {
+      cornerstone.imageCache.purgeCache()
       requestPoolManager.resetRequestPool()
     })
   },
   methods: {
     // 获取某个访视下所有的检查信息
-    getStudiesInfo() {
+    async getStudiesInfo() {
       this.studyList = []
-      getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading).then(res => {
-        res.Result.forEach((study,studyIndex) => {
-          const data = {}
-          data.StudyId = study.StudyId
-          data.StudyCode = study.StudyCode
-          data.Modalities = study.Modalities
-          data.SeriesCount = study.SeriesCount
-          data.InstanceCount = study.InstanceCount
-          data.InstanceCount = study.InstanceCount
-          data.PreviewImageCount = 0
-          var seriesList = []
-          study.SeriesList.forEach((series,seriesIndex) => {
-            const imageIds = []
-            series.InstanceInfoList.forEach(i => {
-              if (i.NumberOfFrames && i.NumberOfFrames > 1) {
-                for (let j = 0; j < i.NumberOfFrames; j++) {
-                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&idx=${studyIndex}|${seriesIndex}`)
+      try {
+        const res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
+        if (res.IsSuccess) {
+          res.Result.forEach((study, studyIndex) => {
+            const data = {}
+            data.StudyId = study.StudyId
+            data.StudyCode = study.StudyCode
+            data.Modalities = study.Modalities
+            data.SeriesCount = study.SeriesCount
+            data.InstanceCount = study.InstanceCount
+            data.InstanceCount = study.InstanceCount
+            data.PreviewImageCount = 0
+            var seriesList = []
+            study.SeriesList.forEach((series, seriesIndex) => {
+              const imageIds = []
+              series.InstanceInfoList.forEach(i => {
+                if (i.NumberOfFrames && i.NumberOfFrames > 1) {
+                  for (let j = 0; j < i.NumberOfFrames; j++) {
+                    imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&idx=${studyIndex}|${seriesIndex}`)
+                  }
+                  i.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?frame=0&instanceId=${i.Id}&idx=${studyIndex}|${seriesIndex}`
+                  // imageIds.push(`${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}`)
+                } else {
+                  const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&idx=${studyIndex}|${seriesIndex}`
+                  imageIds.push(imageId)
+                  i.ImageId = imageId
+                  // imageIds.push(`${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}`)
                 }
-              } else {
-                imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&idx=${studyIndex}|${seriesIndex}`)
-              }
-            })
-            seriesList.push({
-              trialId: this.trialId,
-              subjectVisitId: this.subjectVisitId,
-              studyId: study.StudyId,
-              imageIds: imageIds,
-              instanceInfoList: series.InstanceInfoList,
-              seriesId: series.Id,
-              seriesUid: series.SeriesInstanceUid,
-              seriesNumber: series.SeriesNumber,
-              sliceThickness: series.SliceThickness,
-              modality: series.Modality,
-              description: series.Description,
-              isReading: series.IsReading,
-              isDeleted: series.IsDeleted,
-              previewImageUrl: series.ImageResizePath ? this.OSSclientConfig.basePath + series.ImageResizePath : `/api/series/preview/${series.Id}`,
-              instanceCount: series.InstanceCount,
-              prefetchInstanceCount: 0,
-              loadStatus: false,
-              imageloadedArr: [],
-              isExistMutiFrames: series.IsExistMutiFrames
+              })
+              seriesList.push({
+                trialId: this.trialId,
+                subjectVisitId: this.subjectVisitId,
+                studyId: study.StudyId,
+                imageIds: imageIds,
+                instanceInfoList: series.InstanceInfoList,
+                seriesId: series.Id,
+                seriesUid: series.SeriesInstanceUid,
+                seriesNumber: series.SeriesNumber,
+                sliceThickness: series.SliceThickness,
+                modality: series.Modality,
+                description: series.Description,
+                isReading: series.IsReading,
+                isDeleted: series.IsDeleted,
+                previewImageUrl: series.ImageResizePath ? this.OSSclientConfig.basePath + series.ImageResizePath : `/api/series/preview/${series.Id}`,
+                instanceCount: series.InstanceCount,
+                prefetchInstanceCount: 0,
+                loadStatus: false,
+                imageloadedArr: [],
+                isExistMutiFrames: series.IsExistMutiFrames
+              })
             })
+            data.SeriesList = seriesList
+            this.studyList.push(data)
           })
-          data.SeriesList = seriesList
-          this.studyList.push(data)
-        })
-        if (this.studyList.length > 0) {
-          this.$refs.dicomViewer.loadImageStack(this.studyList[0].SeriesList[0])
-          const imageId = this.studyList[0].SeriesList[0].imageIds[0]
-          let instanceId = imageId.split('/')[imageId.split('/').length - 1]
-          instanceId = instanceId.split('.')[0]
-          this.firstInstanceId = instanceId
-          this.activeNames = [this.studyList[0].StudyId]
-          this.loadAllImages()
+          if (this.studyList.length > 0) {
+            this.$refs.dicomViewer.loadImageStack(this.studyList[0].SeriesList[0])
+            const imageId = this.studyList[0].SeriesList[0].imageIds[0]
+            let instanceId = imageId.split('/')[imageId.split('/').length - 1]
+            instanceId = instanceId.split('.')[0]
+            this.firstInstanceId = instanceId
+            this.activeNames = [this.studyList[0].StudyId]
+            this.loadImages(this.studyList[0].SeriesList[0], 0)
+          }
         }
-      })
+      } catch (e) {
+        console.log(e)
+      }
+    },
+
+    loadImages(series, seriesIndex) {
+      var priority = parseInt(new Date().getTime())
+      if (series.isExistMutiFrames) {
+        series.instanceInfoList.map(image => {
+          this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
+        })
+      } else {
+        series.imageIds.map(imageId => {
+          this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+        })
+      }
+      if (this.imageList.length > 0) {
+        this.loopLoad()
+      }
     },
     showSeriesImage(e, studyIndex, seriesIndex, series) {
       const element = e.currentTarget
@@ -398,11 +430,37 @@ export default {
       element.classList.add('viewerSideActive')
       this.currentSeriesIndex = seriesIndex
       this.$refs.dicomViewer.loadImageStack(this.studyList[studyIndex].SeriesList[seriesIndex])
+      // if (!series.loadStatus) {
+      //   requestPoolManager.changePriority(series.seriesId)
+      // }
       if (!series.loadStatus) {
-        requestPoolManager.changePriority(series.seriesId)
+        series.isLoading = true
+        var isAddToTakPool = false
+        if (this.showSeriesList.includes(`${studyIndex}_${seriesIndex}`)) {
+          isAddToTakPool = true
+        } else {
+          this.showSeriesList.push(`${studyIndex}_${seriesIndex}`)
+        }
+        if (!isAddToTakPool) {
+          var priority = parseInt(new Date().getTime())
+          if (series.isExistMutiFrames) {
+            series.instanceInfoList.map(image => {
+              this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
+            })
+          } else {
+            series.imageIds.map(imageId => {
+              this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+            })
+          }
+          if (this.imageList.length > 0) {
+            this.loopLoad()
+          }
+        } else {
+          requestPoolManager.changePriority(series.seriesId)
+        }
       }
     },
-    showMultiFrames(studyIndex,series, seriesIndex, instanceInfo) {
+    showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) {
       this.currentSeriesIndex = seriesIndex
       const imageIds = []
       if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
@@ -430,10 +488,33 @@ export default {
       }
       this.$refs.dicomViewer.loadImageStack(seriesInfo)
       if (!series.loadStatus) {
-        requestPoolManager.changePriority(series.seriesId)
+        var isAddToTakPool = false
+        if (this.showSeriesList.includes(`${studyIndex}_${seriesIndex}`)) {
+          isAddToTakPool = true
+        } else {
+          this.showSeriesList.push(`${studyIndex}_${seriesIndex}`)
+        }
+        if (!isAddToTakPool) {
+          var priority = parseInt(new Date().getTime())
+          if (series.isExistMutiFrames) {
+            series.instanceInfoList.map(image => {
+              this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
+            })
+          } else {
+            series.imageIds.map((imageId) => {
+              this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+            })
+          }
+
+          if (this.imageList.length > 0) {
+            this.loopLoad()
+          }
+        } else {
+          requestPoolManager.changePriority(series.seriesId)
+        }
       }
     },
-    changeReadingStatus(callback, data) {
+    async changeReadingStatus(callback, data) {
       let statusStr = ''
       if (callback) {
         statusStr = this.$t('trials:audit:label:setSeriesReading')
@@ -444,24 +525,29 @@ export default {
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
       message = message.replace('yyy', this.$fd('YesOrNo', !data.isReading))
-      this.$confirm(message, {
-        distinguishCancelAndClose: true,
-        type: 'warning'
-      }).then(() => {
-        const state = data.isReading ? 1 : 2
-        this.loading = true
-
-        setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            data.isReading = !data.isReading
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
-          }
-        }).catch(() => { this.loading = false })
-      }).catch(() => {})
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const state = data.isReading ? 1 : 2
+      this.loading = true
+      try {
+        const res = await setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          data.isReading = !data.isReading
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
     },
-    changeDeleteStatus(callback, data) {
+    async changeDeleteStatus(callback, data) {
       let statusStr = ''
       if (callback) {
         statusStr = this.$t('trials:audit:label:setSeriesDeleted')
@@ -472,24 +558,31 @@ export default {
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
       message = message.replace('yyy', this.$fd('YesOrNo', !data.isDeleted))
-      this.$confirm(message, {
-        distinguishCancelAndClose: true,
-        type: 'warning'
-      }).then(() => {
-        const state = data.isDeleted ? 5 : 4
-        this.loading = true
-        setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            data.isDeleted = !data.isDeleted
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
-          }
-        }).catch(() => { this.loading = false })
-      }).catch(() => {})
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+
+      const state = data.isDeleted ? 5 : 4
+      this.loading = true
+      try {
+        const res = await setSeriesStatus(data.trialId, data.subjectVisitId, data.studyId, data.seriesId, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          data.isDeleted = !data.isDeleted
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
     },
     // 切换关联检查Tab时获取关联检查信息
-    handleTabClick(tab, event) {
+    async handleTabClick(tab, event) {
       if (tab.name === 'relation-study' && this.relationStudyList.length <= 0) {
         const loading = this.$loading({
           target: document.querySelector('.pane-relation-wrapper'),
@@ -499,11 +592,13 @@ export default {
           background: 'rgb(49 49 49 / 50%)',
           spinner: 'el-icon-loading'
         })
-        getAllRelationStudyList(this.subjectVisitId).then(res => {
+        try {
+          const res = await getAllRelationStudyList(this.subjectVisitId)
           loading.close()
           this.relationStudyList = res.Result
-          console.log(this.relationStudyList)
-        }).catch(() => { loading.close() })
+        } catch (e) {
+          loading.close()
+        }
       }
     },
     handelRelationActiveChange(v) {
@@ -515,8 +610,7 @@ export default {
       }
     },
     // 根据关联检查获取序列信息
-    getRelationSeriesByStudy(studyId, index) {
-      console.log('getRelationSeriesByStudy')
+    async getRelationSeriesByStudy(studyId, index) {
       if (this.relationStudyList[index].seriesCount) {
         this.relationStudyList[index].showSeries = !this.relationStudyList[index].showSeries
         this.$forceUpdate()
@@ -530,20 +624,21 @@ export default {
           background: 'rgb(49 49 49 / 50%)',
           spinner: 'el-icon-loading'
         })
-        getSeriesList(`/series/list/${studyId}`).then(data => {
+        try {
+          const data = await getSeriesList(`/series/list/${studyId}`)
           loading.close()
           if (data.Result != null && data.Result.length > 0) {
             var seriesList = []
             const res = data.Result
-            res.forEach((item,seriesIndex)=> {
+            res.forEach((item, seriesIndex) => {
               const imageIds = []
               item.InstanceInfoList.forEach(i => {
                 if (i.NumberOfFrames && i.NumberOfFrames > 1) {
                   for (let j = 0; j < i.NumberOfFrames; j++) {
-                    imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&idx=${index}|${seriesIndex}`)
+                    imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&idx=${index}|${seriesIndex}&isRelation=1`)
                   }
                 } else {
-                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&idx=${index}|${seriesIndex}`)
+                  imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&idx=${index}|${seriesIndex}&isRelation=1`)
                 }
               })
               seriesList.push({
@@ -568,13 +663,14 @@ export default {
             scope.relationStudyList[index].seriesCount = seriesList.length
             scope.relationStudyList[index].seriesList = seriesList
             scope.relationStudyList[index].showSeries = true
-            console.log(scope.relationStudyList)
             scope.$forceUpdate()
           }
-        }).catch(() => { loading.close() })
+        } catch (e) {
+          loading.close()
+        }
       }
     },
-    showRelationSeriesImage(e, series, index) {
+    showRelationSeriesImage(e, series, studyIndex, index) {
       this.currentRelationIndex = index
       const element = e.currentTarget
       const elements = document.querySelectorAll('[series-type]')
@@ -585,9 +681,15 @@ export default {
       this.$refs.dicomViewer.loadImageStack(series)
       if (!series.loadStatus) {
         var priority = parseInt(new Date().getTime())
-        series.imageIds.map(imageId => {
-          this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
-        })
+        if (series.isExistMutiFrames) {
+          series.instanceInfoList.map(image => {
+            this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
+          })
+        } else {
+          series.imageIds.map((imageId) => {
+            this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+          })
+        }
       }
     },
     loadAllImages() {
@@ -596,21 +698,14 @@ export default {
       if (seriesIndex === -1) return
       const series = seriesList[seriesIndex]
       var priority = parseInt(new Date().getTime())
-      for (let i = 0; i < series.imageIds.length; i++) {
-        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.imageList.push({ imageId: imageId, seriesId: series.seriesId, seriesIndex: seriesIndex, priority: p })
+      if (series.isExistMutiFrames) {
+        series.instanceInfoList.map(image => {
+          this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
+        })
+      } else {
+        series.imageIds.map((imageId) => {
+          this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
+        })
       }
       if (this.imageList.length > 0) {
         this.loopLoad()
@@ -635,26 +730,6 @@ export default {
         this.imageList = []
       }
     },
-    // load(imageId, priority = 999) {
-    //   return new Promise((resolve, reject) => {
-    //     const imageTask = this.buildImageRequestTask(imageId, { priority })
-    //     requestPoolManager.addTaskIntoPool(imageTask).then((res) => {
-    //       resolve(res)
-    //     }).catch(e => {
-    //       reject(e)
-    //       console.log(e)
-    //     })
-    //   })
-    // },
-    buildImageRequestTask(imageId, config = {}) {
-      return {
-        key: imageId,
-        ...config,
-        execute: () => {
-          return cornerstone.loadAndCacheImage(imageId)
-        }
-      }
-    },
     datasetsCacheChanged(e) {
       const cacheInfo = e.detail.cacheInfo
       const cacheSizeInBytes = cacheInfo.cacheSizeInBytes
@@ -662,57 +737,46 @@ export default {
         // 清理缓存的影像
       }
     },
-    imageLoaded(image, seriesUid) {
-      var studyIndex = image.studyIndex
-      var seriesIndex = image.seriesIndex
-      if (seriesIndex < 0 || studyIndex < 0) return
-      if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(image.imageId) < 0) {
-        ++this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount
-        this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.push(image.imageId)
-
-        if (this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount >= this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount) {
-          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
-        }
-      }
-    },
-    cornerstoneimageloadprogress(e){
+    cornerstoneimageloadprogress(e) {
       const imageId = e.detail.imageId
+      if (!imageId) return
       const percentComplete = e.detail.percentComplete
       const params = {}
       const searchParams = new URLSearchParams(imageId.split('?')[1])
+      if (!searchParams) return
       for (const [key, value] of searchParams.entries()) {
         params[key] = value
       }
-      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) {
-          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
+      const studyIndex = params.idx.split('|')[0]
+      const seriesIndex = params.idx.split('|')[1]
+      var series = !params.isRelation ? this.studyList[studyIndex].SeriesList[seriesIndex] : null
+      if (!series) return
+      var prefetchInstanceCount = series.prefetchInstanceCount
+      var instanceCount = series.instanceCount
+      if (series.imageloadedArr.indexOf(imageId) < 0) {
+        const i = this.currentLoadIns.findIndex(i => i.imageId === imageId)
+        if (i > -1) {
+          prefetchInstanceCount = prefetchInstanceCount - this.currentLoadIns[i].percentComplete + percentComplete
+          this.currentLoadIns[i].percentComplete = percentComplete
+          if (percentComplete === 100) {
+            this.currentLoadIns.splice(i, 1)
           }
-          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = prefetchInstanceCount
-          if (percentComplete >= 100) {
-            this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.push(imageId)
+        } else {
+          if (percentComplete !== 100) {
+            this.currentLoadIns.push({ imageId, percentComplete })
           }
+          prefetchInstanceCount = prefetchInstanceCount + percentComplete
         }
-        if (prefetchInstanceCount >= instanceCount * 100) {
-          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
-          // 设置当前序列状态为已下载完成
-          this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
+        series.prefetchInstanceCount = prefetchInstanceCount
+        if (percentComplete >= 100) {
+          series.imageloadedArr.push(imageId)
+        }
+      }
+      if (prefetchInstanceCount >= instanceCount * 100) {
+        series.prefetchInstanceCount = instanceCount * 100
+        // 设置当前序列状态为已下载完成
+        series.loadStatus = true
+        if (!this.isFromCRCUpload) {
           this.loadAllImages()
         }
       }
@@ -784,7 +848,7 @@ export default {
     white-space: normal;
 }
 .viewerContainer .viewerLeftSidePanel {
-    width: 215px;
+    width: 220px;
     background-color: #323232;
     box-sizing: border-box;
     margin: 0;
@@ -821,7 +885,7 @@ export default {
 }
 .viewerContainer .viewerLeftSidePanel .viewernavigatorwrapper {
     display: flex;
-    width: 200px;
+    width: 220px;
     /* height: 84px; */
     padding: 1px 2px 1px 2px;
     margin: 2px 0 1px 1px;

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

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

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

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

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

@@ -18,7 +18,7 @@
         <el-input v-model="form.SiteName" />
       </el-form-item>
       <!-- 中心名称（CN） -->
-      <el-form-item :label="$t('trials:customSite:form:siteName') + '（CN）'" v-if="!show" prop="SiteNameCN">
+      <el-form-item :label="$t('trials:customSite:form:siteName') + '（CN）'"  prop="SiteNameCN">
         <el-input v-model="form.SiteNameCN" />
       </el-form-item>
 

src/views/dictionary/template/components/CriterionQuestionForm.vue

@@ -430,9 +430,26 @@
       <el-form-item v-if="form.Type === 'upload'" label="最大上传个数">
         <el-input-number v-model="form.ImageCount" controls-position="right" :min="1" :max="10" />
       </el-form-item>
-      <!--      <el-form-item v-if="form.Type !== 'group' && form.Type !== 'summary'" label="注释">-->
-      <!--        <el-input v-model="form.Remark" />-->
-      <!--      </el-form-item>-->
+      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
+        <el-select v-model="form.HighlightAnswerList" clearable multiple>
+          <template v-if="form.TypeValue">
+            <el-option
+              v-for="item of form.TypeValue.split('|')"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </template>
+          <template v-else-if="form.DictionaryCode">
+            <el-option
+              v-for="item of highlightAnswers"
+              :key="item.Id"
+              :label="item.ValueCN"
+              :value="item.Code"
+            />
+          </template>
+        </el-select>
+      </el-form-item>
       <el-form-item label="序号" prop="ShowOrder">
         <el-input-number
           v-model="form.ShowOrder"
@@ -500,7 +517,7 @@ export default {
       type: String,
       default() { return '' }
     }
-  },
+  }, 
   data() {
     var validateTypeVal = (rule, value, callback) => {
       if (value === '') {
@@ -552,7 +569,8 @@ export default {
         LimitEdit: 0,
         GroupId: null,
         ConvertShowType: 0,
-        QuestionClassify: null
+        QuestionClassify: null,
+        HighlightAnswerList: []
       },
       rules: {
         Type: [
@@ -588,7 +606,29 @@ export default {
       lesionTypes: [],
       dicList: [],
       CriterionDictionaryList: [],
-      groupClassifyList:[]
+      groupClassifyList:[],
+      highlightAnswers: []
+    }
+  },
+  watch: {
+    'form.DictionaryCode': {
+      deep: true,
+      immediate: true,
+      async handler(v, oldv) {
+        try {
+          if (!v) {
+            this.highlightAnswers = []
+            return
+          }
+          let res = await getCriterionDictionary({
+            ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,
+            DictionaryCode: this.form.DictionaryCode
+          })
+          this.highlightAnswers = res.Result[this.form.DictionaryCode]
+        } catch (e) {
+          console.log(e)
+        }
+      }
     }
   },
   mounted() {
@@ -615,7 +655,6 @@ export default {
       await this.getGroupOptions()
       await this.getParentQuestions()
       await this.getLesionType()
-      await this.getBasicConfigSelect()
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
           if (this.data.hasOwnProperty(k)) {
@@ -679,18 +718,6 @@ export default {
           })
       })
     },
-    getBasicConfigSelect() {
-      // getBasicConfigSelect('Reading_eCRF_Criterion').then(res => {
-      //   this.dicList = res.Result
-      // })
-      getCriterionDictionaryList({
-        CriterionId: this.data.ReadingQuestionCriterionSystemId,
-        SystemCriterionId: this.data.ReadingQuestionCriterionSystemId
-      }).then(res => {
-        console.log(this.dicList)
-        this.dicList = res.Result
-      })
-    },
     getGroupOptions() {
       return new Promise((resolve, reject) => {
         this.loading = true

src/views/dictionary/template/components/TableQsForm.vue

@@ -315,7 +315,26 @@
           :max="10"
         />
       </el-form-item>
-
+      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
+        <el-select v-model="form.HighlightAnswerList" clearable multiple>
+          <template v-if="form.TypeValue">
+            <el-option
+              v-for="item of form.TypeValue.split('|')"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </template>
+          <template v-else-if="form.DictionaryCode">
+            <el-option
+              v-for="item of $d[form.DictionaryCode]"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </template>
+        </el-select>
+      </el-form-item>
       <el-form-item label="序号" prop="ShowOrder">
         <el-input-number
           v-model="form.ShowOrder"
@@ -427,7 +446,8 @@ export default {
         QuestionMark: null,
         LimitEdit: 0,
         GlobalReadingShowType: null,
-        QuestionClassify: null
+        QuestionClassify: null,
+        HighlightAnswerList: []
 
         // IsEnable: true
       },

src/views/dictionary/template/email/components/EmailForm.vue

@@ -59,9 +59,14 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-if="systemLevel !== 1">
         <el-form-item label="收件人" prop="ToUserTypeList">
-          <el-select v-model="form.ToUserTypeList" clearable multiple class="mr">
+          <el-select
+            v-model="form.ToUserTypeList"
+            clearable
+            multiple
+            class="mr"
+          >
             <el-option
               v-for="item of $d.UserType"
               :key="`ToUserTypeList${item.label}`"
@@ -71,9 +76,14 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="抄送人" prop="CopyUserTypeList">
-          <el-select v-model="form.CopyUserTypeList" clearable multiple class="mr">
+          <el-select
+            v-model="form.CopyUserTypeList"
+            clearable
+            multiple
+            class="mr"
+          >
             <el-option
               v-for="item of $d.UserType"
               :key="`CopyUserTypeList${item.label}`"
@@ -83,9 +93,18 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="加急状态" prop="EmailUrgentEnum">
-          <el-select v-model="form.EmailUrgentEnum" @change="(v) => {v === 1 ? form.EmailCron = null : null}" clearable class="mr">
+          <el-select
+            v-model="form.EmailUrgentEnum"
+            @change="
+              (v) => {
+                v === 1 ? (form.EmailCron = null) : null;
+              }
+            "
+            clearable
+            class="mr"
+          >
             <el-option
               v-for="item of $d.EmailUrgent"
               :key="`EmailUrgent${item.label}`"
@@ -95,13 +114,17 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
-        <el-form-item label="发送周期和时间" v-if="form.EmailUrgentEnum !== 1" prop="EmailCron">
+      <el-col :span="12" v-if="!systemLevel">
+        <el-form-item
+          label="发送周期和时间"
+          v-if="form.EmailUrgentEnum !== 1"
+          prop="EmailCron"
+        >
           <el-input style="width: 300px" readonly v-model="form.EmailCron" />
           <el-button type="primary" @click="showDialog">生成 cron</el-button>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="是否需要回执" prop="IsReturnRequired">
           <el-radio-group v-model="form.IsReturnRequired">
             <el-radio :label="true">是</el-radio>
@@ -109,7 +132,7 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="是否自动发送" prop="IsAutoSend">
           <el-radio-group v-model="form.IsAutoSend">
             <el-radio :label="true">是</el-radio>
@@ -117,18 +140,27 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="是否区分标准" prop="IsDistinguishCriteria">
-          <el-radio-group v-model="form.IsDistinguishCriteria" @change="() => {form.CriterionTypeEnum = null}">
+          <el-radio-group
+            v-model="form.IsDistinguishCriteria"
+            @change="
+              () => {
+                form.CriterionTypeEnum = null;
+              }
+            "
+          >
             <el-radio :label="true">是</el-radio>
             <el-radio :label="false">否</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item
           :label="$t('trials:auditRecord:table:criterion')"
-          v-if="form.IsDistinguishCriteria"  prop="CriterionTypeEnum">
+          v-if="form.IsDistinguishCriteria"
+          prop="CriterionTypeEnum"
+        >
           <el-select v-model="form.CriterionTypeEnum" clearable class="mr">
             <el-option
               v-for="item of $d.CriterionType"
@@ -139,7 +171,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="是否启用" prop="IsEnable">
           <el-radio-group v-model="form.IsEnable">
             <el-radio :label="true">是</el-radio>
@@ -147,7 +179,7 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="附件（CN）" prop="IsEnable">
           <el-upload
             class="upload-demo"
@@ -160,11 +192,16 @@
             :limit="1"
             :file-list="fileListCN"
           >
-            <el-button size="small" type="primary" :disabled="fileListCN.length > 0">{{$t('common:button:upload')}}</el-button>
+            <el-button
+              size="small"
+              type="primary"
+              :disabled="fileListCN.length > 0"
+              >{{ $t("common:button:upload") }}</el-button
+            >
           </el-upload>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-if="!systemLevel">
         <el-form-item label="附件（EN）" prop="IsEnable">
           <el-upload
             class="upload-demo"
@@ -177,7 +214,12 @@
             :limit="1"
             :file-list="fileListEN"
           >
-            <el-button size="small" type="primary" :disabled="fileListEN.length > 0">{{$t('common:button:upload')}}</el-button>
+            <el-button
+              size="small"
+              type="primary"
+              :disabled="fileListEN.length > 0"
+              >{{ $t("common:button:upload") }}</el-button
+            >
           </el-upload>
         </el-form-item>
       </el-col>
@@ -186,181 +228,250 @@
       <el-input
         v-model="form.EmailHtmlContentCN"
         type="textarea"
-        :autosize="{ minRows: 8, maxRows: 8}"
+        :autosize="{ minRows: 8, maxRows: 8 }"
       />
     </el-form-item>
     <el-form-item label="邮件内容模版（EN）" prop="EmailHtmlContent">
       <el-input
         v-model="form.EmailHtmlContent"
         type="textarea"
-        :autosize="{ minRows: 8, maxRows: 8}"
+        :autosize="{ minRows: 8, maxRows: 8 }"
       />
     </el-form-item>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;padding-bottom: 10px">
-      <el-form-item style="text-align:right;">
-        <el-button size="small" type="primary" @click="handleSave">Save</el-button>
+    <div
+      class="base-dialog-footer"
+      style="text-align: right; margin-top: 10px; padding-bottom: 10px"
+    >
+      <el-form-item style="text-align: right">
+        <el-button size="small" type="primary" @click="handleSave"
+          >Save</el-button
+        >
       </el-form-item>
     </div>
     <el-dialog append-to-body title="生成 cron" :visible.sync="showCron">
-      <vcrontab :hideComponent="['year']" @hide="showCron=false" @fill="crontabFill" :expression="expression"></vcrontab>
+      <vcrontab
+        :hideComponent="['year']"
+        @hide="showCron = false"
+        @fill="crontabFill"
+        :expression="expression"
+      ></vcrontab>
     </el-dialog>
   </el-form>
 </template>
 <script>
-import { Upload, addOrUpdateEmailNoticeConfigList } from '@/api/dictionary'
+import { Upload, addOrUpdateEmailNoticeConfigList } from "@/api/dictionary";
 export default {
   props: {
     data: {
       type: Object,
-      default() { return {} }
-    }
+      default() {
+        return {};
+      },
+    },
+    systemLevel: {
+      type: Number,
+      default() {
+        return 0;
+      },
+    },
   },
   data() {
     return {
-      expression: '',
+      expression: "",
       showCron: false,
       form: {
-        Id: '',
-        Code: '',
-        EmailTopicCN: '',
-        EmailTopic: '',
-        BusinessLevelEnum: '',
-        BusinessModuleEnum: '',
-        ToUserTypeList: '',
-        CopyUserTypeList: '',
-        EmailUrgentEnum: '',
-        EmailCron: '',
+        Id: "",
+        Code: "",
+        EmailTopicCN: "",
+        EmailTopic: "",
+        BusinessLevelEnum: "",
+        BusinessModuleEnum: "",
+        ToUserTypeList: "",
+        CopyUserTypeList: "",
+        EmailUrgentEnum: "",
+        EmailCron: "",
         BusinessScenarioEnum: null,
-        EmailHtmlContentCN: '',
-        EmailHtmlContent: '',
-        AttachPath: '',
-        AttachName: '',
-        AttachNameCN: '',
-        AttachCNPath: '',
+        EmailHtmlContentCN: "",
+        EmailHtmlContent: "",
+        AttachPath: "",
+        AttachName: "",
+        AttachNameCN: "",
+        AttachCNPath: "",
         IsDistinguishCriteria: true,
         IsReturnRequired: true,
         IsUrgent: true,
         IsEnable: true,
         IsAutoSend: true,
-        CriterionTypeEnum: null
+        CriterionTypeEnum: null,
       },
       rules: {
-        Code: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        BusinessScenarioEnum: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailTopicCN:  [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailTopic:  [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        BusinessLevelEnum:  [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        ToUserTypeList: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailCron: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailUrgentEnum: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailHtmlContentCN: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailHtmlContent: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        CriterionTypeEnum: [{ required: true, message: 'Please select', trigger: ['blur'] }],
+        Code: [{ required: true, message: "Please select", trigger: ["blur"] }],
+        BusinessScenarioEnum: [
+          { required: true, message: "Please select", trigger: ["blur"] },
+        ],
+        EmailTopicCN: [
+          { required: true, message: "Please select", trigger: ["blur"] },
+        ],
+        EmailTopic: [
+          { required: true, message: "Please select", trigger: ["blur"] },
+        ],
+        BusinessLevelEnum: [
+          { required: true, message: "Please select", trigger: ["blur"] },
+        ],
+        ToUserTypeList: [
+          { required: true, message: "Please select", trigger: ["blur"] },
+        ],
+        EmailCron: [
+          { required: true, message: "Please select", trigger: ["blur"] },
+        ],
+        EmailUrgentEnum: [
+          { required: true, message: "Please select", trigger: ["blur"] },
+        ],
+        EmailHtmlContentCN: [
+          { required: true, message: "Please select", trigger: ["blur"] },
+        ],
+        EmailHtmlContent: [
+          { required: true, message: "Please select", trigger: ["blur"] },
+        ],
+        CriterionTypeEnum: [
+          { required: true, message: "Please select", trigger: ["blur"] },
+        ],
       },
       scenarioOption: [],
       fileListCN: [],
       fileListEN: [],
-      loading: false
-    }
+      loading: false,
+    };
   },
   mounted() {
-    this.initForm()
+    this.initForm();
+    if (this.systemLevel) {
+      if (this.systemLevel === 1) {
+        this.form.ToUserTypeList = [];
+      }
+      this.form.CopyUserTypeList = [];
+      this.form.EmailUrgentEnum = "3";
+      this.form.IsReturnRequired = false;
+      this.form.IsDistinguishCriteria = false;
+    }
   },
   methods: {
     showDialog() {
-      this.expression = this.form.EmailCron;//传入的 cron 表达式，可以反解析到 UI 上
+      this.expression = this.form.EmailCron; //传入的 cron 表达式，可以反解析到 UI 上
       this.showCron = true;
     },
     crontabFill(value) {
       this.form.EmailCron = value;
     },
     handleRemoveFileCN() {
-      this.form.AttachNameCN = null
-      this.form.AttachCNPath = null
-      this.fileListCN = []
+      this.form.AttachNameCN = null;
+      this.form.AttachCNPath = null;
+      this.fileListCN = [];
     },
     beforeUploadCN() {
       if (this.fileListCN.length > 0) {
-        this.$alert('最多只能传一个附件')
-        return
+        this.$alert("最多只能传一个附件");
+        return;
       }
     },
     handlePreviewCN(row, r2) {
       if (row.fullPath) {
-        window.open(row.fullPath, '_blank')
+        window.open(row.fullPath, "_blank");
       }
     },
     handleUploadFileCN(param) {
-      this.btnLoading = true
-      const formData = new FormData()
-      formData.append('file', param.file)
-      this.form.AttachNameCN = param.file.name
-      Upload(formData, 3).then(res => {
-        this.form.AttachCNPath = res.Result.FilePath
-        this.btnLoading = false
-        this.fileListCN.push({ name: param.file.name, path: res.Result.FilePath, fullPath: res.Result.FullFilePath, url: res.Result.FilePath })
-      })
+      this.btnLoading = true;
+      const formData = new FormData();
+      formData.append("file", param.file);
+      this.form.AttachNameCN = param.file.name;
+      Upload(formData, 3).then((res) => {
+        this.form.AttachCNPath = res.Result.FilePath;
+        this.btnLoading = false;
+        this.fileListCN.push({
+          name: param.file.name,
+          path: res.Result.FilePath,
+          fullPath: res.Result.FullFilePath,
+          url: res.Result.FilePath,
+        });
+      });
     },
     handleUploadFileEN(param) {
-      this.btnLoading = true
-      const formData = new FormData()
-      formData.append('file', param.file)
-      this.form.AttachName = param.file.name
-      Upload(formData, 3).then(res => {
-        this.form.AttachPath = res.Result.FilePath
-        this.btnLoading = false
-        this.fileListEN.push({ name: param.file.name, path: res.Result.FilePath, fullPath: res.Result.FullFilePath, url: res.Result.FilePath })
-      })
+      this.btnLoading = true;
+      const formData = new FormData();
+      formData.append("file", param.file);
+      this.form.AttachName = param.file.name;
+      Upload(formData, 3).then((res) => {
+        this.form.AttachPath = res.Result.FilePath;
+        this.btnLoading = false;
+        this.fileListEN.push({
+          name: param.file.name,
+          path: res.Result.FilePath,
+          fullPath: res.Result.FullFilePath,
+          url: res.Result.FilePath,
+        });
+      });
     },
     handleRemoveFileEN() {
-      this.form.AttachName = null
-      this.form.AttachPath = null
-      this.fileListEN = []
+      this.form.AttachName = null;
+      this.form.AttachPath = null;
+      this.fileListEN = [];
     },
     beforeUploadEN() {
       if (this.fileListEN.length > 0) {
-        this.$alert('最多只能传一个附件')
-        return
+        this.$alert("最多只能传一个附件");
+        return;
       }
     },
     handlePreviewEN(row, r2) {
       if (row.fullPath) {
-        window.open(row.fullPath, '_blank')
+        window.open(row.fullPath, "_blank");
       }
     },
     async initForm() {
-      this.loading = true
+      this.loading = true;
       // await this.getScenarios()
       for (const k in this.form) {
         if (this.data.hasOwnProperty(k)) {
-          this.form[k] = this.data[k]
+          this.form[k] = this.data[k];
         }
-        if (k === 'AttachPath' && this.form[k]) {
-          this.fileListEN.push({ name: this.data.AttachName, path: this.data.AttachPath, fullPath: this.data.AttachPath, url: this.data.AttachPath })
+        if (k === "AttachPath" && this.form[k]) {
+          this.fileListEN.push({
+            name: this.data.AttachName,
+            path: this.data.AttachPath,
+            fullPath: this.data.AttachPath,
+            url: this.data.AttachPath,
+          });
         }
-        if (k === 'AttachCNPath' && this.form[k]) {
-          this.fileListCN.push({ name: this.data.AttachNameCN, path: this.data.AttachCNPath, fullPath: this.data.AttachCNPath, url: this.data.AttachCNPath })
+        if (k === "AttachCNPath" && this.form[k]) {
+          this.fileListCN.push({
+            name: this.data.AttachNameCN,
+            path: this.data.AttachCNPath,
+            fullPath: this.data.AttachCNPath,
+            url: this.data.AttachCNPath,
+          });
         }
       }
-      console.log(this.fileListEN, this.fileListCN)
-      this.loading = false
+      this.loading = false;
     },
 
     // 保存
     handleSave() {
-      this.$refs.emailForm.validate(valid => {
-        if (!valid) return
-        this.loading = true
-        addOrUpdateEmailNoticeConfigList(this.form).then(res => {
-          this.loading = false
-          this.$emit('closeDialog')
-          this.$emit('getList')
-          this.$message.success('Saved successfully')
-        }).catch(() => {
-          this.loading = false
-        })
-      })
-    }
-  }
-}
+      this.$refs.emailForm.validate((valid) => {
+        if (!valid) return;
+        this.loading = true;
+        this.form.systemLevel = this.systemLevel;
+        addOrUpdateEmailNoticeConfigList(this.form)
+          .then((res) => {
+            this.loading = false;
+            this.$emit("closeDialog");
+            this.$emit("getList");
+            this.$message.success("Saved successfully");
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
+    },
+  },
+};
 </script>

src/views/dictionary/template/email/components/EmailList.vue

@@ -1,25 +1,69 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
+      <el-form
+        v-if="!systemLevel"
+        :inline="true"
+        size="mini"
+        class="base-search-form"
+      >
         <el-form-item label="是否需要回执:">
-          <el-select v-model="searchData.IsReturnRequired" clearable style="width:100px;">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" />
+          <el-select
+            v-model="searchData.IsReturnRequired"
+            clearable
+            style="width: 100px"
+          >
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="是否加急:">
-          <el-select v-model="searchData.IsUrgent" clearable style="width:100px;">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" />
+          <el-select
+            v-model="searchData.IsUrgent"
+            clearable
+            style="width: 100px"
+          >
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="是否启用:">
-          <el-select v-model="searchData.IsEnable" clearable style="width:100px;">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" />
+          <el-select
+            v-model="searchData.IsEnable"
+            clearable
+            style="width: 100px"
+          >
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('trials:auditRecord:table:criterion')" v-if="isDistinguishCriteria">
-          <el-select v-model="searchData.CriterionTypeEnum" clearable style="width:100px;">
-            <el-option v-for="item of $d.CriterionType" :value="item.value" :label="item.label" />
+        <el-form-item
+          :label="$t('trials:auditRecord:table:criterion')"
+          v-if="isDistinguishCriteria"
+        >
+          <el-select
+            v-model="searchData.CriterionTypeEnum"
+            clearable
+            style="width: 100px"
+          >
+            <el-option
+              v-for="item of $d.CriterionType"
+              :value="item.value"
+              :label="item.label"
+              :key="item.id"
+            />
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -27,31 +71,26 @@
           <el-button type="primary" @click="handleReset">重置</el-button>
         </el-form-item>
       </el-form>
-      <span style="margin-left:auto;">
-    <!-- <el-button
+      <span style="margin-left: auto">
+        <!-- <el-button
       type="primary"
       size="mini"
     >
       场景配置
     </el-button> -->
-    <el-button
-      type="primary"
-      size="mini"
-      @click="handleAdd"
-    >
-      新增
-    </el-button>
-  </span>
-
+        <el-button type="primary" size="mini" @click="handleAdd">
+          新增
+        </el-button>
+      </span>
     </div>
     <!-- 受试者列表 -->
     <el-table
       v-loading="loading"
-      v-adaptive="{bottomOffset:45}"
+      v-adaptive="{ bottomOffset: 45 }"
       :data="list"
       stripe
       height="100"
-      style="width:100%"
+      style="width: 100%"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -61,7 +100,7 @@
         :label="$t('trials:emailManageCfg:title:code')"
         sortable="custom"
         show-overflow-tooltip
-        width="100"
+        min-width="100"
       />
       <el-table-column
         v-if="isDistinguishCriteria"
@@ -69,10 +108,10 @@
         :label="$t('trials:reviewTrack:table:criterionName')"
         show-overflow-tooltip
         sortable="custom"
-        width="120"
+        min-width="120"
       >
         <template slot-scope="scope">
-          {{ $fd('CriterionType', scope.row.CriterionTypeEnum) }}
+          {{ $fd("CriterionType", scope.row.CriterionTypeEnum) }}
         </template>
       </el-table-column>
       <el-table-column
@@ -80,23 +119,24 @@
         label="邮件主题（中文）"
         sortable="custom"
         show-overflow-tooltip
-        width="160"
+        min-width="160"
       />
       <el-table-column
         prop="EmailTopic"
         label="邮件主题（英文）"
         sortable="custom"
         show-overflow-tooltip
-        width="160"
+        min-width="160"
       />
       <el-table-column
         prop="BusinessLevelEnum"
         label="业务层级"
         sortable="custom"
         show-overflow-tooltip
-        width="100">
+        min-width="100"
+      >
         <template slot-scope="scope">
-          {{ $fd('BusinessLevel',scope.row.BusinessLevelEnum) }}
+          {{ $fd("BusinessLevel", scope.row.BusinessLevelEnum) }}
         </template>
       </el-table-column>
       <el-table-column
@@ -104,9 +144,10 @@
         label="业务模块"
         sortable="custom"
         show-overflow-tooltip
-        width="100">
+        min-width="100"
+      >
         <template slot-scope="scope">
-          {{ $fd('BusinessModule',scope.row.BusinessModuleEnum) }}
+          {{ $fd("BusinessModule", scope.row.BusinessModuleEnum) }}
         </template>
       </el-table-column>
       <el-table-column
@@ -114,10 +155,10 @@
         label="业务场景"
         sortable="custom"
         show-overflow-tooltip
-        width="130"
+        min-width="130"
       >
         <template slot-scope="scope">
-          {{ $fd('Email_BusinessScenario',scope.row.BusinessScenarioEnum) }}
+          {{ $fd("Email_BusinessScenario", scope.row.BusinessScenarioEnum) }}
         </template>
       </el-table-column>
       <!-- 收件人 -->
@@ -125,10 +166,17 @@
         prop="ToUserTypeList"
         :label="$t('trials:emailManageCfg:title:toUserTypeList')"
         show-overflow-tooltip
-        width="100"
+        min-width="100"
+        v-if="systemLevel !== 1"
       >
         <template slot-scope="scope">
-          {{ scope.row.ToUserTypeList.length > 0?scope.row.ToUserTypeList.map(v => $fd('UserType', v)).join('、'):'' }}
+          {{
+            scope.row.ToUserTypeList.length > 0
+              ? scope.row.ToUserTypeList.map((v) => $fd("UserType", v)).join(
+                  "、"
+                )
+              : ""
+          }}
         </template>
       </el-table-column>
       <!-- 抄送人 -->
@@ -136,10 +184,17 @@
         prop="CopyUserTypeList"
         :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
         show-overflow-tooltip
-        width="100"
+        min-width="100"
+        v-if="!systemLevel"
       >
         <template slot-scope="scope">
-          {{ scope.row.CopyUserTypeList.length > 0?scope.row.CopyUserTypeList.map(v => $fd('UserType', v)).join('、'):'' }}
+          {{
+            scope.row.CopyUserTypeList.length > 0
+              ? scope.row.CopyUserTypeList.map((v) => $fd("UserType", v)).join(
+                  "、"
+                )
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column
@@ -147,10 +202,11 @@
         label="加急状态"
         sortable="custom"
         show-overflow-tooltip
-        width="100"
+        min-width="100"
+        v-if="!systemLevel"
       >
         <template slot-scope="scope">
-          {{ $fd('EmailUrgent',scope.row.EmailUrgentEnum) }}
+          {{ $fd("EmailUrgent", scope.row.EmailUrgentEnum) }}
         </template>
       </el-table-column>
       <el-table-column
@@ -158,17 +214,23 @@
         label="发送周期和时间"
         sortable="custom"
         show-overflow-tooltip
-        width="160"
+        min-width="160"
+        v-if="!systemLevel"
       />
       <!-- 附件 -->
       <el-table-column
         prop="FileName"
         :label="$t('trials:emailManageCfg:title:fileName')"
         show-overflow-tooltip
-        width="100"
+        min-width="100"
+        v-if="!systemLevel"
       >
         <template slot-scope="scope">
-          <el-button v-if="scope.row.FilePath" type="text" @click="handlePreview(scope.row.FilePath)">
+          <el-button
+            v-if="scope.row.FilePath"
+            type="text"
+            @click="handlePreview(scope.row.FilePath)"
+          >
             {{ scope.row.FileName }}
           </el-button>
         </template>
@@ -179,13 +241,16 @@
         :label="$t('trials:emailManageCfg:title:isReturnRequired')"
         show-overflow-tooltip
         sortable="custom"
-        width="140"
+        min-width="140"
+        v-if="!systemLevel"
       >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsReturnRequired" type="danger">
-            {{ $fd('YesOrNo', scope.row.IsReturnRequired) }}
+            {{ $fd("YesOrNo", scope.row.IsReturnRequired) }}
           </el-tag>
-          <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsReturnRequired) }}</el-tag>
+          <el-tag v-else type="primary">{{
+            $fd("YesOrNo", scope.row.IsReturnRequired)
+          }}</el-tag>
         </template>
       </el-table-column>
       <!-- 是否自动发送 -->
@@ -194,13 +259,16 @@
         :label="$t('trials:emailManageCfg:title:isAutoSend')"
         show-overflow-tooltip
         sortable="custom"
-        width="160"
+        min-width="160"
+        v-if="!systemLevel"
       >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsAutoSend" type="danger">
-            {{ $fd('YesOrNo', scope.row.IsAutoSend) }}
+            {{ $fd("YesOrNo", scope.row.IsAutoSend) }}
           </el-tag>
-          <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsAutoSend) }}</el-tag>
+          <el-tag v-else type="primary">{{
+            $fd("YesOrNo", scope.row.IsAutoSend)
+          }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column
@@ -208,13 +276,16 @@
         :label="$t('trials:emailManageCfg:table:IsEnable')"
         show-overflow-tooltip
         sortable="custom"
-        width="160"
+        min-width="160"
+        v-if="!systemLevel"
       >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsEnable" type="danger">
-            {{ $fd('YesOrNo', scope.row.IsEnable) }}
+            {{ $fd("YesOrNo", scope.row.IsEnable) }}
           </el-tag>
-          <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsEnable) }}</el-tag>
+          <el-tag v-else type="primary">{{
+            $fd("YesOrNo", scope.row.IsEnable)
+          }}</el-tag>
         </template>
       </el-table-column>
       <!-- 更新时间 -->
@@ -223,7 +294,7 @@
         :label="$t('trials:emailManageCfg:title:updateTime')"
         show-overflow-tooltip
         sortable="custom"
-        width="160"
+        min-width="160"
       />
       <!-- 创建时间 -->
       <el-table-column
@@ -231,24 +302,28 @@
         :label="$t('trials:emailManageCfg:title:createTime')"
         show-overflow-tooltip
         sortable="custom"
-        width="160"
+        min-width="160"
       />
-      <el-table-column label="Action" width="140" fixed="right">
+      <el-table-column label="Action" min-width="140" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="handleEdit(scope.row)"
-          >
+          <el-button type="text" @click="handleEdit(scope.row)">
             编辑
           </el-button>
 
-          <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
-
+          <el-button type="text" @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+    <pagination
+      class="page"
+      :total="total"
+      :page.sync="searchData.PageIndex"
+      :limit.sync="searchData.PageSize"
+      @pagination="getList"
+    />
     <!-- 搜索框 -->
     <!-- 修改受试者状态 -->
     <el-dialog
@@ -260,7 +335,12 @@
       fullscreen
       custom-class="base-dialog-wrapper"
     >
-      <EmailForm :data="rowData" @closeDialog="closeDialog" @getList="getList" />
+      <EmailForm
+        :data="rowData"
+        :system-level="systemLevel"
+        @closeDialog="closeDialog"
+        @getList="getList"
+      />
     </el-dialog>
 
     <!-- 修改受试者状态 -->
@@ -282,116 +362,128 @@
   </box-content>
 </template>
 <script>
-import { getEmailNoticeConfigList, deleteEmailNoticeConfig } from '@/api/dictionary'
-import BoxContent from '@/components/BoxContent'
-import Pagination from '@/components/Pagination'
-import EmailForm from './EmailForm'
-import AttachmentList from './AttachmentList'
+import {
+  getEmailNoticeConfigList,
+  deleteEmailNoticeConfig,
+} from "@/api/dictionary";
+import BoxContent from "@/components/BoxContent";
+import Pagination from "@/components/Pagination";
+import EmailForm from "./EmailForm";
+import AttachmentList from "./AttachmentList";
 const searchDataDefault = () => {
   return {
-    IsReturnRequired: '',
-    IsUrgent: '',
-    IsEnable: '',
+    IsReturnRequired: "",
+    IsUrgent: "",
+    IsEnable: "",
     CriterionTypeEnum: null,
     PageIndex: 1,
-    PageSize: 20
-  }
-}
+    PageSize: 20,
+  };
+};
 export default {
-  name: 'EmailList',
+  name: "EmailList",
   components: { BoxContent, Pagination, EmailForm, AttachmentList },
   props: {
     isDistinguishCriteria: {
       type: Boolean,
       default() {
-        return false
-      }
-    }
+        return false;
+      },
+    },
+    systemLevel: {
+      type: Number,
+      default() {
+        return 0;
+      },
+    },
   },
   data() {
     return {
-      activeTab: '0',
+      activeTab: "0",
       searchData: searchDataDefault(),
       loading: false,
       list: [],
       total: 0,
       rowData: {},
-      title: '',
+      title: "",
       editVisible: false,
-      attachmentVisible: false
-    }
+      attachmentVisible: false,
+    };
   },
   mounted() {
-    this.getList()
+    this.getList();
   },
   methods: {
     // 获取受试者列表
     getList() {
-      this.loading = true
-      this.searchData.IsDistinguishCriteria = this.isDistinguishCriteria
-      getEmailNoticeConfigList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.loading = false })
+      this.loading = true;
+      this.searchData.IsDistinguishCriteria = this.isDistinguishCriteria;
+      this.searchData.systemLevel = this.systemLevel;
+      getEmailNoticeConfigList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 新增
     handleAdd() {
-      this.rowData = {}
-      this.title = '新增'
-      this.editVisible = true
+      this.rowData = {};
+      this.title = "新增";
+      this.editVisible = true;
     },
     // 编辑
     handleEdit(row) {
-      this.rowData = { ...row }
-      this.title = '编辑'
-      this.editVisible = true
+      this.rowData = { ...row };
+      this.title = "编辑";
+      this.editVisible = true;
     },
     // 删除
     handleDelete(row) {
-      this.$confirm(this.$t('trials:staffResearch:message:confirmDel'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          deleteEmailNoticeConfig(row.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.getList()
-                this.$message.success('删除成功!')
-              }
-            })
-        })
+      this.$confirm(this.$t("trials:staffResearch:message:confirmDel"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        deleteEmailNoticeConfig(row.Id).then((res) => {
+          if (res.IsSuccess) {
+            this.getList();
+            this.$message.success("删除成功!");
+          }
+        });
+      });
     },
     handleDetail(row) {
-      this.rowData = { ...row }
-      this.attachmentVisible = true
+      this.rowData = { ...row };
+      this.attachmentVisible = true;
     },
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.PageIndex = 1;
+      this.getList();
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
     },
     // 关闭新增、编辑框
     closeDialog() {
-      this.editVisible = false
-    }
-  }
-}
+      this.editVisible = false;
+    },
+  },
+};
 </script>

src/views/dictionary/template/email/index.vue

@@ -2,122 +2,148 @@
   <box-content>
     <el-tabs v-model="activeTab" type="border-card">
       <!-- 通用 -->
-      <el-tab-pane
-        :label="$t('trials:emailManageCfg:title:commom')"
-        name="0"
-      >
-        <EmailList v-if="activeTab === '0'" :is-distinguish-criteria="false"></EmailList>
+      <el-tab-pane :label="$t('trials:emailManageCfg:title:commom')" name="0">
+        <EmailList
+          v-if="activeTab === '0'"
+          :is-distinguish-criteria="false"
+          :system-level="0"
+        ></EmailList>
       </el-tab-pane>
       <!-- 标准相关 -->
       <el-tab-pane
         :label="$t('trials:emailManageCfg:title:criterions')"
         name="1"
       >
-        <EmailList v-if="activeTab === '1'" :is-distinguish-criteria="true"></EmailList>
+        <EmailList
+          v-if="activeTab === '1'"
+          :is-distinguish-criteria="true"
+          :system-level="0"
+        ></EmailList>
+      </el-tab-pane>
+      <!-- 系统相关 -->
+      <el-tab-pane :label="$t('trials:emailManageCfg:title:system')" name="2">
+        <EmailList
+          v-if="activeTab === '2'"
+          :is-distinguish-criteria="false"
+          :system-level="1"
+        ></EmailList>
+      </el-tab-pane>
+      <!-- 系统相关-分角色 -->
+      <el-tab-pane :label="$t('trials:emailManageCfg:title:systemDisRole')" name="3">
+        <EmailList
+          v-if="activeTab === '3'"
+          :is-distinguish-criteria="false"
+          :system-level="2"
+        ></EmailList>
       </el-tab-pane>
     </el-tabs>
   </box-content>
 </template>
 <script>
-import { getEmailNoticeConfigList, deleteEmailNoticeConfig } from '@/api/dictionary'
-import BoxContent from '@/components/BoxContent'
-import Pagination from '@/components/Pagination'
-import EmailList from './components/EmailList'
+import {
+  getEmailNoticeConfigList,
+  deleteEmailNoticeConfig,
+} from "@/api/dictionary";
+import BoxContent from "@/components/BoxContent";
+import Pagination from "@/components/Pagination";
+import EmailList from "./components/EmailList";
 const searchDataDefault = () => {
   return {
-    IsReturnRequired: '',
-    IsUrgent: '',
-    IsEnable: '',
+    IsReturnRequired: "",
+    IsUrgent: "",
+    IsEnable: "",
     PageIndex: 1,
-    PageSize: 20
-  }
-}
+    PageSize: 20,
+  };
+};
 export default {
-  name: 'EmailListIndex',
+  name: "EmailListIndex",
   components: { BoxContent, Pagination, EmailList },
   data() {
     return {
-      activeTab: '0',
+      activeTab: "0",
       searchData: searchDataDefault(),
       loading: false,
       list: [],
       total: 0,
       rowData: {},
-      title: '',
+      title: "",
       editVisible: false,
-      attachmentVisible: false
-    }
+      attachmentVisible: false,
+    };
   },
   mounted() {
-    this.getList()
+    this.getList();
   },
   methods: {
     // 获取受试者列表
     getList() {
-      this.loading = true
-      getEmailNoticeConfigList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.loading = false })
+      this.loading = true;
+      getEmailNoticeConfigList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 新增
     handleAdd() {
-      this.rowData = {}
-      this.title = '新增'
-      this.editVisible = true
+      this.rowData = {};
+      this.title = "新增";
+      this.editVisible = true;
     },
     // 编辑
     handleEdit(row) {
-      this.rowData = { ...row }
-      this.title = '编辑'
-      this.editVisible = true
+      this.rowData = { ...row };
+      this.title = "编辑";
+      this.editVisible = true;
     },
     // 删除
     handleDelete(row) {
-      this.$confirm(this.$t('trials:staffResearch:message:confirmDel'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          deleteEmailNoticeConfig(row.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.getList()
-                this.$message.success('删除成功!')
-              }
-            })
-        })
+      this.$confirm(this.$t("trials:staffResearch:message:confirmDel"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        deleteEmailNoticeConfig(row.Id).then((res) => {
+          if (res.IsSuccess) {
+            this.getList();
+            this.$message.success("删除成功!");
+          }
+        });
+      });
     },
     handleDetail(row) {
-      this.rowData = { ...row }
-      this.attachmentVisible = true
+      this.rowData = { ...row };
+      this.attachmentVisible = true;
     },
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.PageIndex = 1;
+      this.getList();
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
     },
     // 关闭新增、编辑框
     closeDialog() {
-      this.editVisible = false
-    }
-  }
-}
+      this.editVisible = false;
+    },
+  },
+};
 </script>

src/views/feedBack/index.vue

@@ -0,0 +1,507 @@
+<template>
+  <div class="role">
+    <div ref="leftContainer" class="left">
+      <el-form :inline="true">
+        <!--项目编号/实验名称-->
+        <el-form-item :label="$t('feedBack:search:trials')" v-if="level > 8">
+          <el-input
+            v-model="searchData.TrialKeyInfo"
+            clearable
+            style="width: 150px"
+          ></el-input>
+        </el-form-item>
+        <!--中心-->
+        <el-form-item :label="$t('feedBack:search:site')" v-if="level > 7">
+          <el-input
+            v-model="searchData.TrialSiteCode"
+            clearable
+            style="width: 150px"
+          ></el-input>
+        </el-form-item>
+        <!--受试者访视-->
+        <el-form-item
+          :label="$t('feedBack:search:subjectVisit')"
+          v-if="level > 7"
+        >
+          <el-input
+            v-model="searchData.SubejctAndVisitKeyInfo"
+            clearable
+            style="width: 150px"
+          ></el-input>
+        </el-form-item>
+        <!--角色-->
+        <el-form-item :label="$t('feedBack:search:role')" v-if="level > 7">
+          <el-select
+            v-model="searchData.UserTypeEnum"
+            clearable
+            style="width: 150px"
+            popper-class="feedBack-select-box"
+          >
+            <el-option
+              v-for="item of UserTypeOptins"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <!--反馈人-->
+        <el-form-item :label="$t('feedBack:search:user')" v-if="level > 7">
+          <el-input
+            v-model="searchData.FeedBackUserKeyInfo"
+            clearable
+            style="width: 150px"
+          ></el-input>
+        </el-form-item>
+        <!--问题类型-->
+        <el-form-item :label="$t('feedBack:search:questionType')">
+          <el-select
+            v-model="searchData.QuestionType"
+            clearable
+            style="width: 150px"
+            popper-class="feedBack-select-box"
+          >
+            <el-option
+              v-for="item of QuestionTypeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <!--问题描述-->
+        <el-form-item :label="$t('feedBack:search:description')">
+          <el-input
+            v-model="searchData.QuestionDescription"
+            clearable
+            style="width: 150px"
+          ></el-input>
+        </el-form-item>
+        <!--状态-->
+        <el-form-item :label="$t('feedBack:search:status')" v-if="level > 7">
+          <el-select
+            v-model="searchData.State"
+            clearable
+            style="width: 150px"
+            popper-class="feedBack-select-box"
+          >
+            <el-option
+              v-for="item of $d.FeedBackStatus"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <!--反馈日期-->
+        <el-form-item :label="$t('feedBack:search:time')">
+          <el-date-picker
+            v-model="datetimerange"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            :start-placeholder="$t('feedBack:search:beginTime')"
+            :end-placeholder="$t('feedBack:search:endTime')"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            @change="handleDatetimeChange"
+            style="width: 250px"
+            popper-class="feedBack-select-box"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="getList"
+          >
+            {{ $t("common:button:search") }}
+          </el-button>
+          <!-- 重置 -->
+          <el-button
+            size="mini"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t("common:button:reset") }}
+          </el-button>
+          <!-- <el-button
+            type="primary"
+            size="mini"
+            @click="report"
+            v-if="level > 7"
+          >
+            {{ $t("common:button:export") }}
+          </el-button> -->
+        </el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          @click="resolve"
+          style="float: right"
+          v-if="level > 7"
+          :disabled="tableSelectData.length <= 0"
+        >
+          {{ $t("feedBack:button:resolve") }}
+        </el-button>
+      </el-form>
+      <el-table
+        v-loading="loading"
+        v-adaptive="{ bottomOffset: 45 }"
+        height="100"
+        :data="list"
+        class="table"
+        @selection-change="handleSelectChange"
+        @sort-change="handleSortByColumn"
+        :default-sort="{ prop: 'CreateTime', order: 'descending' }"
+      >
+        <el-table-column
+          type="selection"
+          align="center"
+          width="45"
+          v-if="level > 7"
+          :selectable="handleSelectTable"
+        />
+        <el-table-column type="index" width="50" />
+        <el-table-column
+          :label="$t('feedBack:form:trialCode')"
+          prop="TrialCode"
+          min-width="100"
+          show-overflow-tooltip
+          sortable="custom"
+          v-if="level > 8"
+        />
+        <el-table-column
+          :label="$t('feedBack:form:study')"
+          prop="ExperimentName"
+          min-width="140"
+          show-overflow-tooltip
+          sortable="custom"
+          v-if="level > 8"
+        />
+        <el-table-column
+          :label="$t('feedBack:form:siteCode')"
+          prop="TrialSiteCode"
+          min-width="100"
+          show-overflow-tooltip
+          sortable="custom"
+          v-if="level > 7"
+        />
+        <el-table-column
+          :label="$t('feedBack:form:SubjectCode')"
+          prop="SubjectCode"
+          min-width="120"
+          show-overflow-tooltip
+          sortable="custom"
+          v-if="level > 7"
+        />
+        <el-table-column
+          :label="$t('feedBack:form:subjectVisit')"
+          prop="SubjectVisitName"
+          min-width="120"
+          show-overflow-tooltip
+          sortable="custom"
+          v-if="level > 7"
+        />
+        <el-table-column
+          :label="$t('feedBack:form:role')"
+          prop="FeedBackUserName"
+          min-width="80"
+          show-overflow-tooltip
+          sortable="custom"
+          v-if="level > 7"
+        />
+        <el-table-column
+          :label="$t('feedBack:form:user')"
+          prop="FeedBackFullName"
+          min-width="140"
+          show-overflow-tooltip
+          sortable="custom"
+          v-if="level > 7"
+        />
+        <el-table-column
+          :label="$t('feedBack:form:questionType')"
+          prop="QuestionType"
+          min-width="180"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              QuestionTypeOptions.filter(
+                (item) => item.value === scope.row.QuestionType
+              )[0].label
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('feedBack:form:description')"
+          prop="QuestionDescription"
+          min-width="200"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <el-table-column
+          :label="$t('feedBack:form:time')"
+          prop="CreateTime"
+          min-width="180"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <el-table-column
+          :label="$t('feedBack:form:status')"
+          prop="State"
+          min-width="120"
+          show-overflow-tooltip
+          sortable="custom"
+          v-if="level > 7"
+        >
+          <template slot-scope="scope">
+            <el-tag :type="['danger', 'success'][scope.row.State]">{{
+              $fd("FeedBackStatus", scope.row.State)
+            }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('feedBack:form:uploadTime')"
+          prop="UpdateTime"
+          min-width="180"
+          show-overflow-tooltip
+          sortable="custom"
+          v-if="level > 7"
+        />
+        <el-table-column
+          :label="$t('common:action:action')"
+          fixed="right"
+          prop="UserTypeShortName"
+          width="80"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" @click="getDetail(scope.row)">
+              {{ $t("common:button:view") }}
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination" style="text-align: right; margin-top: 5px">
+        <pagination
+          :total="total"
+          :page.sync="searchData.PageIndex"
+          :limit.sync="searchData.PageSize"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import Pagination from "@/components/Pagination";
+import { batchUpdateFeedBackState, getUserFeedBackList } from "@/api/trials.js";
+const searchDataDefault = () => {
+  return {
+    TrialKeyInfo: null,
+    SubejctAndVisitKeyInfo: null,
+    UserTypeEnum: null,
+    FeedBackUserKeyInfo: null,
+    QuestionDescription: null,
+    QuestionType: null,
+    State: null,
+    TrialSiteCode: null,
+    BeginCreatime: null,
+    EndCreatime: null,
+    PageIndex: 1,
+    PageSize: 20,
+    Asc: false,
+    SortField: "CreateTime",
+  };
+};
+export default {
+  components: { Pagination },
+  props: {
+    trialId: {
+      type: String,
+      default: "",
+    },
+  },
+  dicts: [
+    "NoticeApplicableTrial",
+    "NoteLevel",
+    "NoteType",
+    "NoticeState",
+    "NoticeMode",
+  ],
+  data() {
+    return {
+      list: [],
+      total: 0,
+      loading: false,
+      datetimerange: [],
+      // 查询参数
+      searchData: searchDataDefault(),
+      tableSelectData: [],
+      UserTypeOptins: [
+        { label: "CRC", value: 2 },
+        { label: "IR", value: 13 },
+      ],
+    };
+  },
+  computed: {
+    level() {
+      if (this.hasPermi(["role:dev", "role:admin"])) {
+        return 9;
+      }
+      if (this.hasPermi(["role:pm"])) {
+        return 8;
+      }
+      if (this.hasPermi(["role:ir", "role:crc"])) {
+        return 7;
+      }
+      return 0;
+    },
+    QuestionTypeOptions() {
+      if (this.level > 7) {
+        return [
+          ...this.$d.FeedBackTypeToCRC.filter((item) => item.value > 0),
+          ...this.$d.FeedBackTypeToIR,
+        ];
+      }
+      if (this.hasPermi(["role:ir"])) {
+        return this.$d.FeedBackTypeToIR;
+      }
+      if (this.hasPermi(["role:crc"])) {
+        return this.$d.FeedBackTypeToCRC;
+      }
+      return [];
+    },
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 通过提交状态决定该行的 CheckBox 是否可以勾选
+    handleSelectTable(row) {
+      return row.State < 1;
+    },
+    async getList() {
+      try {
+        if (this.trialId) {
+          this.searchData.TrialId = this.trialId;
+        }
+        this.loading = true;
+        let res = await getUserFeedBackList(this.searchData);
+        this.loading = false;
+        if (res.IsSuccess) {
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        }
+      } catch (err) {
+        this.loading = false;
+        console.log(err);
+      }
+    },
+    handleDatetimeChange(val) {
+      if (val) {
+        this.searchData.BeginCreatime = val[0];
+        this.searchData.EndCreatime = val[1];
+      } else {
+        this.searchData.BeginCreatime = "";
+        this.searchData.EndCreatime = "";
+      }
+    },
+    // 重置列表查询
+    handleReset() {
+      this.datetimerange = null;
+      this.handleDatetimeChange();
+      this.searchData = searchDataDefault();
+      this.getList();
+    },
+    // 设为解决
+    async resolve() {
+      try {
+        let confirm = await this.$confirm(this.$t("feedBack:resolve:tip"), {
+          type: "warning",
+          distinguishCancelAndClose: true,
+        });
+        if (!confirm) return;
+        let data = {
+          IdList: this.tableSelectData.map((item) => item.Id),
+          state: 1,
+        };
+        let res = await batchUpdateFeedBackState(data);
+        if (res.IsSuccess) {
+          this.$message.success(this.$t("feedBack:resolve:success"));
+          this.getList();
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    // 导出
+    report() {},
+    // 表格选择
+    handleSelectChange(selection) {
+      // console.log(selection, "handleSelectChange");
+      this.tableSelectData = selection;
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
+      } else {
+        this.searchData.Asc = false;
+      }
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+    // 获取详情
+    getDetail(row) {
+      this.$FB({
+        type: "detail",
+        Id: row.Id,
+        callBack: () => {
+          this.getList();
+          this.$emit("success");
+        },
+      });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.role {
+  height: 100%;
+  box-sizing: border-box;
+  display: flex;
+  padding: 10px;
+  border-radius: 5px;
+  .left {
+    display: flex;
+    flex-direction: column;
+    width: 0;
+    flex-grow: 4;
+    // border-right: 1px solid #ccc;
+    .filter-container {
+      display: flex;
+      align-items: center;
+      margin: 5px;
+    }
+    .data-table {
+      flex: 1;
+      padding: 5px 0px;
+    }
+    .pagination-container {
+      text-align: right;
+    }
+  }
+  .right {
+    width: 0;
+    flex-grow: 6;
+    overflow-y: auto;
+    border-right: 1px solid #ccc;
+  }
+  .selected-row {
+    background-color: cadetblue;
+  }
+}
+</style>

src/views/login/index.vue

@@ -18,15 +18,11 @@
         <div
           :class="{
             'login-image': true,
-            'login-image-usa': NODE_ENV === 'usa',
+            'login-image-usa': true,
           }"
         >
-          <svg-icon
-            icon-class="login-bg"
-            style="width: 450px; height: 450px"
-            v-if="NODE_ENV === 'usa'"
-          />
-          <img src="@/assets/login-bg.png" v-else />
+          <svg-icon icon-class="login-bg" style="width: 90%; height: 90%" />
+          <!-- <img src="@/assets/login-bg.png" v-else /> -->
         </div>
       </div>
       <div class="login-r">
@@ -119,7 +115,12 @@
             {{ $t("login:button:login") }}
           </el-button>
           <div style="text-align: right">
-            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
+            <TopLang
+              v-if="
+                VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' &&
+                NODE_ENV !== 'usa'
+              "
+            />
             <!-- Forget password? -->
             <el-button
               type="text"
@@ -213,8 +214,6 @@ import TopLang from "./topLang";
 import Vcode from "vue-puzzle-vcode";
 import browserTip from "@/views/dictionary/template/browser/tip.vue";
 import Img1 from "@/assets/pic-2.png";
-import loginBg from "@/assets/icons/svg/login-bg.svg";
-import loginLogo from "@/assets/icons/svg/login-logo.svg";
 export default {
   name: "Login",
   components: { TopLang, Vcode, browserTip },
@@ -258,13 +257,22 @@ export default {
       isShow: false,
       showCode: false,
       Img1,
-      loginBg,
-      loginLogo,
     };
   },
   computed: {
     ...mapGetters(["asyncRoutes", "routes", "language"]),
   },
+  watch: {
+    "$i18n.locale": {
+      handler() {
+        if (this.$refs.browserTip) {
+          this.$refs.browserTip.open();
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
   mounted() {
     this.loginType = this.$route.query.loginType;
     this.location = this.$route.query.location;
@@ -275,7 +283,7 @@ export default {
       this.setLanguage("en");
       this.$updateDictionary();
     } else {
-      if (this.location === "USA") {
+      if (this.location === "USA" || this.NODE_ENV === "usa") {
         this.$i18n.locale = "en";
         this.setLanguage("en");
         this.$updateDictionary();
@@ -410,7 +418,7 @@ export default {
 /* 修复input 背景不协调 和光标变色 */
 
 $bg: #283443;
-$light_gray: #606266;
+$light_gray: #909399;
 $cursor: #fff;
 
 // @supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
@@ -517,7 +525,7 @@ $light_gray: #606266;
         width: 100%;
         display: flex;
         align-items: center;
-        justify-content: center;
+        justify-content: flex-end;
       }
     }
     .login-r {
@@ -540,7 +548,7 @@ $light_gray: #606266;
       .title-container {
         // margin-bottom: 50px;
         text-align: center;
-        margin-top: 18%;
+        margin-top: 20%;
         .title {
           font-size: 35px;
           color: $light_gray;

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

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

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

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

src/views/research/components/ResearchForm.vue

@@ -6,7 +6,7 @@
         {{ $t('trials:researchForm:title:question') }}
       </h2>
       <div style="display: flex;justify-content: space-between;">
-        <div>调研表状态：<el-tag>{{ $fd('ResearchRecord', state) }}</el-tag></div>
+        <div>{{ $t('trials:researchForm:title:state') }}<el-tag>{{ $fd('ResearchRecord', state) }}</el-tag></div>
 
       </div>
     </div>
@@ -26,7 +26,7 @@
         <h4>{{ $t('trials:staffResearch:title:newStaff') }}</h4>
         <ParticipantList ref="researchParticipants" :is-history="true" @refreshPage="refreshPage" @getList="initPage" />
       </el-card>
-
+ 
       <!-- 设备调研 -->
       <el-card shadow="hover" class="mt10">
         <h4>{{ $t('trials:equiptResearch:title:equiptResearch') }}</h4>
@@ -35,9 +35,12 @@
 
       <!-- 其他信息调研 -->
       <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>
           <!-- 请确保对每位受试者的扫描参数在整个研究过程中保持一致。 -->
@@ -148,7 +151,8 @@ export default {
       rejectForm: { reason: '' },
       btnLoading: false,
       isFullscreen: false,
-      historyVisible: false
+      historyVisible: false,
+      siteSurveyNoteInfo: null
     }
   },
   mounted() {
@@ -165,6 +169,9 @@ 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')
+          }
           var historicalArr = []
           var newArr = []
           res.Result.TrialSiteUserSurveyList.map(i => {
@@ -176,11 +183,11 @@ export default {
           })
           this.state = res.Result.TrialSiteSurvey.State
           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)
           this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
           this.$refs['researchParticipants'].initList(newArr, res.Result.TrialSiteSurvey)
           // this.$refs['researchParticipants'].initList(res.Result.TrialSiteUserSurveyList, 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

src/views/research/form.vue

@@ -5,7 +5,7 @@
         <!-- 中心调研表 -->
         {{ $t('trials:researchForm:title:question') }}
       </h2>
-      <TopLang style="position: fixed;top: 40px;right: 40px" />
+      <!-- <TopLang style="position: fixed;top: 40px;right: 40px" /> -->
       <div style="display: flex;justify-content: space-between;">
         <div>{{ $t('trials:researchForm:title:researchSurveyStatus') }} <el-tag>{{ $fd('ResearchRecord', state) }}</el-tag></div>
         <div>

src/views/research/login.vue

@@ -4,7 +4,7 @@
       <h2 style="text-align:center;">
         <!-- 中心调研表 -->
         {{ $t('trials:researchForm:title:question') }}
-        <TopLang style="position: fixed;top: 40px;right: 40px" />
+        <!-- <TopLang style="position: fixed;top: 40px;right: 40px" /> -->
       </h2>
       <el-card shadow="hover">
         <el-form

src/views/resumeInfo/components/StatusInfo.vue

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

src/views/resumeInfo/index.vue

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

src/views/reviewers/components/Agreements.vue

@@ -5,7 +5,7 @@
       <div class="upload-content">
         <upload-files ref="uploadAgreement" :disabled="$route.query.ReviewStatus === '1'" :doctor-id="doctorId" type="Consultant Agreement" accept=".pdf" @getFileList="getFileList" />
       </div>
-      <p>{{ $t('system:Agreements:tap:must') }}</p>
+      <p>{{ $t('system:tip:file:pdf') }}</p>
     </div>
     <div v-if="!$route.query.ReviewStatus">
       <el-table :data="agreementList" size="small">

src/views/reviewers/components/GcpCertificate.vue

@@ -20,7 +20,7 @@
         accept=".pdf"
       >
         <el-button size="small" type="primary" :loading="btnDisabled">{{ $t('system:GcpCertificate:upload:Upload') }}</el-button>
-        <span slot="tip" style="margin-left:10px;" class="el-upload__tip">{{ $t('system:GcpCertificate:tap:must') }}</span>
+        <span slot="tip" style="margin-left:10px;" class="el-upload__tip">{{ $t('system:tip:file:pdf') }}</span>
       </el-upload>
     </div>
     <div>
@@ -76,7 +76,7 @@ export default {
   methods: {
     handleSaveGCP() {
       if (this.GCP && this.GCPID === '') {
-        this.$message.info('Please upload the GCP certificate')
+        this.$message.info(this.$t('reviewers:GCPCertificate:message:uploadValid'))
         return
       }
 
@@ -91,7 +91,7 @@ export default {
           this.fileList = []
         }
         this.saveBtnLoading = false
-        this.$message.success('Saved successfully')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
       }).catch(() => {
         this.saveBtnLoading = false
       })
@@ -153,7 +153,7 @@ export default {
         if (res.IsSuccess) {
           this.fileList[0].id = res.Result[0].Id
           this.GCPID = res.Result[0].Id
-          this.$message.success('Uploaded successfully')
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
         }
       })
         .catch(() => {
@@ -165,7 +165,7 @@ export default {
       if (isValidFile) {
         this.fileList = []
       } else {
-        this.$alert('must be in pdf format')
+        this.$alert(this.$t('trials:attachment:message:pdf'))
         return false
       }
     },

src/views/reviewers/components/Resumes.vue

@@ -19,7 +19,7 @@
         </div>
       </div>
 
-      <p>{{ $t('system:GcpCertificate:tap:must') }}</p>
+      <p>{{ $t('system:tip:file:docx') }}</p>
     </div>
     <div class="resumeTbl">
       <el-table :data="resumeListEN" size="small">
@@ -78,7 +78,7 @@
           </el-upload>
         </div>
       </div>
-      <p>{{ $t('system:GcpCertificate:tap:must') }}</p>
+      <p>{{ $t('system:tip:file:docx') }}</p>
     </div>
     <div class="resumeTbl">
       <el-table :data="resumeListCN" size="small">

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

@@ -38,6 +38,34 @@
             style="width: 120px"
           />
         </el-form-item>
+        <el-form-item
+          :label="$t('system:loginLog:table:LoginUserName')"
+          prop="LoginFaildName"
+        >
+          <el-input
+            v-model="searchData.LoginUserName"
+            size="small"
+            clearable
+            style="width: 120px"
+          />
+        </el-form-item>
+        <el-form-item
+          :label=" $t('system:loginLog:table:LoginUserType')"
+          prop="LoginUserTypeEnum"
+        >
+          <el-select
+            v-model="searchData.LoginUserTypeEnum"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of $d.UserType"
+              :key="'UserType' + item.label"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item :label="$t('system:loginLog:label:CreateTime')">
           <el-date-picker
             v-model="datetimerange"
@@ -45,17 +73,24 @@
             value-format="yyyy-MM-dd HH:mm:ss"
             :default-time="['00:00:00', '23:59:59']"
             @change="handleDatetimeChange"
+            style="width: 380px"
           />
         </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
             icon="el-icon-search"
-            size="mini"
             @click="getList"
           >
             {{ $t("common:button:search") }}
           </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t("common:button:reset") }}
+          </el-button>
         </el-form-item>
       </el-form>
       <el-table
@@ -163,6 +198,8 @@ const searchDataDefault = () => {
     OptType: null,
     Ip: "",
     LoginFaildName: "",
+    LoginUserName: '',
+    LoginUserTypeEnum: null,
     BeginDate: "",
     EndDate: "",
     Asc: false,
@@ -210,6 +247,7 @@ export default {
     },
     // 重置列表查询
     handleReset() {
+      this.datetimerange = []
       this.searchData = searchDataDefault();
       this.getList();
     },

src/views/system/user/components/UserInfo.vue

@@ -25,12 +25,12 @@
       <el-form-item :label="$t('system:userlist:table:FirstName')" prop="FirstName">
         <el-input v-model="user.FirstName" />
       </el-form-item>
-      <el-form-item :label="$t('system:userlist:table:Gender')" prop="Sex" style="margin-right:40px;">
+      <!-- <el-form-item :label="$t('system:userlist:table: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> -->
       <el-form-item :label="$t('system:userlist:table:Email')" prop="EMail">
         <el-input v-model="user.EMail" />
       </el-form-item>

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

@@ -100,15 +100,15 @@ export default {
           sortable: 'custom',
           showOverflowTooltip: true
         },
-        {
-          prop: 'Sex',
-          label: this.$t('system:userlist:table:Gender'),
-          hidden: true,
-          slot: 'genderSlot',
-          minWidth: 100,
-          sortable: 'custom',
-          showOverflowTooltip: true
-        },
+        // {
+        //   prop: 'Sex',
+        //   label: this.$t('system:userlist:table:Gender'),
+        //   hidden: true,
+        //   slot: 'genderSlot',
+        //   minWidth: 100,
+        //   sortable: 'custom',
+        //   showOverflowTooltip: true
+        // },
         {
           prop: 'Phone',
           label: this.$t('system:userlist:table:Phone'),

src/views/test/videos/index.vue

@@ -1,139 +0,0 @@
-<template>
-  <div>
-    <el-button plain @click="open">上传视频文件</el-button>
-    <el-button plain @click="$refs.file.click()">选择dicom文件</el-button>
-    <input
-      ref="file"
-      type="file"
-      name="file"
-      webkitdirectory
-      multiple
-      @change="beginScanFiles($event)"
-    />
-    <div>
-      <canvas id="img"></canvas>
-    </div>
-    <el-dialog title="上传视频" :close-on-click-modal="false" :visible.sync="IsOpen" width="450px" append-to-body>
-      <my-videos @uploadOver="uploadOver" />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import MyVideos from '@/components/videos'
-import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
-// import charLS from '@cornerstonejs/codec-charls';
-import * as cornerstone from 'cornerstone-core'
-import dicomParser from "dicom-parser";
-import { Anonymizer } from "dicomedit";
-console.log(Anonymizer)
-const script = `version "6.3"
-temp := "chany"
-(0008,0008) := "test"
-(0010,0010) := temp
-`;
-
-const CharLs = require('@cornerstonejs/codec-charls')
-const codecWrapper = {
-  codec: undefined,
-  Decoder: undefined,
-  Encoder: undefined,
-  encoderName: "JpegLSEncoder",
-  decoderName: "JpegLSDecoder",
-};
-function setCodec(codecConfig, encoderName, decoderName, codec = {}) {
-  codecConfig.Encoder = codec[encoderName];
-  codecConfig.Decoder = codec[decoderName];
-  codecConfig.codec = codec;
-}
-CharLs().then(res => {
-  setCodec(codecWrapper, codecWrapper.encoderName, codecWrapper.decoderName, res);
-})
-export default {
-  components: { MyVideos },
-  data() {
-    return {
-      IsOpen: false,
-      videoUrl: null,
-      videoName: null
-    }
-  },
-  methods: {
-    async upload(name, file) {
-      let res = await this.OSSclient.put(name, file)
-      return res
-    },
-    beginScanFiles(e) {
-      var files = e.target.files
-      console.log(e.target.files)
-      if (files.length > 0) {
-        files.forEach(async (item, index) => {
-          const reader = new FileReader();
-          reader.onload = async (event) => {
-            let buffer = event.target.result;
-            const anonymizer = new Anonymizer(script, { test: 'hello' });
-            anonymizer.loadDcm(new Uint8Array(buffer))
-            await anonymizer.applyRules();
-            let buffer1 = anonymizer.write()
-            let data1 = dicomParser.parseDicom(new Uint8Array(buffer1))
-            let data = dicomParser.parseDicom(new Uint8Array(buffer))
-            // 传输语法 0002 0010
-            // if(1.2.840.10008.1.2.1) 才压缩 => 1.2.840.10008.1.2.4.80
-            let height = data.uint16('x00280011')
-            let width = data.uint16('x00280010')
-            let bitsPerSample = data.uint16('x00280100')
-            let componentCount = data.string('x00280004')
-            let transportSyntax = data.string('x00020010')
-            // let pixel = data.byteArrayParser.readUint16('x7fe0x0010')
-            let pixelDataElement = data.elements.x7fe00010;
-            let pixelDataOffset = pixelDataElement.dataOffset;
-            let pixelDataLength = pixelDataElement.length;
-            let pixelDataBytes = data.byteArray.subarray(pixelDataOffset, pixelDataOffset + pixelDataLength)
-            if (transportSyntax === '1.2.840.10008.1.2.1' && ~componentCount.indexOf('MONOCHROME')) {
-              let encoder = new codecWrapper.Encoder();
-              let decodedBytes = encoder.getDecodedBuffer({width: width, height: height, bitsPerSample: bitsPerSample, componentCount: 1})
-              encoder.setNearLossless(0);
-              // 像素数据 7fe0 0010
-              decodedBytes.set(pixelDataBytes);
-              let startTime = performance.now()
-              encoder.encode()
-              let endTime = performance.now();
-              // dicom替换压缩像素 组装
-              let encodeDurationInSeconds = endTime - startTime
-              let encodedBytes = encoder.getEncodedBuffer();
-              data.elements['x00020010'].value = '1.2.840.10008.1.2.4.80'
-              console.log(data.elements['x7fe00010'].length)
-              data.elements['x7fe00010'].length = encodedBytes.length
-              console.log(data.elements['x7fe00010'].length)
-              let mateDataBytes = data.byteArray.subarray(0, pixelDataOffset)
-              let modifiedByteArray = new Uint8Array([...mateDataBytes, ...encodedBytes])
-              let newData = new dicomParser.ByteStream(data.byteArrayParser, modifiedByteArray, 0)
-              console.log(data)
-              console.log(newData)
-              console.log(dicomParser.parseDicom(new Uint8Array(newData.byteArray)))
-              await this.upload(`test/${index}`, newData)
-              encoder.delete();
-              return
-            }
-          };
-          reader.readAsArrayBuffer(item);
-        })
-      }
-    },
-    open() {
-      this.IsOpen = true
-    },
-    uploadOver(isSuccess, res) {
-      if (isSuccess) {
-        this.IsOpen = false
-        this.videoUrl = res.url
-        this.videoName = res.name
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/test/videos/index2.vue

@@ -1,98 +0,0 @@
-<template>
-  <div>
-    <el-button plain @click="$refs.file.click()">选择dicom文件</el-button>
-    <input
-      ref="file"
-      type="file"
-      name="file"
-      webkitdirectory
-      multiple
-      @change="beginScanFiles($event)"
-    />
-  </div>
-</template>
-
-<script>
-import dicomParser from "dicom-parser";
-import dcmjs from 'dcmjs'
-const CharLs = require('@cornerstonejs/codec-charls')
-const codecWrapper = {
-  codec: undefined,
-  Decoder: undefined,
-  Encoder: undefined,
-  encoderName: "JpegLSEncoder",
-  decoderName: "JpegLSDecoder",
-};
-function setCodec(codecConfig, encoderName, decoderName, codec = {}) {
-  codecConfig.Encoder = codec[encoderName];
-  codecConfig.Decoder = codec[decoderName];
-  codecConfig.codec = codec;
-}
-CharLs().then(res => {
-  setCodec(codecWrapper, codecWrapper.encoderName, codecWrapper.decoderName, res);
-})
-export default {
-  data() {
-    return {
-    }
-  },
-  methods: {
-    async upload(name, file) {
-      let res = await this.OSSclient.put(name, file)
-      return res
-    },
-    beginScanFiles(e) {
-      var files = e.target.files
-      if (files.length > 0) {
-        files.forEach(async (item, index) => {
-          const reader = new FileReader();
-          reader.onload = async (event) => {
-            let buffer = event.target.result;
-            let data = dicomParser.parseDicom(new Uint8Array(buffer))
-            let height = data.uint16('x00280011')
-            let width = data.uint16('x00280010')
-            let bitsPerSample = data.uint16('x00280100')
-            let componentCount = data.string('x00280004')
-            let transportSyntax = data.string('x00020010')
-            if ((transportSyntax === '1.2.840.10008.1.2.1' || transportSyntax === '1.2.840.10008.1.2') && ~componentCount.indexOf('MONOCHROME')) {
-              let dataset = dcmjs.data.DicomMessage.readFile(buffer)
-              console.log(new dcmjs.data.DicomMetaDictionary(dataset))
-              let pixelDataElement = data.elements.x7fe00010;
-              let pixelDataOffset = pixelDataElement.dataOffset;
-              let pixelDataLength = pixelDataElement.length;
-              let pixelDataBytes = data.byteArray.subarray(pixelDataOffset, pixelDataOffset + pixelDataLength)
-              let encoder = new codecWrapper.Encoder();
-              let decodedBytes = encoder.getDecodedBuffer({width: width, height: height, bitsPerSample: bitsPerSample, componentCount: 1})
-              encoder.setNearLossless(0);
-              decodedBytes.set(pixelDataBytes);
-              encoder.encode()
-              let encodedBytes = encoder.getEncodedBuffer();
-              dataset.dict['7FE00010'].Value[0] = encodedBytes.buffer;
-              dataset.meta['00020010'].Value[0] = '1.2.840.10008.1.2.4.80';
-              let newDicomFile = dataset.write();
-              const bufferArray = new Uint8Array(newDicomFile);
-              const blob = new Blob([bufferArray], { type: 'application/octet-stream' });
-              await this.upload(`test/${index}.dcm`, blob)
-            }
-          };
-          reader.readAsArrayBuffer(item);
-        })
-      }
-    },
-    open() {
-      this.IsOpen = true
-    },
-    uploadOver(isSuccess, res) {
-      if (isSuccess) {
-        this.IsOpen = false
-        this.videoUrl = res.url
-        this.videoName = res.name
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

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

@@ -0,0 +1,153 @@
+<template>
+  <div
+    :class="{
+      feedBack: true,
+      'feedBack-in': show,
+      'feedBack-out': show === false,
+    }"
+    @click.stop="open"
+    v-if="isShow"
+  >
+    <i class="el-icon-chat-dot-square icon"></i>
+    <transition name="fade">
+      <div class="checkBox" v-show="visible" @click.stop="() => false">
+        <span @click.stop="openFeedBack">{{
+          $t("triials:feedBack:botton:opinion")
+        }}</span>
+        <span @click.stop="openFeedBackTable">{{
+          $t("triials:feedBack:botton:mine")
+        }}</span>
+      </div>
+    </transition>
+  </div>
+</template>
+<script>
+export default {
+  name: "feedBack",
+  data() {
+    return {
+      visible: false,
+      show: null,
+    };
+  },
+  mounted() {
+    document.getElementsByTagName("body")[0].addEventListener("click", () => {
+      this.visible = false;
+      if (this.show) {
+        this.show = false;
+      }
+    });
+  },
+  computed: {
+    isShow() {
+      if (this.hasPermi(["role:ir", "role:crc"])) {
+        return true;
+      }
+      return false;
+    },
+  },
+  methods: {
+    open() {
+      if (this.show) {
+        this.visible = !this.visible;
+      }
+      this.show = true;
+    },
+    // 打开意见反馈
+    openFeedBack() {
+      this.$FB({
+        type: "feedback",
+        trialId: this.$route.query.trialId,
+        SubjectVisitId: this.$store.state.trials.checkTaskId,
+      });
+    },
+    // 打开反馈列表
+    openFeedBackTable() {
+      this.$FBT();
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.feedBack {
+  position: fixed;
+  bottom: 50px;
+  right: -25px;
+  z-index: 3000;
+  width: 50px;
+  height: 50px;
+  background: rgba(64, 158, 255, 0.533);
+  line-height: 50px;
+  text-align: center;
+  color: rgb(255, 255, 255);
+  border-radius: 50%;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  .icon {
+    font-size: 30px;
+  }
+  .checkBox {
+    width: 100px;
+    border: 1px solid #ddd;
+    border-radius: 2px;
+    background-color: #fff;
+    color: #000;
+    position: absolute;
+    left: calc(-50% - 50px);
+    top: -58px;
+    span {
+      display: block;
+      width: 98px;
+      line-height: 24px;
+      font-size: 14px;
+      cursor: pointer;
+      &:first-child {
+        border-bottom: 1px solid #ddd;
+      }
+      &:hover {
+        color: #409eff;
+        background: #ecf5ff;
+      }
+    }
+  }
+}
+.fade-enter,
+.fade-leave-to {
+  opacity: 0;
+}
+.fade-enter-active,
+.fade-leave-active {
+  transition: 0.5s;
+}
+.fade-enter-to {
+  opacity: 1;
+}
+.feedBack-out {
+  animation-duration: 0.5s;
+  animation-name: btn-in-out;
+  animation-fill-mode: both;
+}
+.feedBack-in {
+  animation-duration: 0.5s;
+  animation-name: btn-out-in;
+  animation-fill-mode: both;
+}
+@keyframes btn-out-in {
+  0% {
+    right: -25px;
+  }
+  100% {
+    right: 25px;
+  }
+}
+@keyframes btn-in-out {
+  0% {
+    right: 25px;
+  }
+  100% {
+    right: -25px;
+  }
+}
+</style>

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

@@ -89,7 +89,7 @@
           }}</el-menu-item>
         </el-submenu>
       </el-menu>
-      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
+      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
     </div>
   </div>
 </template>
@@ -158,7 +158,7 @@ export default {
           this.logout();
           break;
         case "4-4":
-          this.go("/system");
+          this.go("/dashboard/list");
           break;
         case "1":
           this.go("/trials/trials-workbench");
@@ -277,6 +277,9 @@ export default {
       cursor: pointer;
     }
   }
+  .center-menu {
+    width: calc(100% - 1200px);
+  }
 }
 </style>
 <style>

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

@@ -6,12 +6,14 @@
       </div>
       <trialsMain />
     </div>
+    <!-- <feedBack /> -->
   </div>
 </template>
 
 <script>
 import trialsMain from './components/trialsMain'
 import trialsNavbar from './components/trialsNavbar'
+// import feedBack from "./components/feedBack";
 // import ResizeMixin from './mixin/ResizeHandler'
 
 export default {
@@ -19,9 +21,9 @@ export default {
   components: {
     trialsMain,
     trialsNavbar
+    // feedBack,
   }
   // mixins: [ResizeMixin]
-
 }
 </script>
 
@@ -34,13 +36,13 @@ export default {
   position: relative;
   height: 100%;
   width: 100%;
-  .trials-container{
+  .trials-container {
     padding: 10px;
     height: 100%;
-    /deep/ .el-tag{
+    /deep/ .el-tag {
       background-color: transparent;
     }
-    /deep/ .el-tag--danger{
+    /deep/ .el-tag--danger {
       color: #f56c6c;
     }
   }

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

@@ -5,17 +5,13 @@
       <el-form :inline="true">
         <!-- 项目编号 -->
         <el-form-item :label="$t('trials:trials-list:table:trialId')">
-          <el-input
-            v-model="searchData.Code"
-            style="width:100px;"
-            clearable
-          />
+          <el-input v-model="searchData.Code" style="width: 100px" clearable />
         </el-form-item>
         <!-- 研究方案号 -->
         <el-form-item :label="$t('trials:trials-list:table:researchNumber')">
           <el-input
             v-model="searchData.ResearchProgramNo"
-            style="width:100px;"
+            style="width: 100px"
             clearable
           />
         </el-form-item>
@@ -23,7 +19,7 @@
         <el-form-item :label="$t('trials:trials-list:table:experimentName')">
           <el-input
             v-model="searchData.ExperimentName"
-            style="width:100px;"
+            style="width: 100px"
             clearable
           />
         </el-form-item>
@@ -32,11 +28,11 @@
         <el-form-item :label="$t('trials:trials-list:table:sponsor')">
           <el-select
             v-model="searchData.SponsorId"
-            style="width:150px;"
+            style="width: 150px"
             clearable
           >
             <el-option
-              v-for="(item) in sponsorList"
+              v-for="item in sponsorList"
               :key="item.Id"
               :label="item.SponsorName"
               :value="item.Id"
@@ -44,14 +40,17 @@
           </el-select>
         </el-form-item>
         <!-- 阅片标准 -->
-        <el-form-item :label="$t('trials:trials-list:table:IR_ReadingCriterionList')" v-if="hasPermi(['role:ir'])">
+        <el-form-item
+          :label="$t('trials:trials-list:table:IR_ReadingCriterionList')"
+          v-if="hasPermi(['role:ir'])"
+        >
           <el-select
             v-model="searchData.CriterionType"
-            style="width:150px;"
+            style="width: 150px"
             clearable
           >
             <el-option
-              v-for="(item) in $d.CriterionType"
+              v-for="item in $d.CriterionType"
               :key="item.id"
               :label="item.label"
               :value="item.value"
@@ -59,10 +58,13 @@
           </el-select>
         </el-form-item>
         <!-- 联系人 -->
-        <el-form-item :label="$t('trials:trials-list:table:IR_PMEmailList')" v-if="hasPermi(['role:ir'])">
-           <el-input
+        <el-form-item
+          :label="$t('trials:trials-list:table:IR_PMEmailList')"
+          v-if="hasPermi(['role:ir'])"
+        >
+          <el-input
             v-model="searchData.PM_EMail"
-            style="width:100px;"
+            style="width: 100px"
             clearable
           />
         </el-form-item>
@@ -70,26 +72,29 @@
           <!-- <el-button type="text" @click="isShow = !isShow">More</el-button> -->
           <!-- Search -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t('common:button:search') }}
+            {{ $t("common:button:search") }}
           </el-button>
           <!-- Reset -->
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-            {{ $t('common:button:reset') }}
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t("common:button:reset") }}
           </el-button>
           <!-- Export -->
           <el-button
             v-hasPermi="['trials:trials-list:export']"
             type="primary"
             icon="el-icon-download"
-            :disabled="!(selectArr.length>0)"
+            :loading="exportLoading"
             @click="handleExportTrial"
           >
-            {{ $t('common:button:export') }}
+            {{ $t("common:button:export") }}
           </el-button>
-
         </el-form-item>
       </el-form>
-      <span style="margin-left:auto;">
+      <span style="margin-left: auto">
         <!-- New -->
         <el-button
           v-hasPermi="['trials:trials-list:new']"
@@ -97,24 +102,20 @@
           type="primary"
           @click="handleNew"
         >
-          {{ $t('common:button:new') }}
+          {{ $t("common:button:new") }}
         </el-button>
       </span>
     </template>
 
     <!-- 更多搜索条件 -->
-    <el-drawer
-      :visible.sync="isShow"
-      :with-header="false"
-      size="390px"
-    >
-      <div style="padding:10px;">
+    <el-drawer :visible.sync="isShow" :with-header="false" size="390px">
+      <div style="padding: 10px">
         <el-form label-width="140px">
           <el-form-item label="Trial ID">
             <el-input
               v-model="searchData.Code"
               placeholder="Trial ID"
-              style="width:100%;"
+              style="width: 100%"
               clearable
             />
           </el-form-item>
@@ -122,7 +123,7 @@
             <el-input
               v-model="searchData.Indication"
               placeholder="Indication"
-              style="width:100%;"
+              style="width: 100%"
               clearable
             />
           </el-form-item>
@@ -130,7 +131,7 @@
             <el-select
               v-model="searchData.CriterionIds"
               placeholder="Assessment Criteria"
-              style="width:100%;"
+              style="width: 100%"
               clearable
               multiple
             >
@@ -152,11 +153,11 @@
             <el-select
               v-model="searchData.SponsorId"
               placeholder="Sponsor"
-              style="width:100%;"
+              style="width: 100%"
               clearable
             >
               <el-option
-                v-for="(item) in sponsorList"
+                v-for="item in sponsorList"
                 :key="item.Id"
                 :label="item.SponsorName"
                 :value="item.Id"
@@ -164,9 +165,14 @@
             </el-select>
           </el-form-item>
           <el-form-item label="CRO">
-            <el-select v-model="searchData.CROId" placeholder="CRO" style="width:100%;" clearable>
+            <el-select
+              v-model="searchData.CROId"
+              placeholder="CRO"
+              style="width: 100%"
+              clearable
+            >
               <el-option
-                v-for="(item) of croList"
+                v-for="item of croList"
                 :key="item.Id"
                 :label="item.CROName"
                 :value="item.Id"
@@ -177,7 +183,7 @@
             <el-select
               v-model="searchData.Phase"
               placeholder="Phase"
-              style="width:100%;"
+              style="width: 100%"
               clearable
             >
               <el-option
@@ -193,7 +199,7 @@
             <el-select
               v-model="searchData.ReviewTypeIds"
               placeholder="ReviewType"
-              style="width:100%;"
+              style="width: 100%"
               clearable
               multiple
             >
@@ -216,7 +222,7 @@
               v-model="searchData.ModalityIds"
               multiple
               placeholder="Modality"
-              style="width:100%;"
+              style="width: 100%"
               clearable
             >
               <!-- <el-option
@@ -234,7 +240,12 @@
             </el-select>
           </el-form-item>
           <el-form-item label="Expedited: ">
-            <el-select v-model="searchData.Expedited" value-key="value" clearable style="width:100%;">
+            <el-select
+              v-model="searchData.Expedited"
+              value-key="value"
+              clearable
+              style="width: 100%"
+            >
               <el-option
                 v-for="item in expeditedOption"
                 :key="item.value"
@@ -251,7 +262,7 @@
               type="date"
               :picker-options="beginPickerOption"
               :clearable="false"
-              style="width:100%;"
+              style="width: 100%"
             />
           </el-form-item>
           <el-form-item label="EndDate: ">
@@ -262,7 +273,7 @@
               type="date"
               :picker-options="endpickerOption"
               :clearable="false"
-              style="width:100%;"
+              style="width: 100%"
             />
           </el-form-item>
 
@@ -270,16 +281,23 @@
             <el-select
               v-model="searchData.AttendedReviewerType"
               placeholder="Attended Reviewer Type"
-              style="width:100%;"
+              style="width: 100%"
               clearable
             >
-              <el-option v-for="item of $d.AttendedReviewerType" :key="item.value" :label="item.label" :value="item.value" />
+              <el-option
+                v-for="item of $d.AttendedReviewerType"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="handleSelectSearch">Search</el-button>
+            <el-button type="primary" @click="handleSelectSearch"
+              >Search</el-button
+            >
             <el-button type="primary" @click="handleReset">Reset</el-button>
-            <el-button type="primary" @click="isShow=false">Back</el-button>
+            <el-button type="primary" @click="isShow = false">Back</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -288,7 +306,7 @@
     <!-- 项目列表 -->
     <template slot="main-container">
       <el-table
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
         v-loading="listLoading"
         :data="list"
         stripe
@@ -336,10 +354,26 @@
           min-width="120"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.TrialStatusStr === 'Initializing'" type="info">{{ $fd('TrialStatusEnum', scope.row.TrialStatusStr) }}</el-tag>
-            <el-tag v-if="scope.row.TrialStatusStr === 'Ongoing'" type="primary">{{ $fd('TrialStatusEnum', scope.row.TrialStatusStr) }}</el-tag>
-            <el-tag v-if="scope.row.TrialStatusStr === 'Completed'" type="warning">{{ $fd('TrialStatusEnum', scope.row.TrialStatusStr) }}</el-tag>
-            <el-tag v-if="scope.row.TrialStatusStr === 'Stopped'" type="danger">{{ $fd('TrialStatusEnum', scope.row.TrialStatusStr) }}</el-tag>
+            <el-tag
+              v-if="scope.row.TrialStatusStr === 'Initializing'"
+              type="info"
+              >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
+            >
+            <el-tag
+              v-if="scope.row.TrialStatusStr === 'Ongoing'"
+              type="primary"
+              >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
+            >
+            <el-tag
+              v-if="scope.row.TrialStatusStr === 'Completed'"
+              type="warning"
+              >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
+            >
+            <el-tag
+              v-if="scope.row.TrialStatusStr === 'Stopped'"
+              type="danger"
+              >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
+            >
           </template>
         </el-table-column>
         <el-table-column
@@ -406,7 +440,7 @@
           min-width="160"
         >
           <template slot-scope="scope">
-            {{scope.row.IR_ReadingCriterionList.join(', ')}}
+            {{ scope.row.IR_ReadingCriterionList.join(", ") }}
           </template>
         </el-table-column>
         <el-table-column
@@ -441,7 +475,7 @@
           min-width="170"
         >
           <template slot-scope="scope">
-            {{scope.row.IR_PMEmailList.join(', ')}}
+            {{ scope.row.IR_PMEmailList.join(", ") }}
           </template>
         </el-table-column>
         <el-table-column
@@ -519,7 +553,9 @@
         <el-table-column
           v-if="hasPermi(['role:spm', 'role:cpm'])"
           prop="SPM_ReviewerSelectApprovalCount"
-          :label="$t('trials:trials-list:table:SPM_ReviewerSelectApprovalCount')"
+          :label="
+            $t('trials:trials-list:table:SPM_ReviewerSelectApprovalCount')
+          "
           show-overflow-tooltip
           sortable="custom"
           min-width="160"
@@ -543,7 +579,11 @@
               v-hasPermi="['trials:trials-list:panel']"
               circle
               icon="el-icon-info"
-              :disabled="(scope.row.TrialStatusStr === 'Initializing' && !hasPermi(['role:pm'])) || scope.row.IsDeleted"
+              :disabled="
+                (scope.row.TrialStatusStr === 'Initializing' &&
+                  !hasPermi(['role:pm'])) ||
+                scope.row.IsDeleted
+              "
               :title="$t('trials:trials-list:action:panel')"
               @click.stop="handleDetail(scope.row)"
             />
@@ -570,19 +610,22 @@
               v-hasPermi="['trials:trials-list:abolish']"
               circle
               icon="el-icon-delete"
-              :disabled="scope.row.IsDeleted || scope.row.TrialStatusStr !== 'Initializing'"
+              :disabled="
+                scope.row.IsDeleted ||
+                scope.row.TrialStatusStr !== 'Initializing'
+              "
               :title="$t('trials:trials-list:action:abolition')"
               @click.stop="handleAbandon(scope.row)"
             />
-<!--             代办详情-->
-<!--            <el-button-->
-<!--              v-hasPermi="['trials:trials-list:abolish']"-->
-<!--              circle-->
-<!--              icon="el-icon-receiving"-->
-<!--              :disabled="scope.row.TrialStatusStr === 'Initializing'"-->
-<!--              :title="$t('trials:trials-list:action:commission')"-->
-<!--              @click.stop="handleCommission(scope.row)"-->
-<!--            />-->
+            <!--             代办详情-->
+            <!--            <el-button-->
+            <!--              v-hasPermi="['trials:trials-list:abolish']"-->
+            <!--              circle-->
+            <!--              icon="el-icon-receiving"-->
+            <!--              :disabled="scope.row.TrialStatusStr === 'Initializing'"-->
+            <!--              :title="$t('trials:trials-list:action:commission')"-->
+            <!--              @click.stop="handleCommission(scope.row)"-->
+            <!--            />-->
           </template>
         </el-table-column>
       </el-table>
@@ -606,7 +649,11 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <TrialForm :trial-id="currentId" @getList="getList" @closeDialog="closeDialog" />
+      <TrialForm
+        :trial-id="currentId"
+        @getList="getList"
+        @closeDialog="closeDialog"
+      />
     </el-dialog>
 
     <!-- 修改项目状态 -->
@@ -619,7 +666,11 @@
       custom-class="base-dialog-wrapper"
       append-to-body
     >
-      <TrialStatusForm :data="currentRow" @closeDialog="closeStatusDialog" @getList="getList" />
+      <TrialStatusForm
+        :data="currentRow"
+        @closeDialog="closeStatusDialog"
+        @getList="getList"
+      />
     </el-dialog>
 
     <el-dialog
@@ -630,51 +681,66 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <DoneList :trial-id="currentId" @getList="getList" @closeDialog="doneDialogVisible = false" />
+      <DoneList
+        :trial-id="currentId"
+        @getList="getList"
+        @closeDialog="doneDialogVisible = false"
+      />
     </el-dialog>
   </BaseContainer>
 </template>
 <script>
-import { abandonTrial, ifTrialCanOngoing, getTrialToBeDoneList } from '@/api/trials'
-import store from '@/store'
-import { mapGetters } from 'vuex'
-import Excel from 'exceljs'
-import BaseContainer from '@/components/BaseContainer'
-import Pagination from '@/components/Pagination'
-import TrialForm from './components/TrialForm'
-import TrialStatusForm from './components/TrialStatusForm'
-import DoneList from './components/DoneList'
+import {
+  abandonTrial,
+  ifTrialCanOngoing,
+  getTrialToBeDoneList,
+} from "@/api/trials";
+import { getTrialList_Export } from "@/api/export";
+import store from "@/store";
+import { mapGetters } from "vuex";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
+import TrialForm from "./components/TrialForm";
+import TrialStatusForm from "./components/TrialStatusForm";
+import DoneList from "./components/DoneList";
 const searchDataDefault = () => {
   return {
-    Code: '',
+    Code: "",
     CriterionIds: [],
-    SponsorId: '',
+    SponsorId: "",
     ReviewTypeIds: [],
-    CROId: '',
-    Expedited: '',
-    Indication: '',
-    Phase: '',
+    CROId: "",
+    Expedited: "",
+    Indication: "",
+    Phase: "",
     ModalityIds: [],
-    BeginDate: '',
-    EndDate: '',
-    AttendedReviewerType: '',
-    ResearchProgramNo: '',
-    ExperimentName: '',
+    BeginDate: "",
+    EndDate: "",
+    AttendedReviewerType: "",
+    ResearchProgramNo: "",
+    ExperimentName: "",
     PageIndex: 1,
     PageSize: 20,
     Asc: false,
-    SortField: '',
-    CriterionType:null,
-    PM_EMail:null,
-  }
-}
+    SortField: "",
+    CriterionType: null,
+    PM_EMail: null,
+  };
+};
 export default {
-  name: 'Trials',
-  components: { Pagination, BaseContainer, TrialForm, TrialStatusForm, DoneList },
-  dicts: ['ReadingStandard', 'ReviewType', 'ReadingType'],
+  name: "Trials",
+  components: {
+    Pagination,
+    BaseContainer,
+    TrialForm,
+    TrialStatusForm,
+    DoneList,
+  },
+  dicts: ["ReadingStandard", "ReviewType", "ReadingType"],
   data() {
     return {
-      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
+      exportLoading: false,
+      userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
       doneDialogVisible: false,
       doneTitle: null,
       selectArr: [],
@@ -684,191 +750,228 @@ export default {
       total: 0,
       isShow: false,
       dialogVisible: false,
-      title: '',
-      currentId: '',
+      title: "",
+      currentId: "",
       statusVisible: false,
       currentRow: {},
-      currentUser: zzSessionStorage.getItem('userName'),
+      currentUser: zzSessionStorage.getItem("userName"),
       phaseOptions: [
-        { value: 'I' },
-        { value: 'II' },
-        { value: 'III' },
-        { value: 'IV' }
+        { value: "I" },
+        { value: "II" },
+        { value: "III" },
+        { value: "IV" },
       ],
       expeditedOption: this.$d.TrialExpeditedState,
       beginPickerOption: {
-        disabledDate: time => {
+        disabledDate: (time) => {
           if (this.searchData.EndDate) {
-            return time.getTime() > new Date(this.searchData.EndDate).getTime()
+            return time.getTime() > new Date(this.searchData.EndDate).getTime();
           } else {
-            return time.getTime() > Date.now()
+            return time.getTime() > Date.now();
           }
-        }
+        },
       },
       endpickerOption: {
-        disabledDate: time => {
+        disabledDate: (time) => {
           if (this.searchData.BeginDate) {
-            return time.getTime() > Date.now() || time.getTime() <= new Date(this.searchData.BeginDate).getTime()
+            return (
+              time.getTime() > Date.now() ||
+              time.getTime() <= new Date(this.searchData.BeginDate).getTime()
+            );
           } else {
-            return time.getTime() > Date.now()
+            return time.getTime() > Date.now();
           }
-        }
-      }
-    }
+        },
+      },
+    };
   },
   computed: {
-    ...mapGetters(['sponsorList', 'croList'])
+    ...mapGetters(["sponsorList", "croList"]),
   },
   created() {
-    this.initPage()
+    this.initPage();
   },
   methods: {
     initPage() {
-      this.getList()
-      store.dispatch('global/getSponsorList')
-      store.dispatch('global/getCROList')
+      this.getList();
+      store.dispatch("global/getSponsorList");
+      store.dispatch("global/getCROList");
     },
     // 获取项目列表信息
     getList() {
-      this.listLoading = true
+      this.listLoading = true;
       getTrialToBeDoneList(this.searchData)
-        .then(res => {
-          this.list = res.Result.CurrentPageData
-          this.total = res.Result.TotalCount
-          this.listLoading = false
+        .then((res) => {
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+          this.listLoading = false;
         })
         .catch(() => {
-          this.listLoading = false
-        })
+          this.listLoading = false;
+        });
     },
 
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.PageIndex = 1;
+      this.getList();
     },
     // 查询
     handleSelectSearch() {
-      this.searchData.PageIndex = 1
-      this.getList()
-      this.isShow = false
+      this.searchData.PageIndex = 1;
+      this.getList();
+      this.isShow = false;
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
     },
     // 新增项目
     handleNew() {
       // this.$router.push({ name: 'CreateTrial' })
-      this.title = this.$t('trials:trials-list:dialogTitle:new')
-      this.currentId = ''
-      this.dialogVisible = true
+      this.title = this.$t("trials:trials-list:dialogTitle:new");
+      this.currentId = "";
+      this.dialogVisible = true;
     },
     // 编辑项目
     handleEdit(row) {
-      this.title = this.$t('trials:trials-list:dialogTitle:edit')
-      this.currentId = row.Id
-      this.dialogVisible = true
+      this.title = this.$t("trials:trials-list:dialogTitle:edit");
+      this.currentId = row.Id;
+      this.dialogVisible = true;
     },
     handleCommission(row) {
-      this.doneTitle = this.$t('trials:trials-list:dialogTitle:doneTitle')
-      this.currentId = row.Id
-      this.doneDialogVisible = true
+      this.doneTitle = this.$t("trials:trials-list:dialogTitle:doneTitle");
+      this.currentId = row.Id;
+      this.doneDialogVisible = true;
     },
     closeDialog() {
-      this.dialogVisible = false
+      this.dialogVisible = false;
     },
     // 状态
     handleStatus(row) {
-      if (row.TrialStatusStr === 'Initializing') {
-        this.listLoading = true
-        ifTrialCanOngoing(row.Id).then(res => {
-          this.listLoading = false
-          if (res.Result) {
-            this.currentRow = { ...row }
-            this.statusVisible = true
-          } else {
-            this.$confirm(res.ErrorMessage, {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => {}
-            })
-          }
-        }).catch(() => { this.listLoading = false })
+      if (row.TrialStatusStr === "Initializing") {
+        this.listLoading = true;
+        ifTrialCanOngoing(row.Id)
+          .then((res) => {
+            this.listLoading = false;
+            if (res.Result) {
+              this.currentRow = { ...row };
+              this.statusVisible = true;
+            } else {
+              this.$confirm(res.ErrorMessage, {
+                type: "warning",
+                showCancelButton: false,
+                callback: (action) => {},
+              });
+            }
+          })
+          .catch(() => {
+            this.listLoading = false;
+          });
       } else {
-        this.currentRow = { ...row }
-        this.statusVisible = true
+        this.currentRow = { ...row };
+        this.statusVisible = true;
       }
     },
     closeStatusDialog() {
-      this.statusVisible = false
+      this.statusVisible = false;
     },
     // 废除
     handleAbandon(row) {
-      this.$confirm(this.$t('trials:trials-list:message:abolition'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      }).then(() => {
-        this.currentRow = { ...row }
-        this.abandonTrial()
-      }).catch(() => {})
+      this.$confirm(this.$t("trials:trials-list:message:abolition"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      })
+        .then(() => {
+          this.currentRow = { ...row };
+          this.abandonTrial();
+        })
+        .catch(() => {});
     },
     // 废除项目
     abandonTrial() {
-      this.listLoading = true
+      this.listLoading = true;
       abandonTrial(this.currentRow.Id, true)
-        .then(res => {
-          this.listLoading = false
+        .then((res) => {
+          this.listLoading = false;
           if (res.IsSuccess) {
-            this.getList()
-            this.$message.success(this.$t('trials:trials-list:message:abolitionSuccessfully'))
+            this.getList();
+            this.$message.success(
+              this.$t("trials:trials-list:message:abolitionSuccessfully")
+            );
           }
-        }).catch(() => { this.listLoading = false })
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
     },
     rowClick(row, col) {
-      this.$router.push({ path: `/trials/trials-panel?trialId=${row.Id}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}` })
+      if (
+        (row.TrialStatusStr === "Initializing" &&
+          !this.hasPermi(["role:pm"])) ||
+        row.IsDeleted
+      )
+        return;
+      this.$router.push({
+        path: `/trials/trials-panel?trialId=${row.Id}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}`,
+      });
     },
     // panel
     handleDetail(row) {
-      this.$router.push({ path: `/trials/trials-panel?trialId=${row.Id}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}` })
+      this.$router.push({
+        path: `/trials/trials-panel?trialId=${row.Id}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}`,
+      });
     },
     // 获取已勾选行数据
     handleSelectChange(val) {
-      const arr = []
+      const arr = [];
       for (let index = 0; index < val.length; index++) {
-        arr.push(val[index])
+        arr.push(val[index]);
       }
-      this.selectArr = arr
+      this.selectArr = arr;
     },
     // 排序
     handleSortChange(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
-      } if (column.prop === 'Criterion') {
-        this.searchData.SortField = 'CriterionId'
-      } else {
-        this.searchData.SortField = column.prop
+        this.searchData.Asc = false;
       }
-      this.searchData.PageIndex = 1
-      this.getList()
+      if (column.prop === "Criterion") {
+        this.searchData.SortField = "CriterionId";
+      } else {
+        this.searchData.SortField = column.prop;
+      }
+      this.searchData.PageIndex = 1;
+      this.getList();
     },
     // 导出Excel表格
     handleExportTrial() {
+      this.exportLoading = true;
+      let data = {
+        ...this.searchData,
+      };
+      data.TrialIdList = this.selectArr.map((item) => item.Id);
+      return getTrialList_Export(data)
+        .then((res) => {
+          this.exportLoading = false;
+        })
+        .catch(() => {
+          this.exportLoading = false;
+        });
       this.selectArr.forEach((element, index) => {
         // element.ExpeditedStr = element.Expedited === 0 ? 'No' : element.Expedited === 1 ? '24H' : '48H'
         // element.ModalityListStr = element.ModalityList.join(', ')
         // element.CreateTimeStr = element.CreateTime
         // element.Criterion = element.CriterionList.join(', ')
-        element.Deleted = element.IsDeleted ? 'Yes' : 'No'
-        element.Index = (index + 1)
-      })
-      var workbook = new Excel.Workbook()
-      var sheet = workbook.addWorksheet('Trials')
+        element.Deleted = element.IsDeleted ? "Yes" : "No";
+        element.Index = index + 1;
+      });
+      var workbook = new Excel.Workbook();
+      var sheet = workbook.addWorksheet("Trials");
 
-      sheet.properties.defaultRowHeight = 22
+      sheet.properties.defaultRowHeight = 22;
       // sheet.columns = [
       //   { key: 'Index', width: 5 },
       //   { key: 'Code', width: 15 },
@@ -884,102 +987,96 @@ export default {
       //   { key: 'CreateTimeStr', width: 18 }
       // ]
       sheet.columns = [
-        { key: 'Index', width: 5 },
-        { key: 'TrialCode', width: 25 },
-        { key: 'ExperimentName', width: 25 },
-        { key: 'ResearchProgramNo', width: 25 },
-        { key: 'Sponsor', width: 25 },
-        { key: 'Deleted', width: 10 },
-        { key: 'CreateTime', width: 25 }
-      ]
+        { key: "Index", width: 5 },
+        { key: "TrialCode", width: 25 },
+        { key: "ExperimentName", width: 25 },
+        { key: "ResearchProgramNo", width: 25 },
+        { key: "Sponsor", width: 25 },
+        { key: "Deleted", width: 10 },
+        { key: "CreateTime", width: 25 },
+      ];
 
       // 处理标题
-      sheet.mergeCells('A1', 'G2')
-      sheet.getCell('A1').value = 'Trials'
-      sheet.getCell('A1').alignment = {
-        vertical: 'middle',
-        horizontal: 'center'
-      }
-      sheet.getCell('A1').font = {
-        name: 'SimSun',
+      sheet.mergeCells("A1", "G2");
+      sheet.getCell("A1").value = "Trials";
+      sheet.getCell("A1").alignment = {
+        vertical: "middle",
+        horizontal: "center",
+      };
+      sheet.getCell("A1").font = {
+        name: "SimSun",
         family: 4,
         size: 13,
-        bold: true
-      }
-      sheet.mergeCells('A3', 'G3')
-      var now = new Date()
-      sheet.getCell('A3').value = now.toLocaleDateString()
-      sheet.getCell('A3').alignment = {
-        vertical: 'middle',
-        horizontal: 'right'
-      }
+        bold: true,
+      };
+      sheet.mergeCells("A3", "G3");
+      var now = new Date();
+      sheet.getCell("A3").value = now.toLocaleDateString();
+      sheet.getCell("A3").alignment = {
+        vertical: "middle",
+        horizontal: "right",
+      };
 
       sheet.getRow(4).values = [
-        'NO.',
-        'Trial ID',
-        '试验名称',
-        '研究方案号',
-        '申办方',
-        '是否废除',
-        'Date Created'
-      ]
+        "NO.",
+        "Trial ID",
+        "试验名称",
+        "研究方案号",
+        "申办方",
+        "是否废除",
+        "Date Created",
+      ];
       sheet.getRow(4).font = {
-        name: 'SimSun',
+        name: "SimSun",
         family: 4,
         size: 11,
-        bold: true
-      }
-      sheet.getRow(4).alignment = { vertical: 'middle', horizontal: 'left' }
+        bold: true,
+      };
+      sheet.getRow(4).alignment = { vertical: "middle", horizontal: "left" };
 
-      sheet.addRows(this.selectArr)
+      sheet.addRows(this.selectArr);
 
       sheet.eachRow((row, number) => {
         if (number > 3) {
           row.eachCell((cell, rowNumber) => {
-            cell.alignment = { vertical: 'center', horizontal: 'left' }
+            cell.alignment = { vertical: "center", horizontal: "left" };
             cell.border = {
-              top: { style: 'thin' },
-              left: { style: 'thin' },
-              bottom: { style: 'thin' },
-              right: { style: 'thin' }
-            }
-          })
+              top: { style: "thin" },
+              left: { style: "thin" },
+              bottom: { style: "thin" },
+              right: { style: "thin" },
+            };
+          });
         }
-      })
+      });
 
       workbook.xlsx
         .writeBuffer({
-          base64: true
+          base64: true,
         })
-        .then(function(xls64) {
+        .then(function (xls64) {
           var data = new Blob([xls64], {
-            type:
-              'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-          })
+            type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+          });
 
-          if ('msSaveOrOpenBlob' in navigator) {
+          if ("msSaveOrOpenBlob" in navigator) {
             // ie使用的下载方式
-            window.navigator.msSaveOrOpenBlob(
-              data,
-              'Trials' + '.xlsx'
-            )
+            window.navigator.msSaveOrOpenBlob(data, "Trials" + ".xlsx");
           } else {
-            var a = document.createElement('a')
+            var a = document.createElement("a");
 
-            var url = URL.createObjectURL(data)
-            a.href = url
-            a.download =
-                'Trials' + '.xlsx'
-            document.body.appendChild(a)
-            a.click()
-            setTimeout(function() {
-              document.body.removeChild(a)
-              window.URL.revokeObjectURL(url)
-            }, 0)
+            var url = URL.createObjectURL(data);
+            a.href = url;
+            a.download = "Trials" + ".xlsx";
+            document.body.appendChild(a);
+            a.click();
+            setTimeout(function () {
+              document.body.removeChild(a);
+              window.URL.revokeObjectURL(url);
+            }, 0);
           }
-        })
-    }
-
-  }
-}
+        });
+    },
+  },
+};
 </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

@@ -5,10 +5,7 @@
       <el-form :inline="true">
         <!-- 文件类型 -->
         <el-form-item :label="$t('trials:signRecords:table:fileType')">
-          <el-select
-            v-model="searchData.FileTypeId"
-            style="width:150px;"
-          >
+          <el-select v-model="searchData.FileTypeId" style="width: 150px">
             <el-option
               v-for="item of typeOptions"
               :key="item.FileTypeId"
@@ -19,19 +16,31 @@
         </el-form-item>
         <!-- 文件名称 -->
         <el-form-item :label="$t('trials:signRecords:table:fileName')">
-          <el-input v-model="searchData.Name" style="width:120px;" />
+          <el-input v-model="searchData.Name" style="width: 120px" />
         </el-form-item>
         <!-- 签署人 -->
         <el-form-item :label="$t('trials:signRecords:table:user')">
-          <el-select v-model="searchData.UserId" clearable filterable style="width:140px;">
+          <el-select
+            v-model="searchData.UserId"
+            clearable
+            filterable
+            style="width: 140px"
+          >
             <el-option
-              v-for="(item) of userOptions"
+              v-for="item of userOptions"
               :key="item.UserId"
               :label="item.RealName"
               :value="item.UserId"
             >
               <span style="float: left">{{ item.RealName }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px;margin-left:5px;">
+              <span
+                style="
+                  float: right;
+                  color: #8492a6;
+                  font-size: 13px;
+                  margin-left: 5px;
+                "
+              >
                 {{ item.UserName }}
               </span>
             </el-option>
@@ -43,7 +52,7 @@
             v-model="searchData.UserTypeId"
             clearable
             filterable
-            style="width:120px;"
+            style="width: 120px"
           >
             <el-option
               v-for="item of userTypeOptions"
@@ -57,23 +66,54 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('trials:signRecords:table:isSign')">
-          <el-select v-model="searchData.IsConfirmed" clearable style="width:120px;">
-            <el-option v-for="i of $d.YesOrNo" :key="'IsConfirmed' + i.label" :value="i.value" :label="i.label" />
+          <el-select
+            v-model="searchData.IsConfirmed"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="i of $d.YesOrNo"
+              :key="'IsConfirmed' + i.label"
+              :value="i.value"
+              :label="i.label"
+            />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('trials:signRecords:table:isDeleted')">
-          <el-select v-model="searchData.IsDeleted" clearable style="width:120px;">
-            <el-option v-for="i of $d.YesOrNo" :key="'IsDeleted' + i.label" :value="i.value" :label="i.label" />
+          <el-select
+            v-model="searchData.IsDeleted"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="i of $d.YesOrNo"
+              :key="'IsDeleted' + i.label"
+              :value="i.value"
+              :label="i.label"
+            />
           </el-select>
         </el-form-item>
         <el-form-item>
           <!-- 查询 -->
           <el-button icon="el-icon-search" type="primary" @click="handleSearch">
-            {{ $t('common:button:search') }}
+            {{ $t("common:button:search") }}
           </el-button>
           <!-- 重置 -->
-          <el-button icon="el-icon-refresh-left" type="primary" @click="handleReset">
-            {{ $t('common:button:reset') }}
+          <el-button
+            icon="el-icon-refresh-left"
+            type="primary"
+            @click="handleReset"
+          >
+            {{ $t("common:button:reset") }}
+          </el-button>
+          <!-- 导出 -->
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            :loading="exportLoading"
+            @click="handleExport"
+          >
+            {{ $t("common:button:export") }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -84,7 +124,7 @@
       <el-table
         ref="AttachmentsManagement"
         v-loading="loading"
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
         :data="list"
         stripe
         height="100"
@@ -115,8 +155,12 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsSystemDoc" type="primary">{{ $fd('IsSystemDoc', scope.row.IsSystemDoc) }}</el-tag>
-            <el-tag v-else type="warning">{{ $fd('IsSystemDoc', scope.row.IsSystemDoc) }}</el-tag>
+            <el-tag v-if="scope.row.IsSystemDoc" type="primary">{{
+              $fd("IsSystemDoc", scope.row.IsSystemDoc)
+            }}</el-tag>
+            <el-tag v-else type="warning">{{
+              $fd("IsSystemDoc", scope.row.IsSystemDoc)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- 是否废除 -->
@@ -127,8 +171,12 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsDeleted" type="danger">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag>
-            <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag>
+            <el-tag v-if="scope.row.IsDeleted" type="danger">{{
+              $fd("YesOrNo", scope.row.IsDeleted)
+            }}</el-tag>
+            <el-tag v-else type="primary">{{
+              $fd("YesOrNo", scope.row.IsDeleted)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- 上传时间 -->
@@ -147,8 +195,12 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="!scope.row.IsConfirmed" type="primary">{{ $fd('YesOrNo', scope.row.IsConfirmed) }}</el-tag>
-            <el-tag v-else type="danger">{{ $fd('YesOrNo', scope.row.IsConfirmed) }}</el-tag>
+            <el-tag v-if="!scope.row.IsConfirmed" type="primary">{{
+              $fd("YesOrNo", scope.row.IsConfirmed)
+            }}</el-tag>
+            <el-tag v-else type="danger">{{
+              $fd("YesOrNo", scope.row.IsConfirmed)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- 签署人 -->
@@ -193,7 +245,13 @@
       </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"
+      />
     </template>
 
     <!-- 预览文件 -->
@@ -205,32 +263,45 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <div class="base-modal-body" style="border:2px solid #ccc;padding: 10px">
-        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" @getList="getList" />
+      <div
+        class="base-modal-body"
+        style="border: 2px solid #ccc; padding: 10px"
+      >
+        <PreviewFile
+          v-if="previewVisible"
+          :file-path="currentPath"
+          :file-type="currentType"
+          @getList="getList"
+        />
       </div>
     </el-dialog>
   </BaseContainer>
 </template>
 <script>
-import { getDocumentConfirmList, getTrialUserSelect, getTrialUserTypeList, getTrialDocAndSystemDocType } from '@/api/trials'
-import BaseContainer from '@/components/BaseContainer'
-import Pagination from '@/components/Pagination'
-import PreviewFile from '@/components/PreviewFile/index'
-import store from '@/store'
+import {
+  getDocumentConfirmList,
+  getTrialUserSelect,
+  getTrialUserTypeList,
+  getTrialDocAndSystemDocType,
+} from "@/api/trials";
+import { pMTrainingRecordList_Export } from "@/api/export";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
+import PreviewFile from "@/components/PreviewFile/index";
 const searchDataDefault = () => {
   return {
-    FileTypeId: '',
-    Name: '',
-    UserId: '',
-    UserTypeId: '',
+    FileTypeId: "",
+    Name: "",
+    UserId: "",
+    UserTypeId: "",
     PageIndex: 1,
     PageSize: 20,
     IsConfirmed: null,
-    IsDeleted: null
-  }
-}
+    IsDeleted: null,
+  };
+};
 export default {
-  name: 'AttachmentsManagement',
+  name: "AttachmentsManagement",
   components: { BaseContainer, Pagination, PreviewFile },
   data() {
     return {
@@ -239,84 +310,99 @@ export default {
       list: [],
       total: 0,
       currentRow: {},
-      currentPath: '',
-      currentType: '',
+      currentPath: "",
+      currentType: "",
       previewVisible: false,
       userOptions: [],
       userTypeOptions: [],
-      currentUser: zzSessionStorage.getItem('userName'),
+      currentUser: zzSessionStorage.getItem("userName"),
       typeOptions: [],
-      trialId: this.$route.query.trialId
-    }
+      trialId: this.$route.query.trialId,
+      exportLoading: false,
+    };
   },
   mounted() {
-    this.getTypeOptions()
-    this.getUserSelect()
-    this.getUserType()
-    this.getList()
+    this.getTypeOptions();
+    this.getUserSelect();
+    this.getUserType();
+    this.getList();
   },
   methods: {
+    handleExport() {
+      this.exportLoading = true;
+      pMTrainingRecordList_Export(this.searchData)
+        .then(() => {
+          this.exportLoading = false;
+        })
+        .catch((err) => {
+          this.exportLoading = false;
+        });
+    },
     // 获取系统文件数据
     getList() {
-      this.loading = true
-      this.searchData.TrialId = this.trialId
-      getDocumentConfirmList(this.searchData).then(async res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-        console.log(this.total)
-      }).catch(() => {
-        this.loading = false
-      })
+      this.loading = true;
+      this.searchData.TrialId = this.trialId;
+      getDocumentConfirmList(this.searchData)
+        .then(async (res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+          console.log(this.total);
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 获取文件类型下拉数据
     getTypeOptions() {
-      getTrialDocAndSystemDocType(this.trialId).then(res => {
-        this.typeOptions = res.Result
-      })
+      getTrialDocAndSystemDocType(this.trialId).then((res) => {
+        this.typeOptions = res.Result;
+      });
     },
     // 获取当前项目下参与者信息
     getUserSelect() {
-      getTrialUserSelect(this.trialId).then(res => {
-        this.userOptions = res.Result
-      })
+      getTrialUserSelect(this.trialId).then((res) => {
+        this.userOptions = res.Result;
+      });
     },
     // 获取用户类型下拉数据
     getUserType() {
-      getTrialUserTypeList().then(res => {
-        this.userTypeOptions = res.Result
-      })
+      getTrialUserTypeList().then((res) => {
+        this.userTypeOptions = res.Result;
+      });
     },
     // 预览
     handlePreview(row) {
-      this.currentRow = { ...row }
-      const { Name, FullFilePath } = row
-      this.currentPath = FullFilePath
-      this.currentType = row.Name ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase() : ''
-      this.previewVisible = true
+      this.currentRow = { ...row };
+      const { Name, FullFilePath } = row;
+      this.currentPath = FullFilePath;
+      this.currentType = row.Name
+        ? Name.substring(Name.lastIndexOf(".") + 1).toLocaleLowerCase()
+        : "";
+      this.previewVisible = true;
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
       this.$nextTick(() => {
-        this.$refs.AttachmentsManagement.clearSort()
-      })
+        this.$refs.AttachmentsManagement.clearSort();
+      });
     },
     // 查询
     handleSearch() {
-      this.getList()
+      this.getList();
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.getList()
-    }
-  }
-}
+      this.searchData.SortField = column.prop;
+      this.getList();
+    },
+  },
+};
 </script>

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

@@ -146,13 +146,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"
           width="120"
-        />
+        /> -->
         
         <el-table-column
           prop="DoctorUserName"

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"
@@ -231,7 +231,13 @@ export default {
       window.open(href, '_blank')
     },
     handleDownloadAll() {
-      this.dialogVisible = true
+      // 英文环境直接下载
+      if (process.env.NODE_ENV === 'usa') {
+        this.language = 2
+        this.handleDownloadResumes()
+      } else {
+        this.dialogVisible = true
+      }
     },
     getFileData(fileUrl) {
       return new Promise((resolve, reject) => {
@@ -285,11 +291,16 @@ export default {
         language: this.language
       }).then(async res => {
         this.selectTable = {};
-        for (let i = 0; res.Result.length > i; i++) {
-          let item = res.Result[i]
-          await this.handleBatchDown(item)
-        }
         this.dialogVisible = false
+        if (!res.Result || res.Result.length === 0) {
+          this.$alert(this.$t('trials:seletctedReviews:table:noResume'))
+        }else{
+          for (let i = 0; res.Result.length > i; i++) {
+            let item = res.Result[i]
+            await this.handleBatchDown(item)
+          }
+        }
+        
       }).catch(err=>{
         this.dialogVisible = false;
         this.selectTable= {};
@@ -305,9 +316,14 @@ export default {
       downloadResume(this.$route.query.trialId, this.language, arr).then(res => { window.open(res.Result) })
     },
     handleDownload(row) { 
-      // this.downloadResume([row.Id]) 
-      this.dialogVisible = true;
-      this.selectTable = row;
+      this.selectTable = row
+      // 英文环境直接下载
+      if (process.env.NODE_ENV === 'usa') {
+        this.language = 2
+        this.handleDownloadResumes()
+      } else {
+        this.dialogVisible = true
+      }
     }
   }
 }

src/views/trials/trials-panel/clinical-data/index.vue

@@ -337,7 +337,8 @@ export default {
         ClinicalDataTrialSetId: this.$router.currentRoute.query.ClinicalDataTrialSetId ? this.$router.currentRoute.query.ClinicalDataTrialSetId : '',
         readingId: this.$router.currentRoute.query.readingId ? this.$router.currentRoute.query.readingId : '',
         visitTaskId: this.$router.currentRoute.query.visitTaskId ? this.$router.currentRoute.query.visitTaskId : '',
-        readingClinicalDataId: this.$router.currentRoute.query.readingClinicalDataId ? this.$router.currentRoute.query.readingClinicalDataId : ''
+        readingClinicalDataId: this.$router.currentRoute.query.readingClinicalDataId ? this.$router.currentRoute.query.readingClinicalDataId : '',
+        IsGetAllConsistencyAnalysis:this.$router.currentRoute.query.isGetAllConsistencyAnalysis == 0 ? false : true,
       }
       if (this.$router.currentRoute.query.IsOnlyGetCRCReadModule) {
         param.IsOnlyGetCRCReadModule = true

src/views/trials/trials-panel/enrolled-reviewers/list/components/UploadAcksow.vue

@@ -14,7 +14,7 @@
       accept=".pdf"
     >
       <el-button size="small" type="primary" :loading="btnDisabled">{{ $t('trials:enrolledReviews:button:upload') }}</el-button>
-      <span slot="tip" class="el-upload__tip">{{ `(${$t('trials:enrolledReviews:label:mustBepdf')})` }}</span>
+      <span slot="tip" class="el-upload__tip">{{ $t('system:tip:file:pdf') }}</span>
     </el-upload>
   </div>
 </template>

src/views/trials/trials-panel/enrolled-reviewers/list/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <BaseContainer>
+  <BaseContainer class="enroll-list">
     <!-- <template slot="search-container">
       <el-button
         v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:enroll']"
@@ -36,14 +36,14 @@
           </template>
         </el-table-column>
         <!-- Name CN -->
-        <el-table-column
+        <!-- <el-table-column
           prop="ChineseName"
           sortable="custom"
           :label="$t('trials:enrolledReviews:table:nameCN')"
           v-if="!hasPermi(['role:ea'])"
           width="120"
           show-overflow-tooltip
-        />
+        /> -->
         <!-- 用户名 -->
         <el-table-column
           prop="UserName"
@@ -96,16 +96,15 @@
           <el-table-column
             :label="$t('trials:enrolledReviews:table:readingType')"
             width="300"
-            show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item.TrialReadingCriterionId">
-                <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
-                <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
-                <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
-                <el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
-              </span>
-              <el-button
+                <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item.TrialReadingCriterionId" style="margin:5px 5px 5px 0;">
+                  <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
+                  <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
+                  <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
+                  <el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
+                </span>
+                <el-button
                 v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:edit']"
                 type="text"
                 @click="openSetEnrollReadingCategory(scope.row, ite.TrialReadingCriterionId)"
@@ -249,7 +248,7 @@
       </template>
     </base-model>
     <!-- 修改 readingCategory -->
-    <base-model :config="readingCategory_model">
+    <base-model :config="readingCategory_model" class="readingCategory_model">
       <template slot="dialog-body">
         <!-- Reading Type -->
         <label>{{ $t('trials:enrolledReviews:table:readingType') }}: </label>
@@ -259,7 +258,7 @@
           allow-create
           multiple
           default-first-option
-          style="width: 70%"
+          style="width: 50%;"
         >
           <template v-for="item of $d.ReadingCategory">
             <el-option  v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)" /> 
@@ -273,20 +272,22 @@
         </el-select>
       </template>
       <template slot="dialog-footer">
-        <el-button
+        <div style="margin-top:30px;">
+          <el-button
           :disabled="readingCategory_model.btnLoading"
           type="primary"
           @click="readingCategory_model.visible = false"
-        >
-          {{ $t('common:button:cancel') }}
-        </el-button>
-        <el-button
-          type="primary"
-          :loading="readingCategory_model.btnLoading"
-          @click="handleUpdateReadingCategory"
-        >
-          {{ $t('common:button:save') }}
-        </el-button>
+          >
+            {{ $t('common:button:cancel') }}
+          </el-button>
+          <el-button
+            type="primary"
+            :loading="readingCategory_model.btnLoading"
+            @click="handleUpdateReadingCategory"
+          >
+            {{ $t('common:button:save') }}
+          </el-button>
+        </div>
       </template>
     </base-model>
     <!-- 修改医生状态 -->
@@ -432,7 +433,7 @@ export default {
         visible: false,
         title: this.$t('trials:enrolledReviews:dialogTitle:changeReadingType'),
         showClose: true,
-        width: '500px',
+        width: '600px',
         btnLoading: false
       },
       reviewerStatus_model: {
@@ -833,10 +834,11 @@ export default {
 <style lang="scss">
   .enroll-list {
     height: 100%;
-    .filter-box {
-      display: flex;
-      align-items: center;
-      padding: 5px 0px;
+    .readingCategory_model{
+      .base-modal-body{
+        min-height: 150px;
+        padding-bottom: 30px !important;
+      }
     }
   }
 </style>

src/views/trials/trials-panel/reading/consistency-analysis/components/DoctorConsistentRuleSubjectTable.vue

@@ -7,10 +7,15 @@
         :data="list"
         stripe
         height="100"
-        style="min-height: 400px;"
+        style="min-height: 400px"
         @selection-change="handleSelectChange"
       >
-        <el-table-column :selectable="selectable" type="selection" align="left" width="45" />
+        <el-table-column
+          :selectable="selectable"
+          type="selection"
+          align="left"
+          width="45"
+        />
         <!-- 中心编号 -->
         <el-table-column
           prop="TrialSiteCode"
@@ -35,25 +40,44 @@
           sortable="custom"
           show-overflow-tooltip
         />
+        <!-- 原截至访视 -->
+        <el-table-column
+          prop="FirstGlobalVisitName"
+          :label="
+            $t('trials:grouptConsistencyAnalysis:table:firstGlobalVisitName')
+          "
+          min-width="160"
+          sortable="custom"
+          show-overflow-tooltip
+          v-if="OtherInfo.IsGenerateGlobalTask && OtherInfo.IsHaveReadingPeriod"
+        />
         <!-- 是否受到退回影响 -->
-<!--        <el-table-column-->
-<!--          prop="IsReReadingOrBackInfluenceAnalysis"-->
-<!--          :label="$t('trials:grouptConsistencyAnalysis:table:backImpact')"-->
-<!--          min-width="160"-->
-<!--          sortable="custom"-->
-<!--          show-overflow-tooltip>-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-tag v-if="!scope.row.IsReReadingOrBackInfluenceAnalysis" type="danger">{{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }}</el-tag>-->
-<!--            <el-tag v-if="scope.row.IsReReadingOrBackInfluenceAnalysis" type="primary">{{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }}</el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column-->
+        <!--          prop="IsReReadingOrBackInfluenceAnalysis"-->
+        <!--          :label="$t('trials:grouptConsistencyAnalysis:table:backImpact')"-->
+        <!--          min-width="160"-->
+        <!--          sortable="custom"-->
+        <!--          show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag v-if="!scope.row.IsReReadingOrBackInfluenceAnalysis" type="danger">{{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }}</el-tag>-->
+        <!--            <el-tag v-if="scope.row.IsReReadingOrBackInfluenceAnalysis" type="primary">{{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }}</el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
       </el-table>
 
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
     </div>
-    <div v-else>{{$t('trials:grouptConsistencyAnalysis:message:createRandom')}}</div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+    <div v-else>
+      {{ $t("trials:grouptConsistencyAnalysis:message:createRandom") }}
+    </div>
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
         <!-- 取消 -->
         <el-button
@@ -62,39 +86,59 @@
           type="primary"
           @click="close"
         >
-          {{ $t('common:button:cancel') }}
+          {{ $t("common:button:cancel") }}
         </el-button>
         <!-- 生成 -->
-        <el-button size="small" type="primary" :loading="btnLoading" @click="save">
-          {{data.IsAutoAllocateGenerateTask ? $t('trials:grouptConsistencyAnalysis:button:createRandom') : $t('trials:grouptConsistencyAnalysis:button:create')}}
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="save"
+        >
+          {{
+            data.IsAutoAllocateGenerateTask
+              ? $t("trials:grouptConsistencyAnalysis:button:createRandom")
+              : $t("trials:grouptConsistencyAnalysis:button:create")
+          }}
         </el-button>
       </el-form-item>
     </div>
   </el-form>
 </template>
 <script>
-import { getDoctorSelfConsistentRuleSubjectList, confirmGenerateSelfConsistentTask, getDoctorConsistentRuleSubjectList, confirmGenerateConsistentTask } from '@/api/trials/reading'
-import BaseContainer from '@/components/BaseContainer'
-import Pagination from '@/components/Pagination'
+import {
+  getDoctorSelfConsistentRuleSubjectList,
+  confirmGenerateSelfConsistentTask,
+  getDoctorConsistentRuleSubjectList,
+  confirmGenerateConsistentTask,
+} from "@/api/trials/reading";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
 const searchDataDefault = () => {
   return {
     PageIndex: 1,
     PageSize: 20,
     Asc: true,
-    SortField: '',
+    SortField: "",
     TrialId: null,
-    TaskConsistentRuleId: null
-  }
-}
+    TaskConsistentRuleId: null,
+  };
+};
 export default {
-  name: 'TrialsNotice',
+  name: "TrialsNotice",
   components: { BaseContainer, Pagination },
   props: {
     data: {
       type: Object,
       default() {
-        return {}
-      }
+        return {};
+      },
+    },
+    OtherInfo: {
+      type: Object,
+      default() {
+        return {};
+      },
     },
   },
   data() {
@@ -105,71 +149,82 @@ export default {
       loading: false,
       trialId: this.$route.query.trialId,
       SelectList: [],
-      btnLoading: false
-    }
+      btnLoading: false,
+    };
   },
   mounted() {
-    this.searchData.TaskConsistentRuleId = this.data.Id
-    this.searchData.DoctorUserId = this.data.AnalysisDoctorUser.UserId
-    this.getList()
+    this.searchData.TaskConsistentRuleId = this.data.Id;
+    this.searchData.DoctorUserId = this.data.AnalysisDoctorUser.UserId;
+    this.getList();
   },
   methods: {
     selectable(row) {
       if (row.IsHaveGeneratedTask) {
-        return false
+        return false;
       } else {
-        return true
+        return true;
       }
     },
     handleSelectChange(e) {
-      this.SelectList = e
+      this.SelectList = e;
     },
-    save () {
-      if (this.SelectList.length === 0 && !this.data.IsAutoAllocateGenerateTask) {
+    save() {
+      if (
+        this.SelectList.length === 0 &&
+        !this.data.IsAutoAllocateGenerateTask
+      ) {
         // '请选择要生成的受试者'
-        this.$alert(this.$t('trials:grouptConsistencyAnalysis:message:msg1'))
-        return
+        this.$alert(this.$t("trials:grouptConsistencyAnalysis:message:msg1"));
+        return;
       }
-      this.btnLoading = true
-      this.loading = true
+      this.btnLoading = true;
+      this.loading = true;
       var params = {
         TaskConsistentRuleId: this.searchData.TaskConsistentRuleId,
-        SubejctIdList: this.SelectList.map(v => v.SubjectId),
+        SubejctIdList: this.SelectList.map((v) => v.SubjectId),
         DoctorUserId: this.searchData.DoctorUserId,
-        IsAutoAllocateGenerateTask: this.data.IsAutoAllocateGenerateTask
-      }
-      confirmGenerateSelfConsistentTask(params).then(res => {
-        this.loading = false
-        this.btnLoading = false
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
-        this.$emit('getList')
-        this.close()
-      }).catch(() => {
-        this.loading = false
-        this.btnLoading = false
-      })
+        IsAutoAllocateGenerateTask: this.data.IsAutoAllocateGenerateTask,
+      };
+      confirmGenerateSelfConsistentTask(params)
+        .then((res) => {
+          this.loading = false;
+          this.btnLoading = false;
+          this.$message.success(this.$t("common:message:savedSuccessfully"));
+          this.$emit("getList");
+          this.close();
+        })
+        .catch(() => {
+          this.loading = false;
+          this.btnLoading = false;
+        });
     },
     getList() {
-      this.searchData.TrialId = this.$route.query.trialId
-      this.loading = true
-      getDoctorSelfConsistentRuleSubjectList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.loading = false })
+      this.searchData.TrialId = this.$route.query.trialId;
+      this.loading = true;
+      getDoctorSelfConsistentRuleSubjectList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    close() {
+      this.$emit("close");
     },
-    close() { this.$emit('close') },
     // 排序
     handleSortChange(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
-    }
-  }
-}
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+  },
+};
 </script>

src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue

@@ -7,10 +7,15 @@
         :data="list"
         stripe
         height="100"
-        style="min-height: 400px;"
+        style="min-height: 400px"
         @selection-change="handleSelectChange"
       >
-        <el-table-column :selectable="selectable" type="selection" align="left" width="45" />
+        <el-table-column
+          :selectable="selectable"
+          type="selection"
+          align="left"
+          width="45"
+        />
         <!-- 中心编号 -->
         <el-table-column
           prop="TrialSiteCode"
@@ -36,7 +41,11 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{scope.row.DoctorUserList.map(v => {return `${v.UserName} (${v.FullName})`}).join(', ')}}
+            {{
+              scope.row.DoctorUserList.map((v) => {
+                return `${v.UserName} (${v.FullName})`;
+              }).join(", ")
+            }}
           </template>
         </el-table-column>
         <!-- 符合规则访视数 -->
@@ -47,13 +56,30 @@
           sortable="custom"
           show-overflow-tooltip
         />
+        <!-- 原截至访视 -->
+        <el-table-column
+          prop="FirstGlobalVisitName"
+          :label="
+            $t('trials:grouptConsistencyAnalysis:table:firstGlobalVisitName')
+          "
+          min-width="160"
+          sortable="custom"
+          show-overflow-tooltip
+          v-if="OtherInfo.IsGenerateGlobalTask && OtherInfo.IsHaveReadingPeriod"
+        />
       </el-table>
       <!-- 分页组件 -->
       <div style="text-align: right">
-        <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"
+        />
       </div>
     </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
@@ -62,64 +88,86 @@
           type="primary"
           @click="close"
         >
-          {{ $t('common:button:cancel') }}
+          {{ $t("common:button:cancel") }}
         </el-button>
-        <el-button size="small" type="primary" :disabled="!IsAllowAutoAllocate" :loading="btnLoading" @click="save(true)">
-          {{$t('trials:grouptConsistencyAnalysis:button:RandomCreate')}}
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="!IsAllowAutoAllocate"
+          :loading="btnLoading"
+          @click="save(true)"
+        >
+          {{ $t("trials:grouptConsistencyAnalysis:button:RandomCreate") }}
         </el-button>
         <!-- 生成 -->
-        <el-button size="small" type="primary" :loading="btnLoading" @click="save(false)">
-          {{$t('trials:grouptConsistencyAnalysis:button:create')}}
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="save(false)"
+        >
+          {{ $t("trials:grouptConsistencyAnalysis:button:create") }}
         </el-button>
       </el-form-item>
     </div>
   </el-form>
 </template>
 <script>
-import { getGroupConsistentRuleSubjectList, confirmGenerateGroupConsistentTask, getDoctorConsistentRuleSubjectList, confirmGenerateConsistentTask } from '@/api/trials/reading'
-import BaseContainer from '@/components/BaseContainer'
-import Pagination from '@/components/Pagination'
+import {
+  getGroupConsistentRuleSubjectList,
+  confirmGenerateGroupConsistentTask,
+  getDoctorConsistentRuleSubjectList,
+  confirmGenerateConsistentTask,
+} from "@/api/trials/reading";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
 const searchDataDefault = () => {
   return {
     PageIndex: 1,
     PageSize: 20,
     Asc: true,
-    SortField: '',
+    SortField: "",
     TrialId: null,
-    TaskConsistentRuleId: null
-  }
-}
+    TaskConsistentRuleId: null,
+  };
+};
 export default {
-  name: 'TrialsNotice',
+  name: "TrialsNotice",
   components: { BaseContainer, Pagination },
   props: {
     changeNum: {
       type: Number,
       default() {
-        return 0
-      }
+        return 0;
+      },
     },
     IsSelfAnalysis: {
       type: Boolean,
       default() {
-        return false
-      }
+        return false;
+      },
     },
-    TrialReadingCriterionId:{
-      type:String,
-      required:true
+    TrialReadingCriterionId: {
+      type: String,
+      required: true,
     },
     data: {
       type: Object,
       default() {
-        return {}
-      }
+        return {};
+      },
+    },
+    OtherInfo: {
+      type: Object,
+      default() {
+        return {};
+      },
     },
   },
   watch: {
     changeNum(v) {
-      this.getList()
-    }
+      this.getList();
+    },
   },
   data() {
     return {
@@ -130,77 +178,85 @@ export default {
       trialId: this.$route.query.trialId,
       SelectList: [],
       btnLoading: false,
-      IsAllowAutoAllocate: true
-    }
+      IsAllowAutoAllocate: true,
+    };
   },
   mounted() {
-    this.getList()
+    this.getList();
   },
   methods: {
     selectable(row) {
       if (row.IsHaveGeneratedTask) {
-        return false
+        return false;
       } else {
-        return true
+        return true;
       }
     },
     handleSelectChange(e) {
-      this.SelectList = e
+      this.SelectList = e;
     },
-    save (IsAutoAllocateGenerateTask) {
+    save(IsAutoAllocateGenerateTask) {
       if (this.SelectList.length === 0) {
         // '请选择要生成的受试者'
-        this.$alert(this.$t('trials:grouptConsistencyAnalysis:message:msg1'))
-        return
+        this.$alert(this.$t("trials:grouptConsistencyAnalysis:message:msg1"));
+        return;
       }
-      this.btnLoading = true
-      this.loading = true
+      this.btnLoading = true;
+      this.loading = true;
       var params = {
         TrialId: this.$route.query.trialId,
-        SubejctIdList: this.SelectList.map(v => v.SubjectId),
+        SubejctIdList: this.SelectList.map((v) => v.SubjectId),
         IsAutoAllocateGenerateTask: IsAutoAllocateGenerateTask,
-        TrialReadingCriterionId: this.TrialReadingCriterionId
-      }
-      confirmGenerateGroupConsistentTask(params).then(res => {
-        this.loading = false
-        this.btnLoading = false
-        // '保存成功'
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
-        this.close()
-        this.$emit('getList')
-      }).catch(() => {
-        this.loading = false
-        this.btnLoading = false
-      })
+        TrialReadingCriterionId: this.TrialReadingCriterionId,
+      };
+      confirmGenerateGroupConsistentTask(params)
+        .then((res) => {
+          this.loading = false;
+          this.btnLoading = false;
+          // '保存成功'
+          this.$message.success(this.$t("common:message:savedSuccessfully"));
+          this.close();
+          this.$emit("getList");
+        })
+        .catch(() => {
+          this.loading = false;
+          this.btnLoading = false;
+        });
     },
     getList() {
-      this.searchData.TrialId = this.$route.query.trialId
-      this.loading = true
-      this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
-      getGroupConsistentRuleSubjectList(this.searchData).then(res => {
-        if (res.OtherInfo.Rule) {
-          this.$emit('setReaderRulesFormVisible', false)
-        } else {
-          this.$emit('setReaderRulesFormVisible', true)
-        }
-        this.IsAllowAutoAllocate = res.OtherInfo.IsAllowAutoAllocate
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.loading = false })
+      this.searchData.TrialId = this.$route.query.trialId;
+      this.loading = true;
+      this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId;
+      getGroupConsistentRuleSubjectList(this.searchData)
+        .then((res) => {
+          if (res.OtherInfo.Rule) {
+            this.$emit("setReaderRulesFormVisible", false);
+          } else {
+            this.$emit("setReaderRulesFormVisible", true);
+          }
+          this.IsAllowAutoAllocate = res.OtherInfo.IsAllowAutoAllocate;
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    close() {
+      this.$emit("close");
     },
-    close() { this.$emit('close') },
     // 排序
     handleSortChange(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
-    }
-  }
-}
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+  },
+};
 </script>

src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue

@@ -10,39 +10,105 @@
   >
     <div class="base-dialog-body">
       <!-- 访视数 -->
-      <el-form-item :label="$t('trials:consistencyAnalysisRule:table:visitNum')" prop="PlanVisitCount">
-        <el-input-number v-model="form.PlanVisitCount" :disabled="isDisable" :min="0" controls-position="right" />
+      <el-form-item
+        :label="$t('trials:consistencyAnalysisRule:table:visitNum')"
+        prop="PlanVisitCount"
+      >
+        <el-input-number
+          v-model="form.PlanVisitCount"
+          :disabled="isDisable"
+          :min="1"
+          controls-position="right"
+        />
       </el-form-item>
       <!-- 所选访视是否有阅片期 -->
-      <el-form-item :label="$t('trials:consistencyAnalysisRule:table:isReadingPeriod')" prop="IsHaveReadingPeriod">
-        <el-radio-group v-model="form.IsHaveReadingPeriod" :disabled="isDisable" @change="form.IsGenerateGlobalTask = form.IsHaveReadingPeriod">
-          <el-radio v-for="item of $d.YesOrNo" :key="'form.IsHaveReadingPeriod' + item.value" :label="item.value">{{ item.label }}</el-radio>
+      <el-form-item
+        :label="$t('trials:consistencyAnalysisRule:table:isReadingPeriod')"
+        prop="IsHaveReadingPeriod"
+      >
+        <el-radio-group
+          v-model="form.IsHaveReadingPeriod"
+          :disabled="isDisable || ruleOtherInfo.IsReadingTaskViewInOrder !== 1"
+          @change="form.IsGenerateGlobalTask = form.IsHaveReadingPeriod"
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="'form.IsHaveReadingPeriod' + item.value"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
       <!-- 间隔周期（周） -->
-      <el-form-item v-if="isSelfAnalysis" :label="$t('trials:consistencyAnalysisRule:table:intervalPeriod')" prop="IntervalWeeks">
-        <el-input-number v-model="form.IntervalWeeks" :min="0" :disabled="isDisable" controls-position="right" />
+      <el-form-item
+        v-if="isSelfAnalysis"
+        :label="$t('trials:consistencyAnalysisRule:table:intervalPeriod')"
+        prop="IntervalWeeks"
+      >
+        <el-input-number
+          v-model="form.IntervalWeeks"
+          :min="0"
+          :disabled="isDisable"
+          controls-position="right"
+        />
       </el-form-item>
       <!-- 计划病例数 -->
-      <el-form-item :label="$t('trials:consistencyAnalysisRule:table:plannedNum')" prop="PlanSubjectCount">
-        <el-input-number v-model="form.PlanSubjectCount" :min="0" :disabled="isDisable" controls-position="right" />
+      <el-form-item
+        :label="$t('trials:consistencyAnalysisRule:table:plannedNum')"
+        prop="PlanSubjectCount"
+      >
+        <el-input-number
+          v-model="form.PlanSubjectCount"
+          :min="0"
+          :disabled="isDisable"
+          controls-position="right"
+        />
       </el-form-item>
       <!-- 虚拟中心编号 -->
-      <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:siteCode')" prop="BlindTrialSiteCode">
-        <el-input v-model="form.BlindTrialSiteCode" maxlength="10" style="width: 140px;" :disabled="!!Result.BlindTrialSiteCode || !!OtherInfo.VitrualSiteCode" @input="(v)=>(form.BlindTrialSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))"/>
+      <el-form-item
+        :label="$t('trials:consistencyAnalysisRule:table:siteCode')"
+        prop="BlindTrialSiteCode"
+      >
+        <el-input
+          v-model="form.BlindTrialSiteCode"
+          maxlength="10"
+          style="width: 140px"
+          :disabled="!!Result.BlindTrialSiteCode || !!OtherInfo.VitrualSiteCode"
+          @input="
+            (v) =>
+              (form.BlindTrialSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))
+          "
+        />
       </el-form-item>
       <!-- 虚拟受试者位数 -->
-      <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:subjectNum')" prop="BlindSubjectNumberOfPlaces">
-        <el-input-number v-model="form.BlindSubjectNumberOfPlaces" :min="1" :disabled="isDisable" :max="5" controls-position="right" />
+      <el-form-item
+        :label="$t('trials:consistencyAnalysisRule:table:subjectNum')"
+        prop="BlindSubjectNumberOfPlaces"
+      >
+        <el-input-number
+          v-model="form.BlindSubjectNumberOfPlaces"
+          :min="1"
+          :disabled="isDisable"
+          :max="5"
+          controls-position="right"
+        />
       </el-form-item>
       <!-- 是否生成全局阅片任务 -->
-      <el-form-item :label="$t('trials:consistencyAnalysisRule:table:isGenerateGlobalTask')" prop="IsGenerateGlobalTask">
+      <el-form-item
+        :label="$t('trials:consistencyAnalysisRule:table:isGenerateGlobalTask')"
+        prop="IsGenerateGlobalTask"
+      >
         <el-radio-group v-model="form.IsGenerateGlobalTask" disabled>
-          <el-radio v-for="item of $d.YesOrNo" :key="'form.IsGenerateGlobalTask' + item.value" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="'form.IsGenerateGlobalTask' + item.value"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </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
@@ -51,64 +117,73 @@
           type="primary"
           @click="close"
         >
-          {{ $t('common:button:cancel') }}
+          {{ $t("common:button:cancel") }}
         </el-button>
         <!-- 保存 -->
-        <el-button size="small" type="primary" :loading="btnLoading" :disabled="isDisable" @click="save">
-          {{ $t('common:button:save') }}
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          :disabled="isDisable"
+          @click="save"
+        >
+          {{ $t("common:button:save") }}
         </el-button>
       </el-form-item>
     </div>
   </el-form>
 </template>
 <script>
-import { getConsistentRule, addOrUpdateTaskConsistentRule } from '@/api/trials/reading'
+import {
+  getConsistentRule,
+  addOrUpdateTaskConsistentRule,
+} from "@/api/trials/reading";
 
 export default {
-  name: 'AddOrUpdateTaskAllocationRuleData',
+  name: "AddOrUpdateTaskAllocationRuleData",
   props: {
     TrialReadingCriterionId: {
       type: String,
       default() {
-        return ''
-      }
+        return "";
+      },
     },
     OtherInfo: {
       type: Object,
       default() {
-        return {}
-      }
+        return {};
+      },
     },
     trialCriterionList: {
       type: Array,
       default() {
-        return []
-      }
+        return [];
+      },
     },
     data: {
       type: Object,
       default() {
-        return {}
-      }
+        return {};
+      },
     },
     isDisable: {
       type: Boolean,
       default() {
-        return true
-      }
+        return true;
+      },
     },
     isSelfAnalysis: {
       type: Boolean,
       default() {
-        return true
-      }
+        return true;
+      },
     },
     doctorUserList: {
       type: Array,
       default() {
-        return []
-      }
-    }
+        return [];
+      },
+    },
   },
   data() {
     return {
@@ -120,81 +195,133 @@ export default {
         IntervalWeeks: 3,
         IsHaveReadingPeriod: null,
         IsGenerateGlobalTask: null,
-        BlindTrialSiteCode: '',
+        BlindTrialSiteCode: "",
         BlindSubjectNumberOfPlaces: 3,
         IsEnable: true,
-        Note: ''
+        Note: "",
       },
-      Result:{}, // 接口返回弹窗数据，用于虚拟中心可编辑校验
+      Result: {}, // 接口返回弹窗数据，用于虚拟中心可编辑校验
       rules: {
-        IsHaveReadingPeriod: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        IsGenerateGlobalTask: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        PlanSubjectCount: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        IntervalWeeks: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        PlanVisitCount: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        BlindTrialSiteCode: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        BlindSubjectNumberOfPlaces: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        IsHaveReadingPeriod: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: "blur",
+          },
+        ],
+        IsGenerateGlobalTask: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: "blur",
+          },
+        ],
+        PlanSubjectCount: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        IntervalWeeks: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        PlanVisitCount: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        BlindTrialSiteCode: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        BlindSubjectNumberOfPlaces: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
       },
       loading: false,
-      btnLoading: false
-    }
+      btnLoading: false,
+      ruleOtherInfo: {},
+    };
   },
   mounted() {
     // this.form.TrialId = this.$route.query.trialId
     // if (Object.keys(this.data).length && this.data.Id) {
     //   this.form = { ...this.data }
     // }
-    this.getFrom()
+    this.getFrom();
   },
-  watch:{
-    "OtherInfo.VitrualSiteCode":{
-      handler(){
+  watch: {
+    "OtherInfo.VitrualSiteCode": {
+      handler() {
         this.form.BlindTrialSiteCode = this.OtherInfo.VitrualSiteCode;
-      }
-    }
+      },
+    },
   },
   methods: {
     getFrom() {
       getConsistentRule({
         TrialId: this.$route.query.trialId,
         IsSelfAnalysis: this.isSelfAnalysis,
-        TrialReadingCriterionId: this.TrialReadingCriterionId
-      }).then(res => {
-        if (res.Result) {
-          this.form = res.Result;
-          this.Result = JSON.parse(JSON.stringify(res.Result));
+        TrialReadingCriterionId: this.TrialReadingCriterionId,
+      }).then((res) => {
+        this.ruleOtherInfo =
+          { IsReadingTaskViewInOrder: res.Result.IsReadingTaskViewInOrder } ||
+          {};
+        if (res.Result.ConsistentRuleBasic) {
+          this.form = res.Result.ConsistentRuleBasic;
+          this.Result = JSON.parse(
+            JSON.stringify(res.Result.ConsistentRuleBasic)
+          );
         } else {
-          let o = this.trialCriterionList.find(v => {
-            return v.TrialReadingCriterionId === this.TrialReadingCriterionId
-          })
-          this.form.IsHaveReadingPeriod = o.IsReadingPeriod
-          this.form.IsGenerateGlobalTask = o.IsReadingPeriod
+          let o = this.trialCriterionList.find((v) => {
+            return v.TrialReadingCriterionId === this.TrialReadingCriterionId;
+          });
+          this.form.IsHaveReadingPeriod = o.IsReadingPeriod;
+          this.form.IsGenerateGlobalTask = o.IsReadingPeriod;
         }
-        this.form.BlindTrialSiteCode = this.OtherInfo.VitrualSiteCode
-      })
+        this.form.BlindTrialSiteCode = this.OtherInfo.VitrualSiteCode;
+      });
     },
     save() {
-      this.$refs.taskAllocationRuleDataForm.validate(valid => {
-        if (!valid) return
-        this.btnLoading = true
-        this.loading = true
-        this.form.IsSelfAnalysis = this.isSelfAnalysis
-        this.form.TrialReadingCriterionId = this.TrialReadingCriterionId
-        addOrUpdateTaskConsistentRule(this.form).then(res => {
-          this.loading = false
-          this.btnLoading = false
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.$emit('close')
-          this.$emit('getList')
-        }).catch(() => {
-          this.loading = false
-          this.btnLoading = false
-        })
-      })
+      this.$refs.taskAllocationRuleDataForm.validate((valid) => {
+        if (!valid) return;
+        this.btnLoading = true;
+        this.loading = true;
+        this.form.IsSelfAnalysis = this.isSelfAnalysis;
+        this.form.TrialReadingCriterionId = this.TrialReadingCriterionId;
+        addOrUpdateTaskConsistentRule(this.form)
+          .then((res) => {
+            this.loading = false;
+            this.btnLoading = false;
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.$emit("close");
+            this.$emit("getList");
+          })
+          .catch(() => {
+            this.loading = false;
+            this.btnLoading = false;
+          });
+      });
     },
-    close() { this.$emit('close') }
-  }
-}
+    close() {
+      this.$emit("close");
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 </style>

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

@@ -111,10 +111,11 @@ export default {
     this.isRender = true
   },
   methods: {
-    handleSave() {
-      this.$refs.assessmentForm.validate(async valid => {
-        if (!valid) return
-        const loading = this.$loading({ fullscreen: true })
+    async handleSave() {
+      const valid = await this.$refs.assessmentForm.validate()
+      if (!valid) return
+      const loading = this.$loading({ fullscreen: true })
+      try {
         var answers = []
         for (const k in this.form) {
           answers.push({ questionId: k, answer: this.form[k] })
@@ -123,13 +124,15 @@ export default {
           visitTaskId: this.visitTaskId,
           answerList: answers
         }
-        submitTaskAdditionalQuestion(params).then(res => {
+        const res = await submitTaskAdditionalQuestion(params)
+        if (res.IsSuccess) {
           this.$emit('sign')
-          loading.close()
-        }).catch(() => {
-          loading.close()
-        })
-      })
+        }
+        loading.close()
+      } catch (e) {
+        console.log(e)
+        loading.close()
+      }
     },
     handleCancel() {
       this.$emit('close')

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

@@ -1,6 +1,6 @@
 <template>
   <el-form
-    ref="subjectForm"
+    ref="customWWWC"
     v-loading="loading"
     :model="form"
     :rules="rules"
@@ -67,11 +67,10 @@ export default {
     }
   },
   methods: {
-    handleSave() {
-      this.$refs.subjectForm.validate(valid => {
-        if (!valid) return
-        this.$emit('setWwwc', this.form)
-      })
+    async handleSave() {
+      const valid = await this.$refs.customWWWC.validate()
+      if (!valid) return
+      this.$emit('setWwwc', this.form)
     },
     handleCancel() {
       this.$emit('close')

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

@@ -13,7 +13,7 @@
     <!-- 临床数据 -->
     <div v-if="stack.isExistsClinicalData" class="info-cd" @click.stop="handleViewCD($event)">
       <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:clinicalData')" placement="bottom">
-        <svg-icon icon-class="documentation" class="svg-icon"/>
+        <svg-icon icon-class="documentation" class="svg-icon" />
       </el-tooltip>
 
     </div>
@@ -899,7 +899,7 @@ export default {
           } else {
             cornerstoneTools.setToolEnabledForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
           }
-          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame) || !data.MeasureData.frame) && data.MeasureData) {
+          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame && data.MeasureData) || (!this.stack.isExistMutiFrames && data.MeasureData))) {
             const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type)
             if (toolState && toolState.data.length > 0) {
               var idx = toolState.data.findIndex(item => item.uuid === data.MeasureData.data.uuid)
@@ -1054,7 +1054,7 @@ export default {
         this.stack.studyId = dicomSeries.studyId
         this.stack.seriesNumber = dicomSeries.seriesNumber
         this.stack.imageIds = dicomSeries.imageIds
-        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex ? dicomSeries.imageIdIndex : 0
+        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length ? dicomSeries.imageIdIndex : 0
         this.stack.imageIdIndex = dicomSeries.imageIdIndex
         this.stack.firstImageLoading = true
         this.stack.visitTaskId = dicomSeries.visitTaskId
@@ -1203,7 +1203,7 @@ export default {
         this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
         this.stack.instanceId = instanceId
         this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
-        this.resetWwwc()
+        // this.resetWwwc()
         resolve()
       })
     },
@@ -1941,6 +1941,9 @@ export default {
       for (const [key, value] of searchParams.entries()) {
         params[key] = value
       }
+      if (isNaN(params.frame)) {
+        params.frame = 0
+      }
       return params
     },
     preventDefault(e) {

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

@@ -878,7 +878,7 @@ export default {
     activeSeries: {
       immediate: true,
       handler(v) {
-        console.log('activeSeries', v)
+        // console.log('activeSeries', v)
         if (v && v.isCurrentTask && this.studyList.length === 0) {
           this.activeTaskInfo.taskName = v.taskBlindName
           this.activeTaskInfo.visitTaskId = v.visitTaskId
@@ -1021,6 +1021,10 @@ export default {
       if (!this.petctWindow) return
       this.petctWindow.postMessage({ type: 'readingPageUpdate', data: data }, window.location)
     })
+    DicomEvent.$on('resetPage', () => {
+      if (!this.petctWindow) return
+      this.petctWindow.postMessage({ type: 'resetPage' }, window.location)
+    })
     DicomEvent.$on('setReadingState', (data) => {
       if (!this.petctWindow) return
       this.petctWindow.postMessage({ type: 'setReadingState', data: data }, window.location)
@@ -1058,28 +1062,30 @@ export default {
     })
   },
   methods: {
-    getWwcTpl() {
-      const loading = this.$loading({ fullscreen: true })
-      getUserWLTemplateList().then(res => {
+    async getWwcTpl() {
+      // const loading = this.$loading({ fullscreen: true })
+      try {
+        const res = await getUserWLTemplateList()
         this.customWwcTpl = []
         res.Result.map(i => {
           this.customWwcTpl.push({ label: i.TemplateName, wc: i.WL, ww: i.WW })
         })
         this.wwwcArr = [...this.defaultWwwc, ...this.customWwcTpl]
-        loading.close()
-      }).catch(() => { loading.close() })
+      } catch (e) {
+        console.log(e)
+      }
     },
-    getHotKeys() {
-      const loading = this.$loading({ fullscreen: true })
-      getDoctorShortcutKey({ imageToolType: 0 }).then(res => {
+    async getHotKeys() {
+      // const loading = this.$loading({ fullscreen: true })
+      try {
+        const res = await getDoctorShortcutKey({ imageToolType: 0 })
         res.Result.map(item => {
           this.hotKeyList.push({ id: item.Id, altKey: item.AltKey, ctrlKey: item.CtrlKey, shiftKey: item.ShiftKey, metaKey: item.MetaKey, key: item.Keyboardkey, code: item.Code, text: item.Text, shortcutKeyEnum: item.ShortcutKeyEnum })
         })
         this.bindHotKey()
-        loading.close()
-      }).catch(() => {
-        loading.close()
-      })
+      } catch (e) {
+        console.log(e)
+      }
     },
     resetHotkeyList(arr) {
       this.hotKeyList = []
@@ -1102,7 +1108,7 @@ export default {
       var container = this.$refs['container']
       // window.addEventListener
       container.addEventListener('keydown', event => {
-        console.log(event)
+        // console.log(event)
         event.preventDefault()
 
         var idx = this.hotKeyList.findIndex(i => i.code === event.code && i.ctrlKey === event.ctrlKey && i.shiftKey === event.shiftKey && i.altKey === event.altKey)
@@ -1241,7 +1247,8 @@ export default {
             store.dispatch('reading/setActiveSeries', series)
             store.dispatch('reading/setLastCanvasTaskId', series.visitTaskId)
           }
-          this.$refs[`dicomCanvas${index}`][0].loadImageStack(series)
+          const s = Object.assign({}, series)
+          this.$refs[`dicomCanvas${index}`][0].loadImageStack(s)
 
           if (this.activeTool) {
             if (series.isCurrentTask && series.readingTaskState < 2) {
@@ -1264,7 +1271,8 @@ export default {
       this.canvasObj[this.currentDicomCanvasIndex] = dicomSeries
       this.$nextTick(() => {
         this.activeSeries = dicomSeries
-        this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].loadImageStack(dicomSeries).then(res => {
+        const s = Object.assign({}, dicomSeries)
+        this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].loadImageStack(s).then(res => {
           if (this.activeTool) {
             if (dicomSeries.isCurrentTask && dicomSeries.readingTaskState < 2) {
               this.$nextTick(() => {
@@ -1325,7 +1333,8 @@ export default {
       // }
       this.$nextTick(() => {
         this.activeSeries = dicomSeries
-        this.$refs[`dicomCanvas${canvasIndex}`][0].loadImageStack(dicomSeries)
+        const s = Object.assign({}, dicomSeries)
+        this.$refs[`dicomCanvas${canvasIndex}`][0].loadImageStack(s)
 
         store.dispatch('reading/setActiveSeries', dicomSeries)
         if (this.currentDicomCanvasIndex === this.maxCanvas - 1) {
@@ -1400,7 +1409,8 @@ export default {
         var promiseArr = []
         for (let i = 0; i < this.maxCanvas && i < seriesStack.length; i++) {
           this.canvasObj[i] = seriesStack[i]
-          promiseArr.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(seriesStack[i]))
+          const s = Object.assign({}, seriesStack[i])
+          promiseArr.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(s))
         }
         Promise.all(promiseArr).then(() => {
           // this.activateDicomCanvas(this.currentDicomCanvasIndex)
@@ -1503,12 +1513,14 @@ export default {
 
         for (let i = 0; i < this.maxCanvas; i++) {
           if (i === this.maxCanvas - 1) {
-            loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(currentAddSeries))
+            const s = Object.assign({}, currentAddSeries)
+            loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(s))
             this.currentDicomCanvasIndex = i
             this.activeSeries = currentAddSeries
             store.dispatch('reading/setActiveSeries', currentAddSeries)
           } else {
-            loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(firstAddSeries))
+            const s = Object.assign({}, firstAddSeries)
+            loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(s))
           }
         }
         Promise.all(loadImagePromises)

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

@@ -798,17 +798,17 @@ export default {
           var imageIds = []
           var instanceList = []
           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' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}?frame=${i}`
-                  imageIds.push(imageId)
-                }
-              } else {
-                const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}`
+            if (instance.NumberOfFrames && instance.NumberOfFrames > 1) {
+              for (let i = 0; i < instance.NumberOfFrames; i++) {
+                const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}?frame=${i}`
                 imageIds.push(imageId)
               }
-              instanceList.push(instance.Id)
-            })
+            } else {
+              const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}`
+              imageIds.push(imageId)
+            }
+            instanceList.push(instance.Id)
+          })
           resolve({
             imageIds: imageIds,
             instanceList: instanceList,
@@ -2149,7 +2149,49 @@ export default {
         this.screenshotWindow.close()
       }
     },
+    async clearAnnotations() {
+      const viewportIds = ['PT_AXIAL', 'CT_AXIAL', 'FUSION_AXIAL']
+      viewportIds.map(v => {
+        const viewport = renderingEngine.getViewport(v)
+        if (viewport) {
+          var annotations = annotation.state.getAnnotations('CircleROI', viewport.element)
+
+          if (annotations && annotations.length > 0) {
+            annotations.map(i => {
+              if (i.metadata.toolName === 'CircleROI') {
+                annotation.state.removeAnnotation(i.annotationUID)
+              }
+            })
+          }
+        }
+        viewport.render()
+      })
+      try {
+        const visitTaskId = this.$route.query.visitTaskId
+        const res = await getTableAnswerRowInfoList(visitTaskId)
+        if (res.IsSuccess) {
+          var arr = []
+          res.Result.forEach(el => {
+            if (el.OtherMeasureData) {
+              el.OtherMeasureData = JSON.parse(el.OtherMeasureData)
+              el.OtherMeasureData.invalidated = false
+              if (this.readingTaskState === 2) {
+                el.OtherMeasureData.isLocked = true
+              }
+              el.OtherMeasureData.data.remark = el.OrderMarkName
+              const viewport = renderingEngine.getViewport('PT_AXIAL')
+              annotation.state.addAnnotation(el.OtherMeasureData, viewport.element)
+            }
+            arr.push(el)
+          })
+          this.measureDatas = arr
+        }
+      } catch (e) {
+
+      }
+    },
     async receiveMsg(event) {
+      console.log(event.data.type)
       if (event.data.type === 'readingPageUpdate') {
         // this.$refs['questions'].initList()
         this.$refs['tableQuestions'].initList(true)
@@ -2171,6 +2213,14 @@ export default {
           FusionEvent.$emit('closeHistoryScreenshot')
           window.close()
         }
+      } else if (event.data.type === 'resetPage') {
+        if (this.screenshotWindow) {
+          this.screenshotWindow.close()
+        }
+        this.$refs['tableQuestions'].initList(true)
+        this.$refs['questions'].initList(true)
+        this.isLocate = true
+        this.clearAnnotations()
       }
     },
     startTimer() {

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

@@ -7,7 +7,7 @@
         {{ language==='en'?question.GroupEnName:question.GroupName }}
       </h4>
     </div>
-    <template v-else-if="((question.QuestionType === 56 || question.QuestionType === 57) && question.IsBaseLineTask)" />
+    <template v-else-if="((question.QuestionType === 56) && question.IsBaseLineTask)" />
     <template v-else>
       <el-form-item
         v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0"
@@ -66,6 +66,27 @@
             </template>
           </el-input>
         </template>
+        <template v-else-if="question.QuestionType === 55">
+          <el-select
+            v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2 "
+            clearable
+            @change="((val)=>{formItemChange(val, question)})"
+          >
+            <el-option-group
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
+            >
+              <template>
+                <el-option
+                  v-for="item of $d[question.DictionaryCode]"
+                  :key="item.id"
+                  :value="String(item.value)"
+                  :label="item.label"
+                />
+              </template>
+            </el-option-group>
+          </el-select>
+        </template>
         <template v-else-if="question.QuestionType === 56">
           <el-select
             v-model="questionForm[question.Id]"
@@ -73,23 +94,27 @@
             clearable
             @change="((val)=>{formItemChange(val, question)})"
           >
-            <template v-if="pet5PS*1=== -1">
-              <el-option
-                v-for="item of $d[question.DictionaryCode]"
-                v-show="item.value !== 4"
-                :key="item.id"
-                :value="String(item.value)"
-                :label="item.label"
-              />
-            </template>
-            <template v-else>
-              <el-option
-                v-for="item of $d[question.DictionaryCode]"
-                :key="item.id"
-                :value="String(item.value)"
-                :label="item.label"
-              />
-            </template>
+            <el-option-group
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${parseFloat(question.LastTaskAnswer) === 5 ? 'NA' : $fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
+            >
+              <template v-if="pet5PS*1=== -1">
+                <el-option
+                  v-for="item of $d[question.DictionaryCode]"
+                  v-show="item.value !== 4"
+                  :key="item.id"
+                  :value="String(item.value)"
+                  :label="item.label"
+                />
+              </template>
+              <template v-else>
+                <el-option
+                  v-for="item of $d[question.DictionaryCode]"
+                  :key="item.id"
+                  :value="String(item.value)"
+                  :label="item.label"
+                />
+              </template>
+            </el-option-group>
           </el-select>
         </template>
         <template v-else-if="question.QuestionType === 57">
@@ -99,23 +124,27 @@
             clearable
             @change="((val)=>{formItemChange(val, question)})"
           >
-            <template v-if="pet5PS*1=== -1">
-              <el-option
-                v-for="item of $d[question.DictionaryCode]"
-                v-show="item.value !== 1"
-                :key="item.id"
-                :value="String(item.value)"
-                :label="item.label"
-              />
-            </template>
-            <template v-else>
-              <el-option
-                v-for="item of $d[question.DictionaryCode]"
-                :key="item.id"
-                :value="String(item.value)"
-                :label="item.label"
-              />
-            </template>
+            <el-option-group
+              :label="!isNaN(parseFloat(question.LastTaskAnswer)) ? `${$t('trials:dicomReading:tip:lastVisitStatus')} ${$fd(question.DictionaryCode,parseFloat(question.LastTaskAnswer))}` : ''"
+            >
+              <template v-if="pet5PS*1=== -1">
+                <el-option
+                  v-for="item of $d[question.DictionaryCode]"
+                  v-show="item.value !== 1"
+                  :key="item.id"
+                  :value="String(item.value)"
+                  :label="item.label"
+                />
+              </template>
+              <template v-else>
+                <el-option
+                  v-for="item of $d[question.DictionaryCode]"
+                  :key="item.id"
+                  :value="String(item.value)"
+                  :label="item.label"
+                />
+              </template>
+            </el-option-group>
           </el-select>
         </template>
         <!-- 输入框 -->
@@ -286,7 +315,7 @@
         :reading-task-state="readingTaskState"
         :question-form="questionForm"
         :visit-task-id="visitTaskId"
-        :pet5PS="pet5PS"
+        :pet5p-s="pet5PS"
         :lung-is-inside-volume="lungIsInsideVolume"
         :liver-is-inside-volume="liverIsInsideVolume"
         @setFormItemData="setFormItemData"
@@ -333,7 +362,7 @@ export default {
     pet5PS: {
       type: String,
       default: ''
-    },
+    }
   },
   data() {
     return {

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

@@ -14,7 +14,7 @@
           :question-form="questionForm"
           :reading-task-state="readingTaskState"
           :visit-task-id="visitTaskId"
-          :pet5PS="questionForm[pet5PSId]"
+          :pet5p-s="questionForm[pet5PSId]"
           :lung-is-inside-volume="lungIsInsideVolume"
           :liver-is-inside-volume="liverIsInsideVolume"
           @setFormItemData="setFormItemData"
@@ -163,42 +163,49 @@ export default {
       }
       this.initList(true)
     },
-    initList(isInit) {
+    async initList(isInit) {
       this.loading = true
-      var params = {
-        trialId: this.trialId,
-        visitTaskId: this.visitTaskId,
-        questionClassify: 0
-      }
-      getDicomReadingQuestionAnswer(params).then(res => {
-        var questions = res.Result
+      try {
+        const params = {
+          trialId: this.trialId,
+          visitTaskId: this.visitTaskId,
+          questionClassify: 0
+        }
+        const res = await getDicomReadingQuestionAnswer(params)
+        if (res.IsSuccess) {
+          const questions = res.Result
 
-        questions.map((v) => {
-          v.IsBaseLineTask = this.isBaseLineTask
-          if (v.Type === 'group' && v.Childrens.length === 0) return
-          if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
-            this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
-          }
-          if (v.Childrens.length > 0) {
-            this.setChild(v.Childrens)
-          }
-        })
-        this.questions = questions
-        this.setPet5PSCommentDisplay()
-        this.measurements = []
-        res.OtherInfo.QuestionMarkInfoList.forEach(i => {
-          if (i.OtherMeasureData) {
-            i.OtherMeasureData = JSON.parse(i.OtherMeasureData)
-            if (i.QuestionType === 51 && isInit) {
-              this.liverRender = false
-            } else if (i.QuestionType === 52 && isInit) {
-              this.lungRender = false
+          questions.map((v) => {
+            v.IsBaseLineTask = this.isBaseLineTask
+            if (v.Type === 'group' && v.Childrens.length === 0) return
+            if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
+              this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
             }
-          }
-          this.measurements.push(i)
-        })
+            if (v.Childrens.length > 0) {
+              this.setChild(v.Childrens)
+            }
+          })
+          console.log(this.questionForm,questions)
+          this.questions = questions
+          this.setPet5PSCommentDisplay()
+          this.measurements = []
+          res.OtherInfo.QuestionMarkInfoList.forEach(i => {
+            if (i.OtherMeasureData) {
+              i.OtherMeasureData = JSON.parse(i.OtherMeasureData)
+              if (i.QuestionType === 51 && isInit) {
+                this.liverRender = false
+              } else if (i.QuestionType === 52 && isInit) {
+                this.lungRender = false
+              }
+            }
+            this.measurements.push(i)
+          })
+        }
         this.loading = false
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        console.log(e)
+        this.loading = false
+      }
     },
     setChild(obj) {
       obj.forEach(i => {
@@ -263,37 +270,28 @@ export default {
         // }
       })
     },
-    saveQuestionsForm() {
+    async saveQuestionsForm() {
       this.loading = true
-      var answers = []
-      for (const k in this.questionForm) {
-        answers.push({ id: k, answer: this.questionForm[k] })
-      }
-      // var questionMarkInfoList = []
-      // this.measurements.forEach(item => {
-      //   var i = Object.assign({}, item)
-      //   if (i.OtherMeasureData) {
-      //     for (const k in i.OtherMeasureData.data.cachedStats) {
-      //       i.OtherMeasureData.data.cachedStats[k].pointsInShape = []
-      //     }
-      //     i.OtherMeasureData = JSON.stringify(i.OtherMeasureData)
-      //   }
-
-      //   questionMarkInfoList.push(i)
-      // })
-      var params = {
-        visitTaskId: this.visitTaskId,
-        answers: answers
-        // questionMarkInfoList
-      }
-      saveTaskQuestion(1, params).then(async res => {
-        window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
+      try {
+        var answers = []
+        for (const k in this.questionForm) {
+          answers.push({ id: k, answer: this.questionForm[k] })
+        }
+        var params = {
+          visitTaskId: this.visitTaskId,
+          answers: answers
+        }
+        const res = await saveTaskQuestion(1, params)
+        if (res.IsSuccess) {
+          window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
+          this.loading = false
+          this.questionFormChangeState = false
+          this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
+        }
+      } catch (e) {
+        console.log(e)
         this.loading = false
-        this.questionFormChangeState = false
-        this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
-      }).catch(() => {
-        this.loading = false
-      })
+      }
     },
     checkAnnotationStatus(obj) {
       for (let i = 0; i < obj.length; i++) {
@@ -422,21 +420,27 @@ export default {
             break
           }
         }
-        var params = {
-          visitTaskId: this.visitTaskId,
-          answers,
-          questionMarkInfoList
+        try {
+          var params = {
+            visitTaskId: this.visitTaskId,
+            answers,
+            questionMarkInfoList
+          }
+          const qsType = question.QuestionType === 51 ? 2 : question.QuestionType === 52 ? 3 : null
+
+          const res = await saveTaskQuestion(qsType, params)
+          if (res.IsSuccess) {
+            this.$set(question, 'SaveEnum', 0)
+            window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
+            loading.close()
+            this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
+            this.resetSuvQuestions(1)
+          }
+          loading.close()
+        } catch (e) {
+          console.log(e)
+          loading.close()
         }
-        const qsType = question.QuestionType === 51 ? 2 : question.QuestionType === 52 ? 3 : null
-        saveTaskQuestion(qsType, params).then(async res => {
-          this.$set(question, 'SaveEnum', 0)
-          window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
-          loading.close()
-          this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
-          this.resetSuvQuestions(1)
-        }).catch(() => {
-          loading.close()
-        })
       })
     },
     viewAnnotations(question) {
@@ -622,7 +626,7 @@ export default {
       console.log('setfocalFDG')
       if (this.questionForm[this.pet5PSId] !== '-1' && this.questionForm[this.focalFDGId] === '1') {
         this.questionForm[this.focalFDGId] = ''
-      } 
+      }
     },
     setpet5PS() {
       console.log('setpet5PS')
@@ -654,40 +658,38 @@ export default {
         return ''
       }
     },
-    resetSuvQuestions(type = 0) {
+    async resetSuvQuestions(type = 0) {
       this.loading = true
-      var params = {
-        trialId: this.trialId,
-        visitTaskId: this.visitTaskId,
-        questionClassify: 0
-      }
-      getDicomReadingQuestionAnswer(params).then(res => {
-        var questions = res.Result
-        questions.map((v) => {
-          if (v.Type === 'group' && v.Childrens.length === 0) return
-          // if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
-          //   this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
-          // }
-          if (v.Childrens.length > 0) {
-            this.setSuvChild(v.Childrens, type)
-          }
-          // var pet5PS = this.setpet5PS()
-          // this.questionForm[this.pet5PSId] = pet5PS
-          // this.calculatePet5PS = pet5PS
-          // this.setPet5PSCommentDisplay()
-          // this.setUptakeFormBaseline()
-        })
-        for (let i = 0; i < this.questions[0].Childrens[0].Childrens.length; i++) {
-          if (this.questions[0].Childrens[0].Childrens[i].QuestionType === 59) {
-            this.questions[0].Childrens[0].Childrens[i].ShowQuestion = 2
-            this.questions[0].Childrens[0].Childrens[i].IsRequired = 3
-            this.questionForm[this.pet5PSCommentsId] = ''
-            break
-          }
+      try {
+        const params = {
+          trialId: this.trialId,
+          visitTaskId: this.visitTaskId,
+          questionClassify: 0
+        }
+        const res = await getDicomReadingQuestionAnswer(params)
+        if (res.IsSuccess) {
+          const questions = res.Result
+          questions.map((v) => {
+            if (v.Type === 'group' && v.Childrens.length === 0) return
+            if (v.Childrens.length > 0) {
+              this.setSuvChild(v.Childrens, type)
+            }
+          })
+          for (let i = 0; i < this.questions[0].Childrens[0].Childrens.length; i++) {
+            if (this.questions[0].Childrens[0].Childrens[i].QuestionType === 59) {
+              this.questions[0].Childrens[0].Childrens[i].ShowQuestion = 2
+              this.questions[0].Childrens[0].Childrens[i].IsRequired = 3
+              this.questionForm[this.pet5PSCommentsId] = ''
+              break
+            }
+          }
+          this.questionFormChangeState = true
         }
-        this.questionFormChangeState = true
         this.loading = false
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        console.log(e)
+        this.loading = false
+      }
     },
     setSuvChild(obj, type) {
       obj.forEach(i => {

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

@@ -316,7 +316,7 @@ export default {
       this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
 
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
-      var lesionState = this.getQuestionVal(7)
+      // var lesionState = this.getQuestionVal(7)
       if (!isRerender) {
         if (this.questionForm.RowId) {
           this.$set(this.questionForm, 'saveTypeEnum', 2)
@@ -625,7 +625,7 @@ export default {
                   }
                 }
               }
-              var lesionState = this.getQuestionVal(7)
+              // var lesionState = this.getQuestionVal(7)
               if (this.firstRenderAnnotation) {
                 this.$set(this.questionForm, 'saveTypeEnum', 2)
               } else {
@@ -871,75 +871,79 @@ export default {
             this.deleteInfo = null
             params.rowId = ''
           }
-          submitTableQuestion(params).then(async res => {
-            this.currentMarkTool = otherMeasureData ? otherMeasureData.type : ''
-            // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
+          try {
+            const res = await submitTableQuestion(params)
+            if (res.IsSuccess) {
+              this.currentMarkTool = otherMeasureData ? otherMeasureData.type : ''
+              this.$set(this.questionForm, 'saveTypeEnum', 2)
+              this.originalQuestionForm = { ...this.questionForm }
+              var isLymphLesion = this.getQuestionVal(2)
+              isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
+              var lesionOrgan = this.getQuestionVal(6)
+              this.$set(this.questionForm, 'RowId', res.Result.RowId)
+              const lesionPart = this.getQuestionVal(8)
+              const suvMax = this.getQuestionVal(20)
+              this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
 
-            this.$set(this.questionForm, 'saveTypeEnum', 2)
-            this.originalQuestionForm = { ...this.questionForm }
-            loading.close()
-            var isLymphLesion = this.getQuestionVal(2)
-            isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
-            var lesionOrgan = this.getQuestionVal(6)
-            this.$set(this.questionForm, 'RowId', res.Result.RowId)
-            const lesionPart = this.getQuestionVal(8)
-            const suvMax = this.getQuestionVal(20)
-            this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+              FusionEvent.$emit('resetSuvQuestions')
+              window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
+              this.$emit('close')
 
-            // FusionEvent.$emit('getAnnotations')
-            FusionEvent.$emit('resetSuvQuestions')
-            window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
-            this.$emit('close')
+              this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
+            }
             loading.close()
-            this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
-          }).catch(() => { loading.close() })
+          } catch (e) {
+            console.log(e)
+            loading.close()
+          }
         })
       })
     },
-    handleDeleteMeasureData() {
+    async handleDeleteMeasureData() {
       // 是否确认清除标记？
-      this.$confirm(this.$t('trials:reading:warnning:msg47'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(async() => {
-          this.organList = []
-          await this.getOrganInfoList()
-          // 重置SUV
-          var suvId = this.getQuestionId(20)
-          this.$set(this.questionForm, suvId, '')
-          // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
-          if (this.questionForm.RowId) {
-            this.$set(this.questionForm, 'saveTypeEnum', 1)
-          } else {
-            this.$set(this.questionForm, 'saveTypeEnum', 0)
-          }
-          FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData, type: 'clear' })
-          // await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
+      const confirm = await this.$confirm(
+        this.$t('trials:reading:warnning:msg47'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      this.organList = []
+      await this.getOrganInfoList()
+      // 重置SUV
+      var suvId = this.getQuestionId(20)
+      this.$set(this.questionForm, suvId, '')
+      // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
+      if (this.questionForm.RowId) {
+        this.$set(this.questionForm, 'saveTypeEnum', 1)
+      } else {
+        this.$set(this.questionForm, 'saveTypeEnum', 0)
+      }
+      FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData, type: 'clear' })
+      // await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
 
-          // Store.$emit('updateImage', this.questionForm.MeasureData.instanceId)
-          var isLymphLesion = this.getQuestionVal(2)
-          isLymphLesion = !isNaN(parseInt(isLymphLesion)) ? parseInt(isLymphLesion) : null
-          const lesionPart = this.getQuestionVal(8)
-          const lesionOrgan = this.getQuestionVal(6)
+      // Store.$emit('updateImage', this.questionForm.MeasureData.instanceId)
+      var isLymphLesion = this.getQuestionVal(2)
+      isLymphLesion = !isNaN(parseInt(isLymphLesion)) ? parseInt(isLymphLesion) : null
+      const lesionPart = this.getQuestionVal(8)
+      const lesionOrgan = this.getQuestionVal(6)
 
-          if (!this.questionForm.IsDicomReading) {
+      if (!this.questionForm.IsDicomReading) {
 
-          }
-          this.$set(this.questionForm, 'IsDicomReading', true)
+      }
+      this.$set(this.questionForm, 'IsDicomReading', true)
 
-          this.$set(this.questionForm, 'OtherMeasureData', '')
-          let anwsers = null
-          if (this.answers.measureObj) {
-            anwsers = Object.assign({ measureObj: '' }, this.questionForm)
-          } else {
-            anwsers = Object.assign({}, this.questionForm)
-          }
-          var suvMax = this.getQuestionVal(20)
-          this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers })
-          this.isInsideVolume = true
-        })
-        .catch(() => {})
+      this.$set(this.questionForm, 'OtherMeasureData', '')
+      let anwsers = null
+      if (this.answers.measureObj) {
+        anwsers = Object.assign({ measureObj: '' }, this.questionForm)
+      } else {
+        anwsers = Object.assign({}, this.questionForm)
+      }
+      var suvMax = this.getQuestionVal(20)
+      this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers })
+      this.isInsideVolume = true
     },
     async clearMeasurement() {
       this.organList = []
@@ -975,65 +979,63 @@ export default {
       this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers })
       this.isInsideVolume = true
     },
-    handleDelete() {
-      // 是否确认删除？
-      this.$confirm(this.$t('trials:reading:warnning:msg48'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(async() => {
-          if (this.questionForm.RowId) {
-            const loading = this.$loading({ fullscreen: true })
-            var param = {
-              visitTaskId: this.visitTaskId,
-              questionId: this.parentQsId,
-              rowId: this.questionForm.RowId
-            }
-            deleteReadingRowAnswer(param)
-              .then(async res => {
-                loading.close()
-                if (res.IsSuccess) {
-                // this.$emit('getReadingQuestionAndAnswer')
-                  if (this.questionForm.IsDicomReading && this.questionForm.OtherMeasureData) {
-                    // await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
-                    FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData, type: 'delete' })
-                  }
-                  this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
-
-                  // '删除成功！'
-                  this.$message.success(this.$t('common:message:deletedSuccessfully'))
-                  loading.close()
-                  window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
-                }
-              }).catch(() => { loading.close() })
-          } else {
-            // const loading = this.$loading({ fullscreen: true })
-            // 移除新建病灶并关闭窗口
-            if (this.questionForm.OtherMeasureData && this.questionForm.IsDicomReading) {
-              // await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
-              FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData })
-            }
-            this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
-            // loading.close()
-          }
-        })
-    },
-    handleClose() {
-      if (!this.questionForm.RowId) {
-        // '当前病灶为新建病灶，未保存。如果关闭窗口，将会删除病灶信息，是否继续？'
-        this.$confirm(this.$t('trials:reading:warnning:msg49'), {
+    async handleDelete() {
+      const confirm = await this.$confirm(
+        this.$t('trials:reading:warnning:msg48'),
+        {
           type: 'warning',
           distinguishCancelAndClose: true
-        })
-          .then(async() => {
-            // 移除新建病灶并关闭窗口
-            if (this.questionForm.OtherMeasureData) {
-              FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData })
-              // await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
+        }
+      )
+      if (confirm !== 'confirm') return
+      if (this.questionForm.RowId) {
+        const loading = this.$loading({ fullscreen: true })
+        try {
+          var param = {
+            visitTaskId: this.visitTaskId,
+            questionId: this.parentQsId,
+            rowId: this.questionForm.RowId
+          }
+          const res = await deleteReadingRowAnswer(param)
+          if (res.IsSuccess) {
+            if (this.questionForm.IsDicomReading && this.questionForm.OtherMeasureData) {
+              FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData, type: 'delete' })
             }
             this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
-          })
-          .catch(() => {})
+            // '删除成功！'
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
+            loading.close()
+            window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
+          }
+          loading.close()
+        } catch (e) {
+          console.log(e)
+          loading.close()
+        }
+      } else {
+        // 移除新建病灶并关闭窗口
+        if (this.questionForm.OtherMeasureData && this.questionForm.IsDicomReading) {
+          FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData })
+        }
+        this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
+      }
+    },
+    async handleClose() {
+      if (!this.questionForm.RowId) {
+        // '当前病灶为新建病灶，未保存。如果关闭窗口，将会删除病灶信息，是否继续？'
+        const confirm = await this.$confirm(
+          this.$t('trials:reading:warnning:msg49'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        // 移除新建病灶并关闭窗口
+        if (this.questionForm.OtherMeasureData) {
+          FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.questionForm.OtherMeasureData })
+        }
+        this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
       } else {
         if (this.questionForm.saveTypeEnum === 1) {
           this.$emit('close')

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

@@ -56,22 +56,25 @@ export default {
     this.getHotkeys()
   },
   methods: {
-    getHotkeys(isReset = false) {
+    async getHotkeys(isReset = false) {
       this.loading = true
       this.hotKeyList = []
-      getDoctorShortcutKey({ imageToolType: this.readingTool }).then(res => {
-        res.Result.map(item => {
-          this.hotKeyList.push({ id: item.Id, keys: { controlKey: { altKey: item.AltKey, ctrlKey: item.CtrlKey, shiftKey: item.ShiftKey, metaKey: item.MetaKey, key: item.Keyboardkey, code: item.Code }, text: item.Text }, label: item.ShortcutKeyEnum })
-        })
-        if (isReset) {
-          this.$emit('reset', this.hotKeyList)
+      try {
+        const res = await getDoctorShortcutKey({ imageToolType: this.readingTool })
+        if (res.IsSuccess) {
+          res.Result.map(item => {
+            this.hotKeyList.push({ id: item.Id, keys: { controlKey: { altKey: item.AltKey, ctrlKey: item.CtrlKey, shiftKey: item.ShiftKey, metaKey: item.MetaKey, key: item.Keyboardkey, code: item.Code }, text: item.Text }, label: item.ShortcutKeyEnum })
+          })
+          if (isReset) {
+            this.$emit('reset', this.hotKeyList)
+          }
         }
         this.loading = false
-      }).catch(() => {
+      } catch (e) {
         this.loading = false
-      })
+      }
     },
-    handleSave() {
+    async handleSave() {
       var params = {
         imageToolType: this.readingTool,
         shortcutKeyList: []
@@ -86,17 +89,15 @@ export default {
           emptyLabel = item.label
           break
         } else {
-          shortcutKeyList.push(
-            {
-              shortcutKeyEnum: item.label,
-              keyboardkey: item.keys.controlKey.key,
-              code: item.keys.controlKey.code,
-              text: item.keys.text,
-              altKey: item.keys.controlKey.altKey,
-              ctrlKey: item.keys.controlKey.ctrlKey,
-              shiftKey: item.keys.controlKey.shiftKey,
-              metaKey: item.keys.controlKey.metaKey }
-          )
+          shortcutKeyList.push({
+            shortcutKeyEnum: item.label,
+            keyboardkey: item.keys.controlKey.key,
+            code: item.keys.controlKey.code,
+            text: item.keys.text,
+            altKey: item.keys.controlKey.altKey,
+            ctrlKey: item.keys.controlKey.ctrlKey,
+            shiftKey: item.keys.controlKey.shiftKey,
+            metaKey: item.keys.controlKey.metaKey })
         }
       }
       if (isExistEmptyText) {
@@ -112,43 +113,40 @@ export default {
         })
       } else {
         this.loading = true
-        // this.hotKeyList.map(item => {
-        //   shortcutKeyList.push(
-        //     {
-        //       shortcutKeyEnum: item.label,
-        //       keyboardkey: item.keys.controlKey.key,
-        //       code: item.keys.controlKey.code,
-        //       text: item.keys.text,
-        //       altKey: item.keys.controlKey.altKey,
-        //       ctrlKey: item.keys.controlKey.ctrlKey,
-        //       shiftKey: item.keys.controlKey.shiftKey,
-        //       metaKey: item.keys.controlKey.metaKey }
-        //   )
-        // })
         params.shortcutKeyList = shortcutKeyList
-        setShortcutKey(params).then(res => {
-          this.$emit('reset', this.hotKeyList)
-          // this.$emit('close')
+        try {
+          const res = await setShortcutKey(params)
+          if (res.IsSuccess) {
+            this.$emit('reset', this.hotKeyList)
+          }
           this.loading = false
-        }).catch(() => {
+        } catch (e) {
           this.loading = false
-        })
+        }
       }
     },
-    handleReset() {
+    async handleReset() {
       // '是否确认重置？'
-      this.$confirm(this.$t('trials:hotkeys:message:confirmReset'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          this.loading = true
-          restoreDefaultShortcutKey({ imageToolType: this.readingTool }).then(res => {
-            this.$message.success(this.$t('trials:hotkeys:message:resetSuccessfully')) // '重置成功！'
-            this.getHotkeys(true)
-          }).catch(() => { this.loading = false })
-        })
-        .catch(action => {})
+      const confirm = await this.$confirm(
+        this.$t('trials:hotkeys:message:confirmReset'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+
+      this.loading = true
+      try {
+        const res = await restoreDefaultShortcutKey({ imageToolType: this.readingTool })
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('trials:hotkeys:message:resetSuccessfully')) // '重置成功！'
+          this.getHotkeys(true)
+        }
+        this.loading = false
+      } catch (e) {
+        this.loading = false
+      }
     },
     handleHotkeyVerify(hotkey) {
       for (const item of this.hotKeyList) {

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

@@ -2,10 +2,20 @@
   <div class="measurement-wrapper" :style="{'height':height+10+'px'}">
 
     <div class="container" :style="{'height':height+'px'}">
-      <h3 v-if="isReadingShowSubjectInfo" style="color: #ddd;padding: 5px 0px;margin: 0;">
-        <span v-if="subjectCode">{{ subjectCode }} </span>
-        <span style="margin-left:5px;">{{ taskBlindName }}</span>
-      </h3>
+      <div class="basic-info">
+        <h3 v-if="isReadingShowSubjectInfo">
+          <span v-if="subjectCode">{{ subjectCode }} </span>
+          <span style="margin-left:5px;">{{ taskBlindName }}</span>
+        </h3>
+        <div v-if="readingTaskState < 2">
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
+            <i
+              class="el-icon-refresh-left"
+              @click="resetMeasuredData"
+            />
+          </el-tooltip>
+        </div>
+      </div>
       <!-- 非测量问题 -->
       <div class="lesions">
         <Questions
@@ -29,7 +39,7 @@
                   class="title"
                 >
                   {{ item.QuestionName }}
-                  <span v-if="isFirstChangeTask && item.TableQuestions.Answers.length > 0" style="color:red;font-size: 12px;">(请重新评估)</span>
+                  <span v-if="isFirstChangeTask && item.TableQuestions.Answers.length > 0" style="color:red;font-size: 12px;">{{ $t("trials:reading:dicom:IRecist:reevaluate") }}</span>
                 </div>
                 <div v-else class="title">
                   {{ item.QuestionName }}
@@ -157,6 +167,7 @@
 </template>
 <script>
 import { splitLesion } from '@/api/trials'
+import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
 import { mapGetters } from 'vuex'
@@ -578,15 +589,15 @@ export default {
         }
       }
     },
-    split(rowId, questionId) {
+    async split(rowId, questionId) {
       const loading = this.$loading({ fullscreen: true })
-      var params = {
-        visitTaskId: this.visitTaskId,
-        questionId: questionId,
-        rowId: rowId
-      }
-      splitLesion(params).then(async res => {
-        loading.close()
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionId: questionId,
+          rowId: rowId
+        }
+        await splitLesion(params)
         await this.getReadingQuestionAndAnswer()
         this.$nextTick(() => {
           this.tableQuestions.forEach(item => {
@@ -596,7 +607,11 @@ export default {
             })
           })
         })
-      })
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
     },
     isCanActiveTool(toolName) {
       console.log('isCanActiveTool')
@@ -1068,6 +1083,39 @@ export default {
     getECRFQuestions(obj) {
       this.$refs['ecrf'].getQuestions(obj.visitTaskId)
     },
+    async resetMeasuredData() {
+      const confirm = await this.$confirm(
+        this.$t('trials:dicomReading:message:confirmReset1'),
+        this.$t('trials:dicomReading:message:confirmReset2'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
+        this.loading = false
+        if (res.IsSuccess) {
+          // 刷新标注、表单、报告页信息
+          this.activeName = ''
+          this.activeItem.activeRowIndex = null
+          this.activeItem.activeCollapseId = null
+          await this.getReadingQuestionAndAnswer(this.visitTaskId)
+          const triald = this.$router.currentRoute.query.trialId
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+          DicomEvent.$emit('getMeasureData')
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('refreshStudyListMeasureData')
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
     receiveMsg(event) {
       if (event.data.type === 'isCanActiveNoneDicomTool') {
         this.getUnSaveTarget()
@@ -1140,6 +1188,22 @@ export default {
 
   .container{
     padding: 10px;
+    .basic-info{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      h3{
+        color: #ddd;
+        padding: 5px 0px;
+        margin: 0;
+      }
+      i{
+        color: #fff;
+        font-size: 22px;
+        font-weight: bold;
+        cursor: pointer;
+      }
+    }
   }
   .title{
     padding: 5px;