pacs

中心调查表链接添加二维码
重阅跟踪添加国际化
2024-07-17 10:09:26 +08:00 · 2024-07-15 15:52:47 +08:00 · 2024-07-12 10:25:46 +08:00 · 2024-07-10 10:55:56 +08:00 · 2024-07-10 09:53:28 +08:00 · 2024-07-10 09:07:03 +08:00
124 changed files with 9391 additions and 4381 deletions
@@ -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-30/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-10/'

 # 是否开启登陆限制 true:是 false:否
-VUE_APP_LOGIN_FOR_PERMISSION = true
+VUE_APP_LOGIN_FOR_PERMISSION = false

 # 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否
 VUE_APP_LOCK_FOR_PERMISSION_MFA = true

 # 是否开启长时间无操作锁定弹框 true:是 false:否
-VUE_APP_LOCK_FOR_PERMISSION = true
+VUE_APP_LOCK_FOR_PERMISSION = false

 # 无操作锁定弹框判断时间 单位:秒
 VUE_APP_LOCK_FOR_TIME = 900

 # 是否开启长时间无操作登出 true:是 false:否
-VUE_APP_LOGOUT_FOR_PERMISSION = true
+VUE_APP_LOGOUT_FOR_PERMISSION = false

 # 无操作锁定弹框判断时间 单位:秒
 VUE_APP_LOGOUT_FOR_TIME = 1800

 # 是否开启密码正则验证 true:是 false:否
-VUE_APP_PASSWORD_FOR_PERMISSION = true
+VUE_APP_PASSWORD_FOR_PERMISSION = false

 # 是否开启密码正则验证 true:是 false:否
 VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
@@ -1,46 +0,0 @@
-# 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'
@@ -10,20 +10,51 @@ clone:
  disable: true  #禁用默认克隆
  
 server:
-  host: 47.117.164.182
+  host: 106.14.89.110
  user: root
  password:
    from_secret: local_pwd

 steps:
- name: uat-branch-publish-irc-vue
+- name: publish-test-irc-vue
  commands:
-  - cd /opt/1panel/vue-devops/Uat_IRC/Uat-To-Uat
-  - sh uat-to-uat.sh v${DRONE_BUILD_NUMBER}
+  - echo start publish test-irc-vue
+  - cd /opt/1panel/hang/vue/test-irc
+  - sh test-irc.sh v${DRONE_BUILD_NUMBER}
  
 trigger:
  branch:
-    - uat    
+    - 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  
+    
    
@@ -19,6 +19,7 @@
      "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"
@@ -28,6 +29,7 @@
      "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"
@@ -36,12 +38,14 @@
    "@babel/compat-data": {
      "version": "7.23.5",
      "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.23.5.tgz",
-      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw=="
+      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
+      "dev": true
    },
    "@babel/core": {
      "version": "7.23.6",
      "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.23.6.tgz",
      "integrity": "sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==",
+      "dev": true,
      "requires": {
        "@ampproject/remapping": "^2.2.0",
        "@babel/code-frame": "^7.23.5",
@@ -63,34 +67,14 @@
        "json5": {
          "version": "2.2.3",
          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
-          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+          "dev": true
        },
        "semver": {
          "version": "6.3.1",
          "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-        }
-      }
-    },
-    "@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=="
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+          "dev": true
        }
      }
    },
@@ -98,6 +82,7 @@
      "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",
@@ -127,6 +112,7 @@
      "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",
@@ -139,6 +125,7 @@
          "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"
          }
@@ -146,12 +133,14 @@
        "semver": {
          "version": "6.3.1",
          "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+          "dev": true
        },
        "yallist": {
          "version": "3.1.1",
          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
        }
      }
    },
@@ -215,12 +204,14 @@
    "@babel/helper-environment-visitor": {
      "version": "7.22.20",
      "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+      "dev": true
    },
    "@babel/helper-function-name": {
      "version": "7.23.0",
      "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+      "dev": true,
      "requires": {
        "@babel/template": "^7.22.15",
        "@babel/types": "^7.23.0"
@@ -230,6 +221,7 @@
      "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"
      }
@@ -247,6 +239,7 @@
      "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"
      }
@@ -255,6 +248,7 @@
      "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",
@@ -304,6 +298,7 @@
      "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"
      }
@@ -321,6 +316,7 @@
      "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"
      }
@@ -328,17 +324,20 @@
    "@babel/helper-string-parser": {
      "version": "7.23.4",
      "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ=="
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "dev": true
    },
    "@babel/helper-validator-identifier": {
      "version": "7.22.20",
      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "dev": true
    },
    "@babel/helper-validator-option": {
      "version": "7.23.5",
      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw=="
+      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
+      "dev": true
    },
    "@babel/helper-wrap-function": {
      "version": "7.22.20",
@@ -355,6 +354,7 @@
      "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,6 +365,7 @@
      "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",
@@ -374,7 +375,8 @@
        "js-tokens": {
          "version": "4.0.0",
          "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+          "dev": true
        }
      }
    },
@@ -1324,6 +1326,7 @@
      "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",
@@ -1334,6 +1337,7 @@
      "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",
@@ -1350,7 +1354,8 @@
        "globals": {
          "version": "11.12.0",
          "resolved": "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+          "dev": true
        }
      }
    },
@@ -1358,6 +1363,7 @@
      "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",
@@ -1367,7 +1373,8 @@
        "to-fast-properties": {
          "version": "2.0.0",
          "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
+          "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+          "dev": true
        }
      }
    },
@@ -1574,15 +1581,11 @@
        }
      }
    },
-    "@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",
@@ -1592,61 +1595,31 @@
    "@jridgewell/resolve-uri": {
      "version": "3.1.1",
      "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "dev": true
    },
    "@jridgewell/set-array": {
      "version": "1.1.2",
      "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true
    },
    "@jridgewell/sourcemap-codec": {
      "version": "1.4.15",
      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true
    },
    "@jridgewell/trace-mapping": {
      "version": "0.3.20",
      "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+      "dev": true,
      "requires": {
        "@jridgewell/resolve-uri": "^3.1.0",
        "@jridgewell/sourcemap-codec": "^1.4.14"
      }
    },
-    "@jsdevtools/coverage-istanbul-loader": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmmirror.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz",
-      "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==",
-      "requires": {
-        "convert-source-map": "^1.7.0",
-        "istanbul-lib-instrument": "^4.0.3",
-        "loader-utils": "^2.0.0",
-        "merge-source-map": "^1.1.0",
-        "schema-utils": "^2.7.0"
-      },
-      "dependencies": {
-        "convert-source-map": {
-          "version": "1.9.0",
-          "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-1.9.0.tgz",
-          "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
-        },
-        "json5": {
-          "version": "2.2.3",
-          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
-          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
-        },
-        "loader-utils": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
-          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        }
-      }
-    },
    "@kitware/vtk.js": {
      "version": "27.3.1",
      "resolved": "https://registry.npmmirror.com/@kitware/vtk.js/-/vtk.js-27.3.1.tgz",
@@ -1745,25 +1718,6 @@
        "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",
@@ -2866,36 +2820,6 @@
            }
          }
        },
-        "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",
@@ -3130,6 +3054,7 @@
          "dev": true,
          "optional": true,
          "requires": {
+            "bindings": "^1.5.0",
            "nan": "^2.12.1"
          }
        },
@@ -3274,13 +3199,6 @@
            }
          }
        },
-        "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",
@@ -3524,32 +3442,6 @@
          "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",
@@ -5180,6 +5072,16 @@
      "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",
@@ -5463,6 +5365,7 @@
      "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",
@@ -5742,7 +5645,8 @@
    "caniuse-lite": {
      "version": "1.0.30001568",
      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001568.tgz",
-      "integrity": "sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A=="
+      "integrity": "sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A==",
+      "dev": true
    },
    "case-sensitive-paths-webpack-plugin": {
      "version": "2.4.0",
@@ -6503,7 +6407,8 @@
    "convert-source-map": {
      "version": "2.0.0",
      "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
    },
    "cookie": {
      "version": "0.5.0",
@@ -6613,32 +6518,12 @@
      }
    },
    "cornerstone-wado-image-loader": {
-      "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==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmmirror.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-3.3.2.tgz",
+      "integrity": "sha512-Yy0DtfSMlflMS5RMQhX9YnXiYYkZz99nnXG2qtBRvzvSdwqiElIpE13sKw0Ohi4mqNwrWRx0xt8utk0HKnAXyw==",
      "requires": {
-        "@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=="
-        }
+        "dicom-parser": "^1.8.3",
+        "pako": "^1.0.10"
      }
    },
    "cosmiconfig": {
@@ -6665,14 +6550,6 @@
        }
      }
    },
-    "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",
@@ -7166,11 +7043,6 @@
      "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",
@@ -7683,7 +7555,8 @@
    "electron-to-chromium": {
      "version": "1.4.611",
      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.611.tgz",
-      "integrity": "sha512-ZtRpDxrjHapOwxtv+nuth5ByB8clyn8crVynmRNGO3wG3LOp8RTcyZDqwaI6Ng6y8FCK2hVZmJoqwCskKbNMaw=="
+      "integrity": "sha512-ZtRpDxrjHapOwxtv+nuth5ByB8clyn8crVynmRNGO3wG3LOp8RTcyZDqwaI6Ng6y8FCK2hVZmJoqwCskKbNMaw==",
+      "dev": true
    },
    "elegant-spinner": {
      "version": "1.0.1",
@@ -7890,7 +7763,8 @@
    "escalade": {
      "version": "3.1.1",
      "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
    },
    "escape-html": {
      "version": "1.0.3",
@@ -8153,6 +8027,7 @@
      "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"
      },
@@ -8160,14 +8035,16 @@
        "estraverse": {
          "version": "5.3.0",
          "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
        }
      }
    },
    "estraverse": {
      "version": "4.3.0",
      "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true
    },
    "esutils": {
      "version": "2.0.3",
@@ -8607,6 +8484,13 @@
      "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",
@@ -8936,7 +8820,8 @@
    "gensync": {
      "version": "1.0.0-beta.2",
      "resolved": "https://registry.npmmirror.com/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true
    },
    "get-caller-file": {
      "version": "2.0.5",
@@ -10524,29 +10409,6 @@
      "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",
@@ -10598,7 +10460,8 @@
    "jsesc": {
      "version": "2.5.2",
      "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
    },
    "json-parse-better-errors": {
      "version": "1.0.2",
@@ -11276,6 +11139,7 @@
      "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"
      },
@@ -11283,7 +11147,8 @@
        "source-map": {
          "version": "0.6.1",
          "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
        }
      }
    },
@@ -11999,7 +11864,8 @@
    "node-releases": {
      "version": "2.0.14",
      "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
+      "dev": true
    },
    "node-sass": {
      "version": "4.14.1",
@@ -17246,6 +17112,7 @@
      "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"
@@ -17593,6 +17460,94 @@
        }
      }
    },
+    "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",
@@ -17852,6 +17807,7 @@
          "dev": true,
          "optional": true,
          "requires": {
+            "bindings": "^1.5.0",
            "nan": "^2.12.1"
          }
        },
@@ -7,7 +7,6 @@
    "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",
@@ -28,10 +27,10 @@
    "babel-eslint": "7.2.3",
    "copy-webpack-plugin": "^4.5.2",
    "core-js": "^3.8.3",
-    "cornerstone-core": "^2.6.1",
-    "cornerstone-math": "^0.1.10",
-    "cornerstone-tools": "^6.0.10",
-    "cornerstone-wado-image-loader": "^4.13.2",
+    "cornerstone-core": "^2.3.0",
+    "cornerstone-math": "^0.1.8",
+    "cornerstone-tools": "^6.0.8",
+    "cornerstone-wado-image-loader": "^3.1.2",
    "dcmjs": "^0.29.8",
    "dicom-parser": "^1.8.9",
    "dicomedit": "^0.1.0",
@@ -89,7 +89,6 @@ import {
  batchAddOrUpdateFrontInternationalization,
  getFrontInternationalizationList,
 } from "@/api/dictionary/dictionary";
-import { getTrialExtralConfig } from "@/api/trials";
 import Vue from "vue";
 import i18n from "./lang";
 export default {
@@ -106,28 +105,6 @@ 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
-        ) {
-          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);
@@ -275,4 +252,7 @@ textarea {
 .title-logo {
  height: 40px;
 }
+.title-logo {
+  height: 40px;
+}
 </style>
@@ -277,3 +277,19 @@ export function batchAddInternationalization(param) {
    data: param
  })
 }
+
+// 国际化获取迭代列表
+export function getPublishVersionSelect() {
+  return request({
+    url: `/PublishLog/getPublishVersionSelect`,
+    method: 'get',
+  })
+}
+// 国际化批量更新
+export function batchUpdateInternationalInfo(data) {
+  return request({
+    url: `/Internationalization/batchUpdateInternationalInfo`,
+    method: 'put',
+    data
+  })
+}
@@ -1013,4 +1013,36 @@ export function getTrialSiteList(params) {
    method: 'post',
    data: params
  })
+}
+
+// 获取版本记录列表
+export function getExploreRecommendList(params) {
+  return request({
+    url: `/ExploreRecommend/getExploreRecommendList`,
+    method: 'post',
+    data: params
+  })
+}
+// 新增或修改推荐版本记录
+export function addOrUpdateExploreRecommend(params) {
+  return request({
+    url: `/ExploreRecommend/addOrUpdateExploreRecommend`,
+    method: 'post',
+    data: params
+  })
+}
+// 删除推荐版本记录
+export function deleteExploreRecommend(id) {
+  return request({
+    url: `/ExploreRecommend/deleteExploreRecommend/${id}`,
+    method: 'delete'
+  })
+}
+// 获取推荐版本记录详情
+export function getExploreRecommentInfo(params) {
+  return request({
+    url: `/ExploreRecommend/getExploreRecommentInfo`,
+    method: 'get',
+    params
+  })
 }
@@ -51,4 +51,10 @@ export function batchAddOrUpdateFrontInternationalization(params) {
    data: params
  })
 }
-
+// 获取当前版本
+export function getCurrentPublishInfo() {
+  return request({
+    url: `/PublishLog/getCurrentPublishInfo`,
+    method: 'get'
+  })
+}
@@ -171,19 +171,3 @@ 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
-  })
-}
@@ -3675,11 +3675,114 @@ export function getTrialSiteSelectList(params) {
    params
  })
 }
-// 获取项目配置
-export function getTrialExtralConfig(params) {
+
+export function getNextIRMedicalFeedback(param) {
  return request({
-    url: `/TrialConfig/getTrialExtralConfig`,
+    url: `/ReadingMedicalReview/getNextIRMedicalFeedback`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function getNextCRCChallenge(param) {
+  return request({
+    url: `/QCList/getNextCRCChallenge`,
+    method: 'post',
+    data: param
+  })
+}
+
+// 获取中心dicomae列表
+export function getTrialSiteDicomAEList(param) {
+  return request({
+    url: `/TrialSiteDicomAE/getTrialSiteDicomAEList`,
+    method: 'post',
+    data: param
+  })
+}
+// 新增或修改中心dicomae信息
+export function addOrUpdateTrialSiteDicomAE(param) {
+  return request({
+    url: `/TrialSiteDicomAE/addOrUpdateTrialSiteDicomAE`,
+    method: 'post',
+    data: param
+  })
+}
+// 删除中心dicomae信息
+export function deleteTrialSiteDicomAE(id) {
+  return request({
+    url: `/TrialSiteDicomAE/deleteTrialSiteDicomAE/${id}`,
+    method: 'delete',
+  })
+}
+// 获取项目中dicomAE配置
+export function getTrialDicomAE(params) {
+  return request({
+    url: `/TrialDicomAE/getTrialDicomAE`,
    method: 'get',
    params
  })
 }
+// 项目新增或修改dicomAE配置
+export function addOrUpdateDicomAE(data) {
+  return request({
+    url: `/TrialDicomAE/addOrUpdateDicomAE`,
+    method: 'post',
+    data
+  })
+}
+// 测试dicomAE链接
+export function testSCPServerConnect(id) {
+  return request({
+    url: `/TrialDicomAE/testSCPServerConnect/${id}`,
+    method: 'get',
+  })
+}
+// dicomAE配置签名
+export function ConfigTrialPACSInfoConfirm(data) {
+  return request({
+    url: `/Inspection/configTrialBasicInfo/ConfigTrialPACSInfoConfirm`,
+    method: 'post',
+    data
+  })
+}
+// 获取推送记录
+export function getSCPImageUploadList(data) {
+  return request({
+    url: `/Patient/getSCPImageUploadList`,
+    method: 'post',
+    data
+  })
+}
+// 获取影像检查患者列表
+export function getPatientList(data) {
+  return request({
+    url: `/Patient/getPatientList`,
+    method: 'post',
+    data
+  })
+}
+// 获取影像检查患者检查列表
+export function getPatientStudyList(data) {
+  return request({
+    url: `/Patient/getPatientStudyList`,
+    method: 'post',
+    data
+  })
+}
+// 获取接收方AE列表
+export function getDicomCalledAEList(params) {
+  return request({
+    url: `/Patient/getDicomCalledAEList`,
+    method: 'get',
+    params
+  })
+}
+// 获取发送方AE列表
+export function getDicomCallingAEList(params) {
+  return request({
+    url: `/Patient/getDicomCallingAEList`,
+    method: 'get',
+    params
+  })
+}
@@ -212,10 +212,8 @@ 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
@@ -873,197 +871,194 @@ export default {
      synchronizer.remove(this.$refs.canvas)
      this.setAllToolsPassive()
    },
-    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)
-      //           }
-      //         }
-      //       ]
-      //     },
+    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)
+                }
+              }
+            ]
+          },

-      //     {
-      //       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 = [
@@ -91,21 +91,21 @@ export default {
        Code: [
          {
            required: true,
-            message: this.$t("mfa:ruleMessage:specify"),
+            message: this.$t("common:ruleMessage:specify"),
            trigger: "blur",
          },
        ],
        EMail: [
          {
            required: true,
-            message: this.$t("mfa:ruleMessage:specify"),
+            message: this.$t("common:ruleMessage:specify"),
            trigger: "blur",
          },
        ],
        username: [
          {
            required: true,
-            message: this.$t("mfa:ruleMessage:specify"),
+            message: this.$t("common:ruleMessage:specify"),
            trigger: "blur",
          },
        ],
@@ -201,7 +201,4 @@ export default {
    margin-right: 5px;
  }
 }
-::v-deep .el-dialog__header{
-  font-weight: bold;
-}
 </style>
@@ -4,14 +4,15 @@
    <el-tabs v-model="trialsTab" @tab-click="clickTab">
      <el-tab-pane v-for="item of trialsRouter.children.find(v => {return v.name == 'TrialsPanel'}).children" :key="`tab${item.path}`" :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'" :label="$t(item.LanguageMark)" :name="item.path">
        <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab">
-          <el-tab-pane
-            v-for="item1 of item.children"
-            v-if="TrialConfig && isShow(item1.path)"
-            :key="`tab1${item1.path}`"
-            :disabled="TotalNeedSignTrialDocCount !== 0 && item1.path !== '/trials/trials-panel/attachments/self-attachment' || (TrialStatusStr === 'Initializing' && (item1.path === '/trials/trials-panel/setting/personnel-manage' || item1.path === '/trials/trials-panel/setting/qc-question' || item1.path === '/trials/trials-panel/setting/reading-unit' || item1.path === '/trials/trials-panel/setting/medical-audit' || item1.path === '/trials/trials-panel/setting/email-manage'))"
-            :label="$t(item1.LanguageMark)"
-            :name="item1.path"
-          />
+          <template v-for="item1 of item.children">
+            <el-tab-pane
+              v-if="TrialConfig && isShow(item1.path)"
+              :key="`tab1${item1.path}`"
+              :disabled="TotalNeedSignTrialDocCount !== 0 && item1.path !== '/trials/trials-panel/attachments/self-attachment' || (TrialStatusStr === 'Initializing' && (item1.path === '/trials/trials-panel/setting/personnel-manage' || item1.path === '/trials/trials-panel/setting/qc-question' || item1.path === '/trials/trials-panel/setting/reading-unit' || item1.path === '/trials/trials-panel/setting/medical-audit' || item1.path === '/trials/trials-panel/setting/email-manage'))"
+              :label="$t(item1.LanguageMark)"
+              :name="item1.path"
+            />
+          </template>
        </el-tabs>
      </el-tab-pane>
    </el-tabs>
@@ -126,6 +127,10 @@ export default {
      var additionalAssessmentList = [
        '/trials/trials-panel/subject/brain-metastasis'
      ]
+      let dicomList = [
+        '/trials/trials-panel/trial-summary/image-inspect',
+        '/trials/trials-panel/trial-summary/push-record',
+      ]
      if (this.TrialConfig.QCProcessEnum === 0 && ~qualityList.indexOf(path)) {
        isShow = false
      }
@@ -135,6 +140,9 @@ export default {
      if (!this.IsAdditionalAssessment && ~additionalAssessmentList.indexOf(path)) {
        isShow = false
      }
+      if ((!this.TrialConfig.IsPACSConnect || !this.TrialConfig.IsTrialPACSConfirmed) && ~dicomList.indexOf(path)) {
+        isShow = false
+      }
      return isShow
    },
    goBack() {
@@ -224,6 +224,7 @@ import {
  addOrUpdateArchiveTaskStudy,
 } from "@/api/load.js";
 import { parseDicom, getThumbnail, dicomToOSS } from "@/utils/parseDicom.js";
+import store from "@/store";
 export default {
  name: "uploadList",
  props: {
@@ -262,6 +263,7 @@ export default {
  },
  watch: {
    isLoad() {
+      store.dispatch("trials/setUnLock", this.isLoad);
      if (!this.isLoad) {
        this.$refs.file.value = null;
        if (this.dicomList.some((item) => item.isUpload === 3)) {
@@ -747,6 +749,7 @@ export default {
  },
  beforeDestroy() {
    this.isClose = true;
+    store.dispatch("trials/setUnLock", false);
  },
 };
 </script>
@@ -66,13 +66,13 @@
      >
        <template slot-scope="scope">
          <!--下载--->
-          <el-button
+          <!-- <el-button
            v-if="!isUpload && Criterion.ImageDownloadEnum > 0"
            circle
            icon="el-icon-download"
            :title="$t('trials:uploadImage:button:download')"
            @click.stop="downloadImage(scope.row)"
-          />
+          /> -->
          <!--删除--->
          <el-button
            v-if="isUpload"
@@ -103,6 +103,7 @@ import uploadList from "./components/upload-list.vue";
 import studyView from "./components/study-view.vue";
 import { getSubjectImageUploadList, deleteTaskStudy } from "@/api/load.js";
 import { downloadImage } from "@/utils/uploadZip.js";
+import store from "@/store";
 export default {
  name: "uploadImage",
  props: {
@@ -247,16 +248,356 @@ export default {
    },
    // 打包下载
    async downloadImage(item) {
-      try {
-        await downloadImage(
-          this.$route.query.trialId,
-          item.SourceSubjectVisitId
-        );
-      } catch (err) {
-        console.log(err);
+      let zipName = "压缩包.zip";
+      let InstanceInfoList = [
+        {
+          Id: "e634352c-6465-32ba-04b3-824ec8d346a8",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/e634352c-6465-32ba-04b3-824ec8d346a8",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 1,
+        },
+        {
+          Id: "d4ad1dd2-747b-6de7-8ad4-3e81c58943dd",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/d4ad1dd2-747b-6de7-8ad4-3e81c58943dd",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 2,
+        },
+        {
+          Id: "6a1d1d12-2b4a-0368-c7e1-d44f7180b280",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6a1d1d12-2b4a-0368-c7e1-d44f7180b280",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 3,
+        },
+        {
+          Id: "7a8fb1b4-9ea8-1189-4ca6-b9a9b9547a39",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7a8fb1b4-9ea8-1189-4ca6-b9a9b9547a39",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 4,
+        },
+        {
+          Id: "8d00be19-5ac5-c608-dbd0-41f84cfacd95",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8d00be19-5ac5-c608-dbd0-41f84cfacd95",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 5,
+        },
+        {
+          Id: "729ded91-0eca-78f2-1c17-5182d4f27e3a",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/729ded91-0eca-78f2-1c17-5182d4f27e3a",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 6,
+        },
+        {
+          Id: "9e2fd28c-72fe-bb66-e0ce-40115cd82260",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9e2fd28c-72fe-bb66-e0ce-40115cd82260",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 7,
+        },
+        {
+          Id: "9b31613f-3c9e-28ad-fd9e-7001a69e09b5",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9b31613f-3c9e-28ad-fd9e-7001a69e09b5",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 8,
+        },
+        {
+          Id: "4982b453-d068-7e56-2acd-a361d8584f35",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4982b453-d068-7e56-2acd-a361d8584f35",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 9,
+        },
+        {
+          Id: "8279cf5a-2551-43ea-3fe4-673e88ba7e5a",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8279cf5a-2551-43ea-3fe4-673e88ba7e5a",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 10,
+        },
+        {
+          Id: "6424e9c5-d31b-9388-3b64-a56705ab6fc8",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6424e9c5-d31b-9388-3b64-a56705ab6fc8",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 11,
+        },
+        {
+          Id: "a73cf3f9-defa-0c22-dfdc-8c5bfb93c9a7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a73cf3f9-defa-0c22-dfdc-8c5bfb93c9a7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 12,
+        },
+        {
+          Id: "dbfaafea-f721-0a93-37c6-69bcc0d957c3",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/dbfaafea-f721-0a93-37c6-69bcc0d957c3",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 13,
+        },
+        {
+          Id: "52000ac1-6a5b-83e2-5468-4dfdf394e455",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/52000ac1-6a5b-83e2-5468-4dfdf394e455",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 14,
+        },
+        {
+          Id: "de34a347-41f4-1018-a710-48d81fa9aadc",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/de34a347-41f4-1018-a710-48d81fa9aadc",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 15,
+        },
+        {
+          Id: "251d6a13-26b7-935b-d765-0c5db1ed7dfc",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/251d6a13-26b7-935b-d765-0c5db1ed7dfc",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 16,
+        },
+        {
+          Id: "b22e93c8-3f6a-484a-a32b-f7626689f8da",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/b22e93c8-3f6a-484a-a32b-f7626689f8da",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 17,
+        },
+        {
+          Id: "6517400b-d4b5-db65-d026-8c06c40bf244",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6517400b-d4b5-db65-d026-8c06c40bf244",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 18,
+        },
+        {
+          Id: "8e70df99-525a-4ecd-5cf1-6c32698eaa3f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8e70df99-525a-4ecd-5cf1-6c32698eaa3f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 19,
+        },
+        {
+          Id: "7df907f2-b6a6-fd03-67ab-be86c497d412",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7df907f2-b6a6-fd03-67ab-be86c497d412",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 20,
+        },
+        {
+          Id: "ba31ba5b-728e-8301-273d-459fd3c65a43",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/ba31ba5b-728e-8301-273d-459fd3c65a43",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 21,
+        },
+        {
+          Id: "7528c70c-5ba1-59c1-413c-7bfc984c0066",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7528c70c-5ba1-59c1-413c-7bfc984c0066",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 22,
+        },
+        {
+          Id: "15dd574d-fc82-c5b7-fefb-497346d4abbb",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/15dd574d-fc82-c5b7-fefb-497346d4abbb",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 23,
+        },
+        {
+          Id: "6cd76aca-91fa-64ce-6077-af48c5e5b18b",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6cd76aca-91fa-64ce-6077-af48c5e5b18b",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 24,
+        },
+        {
+          Id: "2f0f9f4e-12b8-a6a8-d3f9-f43e2055653d",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/2f0f9f4e-12b8-a6a8-d3f9-f43e2055653d",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 25,
+        },
+        {
+          Id: "3c49f379-8548-67cd-1333-dde28219c6e9",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/3c49f379-8548-67cd-1333-dde28219c6e9",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 26,
+        },
+        {
+          Id: "910f43c8-123a-0753-aaf7-11081eef4268",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/910f43c8-123a-0753-aaf7-11081eef4268",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 27,
+        },
+        {
+          Id: "ffad6b36-74aa-1c7d-01eb-18524da91f6e",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/ffad6b36-74aa-1c7d-01eb-18524da91f6e",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 28,
+        },
+        {
+          Id: "9e2bf22d-8734-62ae-881a-7404064a95ce",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9e2bf22d-8734-62ae-881a-7404064a95ce",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 29,
+        },
+        {
+          Id: "eef8b291-ffdf-dbfb-244d-5e63dc5b8cc7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/eef8b291-ffdf-dbfb-244d-5e63dc5b8cc7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 30,
+        },
+        {
+          Id: "12b0de3a-243c-78b9-b006-82f2cc633a0f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/12b0de3a-243c-78b9-b006-82f2cc633a0f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 31,
+        },
+        {
+          Id: "4341ea87-7d54-2608-184e-01e5c976ce9f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4341ea87-7d54-2608-184e-01e5c976ce9f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 32,
+        },
+        {
+          Id: "4db2bac2-18eb-0589-d520-f297b2840e1d",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4db2bac2-18eb-0589-d520-f297b2840e1d",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 33,
+        },
+        {
+          Id: "9442c2a3-0972-67f7-afc3-6f1a47abefab",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9442c2a3-0972-67f7-afc3-6f1a47abefab",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 34,
+        },
+        {
+          Id: "a7fb75b0-0b09-5340-70cf-a11afd84b1ec",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a7fb75b0-0b09-5340-70cf-a11afd84b1ec",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 35,
+        },
+        {
+          Id: "753d7795-451a-bd32-69ea-fd58c1e89d63",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/753d7795-451a-bd32-69ea-fd58c1e89d63",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 36,
+        },
+        {
+          Id: "33bf7274-de0a-e8f9-f97a-c58fb2ea3aaf",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/33bf7274-de0a-e8f9-f97a-c58fb2ea3aaf",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 37,
+        },
+        {
+          Id: "adadae31-37a1-818d-3721-09a1d371c6a5",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/adadae31-37a1-818d-3721-09a1d371c6a5",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 38,
+        },
+        {
+          Id: "f64e8b0d-d2ab-b112-5705-92c23cfc5df6",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/f64e8b0d-d2ab-b112-5705-92c23cfc5df6",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 39,
+        },
+        {
+          Id: "781088b0-5afd-6eb3-5f87-9bfec210d490",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/781088b0-5afd-6eb3-5f87-9bfec210d490",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 40,
+        },
+        {
+          Id: "56df4cef-8053-bff3-21f7-1b1841a3d6e6",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/56df4cef-8053-bff3-21f7-1b1841a3d6e6",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 41,
+        },
+        {
+          Id: "a3e3dab9-7a61-f822-d113-42f46bc5e8ce",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a3e3dab9-7a61-f822-d113-42f46bc5e8ce",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 42,
+        },
+        {
+          Id: "1cc195b9-e498-179d-b927-6d706266decb",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/1cc195b9-e498-179d-b927-6d706266decb",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 43,
+        },
+        {
+          Id: "7dca834f-d959-898e-a0cb-5c8244c4c4a9",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7dca834f-d959-898e-a0cb-5c8244c4c4a9",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 44,
+        },
+        {
+          Id: "13eeba83-2e93-800e-e934-a56061633c64",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/13eeba83-2e93-800e-e934-a56061633c64",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 45,
+        },
+        {
+          Id: "971f0a62-92a3-6d04-53c5-51fa9155e28c",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/971f0a62-92a3-6d04-53c5-51fa9155e28c",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 46,
+        },
+        {
+          Id: "2959d06c-5ac7-f3b9-63d4-1a56e3974fc7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/2959d06c-5ac7-f3b9-63d4-1a56e3974fc7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 47,
+        },
+      ];
+      let path = "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com";
+      let files = new Array();
+      for (let i = 0; i < InstanceInfoList.length; i++) {
+        let item = InstanceInfoList[i];
+        let obj = {
+          name: "file" + i,
+          url: path + item.Path,
+        };
+        files.push(obj);
      }
+      store.dispatch("trials/setUnLock", true);
+      let res = await downloadImage(zipName, files);
+      store.dispatch("trials/setUnLock", false);
    },
  },
+  beforeDestroy() {
+    store.dispatch("trials/setUnLock", false);
+  },
 };
 </script>
 <style lang="scss" scoped>
@@ -1,6 +1,5 @@
 <script>
-export default
-{
+export default {
  processSignature: {
    LogicalConfigConfirmation: 101, // 逻辑配置确认：逻辑配置确认操作
    ProcessConfigConfirmation: 102, // 流程配置确认：流程配置确认操作
@@ -25,9 +24,11 @@ export default
    ImageAssessmentReportConfirmation: 214, // 影像评估报告确认
    MedicalAuditConfirmation: 109, // 医学审核问题确认
    ReadingUnitConfirmation: 108, // 医学审核问题确认
-    MedicalAudit: 215,// 医学审核
-    HeavyReadingApproval: 216,// 重阅审批
+    MedicalAudit: 215, // 医学审核
+    HeavyReadingApproval: 216, // 重阅审批
    ResetAndAsyncCriterion: 218, //同步签名
-  }
-}
+    DicomConfigConfirmation: 219, // DICOM AE配置确认
+    DicomConfigUpdates: 220, // DICOM AE配置更新
+  },
+};
 </script>
@@ -1,52 +0,0 @@
-<?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>
@@ -3,7 +3,7 @@ import Vue from 'vue'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets

 import ElementUI, { MessageBox } from 'element-ui'
-import { getBasicDataAllSelect, getFrontInternationalizationList } from '@/api/dictionary/dictionary'
+import { 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'
@@ -44,6 +44,7 @@ Viewer.setDefaults({
    'rotatable': true,
    'scalable': true,
    'transition': true,
+    'fullscreen': true,
    'keyboard': true,
    'url': 'data-source'
  }
@@ -130,8 +131,7 @@ 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(
-      new Error(_vm.$t('env:regExp:formatPassword')))
+    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 (~!-@#$%^&*_+?) '))
  } else {
    callback();
  }
@@ -186,6 +186,9 @@ async function VueInit() {
    zhMessages[v.Code] = v.ValueCN
    enMessages[v.Code] = v.Value
  })
+  // 获取版本信息
+  let PublishInfo = await getCurrentPublishInfo();
+  Vue.prototype.$version = PublishInfo.Result;
  // 获取检查部位
  Vue.prototype.$getBodyPart = (id) => {
    return new Promise(async (resolve, reject) => {
@@ -307,7 +310,7 @@ async function VueInit() {
      if (_vm.$store.state.user.userId !== zzSessionStorage.getItem('userId')) {
        window.location.href = `/login`
        zzSessionStorage.removeItem('lastWorkbench')
-        _vm.$alert(_vm.$t("env:sso:tip"), {
+        _vm.$alert(lang === 'en' ? 'The same browser only allows one user account to be logged in at a time.' : '同一浏览器只允许同时登陆一个账户', {
          type: 'warning',
        })
      }
@@ -358,6 +361,10 @@ async function VueInit() {
  }
  const h = _vm.$createElement
  /* eslint-disable */
+  // eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION)
+  // process.env.VUE_APP_LOGOUT_FOR_TIME
+  // eval(process.env.VUE_APP_LOCK_FOR_PERMISSION)
+  // process.env.VUE_APP_LOCK_FOR_TIME
  window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME;
  waitOperate(eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION) ? () => {
    var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
@@ -368,18 +375,13 @@ async function VueInit() {
    }
    _vm.$store.dispatch('user/logout').then(res => {
      // window.location.href = `/login`
-      if (_vm.$msgbox) {
-        _vm.$msgbox.close();
-      }
+      _vm.$msgbox.close();
      isOpen = false
      isLock = null
      zzSessionStorage.removeItem('isLock')
      router.push("/login")
    }).then(() => {
-      // _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登陆！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', {
-      //   type: 'warning',
-      // })
-      _vm.$alert(_vm.$t("env:loginOut"), {
+      _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',
      })
    })
@@ -387,7 +389,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.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
        count = 0;
        localStorage.setItem('count', '0')
        if (_vm.$route.path === '/login') {
@@ -403,17 +405,17 @@ async function VueInit() {
      isOpen = true
      zzSessionStorage.setItem('isLock', 'true')
      _vm.$msgbox({
-        title: _vm.$t("env:lock:msgBox:title"),
-        confirmButtonText: _vm.$t("env:lock:msgBox:confirmButtonText"),
+        title: lang === 'zh' ? '已锁定' : 'Locked',
+        confirmButtonText: lang === 'zh' ? '解锁' : 'Unlock',
        showClose: false,
        beforeClose: (action, instance, done) => {
          if (action === 'confirm') {
            if (!_vm.unlock.my_username) {
-              _vm.$alert(_vm.$t("env:lock:msgBox:iupUser"))
+              _vm.$alert(lang === 'zh' ? '请输入您的用户名解锁' : 'Please enter your user name to unlock.')
              return
            }
            if (!_vm.unlock.my_password) {
-              _vm.$alert(_vm.$t("env:lock:msgBox:inpPassword"))
+              _vm.$alert(lang === 'zh' ? '请输入您的密码解锁' : 'Please enter the correct password to unlock.')
              return
            }
            var my_username = zzSessionStorage.getItem('my_username')
@@ -424,7 +426,7 @@ async function VueInit() {
              resetReadingRestTime().then(() => {
              })
              const closeLock = (_vm) => {
-                _vm.$message.success(_vm.$t("env:lock:msgBox:lockSuccess"))
+                _vm.$message.success(lang === 'zh' ? '解锁成功，请继续操作' : 'Unlocked successfully. Please continue operation.')
                _vm.unlock = {
                  my_username: null,
                  my_password: null
@@ -446,7 +448,7 @@ async function VueInit() {
                  Vue.prototype.$MFA({
                    status: "lock",
                    UserId: my_userid,
-                    EMail: res.Result,
+                    EMail: my_EMail,
                    username: my_username,
                    callBack: () => {
                      closeLock(_vm)
@@ -459,7 +461,7 @@ async function VueInit() {

            } else {
              // console.log(111)
-              _vm.$message.error(_vm.$t('env:lock:msgBox:userFail'))
+              _vm.$message.error(lang === 'zh' ? '请输入正确用户名密码' : 'Please enter the correct password.')
            }
          }
        },
@@ -468,7 +470,7 @@ async function VueInit() {
            props: { labelWidth: "80px" }
          }, [
            h('el-form-item', {
-              props: { label: _vm.$t("env:lock:msgBox:form:username") },
+              props: { label: lang === 'zh' ? '用户名' : 'Username' },
            }, [
              h('input', {
                props: {
@@ -490,7 +492,7 @@ async function VueInit() {
              })
            ]),
            h('el-form-item', {
-              props: { label: _vm.$t("env:lock:msgBox:form:Password") },
+              props: { label: lang === 'zh' ? '密码' : 'Password' },
            }, [
              h('input', {
                props: {
@@ -10,9 +10,9 @@ import { OSSclient } from './utils/oss'

 NProgress.configure({ showSpinner: false })

-const whiteList = ['/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
+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) => {
+router.beforeEach(async(to, from, next) => {
  NProgress.start()
  // 设置页面标题
  // document.title = getPageTitle(to.meta.title)
@@ -55,20 +55,33 @@ router.beforeEach(async (to, from, next) => {
  } else {
    /* has no token*/
    if (whiteList.indexOf(to.path) !== -1) {
-      // 在免登录whiteList中，直接进入
-      if (to.path === '/readingDicoms' || to.path === '/noneDicomReading') {
-        OSSclient()
+      if (to.path === '/researchLogin') {
+        console.log(to)
+        const flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
+        if (flag) {
+          next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${to.query.lang}`)
+        } else {
+          next()
+        }
+      } else {
+        // 在免登录whiteList中，直接进入
+        if (to.path === '/readingDicoms' || to.path === '/noneDicomReading') {
+          OSSclient()
+        }
+        next()
      }
-      next()
    } else {
      if (to.path === '/researchForm') {
        next(`/researchLogin?`)
        NProgress.done()
+      } else if (to.path === '/researchDetail_m') {
+        next(`/researchLogin_m?`)
+        NProgress.done()
      } else if (to.path === '/ReviewersResearchForm') {
        next(`/ReviewersResearch?`)
        NProgress.done()
      } else {
-        // 其他无权访问的页面将重定向到登录页面。
+      // 其他无权访问的页面将重定向到登录页面。
        next(`/login?`)
        NProgress.done()
      }
@@ -201,6 +201,18 @@ export const constantRoutes = [
    component: () => import('@/views/research/form'),
    hidden: true
  },
+  {
+    path: '/researchLogin_m',
+    name: 'researchLogin_m',
+    component: () => import('@/views/research-mobile/login'),
+    hidden: true
+  },
+  {
+    path: '/researchDetail_m',
+    name: 'researchDetail_m',
+    component: () => import('@/views/research-mobile/detail'),
+    hidden: true
+  },
  {
    path: '/trialsResume',
    component: () => import('@/views/trials/trials-panel/enrolled-reviewers/resume/index'),
@@ -41,7 +41,6 @@ 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,
@@ -30,8 +30,7 @@ const getDefaultState = () => {
    activeSeries: {},
    lastCanvasTaskId: '',
    imageQuality: null,
-    imageQualityIssues: null,
-    currentLoadIns: []
+    imageQualityIssues: null
  }
 }
 function getQuestions(questions) {
@@ -140,22 +139,6 @@ 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

@@ -776,17 +759,7 @@ 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
@@ -812,22 +785,16 @@ 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}|${index}`
+                    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}`
                    imageIds.push(imageId)
                  }
-                  instance.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${0}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
+                  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}`
                } else {
-                  const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
+                  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}`
                  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({
@@ -870,7 +837,6 @@ 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() })
@@ -929,114 +895,11 @@ 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) {
-    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)
-    // }
+    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)
  },
  setStatus({ state }, obj) {
    var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
@@ -8,7 +8,6 @@ const getDefaultState = () => {
    visitPointQuery: null,
    studyListQuery: null,
    unlock: false,
-    config: {},
  }
 }

@@ -21,9 +20,6 @@ const mutations = {
  SET_UNLOCK: (state, unlock) => {
    state.unlock = unlock
  },
-  SET_CONFIG: (state, config) => {
-    state.config = config
-  },
  SET_ACTIVENAME: (state, activeName) => {
    state.trialDetailActiveName = activeName
  },
@@ -48,9 +44,6 @@ const actions = {
  setUnLock({ commit }, unlock) {
    commit('SET_UNLOCK', unlock)
  },
-  setConfig({ commit }, config) {
-    commit('SET_CONFIG', config)
-  },
  setActiveName({ commit }, activeName) {
    commit('SET_ACTIVENAME', activeName)
  },
@@ -1,6 +1,5 @@
 import dicomParser from "dicom-parser";
 import dcmjs from './dcmjs'
-import { encoder } from "./encoder";

 export const anonymization = function (file, config) {
  return new Promise(async (resolve, reject) => {
@@ -61,14 +60,12 @@ 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)
    }
@@ -19,7 +19,6 @@ export const dcmUpload = async function (name, file, config) {


    } catch (e) {
-      console.log(file, 'warning')
      resolve(false)
      console.log(e)
    }
@@ -2,8 +2,10 @@ 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 { GetObjectStoreToken } = require('../api/user.js')
+const { GenerateSTS, GetObjectStoreToken } = require('../api/user.js')
+import { getToken } from '@/utils/auth'

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

-        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);
-}
+};
@@ -56,20 +56,28 @@
                                trigger="hover"
                                popper-class="instance_frame_wrapper"
                              >
-                                <div class="frame_list">
-                                  <div
-                                    v-for="(instance, idx) in item.instanceInfoList"
-                                    :key="instance.Id"
-                                    class="frame_content"
-                                    :style="{'margin-bottom':idx<item.instanceInfoList.length-1? '5px':'0px'}"
-                                    @click="showMultiFrames(item, index, instance)"
-                                  >
-                                    <div>
-                                      <div>{{ instance.InstanceNumber }}</div>
-                                      <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                                    </div>
-
+                                <div
+                                  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>
+
                                </div>
                                <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
                              </el-popover>
@@ -147,8 +155,7 @@ import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
-cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
+const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
 export default {
  components: {
    'dicom-viewer': dicomViewer
@@ -651,7 +658,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 && this.seriesList[seriesIndex].imageloadedArr.length < this.seriesList[seriesIndex].instanceCount) {
+        if (this.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
@@ -877,18 +884,6 @@ 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;
@@ -200,20 +200,28 @@
                                    trigger="hover"
                                    popper-class="instance_frame_wrapper"
                                  >
-                                    <div class="frame_list">
-                                      <div
-                                        v-for="(instance, idx) in seriesItem.instanceInfoList"
-                                        :key="instance.Id"
-                                        class="frame_content"
-                                        :style="{'margin-bottom':idx<seriesItem.instanceInfoList.length-1? '5px':'0px'}"
-                                        @click="showMultiFrames(studyIndex,seriesItem, index, instance)"
-                                      >
-                                        <div>
-                                          <div>{{ instance.InstanceNumber }}</div>
-                                          <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                                        </div>
-
+                                    <div
+                                      v-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>
                                    <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
                                  </el-popover>
@@ -266,8 +274,7 @@ import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
-cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
+const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
 export default {
  name: 'DicomsOfVisit',
  components: {
@@ -683,7 +690,7 @@ export default {
        const seriesIndex = params.idx.split('|')[1]
        var prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount
        var instanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount
-        if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0 && this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.length < 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
@@ -893,18 +900,6 @@ 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;
@@ -0,0 +1,214 @@
+<template>
+  <base-model :config="config">
+    <div slot="dialog-body">
+      <el-form
+        ref="browserForm"
+        :model="form"
+        label-width="140px"
+        size="small"
+        :rules="rules"
+      >
+        <div class="base-dialog-body">
+          <el-form-item
+            :label="$t('dictionary:browser:form:title')"
+            prop="Title"
+          >
+            <el-input v-model="form.Title" />
+          </el-form-item>
+          <el-form-item
+            :label="$t('dictionary:browser:form:exploreType')"
+            prop="ExploreType"
+          >
+            <el-input v-model="form.ExploreType" />
+          </el-form-item>
+          <el-form-item
+            :label="$t('dictionary:browser:form:version')"
+            prop="Version"
+          >
+            <el-input v-model="form.Version" type="textarea" rows="5" />
+          </el-form-item>
+          <el-form-item
+            :label="$t('dictionary:browser:form:downloadUrl')"
+            prop="DownloadUrl"
+          >
+            <el-input v-model="form.DownloadUrl" />
+          </el-form-item>
+          <el-form-item :label="$t('dictionary:browser:form:addFile')">
+            <el-upload
+              class="upload-demo"
+              action
+              :before-upload="beforeUpload"
+              :http-request="handleUploadFile"
+              :on-preview="handlePreview"
+              :on-remove="handleRemoveFile"
+              :show-file-list="true"
+              :limit="1"
+              :file-list="fileList"
+            >
+              <el-button
+                size="small"
+                type="primary"
+                :disabled="fileList.length > 0"
+                >{{ $t("common:button:upload") }}</el-button
+              >
+            </el-upload>
+          </el-form-item>
+          <el-form-item :label="$t('dictionary:browser:form:isDeleted')">
+            <el-switch
+              v-model="form.IsDeleted"
+              :active-value="false"
+              :inactive-value="true"
+            >
+            </el-switch>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div slot="dialog-footer">
+      <el-button size="small" @click="canel">
+        {{ $t("dictionary:browser:button:canel") }}
+      </el-button>
+      <el-button size="small" type="primary" :loading="loading" @click="save">
+        {{ $t("dictionary:browser:button:save") }}
+      </el-button>
+    </div>
+  </base-model>
+</template>
+<script>
+import baseModel from "@/components/BaseModel";
+import { addOrUpdateExploreRecommend } from "@/api/dictionary";
+export default {
+  props: {
+    config: {
+      required: true,
+      default: () => {
+        return {};
+      },
+    },
+    data: {
+      required: true,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  components: {
+    "base-model": baseModel,
+  },
+  data() {
+    return {
+      form: {
+        Version: null,
+        Title: null,
+        IsDeleted: true,
+        ExploreType: null,
+        DownloadUrl: null,
+        Path: null,
+        FileName: null,
+      },
+      rules: {
+        Title: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        ExploreType: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        Version: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        DownloadUrl: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: ["blur", "change"],
+          },
+        ],
+      },
+      fileList: [],
+      loading: false,
+    };
+  },
+  created() {
+    if (this.config.status === "edit") {
+      Object.keys(this.form).forEach((key) => {
+        this.form[key] = this.data[key];
+      });
+      if (this.form.FileName) {
+        this.fileList[0] = {
+          name: this.form.FileName,
+          path: this.form.Path,
+          fullPath: this.form.Path,
+        };
+      }
+    }
+  },
+  methods: {
+    async save() {
+      try {
+        let validate = await this.$refs.browserForm.validate();
+        if (!validate) return false;
+        this.loading = true;
+        if (this.config.status === "edit") {
+          this.form.Id = this.data.Id;
+        }
+        let res = await addOrUpdateExploreRecommend(this.form);
+        if (res.IsSuccess) {
+          this.$emit("close");
+          this.$emit("getList");
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
+    },
+    canel() {
+      this.$emit("close");
+    },
+    handleRemoveFile() {
+      this.form.FileName = null;
+      this.form.Path = null;
+      this.fileList = [];
+    },
+    beforeUpload() {
+      if (this.fileList.length > 0) {
+        this.$alert(this.$t("dictionary:bbrowser:msg:message1"));
+        return;
+      }
+    },
+    handlePreview(row, r2) {
+      if (row.fullPath) {
+        window.open(row.fullPath, "_blank");
+      }
+    },
+    async handleUploadFile(param) {
+      this.loading = true;
+      var file = await this.fileToBlob(param.file);
+      const res = await this.OSSclient.put(
+        `/System/Browser/${param.file.name}`,
+        file
+      );
+      this.fileList.push({
+        name: param.file.name,
+        path: this.$getObjectName(res.url),
+        fullPath: this.$getObjectName(res.url),
+        url: this.$getObjectName(res.url),
+      });
+      this.form.Path = this.$getObjectName(res.url);
+      this.form.FileName = param.file.name;
+      this.loading = false;
+    },
+  },
+};
+</script>
@@ -0,0 +1,252 @@
+<template>
+  <box-content>
+    <!-- 搜索框 -->
+    <div class="search">
+      <el-form :inline="true" size="mini" class="base-search-form">
+        <el-form-item :label="$t('dictionary:browser:search:title')">
+          <el-input v-model="searchData.Title" style="width: 100px" />
+        </el-form-item>
+        <el-form-item :label="$t('dictionary:browser:search:version')">
+          <el-input v-model="searchData.Version" style="width: 100px" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleReset">{{
+            $t("dictionary:browser:button:reset")
+          }}</el-button>
+          <el-button type="primary" @click="handleSearch">{{
+            $t("dictionary:browser:button:search")
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <span style="margin-left: auto">
+        <el-button type="primary" size="mini" @click="handleAdd">
+          {{ $t("dictionary:browser:button:add") }}
+        </el-button>
+      </span>
+    </div>
+
+    <!-- 浏览器推荐版本列表 -->
+    <el-table
+      v-loading="loading"
+      v-adaptive="{ bottomOffset: 45 }"
+      :data="list"
+      stripe
+      height="100"
+      style="width: 100%"
+      @sort-change="handleSortByColumn"
+    >
+      <el-table-column type="index" width="40" />
+
+      <el-table-column
+        prop="Title"
+        :label="$t('dictionary:browser:table:title')"
+        sortable="custom"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ExploreType"
+        :label="$t('dictionary:browser:table:exploreType')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="Version"
+        :label="$t('dictionary:browser:table:version')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="DownloadUrl"
+        :label="$t('dictionary:browser:table:path')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="FileName"
+        :label="$t('dictionary:browser:table:fileName')"
+        show-overflow-tooltip
+        sortable="custom"
+      >
+        <template slot-scope="scope">
+          <a
+            :href="OSSclientConfig.basePath + scope.row.Path"
+            target="_blank"
+            style="color: #428bca"
+          >
+            {{ scope.row.FileName }}
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="IsDeleted"
+        :label="$t('dictionary:browser:table:IsDeleted')"
+        show-overflow-tooltip
+        sortable="custom"
+      >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.IsDeleted" type="danger">{{
+            $fd("IsSiteDisable", scope.row.IsDeleted)
+          }}</el-tag>
+          <el-tag v-else>{{
+            $fd("IsSiteDisable", scope.row.IsDeleted)
+          }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="UpdateTime"
+        :label="$t('dictionary:browser:table:updateTime')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        :label="$t('dictionary:browser:table:action')"
+        width="200"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleEdit(scope.row)">
+            {{ $t("dictionary:browser:button:edit") }}
+          </el-button>
+          <el-button type="text" @click="handleDelete(scope.row)">
+            {{ $t("dictionary:browser: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"
+    />
+    <browser-form
+      :config="config"
+      :data="rowData"
+      v-if="config.visible"
+      @close="close"
+      @getList="getList"
+    />
+  </box-content>
+</template>
+<script>
+import {
+  getExploreRecommendList,
+  deleteExploreRecommend,
+} from "@/api/dictionary";
+import Pagination from "@/components/Pagination";
+import BoxContent from "@/components/BoxContent";
+import browserForm from "./form.vue";
+const searchDataDefault = () => {
+  return {
+    Version: null,
+    Title: null,
+    DownloadUrl: null,
+    FileName: null,
+    IsDeleted: null,
+    PageIndex: 1,
+    PageSize: 20,
+    Asc: false,
+    SortField: null,
+  };
+};
+export default {
+  name: "browser",
+  components: { BoxContent, Pagination, browserForm },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      loading: false,
+      list: [],
+      total: 0,
+      rowData: {},
+      config: {
+        visible: false,
+        showClose: true,
+        width: "600px",
+        title: "",
+        appendToBody: true,
+        status: "add",
+      },
+    };
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    async getList() {
+      try {
+        this.loading = true;
+        let res = await getExploreRecommendList(this.searchData);
+        if (res.IsSuccess) {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
+    },
+    // 新增
+    handleAdd() {
+      this.rowData = {};
+      this.config.title = this.$t("dictionary:browser:form:title:add");
+      this.config.status = "add";
+      this.config.visible = true;
+    },
+    // 编辑
+    handleEdit(row) {
+      this.rowData = { ...row };
+      this.config.title = this.$t("dictionary:browser:form:title:edit");
+      this.config.status = "edit";
+      this.config.visible = true;
+    },
+    // 删除
+    handleDelete(row) {
+      this.$confirm(this.$t("dictionary:browser:message:deleteMessage"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        deleteExploreRecommend(row.Id).then((res) => {
+          if (res.IsSuccess) {
+            this.list.splice(
+              this.list.findIndex((item) => item.Id === row.Id),
+              1
+            );
+            this.$message.success(
+              this.$t("common:message:deletedSuccessfully")
+            );
+          }
+        });
+      });
+    },
+    // 查询
+    handleSearch() {
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+    // 重置
+    handleReset() {
+      this.searchData = searchDataDefault();
+      this.getList();
+    },
+    // 排序
+    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();
+    },
+    close() {
+      this.config.visible = false;
+    },
+  },
+};
+</script>
@@ -0,0 +1,109 @@
+<template>
+  <div class="browserTip" v-if="visible">
+    <i class="el-icon-warning-outline"></i>
+    <span v-html="tip"></span>
+  </div>
+</template>
+<script>
+import { getExploreRecommentInfo } from "@/api/dictionary";
+export default {
+  name: "browserTip",
+  data() {
+    return {
+      form: {},
+      tip: this.$t("browser:tip:changeBorwser"),
+      visible: false,
+    };
+  },
+  methods: {
+    async getInfo() {
+      try {
+        let res = await getExploreRecommentInfo();
+        if (res.IsSuccess) {
+          return res.Result;
+        }
+        return false;
+      } catch (err) {
+        console.log(err);
+        return false;
+      }
+    },
+    async open() {
+      try {
+        let browserType = this.getExplore();
+        let type = browserType.split(": ")[0];
+        let No = browserType.split(": ")[1].split(".")[0];
+        console.log(type, No);
+        if (type !== "Chrome" && type !== "Edge") {
+          this.tip = this.$t("browser:tip:changeBorwser");
+          return (this.visible = true);
+        }
+        let res = await this.getInfo();
+        if (!res) return this.$t("dictionary:browser:tip:getError");
+        let currentType = res.filter(
+          (item) => item.ExploreType.toLowerCase() === type.toLowerCase()
+        )[0];
+        if (No < currentType.Version) {
+          this.tip = `<span>${this.$t("browser:tip:borwserversionLow")}</span>`;
+          res.forEach((item, index) => {
+            this.tip += `<a href="${item.DownloadUrl}" target="_blank" style="color:#428bca">${item.Title}</a>`;
+            if (index < res.length - 1) {
+              this.tip += "、";
+            }
+          });
+          return (this.visible = true);
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    getExplore() {
+      var Sys = {};
+      var ua = navigator.userAgent.toLowerCase();
+      var s;
+      (s = ua.match(/rv:([\d.]+)\) like gecko/))
+        ? (Sys.ie = s[1])
+        : (s = ua.match(/msie ([\d\.]+)/))
+        ? (Sys.ie = s[1])
+        : (s = ua.match(/edg\/([\d\.]+)/) || ua.match(/edge\/([\d\.]+)/))
+        ? (Sys.edge = s[1])
+        : (s = ua.match(/firefox\/([\d\.]+)/))
+        ? (Sys.firefox = s[1])
+        : (s = ua.match(/(?:opera|opr).([\d\.]+)/))
+        ? (Sys.opera = s[1])
+        : (s = ua.match(/chrome\/([\d\.]+)/))
+        ? (Sys.chrome = s[1])
+        : (s = ua.match(/version\/([\d\.]+).*safari/))
+        ? (Sys.safari = s[1])
+        : 0;
+      // 根据关系进行判断
+      if (Sys.ie) return "IE: " + Sys.ie;
+      if (Sys.edge) return "Edge: " + Sys.edge;
+      if (Sys.firefox) return "Firefox: " + Sys.firefox;
+      if (Sys.chrome) return "Chrome: " + Sys.chrome;
+      if (Sys.opera) return "Opera: " + Sys.opera;
+      if (Sys.safari) return "Safari: " + Sys.safari;
+      return "Unkonwn";
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.browserTip {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 40px;
+  background-color: rgba(250, 205, 145, 0.129411764705882);
+  display: flex;
+  align-items: center;
+  padding: 0 20px;
+  color: #555;
+  i {
+    color: red;
+    font-size: 24px;
+    margin-right: 10px;
+  }
+}
+</style>
@@ -113,13 +113,13 @@
              width="55">
            </el-table-column>
            <el-table-column
-              prop="raw.ValueCN"
+              prop="ValueCN"
              label="中文值"
              show-overflow-tooltip
            >
            </el-table-column>
            <el-table-column
-              prop="raw.Value"
+              prop="Value"
              label="英文值"
              show-overflow-tooltip
            >
@@ -25,56 +25,68 @@
      <el-tab-pane label="签名管理" name="sign">
        <Sign v-if="activeTab == 'sign'" />
      </el-tab-pane>
+      <el-tab-pane label="浏览器推荐" name="browser">
+        <Browser v-if="activeTab == 'browser'" />
+      </el-tab-pane>
    </el-tabs>
  </div>
 </template>
 <script>
-import QcQuestions from './components/QcQuestions.vue'
-import CriterionsTmp from './components/CriterionsTmp'
-import ClinicalData from './components/ClinicalDataConfig'
-import MedicalAudit from './components/MedicalAudit'
-import Anonymization from './components/Anonymization'
-import IncreaseFields from './components/IncreaseFields'
-import Email from './email/index.vue'
-import Sign from './sign/index.vue'
+import QcQuestions from "./components/QcQuestions.vue";
+import CriterionsTmp from "./components/CriterionsTmp";
+import ClinicalData from "./components/ClinicalDataConfig";
+import MedicalAudit from "./components/MedicalAudit";
+import Anonymization from "./components/Anonymization";
+import IncreaseFields from "./components/IncreaseFields";
+import Email from "./email/index.vue";
+import Sign from "./sign/index.vue";
+import Browser from "./browser/index.vue";
 export default {
-  name: 'Questions',
+  name: "Questions",
  components: {
-    QcQuestions, CriterionsTmp, ClinicalData, Anonymization, IncreaseFields, Email, Sign,
-    MedicalAudit
+    QcQuestions,
+    CriterionsTmp,
+    ClinicalData,
+    Anonymization,
+    IncreaseFields,
+    Email,
+    Sign,
+    MedicalAudit,
+    Browser,
  },
  data() {
    return {
-      activeTab: 'qc'
-    }
-  }, mounted() {
+      activeTab: "qc",
+    };
+  },
+  mounted() {
    if (this.$route.query.tabActive) {
-      this.activeTab = this.$route.query.tabActive
+      this.activeTab = this.$route.query.tabActive;
    } else {
-      this.activeTab = 'qc'
+      this.activeTab = "qc";
    }
  },
  methods: {
    clickTab(tab, event) {
-      this.$router.push({ path: `/dictionary/template?tabActive=${tab.name}` })
-    }
-  }
-}
+      this.$router.push({ path: `/dictionary/template?tabActive=${tab.name}` });
+    },
+  },
+};
 </script>
 <style lang="scss">
-.question-wrapper{
-  .el-tabs{
+.question-wrapper {
+  .el-tabs {
    height: 100%;
    display: flex;
    flex-direction: column;
  }
  .el-tabs__header {
    height: 40px;
-    margin-bottom:5px;
+    margin-bottom: 5px;
  }
-  .el-tabs__content{
+  .el-tabs__content {
    flex: 1;
-    .el-tab-pane{
+    .el-tab-pane {
      height: 100%;
    }
  }
@@ -23,7 +23,7 @@
        >
          <svg-icon
            icon-class="login-bg"
-            style="width: 90%; height: 90%"
+            style="width: 450px; height: 450px"
            v-if="NODE_ENV === 'usa'"
          />
          <img src="@/assets/login-bg.png" v-else />
@@ -119,7 +119,7 @@
            {{ $t("login:button:login") }}
          </el-button>
          <div style="text-align: right">
-            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
+            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
            <!-- Forget password? -->
            <el-button
              type="text"
@@ -183,7 +183,7 @@
          {{ $t("login:title:system_title") }}
        </p>
        <p style="margin-bottom: 20px" v-else>{{ $t("login:title:system") }}</p>
-        <p style="margin-bottom: 20px">V1.5.4.001</p>
+        <p style="margin-bottom: 20px">V{{ $version.Version }}</p>
        <p style="margin-bottom: 20px" v-if="language === 'zh'">
          Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
          版权所有
@@ -202,6 +202,7 @@
        >
      </div>
    </el-dialog>
+    <browserTip ref="browserTip" />
  </div>
 </template>

@@ -210,13 +211,16 @@ import { mapGetters, mapMutations } from "vuex";
 import TopLang from "./topLang";
 // import NoticeMarquee from '../trials/trials-layout/components/noticeMarquee'
 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 },
+  components: { TopLang, Vcode, browserTip },
  data() {
    return {
-      NODE_ENV: process.env.NODE_ENV,
+      NODE_ENV: process.env.NODE_ENV, // process.env.NODE_ENV
      VUE_APP_OSS_CONFIG_REGION: process.env.VUE_APP_OSS_CONFIG_REGION,
      aboutVisible: false,
      loginForm: {
@@ -254,6 +258,8 @@ export default {
      isShow: false,
      showCode: false,
      Img1,
+      loginBg,
+      loginLogo,
    };
  },
  computed: {
@@ -269,7 +275,7 @@ export default {
      this.setLanguage("en");
      this.$updateDictionary();
    } else {
-      if (this.location === "USA" || this.NODE_ENV === "usa") {
+      if (this.location === "USA") {
        this.$i18n.locale = "en";
        this.setLanguage("en");
        this.$updateDictionary();
@@ -279,6 +285,7 @@ export default {
        // this.$updateDictionary()
      }
    }
+    this.$refs.browserTip.open();
  },
  methods: {
    ...mapMutations({ setLanguage: "lang/setLanguage" }),
@@ -403,7 +410,7 @@ export default {
 /* 修复input 背景不协调 和光标变色 */

 $bg: #283443;
-$light_gray: #909399;
+$light_gray: #606266;
 $cursor: #fff;

 // @supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
@@ -510,7 +517,7 @@ $light_gray: #606266;
        width: 100%;
        display: flex;
        align-items: center;
-        justify-content: flex-end;
+        justify-content: center;
      }
    }
    .login-r {
@@ -533,7 +540,7 @@ $light_gray: #606266;
      .title-container {
        // margin-bottom: 50px;
        text-align: center;
-        margin-top: 20%;
+        margin-top: 18%;
        .title {
          font-size: 35px;
          color: $light_gray;
@@ -121,7 +121,7 @@ export default {
    // 获取非Dicom检查信息
    getNoneDicomList() {
      this.loading = true
-      getNoneDicomStudyList(this.subjectVisitId, this.studyId).then(res => {
+      getNoneDicomStudyList(this.subjectVisitId, this.studyId, true).then(res => {
        this.studyList = res.Result
        this.loading = false
        const studyIndex = this.studyList.findIndex(item => {
@@ -62,7 +62,7 @@ export default {
    // 获取非Dicom检查信息
    getNoneDicomList() {
      this.loading = true
-      getNoneDicomStudyList(this.subjectVisitId, '').then(res => {
+      getNoneDicomStudyList(this.subjectVisitId, '', true).then(res => {
        this.noneDicomStudyList = res.Result
        this.loading = false
        const study = this.noneDicomStudyList.find((item, index) => {
@@ -0,0 +1,310 @@
+<template>
+  <div class="research_bs_content">
+    <el-form ref="researchBSForm" label-position="left" :model="form" :rules="rules">
+      <div class="basic_content form-label-width">
+        <el-form-item :label="$t('trials:researchForm:title:researchSurveyStatus')">
+          <el-tag>{{ $fd('ResearchRecord', state) }}</el-tag>
+        </el-form-item>
+        <!-- 项目编号 -->
+        <el-form-item :label="$t('trials:researchForm:form:trialId')">
+          <span>{{ form.TrialCode }}</span>
+        </el-form-item>
+        <!-- 试验方案号 -->
+        <el-form-item :label="$t('trials:researchForm:form:researchNo')">
+          <span>{{ form.ResearchProgramNo }}</span>
+        </el-form-item>
+        <!-- 试验名称 -->
+        <el-form-item :label="$t('trials:researchForm:form:researchName')">
+          <span>{{ form.ExperimentName }}</span>
+        </el-form-item>
+        <!-- 适应症类型 -->
+        <el-form-item :label="$t('trials:researchForm:form:decleareType')">
+          <span>{{ form.IndicationType }}</span>
+        </el-form-item>
+      </div>
+      <div class="login_content">
+        <div class="form-label-width">
+          <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="TrialSiteId">
+            <el-select
+              v-model="form.TrialSiteId"
+              filterable
+              style="width:100%;"
+              :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
+              @change="handleSiteChange"
+            >
+              <el-option
+                v-for="(item,index) of siteOptions"
+                :key="index"
+                :label="item.TrialSiteAliasName"
+                :value="item.TrialSiteId"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 中心编号 -->
+          <el-form-item v-if="form.TrialSiteId" :label="$t('trials:researchForm:form:siteId')">
+            <el-input v-model="form.TrialSiteCode" disabled />
+          </el-form-item>
+          <!-- 联系人 -->
+          <el-form-item :label="$t('trials:researchForm:form:contactor')" prop="UserName">
+            <el-input v-model="form.UserName" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
+          </el-form-item>
+          <!-- 联系电话 -->
+          <el-form-item
+            :label="$t('trials:researchForm:form:contactorPhone')"
+            prop="Phone"
+          >
+            <el-input v-model="form.Phone" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
+          </el-form-item>
+          <!-- 联系邮箱 -->
+          <el-form-item :label="$t('trials:researchForm:form:contactorEmail')">
+            <el-input v-model="form.Email" disabled />
+          </el-form-item>
+          <!-- 平均刻盘周期（天） -->
+          <el-form-item :label="$t('trials:researchForm:form:engravingCycle')">
+            <el-input-number v-model="form.AverageEngravingCycle" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" controls-position="right" :min="0" style="width:100%;" />
+          </el-form-item>
+        </div>
+        <!-- 请确认参与本项目影像采集的影像技师具备对应的资质（如：“技师证”，对应设备的“大型设备上岗证”） -->
+        <el-form-item v-if="!notShowFieldList.includes('IsConfirmImagingTechnologist')" :label="$t('trials:researchForm:form:isQualified')">
+          <el-radio-group v-model="form.IsConfirmImagingTechnologist" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :key="`IsConfirmImagingTechnologist${item.value}`"
+              :label="item.value"
+            >{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- 原因 -->
+        <el-form-item
+          v-if="!notShowFieldList.includes('NotConfirmReson') && form.IsConfirmImagingTechnologist === false"
+          :label="$t('trials:researchForm:form:notQualifiedReason')"
+        >
+          <el-input
+            v-model="form.NotConfirmReson"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4}"
+            :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
+          />
+        </el-form-item>
+        <!-- 研究单位疗效评估人员类型 -->
+        <el-form-item v-if="!notShowFieldList.includes('EfficacyEvaluatorType')" :label="$t('trials:researchForm:form:staffType')">
+          <el-radio-group v-model="form.EfficacyEvaluatorType" :disabled="!(state === 0 && userTypeEnumInt === 0)|| isHistory">
+            <el-radio v-for="item of $d.EfficacyEvaluatorType" :key="`EfficacyEvaluatorType${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- 是否严格按照研究单位影像手册参数完成图像采集 -->
+        <el-form-item v-if="!notShowFieldList.includes('IsFollowStudyParameters')">
+          <span slot="label" v-html="$t('trials:researchForm:form:isFollowStudyParam')" />
+          <el-radio-group v-model="form.IsFollowStudyParameters" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+            <el-radio v-for="item of $d.YesOrNo" :key="`IsFollowStudyParameters${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- 不能严格按照研究单位影像手册参数采集图像原因 -->
+        <el-form-item
+          v-if="!notShowFieldList.includes('NotFollowReson') && !form.IsFollowStudyParameters"
+        >
+          <span slot="label" v-html="$t('trials:researchForm:form:notFollowStudyParam')" />
+          <el-input
+            v-model="form.NotFollowReson"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4}"
+            :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
+          />
+        </el-form-item>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { getTrialSiteSelect } from '@/api/trials'
+import { addOrUpdateTrialSiteSurvey } from '@/api/research'
+export default {
+  name: 'ResearchBasicInfo',
+  props: {
+    isHistory: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    var checkPhone = (rule, value, callback) => {
+      const phoneReg = /^[0-9]+$/
+      if (!value) {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        setTimeout(() => {
+          if (phoneReg.test(value)) {
+            callback()
+          } else {
+            callback(new Error(this.$t('trials:researchForm:formRule:phone')))
+          }
+        }, 100)
+      }
+    }
+    return {
+      form: {
+        Id: '',
+        Sponsor: '', // 申办方
+        ResearchProgramNo: '', // 方案号
+        ExperimentName: '',
+        TrialCode: '', // 项目编号
+        TrialSiteCode: '',
+        TrialSiteAliasName: '',
+        IndicationType: '', // 适应症
+        TrialSiteId: '', // 研究单位名称
+        UserName: '', // 联系人
+        Phone: '', // 联系人电话
+        Email: '', // 联系人邮箱
+        AverageEngravingCycle: '',
+        IsConfirmImagingTechnologist: '',
+        NotConfirmReson: '',
+        EfficacyEvaluatorType: '',
+        IsFollowStudyParameters: '',
+        NotFollowReson: ''
+      },
+      rules: {
+        TrialSiteId: [
+          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' }
+        ],
+        UserName: [
+          { required: true, validator: (rule, value, callback) => { !value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback() }, trigger: 'blur' },
+          { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: ['blur', 'change'] }
+        ],
+        Phone: [
+          { required: true, validator: checkPhone, trigger: 'blur' }
+        ]
+      },
+      siteOptions: [],
+      loading: false,
+      state: null,
+      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
+      isShow: false,
+      notShowFieldList: []
+    }
+  },
+  methods: {
+    // 保存基本信息
+    handleSave(isAutoCommit) {
+      return new Promise(async(resolve) => {
+        try {
+          const valid = await this.$refs['researchBSForm'].validate()
+          if (valid) {
+            this.loading = true
+            const param = {
+              id: this.form.Id,
+              trialId: this.$route.query.trialId,
+              trialSiteId: this.form.TrialSiteId,
+              userName: this.form.UserName,
+              phone: this.form.Phone,
+              email: this.form.Email,
+              averageEngravingCycle: this.form.AverageEngravingCycle,
+              isConfirmImagingTechnologist: this.form.IsConfirmImagingTechnologist,
+              notConfirmReson: this.form.NotConfirmReson,
+              efficacyEvaluatorType: this.form.EfficacyEvaluatorType,
+              isFollowStudyParameters: this.form.IsFollowStudyParameters,
+              notFollowReson: this.form.NotFollowReson
+            }
+            const res = await addOrUpdateTrialSiteSurvey(param)
+            this.loading = false
+            if (res.IsSuccess && !isAutoCommit) {
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+            }
+            resolve(true)
+          } else {
+            if (isAutoCommit) {
+              this.$message.error(this.$t('trials:researchForm:button:msg1'))
+            }
+            resolve(false)
+          }
+        } catch (e) {
+          console.log(e)
+          resolve(false)
+        }
+      })
+    },
+    // 初始化
+    async initForm(trialInfo, trialSiteSurvey, notShowFieldList) {
+      // 获取项目下的site
+      const { Result } = await getTrialSiteSelect(this.$route.query.trialId)
+      this.siteOptions = Result
+      this.form.Id = trialSiteSurvey.Id
+      this.form.Sponsor = trialInfo.Sponsor // 申办方
+      this.form.ResearchProgramNo = trialInfo.ResearchProgramNo // 方案号
+      this.form.ExperimentName = trialInfo.ExperimentName
+      this.form.TrialCode = trialInfo.TrialCode // 项目编号
+      this.form.TrialSiteCode = trialSiteSurvey.TrialSiteCode
+      this.form.TrialSiteAliasName = trialSiteSurvey.TrialSiteAliasName // 项目别称
+      this.form.IndicationType = trialInfo.IndicationType // 适应症
+      this.form.TrialSiteId = trialSiteSurvey.TrialSiteId
+      this.form.UserName = trialSiteSurvey.UserName // 联系人
+      this.form.Phone = trialSiteSurvey.Phone // 联系人电话
+      this.form.Email = trialSiteSurvey.Email // 联系人邮箱
+      this.form.AverageEngravingCycle = trialSiteSurvey.AverageEngravingCycle
+      this.form.IsConfirmImagingTechnologist = trialSiteSurvey.IsConfirmImagingTechnologist
+      this.form.NotConfirmReson = trialSiteSurvey.NotConfirmReson
+      this.form.EfficacyEvaluatorType = trialSiteSurvey.EfficacyEvaluatorType
+      this.form.IsFollowStudyParameters = trialSiteSurvey.IsFollowStudyParameters
+      this.form.NotFollowReson = trialSiteSurvey.NotFollowReson
+      this.state = trialSiteSurvey.State
+      this.isShow = true
+      if (!notShowFieldList) return
+      this.notShowFieldList = notShowFieldList
+    },
+    handleSiteChange(val) {
+      var selected = this.siteOptions.find(item => item.TrialSiteId === val)
+      if (selected) {
+        this.form.TrialSiteCode = selected.TrialSiteCode
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.research_bs_content{
+
+  .basic_content{
+    padding: 0 20px;
+    background: #fff;
+
+  }
+  .login_content{
+    padding: 5px 20px;
+    margin-top: 5px;
+    background: #fff;
+    /deep/.el-form-item {
+      padding-bottom: 20px;
+      
+    }
+  }
+  .code_content{
+    display:flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    .el-input{
+      margin-right: 10px;
+    }
+  }
+  .form-label-width{
+    /deep/.el-form-item__label{
+      width: 140px;
+    }
+    /deep/.el-form-item__content{
+      margin-left: 140px;
+    }
+  }
+  .submit_content{
+    margin-top: 20px;
+    text-align: center;
+  }
+
+  /deep/.el-form-item {
+    margin-bottom: 0px;
+    padding-top: 5px;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+
+}
+</style>
@@ -0,0 +1,168 @@
+<template>
+  <div
+    v-loading="loading"
+    class="equipment_form_content"
+  >
+    <el-form
+      ref="equipmentForm"
+      :model="form"
+      :rules="rules"
+      label-position="left"
+    >
+      <!-- 扫描设备 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:equipment')" prop="EquipmentTypeId">
+        <el-select
+          v-model="form.EquipmentTypeId"
+          style="width:100%"
+        >
+          <el-option
+            v-for="item of $d.SiteSurvey_ScanEquipmentType"
+            :key="item.id"
+            :label="item.label"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 扫描参数 -->
+      <el-form-item v-if="isShowParameters" :label="$t('trials:equiptResearch:form:param')">
+        <el-input v-model="form.Parameters" />
+      </el-form-item>
+      <!-- 扫描仪器制造商名称 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:manufacturer')">
+        <el-input v-model="form.ManufacturerName" />
+      </el-form-item>
+      <!-- 扫描仪型号 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:model')">
+        <el-input v-model="form.ScannerType" />
+      </el-form-item>
+      <!-- 备注 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:remark')">
+        <el-input v-model="form.Note" />
+      </el-form-item>
+      <div style="text-align: center;padding:20px 0px;">
+        <!-- 取消 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleCancel"
+        >
+          {{ $t("common:button:cancel") }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleSave"
+        >
+          {{ $t("common:button:save") }}
+        </el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { addOrUpdateTrialSiteEquipmentSurvey } from '@/api/research'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'EquipmentForm',
+  props: {
+    equipmentInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    trialSiteSurveyEquipmentType: {
+      type: String,
+      default: ''
+    },
+    isShowParameters: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      form: {
+        Id: '',
+        EquipmentTypeId: '',
+        Parameters: '',
+        ManufacturerName: '',
+        ScannerType: '',
+        Note: '',
+        TrialSiteSurveyId: ''
+      },
+      rules: {
+        EquipmentTypeId: [
+          { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
+        ]
+      },
+      loading: false,
+      dictionaryList: {}
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    async initForm() {
+      Object.keys(this.equipmentInfo).forEach(key => {
+        this.form[key] = this.equipmentInfo[key]
+      })
+    },
+    // 保存参与者信息
+    async handleSave() {
+      try {
+        const validate = await this.$refs.equipmentForm.validate()
+        if (!validate) return
+        this.loading = true
+        if (!this.form.TrialSiteSurveyId) {
+          this.form.TrialSiteSurveyId = getQueryString('trialSiteSurveyId')
+        }
+        const trialId = getQueryString('trialId')
+        const res = await addOrUpdateTrialSiteEquipmentSurvey(trialId, this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.$emit('getList')
+          this.$emit('close')
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    handleTrialRoleChange(v) {
+      if (v === 1) {
+        // crc
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.crcId
+      } else if (v === 2) {
+        // cra
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.craId
+      } else {
+        this.form.IsGenerateAccount = false
+        this.form.UserTypeId = ''
+      }
+    },
+    // 取消保存
+    handleCancel() {
+      this.$emit('close')
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.equipment_form_content{
+  padding: 0 10px;
+  /deep/.el-form-item {
+    margin-bottom: 0px;
+    padding: 5px 0 20px 0;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+}
+</style>
@@ -0,0 +1,219 @@
+<template>
+  <div class="equipments_content">
+    <div class="title">
+      <div>{{ $t('trials:equiptResearch:title:equiptResearch') }}</div>
+      <div v-if="state === 0 && userTypeEnumInt === 0 && !isHistory">
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">
+          {{ $t('common:button:add') }}
+        </el-button>
+      </div>
+    </div>
+    <div v-for="item in list" :key="item.name" class="equipment_info">
+      <div class="p_icon">
+        <i class="el-icon-receiving" />
+      </div>
+      <div class="p_info">
+        <div
+          class="p_info_basic"
+          :style="{maxWidth:w+'px','white-space': 'nowrap',
+                   overflow: 'hidden',
+                   'text-overflow': 'ellipsis'}"
+        >
+          <div class="p_text">{{ item.EquipmentType }}</div>
+          <div v-if="isShowParameters" class="p_text" style="margin-left:10px">{{ item.Parameters }}</div>
+          <div class="p_text" style="margin-left:10px">{{ item.ManufacturerName }}</div>
+        </div>
+        <div class="p_text">{{ item.ScannerType }}</div>
+        <div class="p_text">{{ item.Note }}</div>
+      </div>
+      <div v-if="state === 0 && userTypeEnumInt === 0 && !isHistory" class="p_func">
+        <el-button type="text" @click="handleEdit(item)">
+          <i class="el-icon-edit-outline" style="font-size: 20px;" />
+        </el-button>
+        <el-button type="text" @click="handleDelete(item)">
+          <i class="el-icon-delete" style="font-size: 20px;" />
+        </el-button>
+      </div>
+    </div>
+    <!-- 添加/编辑设备信息 -->
+    <el-drawer
+      :title="title"
+      :visible.sync="formVisible"
+      direction="btt"
+      size="70%"
+    >
+      <EquipmentForm
+        v-if="formVisible"
+        :equipment-info="equipmentInfo"
+        :is-show-parameters="isShowParameters"
+        @getList="getList"
+        @close="close"
+      />
+    </el-drawer>
+  </div>
+</template>
+<script>
+import { getTrialSiteEquipmentSurveyList, deleteTrialSiteEquipmentSurvey } from '@/api/research'
+import EquipmentForm from './EquipmentForm'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'EquipmentsResearch',
+  components: { EquipmentForm },
+  props: {
+    trialSiteSurveyEquipmentType: {
+      type: String,
+      default: ''
+    },
+    isHistory: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      list: [],
+      formVisible: false,
+      title: '',
+      equipmentInfo: {},
+      w: 0,
+      loading: false,
+      userTypeEnumInt: 0,
+      state: null,
+      trialSiteSurveyId: '',
+      trialId: '',
+      isShowParameters: false
+    }
+  },
+  mounted() {
+    this.w = document.body.clientWidth - 200
+    if (zzSessionStorage.getItem('userTypeEnumInt')) {
+      this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+    }
+    this.trialSiteSurveyId = getQueryString('trialSiteSurveyId')
+    this.trialId = getQueryString('trialId')
+  },
+  methods: {
+    // 获取列表数据
+    async getList() {
+      try {
+        this.loading = true
+        const res = await getTrialSiteEquipmentSurveyList(this.trialSiteSurveyId)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list = res.Result
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 新增
+    handleAdd() {
+      this.equipmentInfo = {}
+      this.title = this.$t('trials:equiptResearch:dialogTitle:add')
+      this.formVisible = true
+    },
+    // 编辑
+    handleEdit(obj) {
+      this.equipmentInfo = Object.assign({ ...obj })
+      this.title = this.$t('trials:equiptResearch:dialogTitle:edit')
+      this.formVisible = true
+    },
+    // 删除
+    async handleDelete(obj) {
+      try {
+        const confirm = await this.$confirm(
+          this.$t('trials:staffResearch:message:confirmDel'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        this.loading = true
+        const res = await deleteTrialSiteEquipmentSurvey(obj.Id, this.trialId)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list.splice(this.list.findIndex((item) => item.Id === obj.Id), 1)
+          this.$message.success(this.$t('trials:equiptResearch:message:delSuccessfully'))
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, isShowParameters) {
+      this.isShowParameters = isShowParameters
+      this.list = TrialSiteEquipmentSurveyList
+      this.state = trialSiteSurvey.State
+      this.$forceUpdate()
+      console.log(this.list)
+    },
+    // 关闭窗口
+    close() {
+      this.formVisible = false
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.equipments_content{
+  background: #fff;
+  padding: 10px;
+  .title{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+  .equipment_info{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    align-items: center;
+    border-top: 1px solid #f5f7fa;
+    .p_icon{
+      width: 70px;
+      font-size: 25px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .p_info{
+      position: relative;
+      flex:1;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-evenly;
+      // border-right: 1px solid #f5f7fa;
+      font-size: 13px;
+    }
+    .p_info:after {
+        content: '';
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+        right: 0;
+        height: 50px;
+        width: 1px;
+        background-color: #f5f7fa;
+    }
+    .p_info_basic{
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+    }
+    .p_text{
+      line-height: 25px;
+      color: #82848a;
+    }
+    .p_func{
+      width: 80px;
+      padding: 0 10px;
+      text-align: center;
+    }
+  }
+}
+
+</style>
@@ -0,0 +1,304 @@
+<template>
+  <div
+    v-loading="loading"
+    class="participants_form_content"
+  >
+    <el-form
+      ref="participantForm"
+      :model="form"
+      :rules="rules"
+      label-width="80px"
+      label-position="left"
+    >
+      <!-- 姓 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:lastName')"
+        prop="LastName"
+      >
+        <span>{{ form.LastName }}</span>
+      </el-form-item>
+      <!-- 名 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:firstName')"
+        prop="FirstName"
+      >
+        <span>{{ form.FirstName }}</span>
+      </el-form-item>
+      <!-- 电话号码 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:phone')"
+        prop="Phone"
+      >
+        <span>{{ form.Phone }}</span>
+      </el-form-item>
+      <!-- 邮箱 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:email')"
+        prop="Email"
+      >
+        <span>{{ form.Email }}</span>
+      </el-form-item>
+      <!-- 单位 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:organization')"
+        prop="OrganizationName"
+      >
+        <span>{{ form.Email }}</span>
+      </el-form-item>
+      <!-- 用户类型 -->
+      <el-form-item v-if="form.IsGenerateAccount" :label="$t('trials:staffResearch:form:userType')" prop="UserTypeId">
+        <el-select v-model="form.UserTypeId" style="width: 100%" disabled>
+          <el-option v-for="item of userTypeOptions" :key="item.Id" :label="item.UserTypeShortName" :value="item.Id">
+            <span>{{ item.UserType }}</span>
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <!-- 更新状态 -->
+      <el-form-item :label="$t('trials:staffResearch:form:updateState')">
+        <el-radio-group v-model="form.IsHistoryUserDeleted" style="width: 100%">
+          <el-radio v-for="item of $d.IsUserExitTrial" :key="`IsHistoryUserDeleted${item.value}`" :label="item.value">{{
+            item.label }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        v-if="errorMsg"
+        label=""
+      >
+        <span
+          v-if="errorMsg"
+          style="font-size: 12px; color: #f66"
+        >
+          {{ errorMsg }}
+        </span>
+      </el-form-item>
+      <div style="text-align: center;padding:20px 0px;">
+        <!-- 取消 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleCancel"
+        >
+          {{ $t("common:button:cancel") }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleSave"
+        >
+          {{ $t("common:button:save") }}
+        </el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { addOrUpdateTrialSiteUserSurvey } from '@/api/research'
+import { getUserTypeList } from '@/api/research'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'ParticipantForm',
+  props: {
+    participantInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    state: {
+      type: Number,
+      required: true
+    }
+  },
+  data() {
+    var validateEmail = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        var reg =
+          /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.form.Email && reg.test(this.form.Email)) {
+          this.sendDisabled = false
+          callback()
+        } else {
+          callback(new Error(this.$t('trials:researchForm:formRule:email')))
+          this.sendDisabled = true
+        }
+      }
+    }
+    return {
+      form: {
+        Id: '',
+        LastName: null,
+        FirstName: null,
+        TrialRoleCode: null,
+        UserTypeId: null,
+        Phone: null,
+        Email: null,
+        OrganizationName: '',
+        IsGenerateAccount: false,
+        IsHistoryUserDeleted: ''
+      },
+      rules: {
+        LastName: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
+        ],
+        FirstName: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
+        ],
+        TrialRoleCode: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur', 'change']
+          }
+        ],
+        UserTypeId: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur']
+          }
+        ],
+        Phone: [
+          {
+            max: 50,
+            message: this.$t('common:ruleMessage:maxLength') + ' 50',
+            trigger: 'blur'
+          }
+        ],
+        Email: [
+          { required: true, validator: validateEmail, trigger: ['blur'] }
+        ],
+        IsHistoryUserDeleted: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur', 'change']
+          }
+        ]
+      },
+      userRoles: [],
+      userTypeOptions: [],
+      userTypeEnumInt: 0,
+      errorMsg: '',
+      loading: false
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    async initForm() {
+      this.loading = true
+      const res = await getUserTypeList(3)
+      if (res.IsSuccess) {
+        this.userTypeOptions = res.Result
+        var crcObj = res.Result.find((i) => i.UserTypeEnum === 2)
+        this.crcId = crcObj ? crcObj.Id : ''
+        var craObj = res.Result.find((i) => i.UserTypeEnum === 9)
+        this.craId = craObj ? craObj.Id : ''
+      }
+      Object.keys(this.participantInfo).forEach((key) => {
+        this.form[key] = this.participantInfo[key]
+      })
+      if (zzSessionStorage.getItem('userTypeEnumInt')) {
+        this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+      }
+      this.loading = false
+    },
+    // 保存参与者信息
+    async handleSave() {
+      try {
+        const validate = await this.$refs.participantForm.validate()
+        if (!validate) return
+        this.loading = true
+        if (!this.form.TrialSiteSurveyId) {
+          this.form.TrialSiteSurveyId = getQueryString('trialSiteSurveyId')
+        }
+        const trialId = getQueryString('trialId')
+        const res = await addOrUpdateTrialSiteUserSurvey(trialId, this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(
+            this.$t('common:message:savedSuccessfully')
+          )
+
+          this.$emit('close', { id: res.Result, errorMessage: '' })
+        }
+      } catch (e) {
+        if (e.Result && e.Result.Id && e.ErrorMessage) {
+          this.$emit('close', {
+            id: e.Result.Id,
+            errorMessage: e.ErrorMessage
+          })
+        } else {
+          console.log(e)
+        }
+        this.loading = false
+      }
+    },
+    handleTrialRoleChange(v) {
+      if (v === 1) {
+        // crc
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.crcId
+      } else if (v === 2) {
+        // cra
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.craId
+      } else {
+        this.form.IsGenerateAccount = false
+        this.form.UserTypeId = ''
+      }
+    },
+    // 取消保存
+    handleCancel() {
+      this.$emit('close')
+    },
+    handleIsCorrectChange(val) {
+      if (!val) {
+        this.form.IsGenerateAccount = false
+      }
+    },
+    handleIsGenerateAccountChange(val) {
+      if (!val) {
+        this.form.UserTypeId = ''
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.participants_form_content{
+  padding: 0 10px;
+  /deep/.el-form-item {
+     margin-bottom: 0px;
+    padding: 5px 0 20px 0;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+}
+</style>
@@ -0,0 +1,198 @@
+<template>
+  <div class="participants_content">
+    <div class="title">
+      <div>{{ $t('trials:staffResearch:title:historicalStaff') }}</div>
+    </div>
+    <div v-for="item in list" :key="item.Id" class="participant_info">
+      <div class="p_icon">
+        <i class="el-icon-user" />
+      </div>
+      <div class="p_info">
+        <div
+          class="p_info_basic"
+          :style="{maxWidth:w+'px','white-space': 'nowrap',overflow: 'hidden','text-overflow': 'ellipsis'}"
+        >
+          <div class="p_text">{{ `${item.LastName} / ${item.FirstName}` }}</div>
+          <div class="p_text" style="margin:0 10px">{{ $fd('SiteSurvey_UserRoles',item.TrialRoleCode) }}</div> 
+        </div>
+        <div class="p_text">{{ item.Phone }}</div>
+        <div class="p_text">{{ item.Email }}</div>
+        <div class="p_text">{{ item.OrganizationName }}</div>
+      </div>
+      <div v-if="state === 0 && (userTypeEnumInt===0 ) && !isHistory" class="p_func">
+        <!-- 编辑 -->
+        <el-button
+          v-if="userTypeEnumInt===0"
+          type="text"
+          @click="editParticipant(item)"
+        >
+          <i class="el-icon-edit-outline" style="font-size: 20px;" />
+        </el-button>
+      </div>
+    </div>
+
+    <!-- 编辑人员信息 -->
+    <el-drawer
+      :title="title"
+      :visible.sync="formVisible"
+      direction="btt"
+      size="70%"
+    >
+      <HistoricalParticipantForm
+        v-if="formVisible"
+        :state="state"
+        :participant-info="participantInfo"
+        @getList="getList"
+        @close="close"
+      />
+    </el-drawer>
+  </div>
+</template>
+<script>
+import { getTrialSiteUserSurveyList } from '@/api/research'
+import HistoricalParticipantForm from './HistoricalParticipantForm'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'HisParticipantsResearch',
+  components: { HistoricalParticipantForm },
+  props: {
+    isHistory: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      formVisible: false,
+      title: '',
+      participantInfo: null,
+      w: 0,
+      state: null,
+      trialSiteSurveyId: '',
+      trialId: '',
+      userTypeEnumInt: 0,
+      warningList: []
+    }
+  },
+  mounted() {
+    this.w = document.body.clientWidth - 200
+    if (zzSessionStorage.getItem('userTypeEnumInt')) {
+      this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+    }
+    this.trialSiteSurveyId = getQueryString('trialSiteSurveyId')
+    this.trialId = getQueryString('trialId')
+  },
+  methods: {
+    // 获取参与者列表数据
+    async getList() {
+      try {
+        this.loading = true
+        var params = {
+          trialSiteSurveyId: this.trialSiteSurveyId,
+          isHistoryUser: true
+        }
+        const res = await getTrialSiteUserSurveyList(params)
+        this.loading = false
+        if (res.IsSuccess) {
+          res.Result.map(item => {
+            var obj = this.warningList.find(i => i.id === item.Id)
+            if (obj) {
+              item.ErrorMessage = obj.errorMessage
+            }
+          })
+          this.list = res.Result
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 编辑
+    editParticipant(row) {
+      this.participantInfo = Object.assign({ ...row })
+      this.title = this.$t('trials:staffResearch:dialogTitle:edit')
+      this.formVisible = true
+    },
+    // 初始化列表
+    initList(trialSiteUserSurveyList, trialSiteSurvey) {
+      this.list = trialSiteUserSurveyList
+      this.state = trialSiteSurvey.State
+      this.$forceUpdate()
+    },
+    // 关闭窗口
+    async close(obj) {
+      this.formVisible = false
+      var idx = this.warningList.findIndex(i => i.id === obj.id)
+      if (idx > -1) {
+        this.warningList[idx].errorMessage = obj.errorMessage
+      } else {
+        this.warningList.push({ id: obj.id, errorMessage: obj.errorMessage })
+      }
+      this.getList()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.participants_content{
+  background: #fff;
+  padding: 10px;
+  .title{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+  .participant_info{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    align-items: center;
+    border-top: 1px solid #f5f7fa;
+    .p_icon{
+      width: 70px;
+      font-size: 25px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .p_info{
+      position: relative;
+      flex:1;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-evenly;
+      // border-right: 1px solid #f5f7fa;
+      font-size: 13px;
+    }
+    .p_info:after {
+        content: '';
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+        right: 0;
+        height: 50px;
+        width: 1px;
+        background-color: #f5f7fa;
+    }
+    .p_info_basic{
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+    }
+    .p_text{
+      line-height: 25px;
+      color: #82848a;
+    }
+    .p_func{
+      width: 80px;
+      padding: 0 10px;
+      text-align: center;
+    }
+  }
+}
+
+</style>
@@ -0,0 +1,47 @@
+<template>
+  <div class="research_note">
+    <div class="title">
+      {{ $t('trials:equiptResearch:form:precautions') }}
+    </div>
+    <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>
+      <!-- 请确保对每位受试者的扫描参数在整个研究过程中保持一致。 -->
+      <li>{{ $t('trials:equiptResearch:form:item2') }}</li>
+      <!-- 试验过程中，如果有任何人员、设备或扫描仪器的替换，请立即通知我们。 -->
+      <li>{{ $t('trials:equiptResearch:form:item3') }}</li>
+      <!-- 请保存好原始（未经压缩的；非重建的）数据。 -->
+      <li>{{ $t('trials:equiptResearch:form:item4') }}</li>
+    </ol>
+  </div>
+</template>
+<script>
+export default {
+  name: 'ResearchNotes',
+  data() {
+    return {
+      siteSurveyNoteInfo: null
+    }
+  },
+  methods: {
+    initPage(siteSurveyNoteInfo) {
+      this.siteSurveyNoteInfo = siteSurveyNoteInfo
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.research_note{
+  background: #fff;
+  padding: 10px;
+  li{
+    line-height: 20px;
+    font-size: 14px;
+    color: #82848a;
+  }
+}
+</style>
@@ -0,0 +1,318 @@
+<template>
+  <div
+    v-loading="loading"
+    class="participants_form_content"
+  >
+    <el-form
+      ref="participantForm"
+      :model="form"
+      :rules="rules"
+      label-width="80px"
+      label-position="left"
+    >
+      <!-- 姓 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:lastName')"
+        prop="LastName"
+      >
+        <el-input
+          v-model="form.LastName"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <!-- 名 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:firstName')"
+        prop="FirstName"
+      >
+        <el-input
+          v-model="form.FirstName"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <!-- 角色 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:role')"
+        prop="TrialRoleCode"
+      >
+        <el-select
+          v-model="form.TrialRoleCode"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+          style="width:100%"
+          @change="handleTrialRoleChange"
+        >
+          <el-option
+            v-for="item of $d.SiteSurvey_UserRoles"
+            :key="item.id"
+            :label="item.label"
+            :value="parseInt(item.value)"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 电话号码 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:phone')"
+        prop="Phone"
+      >
+        <el-input
+          v-model="form.Phone"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <!-- 邮箱 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:email')"
+        prop="Email"
+      >
+        <el-input
+          v-model="form.Email"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <!-- 单位 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:organization')"
+        prop="OrganizationName"
+      >
+        <el-input
+          v-model="form.OrganizationName"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <el-form-item
+        v-if="errorMsg"
+        label=""
+      >
+        <span
+          v-if="errorMsg"
+          style="font-size: 12px; color: #f66"
+        >
+          {{ errorMsg }}
+        </span>
+      </el-form-item>
+      <div style="text-align: center;padding:20px 0px;">
+        <!-- 取消 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleCancel"
+        >
+          {{ $t("common:button:cancel") }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleSave"
+        >
+          {{ $t("common:button:save") }}
+        </el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { addOrUpdateTrialSiteUserSurvey } from '@/api/research'
+import { getUserTypeList } from '@/api/research'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'ParticipantForm',
+  props: {
+    participantInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    state: {
+      type: Number,
+      required: true
+    }
+  },
+  data() {
+    var validateEmail = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        var reg =
+          /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.form.Email && reg.test(this.form.Email)) {
+          this.sendDisabled = false
+          callback()
+        } else {
+          callback(new Error(this.$t('trials:researchForm:formRule:email')))
+          this.sendDisabled = true
+        }
+      }
+    }
+    return {
+      form: {
+        Id: '',
+        LastName: null,
+        FirstName: null,
+        TrialRoleCode: null,
+        UserTypeId: null,
+        Phone: null,
+        Email: null,
+        OrganizationName: '',
+        IsGenerateAccount: false,
+        IsDisable: false
+      },
+      rules: {
+        LastName: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
+        ],
+        FirstName: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
+        ],
+        TrialRoleCode: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur', 'change']
+          }
+        ],
+        UserTypeId: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur']
+          }
+        ],
+        Phone: [
+          {
+            max: 50,
+            message: this.$t('common:ruleMessage:maxLength') + ' 50',
+            trigger: 'blur'
+          }
+        ],
+        Email: [
+          { required: true, validator: validateEmail, trigger: ['blur'] }
+        ]
+      },
+      userRoles: [],
+      userTypeOptions: [],
+      userTypeEnumInt: 0,
+      errorMsg: '',
+      crcId: '',
+      craId: '',
+      loading: false
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    async initForm() {
+      this.loading = true
+      const res = await getUserTypeList(3)
+      if (res.IsSuccess) {
+        this.userTypeOptions = res.Result
+        var crcObj = res.Result.find((i) => i.UserTypeEnum === 2)
+        this.crcId = crcObj ? crcObj.Id : ''
+        var craObj = res.Result.find((i) => i.UserTypeEnum === 9)
+        this.craId = craObj ? craObj.Id : ''
+      }
+      Object.keys(this.participantInfo).forEach((key) => {
+        this.form[key] = this.participantInfo[key]
+      })
+      if (zzSessionStorage.getItem('userTypeEnumInt')) {
+        this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+      }
+      this.loading = false
+    },
+    // 保存参与者信息
+    async handleSave() {
+      try {
+        const validate = await this.$refs.participantForm.validate()
+        if (!validate) return
+        this.loading = true
+        if (!this.form.TrialSiteSurveyId) {
+          this.form.TrialSiteSurveyId = getQueryString('trialSiteSurveyId')
+        }
+        const trialId = getQueryString('trialId')
+        const res = await addOrUpdateTrialSiteUserSurvey(trialId, this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(
+            this.$t('common:message:savedSuccessfully')
+          )
+
+          this.$emit('close', { id: res.Result, errorMessage: '' })
+        }
+      } catch (e) {
+        if (e.Result && e.Result.Id && e.ErrorMessage) {
+          this.$emit('close', {
+            id: e.Result.Id,
+            errorMessage: e.ErrorMessage
+          })
+        } else {
+          console.log(e)
+        }
+        this.loading = false
+      }
+    },
+    handleTrialRoleChange(v) {
+      if (v === 1) {
+        // crc
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.crcId
+      } else if (v === 2) {
+        // cra
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.craId
+      } else {
+        this.form.IsGenerateAccount = false
+        this.form.UserTypeId = ''
+      }
+    },
+    // 取消保存
+    handleCancel() {
+      this.$emit('close')
+    },
+    handleIsCorrectChange(val) {
+      if (!val) {
+        this.form.IsGenerateAccount = false
+      }
+    },
+    handleIsGenerateAccountChange(val) {
+      if (!val) {
+        this.form.UserTypeId = ''
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.participants_form_content{
+  padding: 0 10px;
+  /deep/.el-form-item {
+    margin-bottom: 0px;
+    padding: 5px 0 20px 0;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+}
+</style>
@@ -0,0 +1,249 @@
+<template>
+  <div class="participants_content">
+    <div class="title">
+      <div>{{ $t('trials:staffResearch:title:newStaff') }}</div>
+      <div v-if="state === 0 && userTypeEnumInt === 0 && !isHistory">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="addParticipant"
+        >
+          {{ $t('common:button:add') }}
+        </el-button>
+      </div>
+    </div>
+    <div v-for="item in list" :key="item.Id" class="participant_info">
+      <div class="p_icon">
+        <i class="el-icon-user" />
+      </div>
+      <div class="p_info">
+        <div
+          class="p_info_basic"
+          :style="{maxWidth:w+'px','white-space': 'nowrap',overflow: 'hidden','text-overflow': 'ellipsis'}"
+        >
+          <div class="p_text">{{ `${item.LastName} / ${item.FirstName}` }}</div>
+          <div class="p_text" style="margin:0 10px">{{ $fd('SiteSurvey_UserRoles',item.TrialRoleCode) }}</div>
+        </div>
+        <div class="p_text">{{ item.Phone }}</div>
+        <div class="p_text">{{ item.Email }}</div>
+        <div class="p_text">{{ item.OrganizationName }}</div>
+      </div>
+      <div v-if="state === 0 && (userTypeEnumInt===0 ) && !isHistory" class="p_func">
+        <!-- 编辑 -->
+        <el-button
+          type="text"
+          :disabled="state!==0 || item.IsGenerateSuccess"
+          @click="editParticipant(item)"
+        >
+          <i class="el-icon-edit-outline" style="font-size: 20px;" />
+        </el-button>
+        <!-- 移除 -->
+        <el-button
+          type="text"
+          :disabled="state!==0 || item.IsGenerateSuccess"
+          @click="removeParticipant(item)"
+        >
+          <i class="el-icon-delete" style="font-size: 20px;" />
+        </el-button>
+      </div>
+    </div>
+
+    <!-- 添加/编辑人员信息 -->
+    <el-drawer
+      :title="title"
+      :visible.sync="formVisible"
+      direction="btt"
+      size="70%"
+    >
+      <ParticipantForm
+        v-if="formVisible"
+        :state="state"
+        :participant-info="participantInfo"
+        @getList="getList"
+        @close="close"
+      />
+    </el-drawer>
+  </div>
+</template>
+<script>
+import { getTrialSiteUserSurveyList, deleteTrialSiteUserSurvey } from '@/api/research'
+import ParticipantForm from './ParticipantForm'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'ParticipantsResearch',
+  components: { ParticipantForm },
+  props: {
+    isHistory: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      formVisible: false,
+      title: '',
+      participantInfo: null,
+      w: 0,
+      state: null,
+      trialSiteSurveyId: '',
+      trialId: '',
+      userTypeEnumInt: 0,
+      warningList: []
+    }
+  },
+  mounted() {
+    this.w = document.body.clientWidth - 200
+    if (zzSessionStorage.getItem('userTypeEnumInt')) {
+      this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+    }
+    this.trialSiteSurveyId = getQueryString('trialSiteSurveyId')
+    this.trialId = getQueryString('trialId')
+  },
+  methods: {
+    // 获取参与者列表数据
+    async getList() {
+      try {
+        this.loading = true
+        var params = {
+          trialSiteSurveyId: this.trialSiteSurveyId,
+          isHistoryUser: false
+        }
+        const res = await getTrialSiteUserSurveyList(params)
+        this.loading = false
+        if (res.IsSuccess) {
+          res.Result.map(item => {
+            var obj = this.warningList.find(i => i.id === item.Id)
+            if (obj) {
+              item.ErrorMessage = obj.errorMessage
+            }
+          })
+          this.list = res.Result
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 新增
+    addParticipant() {
+      this.participantInfo = {}
+      this.title = this.$t('trials:staffResearch:dialogTitle:add')
+      this.formVisible = true
+    },
+    // 编辑
+    editParticipant(obj) {
+      this.participantInfo = Object.assign({ ...obj })
+      this.title = this.$t('trials:staffResearch:dialogTitle:edit')
+      this.formVisible = true
+    },
+    // 删除
+    async removeParticipant(obj) {
+      try {
+        const confirm = await this.$confirm(
+          this.$t('trials:staffResearch:message:confirmDel'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        this.loading = true
+        const res = await deleteTrialSiteUserSurvey(obj.Id, this.trialId)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list.splice(this.list.findIndex((item) => item.Id === obj.Id), 1)
+          this.$message.success(this.$t('trials:staffResearch:message:delSuccessfully'))
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    isExistIncorrect() {
+      return this.list.some(item => item.IsCorrect === false)
+    },
+
+    // 初始化列表
+    initList(trialSiteUserSurveyList, trialSiteSurvey) {
+      this.list = trialSiteUserSurveyList
+      this.state = trialSiteSurvey.State
+      this.$forceUpdate()
+    },
+    // 关闭窗口
+    async close(obj) {
+      this.formVisible = false
+      var idx = this.warningList.findIndex(i => i.id === obj.id)
+      if (idx > -1) {
+        this.warningList[idx].errorMessage = obj.errorMessage
+      } else {
+        this.warningList.push({ id: obj.id, errorMessage: obj.errorMessage })
+      }
+      this.getList()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.participants_content{
+  background: #fff;
+  padding: 10px;
+  .title{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+  .participant_info{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    align-items: center;
+    border-top: 1px solid #f5f7fa;
+    .p_icon{
+      width: 70px;
+      font-size: 25px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .p_info{
+      position: relative;
+      flex:1;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-evenly;
+      // border-right: 1px solid #f5f7fa;
+      font-size: 13px;
+    }
+    .p_info:after {
+        content: '';
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+        right: 0;
+        height: 50px;
+        width: 1px;
+        background-color: #f5f7fa;
+    }
+    .p_info_basic{
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+    }
+    .p_text{
+      line-height: 25px;
+      color: #82848a;
+    }
+    .p_func{
+      width: 80px;
+      padding: 0 10px;
+      text-align: center;
+    }
+  }
+}
+
+</style>
@@ -0,0 +1,221 @@
+<template>
+  <div v-loading="loading" class="research_detal_wrapper">
+    <div class="d_title">{{ $t('trials:researchForm:title:question') }}</div>
+    <div class="d_content">
+
+      <!-- 项目基本信息 -->
+      <BasicInfo ref="basicInfo" />
+      <!-- 历史人员 -->
+      <HistoricalParticipants ref="historicalParticipant" class="mt5" />
+      <!-- 新增人员 -->
+      <Participants ref="participants" class="mt5" />
+      <!-- 设备调研 -->
+      <Equipments ref="equipments" class="mt5" />
+      <!-- 备注 -->
+      <Notes ref="notes" class="mt5" />
+    </div>
+    <div class="d_footer">
+      <div class="d_func_row">
+        <div
+          v-if="state === 0 && userTypeEnumInt === 0"
+          class="d_func"
+          @click="handleSave"
+        >
+          {{ $t('common:button:save') }}
+        </div>
+        <div
+          v-if="(state === 0 && userTypeEnumInt === 0)"
+          class="d_func"
+          @click="handleSubmit('submit')"
+        >
+          {{ $t('trials:researchForm:button:submit') }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getSiteSurveyInfo, trialSurveySubmit } from '@/api/research'
+import { getQueryString } from '@/utils/history.js'
+import BasicInfo from './components/BasicInfo'
+import HistoricalParticipants from './components/HistoricalParticipants'
+import Participants from './components/Participants'
+import Equipments from './components/Equipments'
+import Notes from './components/Notes'
+export default {
+  name: 'ResearchMobileDetail',
+  components: {
+    BasicInfo,
+    HistoricalParticipants,
+    Participants, Equipments, Notes
+  },
+  data() {
+    return {
+      trialId: this.$route.query.trialId,
+      trialSiteSurveyId: '',
+      loading: false,
+      state: null,
+      userTypeEnumInt: 0,
+      rejectVisible: false,
+      rejectForm: { reason: '' },
+      siteSurveyNoteInfo: null
+    }
+  },
+  mounted() {
+    this.trialSiteSurveyId = getQueryString('trialSiteSurveyId')
+    this.initPage()
+    if (zzSessionStorage.getItem('userTypeEnumInt')) {
+      this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+    }
+  },
+  methods: {
+    // 初始化页面
+    async initPage() {
+      try {
+        this.loading = true
+        const res = await getSiteSurveyInfo(this.trialId, this.trialSiteSurveyId)
+        if (res.Result) {
+          if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
+            this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
+          }
+          this.state = res.Result.TrialSiteSurvey.State
+          this.$refs['basicInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig ? res.Result.SiteSurveyFiledConfig.NotShowFieldList : null)
+          var historicalArr = []
+          var newArr = []
+          res.Result.TrialSiteUserSurveyList.map(i => {
+            if (i.IsHistoryUser) {
+              historicalArr.push(i)
+            } else {
+              newArr.push(i)
+            }
+          })
+
+          this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
+          this.$refs['participants'].initList(newArr, res.Result.TrialSiteSurvey)
+          this.$refs['equipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey, !(res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0))
+          this.$refs['notes'].initPage(this.siteSurveyNoteInfo)
+        }
+        this.loading = false
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 保存
+    handleSave() {
+      this.$refs['basicInfo'].handleSave(false)
+    },
+    // 提交
+    async handleSubmit(type) {
+      if (this.userTypeEnumInt === 0) {
+        try {
+          this.loading = true
+          const res = await this.$refs['basicInfo'].handleSave(true)
+          this.loading = false
+          if (res) {
+            this.submit(type)
+          }
+        } catch (e) {
+          this.loading = false
+          console.log(e)
+        }
+      } else {
+        this.submit(type)
+      }
+    },
+    async submit(type) {
+      try {
+        const confirm = await this.$confirm(
+          this.userTypeEnumInt === 0 ? this.$t('trials:researchForm:message:submitWarning') : this.$t('trials:researchForm:message:submitWarning2'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        var param = {
+          TrialId: this.trialId,
+          TrialSiteSurveyId: this.trialSiteSurveyId
+        }
+        const res = await trialSurveySubmit(param)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.initPage()
+          if (type === 'approve') {
+            this.$message.success(this.$t('common:message:approvedSuccessfully'))
+          } else {
+            this.$message.success(this.$t('trials:researchForm:message:savedSuccessfully'))
+          }
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 退出
+    handleBack() {
+      this.$router.push({ path: `/researchLogin_m?trialId=${this.trialId}&lang=${this.$i18n.locale}` })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.research_detal_wrapper{
+  background-color:#f5f7fa;
+  .d_title{
+    margin-bottom: 5px;
+    line-height: 80px;
+    font-size: 28px;
+    font-weight: bold;
+    text-align: center;
+    background: #fff;
+    position: sticky;
+    top: 0;
+    z-index: 10;
+  }
+  // .d_content{
+
+  // }
+  .d_footer{
+    position: sticky;
+    bottom: 0;
+    z-index: 10;
+    background-color: #f8f8f8;
+    line-height: 50px;
+    text-align: center;
+    // padding: 20px;
+  }
+  .d_func_row{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+  }
+  .d_func{
+    flex: 1;
+    margin: 20px;
+    color: #fff;
+    background-color: #428bca;
+    border-color: #428bca;
+    padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    transition: .1s;
+    font-weight: 500;
+    box-sizing: border-box;
+    outline: 0;
+    text-align: center;
+    line-height: 1;
+    white-space: nowrap;
+    cursor: pointer;
+    &:hover{
+      background: #68a2d5;
+      border-color: #68a2d5;
+      color: #fff;
+    }
+  }
+  .mt5{
+    margin-top: 5px
+  }
+}
+
+</style>
@@ -0,0 +1,406 @@
+<template>
+  <div class="research_login_m_content">
+    <div class="title">{{ $t('trials:researchForm:title:question') }}</div>
+    <el-form
+      ref="loginForm"
+      v-loading="loading"
+      label-position="left"
+      label-width="120px"
+      :model="form"
+      :rules="rules"
+    >
+      <div class="basic_content">
+        <!-- 项目编号 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:trialId')"
+        >
+          <span>{{ form.TrialCode }}</span>
+        </el-form-item>
+        <!-- 试验方案号 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:researchNo')"
+        >
+          <span>{{ form.ResearchProgramNo }}</span>
+        </el-form-item>
+        <!-- 试验名称 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:researchName')"
+        >
+          <span>{{ form.ExperimentName }}</span>
+        </el-form-item>
+        <!-- 适应症类型 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:decleareType')"
+        >
+          <span>{{ form.IndicationType }}</span>
+        </el-form-item>
+      </div>
+      <div class="login_content">
+        <el-form-item
+          :label="$t('trials:researchForm:form:siteName')"
+          prop="SiteId"
+        >
+          <el-select
+            v-model="form.TrialSiteId"
+            filterable
+            style="width:100%;"
+            @change="handleSiteChange"
+          >
+            <el-option
+              v-for="(item,index) of siteOptions"
+              :key="index"
+              :label="item.TrialSiteAliasName"
+              :value="item.TrialSiteId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="form.TrialSiteId && isHaveSiteSurveyRecord"
+          label=""
+          style="text-align:right;"
+        >
+          <!-- 更新调研表 -->
+          <el-link
+            v-if="!form.IsUpdate"
+            type="primary"
+            @click="form.IsUpdate = true"
+          >
+            {{ $t('trials:researchForm:button:updateQsForm') }}
+          </el-link>
+          <!-- 取消更新调研表 -->
+          <el-link
+            v-else
+            type="primary"
+            @click="form.IsUpdate = false;form.ReplaceUserEmailOrPhone=''"
+          >
+            {{ $t('trials:researchForm:button:cancelUpdateQsForm') }}
+          </el-link>
+        </el-form-item>
+
+        <!-- 原调研表填写人邮箱 -->
+        <el-form-item
+          v-if="form.IsUpdate"
+          :label="$t('trials:researchForm:form:originalEmail')"
+          prop="ReplaceUserEmailOrPhone"
+        >
+          <el-input
+            v-model="form.ReplaceUserEmailOrPhone"
+            autocomplete="new-password"
+          />
+        </el-form-item>
+        <!-- 联系邮箱 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:contactorEmail')"
+          prop="EmailOrPhone"
+        >
+          <el-input
+            v-model="form.EmailOrPhone"
+            autocomplete="new-password"
+          />
+        </el-form-item>
+        <el-form-item
+          :label="$t('trials:researchForm:form:verifyCode')"
+        >
+          <div class="code_content">
+            <el-input
+              v-model="form.VerificationCode"
+              autocomplete="new-password"
+            />
+            <el-button
+              type="primary"
+              :disabled="sendDisabled || !form.EmailOrPhone || count > 0"
+              @click="handleSendCode"
+            >
+              {{ this.$t('trials:researchForm:button:send') }} {{ sendTitle ? `${sendTitle}` : null }}
+            </el-button>
+          </div>
+        </el-form-item>
+        <div class="submit_content">
+          <el-button
+            size="large"
+            type="primary"
+            @click="onSubmit"
+          >
+            {{ $t('common:button:submit') }}
+          </el-button>
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { sendVerifyCode, verifySendCode, getTrialSurveyInitInfo } from '@/api/research'
+import { getUserMenuTree, getUserPermissions } from '@/api/user'
+import store from '@/store'
+import { mapGetters, mapMutations } from 'vuex'
+export default {
+  name: 'ResearchMobileLogin',
+  data() {
+    var checkPhone = (rule, value, callback) => {
+      const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
+      if (!value) {
+        return callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      }
+      setTimeout(() => {
+        if (!Number.isInteger(+value)) {
+          callback(new Error(this.$t('trials:researchForm:formRule:phone')))
+        } else {
+          if (phoneReg.test(value)) {
+            callback()
+          } else {
+            callback(new Error(this.$t('trials:researchForm:formRule:phone')))
+          }
+        }
+      }, 100)
+    }
+    var validateEmail = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
+          callback()
+        } else {
+          callback(new Error(this.$t('trials:researchForm:formRule:email')))
+        }
+      }
+    }
+    var validateReplaceEmail = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.form.ReplaceUserEmailOrPhone && reg.test(this.form.ReplaceUserEmailOrPhone)) {
+          callback()
+        } else {
+          callback(new Error(this.$t('trials:researchForm:formRule:email')))
+        }
+      }
+    }
+    return {
+      trialId: '',
+      form: {
+        Sponsor: null, // 申办方
+        ResearchProgramNo: null, // 方案号
+        TrialCode: null, // 项目编号
+        IndicationType: null, // 适应症
+        ExperimentName: '',
+        TrialSiteId: null, // 研究单位名称
+        UserName: null, // 联系人
+        Phone: '', // 联系人电话
+        EmailOrPhone: '',
+        TrialSiteCode: '',
+        IsUpdate: false,
+        ReplaceUserEmailOrPhone: '',
+        VerificationCode: ''
+      },
+      rules: {
+        TrialSiteId: [
+          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: ['blur'] }
+        ],
+        UserName: [
+          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: ['blur'] },
+          { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: 'blur' }
+        ],
+        Phone: [
+          { required: true, validator: checkPhone, trigger: ['blur'] }
+        ],
+        EmailOrPhone: [
+          { required: true, validator: validateEmail, trigger: ['blur', 'change'] }
+        ],
+        ReplaceUserEmailOrPhone: [
+          { required: true, validator: validateReplaceEmail, trigger: ['blur'] }
+        ],
+        VerificationCode: [{ required: true, validator: (rule, value, callback) => { !value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback() }, trigger: ['blur'] }]
+      },
+      siteOptions: [],
+      loading: false,
+      sendDisabled: false,
+      btnLoading: false,
+      sendTitle: '',
+      count: '',
+      timer: null,
+      msg: '',
+      lang: 'zh',
+      isHaveSiteSurveyRecord: false
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'asyncRoutes',
+      'routes',
+      'language'
+    ])
+  },
+  mounted() {
+    this.$i18n.locale = this.$route.query.lang
+    this.setLanguage(this.$route.query.lang)
+    this.$updateDictionary()
+    if (this.$route.query.trialId) {
+      this.trialId = this.$route.query.trialId
+      this.initPage()
+    }
+  },
+  methods: {
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    // 初始化页面
+    async initPage() {
+      try {
+        this.loading = true
+        const res = await getTrialSurveyInitInfo(this.trialId)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.siteOptions = res.Result.TrialSiteSelectList
+        }
+        Object.keys(this.form).forEach(key => {
+          if (res.Result.hasOwnProperty(key)) {
+            this.form[key] = res.Result[key]
+          }
+        })
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 提交
+    async onSubmit() {
+      const validate = await this.$refs.loginForm.validate()
+      if (!validate) return
+      try {
+        this.loading = true
+        if (!this.form.IsUpdate) {
+          this.form.ReplaceUserEmailOrPhone = ''
+        }
+        const param = {
+          trialSiteId: this.form.TrialSiteId,
+          userName: this.form.UserName,
+          phone: this.form.Phone,
+          verificationType: 0,
+          emailOrPhone: this.form.EmailOrPhone,
+          verificationCode: this.form.VerificationCode,
+          isUpdate: this.form.IsUpdate,
+          replaceUserEmailOrPhone: this.form.ReplaceUserEmailOrPhone,
+          trialId: this.trialId
+        }
+        const res = await verifySendCode(param)
+
+        if (res.IsSuccess) {
+          zzSessionStorage.clear()
+          this.$i18n.locale = this.$route.query.lang
+          this.setLanguage(this.$route.query.lang)
+          store.dispatch('user/setToken', res.Result.Token)
+          zzSessionStorage.setItem('TokenKey', res.Result.Token)
+          var permissions = await getUserPermissions()
+          var menuTree = await getUserMenuTree()
+          store.dispatch('user/setTree', menuTree.Result)
+          store.dispatch('user/setPermissions', permissions.Result)
+          this.$router.push({ path: `/researchDetail_m?trialId=${this.trialId}&trialSiteSurveyId=${res.Result.TrialSiteSurveyId}` })
+          this.loading = false
+        }
+      } catch (e) {
+        this.loading = false
+        this.sendDisabled = false
+      }
+    },
+    handleSiteChange(val) {
+      this.isHaveSiteSurveyRecord = false
+      var selected = this.siteOptions.find(item => item.TrialSiteId === val)
+      if (selected) {
+        this.form.TrialSiteCode = selected.TrialSiteCode
+        this.isHaveSiteSurveyRecord = selected.IsHaveSiteSurveyRecord
+      }
+    },
+    // 发送验证码
+    async handleSendCode() {
+      try {
+        this.loading = true
+        const param = {
+          Email: this.form.EmailOrPhone,
+          TrialId: this.trialId
+        }
+        const res = await sendVerifyCode(param)
+        if (res.IsSuccess) {
+          this.getCode()
+          this.loading = false
+          const msg = this.$t('trials:researchForm:tip:sendCode').replace('xxx', this.form.EmailOrPhone)
+          this.$message.success(msg)
+        } else {
+          this.$alert(res.ErrorMessage)
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    getCode() {
+      const TIME_COUNT = 60
+      if (!this.timer) {
+        this.count = TIME_COUNT
+        this.sendDisabled = true
+        this.timer = setInterval(() => {
+          if (this.count > 0 && this.count <= TIME_COUNT) {
+            this.sendTitle = `(${this.count}s)`
+            this.count--
+          } else {
+            this.sendDisabled = false
+            this.sendTitle = ''
+            clearInterval(this.timer)
+            this.timer = null
+          }
+        }, 1000)
+      }
+    },
+    onCancel() {
+      this.$refs['loginForm'].resetFields()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.research_login_m_content{
+  background-color:#f5f7fa;
+  .title{
+    margin-bottom: 5px;
+    line-height: 80px;
+    font-size: 28px;
+    font-weight: bold;
+    text-align: center;
+    background: #fff;
+  }
+  .basic_content{
+    padding: 0 20px;
+    background: #fff;
+  }
+  .login_content{
+    padding: 5px 20px;
+    margin-top: 5px;
+    background: #fff;
+    /deep/.el-form-item {
+      padding-bottom: 20px;
+    }
+  }
+  .code_content{
+    display:flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    .el-input{
+      margin-right: 10px;
+    }
+  }
+  .submit_content{
+    margin-top: 20px;
+    text-align: center;
+  }
+
+  /deep/.el-form-item {
+    margin-bottom: 0px;
+    padding-top: 5px;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+  
+
+}
+</style>
@@ -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:GcpCertificate:tap:must') }}</p>
+      <p>{{ $t('system:Agreements:tap:must') }}</p>
    </div>
    <div v-if="!$route.query.ReviewStatus">
      <el-table :data="agreementList" size="small">
@@ -6,122 +6,162 @@
        v-loading="loading"
        :model="form"
        size="small"
+        :rules="rules"
      >
        <el-form-item label="国际化类型" prop="InternationalizationType">
          <el-radio-group v-model="form.InternationalizationType">
            <el-radio
              v-for="item of $d.InternationalizationType"
-              :key="'InternationalizationType'+item.value"
+              :key="'InternationalizationType' + item.value"
              :label="item.value"
-            >{{ item.label }}</el-radio>
+              >{{ item.label }}</el-radio
+            >
          </el-radio-group>
        </el-form-item>
        <el-form-item label="状态" prop="State">
          <el-radio-group v-model="form.State">
            <el-radio
              v-for="item of $d.InternationalizationKeyState"
-              :key="'InternationalizationKeyState'+item.value"
+              :key="'InternationalizationKeyState' + item.value"
              :label="item.value"
-            >{{ item.label }}</el-radio>
+              >{{ item.label }}</el-radio
+            >
          </el-radio-group>
        </el-form-item>
-        <el-table
-          :data="form.AddList"
-          style="width: 100%"
-          height="300"
-        >
-          <el-table-column
-            prop=""
-            label="功能模块/服务名"
-          >
+        <el-form-item label="迭代" prop="PublishLogId">
+          <el-select v-model="form.PublishLogId" clearable filterable>
+            <el-option
+              v-for="item in PublishVersionList"
+              :key="item.Id"
+              :label="item.Version"
+              :value="item.Id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-table :data="form.AddList" style="width: 100%" height="300">
+          <el-table-column prop="" label="功能模块/服务名">
            <template slot-scope="scope">
              <el-form-item
                label=""
-                :prop="`AddList.${scope.$index}.Description`"
+                :prop="`AddList.${scope.$index}.Module`"
                :rules="[
-                  { required: true,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  { max: 200, message: `${$t('common:ruleMessage:maxLength')} 200` }
+                  {
+                    max: 200,
+                    message: `${$t('common:ruleMessage:maxLength')} 200`,
+                    trigger: ['change', 'blur'],
+                  },
                ]"
              >
                <el-input
-                  v-model="scope.row.Description"
+                  v-model="scope.row.Module"
                  type="textarea"
                  maxlength="200"
-                  :autosize="{ minRows: 2, maxRows: 4}"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
                />
              </el-form-item>
            </template>
          </el-table-column>
-          <el-table-column
-            prop=""
-            label="标识"
-          >
+          <el-table-column prop="" label="标识">
            <template slot-scope="scope">
              <el-form-item
                label=""
                :prop="`AddList.${scope.$index}.Code`"
                :rules="[
-                  { required: true,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  { max: 200, message: `${$t('common:ruleMessage:maxLength')} 200` }
+                  {
+                    required: true,
+                    message: $t('common:ruleMessage:specify'),
+                    trigger: ['change', 'blur'],
+                  },
+                  {
+                    max: 200,
+                    message: `${$t('common:ruleMessage:maxLength')} 200`,
+                  },
                ]"
              >
                <el-input
                  v-model="scope.row.Code"
                  type="textarea"
                  maxlength="200"
-                  :autosize="{ minRows: 2, maxRows: 4}"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
                />
              </el-form-item>
            </template>
          </el-table-column>
-          <el-table-column
-            prop=""
-            label="中文值"
-          >
+          <el-table-column prop="" label="中文值">
            <template slot-scope="scope">
              <el-form-item
                label=""
                :prop="`AddList.${scope.$index}.ValueCN`"
                :rules="[
-                  { required: true,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  { max: 1000, message: `${$t('common:ruleMessage:maxLength')} 1000` }
+                  {
+                    required: true,
+                    message: $t('common:ruleMessage:specify'),
+                    trigger: ['change', 'blur'],
+                  },
+                  {
+                    max: 1000,
+                    message: `${$t('common:ruleMessage:maxLength')} 1000`,
+                  },
                ]"
              >
                <el-input
                  v-model="scope.row.ValueCN"
                  type="textarea"
                  maxlength="1000"
-                  :autosize="{ minRows: 2, maxRows: 4}"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
                />
              </el-form-item>
            </template>
          </el-table-column>
-          <el-table-column
-            prop=""
-            label="英文值"
-          >
+          <el-table-column prop="" label="英文值">
            <template slot-scope="scope">
              <el-form-item
                label=""
                :prop="`AddList.${scope.$index}.Value`"
                :rules="[
-                  { required: true,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  { max: 1000, message: `${$t('common:ruleMessage:maxLength')} 1000` }
+                  {
+                    required: true,
+                    message: $t('common:ruleMessage:specify'),
+                    trigger: ['change', 'blur'],
+                  },
+                  {
+                    max: 1000,
+                    message: `${$t('common:ruleMessage:maxLength')} 1000`,
+                  },
                ]"
              >
                <el-input
                  v-model="scope.row.Value"
                  type="textarea"
                  maxlength="1000"
-                  :autosize="{ minRows: 2, maxRows: 4}"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
                />
              </el-form-item>
            </template>
          </el-table-column>
-          <el-table-column
-            align="right"
-            width="100"
-          >
+          <el-table-column prop="" label="说明">
+            <template slot-scope="scope">
+              <el-form-item
+                label=""
+                :prop="`AddList.${scope.$index}.Description`"
+                :rules="[
+                  {
+                    max: 200,
+                    message: `${$t('common:ruleMessage:maxLength')} 200`,
+                    trigger: ['change', 'blur'],
+                  },
+                ]"
+              >
+                <el-input
+                  v-model="scope.row.Description"
+                  type="textarea"
+                  maxlength="200"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
+                />
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="right" width="100">
            <template slot="header">
              <!-- 新增 -->
              <el-button
@@ -129,7 +169,8 @@
                type="primary"
                icon="el-icon-plus"
                @click="handleAdd"
-              >{{ $t('common:button:new') }}</el-button>
+                >{{ $t("common:button:new") }}</el-button
+              >
            </template>
            <template slot-scope="scope">
              <!-- 删除 -->
@@ -138,81 +179,97 @@
                type="text"
                icon="el-icon-delete"
                @click="handleDelete(scope.$index)"
-              >{{ $t('common:button:delete') }}</el-button>
+                >{{ $t("common:button:delete") }}</el-button
+              >
            </template>
          </el-table-column>
        </el-table>
      </el-form>
-
    </template>
    <template slot="dialog-footer">
-      <el-button size="small" type="primary" @click="handleCancle">取消</el-button>
-      <el-button size="small" type="primary" @click="handleSave">保存</el-button>
+      <el-button size="small" type="primary" @click="handleCancle"
+        >取消</el-button
+      >
+      <el-button size="small" type="primary" @click="handleSave"
+        >保存</el-button
+      >
    </template>
  </base-model>
 </template>
 <script>
-import { batchAddInternationalization } from '@/api/admin'
-import BaseModel from '@/components/BaseModel'
+import { batchAddInternationalization } from "@/api/admin";
+import BaseModel from "@/components/BaseModel";
 const formDataDefault = () => {
  return {
    State: 0,
    InternationalizationType: 1,
-    AddList: []
-  }
-}
+    PublishLogId: null,
+    AddList: [],
+  };
+};
 export default {
-  name: 'BatcnAddForm',
+  name: "BatcnAddForm",
  components: { BaseModel },
  data() {
    return {
      loading: false,
      form: formDataDefault(),
-      model_cfg: { visible: false, showClose: true, width: '800px', title: '', appendToBody: true }
-    }
-  },
-  mounted() {
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: "800px",
+        title: "",
+        appendToBody: true,
+      },
+      rules: {
+        PublishLogId: [{ required: true, message: "请选择", trigger: "blur" }],
+      },
+      PublishVersionList: [],
+    };
  },
+  mounted() {},
  methods: {
-
-    openDialog(title, data) {
-      this.model_cfg.visible = true
-      this.model_cfg.title = title
-      this.form = formDataDefault()
+    openDialog(title, data, options = []) {
+      this.PublishVersionList = options;
+      this.model_cfg.visible = true;
+      this.model_cfg.title = title;
+      this.form = formDataDefault();
    },
    handleSave() {
-      this.$refs.batcnAddForm.validate(valid => {
-        if (!valid) return
-        this.loading = true
-        batchAddInternationalization(this.form).then(res => {
-          this.loading = false
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.model_cfg.visible = false
-          this.$emit('getList')
-        }).catch(() => {
-          this.loading = false
-        })
-      })
+      this.$refs.batcnAddForm.validate((valid) => {
+        if (!valid) return;
+        this.loading = true;
+        batchAddInternationalization(this.form)
+          .then((res) => {
+            this.loading = false;
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.model_cfg.visible = false;
+            this.$emit("getList");
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
    },
    handleCancle() {
-      this.model_cfg.visible = false
+      this.model_cfg.visible = false;
    },
    handleAdd() {
      this.form.AddList.push({
-        Description: '',
-        Code: '',
-        ValueCN: '',
-        Value: ''
-      })
+        Description: "",
+        Code: "",
+        ValueCN: "",
+        Value: "",
+      });
    },
    handleDelete(index) {
-      this.$confirm('是否确认删除？', {
-        type: 'warning',
-        distinguishCancelAndClose: true
+      this.$confirm("是否确认删除？", {
+        type: "warning",
+        distinguishCancelAndClose: true,
      }).then(() => {
-        this.form.AddList.splice(index, 1)
-      })
-    }
-  }
-}
+        this.form.AddList.splice(index, 1);
+      });
+    },
+  },
+};
 </script>
@@ -9,147 +9,216 @@
        label-width="130px"
        size="small"
      >
-        <el-form-item label="国际化类型" prop="InternationalizationType">
+        <el-form-item
+          label="国际化类型"
+          prop="InternationalizationType"
+          v-if="status !== 'batch'"
+        >
          <el-radio-group v-model="form.InternationalizationType">
            <el-radio
              v-for="item of $d.InternationalizationType"
-              :key="'InternationalizationType'+item.value"
+              :key="'InternationalizationType' + item.value"
              :label="item.value"
-            >{{ item.label }}</el-radio>
+              >{{ item.label }}</el-radio
+            >
          </el-radio-group>
        </el-form-item>
-        <el-form-item label="功能模块/服务名" prop="Description">
+        <el-form-item
+          label="功能模块/服务名"
+          prop="Module"
+          v-if="status !== 'batch'"
+        >
          <el-input
-            v-model="form.Description"
+            v-model="form.Module"
            type="textarea"
            maxlength="200"
-            :autosize="{ minRows: 2, maxRows: 4}"
+            :autosize="{ minRows: 2, maxRows: 4 }"
          />
        </el-form-item>
-        <el-form-item label="标识" prop="Code">
+        <el-form-item label="标识" prop="Code" v-if="status !== 'batch'">
          <el-input
            v-model="form.Code"
            type="textarea"
            maxlength="200"
-            :autosize="{ minRows: 2, maxRows: 4}"
+            :autosize="{ minRows: 2, maxRows: 4 }"
          />
        </el-form-item>
-        <el-form-item label="中文值" prop="ValueCN">
+        <el-form-item label="中文值" prop="ValueCN" v-if="status !== 'batch'">
          <el-input
            v-model="form.ValueCN"
            type="textarea"
            maxlength="1000"
-            :autosize="{ minRows: 2, maxRows: 4}"
+            :autosize="{ minRows: 2, maxRows: 4 }"
          />
        </el-form-item>
-        <el-form-item label="英文值" prop="Value">
+        <el-form-item label="英文值" prop="Value" v-if="status !== 'batch'">
          <el-input
            v-model="form.Value"
            type="textarea"
            maxlength="1000"
-            :autosize="{ minRows: 2, maxRows: 4}"
+            :autosize="{ minRows: 2, maxRows: 4 }"
          />
        </el-form-item>
-
        <el-form-item label="状态" prop="State">
          <el-radio-group v-model="form.State">
            <el-radio
              v-for="item of $d.InternationalizationKeyState"
-              :key="'InternationalizationKeyState'+item.value"
+              :key="'InternationalizationKeyState' + item.value"
              :label="item.value"
-            >{{ item.label }}</el-radio>
+              >{{ item.label }}</el-radio
+            >
          </el-radio-group>
        </el-form-item>
+        <el-form-item label="说明" prop="Description" v-if="status !== 'batch'">
+          <el-input
+            v-model="form.Description"
+            type="textarea"
+            maxlength="200"
+            :autosize="{ minRows: 2, maxRows: 4 }"
+          />
+        </el-form-item>
+        <el-form-item label="迭代" prop="PublishLogId">
+          <el-select v-model="form.PublishLogId" clearable filterable>
+            <el-option
+              v-for="item in PublishVersionList"
+              :key="item.Id"
+              :label="item.Version"
+              :value="item.Id"
+            />
+          </el-select>
+        </el-form-item>
      </el-form>
    </template>
    <template slot="dialog-footer">
-      <el-button size="small" type="primary" @click="handleCancle">取消</el-button>
-      <el-button size="small" type="primary" @click="handleSave">保存</el-button>
+      <el-button size="small" type="primary" @click="handleCancle"
+        >取消</el-button
+      >
+      <el-button size="small" type="primary" @click="handleSave"
+        >保存</el-button
+      >
    </template>
  </base-model>
 </template>
 <script>
-import { addOrUpdateInternationalization } from '@/api/admin'
-import BaseModel from '@/components/BaseModel'
+import { addOrUpdateInternationalization } from "@/api/admin";
+import BaseModel from "@/components/BaseModel";
 const formDataDefault = () => {
  return {
    Id: null,
    State: 0,
    Description: null,
+    Module: null,
    Code: null,
    Value: null,
    ValueCN: null,
-    InternationalizationType: 1
-  }
-}
+    InternationalizationType: 1,
+    PublishLogId: null,
+  };
+};
 export default {
-  name: 'I18nForm',
+  name: "I18nForm",
  components: { BaseModel },
  data() {
    return {
+      status: "add", // add update batch
      loading: false,
      form: formDataDefault(),
      rules: {
-        State: [
-          { required: true, message: '请选择', trigger: 'blur' }
+        State: [{ required: true, message: "请选择", trigger: "blur" }],
+        Module: [
+          {
+            max: 200,
+            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
+            trigger: "blur",
+          },
        ],
        Description: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }
+          {
+            max: 200,
+            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
+            trigger: "blur",
+          },
        ],
        Code: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }
+          { required: true, message: "请注明", trigger: "blur" },
+          {
+            max: 200,
+            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
+          },
        ],
        Value: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 1000, message: `${this.$t('common:ruleMessage:maxLength')} 1000` }
+          { required: true, message: "请注明", trigger: "blur" },
+          {
+            max: 1000,
+            message: `${this.$t("common:ruleMessage:maxLength")} 1000`,
+          },
        ],
        ValueCN: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 1000, message: `${this.$t('common:ruleMessage:maxLength')} 1000` }
+          { required: true, message: "请注明", trigger: "blur" },
+          {
+            max: 1000,
+            message: `${this.$t("common:ruleMessage:maxLength")} 1000`,
+          },
        ],
        InternationalizationType: [
-          { required: true, message: '请选择', trigger: 'blur' }
-        ]
+          { required: true, message: "请选择", trigger: "blur" },
+        ],
+        PublishLogId: [{ required: true, message: "请选择", trigger: "blur" }],
      },
-      model_cfg: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true }
-    }
-  },
-  mounted() {
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: "600px",
+        title: "",
+        appendToBody: true,
+      },
+      PublishVersionList: [],
+    };
  },
+  mounted() {},
  methods: {
-
-    openDialog(title, data) {
-      this.model_cfg.visible = true
-      this.model_cfg.title = title
+    openDialog(title, data, options = [], status) {
+      this.PublishVersionList = options;
+      this.status = status;
+      this.model_cfg.visible = true;
+      this.model_cfg.title = title;
      if (Object.keys(data).length > 0) {
        for (const k in this.form) {
          if (data.hasOwnProperty(k)) {
-            this.form[k] = data[k]
+            this.form[k] = data[k];
          }
        }
      } else {
-        this.form = formDataDefault()
+        this.form = formDataDefault();
      }
    },
    handleSave() {
-      this.$refs.i18nForm.validate(valid => {
-        if (!valid) return
-        this.loading = true
-        addOrUpdateInternationalization(this.form).then(res => {
-          this.loading = false
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.model_cfg.visible = false
-          this.$emit('getList')
-        }).catch(() => {
-          this.loading = false
-        })
-      })
+      this.$refs.i18nForm.validate((valid) => {
+        if (!valid) return;
+        this.loading = true;
+        if (this.status === "batch") {
+          return this.$emit("batch", this.form);
+        }
+        addOrUpdateInternationalization(this.form)
+          .then((res) => {
+            this.loading = false;
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.model_cfg.visible = false;
+            this.$emit("getList");
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
    },
    handleCancle() {
-      this.model_cfg.visible = false
-    }
-  }
-}
+      this.model_cfg.visible = false;
+    },
+  },
+};
 </script>
+<style lang="scss" scoped>
+::v-deep .el-select {
+  width: 100%;
+}
+</style>
@@ -7,11 +7,11 @@
            v-model="searchData.InternationalizationType"
            clearable
            filterable
-            style="width:130px;"
+            style="width: 130px"
          >
            <el-option
              v-for="item of $d.InternationalizationType"
-              :key="'InternationalizationType'+item.value"
+              :key="'InternationalizationType' + item.value"
              :label="item.label"
              :value="item.value"
            />
@@ -19,10 +19,10 @@
        </el-form-item>
        <el-form-item label="功能模块/服务名">
          <el-input
-            v-model="searchData.Description"
+            v-model="searchData.Module"
            size="small"
            clearable
-            style="width:130px;"
+            style="width: 130px"
          />
        </el-form-item>
        <el-form-item label="标识">
@@ -30,7 +30,7 @@
            v-model="searchData.Code"
            size="small"
            clearable
-            style="width:130px;"
+            style="width: 130px"
          />
        </el-form-item>
        <el-form-item label="中文值">
@@ -38,27 +38,55 @@
            v-model="searchData.ValueCN"
            size="small"
            clearable
-            style="width:130px;"
+            style="width: 130px"
          />
        </el-form-item>
        <el-form-item label="英文值">
          <el-input
            v-model="searchData.Value"
            size="small"
-            style="width:130px;"
+            style="width: 130px"
            clearable
          />
        </el-form-item>
        <el-form-item label="状态">
-          <el-select v-model="searchData.State" clearable filterable style="width:130px;">
+          <el-select
+            v-model="searchData.State"
+            clearable
+            filterable
+            style="width: 130px"
+          >
            <el-option
              v-for="item of $d.InternationalizationKeyState"
-              :key="'InternationalizationKeyState'+item.value"
+              :key="'InternationalizationKeyState' + item.value"
              :label="item.label"
              :value="item.value"
            />
          </el-select>
        </el-form-item>
+        <el-form-item label="说明">
+          <el-input
+            v-model="searchData.Description"
+            size="small"
+            clearable
+            style="width: 130px"
+          />
+        </el-form-item>
+        <el-form-item label="迭代">
+          <el-select
+            v-model="searchData.PublishLogId"
+            clearable
+            filterable
+            style="width: 130px"
+          >
+            <el-option
+              v-for="item in PublishVersionList"
+              :key="item.Id"
+              :label="item.Version"
+              :value="item.Id"
+            />
+          </el-select>
+        </el-form-item>
        <el-form-item>
          <el-button
            type="primary"
@@ -84,20 +112,27 @@
          >
            批量新增
          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-edit-outline"
+            size="mini"
+            :disabled="selectTableList.length <= 0"
+            @click="handleBatchUpdate"
+          >
+            批量更新
+          </el-button>
        </el-form-item>
      </el-form>
      <el-table
        v-loading="loading"
-        v-adaptive="{bottomOffset:45}"
+        v-adaptive="{ bottomOffset: 45 }"
        height="100"
        :data="list"
        class="table"
        @sort-change="handleSortByColumn"
-      >
-        <el-table-column
-          type="index"
-          width="50"
-        />
+        @selection-change="handleSelectionChange"
+        ><el-table-column type="selection" width="50" />
+        <el-table-column type="index" width="50" />
        <el-table-column
          label="国际化类型"
          prop="InternationalizationType"
@@ -106,21 +141,42 @@
          sortable="custom"
        >
          <template slot-scope="scope">
-            <el-tag v-if="scope.row.InternationalizationType === 0" type="primary">
-              {{ $fd('InternationalizationType', scope.row.InternationalizationType) }}
+            <el-tag
+              v-if="scope.row.InternationalizationType === 0"
+              type="primary"
+            >
+              {{
+                $fd(
+                  "InternationalizationType",
+                  scope.row.InternationalizationType
+                )
+              }}
            </el-tag>
-            <el-tag v-else-if="scope.row.InternationalizationType === 1" type="warning">
-              {{ $fd('InternationalizationType', scope.row.InternationalizationType) }}
+            <el-tag
+              v-else-if="scope.row.InternationalizationType === 1"
+              type="warning"
+            >
+              {{
+                $fd(
+                  "InternationalizationType",
+                  scope.row.InternationalizationType
+                )
+              }}
            </el-tag>
            <el-tag v-else>
-              {{ $fd('InternationalizationType', scope.row.InternationalizationType) }}
+              {{
+                $fd(
+                  "InternationalizationType",
+                  scope.row.InternationalizationType
+                )
+              }}
            </el-tag>
          </template>
        </el-table-column>
        <el-table-column
          label="功能模块/服务名"
-          prop="Description"
-          min-width="100"
+          prop="Module"
+          min-width="120"
          show-overflow-tooltip
          sortable="custom"
        />
@@ -154,16 +210,30 @@
        >
          <template slot-scope="scope">
            <el-tag v-if="scope.row.State === 0" type="danger">
-              {{ $fd('InternationalizationKeyState', scope.row.State) }}
+              {{ $fd("InternationalizationKeyState", scope.row.State) }}
            </el-tag>
            <el-tag v-else-if="scope.row.State === 1" type="primary">
-              {{ $fd('InternationalizationKeyState', scope.row.State) }}
+              {{ $fd("InternationalizationKeyState", scope.row.State) }}
            </el-tag>
            <el-tag v-else>
-              {{ $fd('InternationalizationKeyState', scope.row.State) }}
+              {{ $fd("InternationalizationKeyState", scope.row.State) }}
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column
+          label="说明"
+          prop="Description"
+          min-width="100"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <el-table-column
+          label="迭代"
+          prop="Version"
+          min-width="100"
+          show-overflow-tooltip
+          sortable="custom"
+        />
        <el-table-column
          label="更新时间"
          prop="UpdateTime"
@@ -197,11 +267,10 @@
            >
              删除
            </el-button>
-
          </template>
        </el-table-column>
      </el-table>
-      <div class="pagination" style="text-align: right;margin-top:5px;">
+      <div class="pagination" style="text-align: right; margin-top: 5px">
        <pagination
          :total="total"
          :page.sync="searchData.PageIndex"
@@ -209,20 +278,22 @@
          @pagination="getList"
        />
      </div>
-      <i18n-form
-        ref="i18nForm"
-        @getList="getList"
-      />
+      <i18n-form ref="i18nForm" @getList="getList" @batch="batch" />
      <BatchAddForm ref="batcnAddForm" @getList="getList" />
    </div>
  </div>
 </template>
 <script>
-import { getInternationalizationList, deleteInternationalization } from '@/api/admin'
-import Pagination from '@/components/Pagination'
-import I18nForm from './components/I18nForm.vue'
-import BatchAddForm from './components/BatchAddForm.vue'
-import moment from 'moment'
+import {
+  getInternationalizationList,
+  deleteInternationalization,
+  getPublishVersionSelect,
+  batchUpdateInternationalInfo,
+} from "@/api/admin";
+import Pagination from "@/components/Pagination";
+import I18nForm from "./components/I18nForm.vue";
+import BatchAddForm from "./components/BatchAddForm.vue";
+import moment from "moment";
 const searchDataDefault = () => {
  return {
    Description: null,
@@ -230,14 +301,16 @@ const searchDataDefault = () => {
    ValueCN: null,
    InternationalizationType: null,
    State: null,
+    Module: null,
+    PublishLogId: null,
    Asc: true,
-    SortField: '',
+    SortField: "",
    PageIndex: 1,
-    PageSize: 20
-  }
-}
+    PageSize: 20,
+  };
+};
 export default {
-  name: 'I18n',
+  name: "I18n",
  components: { Pagination, I18nForm, BatchAddForm },
  data() {
    return {
@@ -245,100 +318,169 @@ export default {
      searchData: searchDataDefault(),
      list: [],
      total: 0,
-      loading: false
-    }
+      loading: false,
+      PublishVersionList: [],
+      selectTableList: [],
+    };
  },
  mounted() {
-    this.getList()
+    this.getList();
+    this.getPublishVersionSelect();
  },
  methods: {
+    // 获取迭代
+    async getPublishVersionSelect() {
+      try {
+        let res = await getPublishVersionSelect();
+        if (res.IsSuccess) {
+          this.PublishVersionList = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
    getList() {
-      this.loading = true
-      getInternationalizationList(this.searchData).then((res) => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => {
-        this.loading = false
-      })
+      this.loading = true;
+      getInternationalizationList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    // 批量更新
+    handleBatchUpdate() {
+      this.$nextTick(() => {
+        this.$refs["i18nForm"].openDialog(
+          "批量更新",
+          {},
+          this.PublishVersionList,
+          "batch"
+        );
+      });
+    },
+    async batch(row) {
+      let { PublishLogId, State } = row;
+      let data = {
+        PublishLogId,
+        State,
+        IdList: this.selectTableList.map((item) => item.Id),
+      };
+      try {
+        let res = await batchUpdateInternationalInfo(data);
+        if (res.IsSuccess) {
+          this.$message.success(this.$t("common:message:updatedSuccessfully"));
+          this.getList();
+          this.$nextTick(() => {
+            this.$refs["i18nForm"].handleCancle();
+          });
+        }
+      } catch (err) {
+        console.log(err);
+      }
    },
    handleAdd() {
      this.$nextTick(() => {
-        this.$refs['i18nForm'].openDialog('新增', {})
-      })
+        this.$refs["i18nForm"].openDialog(
+          "新增",
+          {},
+          this.PublishVersionList,
+          "add"
+        );
+      });
    },
    handleBatchAdd() {
      this.$nextTick(() => {
-        this.$refs['batcnAddForm'].openDialog('批量新增', {})
-      })
+        this.$refs["batcnAddForm"].openDialog(
+          "批量新增",
+          {},
+          this.PublishVersionList
+        );
+      });
    },
    handleEdit(row) {
      this.$nextTick(() => {
-        this.$refs['i18nForm'].openDialog('编辑', row)
-      })
+        this.$refs["i18nForm"].openDialog(
+          "编辑",
+          row,
+          this.PublishVersionList,
+          "update"
+        );
+      });
    },
    // 重置列表查询
    handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
    },
    // 删除
    handleDelete(row) {
-      this.$confirm('是否确认删除？', {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          this.loading = true
-          deleteInternationalization(row.Id)
-            .then(res => {
-              this.loading = false
-              if (res.IsSuccess) {
-                this.getList()
-                this.$message.success(this.$t('common:message:deletedSuccessfully'))
-              }
-            }).catch(() => { this.loading = false })
-        })
+      this.$confirm("是否确认删除？", {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.loading = true;
+        deleteInternationalization(row.Id)
+          .then((res) => {
+            this.loading = false;
+            if (res.IsSuccess) {
+              this.getList();
+              this.$message.success(
+                this.$t("common:message:deletedSuccessfully")
+              );
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
    },
    // 排序
    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();
+    },
+    // 选择
+    handleSelectionChange(val) {
+      this.selectTableList = val;
+    },
+  },
+};
+</script>
+<style lang="scss">
+.log {
+  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;
    }
  }
 }
-</script>
-<style lang="scss">
-  .log {
-    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;
-      }
-    }
-  }
 </style>
@@ -10,46 +10,72 @@
        size="small"
      >
        <el-form-item label="发布版本" prop="Version">
-          <el-input
-            v-model="form.Version"
-          />
+          <el-input v-model="form.Version" />
        </el-form-item>
        <el-form-item label="更新功能" prop="UpdateContent">
          <el-input
            v-model="form.UpdateContent"
            type="textarea"
            maxlength="1000"
-            :autosize="{ minRows: 4, maxRows: 5}"
+            :autosize="{ minRows: 4, maxRows: 5 }"
          />
        </el-form-item>
-        <el-form-item label="发布日期" prop="PublishTime">
+        <el-form-item label="发布状态" prop="State">
+          <el-select v-model="form.State" placeholder="请选择">
+            <el-option
+              v-for="item in $d.PublishStatus"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发布日期">
          <el-date-picker
            v-model="form.PublishTime"
            type="date"
            value-format="yyyy-MM-dd HH:mm:ss"
          />
        </el-form-item>
+        <el-form-item label="是否当前版本" prop="IsCurrentVersion">
+          <el-select v-model="form.IsCurrentVersion" placeholder="请选择">
+            <el-option
+              v-for="item in $d.YesOrNo"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
      </el-form>
    </template>
    <template slot="dialog-footer">
-      <el-button size="small" type="primary" @click="handleCancle">取消</el-button>
-      <el-button size="small" type="primary" @click="handleSave">保存</el-button>
+      <el-button size="small" type="primary" @click="handleCancle"
+        >取消</el-button
+      >
+      <el-button size="small" type="primary" @click="handleSave"
+        >保存</el-button
+      >
    </template>
  </base-model>
 </template>
 <script>
-import { addOrUpdatePublishLog } from '@/api/admin'
-import BaseModel from '@/components/BaseModel'
+import { addOrUpdatePublishLog } from "@/api/admin";
+import BaseModel from "@/components/BaseModel";
 const formDataDefault = () => {
  return {
    Id: null,
    Version: null,
    PublishTime: null,
-    UpdateContent: null
-  }
-}
+    UpdateContent: null,
+    State: null,
+    IsCurrentVersion: null,
+  };
+};
 export default {
-  name: 'LogForm',
+  name: "LogForm",
  components: { BaseModel },
  data() {
    return {
@@ -57,54 +83,73 @@ export default {
      form: formDataDefault(),
      rules: {
        Version: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` }
+          { required: true, message: "请注明", trigger: "blur" },
+          { max: 50, message: `${this.$t("common:ruleMessage:maxLength")} 50` },
        ],
-        PublishTime: [
-          { required: true, message: '请注明', trigger: 'blur' }
+        // PublishTime: [
+        //   { required: true, message: '请注明', trigger: 'blur' }
+        // ],
+        IsCurrentVersion: [
+          { required: true, message: "请选择", trigger: "blur" },
        ],
+        State: [{ required: true, message: "请选择", trigger: "blur" }],
        UpdateContent: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 1000, message: `${this.$t('common:ruleMessage:maxLength')} 500` }
-        ]
+          { required: true, message: "请注明", trigger: "blur" },
+          {
+            max: 1000,
+            message: `${this.$t("common:ruleMessage:maxLength")} 500`,
+          },
+        ],
      },
-      model_cfg: { visible: false, showClose: true, width: '500px', title: '', appendToBody: true }
-    }
-  },
-  mounted() {
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: "500px",
+        title: "",
+        appendToBody: true,
+      },
+    };
  },
+  mounted() {},
  methods: {
-
    openDialog(title, data) {
-      this.model_cfg.visible = true
-      this.model_cfg.title = title
+      this.model_cfg.visible = true;
+      this.model_cfg.title = title;
      if (Object.keys(data).length > 0) {
        for (const k in this.form) {
          if (data.hasOwnProperty(k)) {
-            this.form[k] = data[k]
+            this.form[k] = data[k];
          }
        }
      } else {
-        this.form = formDataDefault()
+        this.form = formDataDefault();
      }
    },
    handleSave() {
-      this.$refs.LogForm.validate(valid => {
-        if (!valid) return
-        this.loading = true
-        addOrUpdatePublishLog(this.form).then(res => {
-          this.loading = false
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.model_cfg.visible = false
-          this.$emit('getList')
-        }).catch(() => {
-          this.loading = false
-        })
-      })
+      this.$refs.LogForm.validate((valid) => {
+        if (!valid) return;
+        this.loading = true;
+        addOrUpdatePublishLog(this.form)
+          .then((res) => {
+            this.loading = false;
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.model_cfg.visible = false;
+            this.$emit("getList");
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
    },
    handleCancle() {
-      this.model_cfg.visible = false
-    }
-  }
-}
+      this.model_cfg.visible = false;
+    },
+  },
+};
 </script>
+<style lang="scss" scoped>
+::v-deep .el-select,
+.el-date-editor {
+  width: 100%;
+}
+</style>
@@ -2,25 +2,11 @@
  <div class="log">
    <div ref="leftContainer" class="left">
      <el-form :inline="true">
-        <el-form-item
-          label="发布版本"
-          prop="Version"
-        >
-          <el-input
-            v-model="searchData.Version"
-            size="small"
-            clearable
-          />
+        <el-form-item label="发布版本" prop="Version">
+          <el-input v-model="searchData.Version" size="small" clearable />
        </el-form-item>
-        <el-form-item
-          label="更新功能"
-          prop="UpdateContent"
-        >
-          <el-input
-            v-model="searchData.UpdateContent"
-            size="small"
-            clearable
-          />
+        <el-form-item label="更新功能" prop="UpdateContent">
+          <el-input v-model="searchData.UpdateContent" size="small" clearable />
        </el-form-item>
        <el-form-item>
          <el-button
@@ -43,17 +29,14 @@
      </el-form>
      <el-table
        v-loading="loading"
-        v-adaptive="{bottomOffset:45}"
+        v-adaptive="{ bottomOffset: 45 }"
        height="100"
        :data="list"
        class="table"
        @sort-change="handleSortByColumn"
-        :default-sort="{prop:'PublishTime',order:'descending'}"
+        :default-sort="{ prop: 'PublishTime', order: 'descending' }"
      >
-        <el-table-column
-          type="index"
-          width="50"
-        />
+        <el-table-column type="index" width="50" />
        <el-table-column
          label="发布版本"
          prop="Version"
@@ -67,6 +50,16 @@
          min-width="150"
          show-overflow-tooltip
        />
+        <el-table-column
+          label="发布状态"
+          prop="State"
+          min-width="150"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ $fd("PublishStatus", scope.row.State) }}</span>
+          </template>
+        </el-table-column>
        <el-table-column
          label="发布日期"
          prop="PublishTime"
@@ -75,10 +68,23 @@
          sortable="custom"
        >
          <template slot-scope="scope">
-            {{ scope.row.PublishTime?moment(scope.row.PublishTime).format('YYYY-MM-DD'):'' }}
+            {{
+              scope.row.PublishTime
+                ? moment(scope.row.PublishTime).format("YYYY-MM-DD")
+                : ""
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="是否当前版本"
+          prop="IsCurrentVersion"
+          min-width="150"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ $fd("YesOrNo", scope.row.IsCurrentVersion) }}</span>
          </template>
        </el-table-column>
-
        <el-table-column
          label="操作"
          fixed="right"
@@ -103,11 +109,10 @@
            >
              删除
            </el-button>
-
          </template>
        </el-table-column>
      </el-table>
-      <div class="pagination" style="text-align: right;margin-top:5px;">
+      <div class="pagination" style="text-align: right; margin-top: 5px">
        <pagination
          :total="total"
          :page.sync="searchData.PageIndex"
@@ -115,28 +120,25 @@
          @pagination="getList"
        />
      </div>
-      <log-form
-        ref="LogForm"
-        @getList="getList"
-      />
+      <log-form ref="LogForm" @getList="getList" />
    </div>
  </div>
 </template>
 <script>
-import { getPublishLogList, deletePublishLog } from '@/api/admin'
-import Pagination from '@/components/Pagination'
-import LogForm from './components/LogForm.vue'
-import moment from 'moment'
+import { getPublishLogList, deletePublishLog } from "@/api/admin";
+import Pagination from "@/components/Pagination";
+import LogForm from "./components/LogForm.vue";
+import moment from "moment";
 const searchDataDefault = () => {
  return {
    Version: null,
    UpdateContent: null,
    Asc: false,
-    SortField: 'PublishTime',
+    SortField: "PublishTime",
    PageIndex: 1,
-    PageSize: 20
-  }
-}
+    PageSize: 20,
+  };
+};
 export default {
  components: { Pagination, LogForm },
  data() {
@@ -145,95 +147,101 @@ export default {
      searchData: searchDataDefault(),
      list: [],
      total: 0,
-      loading: false
-    }
+      loading: false,
+    };
  },
  mounted() {
-    this.getList()
+    this.getList();
  },
  methods: {
    getList() {
-      this.loading = true
-      getPublishLogList(this.searchData).then((res) => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => {
-        this.loading = false
-      })
+      this.loading = true;
+      getPublishLogList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
    },
    handleAdd() {
      this.$nextTick(() => {
-        this.$refs['LogForm'].openDialog('新增', {})
-      })
+        this.$refs["LogForm"].openDialog("新增", {});
+      });
    },
    handleEdit(row) {
      this.$nextTick(() => {
-        this.$refs['LogForm'].openDialog('编辑', row)
-      })
+        this.$refs["LogForm"].openDialog("编辑", row);
+      });
    },
    // 重置列表查询
    handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
    },
    // 删除
    handleDelete(row) {
-      this.$confirm('是否确认删除？', {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          this.loading = true
-          deletePublishLog(row.Id)
-            .then(res => {
-              this.loading = false
-              if (res.IsSuccess) {
-                this.getList()
-                this.$message.success(this.$t('common:message:deletedSuccessfully'))
-              }
-            }).catch(() => { this.loading = false })
-        })
+      this.$confirm("是否确认删除？", {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.loading = true;
+        deletePublishLog(row.Id)
+          .then((res) => {
+            this.loading = false;
+            if (res.IsSuccess) {
+              this.getList();
+              this.$message.success(
+                this.$t("common:message:deletedSuccessfully")
+              );
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
    },
    // 排序
    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();
+    },
+  },
+};
+</script>
+<style lang="scss">
+.log {
+  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;
    }
  }
 }
-</script>
-<style lang="scss">
-  .log {
-    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;
-      }
-    }
-  }
 </style>
@@ -85,13 +85,13 @@
          sortable="custom"
          show-overflow-tooltip
        />
-        <!-- <el-table-column
+        <el-table-column
          :label="$t('trials:loginLog:table:IPRegion')"
          prop="IPRegion"
          min-width="120"
          show-overflow-tooltip
          sortable="custom"
-        /> -->
+        />
        <el-table-column
          :label="$t('system:loginLog:table:LoginFaildName')"
          prop="LoginFaildName"
@@ -1,6 +1,6 @@
 <template>
  <div class="notice-marquee_wrapper">
-    <marquee ref="mar" hspace="0" direction="left" width="100%" @mouseout="start()" @mouseover="stop()">
+    <marquee ref="mar" hspace="0" direction="left" width="500" @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,7 +70,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 .notice-marquee_wrapper{
-  width: 100%;
  /deep/ .el-dialog__header{
    padding: 10px;
  }
@@ -41,11 +41,7 @@
          <!-- 工作台 -->
          <span slot="title">{{ $t("trials:menuTitle:workbench") }}</span>
        </el-menu-item>
-        <el-menu-item
-          v-if="!hasPermi(['role:zys'])"
-          index="2"
-          :disabled="TotalNeedSignSystemDocCount !== 0"
-        >
+        <el-menu-item v-if="!hasPermi(['role:zys','role:zyss','role:zybs'])" index="2" :disabled="TotalNeedSignSystemDocCount !== 0">
          <i class="el-icon-box" />
          <!-- 我的项目 -->
          <span slot="title">
@@ -93,7 +89,7 @@
          }}</el-menu-item>
        </el-submenu>
      </el-menu>
-      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
+      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
    </div>
  </div>
 </template>
@@ -162,7 +158,7 @@ export default {
          this.logout();
          break;
        case "4-4":
-          this.go("/dashboard/list");
+          this.go("/system");
          break;
        case "1":
          this.go("/trials/trials-workbench");
@@ -281,9 +277,6 @@ export default {
      cursor: pointer;
    }
  }
-  .center-menu {
-    width: calc(100% - 1200px);
-  }
 }
 </style>
 <style>
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -323,6 +323,7 @@ export default {
    },
    // 关闭签名弹窗
    closeSignDialog(isSave) {
+      this.duration = 0
      this.signVisible = false
      if (isSave) {
        this.currentIsConfirm = true
@@ -5,9 +5,14 @@
      <el-form :inline="true">
        <!-- 中心 -->
        <el-form-item :label="$t('trials:researchRecord:table:siteId')">
-          <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
+          <el-select
+            v-model="searchData.TrialSiteId"
+            clearable
+            filterable
+            style="width: 120px"
+          >
            <el-option
-              v-for="(item,index) of siteOptions"
+              v-for="(item, index) of siteOptions"
              :key="index"
              :label="item.TrialSiteCode"
              :value="item.TrialSiteId"
@@ -20,17 +25,21 @@
            v-model="searchData.UserKeyInfo"
            class="mr"
            clearable
-            :placeholder="`${$t('trials:researchRecord:placeholder:contactorInfo')}`"
-            style="width:140px;"
+            :placeholder="`${$t(
+              'trials:researchRecord:placeholder:contactorInfo'
+            )}`"
+            style="width: 140px"
          />
        </el-form-item>
        <!-- 初审人 -->
-        <el-form-item :label="$t('trials:researchRecord:table:preliminaryUser')">
+        <el-form-item
+          :label="$t('trials:researchRecord:table:preliminaryUser')"
+        >
          <el-input
            v-model="searchData.PreliminaryUserName"
            class="mr"
            clearable
-            style="width:140px;"
+            style="width: 140px"
          />
        </el-form-item>
        <!-- 审核人 -->
@@ -39,14 +48,19 @@
            v-model="searchData.ReviewerUserName"
            class="mr"
            clearable
-            style="width:140px;"
+            style="width: 140px"
          />
        </el-form-item>
        <!-- 状态 -->
        <el-form-item :label="$t('trials:researchRecord:table:status')">
-          <el-select v-model="searchData.State" clearable filterable style="width:120px;">
+          <el-select
+            v-model="searchData.State"
+            clearable
+            filterable
+            style="width: 120px"
+          >
            <el-option
-              v-for="(item,index) of $d.ResearchRecord"
+              v-for="(item, index) of $d.ResearchRecord"
              :key="index"
              :label="item.label"
              :value="item.value"
@@ -55,8 +69,19 @@
        </el-form-item>
        <!-- 是否废除 -->
        <el-form-item :label="$t('trials:researchRecord:table:isDeleted')">
-          <el-select v-model="searchData.IsDeleted" clearable filterable style="width:120px;">
-            <el-option v-for="item of $d.YesOrNo" v-show="item.raw.ValueCN !== '无'" :key="`IsDeleted${item.value}`" :label="item.label" :value="item.value" />
+          <el-select
+            v-model="searchData.IsDeleted"
+            clearable
+            filterable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of $d.YesOrNo"
+              v-show="item.raw.ValueCN !== '无'"
+              :key="`IsDeleted${item.value}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
        <!-- 更新时间 -->
@@ -66,34 +91,42 @@
            type="daterange"
            value-format="yyyy-MM-dd"
            format="yyyy-MM-dd"
-            style="width:250px;"
+            style="width: 250px"
          />
        </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-button
-          v-hasPermi="['trials:trials-panel:attachments:site-research:summary-record']"
+          v-hasPermi="[
+            'trials:trials-panel:attachments:site-research:summary-record',
+          ]"
          type="primary"
          icon="el-icon-info"
          @click="showResearchUser"
        >
-          {{ $t('trials:researchRecord:button:questionStaffs') }}
+          {{ $t("trials:researchRecord:button:questionStaffs") }}
        </el-button>
        <!-- 调查表链接 -->
        <el-button
-          v-hasPermi="['trials:trials-panel:attachments:site-research:questionnaire-link']"
+          v-hasPermi="[
+            'trials:trials-panel:attachments:site-research:questionnaire-link',
+          ]"
          type="primary"
          icon="el-icon-link"
          @click="showResearchLink"
        >
-          {{ $t('trials:researchRecord:button:questionLink') }}
+          {{ $t("trials:researchRecord:button:questionLink") }}
        </el-button>
      </el-form>
    </template>
@@ -103,7 +136,7 @@
      <el-table
        ref="siteResearchList"
        v-loading="loading"
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
        :data="list"
        stripe
        height="100"
@@ -153,7 +186,11 @@
          show-overflow-tooltip
        >
          <template slot-scope="scope">
-            {{ scope.row.PreliminaryUser?scope.row.PreliminaryUser.RealName:"" }}
+            {{
+              scope.row.PreliminaryUser
+                ? scope.row.PreliminaryUser.RealName
+                : ""
+            }}
          </template>
        </el-table-column>
        <!-- 审核人 -->
@@ -164,7 +201,7 @@
          show-overflow-tooltip
        >
          <template slot-scope="scope">
-            {{ scope.row.ReviewerUser?scope.row.ReviewerUser.RealName:"" }}
+            {{ scope.row.ReviewerUser ? scope.row.ReviewerUser.RealName : "" }}
          </template>
        </el-table-column>
        <!-- 状态 -->
@@ -175,10 +212,18 @@
          show-overflow-tooltip
        >
          <template slot-scope="scope">
-            <el-tag v-if="scope.row.State === 0" type="primary">{{ $fd('ResearchRecord', scope.row.State) }}</el-tag>
-            <el-tag v-if="scope.row.State === 1" type="info">{{ $fd('ResearchRecord', scope.row.State) }}</el-tag>
-            <el-tag v-if="scope.row.State === 2" type="warning">{{ $fd('ResearchRecord', scope.row.State) }}</el-tag>
-            <el-tag v-if="scope.row.State === 3" type="danger">{{ $fd('ResearchRecord', scope.row.State) }}</el-tag>
+            <el-tag v-if="scope.row.State === 0" type="primary">{{
+              $fd("ResearchRecord", scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 1" type="info">{{
+              $fd("ResearchRecord", scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 2" type="warning">{{
+              $fd("ResearchRecord", scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 3" type="danger">{{
+              $fd("ResearchRecord", scope.row.State)
+            }}</el-tag>
          </template>
        </el-table-column>
        <!-- 是否废除 -->
@@ -189,8 +234,12 @@
          show-overflow-tooltip
        >
          <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>
        <!-- 更新时间 -->
@@ -200,9 +249,7 @@
          min-width="150"
          show-overflow-tooltip
        />
-        <el-table-column
-          width="150"
-        >
+        <el-table-column width="150">
          <template slot-scope="scope">
            <!-- 查看 -->
            <el-button
@@ -214,7 +261,9 @@
            />
            <!-- 审批 -->
            <el-button
-              v-hasPermi="['trials:trials-panel:attachments:site-research:auidt']"
+              v-hasPermi="[
+                'trials:trials-panel:attachments:site-research:auidt',
+              ]"
              :disabled="scope.row.State === 0 || scope.row.State === 3"
              circle
              :title="$t('trials:researchRecord:action:view')"
@@ -223,7 +272,9 @@
            />
            <!-- 废除 -->
            <el-button
-              v-hasPermi="['trials:trials-panel:attachments:site-research:abolish']"
+              v-hasPermi="[
+                'trials:trials-panel:attachments:site-research:abolish',
+              ]"
              :disabled="scope.row.State !== 0 || scope.row.IsDeleted"
              circle
              :title="$t('trials:researchRecord:action:abolish')"
@@ -235,7 +286,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>

    <!-- 中心人员 -->
@@ -246,10 +303,12 @@
      custom-class="base-dialog-wrapper"
      :fullscreen="true"
    >
-      <div class="base-modal-body" style="border:1px solid #ccc;padding: 10px">
+      <div
+        class="base-modal-body"
+        style="border: 1px solid #ccc; padding: 10px"
+      >
        <Users v-if="researchUserVisible" />
      </div>
-
    </el-dialog>

    <!-- 调查表 -->
@@ -265,53 +324,87 @@
    <!-- 调查表链接 -->
    <base-model :config="share_model">
      <template slot="dialog-body">
-        <div>
-          <i style="color:#428bca;" class="el-icon-success" />
-          <!-- 成功创建调查表链接 -->
-          <span>{{ $t('trials:researchRecord:message:createLinkSuccessfully') }}</span>
-        </div>
-        <div style="margin:10px 0;">
-          <!-- 链接： -->
-          {{ $t('trials:researchRecord:label:link') }}
-          <el-input ref="shareLink" v-model="shareLink" readonly type="textarea" autosize />
-        </div>
-        <div>
-          <!-- 复制链接 -->
-          <el-button type="primary" round @click="copyLink">
-            {{ $t('trials:researchRecord:button:copyLink') }}
-          </el-button>
+        <div style="width: 100%; display: flex">
+          <div class="shareLink">
+            <div>
+              <i style="color: #428bca" class="el-icon-success" />
+              <!-- 成功创建调查表链接 -->
+              <span>{{
+                $t("trials:researchRecord:message:createLinkSuccessfully")
+              }}</span>
+            </div>
+            <div style="margin: 10px 0">
+              <!-- 链接： -->
+              {{ $t("trials:researchRecord:label:link") }}
+              <el-input
+                ref="shareLink"
+                v-model="shareLink"
+                readonly
+                type="textarea"
+                autosize
+              />
+            </div>
+            <div>
+              <!-- 复制链接 -->
+              <el-button
+                type="primary"
+                round
+                @click="copyLink"
+                class="shareLinkBtn"
+              >
+                {{ $t("trials:researchRecord:button:copyLink") }}
+              </el-button>
+            </div>
+          </div>
+          <div class="shareCode">
+            <div class="qrCode">
+              <div id="qrcode" ref="qrcode"></div>
+            </div>
+            <div class="codeBtnBox">
+              <el-button @click="handleCopyImg" type="primary" round>{{
+                $t("trials:researchRecord:button:copyCode")
+              }}</el-button>
+              <el-button @click="savePic" round>{{
+                $t("trials:researchRecord:button:savePic")
+              }}</el-button>
+            </div>
+          </div>
        </div>
      </template>
    </base-model>
-
  </BaseContainer>
 </template>
 <script>
-import { getTrialSiteSurveyList, getTrialSiteSelect, abandonSiteSurvey } from '@/api/trials'
-import { changeURLStatic } from '@/utils/history.js'
-import BaseContainer from '@/components/BaseContainer'
-import Pagination from '@/components/Pagination'
-import Users from './components/users'
-import ResearchForm from '@/views/research/form'
-import BaseModel from '@/components/BaseModel'
+import {
+  getTrialSiteSurveyList,
+  getTrialSiteSelect,
+  abandonSiteSurvey,
+} from "@/api/trials";
+import { changeURLStatic } from "@/utils/history.js";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
+import Users from "./components/users";
+import ResearchForm from "@/views/research/form";
+import BaseModel from "@/components/BaseModel";
+import QRCode from "qrcodejs2";

 const searchDataDefault = () => {
  return {
-    SortField: '',
+    SortField: "",
    Asc: true,
    PageIndex: 1,
    PageSize: 20,
-    TrialSiteId: '',
-    UserKeyInfo: '',
+    TrialSiteId: "",
+    UserKeyInfo: "",
    State: null,
-    IsDeleted: '',
+    IsDeleted: "",
    DateRange: [],
    PreliminaryUserName: null,
-    ReviewerUserName: null
-  }
-}
+    ReviewerUserName: null,
+  };
+};
 export default {
-  name: 'SiteResearchList',
+  name: "SiteResearchList",
  components: { BaseContainer, Pagination, Users, ResearchForm, BaseModel },
  data() {
    return {
@@ -323,117 +416,223 @@ export default {
      siteOptions: [],
      researchUserVisible: false,
      researchInfoVisible: false,
-      share_model: { visible: false, title: '', width: '500px' },
-      shareLink: '',
-      researchState: this.$d.ResearchRecord
-    }
+      share_model: {
+        visible: false,
+        title: this.$t("trials:researchRecord:title:shark"),
+        width: "800px",
+      },
+      shareLink: "",
+      researchState: this.$d.ResearchRecord,
+      qrcode: null,
+    };
  },
  mounted() {
-    this.getList()
-    this.getSite()
+    this.getList();
+    this.getSite();
  },
  methods: {
    // 获取系统文件数据
    getList() {
-      this.loading = true
-      this.searchData.TrialId = this.trialId
+      this.loading = true;
+      this.searchData.TrialId = this.trialId;
      if (this.searchData.DateRange && this.searchData.DateRange.length === 2) {
-        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0]
-        this.searchData.updateTimeEnd = this.searchData.DateRange[1]
+        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0];
+        this.searchData.updateTimeEnd = this.searchData.DateRange[1];
      } else {
-        this.searchData.UpdateTimeBegin = ''
-        this.searchData.updateTimeEnd = ''
+        this.searchData.UpdateTimeBegin = "";
+        this.searchData.updateTimeEnd = "";
      }
-      getTrialSiteSurveyList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => {
-        this.loading = false
-      })
+      getTrialSiteSurveyList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
    },
    // 查看调查表记录详情
    handleViewResearchList(row) {
-      changeURLStatic('trialSiteSurveyId', row.Id)
-      this.researchInfoVisible = true
+      changeURLStatic("trialSiteSurveyId", row.Id);
+      this.researchInfoVisible = true;
    },
    // 废除待提交的调查表
    handleRepealResearch(row) {
      // 是否确认废除？
-      this.$confirm(this.$t('trials:researchRecord:message:abolish'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          abandonSiteSurvey(this.trialId, row.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.getList()
-                // 废除成功
-                this.$message.success(this.$t('trials:researchRecord:message:abolishSuccessfully'))
-              }
-            })
-        })
+      this.$confirm(this.$t("trials:researchRecord:message:abolish"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        abandonSiteSurvey(this.trialId, row.Id).then((res) => {
+          if (res.IsSuccess) {
+            this.getList();
+            // 废除成功
+            this.$message.success(
+              this.$t("trials:researchRecord:message:abolishSuccessfully")
+            );
+          }
+        });
+      });
    },
    // 展示当前项目下所有调查表需生成账户的用户信息
    showResearchUser() {
-      this.researchUserVisible = true
+      this.researchUserVisible = true;
    },
    // 复制链接
    copyLink() {
      // 中心调研表链接
-      this.$copyText(`${this.$t('trials:researchRecord:message:researchFormLink')}: ${this.shareLink}`).then(
-        res => {
+      this.$copyText(
+        `${this.$t("trials:researchRecord:message:researchFormLink")}: ${
+          this.shareLink
+        }`
+      )
+        .then((res) => {
          // 复制成功
-          this.$message.success(this.$t('trials:researchRecord:message:copySuccessfully'))
-        }
-      ).catch(() => {
-        // 复制失败
-        this.$alert(this.$t('trials:researchRecord:message:copyFailed'))
-      })
+          this.$message.success(
+            this.$t("trials:researchRecord:message:copySuccessfully")
+          );
+        })
+        .catch(() => {
+          // 复制失败
+          this.$alert(this.$t("trials:researchRecord:message:copyFailed"));
+        });
+    },
+    // 创建二维码
+    creatQrCode() {
+      this.$refs.qrcode.innerHTML = ""; //清除二维码方法一
+      let text = this.shareLink;
+      this.qrcode = new QRCode(this.$refs.qrcode, {
+        text: text, //页面地址 ,如果页面需要参数传递请注意哈希模式#
+        width: 200,
+        height: 200,
+        colorDark: "#000000",
+        colorLight: "#ffffff",
+        correctLevel: QRCode.CorrectLevel.H,
+      });
+      // qrcode.clear(); // 清除二维码方法二
+    },
+    // 下载二维码
+    savePic() {
+      let qrCodeCanvas = document
+        .getElementById("qrcode")
+        .getElementsByTagName("canvas");
+      let a = document.createElement("a");
+      a.href = qrCodeCanvas[0].toDataURL("image/url");
+      a.download = `${this.$t("trials:researchRecord:title:code")}.png`;
+      a.click();
+    },
+    // 复制二维码
+    handleCopyImg() {
+      let qrCodeCanvas = document
+        .getElementById("qrcode")
+        .getElementsByTagName("canvas");
+      qrCodeCanvas[0].toBlob(async (blob) => {
+        console.log(blob);
+        const data = [
+          new ClipboardItem({
+            [blob.type]: blob,
+          }),
+        ]; // https://w3c.github.io/clipboard-apis/#dom-clipboard-write
+        await navigator.clipboard.write(data).then(
+          () => {
+            this.$message.success(
+              this.$t("trials:researchRecord:message:copySuccess")
+            );
+          },
+          () => {
+            this.$message.error(
+              this.$t("trials:researchRecord:message:UnableWrite")
+            );
+          }
+        );
+      });
    },
    // 获取site下拉框数据
    getSite() {
-      getTrialSiteSelect(this.trialId).then(res => {
-        this.siteOptions = res.Result
-      })
+      getTrialSiteSelect(this.trialId).then((res) => {
+        this.siteOptions = res.Result;
+      });
    },
    // 展示调查表链接
    showResearchLink() {
-      const trialId = this.trialId
-      this.shareLink = `${location.protocol}//${location.host}/researchLogin?trialId=${trialId}&lang=${this.$i18n.locale}`
-      this.share_model.visible = true
+      const trialId = this.trialId;
+      this.shareLink = `${location.protocol}//${location.host}/researchLogin?trialId=${trialId}&lang=${this.$i18n.locale}`;
+      this.share_model.visible = true;
+      this.$nextTick(() => {
+        this.creatQrCode();
+      });
    },
    // 重置
    handleReset() {
-      this.searchData = searchDataDefault()
-      this.searchData.DateRange = []
+      this.searchData = searchDataDefault();
+      this.searchData.DateRange = [];
      if (this.searchData.DateRange && this.searchData.DateRange.length === 2) {
-        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0]
-        this.searchData.updateTimeEnd = this.searchData.DateRange[1]
+        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0];
+        this.searchData.updateTimeEnd = this.searchData.DateRange[1];
      } else {
-        this.searchData.UpdateTimeBegin = ''
-        this.searchData.updateTimeEnd = ''
+        this.searchData.UpdateTimeBegin = "";
+        this.searchData.updateTimeEnd = "";
      }
-      this.getList()
+      this.getList();
      this.$nextTick(() => {
-        this.$refs.siteResearchList.clearSort()
-      })
+        this.$refs.siteResearchList.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();
+    },
+  },
+  beforeDestroy() {
+    if (this.qrcode) {
+      this.qrcode = null;
    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.shareLink {
+  padding-right: 20px;
+  width: 50%;
+  position: relative;
+  .shareLinkBtn{
+    position: absolute;
+    bottom: 0px;
+    left: 0px;
  }
 }
-</script>
+.shareCode {
+  width: 50%;
+  border-left: 1px solid #eee;
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+  .qrCode {
+    width: 220px;
+    height: 220px;
+    display: flex;
+    border: 1px solid #c0c4cc;
+    border-radius: 5px;
+    box-shadow: 1px 1px 5px #c0c4cc;
+    align-items: center;
+    justify-content: center;
+  }
+  .codeBtnBox {
+    margin-top: 20px;
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+  }
+}
+</style>
@@ -140,7 +140,8 @@
          >
            <template slot-scope="scope">
              <div v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).StatementCriterionFileList.length > 0">
-                <el-button type="text" @click="windowOpen(scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).StatementCriterionFileList[0].FilePath)">View</el-button>
+                <el-button type="text" @click="preview(scope.row,ite.TrialReadingCriterionId)">View</el-button>
+                <!-- <el-button type="text" @click="windowOpen(scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).StatementCriterionFileList[0].FilePath)">View</el-button> -->
              </div>
              <div v-else>
                <span>{{ $t('trials:enrolledReviews:label:notUpload') }}</span>
@@ -474,6 +475,17 @@ export default {
    this.initPage()
  },
  methods: {
+    // 预览
+    preview(row,TrialReadingCriterionId){
+      let file = row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === TrialReadingCriterionId}).StatementCriterionFileList[0];
+      let arr = file.FilePath.split(".");
+
+      this.$preview({
+        path:file.FilePath, 
+        type:arr[arr.length - 1], 
+        title:file.FileName
+      })
+    },
    isConsistencyChange(row, ite, value, showMessage) {
      this.batchSetCriterionJoinJoinAnalysis(row, ite, value, showMessage)
    },
@@ -203,40 +203,45 @@
          >
            <i slot="default" class="el-icon-plus" />
            <div slot="file" slot-scope="{file}">
-              <viewer :images="images" :ref="file.url">
-                <img
-                  class="el-upload-list__item-thumbnail"
-                  :src="OSSclientConfig.basePath + file.url"
-                  alt=""
-                  crossorigin="anonymous"
+              <img
+                class="el-upload-list__item-thumbnail"
+                :src="OSSclientConfig.basePath + file.url"
+                alt=""
+                crossorigin="anonymous"
+              >
+              <span class="el-upload-list__item-actions">
+                <span
+                  class="el-upload-list__item-preview"
+                  @click="handlePictureCardPreview(file)"
                >
-                <span class="el-upload-list__item-actions">
-                  <span
-                    class="el-upload-list__item-preview"
-                    @click="handlePictureCardPreview(file)"
-                  >
-                    <i class="el-icon-zoom-in" />
-                  </span>
-
-                  <span
-                    v-if="adInfo.ReadingTaskState < 2"
-                    class="el-upload-list__item-delete"
-                    @click="handleRemove(file)"
-                  >
-                    <i class="el-icon-delete" />
-                  </span>
+                  <i class="el-icon-zoom-in" />
                </span>
-              </viewer>
+
+                <span
+                  v-if="adInfo.ReadingTaskState < 2"
+                  class="el-upload-list__item-delete"
+                  @click="handleRemove(file)"
+                >
+                  <i class="el-icon-delete" />
+                </span>
+              </span>
            </div>
          </el-upload>
-          
+          <el-dialog
+            append-to-body
+            :visible.sync="imgVisible"
+            width="600px"
+          >
+            <!-- <img width="100%" :src="imageUrl" alt="图片未找到"> -->
+            <el-image :src="imageUrl" width="100%" crossorigin="anonymous">
+              <div slot="placeholder" class="image-slot">
+                {{ $t('trials:adReview:title:loading') }}<span class="dot">...</span>
+              </div>
+            </el-image>
+          </el-dialog>
        </el-form-item>
        <el-form-item v-if="adInfo.ReadingTaskState < 2">
          <div style="text-align:center;">
-            <el-button type="primary" @click="skipTask">
-              <!-- 跳过 -->
-              {{ $t('trials:readingReport:button:skip') }}
-            </el-button>
            <!-- 保存 -->
            <el-button type="primary" @click="handleSave">{{ $t('common:button:save') }}</el-button>
            <!-- 提交 -->
@@ -312,14 +317,12 @@ import { getJudgeReadingInfo,
  // uploadJudgeTaskImage,
  saveJudgeVisitTaskResult, submitJudgeVisitTaskResult, getReadingPastResultList } from '@/api/trials'
 import { getAutoCutNextTask } from '@/api/user'
-import { setSkipReadingCache } from '@/api/reading'
 import const_ from '@/const/sign-code'
 import { getToken } from '@/utils/auth'
 import SignForm from '@/views/trials/components/newSignForm'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
-import Viewer from 'v-viewer'
 export default {
  name: 'AdReview',
  components: { SignForm },
@@ -387,8 +390,7 @@ export default {
      judgeResultArmEnum: '',
      criterionType: null,
      openWindow: null,
-      isFixed: false,
-      images: []
+      isFixed:false
    }
  },
  // watch: {
@@ -405,7 +407,6 @@ export default {
  //   }
  // },
  mounted() {
-    this.initializeViewer()
    this.criterionType = parseInt(this.$route.query.criterionType)
    this.getAdInfo()
    if (this.isReadingShowPreviousResults) {
@@ -707,42 +708,14 @@ export default {
    },
    // 预览图片
    handlePictureCardPreview(file) {
-      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
-      // this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.$refs[file.url].$viewer.show()
+      this.imageUrl = this.OSSclientConfig.basePath + file.url
+      this.imgVisible = true
    },
    // 删除图片
    handleRemove(file, fileList) {
      var idx = this.fileList.findIndex(i => i.url === file.url)
      if (idx === -1) return
      this.fileList.splice(idx, 1)
-    },
-    async skipTask() {
-      try {
-        // 是否确认跳过？
-        const confirm = await this.$confirm(
-          this.$t('trials:readingReport:message:skipConfirm'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.loading = true
-        const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
-        this.loading = false
-        if (res.IsSuccess) {
-          window.location.reload()
-        }
-      } catch (e) {
-        this.loading = false
-        console.log(e)
-      }
-    },
-    initializeViewer() {
-      Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
-      })
    }
  }
 }
@@ -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) || (!this.stack.isExistMutiFrames && data.MeasureData))) {
+          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame) || !data.MeasureData.frame) && 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 < dicomSeries.imageIds.length - 1 ? dicomSeries.imageIdIndex : 0
+        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex ? 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,9 +1941,6 @@ export default {
      for (const [key, value] of searchParams.entries()) {
        params[key] = value
      }
-      if (isNaN(params.frame)){
-        params.frame = 0
-      }
      return params
    },
    preventDefault(e) {
@@ -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,10 +1021,6 @@ 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)
@@ -1062,30 +1058,28 @@ export default {
    })
  },
  methods: {
-    async getWwcTpl() {
-      // const loading = this.$loading({ fullscreen: true })
-      try {
-        const res = await getUserWLTemplateList()
+    getWwcTpl() {
+      const loading = this.$loading({ fullscreen: true })
+      getUserWLTemplateList().then(res => {
        this.customWwcTpl = []
        res.Result.map(i => {
          this.customWwcTpl.push({ label: i.TemplateName, wc: i.WL, ww: i.WW })
        })
        this.wwwcArr = [...this.defaultWwwc, ...this.customWwcTpl]
-      } catch (e) {
-        console.log(e)
-      }
+        loading.close()
+      }).catch(() => { loading.close() })
    },
-    async getHotKeys() {
-      // const loading = this.$loading({ fullscreen: true })
-      try {
-        const res = await getDoctorShortcutKey({ imageToolType: 0 })
+    getHotKeys() {
+      const loading = this.$loading({ fullscreen: true })
+      getDoctorShortcutKey({ imageToolType: 0 }).then(res => {
        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()
-      } catch (e) {
-        console.log(e)
-      }
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
    },
    resetHotkeyList(arr) {
      this.hotKeyList = []
@@ -1108,7 +1102,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)
@@ -7,7 +7,7 @@
        {{ language==='en'?question.GroupEnName:question.GroupName }}
      </h4>
    </div>
-    <template v-else-if="((question.QuestionType === 56) && question.IsBaseLineTask)" />
+    <template v-else-if="((question.QuestionType === 56 || question.QuestionType === 57) && question.IsBaseLineTask)" />
    <template v-else>
      <el-form-item
        v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0"
@@ -29,7 +29,7 @@
                  class="title"
                >
                  {{ item.QuestionName }}
-                  <span v-if="isFirstChangeTask && item.TableQuestions.Answers.length > 0" style="color:red;font-size: 12px;">{{ $t("trials:reading:dicom:IRecist:reevaluate") }}</span>
+                  <span v-if="isFirstChangeTask && item.TableQuestions.Answers.length > 0" style="color:red;font-size: 12px;">(请重新评估)</span>
                </div>
                <div v-else class="title">
                  {{ item.QuestionName }}
@@ -72,13 +72,6 @@ import DicomEvent from './DicomEvent'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import { mapGetters } from 'vuex'
-import * as dicomParser from 'dicom-parser'
-import * as cornerstone from 'cornerstone-core'
-import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
-cornerstoneWADOImageLoader.external.dicomParser = dicomParser
-cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
-cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
  name: 'ReadPage',
  components: {
@@ -217,20 +210,14 @@ export default {
        this.$refs[this.activeTaskVisitId][0].selectSeries(data)
      })
    })
-    cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
-    window.addEventListener('beforeunload', e => {
-      cornerstone.imageCache.purgeCache()
-    })
  },
  beforeDestroy() {
-    cornerstone.imageCache.purgeCache()
    DicomEvent.$off('getNextVisitInfo')
    DicomEvent.$off('toggleSeries')
    DicomEvent.$off('isCanActiveNoneDicomTool')
    DicomEvent.$off('removeNoneDicomMeasureData')
    DicomEvent.$off('addNoneDicomMeasureData')
    DicomEvent.$off('selectSeries')
-    window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
  },
  methods: {
    async getVisitInfo() {
@@ -413,7 +400,7 @@ export default {
        idx > -1 ? obj = seriesList[idx] : ''
      }
      if (obj) {
-        const index = Math.floor(obj.imageIds.length * ((baseSeries.imageIdIndex + 1) / baseSeries.imageIds))
+        const index = Math.floor(obj.imageIds.length * ((baseSeries.imageIdIndex + 1) / baseSeries.instanceCount))
        obj.imageIdIndex = index > 0 ? index - 1 : 0
      }
      return obj
@@ -501,16 +488,6 @@ export default {
        seriesInfo = this.getLinkedSeries(baseSeries, visitTaskId, visitTaskIdx)
      }
      return seriesInfo
-    },
-    cornerstoneimageloadprogress(e) {
-      const imageId = e.detail.imageId
-      const params = {}
-      const searchParams = new URLSearchParams(imageId.split('?')[1])
-      for (const [key, value] of searchParams.entries()) {
-        params[key] = value
-      }
-      params.percentComplete = e.detail.percentComplete
-      store.dispatch('reading/setImageLoadedProgress', params)
    }
  }
 }
@@ -12,15 +12,6 @@
            style="margin-right:5px;"
            @change="handleShowDetail"
          />
-          <el-button
-            v-if="readingTaskState<2"
-            type="primary"
-            size="small"
-            @click="skipTask"
-          >
-            <!-- 跳过 -->
-            {{ $t('trials:readingReport:button:skip') }}
-          </el-button>
          <el-button
            v-if="readingTaskState<2"
            type="primary"
@@ -181,7 +172,8 @@
                        @change="evaluateReasonChange"
                      />
                      <!-- 系统评估结果为：xxx,与当前调整的结果不一致，请填写调整原因 -->
-                      <p v-if="currentEvaluateResult !== tumorEvaluate" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;" v-html="getWarningText()" />
+                      <p v-if="currentEvaluateResult !== tumorEvaluate" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;" v-html="getWarningText()">
+                      </p>
                      <p v-else-if="currentExistDisease !== isExistDisease" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;">{{ $t('trials:readingReport:title:sysEvaluationRes') }}<span style="color:red">{{ $fd('ExistDisease',isExistDisease) }}</span>{{ $t('trials:readingReport:message:msg1') }}
                      </p>
                    </template>
@@ -270,7 +262,6 @@
 </template>
 <script>
 import { getReadingReportEvaluation, changeDicomReadingQuestionAnswer, submitDicomVisitTask, verifyVisitTaskQuestions, getTaskAdditionalQuestion } from '@/api/trials'
-import { setSkipReadingCache } from '@/api/reading'
 import { getAutoCutNextTask } from '@/api/user'
 import DicomEvent from './DicomEvent'
 import const_ from '@/const/sign-code'
@@ -825,36 +816,14 @@ export default {
      var sysRes = ''
      var curRes = ''
      if (this.CriterionType === 2) {
-        sysRes = this.$fd('ImagingOverallAssessment_Lugano', this.tumorEvaluate)
-        curRes = this.$fd('ImagingOverallAssessment_Lugano', this.currentEvaluateResult)
+        sysRes = this.$fd('ImagingOverallAssessment_Lugano',this.tumorEvaluate)
+        curRes = this.$fd('ImagingOverallAssessment_Lugano',this.currentEvaluateResult)
      } else {
-        sysRes = this.$fd('OverallAssessment', this.tumorEvaluate)
-        curRes = this.$fd('OverallAssessment', this.currentEvaluateResult)
+        sysRes = this.$fd('OverallAssessment',this.tumorEvaluate)
+        curRes = this.$fd('OverallAssessment',this.currentEvaluateResult)
      }
-      const msg = this.$t('trials:readingReport:message:msg9').replace('xxx', '<font color="red">' + sysRes + '</font>').replace('yyy', '<font color="red">' + curRes + '</font>')
+      let msg = this.$t('trials:readingReport:message:msg9').replace('xxx','<font color="red">' + sysRes + '</font>').replace('yyy','<font color="red">' + curRes + '</font>')
      return msg
-    },
-    async skipTask() {
-      try {
-        // 是否确认跳过？
-        const confirm = await this.$confirm(
-          this.$t('trials:readingReport:message:skipConfirm'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.loading = true
-        const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
-        this.loading = false
-        if (res.IsSuccess) {
-          window.location.reload()
-        }
-      } catch (e) {
-        this.loading = false
-        console.log(e)
-      }
    }
  }
 }
@@ -67,20 +67,28 @@
                        trigger="hover"
                        popper-class="instance_frame_wrapper"
                      >
-                        <div class="frame_list">
-                          <div
+                        <div
                          v-for="(instance, idx) in series.instanceInfoList"
                          :key="instance.Id"
                          class="frame_content"
                          :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
                          @click.stop="showMultiFrames(index,series, i, instance)"
                        >
+                          <!-- <div>
+                                        <img
+                                          class="image-preview"
+                                          :src="series.previewImageUrl"
+                                          crossorigin="anonymous"
+                                          alt=""
+                                          style="width: 40px;height:40px;"
+                                          fit="fill"
+                                        >
+                                      </div> -->
                          <div>
                            <div>{{ instance.InstanceNumber }}</div>
                            <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
                          </div>

-                        </div>
                        </div>
                        <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;color: #ffeb3b;" />
                      </el-popover>
@@ -150,13 +158,18 @@
  </div>
 </template>
 <script>
-// import * as cornerstone from 'cornerstone-core'
+import * as dicomParser from 'dicom-parser'
+import * as cornerstone from 'cornerstone-core'
+import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import requestPoolManager from '@/utils/request-pool'
 import DicomEvent from './DicomEvent'
 import { mapGetters } from 'vuex'
 import store from '@/store'
 import SrList from './SrList'
-
+cornerstoneWADOImageLoader.external.dicomParser = dicomParser
+cornerstoneWADOImageLoader.external.cornerstone = cornerstone
+const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
+cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
  name: 'StudyList',
  components: { SrList },
@@ -205,7 +218,9 @@ export default {
      srDialogVisible: false,
      srInfo: {},
      digitPlaces: 2,
-      visitTaskIdx: -1
+      visitTaskIdx: -1,
+      currentLoadIns: [],
+      keySeriesLoad: []
    }
  },

@@ -255,18 +270,18 @@ export default {
    //   }
    // })
    // const debouncedInputHandler = this.debounce(this.cornerstoneimageloadprogress, 100)
-    // cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
-    // cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded)
+    cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
+    cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded)
    // cornerstone.events.addEventListener('cornerstoneimagecachefull', this.cornerstoneimagecachefull)
    // cornerstone.events.addEventListener('cornerstoneimagecachechanged', this.cornerstoneimagecachechanged)
-    // window.addEventListener('beforeunload', e => {
-    //   cornerstone.imageCache.purgeCache()
-    // })
+    window.addEventListener('beforeunload', e => {
+      cornerstone.imageCache.purgeCache()
+    })
  },
  beforeDestroy() {
-    // cornerstone.imageCache.purgeCache()
+    cornerstone.imageCache.purgeCache()
    DicomEvent.$off('refreshStudyListMeasureData')
-    // window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
+    window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
  },
  methods: {
    debounce(fn, delay) {
@@ -345,27 +360,8 @@ export default {
            this.studyIndex = sIdx
            this.seriesIndex = 0
            this.activeNames = [`${this.studyList[sIdx].StudyId}`]
-            // 下载关键序列
-            const i = this.studyList.findIndex(i => i.IsCriticalSequence)
-            if (i > -1 && this.studyList[i].SeriesList[0].length > 0) {
-              const series = this.studyList[i].SeriesList[0]
-              if (!series.loadStatus) {
-                let priority = parseInt(new Date().getTime())
-                if (series.isExistMutiFrames) {
-                  series.instanceInfoList.map(image => {
-                    priority = priority - 1
-                    this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: i, seriesIndex: 0, visitTaskId: series.visitTaskId, priority })
-                  })
-                } else {
-                  series.imageIds.map(imageId => {
-                    priority = priority - 1
-                    this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: i, seriesIndex: 0, visitTaskId: series.visitTaskId, priority })
-                  })
-                }
-              }
-            }
-            this.loopLoad()
-            // this.loadImages(this.visitTaskList[idx])
+
+            this.loadImages(this.visitTaskList[idx])
          }
        }
        this.isRender = true
@@ -373,6 +369,7 @@ export default {
    },

    async getInitSeries() {
+      console.log('getInitSeries')
      var seriesList = []
      var isReadingTaskViewInOrder = parseInt(this.$router.currentRoute.query.isReadingTaskViewInOrder)
      var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
@@ -621,9 +618,7 @@ export default {
          this.studyIndex = studyIndex
          this.seriesIndex = seriesIndex
          this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
-          // var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
-          var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
-          dicomStatck.imageIdIndex = 0
+          var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
          this.$emit('loadImageStack', dicomStatck)
          if (!series.loadStatus && series.modality !== 'SR') {
            this.loopLoadStatus = -1
@@ -665,20 +660,18 @@ export default {
    },
    showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) {
      this.currentSeriesIndex = seriesIndex
-      var idx = this.visitTaskIdx
      const imageIds = []
      if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
        for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
-          imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`)
+          imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}`)
        }
      } else {
-        imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`)
-      } 
+        imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}`)
+      }
      this.studyIndex = studyIndex
      this.seriesIndex = seriesIndex
      this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
-      // var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
-      var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
+      var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
      dicomStatck.imageIds = imageIds
      dicomStatck.imageIdIndex = 0
      this.$emit('loadImageStack', dicomStatck)
@@ -721,8 +714,7 @@ export default {
      var activeNames = `${this.studyList[obj.studyIndex].StudyId}`
      if (this.activeNames.includes(activeNames)) return
      this.activeNames.push(activeNames)
-      // console.log('setSeriesActive', obj)
-      this.loadImages(obj)
+      this.loadImages(this.visitTaskList[idx])
    },
    selectSeries(obj) {
      var seriseList = this.studyList.map(s => s.SeriesList).flat()
@@ -747,27 +739,10 @@ export default {
      var activeNames = `${this.studyList[series.studyIndex].StudyId}`
      if (this.activeNames.includes(activeNames)) return
      this.activeNames.push(activeNames)
-      this.loadImages(series)
+      this.loadImages(this.visitTaskList[idx])
      store.dispatch('reading/setActiveSeries', series)
    },
-    loadImages(series) {
-      var priority = parseInt(new Date().getTime())
-      if (!series.loadStatus && series.isDicom && series.modality !== 'SR') {
-        if (series.isExistMutiFrames) {
-          series.instanceInfoList.map(image => {
-            priority = priority - 1
-            this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex, visitTaskId: series.visitTaskId, priority })
-          })
-        } else {
-          series.imageIds.map(imageId => {
-            priority = priority - 1
-            this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex, visitTaskId: series.visitTaskId, priority })
-          })
-        }
-      }
-      this.loopLoad()
-    },
-    loadImages1(taskInfo) {
+    loadImages(taskInfo) {
      // const isBaseLineTask = taskInfo.IsBaseLineTask
      const isCurrentTask = taskInfo.IsCurrentTask
      // var priority = isCurrentTask ? parseInt(new Date().getTime()) : 999
@@ -859,6 +834,141 @@ export default {
      console.log('stopLoadSeries')
      requestPoolManager.removeTask(series.seriesId)
      this.$set(this.studyList[studyIndex].SeriesList[seriesIndex], 'isLoading', false)
+    },
+    async imageLoaded(image, seriesUid) {
+      // await store.dispatch('reading/updateStudyList', { visitTaskId: image.visitTaskId, imageId: image.imageId, seriesUid })
+      // console.log(this.studyList[image.studyIndex].SeriesList[image.seriesIndex])
+      if (image.studyIndex > -1 && image.seriesIndex > -1) {
+        var prefetchInstanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount
+        var instanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].instanceCount
+        if (this.studyList[image.studyIndex].SeriesList[image.seriesIndex].imageloadedArr.indexOf(image.imageId) < 0) {
+          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].imageloadedArr.push(image.imageId)
+          prefetchInstanceCount = prefetchInstanceCount + 1
+          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount = prefetchInstanceCount
+        }
+        if (prefetchInstanceCount >= instanceCount) {
+          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].instanceCount
+          // 设置当前序列状态为已下载完成
+          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].loadStatus = true
+        }
+      }
+
+      // store.dispatch('reading/updateSeriesList', { visitTaskindex: this.visitTaskIdx, studyIndex: image.studyIndex, seriesIndex: image.seriesIndex, imageId: image.imageId })
+    },
+    // instance下载成功回调
+    async cornerstoneImageLoaded(e) {
+      // var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+      // if (idx === -1) return
+      // this.studyList = this.visitTaskList[idx].StudyList
+      // if (!this.studyList || this.studyList.length === 0) {
+      //   return
+      // }
+      // if (!this.visitTaskList[idx].IsInit) {
+      //   const loading = this.$loading({ fullscreen: true })
+      //   await store.dispatch('reading/getMeasuredData', this.visitTaskList[idx].VisitTaskId)
+      //   await store.dispatch('reading/getStudyInfo', { trialId: this.trialId, subjectVisitId: this.visitTaskList[idx].VisitId, visitTaskId: this.visitTaskList[idx].VisitTaskId, taskBlindName: this.visitTaskList[idx].TaskBlindName })
+      //   await store.dispatch('reading/getReadingQuestionAndAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[idx].VisitTaskId })
+      //   await store.dispatch('reading/getDicomReadingQuestionAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[idx].VisitTaskId })
+      //   await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[idx].VisitTaskId })
+      //   loading.close()
+      // }
+      // await store.dispatch('reading/updateStudyList', { visitTaskId: this.visitTaskId, imageId: e.detail.image.imageId, seriesUid: e.detail.image.data.string('x0020000e') })
+      // const uri = e.detail.image.sharedCacheKey
+      // const index = this.cachedImages.findIndex(item => item.uri === uri)
+      // if (index === -1) {
+      //   this.cachedImages.push({ uri: uri, timestamp: new Date().getTime() })
+      // } else {
+      //   this.cachedImages[index].timestamp = new Date().getTime()
+      // }
+      // var imageId = e.detail.image.imageId
+      // var seriesUid = e.detail.image.data.string('x0020000e')
+      // var studyIndex = -1
+      // var seriesIndex = -1
+      // for (let i = 0; i < this.studyList.length; ++i) {
+      //   for (let j = 0; j < this.studyList[i].SeriesList.length; ++j) {
+      //     if (this.studyList[i].SeriesList[j].seriesUid === seriesUid) {
+      //       studyIndex = i
+      //       seriesIndex = j
+      //       break
+      //     }
+      //   }
+      //   if (studyIndex > 0) break
+      // }
+      // if (seriesIndex < 0) return
+
+      // const imageIdIndex = this.studyList[studyIndex].SeriesList[seriesIndex].imageIds.indexOf(imageId)
+      // if (imageIdIndex < 0) return
+      // if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
+      //   if (this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount >= this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount) {
+      //     // 设置当前序列状态为已下载完成
+      //     this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
+      //   }
+      // }
+    },
+    cornerstoneimageloadprogress(e) {
+      const imageId = e.detail.imageId
+      const params = {}
+      const searchParams = new URLSearchParams(imageId.split('?')[1])
+      for (const [key, value] of searchParams.entries()) {
+        params[key] = value
+      }
+      if (this.visitTaskId !== params.visitTaskId) return
+      const percentComplete = e.detail.percentComplete
+
+      const studyIndex = parseInt(params.idx.split('|')[0])
+      const seriesIndex = parseInt(params.idx.split('|')[1])
+      // 关键序列处理
+      const seriesId = this.studyList[studyIndex].SeriesList[seriesIndex].seriesId
+      const i = this.keySeriesLoad.findIndex(i => i.seriesId === seriesId)
+      if (this.studyList[studyIndex].IsCriticalSequence && percentComplete >= 100) {
+        // 关键序列处理
+        if (i === -1) {
+          this.keySeriesLoad.push({ seriesId: seriesId, loadCount: 1, imageIds: [imageId] })
+        } else {
+          ++this.keySeriesLoad[i].loadCount
+          this.keySeriesLoad[i].imageIds.push(imageId)
+        }
+      }
+      if (!this.studyList[studyIndex].IsCriticalSequence && i > -1) {
+        this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount + 100 * this.keySeriesLoad[i].loadCount
+        this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr = [this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr, this.keySeriesLoad[i].imageIds]
+        this.keySeriesLoad.splice(i, 1)
+      }
+      var prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount
+      var instanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount
+      if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
+        const i = this.currentLoadIns.findIndex(i => i.imageId === imageId)
+        if (i > -1) {
+          prefetchInstanceCount = prefetchInstanceCount + percentComplete - this.currentLoadIns[i].percentComplete
+          this.currentLoadIns[i].percentComplete = percentComplete
+          if (percentComplete >= 100) {
+            this.currentLoadIns.splice(i, 1)
+          }
+        } else {
+          if (percentComplete !== 100) {
+            this.currentLoadIns.push({ imageId, percentComplete })
+          }
+          prefetchInstanceCount = prefetchInstanceCount + percentComplete
+        }
+        this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = prefetchInstanceCount
+        if (percentComplete >= 100) {
+          this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.push(imageId)
+        }
+      }
+
+      if (prefetchInstanceCount >= instanceCount * 100) {
+        this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
+        // 设置当前序列状态为已下载完成
+        this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
+        // this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.push(imageId)
+      }
+    },
+    cornerstoneimagecachechanged(e) {
+      const cacheInfo = cornerstone.imageCache.getCacheInfo()
+      console.log(cacheInfo)
+    },
+    cornerstoneimagecachefull(e) {
+      console.log('超过内存了')
    }
  }
 }
@@ -1014,18 +1124,6 @@ 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;
@@ -670,7 +670,7 @@ export default {
      this.sliderInfo.isMove = false
    },
    getMeasureData() {
-      console.log('getMeasureData') 
+      console.log('getMeasureData')
      var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId)
      this.measureData = this.visitTaskList[idx].MeasureData
      const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
@@ -889,8 +889,9 @@ export default {
            cornerstoneTools.setToolPassiveForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
            
          }
-          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && (data.MeasureData.frame === this.stack.frame) && data.MeasureData) || (!this.stack.isExistMutiFrames && data.MeasureData))) {
-            //  console.log('renderMeasuredData', this.stack.frame,data.MeasureData.frame,this.stack.isExistMutiFrames)
+          // console.log('renderMeasuredData', this.stack.frame)
+
+          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame) || !data.MeasureData.frame) && 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)
@@ -1038,7 +1039,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 < dicomSeries.imageIds.length - 1 ? dicomSeries.imageIdIndex : 0
+        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex ? dicomSeries.imageIdIndex : 0
        this.stack.imageIdIndex = dicomSeries.imageIdIndex
        this.stack.firstImageLoading = true
        this.stack.visitTaskId = dicomSeries.visitTaskId
@@ -1180,7 +1181,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()
      })
    },
@@ -1245,6 +1246,7 @@ export default {
      // console.log('onImageLoaded')
    },
    onImageRendered(e) {
+      // console.log('onImageRendered')
      this.stack.imageRendered = true
      // const { element } = e.detail
      var imageId = e.detail.image.imageId
@@ -1919,9 +1921,6 @@ export default {
      for (const [key, value] of searchParams.entries()) {
        params[key] = value
      }
-      if (isNaN(params.frame)){
-        params.frame = 0
-      }
      return params
    },
    preventDefault(e) {
@@ -914,9 +914,9 @@ export default {
    this.getWwcTpl()
    // cornerstone.imageCache.setMaximumSizeBytes(0)

-    // const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 // 1 GB
+    const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
    // const maximumSizeInBytes = 1024 * 1024 * 500
-    // cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
+    cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
    this.customWwc = {
      visible: false,
      title: this.$t('trials:reading:dagTitle:wwwcCustom')
@@ -993,7 +993,6 @@ export default {
      }
      console.log('getMeasureData')
    })
-    
    DicomEvent.$on('getScreenshots', (callback) => {
      var base64Str =
        this.$refs[
@@ -1052,11 +1051,11 @@ export default {
      this.uploadStatus = status
      this.uploadImageVisible = true
    },
-    async getWwcTpl() {
-      // const loading = this.$loading({ fullscreen: true })
-      try {
-        let res = await getUserWLTemplateList()
-        this.customWwcTpl = []
+    getWwcTpl() {
+      const loading = this.$loading({ fullscreen: true })
+      getUserWLTemplateList()
+        .then((res) => {
+          this.customWwcTpl = []
          res.Result.map((i) => {
            this.customWwcTpl.push({
              label: i.TemplateName,
@@ -1065,32 +1064,35 @@ export default {
            })
          })
          this.wwwcArr = [...this.defaultWwwc, ...this.customWwcTpl]
-      } catch(e) {
-        console.log(e)
-      }
-      
-    },
-    async getHotKeys() {
-      // const loading = this.$loading({ fullscreen: true })
-      try {
-        let 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
-          })
+          loading.close()
+        })
+        .catch(() => {
+          loading.close()
+        })
+    },
+    getHotKeys() {
+      const loading = this.$loading({ fullscreen: true })
+      getDoctorShortcutKey({ imageToolType: 0 })
+        .then((res) => {
+          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()
        })
-        this.bindHotKey()
-      } catch(e) {
-        console.log(e)
-      }
    },
    resetHotkeyList(arr) {
      this.hotKeyList = []
@@ -74,13 +74,6 @@ import DicomEvent from "./../components/DicomEvent";
 import store from "@/store";
 import { getToken } from "@/utils/auth";
 import { mapGetters } from "vuex";
-import * as dicomParser from 'dicom-parser'
-import * as cornerstone from 'cornerstone-core'
-import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
-cornerstoneWADOImageLoader.external.dicomParser = dicomParser
-cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
-cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
  name: "CustomizeReadPage",
  components: {
@@ -236,10 +229,6 @@ export default {
        this.$refs[this.activeTaskVisitId][0].selectSeries(data);
      });
    });
-    cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
-    window.addEventListener('beforeunload', e => {
-      cornerstone.imageCache.purgeCache()
-    })
  },
  beforeDestroy() {
    DicomEvent.$off("getNextVisitInfo");
@@ -248,7 +237,6 @@ export default {
    DicomEvent.$off("removeNoneDicomMeasureData");
    DicomEvent.$off("addNoneDicomMeasureData");
    DicomEvent.$off("selectSeries");
-    window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
  },
  methods: {
    async getVisitInfo() {
@@ -535,7 +523,7 @@ export default {
      if (obj) {
        let index = Math.floor(
          obj.imageIds.length *
-            ((baseSeries.imageIdIndex + 1) / baseSeries.imageIds)
+            ((baseSeries.imageIdIndex + 1) / baseSeries.instanceCount)
        );
        obj.imageIdIndex = index > 0 ? index - 1 : 0;
      }
@@ -658,16 +646,6 @@ export default {
      }
      return seriesInfo;
    },
-    cornerstoneimageloadprogress(e) {
-      const imageId = e.detail.imageId
-      const params = {}
-      const searchParams = new URLSearchParams(imageId.split('?')[1])
-      for (const [key, value] of searchParams.entries()) {
-        params[key] = value
-      }
-      params.percentComplete = e.detail.percentComplete
-      store.dispatch('reading/setImageLoadedProgress', params)
-    }
  },
 };
 </script>
@@ -11,15 +11,6 @@
            style="margin-right:5px"
            @change="handleShowDetail"
          />
-          <el-button
-            v-if="readingTaskState<2"
-            type="primary"
-            size="small"
-            @click="skipTask"
-          >
-            <!-- 跳过 -->
-            {{ $t('trials:readingReport:button:skip') }}
-          </el-button>
          <el-button v-if="readingTaskState<2" type="primary" size="small" @click="getReportInfo">{{$t('trials:readingReport:button:refresh')}}</el-button>
          <el-button v-if="readingTaskState<2" type="primary" size="small" @click="handleSave(true)">{{$t('common:button:save')}}</el-button>
          <el-button v-if="readingTaskState<2" type="primary" size="small" @click="handleConfirm">{{$t('common:button:submit')}}</el-button>
@@ -269,7 +260,6 @@
 </template>
 <script>
 import { changeCalculationAnswer, getReadingReportEvaluation, changeDicomReadingQuestionAnswer, submitDicomVisitTask, verifyVisitTaskQuestions, getQuestionCalculateRelation } from '@/api/trials'
-import { setSkipReadingCache } from '@/api/reading'
 import DicomEvent from './../components/DicomEvent'
 import CustomizeReportPageUpload from './CustomizeReportPageUpload'
 import const_ from '@/const/sign-code'
@@ -838,28 +828,6 @@ export default {
          reject()
        })
      })
-    },
-    async skipTask() {
-      try {
-        // 是否确认跳过？
-        const confirm = await this.$confirm(
-          this.$t('trials:readingReport:message:skipConfirm'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.loading = true
-        const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
-        this.loading = false
-        if (res.IsSuccess) {
-          window.location.reload()
-        }
-      } catch (e) {
-        this.loading = false
-        console.log(e)
-      }
    }
  }
 }
@@ -67,30 +67,28 @@
                        trigger="hover"
                        popper-class="instance_frame_wrapper"
                      >
-                        <div class="frame_list">
-                          <div
-                            v-for="(instance, idx) in series.instanceInfoList"
-                            :key="instance.Id"
-                            class="frame_content"
-                            :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
-                            @click.stop="showMultiFrames(index,series, i, instance)"
-                          >
-                            <!-- <div>
-                                          <img
-                                            class="image-preview"
-                                            :src="series.previewImageUrl"
-                                            crossorigin="anonymous"
-                                            alt=""
-                                            style="width: 40px;height:40px;"
-                                            fit="fill"
-                                          >
-                                        </div> -->
-                            <div>
-                              <div>{{ instance.InstanceNumber }}</div>
-                              <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                            </div>
-
+                        <div
+                          v-for="(instance, idx) in series.instanceInfoList"
+                          :key="instance.Id"
+                          class="frame_content"
+                          :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
+                          @click.stop="showMultiFrames(index,series, i, instance)"
+                        >
+                          <!-- <div>
+                                        <img
+                                          class="image-preview"
+                                          :src="series.previewImageUrl"
+                                          crossorigin="anonymous"
+                                          alt=""
+                                          style="width: 40px;height:40px;"
+                                          fit="fill"
+                                        >
+                                      </div> -->
+                          <div>
+                            <div>{{ instance.InstanceNumber }}</div>
+                            <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
                          </div>
+
                        </div>
                        <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;color: #ffeb3b;" />
                      </el-popover>
@@ -159,11 +157,18 @@
  </div>
 </template>
 <script>
+import * as dicomParser from 'dicom-parser'
+import * as cornerstone from 'cornerstone-core'
+import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import requestPoolManager from '@/utils/request-pool'
 import DicomEvent from './../components/DicomEvent'
 import { mapGetters } from 'vuex'
 import store from '@/store'
 import SrList from './../components/SrList'
+cornerstoneWADOImageLoader.external.dicomParser = dicomParser
+cornerstoneWADOImageLoader.external.cornerstone = cornerstone
+const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
+cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
  name: 'StudyList',
  components: { SrList },
@@ -212,7 +217,9 @@ export default {
      srDialogVisible: false,
      srInfo: {},
      digitPlaces: 2,
-      visitTaskIdx: -1
+      visitTaskIdx: -1,
+      currentLoadIns: [],
+      keySeriesLoad: []
    }
  },

@@ -250,19 +257,24 @@ export default {
    this.subjectCode = localStorage.getItem('subjectCode')
    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
-    DicomEvent.$on('refreshStudyListMeasureData', () => {
-      var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
-      this.measureData = this.visitTaskList[idx].MeasureData
-    })
+
    // DicomEvent.$on('setReadingState', readingTaskState => {
    //   var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
    //   if (idx > -1) {
    //     this.studyList = this.visitTaskList[idx].StudyList
    //   }
    // })
-
+    cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
+    cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded)
+    // cornerstone.events.addEventListener('cornerstoneimagecachefull', this.cornerstoneimagecachefull)
+    // cornerstone.events.addEventListener('cornerstoneimagecachechanged', this.cornerstoneimagecachechanged)
+    window.addEventListener('beforeunload', e => {
+      cornerstone.imageCache.purgeCache()
+    })
  },
  beforeDestroy() {
+    cornerstone.imageCache.purgeCache()
+    window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
  },
  methods: {
    initStudyInfo() {
@@ -314,6 +326,7 @@ export default {
      requestPoolManager.loadAndCacheImagePlus(imageId, seriesInfo.seriesId, p * 100)
    },
    getStudyList() {
+      console.log('getStudyList')
      if (!this.isRender) {
        var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
        if (idx > -1 && this.visitTaskList[idx].StudyList && this.visitTaskList[idx].StudyList.length > 0) {
@@ -324,27 +337,8 @@ export default {
            this.studyIndex = sIdx
            this.seriesIndex = 0
            this.activeNames = [`${this.studyList[sIdx].StudyId}`]
-            // 下载关键序列
-            const i = this.studyList.findIndex(i => i.IsCriticalSequence)
-            if (i > -1 && this.studyList[i].SeriesList[0].length > 0) {
-              const series = this.studyList[i].SeriesList[0]
-              if (!series.loadStatus) {
-                let priority = parseInt(new Date().getTime())
-                if (series.isExistMutiFrames) {
-                  series.instanceInfoList.map(image => {
-                    priority = priority - 1
-                    this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: i, seriesIndex: 0, visitTaskId: series.visitTaskId, priority })
-                  })
-                } else {
-                  series.imageIds.map(imageId => {
-                    priority = priority - 1
-                    this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: i, seriesIndex: 0, visitTaskId: series.visitTaskId, priority })
-                  })
-                }
-              }
-            }
-            this.loopLoad()
-            // this.loadImages(this.visitTaskList[idx])
+
+            this.loadImages(this.visitTaskList[idx])
          }
        }
        this.isRender = true
@@ -602,9 +596,7 @@ export default {
          this.studyIndex = studyIndex
          this.seriesIndex = seriesIndex
          this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
-          var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
-
-          dicomStatck.imageIdIndex = 0
+          var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
          this.$emit('loadImageStack', dicomStatck)
          if (!series.loadStatus && series.modality !== 'SR') {
            this.loopLoadStatus = -1
@@ -646,19 +638,18 @@ export default {
    },
    showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) {
      this.currentSeriesIndex = seriesIndex
-      var idx = this.visitTaskIdx
-      this.studyIndex = studyIndex
-      this.seriesIndex = seriesIndex
-      this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
-      var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
      const imageIds = []
      if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
        for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
-          imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`)
+          imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}`)
        }
      } else {
-        imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`)
+        imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}`)
      }
+      this.studyIndex = studyIndex
+      this.seriesIndex = seriesIndex
+      this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
+      var dicomStatck = this.studyList[studyIndex].SeriesList[seriesIndex]
      dicomStatck.imageIds = imageIds
      dicomStatck.imageIdIndex = 0
      this.$emit('loadImageStack', dicomStatck)
@@ -701,8 +692,7 @@ export default {
      var activeNames = `${this.studyList[obj.studyIndex].StudyId}`
      if (this.activeNames.includes(activeNames)) return
      this.activeNames.push(activeNames)
-      // this.loadImages(this.visitTaskList[idx])
-      this.loadImages(obj)
+      this.loadImages(this.visitTaskList[idx])
    },
    selectSeries(obj) {
      var seriseList = this.studyList.map(s => s.SeriesList).flat()
@@ -727,25 +717,45 @@ export default {
      var activeNames = `${this.studyList[series.studyIndex].StudyId}`
      if (this.activeNames.includes(activeNames)) return
      this.activeNames.push(activeNames)
-      this.loadImages(series)
-      // this.loadImages(this.visitTaskList[idx])
+      this.loadImages(this.visitTaskList[idx])
      store.dispatch('reading/setActiveSeries', series)
    },
-    loadImages(series) {
+    loadImages(taskInfo) {
+      // const isBaseLineTask = taskInfo.IsBaseLineTask
+      const isCurrentTask = taskInfo.IsCurrentTask
+      // var priority = isCurrentTask ? parseInt(new Date().getTime()) : 999
      var priority = parseInt(new Date().getTime())
-      if (!series.loadStatus && series.isDicom && series.modality !== 'SR') {
-        if (series.isExistMutiFrames) {
-          series.instanceInfoList.map(image => {
-            priority = priority - 1
-            this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex, visitTaskId: series.visitTaskId, priority })
-          })
-        } else {
-          series.imageIds.map(imageId => {
-            priority = priority - 1
-            this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex, visitTaskId: series.visitTaskId, priority })
-          })
-        }
-      }
+      this.studyList.map((study, studyIndex) => {
+        study.SeriesList.map((series, seriesIndex) => {
+          if (!series.loadStatus && series.isDicom && series.modality !== 'SR') {
+            // if (isCurrentTask || isBaseLineTask) {
+            //   // 当前任务/基线任务下载所有影像
+            //   series.imageIds.map(image => {
+            //     this.imageList.push({ imageId: image, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority })
+            //   })
+            // } else if (!isBaseLineTask && !isCurrentTask && study.IsCriticalSequence) {
+            //   // 非当前随访任务下载关键影像
+            //   series.imageIds.map(image => {
+            //     this.imageList.push({ imageId: image, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority })
+            //   })
+            // }
+            // 均只下载关键序列
+            if (!isCurrentTask && study.IsCriticalSequence) {
+              if (series.isExistMutiFrames) {
+                series.instanceInfoList.map(image => {
+                  priority = priority - 1
+                  this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority })
+                })
+              } else {
+                series.imageIds.map(imageId => {
+                  priority = priority - 1
+                  this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority })
+                })
+              }
+            }
+          }
+        })
+      })
      this.loopLoad()
    },

@@ -802,6 +812,139 @@ export default {
      requestPoolManager.removeTask(series.seriesId)
      this.$set(this.studyList[studyIndex].SeriesList[seriesIndex], 'isLoading', false)
    },
+    async imageLoaded(image, seriesUid) {
+      // await store.dispatch('reading/updateStudyList', { visitTaskId: image.visitTaskId, imageId: image.imageId, seriesUid })
+      // console.log(this.studyList[image.studyIndex].SeriesList[image.seriesIndex])
+      if (image.studyIndex > -1 && image.seriesIndex > -1) {
+        var prefetchInstanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount
+        var instanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].instanceCount
+        if (this.studyList[image.studyIndex].SeriesList[image.seriesIndex].imageloadedArr.indexOf(image.imageId) < 0) {
+          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].imageloadedArr.push(image.imageId)
+          prefetchInstanceCount = prefetchInstanceCount + 1
+          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount = prefetchInstanceCount
+        }
+        if (prefetchInstanceCount >= instanceCount) {
+          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].instanceCount
+          // 设置当前序列状态为已下载完成
+          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].loadStatus = true
+        }
+      }
+
+      // store.dispatch('reading/updateSeriesList', { visitTaskindex: this.visitTaskIdx, studyIndex: image.studyIndex, seriesIndex: image.seriesIndex, imageId: image.imageId })
+    },
+    // instance下载成功回调
+    async cornerstoneImageLoaded(e) {
+      // var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+      // if (idx === -1) return
+      // this.studyList = this.visitTaskList[idx].StudyList
+      // if (!this.studyList || this.studyList.length === 0) {
+      //   return
+      // }
+      // if (!this.visitTaskList[idx].IsInit) {
+      //   const loading = this.$loading({ fullscreen: true })
+      //   await store.dispatch('reading/getMeasuredData', this.visitTaskList[idx].VisitTaskId)
+      //   await store.dispatch('reading/getStudyInfo', { trialId: this.trialId, subjectVisitId: this.visitTaskList[idx].VisitId, visitTaskId: this.visitTaskList[idx].VisitTaskId, taskBlindName: this.visitTaskList[idx].TaskBlindName })
+      //   await store.dispatch('reading/getReadingQuestionAndAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[idx].VisitTaskId })
+      //   await store.dispatch('reading/getDicomReadingQuestionAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[idx].VisitTaskId })
+      //   await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[idx].VisitTaskId })
+      //   loading.close()
+      // }
+      // await store.dispatch('reading/updateStudyList', { visitTaskId: this.visitTaskId, imageId: e.detail.image.imageId, seriesUid: e.detail.image.data.string('x0020000e') })
+      // const uri = e.detail.image.sharedCacheKey
+      // const index = this.cachedImages.findIndex(item => item.uri === uri)
+      // if (index === -1) {
+      //   this.cachedImages.push({ uri: uri, timestamp: new Date().getTime() })
+      // } else {
+      //   this.cachedImages[index].timestamp = new Date().getTime()
+      // }
+      // var imageId = e.detail.image.imageId
+      // var seriesUid = e.detail.image.data.string('x0020000e')
+      // var studyIndex = -1
+      // var seriesIndex = -1
+      // for (let i = 0; i < this.studyList.length; ++i) {
+      //   for (let j = 0; j < this.studyList[i].SeriesList.length; ++j) {
+      //     if (this.studyList[i].SeriesList[j].seriesUid === seriesUid) {
+      //       studyIndex = i
+      //       seriesIndex = j
+      //       break
+      //     }
+      //   }
+      //   if (studyIndex > 0) break
+      // }
+      // if (seriesIndex < 0) return
+
+      // const imageIdIndex = this.studyList[studyIndex].SeriesList[seriesIndex].imageIds.indexOf(imageId)
+      // if (imageIdIndex < 0) return
+      // if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
+      //   if (this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount >= this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount) {
+      //     // 设置当前序列状态为已下载完成
+      //     this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
+      //   }
+      // }
+    },
+    cornerstoneimageloadprogress(e) {
+      const imageId = e.detail.imageId
+      const percentComplete = e.detail.percentComplete
+      const params = {}
+      const searchParams = new URLSearchParams(imageId.split('?')[1])
+      for (const [key, value] of searchParams.entries()) {
+        params[key] = value
+      }
+      if (this.visitTaskId === params.visitTaskId) {
+        const studyIndex = params.idx.split('|')[0]
+        const seriesIndex = params.idx.split('|')[1]
+        
+        const seriesId = this.studyList[studyIndex].SeriesList[seriesIndex].seriesId
+        const i = this.keySeriesLoad.findIndex(i => i.seriesId === seriesId)
+        if (this.studyList[studyIndex].IsCriticalSequence && percentComplete >= 100) {
+          // 关键序列处理
+          if (i === -1) {
+            this.keySeriesLoad.push({ seriesId: seriesId, loadCount: 1, imageIds: [imageId] })
+          } else {
+            ++this.keySeriesLoad[i].loadCount
+            this.keySeriesLoad[i].imageIds.push(imageId)
+          } 
+        }
+        if (!this.studyList[studyIndex].IsCriticalSequence && i > -1) {
+          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount + 100 * this.keySeriesLoad[i].loadCount
+          this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr = [this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr, this.keySeriesLoad[i].imageIds]
+          this.keySeriesLoad.splice(i, 1)
+        }
+        var prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount
+        var instanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount
+        if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
+          const i = this.currentLoadIns.findIndex(i => i.imageId === imageId)
+          if (i > -1) {
+            prefetchInstanceCount = prefetchInstanceCount - this.currentLoadIns[i].percentComplete + percentComplete
+            this.currentLoadIns[i].percentComplete = percentComplete
+            if (percentComplete === 100) {
+              this.currentLoadIns.splice(i, 1)
+            }
+          } else {
+            if (percentComplete !== 100) {
+              this.currentLoadIns.push({ imageId, percentComplete })
+            }
+            prefetchInstanceCount = prefetchInstanceCount + percentComplete
+          }
+          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = prefetchInstanceCount
+          if (percentComplete >= 100) {
+            this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.push(imageId)
+          }
+        }
+        if (prefetchInstanceCount >= instanceCount * 100) {
+          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
+          // 设置当前序列状态为已下载完成
+          this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
+        }
+      }
+    },
+    cornerstoneimagecachechanged(e) {
+      const cacheInfo = cornerstone.imageCache.getCacheInfo()
+      console.log(cacheInfo)
+    },
+    cornerstoneimagecachefull(e) {
+      console.log('超过内存了')
+    }
  }
 }
 </script>
@@ -956,18 +1099,6 @@ 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;
@@ -25,14 +25,7 @@
      </div>

      <div v-if=" readingTaskState < 2" style="text-align:right;margin:5px 0;">
-        <el-button
-            type="primary"
-            size="small"
-            @click="skipTask"
-          >
-            <!-- 跳过 -->
-            {{ $t('trials:readingReport:button:skip') }}
-          </el-button>
+
        <el-button size="small" type="primary" @click="handleSave">
          {{ $t('common:button:save') }}
        </el-button>
@@ -149,7 +142,6 @@
 <script>
 import { getGlobalReadingInfo, getReadingPastResultList, submitGlobalReadingInfo, saveGlobalReadingInfo } from '@/api/trials'
 import { getAutoCutNextTask } from '@/api/user'
-import { setSkipReadingCache } from '@/api/reading'
 import { getToken } from '@/utils/auth'
 import const_ from '@/const/sign-code'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
@@ -385,28 +377,6 @@ export default {
    handleSave() {
      this.$refs['globalTbl'].handleSave(true)
    },
-    async skipTask() {
-      try {
-        // 是否确认跳过？
-        const confirm = await this.$confirm(
-          this.$t('trials:readingReport:message:skipConfirm'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.loading = true
-        const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
-        this.loading = false
-        if (res.IsSuccess) {
-          window.location.reload()
-        }
-      } catch (e) {
-        this.loading = false
-        console.log(e)
-      }
-    },
    async handleConfirm() {
      // 判断是否存在访视评估结果未确认
      var idx = this.taskList.findIndex(i => !i.AgreeOrNotAnswer)
@@ -29,22 +29,11 @@
                  {{ $t('trials:medicalFeedback:message:msg2') }}
                  <ol>
                    <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;">
-                      <viewer
-                        v-if="file.ImagePath"
-                        :ref="file.ImagePath"
-                        style="margin:0 10px;"
-                        :images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
-                      >
-                        <el-button type="text" @click="previewImage(file.ImagePath)">
-                          {{ file.FileName }}
-                        </el-button>
-                        <img
-                          v-show="false"
-                          crossorigin="anonymous"
-                          :src="`${OSSclientConfig.basePath}${file.ImagePath}`"
-                          alt="Image"
-                        >
-                      </viewer>
+                      <el-button
+                        type="text"
+                        size="mini"
+                        @click="previewImage(file.ImagePath)"
+                      >{{ file.FileName }}</el-button>
                    </li>
                  </ol>
                </div>
@@ -77,23 +66,12 @@
                  <!-- 本次医学审核相关截图（如适用）如下： -->
                  {{ $t('trials:medicalFeedback:message:msg5') }}
                  <ol>
-                    <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;"> 
-                      <viewer
-                        v-if="file.ImagePath"
-                        :ref="file.ImagePath"
-                        style="margin:0 10px;"
-                        :images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
-                      >
-                        <el-button type="text" @click="previewImage(file.ImagePath)">
-                          {{ file.FileName }}
-                        </el-button>
-                        <img
-                          v-show="false"
-                          crossorigin="anonymous"
-                          :src="`${OSSclientConfig.basePath}${file.ImagePath}`"
-                          alt="Image"
-                        >
-                      </viewer>
+                    <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;">
+                      <el-button
+                        type="text"
+                        size="mini"
+                        @click="previewImage(file.ImagePath)"
+                      >{{ file.FileName }}</el-button>
                    </li>
                  </ol>
                </div>
@@ -119,6 +97,22 @@
      </div>

    </div>
+    <el-dialog
+      v-if="previewDialog"
+      append-to-body
+      :close-on-click-modal="false"
+      :visible.sync="previewDialog"
+      width="600px"
+    >
+      <!-- <img width="100%" :src="imagePath" alt="图片未找到"> -->
+      <el-image :src="imagePath" crossorigin="anonymous" width="100%">
+        <div slot="placeholder" class="image-slot">
+          <!-- 加载中 -->
+          {{ $t('trials:medicalFeedback:message:loading') }}<span class="dot">...</span>
+        </div>
+      </el-image>
+
+    </el-dialog>

    <el-dialog
      v-if="irFeedbackForm.visible"
@@ -143,7 +137,6 @@ import { getMedicalReviewDialog } from '@/api/trials'
 import FeedbackForm from './FeedbackForm'
 import mimAvatar from '@/assets/MIM.png'
 import irAvatar from '@/assets/IR.png'
-import Viewer from 'v-viewer'
 export default {
  name: 'ChatForm',
  components: { FeedbackForm },
@@ -177,7 +170,6 @@ export default {
    }
  },
  mounted() {
-    this.initializeViewer()
    this.getMessageList()
  },
  methods: {
@@ -212,12 +204,6 @@ export default {
    previewImage(path) {
      this.imagePath = `${this.OSSclientConfig.basePath}${path}`
      this.previewDialog = true
-      this.$refs[path][0].$viewer.show()
-    },
-    initializeViewer() {
-      Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
-      })
    }
  }

@@ -271,7 +271,7 @@
                sortable="custom"
              />
              <!-- 审核结论 -->
-               <el-table-column
+              <el-table-column
                prop="IsHaveQuestion"
                :label="$t('trials:medicalFeedback:button:isQuestions')"
                min-width="120"
@@ -323,7 +323,7 @@
                  />
                  <!-- 回复:disabled="!scope.row.IsHaveQuestion || scope.row.IsInvalid" -->
                  <el-button
-                    
+
                    circle
                    :title="$t('trials:medicalFeedback:table:reply')"
                    icon="el-icon-chat-dot-round"
@@ -369,12 +369,13 @@
        :row-data="currentRow"
        @getList="getList"
        @close="auditVisible=false"
+        @nextTask="nextTask"
      />
    </el-dialog>
  </BaseContainer>
 </template>
 <script>
-import { getIRMedicalFeedbackList } from '@/api/trials'
+import { getIRMedicalFeedbackList, getNextIRMedicalFeedback } from '@/api/trials'
 import { getTrialCriterionList } from '@/api/trials/reading'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
@@ -456,6 +457,26 @@ export default {
      this.chatForm.title = `${this.$t('trials:medicalFeedback:title:qaRecord')} (${row.SubjectCode} ${row.TaskBlindName})`
      this.chatForm.visible = true
    },
+    async nextTask(taskMedicalReviewId) {
+      try {
+        const params = {
+          trialId: this.trialId,
+          trialReadingCriterionId: this.TrialReadingCriterionId,
+          taskMedicalReviewId: taskMedicalReviewId
+        }
+        const res = await getNextIRMedicalFeedback(params)
+        if (res.IsSuccess) {
+          this.auditVisible = false
+          this.currentRow = res.Result
+          this.$nextTick(() => {
+            this.auditVisible = true
+          })
+        }
+      } catch (e) {
+        this.auditVisible = false
+        console.log(e)
+      }
+    },
    // 排序
    handleSortChange(column) {
      if (column.order === 'ascending') {
@@ -138,22 +138,20 @@
        >
          <i slot="default" class="el-icon-plus" />
          <div slot="file" slot-scope="{file}">
-            <viewer :ref="file.url" :images="images">
-                <img
-                  class="el-upload-list__item-thumbnail"
-                  :src="OSSclientConfig.basePath + file.url"
-                  alt=""
-                  crossorigin="anonymous"
-                >
-                <span class="el-upload-list__item-actions">
-                  <span
-                    class="el-upload-list__item-preview"
-                    @click="handlePictureCardPreview(file)"
-                  >
-                    <i class="el-icon-zoom-in" />
-                  </span>
-                </span>
-              </viewer>
+            <img
+              class="el-upload-list__item-thumbnail"
+              :src="OSSclientConfig.basePath + file.url"
+              alt=""
+              crossorigin="anonymous"
+            >
+            <span class="el-upload-list__item-actions">
+              <span
+                class="el-upload-list__item-preview"
+                @click="handlePictureCardPreview(file)"
+              >
+                <i class="el-icon-zoom-in" />
+              </span>
+            </span>
          </div>
        </el-upload>
        <el-dialog
@@ -239,8 +237,8 @@ export default {
      this.visitTaskArmList = JudgeInfo.VisitTaskArmList
    },
    handlePictureCardPreview(file) {
-      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
-      this.$refs[file.url].$viewer.show()
+      this.imageUrl = this.OSSclientConfig.basePath + file.url
+      this.imgVisible = true
    },
    handleViewDetail(visitTaskId) {
      console.log(this.rowData)
@@ -28,23 +28,12 @@
                  <!-- 本次医学审核相关截图（如适用）如下： -->
                  {{ $t('trials:medicalFeedback:message:msg2') }}
                  <ol>
-                    <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;"> 
-                      <viewer
-                        v-if="file.ImagePath"
-                        :ref="file.ImagePath"
-                        style="margin:0 10px;"
-                        :images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
-                      >
-                        <el-button type="text" @click="previewImage(file.ImagePath)">
-                          {{ file.FileName }}
-                        </el-button>
-                        <img
-                          v-show="false"
-                          crossorigin="anonymous"
-                          :src="`${OSSclientConfig.basePath}${file.ImagePath}`"
-                          alt="Image"
-                        >
-                      </viewer>
+                    <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;">
+                      <el-button
+                        type="text"
+                        size="mini"
+                        @click="previewImage(file.ImagePath)"
+                      >{{ file.FileName }}</el-button>
                    </li>
                  </ol>
                </div>
@@ -77,23 +66,12 @@
                  <!-- 本次医学审核相关截图（如适用）如下： -->
                  {{ $t('trials:medicalFeedback:message:msg5') }}
                  <ol>
-                    <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;"> 
-                      <viewer
-                        v-if="file.ImagePath"
-                        :ref="file.ImagePath"
-                        style="margin:0 10px;"
-                        :images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
-                      >
-                        <el-button type="text" @click="previewImage(file.ImagePath)">
-                          {{ file.FileName }}
-                        </el-button>
-                        <img
-                          v-show="false"
-                          crossorigin="anonymous"
-                          :src="`${OSSclientConfig.basePath}${file.ImagePath}`"
-                          alt="Image"
-                        >
-                      </viewer>
+                    <li v-for="file in record.FileList" :key="file.ImagePath" style="list-style: none;">
+                      <el-button
+                        type="text"
+                        size="mini"
+                        @click="previewImage(file.ImagePath)"
+                      >{{ file.FileName }}</el-button>
                    </li>
                  </ol>
                </div>
@@ -147,6 +125,19 @@
      </div>
    </div>

+    <el-dialog
+      append-to-body
+      :visible.sync="previewDialog"
+      width="600px"
+    >
+      <!-- <img width="100%" :src="imagePath" alt="图片未找到"> -->
+      <el-image :src="OSSclientConfig.basePath + imagePath" width="100%" crossorigin="anonymous">
+        <div slot="placeholder" class="image-slot">
+          {{ $t('trials:medicalFeedback:message:loading') }}<span class="dot">...</span>
+        </div>
+      </el-image>
+    </el-dialog>
+
    <el-dialog
      v-if="irFeedbackForm.visible"
      :visible.sync="irFeedbackForm.visible"
@@ -163,7 +154,6 @@
        @close="irFeedbackForm.visible = false"
      />
    </el-dialog>
-    
  </div>
 </template>
 <script>
@@ -171,7 +161,6 @@ import { getMedicalReviewDialog, sendMedicalReviewDialog } from '@/api/trials'
 import FeedbackForm from '@/views/trials/trials-panel/reading/medical-feedback/components/FeedbackForm'
 import mimAvatar from '@/assets/MIM.png'
 import irAvatar from '@/assets/IR.png'
-import Viewer from 'v-viewer'
 export default {
  name: 'ChatForm',
  components: {
@@ -207,7 +196,6 @@ export default {
    }
  },
  mounted() {
-    this.initializeViewer()
    this.getMessageList()
  },
  methods: {
@@ -254,18 +242,12 @@ export default {
    previewImage(path) {
      this.imagePath = `${path}`
      this.previewDialog = true
-      this.$refs[path][0].$viewer.show()
    },
    handleIRReply() {
      // '反馈'
      this.irFeedbackForm.title = this.$t('trials:medicalFeedback:title:feedback')

      this.irFeedbackForm.visible = true
-    },
-    initializeViewer() {
-      Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
-      })
    }
  }

@@ -92,49 +92,46 @@
        >
          <i slot="default" class="el-icon-plus" />
          <div slot="file" slot-scope="{file}">
-            <viewer :images="images" :ref="file.url">
-              <img
-                class="el-upload-list__item-thumbnail"
-                :src="OSSclientConfig.basePath + file.url"
-                crossOrigin="anonymous"
-                alt=""
+            <img
+              class="el-upload-list__item-thumbnail"
+              :src="OSSclientConfig.basePath + file.url"
+              crossOrigin="anonymous"
+              alt=""
+            >
+            <span class="el-upload-list__item-actions">
+              <span
+                class="el-upload-list__item-preview"
+                @click="handlePictureCardPreview(file)"
              >
-              <span class="el-upload-list__item-actions">
-                <span
-                  class="el-upload-list__item-preview"
-                  @click="handlePictureCardPreview(file)"
-                >
-                  <i class="el-icon-zoom-in" />
-                </span>
-
-                <span
-                  v-if="!isSendMessage && auditState!==2"
-                  class="el-upload-list__item-delete"
-                  @click="handleRemove(file)"
-                >
-                  <i class="el-icon-delete" />
-                </span>
+                <i class="el-icon-zoom-in" />
              </span>
-            </viewer>
+
+              <span
+                v-if="!isSendMessage && auditState!==2"
+                class="el-upload-list__item-delete"
+                @click="handleRemove(file)"
+              >
+                <i class="el-icon-delete" />
+              </span>
+            </span>
          </div>
        </el-upload>
-        <!-- <el-dialog
+        <el-dialog
          append-to-body
          :visible.sync="imgVisible"
          width="600px"
        >
+          <!-- <img width="100%" :src="imageUrl" alt="图片未找到"> -->
          <el-image :src="imageUrl" width="100%" crossorigin="anonymous">
            <div slot="placeholder" class="image-slot">
              {{ $t('trials:medicalFeedback:message:loading') }}<span class="dot">...</span>
            </div>
          </el-image>
-        </el-dialog> -->
+        </el-dialog>
      </el-form-item>

    </el-form>
-    <!-- <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
-      <img :src="imageUrl"  crossorigin="anonymous" alt="">
-    </viewer> -->
+
    <el-dialog
      v-if="chatVisible"
      :visible.sync="chatVisible"
@@ -173,7 +170,6 @@
 import { saveMedicalReviewInfo } from '@/api/trials'
 import ChatForm from './ChatForm'
 import CloseQC from './CloseQC'
-import Viewer from 'v-viewer'
 export default {
  name: 'AuditConclusions',
  components: {
@@ -224,12 +220,10 @@ export default {
      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
      isClosedDialog: false,
      isSendMessage: false,
-      closeQuestionVisible: false,
-      images:[]
+      closeQuestionVisible: false
    }
  },
  mounted() {
-    this.initializeViewer()
    this.initForm()
  },
  methods: {
@@ -385,20 +379,14 @@ export default {
    },
    // 预览图片
    handlePictureCardPreview(file) {
-      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
-      // this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.$refs[file.url].$viewer.show()
+      this.imageUrl = this.OSSclientConfig.basePath + file.url
+      this.imgVisible = true
    },
    // 删除图片
    handleRemove(file, fileList) {
      var idx = this.fileList.findIndex(i => i.url === file.url)
      if (idx === -1) return
      this.fileList.splice(idx, 1)
-    },
-    initializeViewer() {
-      Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true}
-      })
    }
  }
 }
@@ -67,6 +67,10 @@
      <el-button v-if="hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit']) && auditInfo.AuditState !== 2" type="primary" @click="getNextTask">
        {{ $t('trials:medicalFeedback:button:nextTask') }}
      </el-button>
+      <!-- IR下一任务 -->
+      <el-button v-if="hasPermi(['trials:trials-panel:medicalFeedback:nextTask']) && auditInfo.AuditState === 1" type="primary" @click="getNextIRTask">
+        {{ $t('trials:irmedicalFeedback:button:nextTask') }}
+      </el-button>
    </div>

    <!--签名框 -->
@@ -221,7 +225,20 @@ export default {
    // 获取下一任务
    getNextTask() {
      this.disPatchNextTask(this.auditInfo.AuditState >= 2)
-
+    },
+    getNextIRTask() {
+      // 是否确认进入下一任务？
+      this.$confirm(this.$t('trials:medicalFeedback:message:goNextTask04'), {
+        type: 'warning',
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          this.loading = true
+          this.$emit('nextTask', this.taskMedicalReviewId)
+        })
+        .catch(action => {
+          this.loading = false
+        })
    },
    disPatchNextTask(isComplete) {
      // '是否确认进入下一个医学审核任务？' : '当前医学审核任务未完成，是否确认进入下一个医学审核任务？'
@@ -59,7 +59,7 @@
      :show-close="false"
    >
      <span slot="title" class="dialog-footer">
-        {{ $t('trials:reading:noneDicom:tip:hasCllinicalData') }}
+        当前阅片任务存在临床数据，请查看。若已查看，请点击“确认”
      </span>
      <div :style="{'height':dialogH,'margin':0}">
        <ClinicalData
@@ -70,7 +70,7 @@
      </div>

      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handleConfirmCD">{{$t("common:button:confirm")}}</el-button>
+        <el-button type="primary" @click="handleConfirmCD">确认</el-button>
      </span>
    </el-dialog>

@@ -136,8 +136,7 @@ export default {
    this.readingTool = this.$router.currentRoute.query.readingTool
    this.isNewSubject = this.$router.currentRoute.query.isNewSubject
    if (this.isNewSubject && this.isReadingTaskViewInOrder) {
-      let message = this.$t('trials:reading:noneDicom:message:startRead').replace("xxx",this.subjectCode);
-      this.$message.success(message)
+      this.$message.success(`已开始受试者${this.subjectCode}阅片任务`)
      changeURLStatic('isNewSubject', '')
    }
    if (this.$router.currentRoute.query.TokenKey) {
@@ -26,14 +26,6 @@
        >
          {{ $t('trials:oncologyReview:button:clinicalData') }}
        </el-button>
-        <el-button
-          type="primary"
-          size="small"
-          @click="skipTask"
-        >
-          <!-- 跳过 -->
-          {{ $t('trials:readingReport:button:skip') }}
-        </el-button>
        <!-- 保存 -->
        <el-button
          v-if="oncologyInfo.ReadingTaskState < 2"
@@ -261,7 +253,6 @@
 </template>
 <script>
 import { getOncologyReadingInfo, getReadingPastResultList, setOncologyReadingInfo, submitOncologyReadingInfo } from '@/api/trials'
-import { setSkipReadingCache } from '@/api/reading'
 import const_ from '@/const/sign-code'
 import { getToken } from '@/utils/auth'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
@@ -563,28 +554,6 @@ export default {
        path: `/clinicalData?subjectId=${this.oncologyInfo.SubjectId}&trialId=${this.trialId}&visitTaskId=${this.oncologyInfo.OncologyTaskId}&TokenKey=${token}`
      })
      window.open(routeData.href, '_blank')
-    },
-    async skipTask() {
-      try {
-        // 是否确认跳过？
-        const confirm = await this.$confirm(
-          this.$t('trials:readingReport:message:skipConfirm'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.loading = true
-        const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
-        this.loading = false
-        if (res.IsSuccess) {
-          window.location.reload()
-        }
-      } catch (e) {
-        this.loading = false
-        console.log(e)
-      }
    }
  }
 }
@@ -313,9 +313,8 @@
                </div>
                <el-tag type="danger">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
              </el-tooltip>
-              <el-tag v-else-if="scope.row.RequestReReadingResultEnum === 1" type="primary">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
-              <el-tag v-else-if="scope.row.RequestReReadingResultEnum === 0" type="warning">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
-              <el-tag v-else type="info">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
+              <el-tag v-if="scope.row.RequestReReadingResultEnum === 1" type="primary">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
+              <el-tag v-if="scope.row.RequestReReadingResultEnum === 0" type="warning">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
            </div>
          </template>
        </el-table-column>
@@ -765,16 +764,8 @@ export default {
      })
    },
    confirmSign(type) {
-      const { HeavyReadingApproval } = const_.processSignature;
+      const { HeavyReadingApproval } = const_.processSignature
      this.type = type
-      if(type === 2){
-        return this.$refs.reasonForm.validate(validate=>{
-          if(validate){
-            this.signCode = HeavyReadingApproval
-            this.signVisible = true
-          }
-        })
-      }
      this.signCode = HeavyReadingApproval
      this.signVisible = true
    },
@@ -785,7 +776,7 @@ export default {
        this.signVisible = false
      }
    },
-    async confirmReReading(row, type, open, signInfo) {
+    confirmReReading(row, type, open, signInfo) {
      if (open) {
        this.rowData = { ...row }
        this.ConfirmReReadingVisible = true
@@ -795,41 +786,41 @@ export default {
        return
      }
      if (type === 2) {
-        let valid = await this.$refs.reasonForm.validate()
-        if (!valid) return
-        var params = {
-          data: {
-            ConfirmReReadingList: [
-              {
-                Id: row.Id,
-                OriginalReReadingTaskId: row.OriginalReReadingTaskId,
-                RootReReadingTaskId: row.RootReReadingTaskId,
-                NewReReadingTaskId: row.NewReReadingTaskId
-              }
-            ],
-            RequestReReadingRejectReason: this.ConfirmReReadingForm.RequestReReadingRejectReason,
-            TrialId: this.$route.query.trialId,
-            RequestReReadingResultEnum: type
-          },
-          signInfo: signInfo
-        }
-        this.loading = true
-        this.btnLoading = true
-        try {
-          await confirmReReading(params)
-          this.loading = false
-          this.btnLoading = false
-          // 同意申请成功/拒绝申请成功
-          this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`)
-          this.$refs['signForm'].btnLoading = false
-          this.signVisible = false
-          this.getList()
-          this.ConfirmReReadingVisible = false
-        } catch (e) {
-          this.loading = false
-          this.$refs['signForm'].btnLoading = false
-          this.btnLoading = false
-        }
+        this.$refs.reasonForm.validate((valid) => {
+          if (!valid) return
+          var params = {
+            data: {
+              ConfirmReReadingList: [
+                {
+                  Id: row.Id,
+                  OriginalReReadingTaskId: row.OriginalReReadingTaskId,
+                  RootReReadingTaskId: row.RootReReadingTaskId,
+                  NewReReadingTaskId: row.NewReReadingTaskId
+                }
+              ],
+              RequestReReadingRejectReason: this.ConfirmReReadingForm.RequestReReadingRejectReason,
+              TrialId: this.$route.query.trialId,
+              RequestReReadingResultEnum: type
+            },
+            signInfo: signInfo
+          }
+          this.loading = true
+          this.btnLoading = true
+          confirmReReading(params).then(() => {
+            this.loading = false
+            this.btnLoading = false
+            // 同意申请成功/拒绝申请成功
+            this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`)
+            this.$refs['signForm'].btnLoading = false
+            this.signVisible = false
+            this.getList()
+            this.ConfirmReReadingVisible = false
+          }).catch(() => {
+            this.loading = false
+            this.$refs['signForm'].btnLoading = false
+            this.btnLoading = false
+          })
+        })
        return
      }
      var params = {
@@ -849,29 +840,21 @@ export default {
      }
      this.loading = true
      this.btnLoading = true
-      try {
-        let res = await confirmReReading(params)
+      confirmReReading(params).then(() => {
        this.loading = false
        this.btnLoading = false
+        // this.$message.success(`${type === 1 ? '同意' : '拒绝'}申请成功`)
+        // 同意申请成功/拒绝申请成功
+        this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`)
+        this.ReReadingOrBackVisible = false
        this.$refs['signForm'].btnLoading = false
-        if (res.ErrorMessage) {
-          let alert = await this.$alert(res.ErrorMessage)
-          if (alert !== "confirm") return
-          this.ReReadingOrBackVisible = false
-          this.signVisible = false
-          this.getList()
-        } else {
-          // 同意申请成功/拒绝申请成功
-          this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`)
-          this.ReReadingOrBackVisible = false
-          this.signVisible = false
-          this.getList()
-        }
-      } catch (e) {
+        this.signVisible = false
+        this.getList()
+      }).catch(() => {
        this.loading = false
        this.$refs['signForm'].btnLoading = false
        this.btnLoading = false
-      }
+      })
    },
    assignSubjectTaskToDoctor(row, type) {
      this.rowData = { ...row }
@@ -18,7 +18,7 @@
          v-if="
            (isReadingTaskViewInOrder === 1 ||
              isReadingTaskViewInOrder === 2) &&
-              TrialReadingCriterionId === item.TrialReadingCriterionId
+            TrialReadingCriterionId === item.TrialReadingCriterionId
          "
        >
          <div slot="search-container">
@@ -75,10 +75,11 @@
                      scope.row.UrgentColor === 1
                        ? 'danger'
                        : scope.row.UrgentColor === 2
-                          ? 'warning'
-                          : 'primary'
+                        ? 'warning'
+                        : 'primary'
                    "
-                  >{{ $fd("YesOrNo", scope.row.IsUrgent) }}</el-tag>
+                    >{{ $fd("YesOrNo", scope.row.IsUrgent) }}</el-tag
+                  >
                </template>
              </el-table-column>
              <!-- 受试者编号 -->
@@ -113,10 +114,11 @@
                        scope.row.UrgentColor === 1
                          ? '#F56C6C'
                          : scope.row.UrgentColor === 2
-                            ? '#E6A23C'
-                            : '#409EFF',
+                          ? '#E6A23C'
+                          : '#409EFF',
                    }"
-                  >{{ scope.row.UrgentCount }}</span>
+                    >{{ scope.row.UrgentCount }}</span
+                  >
                </template>
              </el-table-column>
              <!-- 建议完成时间 -->
@@ -146,8 +148,8 @@
                    :title="
                      scope.row.ExistReadingApply
                        ? $t(
-                          'trials:pendingReadingTasks:button:ExistReadingApply'
-                        )
+                            'trials:pendingReadingTasks:button:ExistReadingApply'
+                          )
                        : $t('trials:pendingReadingTasks:button:review')
                    "
                    icon="el-icon-edit-outline"
@@ -155,12 +157,12 @@
                  />
                  <!-- 上传 -->
                  <el-button
+                    v-hasPermi="['role:ir']"
                    v-if="
                      item.CriterionType === 0 &&
-                        item.ImageUploadEnum > 0 &&
-                        item.IsReadingTaskViewInOrder > 0
+                      item.ImageUploadEnum > 0 &&
+                      item.IsReadingTaskViewInOrder > 0
                    "
-                    v-hasPermi="['role:ir']"
                    circle
                    icon="el-icon-upload2"
                    :title="$t('trials:pendingReadingTasks:button:upload')"
@@ -168,12 +170,12 @@
                  />
                  <!-- 下载 -->
                  <el-button
+                    v-hasPermi="['role:ir']"
                    v-if="
                      item.CriterionType === 0 &&
-                        item.ImageDownloadEnum === 1 &&
-                        item.IsReadingTaskViewInOrder > 0
+                      item.ImageDownloadEnum === 1 &&
+                      item.IsReadingTaskViewInOrder > 0
                    "
-                    v-hasPermi="['role:ir']"
                    circle
                    icon="el-icon-download"
                    :title="$t('trials:pendingReadingTasks:button:download')"
@@ -194,7 +196,7 @@
        <div
          v-else-if="
            isReadingTaskViewInOrder === 0 &&
-              TrialReadingCriterionId === item.TrialReadingCriterionId
+            TrialReadingCriterionId === item.TrialReadingCriterionId
          "
        >
          <el-descriptions :column="2" border style="width: 800px">
@@ -248,7 +250,7 @@
                :disabled="
                  randomReadInfo.UnReadTaskCount +
                    randomReadInfo.UnReadJudgeTaskCount ===
-                    0
+                  0
                "
                @click="handleOutOfOrderReading"
              >
@@ -262,8 +264,8 @@
    <upload-image
      v-if="uploadImageVisible"
      :visible.sync="uploadImageVisible"
-      :subject-id="uploadSubjectId"
-      :criterion="uploadTrialCriterion"
+      :SubjectId="uploadSubjectId"
+      :Criterion="uploadTrialCriterion"
      :status="uploadStatus"
      @getList="getList"
    />
@@ -272,36 +274,35 @@
 <script>
 import {
  getIRUnReadSubjectTaskList,
-  verifyReadingRestTime
-} from '@/api/trials'
-import { getTrialCriterionList } from '@/api/trials/reading'
-import { clearSkipReadingCache } from '@/api/reading'
-import BaseContainer from '@/components/BaseContainer'
-import uploadImage from '@/components/uploadImage'
-import Pagination from '@/components/Pagination'
-import { getToken } from '@/utils/auth'
+  verifyReadingRestTime,
+} from "@/api/trials";
+import { getTrialCriterionList } from "@/api/trials/reading";
+import BaseContainer from "@/components/BaseContainer";
+import uploadImage from "@/components/uploadImage";
+import Pagination from "@/components/Pagination";
+import { getToken } from "@/utils/auth";
 const searchDataDefault = () => {
  return {
-    SubjectCode: '',
+    SubjectCode: "",
    PageIndex: 1,
-    PageSize: 20
-  }
-}
+    PageSize: 20,
+  };
+};
 export default {
-  name: 'ReadingTaskList',
-  components: { BaseContainer, Pagination, 'upload-image': uploadImage },
+  name: "ReadingTaskList",
+  components: { BaseContainer, Pagination, "upload-image": uploadImage },
  data() {
    return {
      searchData: searchDataDefault(),
      list: [],
      total: 0,
      loading: false,
-      trialId: '',
+      trialId: "",
      isReadingTaskViewInOrder: null,
      randomReadInfo: {},
      isRender: false,
      trialCriterionList: [],
-      TrialReadingCriterionId: '',
+      TrialReadingCriterionId: "",
      isTableShow: true,
      readingTool: null,
      criterionType: null,
@@ -311,146 +312,147 @@ export default {
      uploadImageVisible: false,
      uploadSubjectId: null,
      uploadTrialCriterion: {},
-      uploadStatus: 'upload'
-    }
+      uploadStatus: "upload",
+    };
  },
  watch: {
    TrialReadingCriterionId(v) {
      if (v) {
-        this.getList()
+        this.getList();
      }
-    }
+    },
  },
  mounted() {
-    window.addEventListener('message', this.receiveMsg)
-    this.trialId = this.$route.query.trialId
-    this.getTrialCriterionList()
+    window.addEventListener("message", this.receiveMsg);
+    this.trialId = this.$route.query.trialId;
+    this.getTrialCriterionList();
  },
  beforeDestroy() {
-    window.removeEventListener('message', this.receiveMsg)
+    window.removeEventListener("message", this.receiveMsg);
    if (this.openWindow) {
-      this.openWindow.close()
+      this.openWindow.close();
    }
  },
  methods: {
    // 打开上传下载弹框
    openUploadImage(item, trialCriterion, status) {
-      this.uploadSubjectId = item.SubjectId
-      this.uploadTrialCriterion = trialCriterion
-      this.uploadStatus = status
-      this.uploadImageVisible = true
+      this.uploadSubjectId = item.SubjectId;
+      this.uploadTrialCriterion = trialCriterion;
+      this.uploadStatus = status;
+      this.uploadImageVisible = true;
    },
-    async getTrialCriterionList() {
-      try {
-        const res = await getTrialCriterionList(this.trialId)
-        if (res.IsSuccess) {
-          this.trialCriterionList = res.Result
+    getTrialCriterionList() {
+      getTrialCriterionList(this.trialId)
+        .then((res) => {
+          this.trialCriterionList = res.Result;
          this.TrialReadingCriterionId =
-            this.trialCriterionList[0].TrialReadingCriterionId
-        }
-      } catch (e) {
-        console.log(e)
-      }
+            this.trialCriterionList[0].TrialReadingCriterionId;
+        })
+        .catch(() => {});
    },
-    async getList() {
-      try {
-        this.loading = true
-        this.searchData.TrialId = this.trialId
-        this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
-        this.isRender = false
-        const res = await getIRUnReadSubjectTaskList(this.searchData)
-        if (res.IsSuccess) {
+    getList() {
+      this.loading = true;
+      this.searchData.TrialId = this.trialId;
+      this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId;
+      this.isRender = false;
+      getIRUnReadSubjectTaskList(this.searchData)
+        .then((res) => {
          this.isReadingTaskViewInOrder =
-            res.OtherInfo.IsReadingTaskViewInOrder
-          this.readingTool = res.OtherInfo.ReadingTool
-          this.criterionType = res.OtherInfo.CriterionType
+            res.OtherInfo.IsReadingTaskViewInOrder;
+          this.readingTool = res.OtherInfo.ReadingTool;
+          this.criterionType = res.OtherInfo.CriterionType;
          if (res.OtherInfo.IsReadingTaskViewInOrder) {
-            this.list = res.Result.CurrentPageData
-            this.total = res.Result.TotalCount
+            this.list = res.Result.CurrentPageData;
+            this.total = res.Result.TotalCount;
          } else {
-            this.randomReadInfo = res.OtherInfo.RandomReadInfo
+            this.randomReadInfo = res.OtherInfo.RandomReadInfo;
          }
-          this.isRender = true
-          this.loading = false
-        }
-      } catch (e) {
-        this.isRender = true
-        this.loading = false
-      }
+          this.isRender = true;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.isRender = true;
+          this.loading = false;
+        });
    },
    handleSearch() {
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.PageIndex = 1;
+      this.getList();
    },
    handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
    },
-    async handleReadImage(row) {
+    handleReadImage(row) {
      if (this.openWindow) {
-        this.openWindow.close()
+        this.openWindow.close();
      }
-      try {
-        this.loading = true
-        await clearSkipReadingCache()
-        await verifyReadingRestTime()
-        this.loading = false
-        window.localStorage.setItem('TrialReadingCriterionId', this.TrialReadingCriterionId)
-        var token = getToken()
-        var path = ''
-        if (this.readingTool === 0) {
-          path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
-        } else {
-          path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
-        }
-        var routeData = this.$router.resolve({ path })
+      this.loading = true;
+      verifyReadingRestTime()
+        .then((_) => {
+          this.loading = false;

-        this.openWindow = window.open(routeData.href, '_blank')
-      } catch (e) {
-        this.loading = false
-        console.log(e)
-      }
+          window.localStorage.setItem(
+            "TrialReadingCriterionId",
+            this.TrialReadingCriterionId
+          );
+          var token = getToken();
+          var path = "";
+          if (this.readingTool === 0) {
+            path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`;
+          } else {
+            path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`;
+          }
+          var routeData = this.$router.resolve({ path });
+
+          this.openWindow = window.open(routeData.href, "_blank");
+        })
+        .catch(() => {
+          this.loading = false;
+        });
    },
-    async handleOutOfOrderReading() {
+    handleOutOfOrderReading() {
      if (this.openWindow) {
-        this.openWindow.close()
-      }
-      try {
-        this.loading = true
-        await clearSkipReadingCache()
-        await verifyReadingRestTime()
-        this.loading = false
-        window.localStorage.setItem('TrialReadingCriterionId', this.TrialReadingCriterionId)
-        var token = getToken()
-        var path = ''
-        if (this.readingTool === 0) {
-          path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
-        } else {
-          path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`
-        }
-        var routeData = this.$router.resolve({ path })
-        this.openWindow = window.open(routeData.href, '_blank')
-      } catch (e) {
-        this.loading = false
-        console.log(e)
+        this.openWindow.close();
      }
+      this.loading = true;
+      verifyReadingRestTime()
+        .then((_) => {
+          this.loading = false;
+          window.localStorage.setItem(
+            "TrialReadingCriterionId",
+            this.TrialReadingCriterionId
+          );
+          var token = getToken();
+          var path = "";
+          if (this.readingTool === 0) {
+            path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`;
+          } else {
+            path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}`;
+          }
+          var routeData = this.$router.resolve({ path });
+          this.openWindow = window.open(routeData.href, "_blank");
+        })
+        .catch(() => {
+          this.loading = false;
+        });
    },
    receiveMsg(event) {
-      if (event.data === 'refreshTaskList') {
-        this.getList()
+      if (event.data === "refreshTaskList") {
+        this.getList();
      }
    },
    // 排序
    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>
@@ -135,12 +135,25 @@ export default {
        EmailAuthorizationCode: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
        EmailSMTPServerAddress: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
        EmailSMTPServerPort: [{ required: true, message: this.$t('common:ruleMessage:select') }]
-      }
+      },
+      NODE_ENV: process.env.NODE_ENV,
    }
  },
-  watch: {
-    activeTab(v) {
-      console.log(v)
+  // watch: {
+  //   activeTab(v) {
+  //     console.log(v)
+  //   }
+  // },
+  created() {
+    if(this.NODE_ENV === 'production'){
+      this.form= {
+        EmailFromEmail: 'test@extimaging.com',
+        EmailFromName: 'Test_IRC',
+        EmailAuthorizationCode: 'SHzyyl2021',
+        EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
+        EmailSMTPServerPort: 465,
+        IsConfigureEmail: true
+      };
    }
  },
  mounted() {
@@ -17,21 +17,6 @@
          v-model="form.QuestionName"
        />
      </el-form-item>
-      <el-form-item
-        :label="$t('common:title:languageType')"
-        prop="LanguageType"
-      >
-        <el-select
-          v-model="form.LanguageType"
-        >
-          <el-option
-            v-for="item of $d.LanguageType"
-            :key="item.value"
-            :value="item.value"
-            :label="item.label"
-          />
-        </el-select>
-      </el-form-item>
      <!-- 类型 -->
      <el-form-item
        :label="$t('trials:qcCfg:table:type')"
@@ -326,7 +326,7 @@
  </box-content>
 </template>
 <script>
-import { batchDeteteCriterionMedicineQuestion, getReadingMedicineTrialQuestionList, deleteReadingMedicineTrialQuestion, confirmReadingMedicineQuestion, verifyReadingMedicineQuestion, verifyIsCanConfirm } from '@/api/trials'
+import { addDefaultQuestions , batchDeteteCriterionMedicineQuestion, getReadingMedicineTrialQuestionList, deleteReadingMedicineTrialQuestion, confirmReadingMedicineQuestion, verifyReadingMedicineQuestion, verifyIsCanConfirm } from '@/api/trials'
 import { getTrialCriterionList } from '@/api/trials/reading'
 import BoxContent from '@/components/BoxContent'
 import DefaultQS from './components/DefaultQsLang'
@@ -334,7 +334,7 @@ import QSForm from './components/QSForm'
 import Pagination from '@/components/Pagination'
 import QuestionsPreview from './components/QuestionsPreview'
 import SignForm from '@/views/trials/components/newSignForm'
-import const_ from '@/const/sign-code'
+import const_ from '@/const/sign-code';
 const searchDataDefault = () => {
  return {
    QuestionName: '',
@@ -382,7 +382,6 @@ export default {
      this.CurrentCriterionType = this.trialCriterionList.find(v => {
        return v.TrialReadingCriterionId === this.trialReadingCriterionId
      }).CriterionType
-      console.log(this.CurrentCriterionType)
    }
  },
  mounted() {
@@ -390,6 +389,23 @@ export default {
    this.getTrialCriterionList()
  },
  methods: {
+    // 添加默认问题
+    addDefaultQuestions(){
+      let data = {
+        TrialId: this.$route.query.trialId,
+        TrialReadingCriterionId: this.trialReadingCriterionId,
+        LanguageType: 0
+      }
+      if( this.otherInfo.LanguageType === null ){
+        data.LanguageType = this.$i18n.locale === 'zh' ? 0 : 1
+      } else {
+        data.LanguageType = this.otherInfo.LanguageType
+      }
+      addDefaultQuestions(data).then(res => {
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
+        this.getList();
+      })
+    },
    handleSelectionChange(value) {
      this.selectedList = value
    },
@@ -433,7 +449,8 @@ export default {
    },
    // 打开系统模板配置项
    handleAdd() {
-      this.addVisible = true
+      // this.addVisible = true
+      this.addDefaultQuestions();
    },
    handleEdit(row) {
      this.currentRow = { ...row }
@@ -0,0 +1,127 @@
+<template>
+  <base-model v-if="config.visible" :config="config">
+    <template slot="dialog-body">
+      <el-button type="primary" icon="el-icon-plus" @click="openAdd" style="float: right" v-if="status === 'add'">
+        {{ $t("common:button:add") }}
+      </el-button>
+      <el-table v-loading="loading" :data="list" stripe>
+        <!-- AE 名称 -->
+        <el-table-column prop="CallingAE" :label="$t('trials:sitesList:dicomAEList:table:AEName')" show-overflow-tooltip
+          min-width="120" />
+        <!-- IP地址 -->
+        <el-table-column prop="IP" :label="$t('trials:sitesList:dicomAEList:table:ip')" show-overflow-tooltip
+          min-width="120" />
+        <!-- 端口 -->
+        <el-table-column prop="Port" :label="$t('trials:sitesList:dicomAEList:table:port')" show-overflow-tooltip
+          min-width="120" />
+        <!-- 说明 -->
+        <el-table-column prop="Description" :label="$t('trials:sitesList:dicomAEList:table:description')"
+          show-overflow-tooltip min-width="120" />
+        <!-- 操作 -->
+        <!-- <el-table-column prop="action" :label="$t('trials:sitesList:dicomAEList:table:action')" min-width="120">
+          <template slot-scope="scope">
+            <el-button circle :title="$t('trials:sitesList:dicomAEList:action:del')" icon="el-icon-delete"
+              :disabled="scope.row.IsDeleted" @click="delDicom(scope.row)" />
+          </template>
+        </el-table-column> -->
+
+      </el-table>
+      <dicomForm ref="dicomForm" @getList="getList" @save="save" />
+    </template>
+  </base-model>
+</template>
+<script>
+import BaseModel from "@/components/BaseModel";
+import dicomForm from "./dicomForm.vue";
+import {
+  getTrialSiteDicomAEList,
+  deleteTrialSiteDicomAE
+} from "@/api/trials";
+const defaultSearchData = () => {
+  return {
+    TrialSiteId: null,
+    CallingAE: null,
+    Ip: null,
+    Port: null,
+    Description: null,
+  };
+};
+export default {
+  name: "dicomAE",
+  components: { BaseModel, dicomForm },
+  data() {
+    return {
+      config: {
+        visible: false,
+        title: null,
+        width: "800px",
+        appendToBody: true
+      },
+      status: "add",
+      TrialSiteId: null,
+      loading: false,
+      list: [],
+      searchData: defaultSearchData(),
+      siteData: {},
+    };
+  },
+  methods: {
+    open(row, status = "add") {
+      this.status = status;
+      this.TrialSiteId = row.TrialSiteId;
+      this.config.title = this.$t(
+        "trials:trials-panel:setting:personnel-manage:dicomAETitle"
+      ).replace("xxx", `${row.TrialSiteCode}、${row.TrialSiteAliasName}`);
+      this.siteData = row;
+      this.config.visible = true;
+      this.getList();
+    },
+    // 获取dicomAE列表
+    async getList() {
+      try {
+        this.searchData.TrialSiteId = this.TrialSiteId;
+        this.loading = true;
+        let res = await getTrialSiteDicomAEList(this.searchData);
+        this.loading = false;
+        if (res.IsSuccess) {
+          this.list = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
+    },
+    // 新增
+    openAdd() {
+      this.$refs.dicomForm.open(this.siteData, null, 'add');
+    },
+    save() {
+      this.$emit('getList')
+    },
+    // 删除dicom
+    async delDicom(row) {
+      try {
+        let confirm = await this.$confirm(
+          this.$t("trials:sitesList:dicomAEList:confirm:delMessage"),
+          {
+            type: "warning",
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t("common:button:confirm"),
+            cancelButtonText: this.$t("common:button:cancel"),
+          }
+        );
+        if (confirm !== "confirm") return;
+        let res = await deleteTrialSiteDicomAE(row.Id);
+        if (res.IsSuccess) {
+          this.getList();
+          this.save();
+          this.$t('common:message:deletedSuccessfully');
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    }
+  },
+};
+</script>
+<style lang="scss" scoped></style>
@@ -0,0 +1,183 @@
+<template>
+  <base-model v-if="config.visible" :config="config">
+    <template slot="dialog-body">
+      <el-form ref="dicomForm" :model="form" label-width="100px" :rules="rules">
+        <!-- 中心编号 -->
+        <el-form-item :label="$t('trials:sitesList:table:siteId')" prop="TrialSiteCode">
+          <el-input v-model="siteData.TrialSiteCode" disabled />
+        </el-form-item>
+        <!-- 中心别称 -->
+        <el-form-item :label="$t('trials:sitesList:table:siteName')" prop="TrialSiteAliasName">
+          <el-input v-model="siteData.TrialSiteAliasName" disabled />
+        </el-form-item>
+        <!-- AE -->
+        <el-form-item :label="$t('trials:setting:siteList:dicomForm:dicomAE')" prop="CallingAE">
+          <el-input v-model="form.CallingAE" clearable maxlength="16" />
+        </el-form-item>
+        <!-- IP -->
+        <el-form-item :label="$t('trials:setting:siteList:dicomForm:ip')" prop="Ip">
+          <el-input v-model="form.Ip" clearable />
+        </el-form-item>
+        <!-- PORT -->
+        <el-form-item :label="$t('trials:setting:siteList:dicomForm:port')" prop="Port">
+          <el-input v-model.number="form.Port" type="number" clearable />
+        </el-form-item>
+        <!-- 说明 -->
+        <el-form-item :label="$t('trials:setting:siteList:dicomForm:description')" prop="Description">
+          <el-input v-model="form.Description" clearable />
+        </el-form-item>
+      </el-form>
+    </template>
+    <template slot="dialog-footer">
+      <el-button type="primary" size="small" :disabled="loading" @click="config.visible = false">
+        {{ $t("common:button:cancel") }}
+      </el-button>
+      <el-button type="primary" size="small" :loading="loading" @click="save">
+        {{ $t("common:button:save") }}
+      </el-button>
+    </template>
+  </base-model>
+</template>
+<script>
+import {
+  addOrUpdateTrialSiteDicomAE,
+} from "@/api/trials";
+import BaseModel from "@/components/BaseModel";
+export default {
+  name: "dicomForm",
+  components: { BaseModel },
+  data() {
+    return {
+      config: {
+        visible: false,
+        title: null,
+        width: "600px",
+        appendToBody: true,
+      },
+      form: {
+        Id: null,
+        CallingAE: null,
+        Ip: null,
+        Port: null,
+        Description: null
+      },
+      rules: {
+        CallingAE: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            pattern: /[a-zA-Z0-9]/,
+            message: this.$t("common:ruleMessage:CallingAEPattern"),
+            trigger: "blur",
+          },
+          {
+            min: 1,
+            max: 16,
+            message: this.$t("common:ruleMessage:CallingAEPattern"),
+            trigger: "blur",
+          },
+        ],
+        Ip: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value === "" ||
+                typeof value === "undefined" ||
+                value == null
+              ) {
+                callback(new Error(this.$t("common:ruleMessage:ipPattern")));
+              } else {
+                const reg =
+                  /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
+                if (!reg.test(value) && value !== "") {
+                  callback(new Error(this.$t("common:ruleMessage:ipPattern")));
+                } else {
+                  callback();
+                }
+              }
+            },
+            message: this.$t("common:ruleMessage:ipPattern"),
+            trigger: "blur",
+          },
+        ],
+        Port: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            type: "number",
+            min: 0,
+            max: 65535,
+            message: this.$t("common:ruleMessage:portPattern"),
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                (String(value).includes(".") ||
+                  new RegExp(/\D/g).test(String(value)))
+              ) {
+                callback(new Error(this.$t("common:ruleMessage:portPattern")));
+              } else {
+                callback();
+              }
+            },
+            trigger: "blur",
+          },
+        ],
+      },
+      siteData: {},
+      loading: false,
+      status: 'add'
+    };
+  },
+  methods: {
+    open(siteData, data = null, status = 'add') {
+      this.siteData = siteData;
+      this.status = status;
+      if (data) {
+        Object.keys(this.form).forEach(key => {
+          this.form[key] = data[key];
+        })
+      }
+      this.config.title = this.$t(
+        "trials:trials-panel:setting:personnel-manage:dicomAETitle"
+      ).replace("xxx", `${siteData.TrialSiteCode}、${siteData.TrialSiteAliasName}`);
+      this.config.visible = true;
+    },
+    // 保存
+    async save() {
+      try {
+        let validate = await this.$refs.dicomForm.validate();
+        if (!validate) return false;
+        this.loading = true;
+        this.form.TrialSiteId = this.siteData.TrialSiteId;
+        this.form.TrialId = this.$route.query.trialId;
+        let res = await addOrUpdateTrialSiteDicomAE(this.form);
+        this.loading = false;
+        if (res.IsSuccess) {
+          this.status === 'add' ? this.$t('common:message:savedSuccessfully') : this.$t('common:message:savedFail');
+          this.$emit('getList');
+          this.$emit("save");
+          this.config.visible = false;
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped></style>
@@ -16,23 +16,13 @@
        </el-form-item> -->
        <!-- 关键词 -->
        <el-form-item :label="$t('trials:sitesList:form:keyWord')">
-          <el-input
-            v-model="listQuery.UserKeyInfo"
-            style="width: 200px"
-            class="mr"
-            clearable
-            :placeholder="$t('trials:sitesList:formPlaceholder:keyWord')"
-          />
+          <el-input v-model="listQuery.UserKeyInfo" style="width: 200px" class="mr" clearable
+            :placeholder="$t('trials:sitesList:formPlaceholder:keyWord')" />
        </el-form-item>
        <!-- 状态 -->
        <el-form-item :label="$t('trials:sitesList:table:status')">
          <el-select v-model="listQuery.IsDeleted" clearable class="mr">
-            <el-option
-              v-for="item of $d.IsSiteDisable"
-              :key="item.label"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item of $d.IsSiteDisable" :key="item.label" :label="item.label" :value="item.value" />
          </el-select>
        </el-form-item>
        <el-form-item>
@@ -41,120 +31,60 @@
            {{ $t("common:button:search") }}
          </el-button>
          <!-- 重置 -->
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
            {{ $t("common:button:reset") }}
          </el-button>
          <!-- 中心调研 -->
-          <el-button
-            v-hasPermi="[
-              'trials:trials-panel:setting:personnel-manage:questionnaire-record',
-            ]"
-            type="primary"
-            icon="el-icon-info"
-            @click="handleResearchList"
-          >
+          <el-button v-hasPermi="[
+            'trials:trials-panel:setting:personnel-manage:questionnaire-record',
+          ]" type="primary" icon="el-icon-info" @click="handleResearchList">
            {{ $t("trials:sitesList:button:siteResearch") }}
          </el-button>
          <!-- 添加中心 -->
-          <el-button
-            v-hasPermi="[
-              'trials:trials-panel:setting:personnel-manage:add-site',
-            ]"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleAdd"
-          >
+          <el-button v-hasPermi="[
+            'trials:trials-panel:setting:personnel-manage:add-site',
+          ]" type="primary" icon="el-icon-plus" @click="handleAdd">
            {{ $t("trials:sitesList:dialogTitle:assignSite") }}
          </el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-download"
-            :disabled="list.length === 0"
-            @click="handleResearchListExport"
-          >
+          <el-button type="primary" icon="el-icon-download" :disabled="list.length === 0"
+            @click="handleResearchListExport">
            {{ $t("common:button:export") }}
          </el-button>
          <!-- 下载模板 -->
-          <el-button
-            type="primary"
-            icon="el-icon-download"
-            @click="handleDownload"
-          >
+          <el-button type="primary" icon="el-icon-download" @click="handleDownload">
            {{ $t("common:button:downloadTpl") }}
          </el-button>
-          <el-button
-            v-hasPermi="[
-              'trials:trials-panel:setting:personnel-manage:add-site',
-            ]"
-            type="primary"
-            icon="el-icon-upload2"
-            @click="handleUpload"
-          >
+          <el-button v-hasPermi="[
+            'trials:trials-panel:setting:personnel-manage:add-site',
+          ]" type="primary" icon="el-icon-upload2" @click="handleUpload">
            {{ $t("common:button:upload") }}
          </el-button>
        </el-form-item>
      </el-form>
    </div>
-    <el-table
-      v-loading="listLoading"
-      :data="list"
-      stripe
-      @sort-change="handleSortByColumn"
-    >
+    <el-table v-loading="listLoading" :data="list" stripe @sort-change="handleSortByColumn">
      <el-table-column type="index" width="50" />
      <!-- 中心编号 -->
-      <el-table-column
-        prop="TrialSiteCode"
-        :label="$t('trials:sitesList:table:siteId')"
-        show-overflow-tooltip
-        sortable="custom"
-        width="120"
-      >
+      <el-table-column prop="TrialSiteCode" :label="$t('trials:sitesList:table:siteId')" show-overflow-tooltip
+        sortable="custom" width="120">
        <template slot-scope="scope">
          <span v-if="!!scope.row.TrialSiteCode">{{
            scope.row.TrialSiteCode
          }}</span>
-          <i
-            v-else
-            class="el-icon-warning"
-            style="color: #f44336; font-size: 14px"
-          />
+          <i v-else class="el-icon-warning" style="color: #f44336; font-size: 14px" />
        </template>
      </el-table-column>
      <!-- 中心名称 -->
-      <el-table-column
-        prop="TrialSiteName"
-        :label="$t('trials:sitesList:table:siteName')"
-        show-overflow-tooltip
-        sortable="custom"
-        min-width="120"
-      />
+      <el-table-column prop="TrialSiteName" :label="$t('trials:sitesList:table:siteName')" show-overflow-tooltip
+        sortable="custom" min-width="120" />
      <!-- 中心别名 -->
-      <el-table-column
-        prop="TrialSiteAliasName"
-        :label="$t('trials:sitesList:table:siteAliasName')"
-        show-overflow-tooltip
-        sortable="custom"
-        min-width="120"
-      />
+      <el-table-column prop="TrialSiteAliasName" :label="$t('trials:sitesList:table:siteAliasName')"
+        show-overflow-tooltip sortable="custom" min-width="120" />
      <!-- 参与者 -->
-      <el-table-column
-        prop="UserNameList"
-        :label="$t('trials:sitesList:table:staff')"
-        show-overflow-tooltip
-        min-width="100"
-      >
+      <el-table-column prop="UserNameList" :label="$t('trials:sitesList:table:staff')" show-overflow-tooltip
+        min-width="100">
        <template slot-scope="scope">
-          <el-button
-            v-if="scope.row.UserCount > 0"
-            size="small"
-            type="text"
-            @click="getCrcList(scope.row)"
-          >
+          <el-button v-if="scope.row.UserCount > 0" size="small" type="text" @click="getCrcList(scope.row)">
            {{
              scope.row.UserNameList.length > 0
                ? scope.row.UserNameList.join(", ")
@@ -164,29 +94,14 @@
        </template>
      </el-table-column>
      <!-- Subjects -->
-      <el-table-column
-        prop="SubjectCount"
-        min-width="100"
-        :label="$t('trials:site:table:subjects')"
-        show-overflow-tooltip
-        sortable="custom"
-      />
+      <el-table-column prop="SubjectCount" min-width="100" :label="$t('trials:site:table:subjects')"
+        show-overflow-tooltip sortable="custom" />
      <!-- Visits -->
-      <el-table-column
-        prop="VisitCount"
-        min-width="100"
-        :label="$t('trials:site:table:visits')"
-        show-overflow-tooltip
-        sortable="custom"
-      />
+      <el-table-column prop="VisitCount" min-width="100" :label="$t('trials:site:table:visits')" show-overflow-tooltip
+        sortable="custom" />
      <!-- 状态 -->
-      <el-table-column
-        prop="IsDeleted"
-        :label="$t('trials:sitesList:table:status')"
-        show-overflow-tooltip
-        sortable
-        min-width="100"
-      >
+      <el-table-column prop="IsDeleted" :label="$t('trials:sitesList:table:status')" show-overflow-tooltip sortable
+        min-width="100">
        <template slot-scope="scope">
          <el-tag v-if="scope.row.IsDeleted" type="danger">{{
            $fd("IsSiteDisable", scope.row.IsDeleted)
@@ -196,53 +111,45 @@
          }}</el-tag>
        </template>
      </el-table-column>
-      <!-- 授权时间 -->
-      <el-table-column
-        prop="EnabledTime"
-        :label="$t('trials:sitesList:table:timeAdded')"
-        show-overflow-tooltip
-        sortable
-        min-width="150"
-      />
-      <el-table-column
-        v-if="
-          hasPermi([
-            'trials:trials-panel:setting:personnel-manage:edit-site',
-            'trials:trials-panel:setting:personnel-manage:remove-site',
-          ])
-        "
-        :label="$t('common:action:action')"
-        min-width="120"
-      >
+      <!-- DICOM AE -->
+      <el-table-column prop="CallingAEList" :label="$t('trials:sitesList:table:AE')" show-overflow-tooltip sortable
+        min-width="100">
        <template slot-scope="scope">
-          <el-button
-            circle
-            :title="$t('trials:sitesList:action:assign')"
-            icon="el-icon-user"
-            :disabled="scope.row.IsDeleted"
-            @click="getCrcList(scope.row)"
-          />
+          <el-button v-if="scope.row.CallingAEList.length > 0" size="small" type="text"
+            @click="handleConfig(scope.row, 'view')">
+            {{
+              scope.row.CallingAEList.length > 0
+                ? scope.row.CallingAEList.join(", ")
+                : ""
+            }}
+          </el-button>
+        </template>
+      </el-table-column>
+      <!-- 授权时间 -->
+      <el-table-column prop="EnabledTime" :label="$t('trials:sitesList:table:timeAdded')" show-overflow-tooltip sortable
+        min-width="150" />
+      <el-table-column v-if="
+        hasPermi([
+          'trials:trials-panel:setting:personnel-manage:edit-site',
+          'trials:trials-panel:setting:personnel-manage:remove-site',
+        ])
+      " :label="$t('common:action:action')" min-width="120">
+        <template slot-scope="scope">
+          <el-button circle :title="$t('trials:sitesList:action:assign')" icon="el-icon-user"
+            :disabled="scope.row.IsDeleted" @click="getCrcList(scope.row)" />

          <!-- Edit -->
-          <el-button
-            v-hasPermi="[
-              'trials:trials-panel:setting:personnel-manage:edit-site',
-            ]"
-            circle
-            :title="$t('common:button:edit')"
-            icon="el-icon-edit-outline"
-            @click="handleEdit(scope.row)"
-          />
+          <el-button v-hasPermi="[
+            'trials:trials-panel:setting:personnel-manage:edit-site',
+          ]" circle :title="$t('common:button:edit')" icon="el-icon-edit-outline" @click="handleEdit(scope.row)" />
+          <el-button circle :title="$t('common:button:config')" icon="el-icon-setting"
+            @click="handleConfig(scope.row, 'add')" />
        </template>
      </el-table-column>
    </el-table>
    <div class="pagination" style="text-align: right">
-      <pagination
-        :total="total"
-        :page.sync="listQuery.PageIndex"
-        :limit.sync="listQuery.PageSize"
-        @pagination="getList"
-      />
+      <pagination :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize"
+        @pagination="getList" />
    </div>

    <!-- 给site分配crc -->
@@ -255,66 +162,31 @@
    <!-- 修改site信息 -->
    <base-model v-if="edit_model.visible" :config="edit_model">
      <template slot="dialog-body">
-        <el-form
-          ref="editForm"
-          :model="form"
-          label-width="100px"
-          :rules="rules"
-        >
+        <el-form ref="editForm" :model="form" label-width="100px" :rules="rules">
          <!-- 中心编号 -->
-          <el-form-item
-            :label="$t('trials:sitesList:table:siteId')"
-            prop="TrialSiteCode"
-          >
+          <el-form-item :label="$t('trials:sitesList:table:siteId')" prop="TrialSiteCode">
            <el-input v-model="form.TrialSiteCode" />
          </el-form-item>
          <!-- 中心名称 -->
-          <el-form-item
-            :label="$t('trials:sitesList:table:siteName')"
-            prop="TrialSiteName"
-          >
-            <el-autocomplete
-              clearable
-              class="inline-input"
-              style="width: 100%"
-              v-model="form.TrialSiteName"
-              :fetch-suggestions="querySearch"
-              @select="handleSelect"
-              placeholder=""
-            ></el-autocomplete>
+          <el-form-item :label="$t('trials:sitesList:table:siteName')" prop="TrialSiteName">
+            <el-autocomplete clearable class="inline-input" style="width: 100%" v-model="form.TrialSiteName"
+              :fetch-suggestions="querySearch" @select="handleSelect" placeholder=""></el-autocomplete>
          </el-form-item>
          <!-- 中心别称 -->
-          <el-form-item
-            :label="$t('trials:sitesList:table:siteAliasName')"
-            prop="TrialSiteAliasName"
-          >
+          <el-form-item :label="$t('trials:sitesList:table:siteAliasName')" prop="TrialSiteAliasName">
            <el-input v-model="form.TrialSiteAliasName" />
          </el-form-item>
          <!-- 状态 -->
          <el-form-item :label="$t('trials:sitesList:table:status')">
-            <el-switch
-              v-model="form.IsDeleted"
-              :active-value="false"
-              :inactive-value="true"
-            />
+            <el-switch v-model="form.IsDeleted" :active-value="false" :inactive-value="true" />
          </el-form-item>
        </el-form>
      </template>
      <template slot="dialog-footer">
-        <el-button
-          type="primary"
-          size="small"
-          :disabled="saveBtnLoading"
-          @click="edit_model.visible = false"
-        >
+        <el-button type="primary" size="small" :disabled="saveBtnLoading" @click="edit_model.visible = false">
          {{ $t("common:button:cancel") }}
        </el-button>
-        <el-button
-          type="primary"
-          size="small"
-          :loading="saveBtnLoading"
-          @click="handleUpdateSiteID"
-        >
+        <el-button type="primary" size="small" :loading="saveBtnLoading" @click="handleUpdateSiteID">
          {{ $t("common:button:save") }}
        </el-button>
      </template>
@@ -325,29 +197,14 @@
      <template slot="dialog-body">
        <span>{{ $t("trials:internalStaff:table:status") }}:</span>
        <el-radio-group v-model="staffStatus">
-          <el-radio
-            v-for="item of $d.IsUserExitTrial"
-            :key="item.label"
-            :label="item.value"
-            >{{ item.label }}</el-radio
-          >
+          <el-radio v-for="item of $d.IsUserExitTrial" :key="item.label" :label="item.value">{{ item.label }}</el-radio>
        </el-radio-group>
      </template>
      <template slot="dialog-footer">
-        <el-button
-          :disabled="btnLoading"
-          size="small"
-          type="primary"
-          @click="status_model.visible = false"
-        >
+        <el-button :disabled="btnLoading" size="small" type="primary" @click="status_model.visible = false">
          {{ $t("common:button:cancel") }}
        </el-button>
-        <el-button
-          size="small"
-          type="primary"
-          :loading="btnLoading"
-          @click="saveStatus"
-        >
+        <el-button size="small" type="primary" :loading="btnLoading" @click="saveStatus">
          {{ $t("common:button:save") }}
        </el-button>
      </template>
@@ -357,72 +214,33 @@
    <base-model v-if="siteOfcrc_model.visible" :config="siteOfcrc_model">
      <template slot="dialog-body">
        <div style="text-align: right">
-          <el-button
-            v-hasPermi="[
-              'trials:trials-panel:setting:personnel-manage:assign-staff',
-            ]"
-            type="primary"
-            icon="el-icon-plus"
-            size="small"
-            @click="crc_model.visible = true"
-          >
+          <el-button v-hasPermi="[
+            'trials:trials-panel:setting:personnel-manage:assign-staff',
+          ]" type="primary" icon="el-icon-plus" size="small" @click="crc_model.visible = true">
            {{ $t("common:button:add") }}
          </el-button>
        </div>
-        <el-table
-          v-loading="userListLoading"
-          :data="userList"
-          height="400"
-          size="small"
-        >
+        <el-table v-loading="userListLoading" :data="userList" height="400" size="small">
          <!-- 姓名 -->
-          <el-table-column
-            prop="UserRealName"
-            :label="$t('trials:internalStaff:table:name')"
-            width="100"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="UserRealName" :label="$t('trials:internalStaff:table:name')" width="100"
+            show-overflow-tooltip />
          <!-- 用户名 -->
-          <el-table-column
-            prop="UserName"
-            :label="$t('trials:internalStaff:table:uid')"
-            min-width="100"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="UserName" :label="$t('trials:internalStaff:table:uid')" min-width="100"
+            show-overflow-tooltip />
          <!-- 用户类型 -->
-          <el-table-column
-            prop="UserType"
-            :label="$t('trials:internalStaff:table:userType')"
-            width="100"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="UserType" :label="$t('trials:internalStaff:table:userType')" width="100"
+            show-overflow-tooltip />
          <!-- 电话 -->
-          <el-table-column
-            prop="Phone"
-            :label="$t('trials:internalStaff:table:phone')"
-            show-overflow-tooltip
-            width="100"
-          />
+          <el-table-column prop="Phone" :label="$t('trials:internalStaff:table:phone')" show-overflow-tooltip
+            width="100" />
          <!-- 邮箱 -->
-          <el-table-column
-            prop="EMail"
-            :label="$t('trials:internalStaff:table:email')"
-            show-overflow-tooltip
-            width="100"
-          />
+          <el-table-column prop="EMail" :label="$t('trials:internalStaff:table:email')" show-overflow-tooltip
+            width="100" />
          <!-- 单位 -->
-          <el-table-column
-            prop="OrganizationName"
-            :label="$t('trials:internalStaff:table:organization')"
-            width="100"
-          />
+          <el-table-column prop="OrganizationName" :label="$t('trials:internalStaff:table:organization')" width="100" />
          <!-- 状态 -->
-          <el-table-column
-            prop="IsDeleted"
-            :label="$t('trials:internalStaff:table:status')"
-            show-overflow-tooltip
-            width="100"
-          >
+          <el-table-column prop="IsDeleted" :label="$t('trials:internalStaff:table:status')" show-overflow-tooltip
+            width="100">
            <template slot-scope="scope">
              <el-tag v-if="scope.row.IsDeleted" type="danger">{{
                $fd("IsUserExitTrial", scope.row.IsDeleted)
@@ -432,37 +250,18 @@
              }}</el-tag>
            </template>
          </el-table-column>
-          <el-table-column
-            prop="CreateTime"
-            :label="$t('trials:internalStaff:table:authorizationTime')"
-            show-overflow-tooltip
-            sortable="custom"
-            width="210"
-          />
-          <el-table-column
-            prop="DeletedTime"
-            :label="$t('trials:internalStaff:table:disableTime')"
-            show-overflow-tooltip
-            sortable
-            width="210"
-          />
-          <el-table-column
-            v-hasPermi="[
-              'trials:trials-panel:setting:personnel-manage:assign-staff',
-            ]"
-            :label="$t('common:action:action')"
-            width="100"
-          >
+          <el-table-column prop="CreateTime" :label="$t('trials:internalStaff:table:authorizationTime')"
+            show-overflow-tooltip sortable="custom" width="210" />
+          <el-table-column prop="DeletedTime" :label="$t('trials:internalStaff:table:disableTime')"
+            show-overflow-tooltip sortable width="210" />
+          <el-table-column v-hasPermi="[
+            'trials:trials-panel:setting:personnel-manage:assign-staff',
+          ]" :label="$t('common:action:action')" width="100">
            <template slot-scope="scope">
-              <el-button
-                v-hasPermi="[
-                  'trials:trials-panel:setting:personnel-manage:assign-staff',
-                ]"
-                circle
-                :title="$t('trials:internalStaff:action:status')"
-                icon="el-icon-edit-outline"
-                @click="handleStatus(scope.row)"
-              />
+              <el-button v-hasPermi="[
+                'trials:trials-panel:setting:personnel-manage:assign-staff',
+              ]" circle :title="$t('trials:internalStaff:action:status')" icon="el-icon-edit-outline"
+                @click="handleStatus(scope.row)" />
            </template>
          </el-table-column>
        </el-table>
@@ -471,12 +270,11 @@
    <!-- 导入 -->
    <base-model v-if="upload_model.visible" :config="upload_model">
      <template slot="dialog-body">
-        <UploadExcel
-          @closeDialog="upload_model.visible = false"
-          @getList="getList"
-        />
+        <UploadExcel @closeDialog="upload_model.visible = false" @getList="getList" />
      </template>
    </base-model>
+    <!--dicom AE-->
+    <dicomAEList ref="dicomAEList" @getList="getList" />
  </div>
 </template>
 <script>
@@ -496,6 +294,7 @@ import CRCForm from "./crcForm";
 import BaseModel from "@/components/BaseModel";
 import UploadExcel from "./uploadExcel";
 import moment from "moment";
+import dicomAEList from "./dicomAEList.vue";
 const getListQueryDefault = () => {
  return {
    UserKeyInfo: "",
@@ -511,7 +310,7 @@ const getListQueryDefault = () => {
 };
 export default {
  name: "Participant",
-  components: { Pagination, CRCForm, BaseModel, UploadExcel },
+  components: { Pagination, CRCForm, BaseModel, UploadExcel, dicomAEList },
  data() {
    return {
      list: [],
@@ -610,6 +409,10 @@ export default {
    this.getTrialSiteSelectList();
  },
  methods: {
+    // 打开DICOMAE配置列表
+    handleConfig(row, status) {
+      this.$refs.dicomAEList.open(row, status);
+    },
    handleSelect(item) {
      this.form.TrialSiteName = item.SiteName;
      this.form.TrialSiteAliasName = item.AliasName
@@ -891,19 +694,23 @@ export default {
  .filter-box {
    display: flex;
    padding: 5px;
+
    .base-search-form {
      .el-form-item {
        margin-bottom: 0px;
      }
    }
+
    .mr {
      margin-right: 5px;
      width: 120px;
    }
  }
+
  .el-dialog__header {
    padding: 10px;
  }
+
  .el-dialog__body {
    padding: 10px;
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
wangxiaoshuang	e51e7d0e66	pacs continuous-integration/drone/push Build is passing Details	2024-07-17 10:09:26 +08:00
wangxiaoshuang	7f36aa5a05	中心调查表链接添加二维码 continuous-integration/drone/push Build is passing Details	2024-07-15 15:52:47 +08:00
wangxiaoshuang	e45903d55e	重阅跟踪添加国际化 continuous-integration/drone/push Build is passing Details	2024-07-12 10:25:46 +08:00
wangxiaoshuang	02e82bba33	1 continuous-integration/drone/push Build is passing Details	2024-07-10 10:55:56 +08:00
wangxiaoshuang	3d3e6a3db0	Merge branch 'uat' continuous-integration/drone/push Build is passing Details # Conflicts: # src/views/login/index.vue	2024-07-10 09:53:28 +08:00
wangxiaoshuang	6e2b7cb76a	usa环境logo变更 continuous-integration/drone/push Build is passing Details	2024-07-10 09:07:03 +08:00
wangxiaoshuang	ca2ed72a6f	usa更换logo continuous-integration/drone/push Build is passing Details	2024-07-09 17:17:53 +08:00
wangxiaoshuang	c2e2f65434	项目配置增加diicomAE配置 continuous-integration/drone/push Build is passing Details	2024-07-09 16:40:07 +08:00
caiyiling	d2fc9ad981	提交调研表逻辑更改 continuous-integration/drone/push Build is passing Details	2024-07-09 16:27:33 +08:00
caiyiling	c2083e9c9c	Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main continuous-integration/drone/push Build is passing Details	2024-07-08 17:45:35 +08:00
caiyiling	d118f6461f	1	2024-07-08 17:45:26 +08:00
wangxiaoshuang	13d968c5b9	中心配置中心添加dicomAE continuous-integration/drone/push Build is passing Details	2024-07-08 16:56:40 +08:00
wangxiaoshuang	65f0af06ad	Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web continuous-integration/drone/push Build is passing Details	2024-07-08 13:55:15 +08:00
wangxiaoshuang	49a93d0188	管理后台角色添加国际化	2024-07-08 13:55:05 +08:00
caiyiling	de832afac8	Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main continuous-integration/drone/push Build is passing Details	2024-07-08 13:13:19 +08:00
caiyiling	c4381a0eb2	中心调研表样式更改	2024-07-08 13:12:22 +08:00
wangxiaoshuang	17c796bd53	管理平台菜单页新增国际化 continuous-integration/drone/push Build is passing Details	2024-07-08 11:43:26 +08:00
caiyiling	9ce1e569eb	样式调整 continuous-integration/drone/push Build is passing Details	2024-07-05 16:10:55 +08:00
caiyiling	8b48f5fe2e	样式调整 continuous-integration/drone/push Build is passing Details	2024-07-05 16:05:59 +08:00
caiyiling	98af1e7540	1 continuous-integration/drone/push Build is passing Details	2024-07-05 15:57:40 +08:00
caiyiling	ed027781c4	表单样式调整 continuous-integration/drone/push Build is running Details	2024-07-05 15:53:01 +08:00
caiyiling	dd20a93523	表单样式调整 continuous-integration/drone/push Build is running Details	2024-07-05 15:49:50 +08:00
caiyiling	ba5e9f82b7	移动端调研表操作功能添加权限控制 continuous-integration/drone/push Build is passing Details	2024-07-05 15:40:26 +08:00
caiyiling	5af5954f2a	表单样式调整 continuous-integration/drone/push Build is passing Details	2024-07-05 15:36:19 +08:00
caiyiling	9e1dbda53c	国际化补充 continuous-integration/drone/push Build is passing Details	2024-07-05 15:08:44 +08:00
caiyiling	3aa521229f	中心调研表登录页面优化 continuous-integration/drone/push Build is running Details	2024-07-05 15:07:07 +08:00
caiyiling	cd1735eae8	Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main continuous-integration/drone/push Build is passing Details	2024-07-05 15:00:06 +08:00
caiyiling	29dfe79acd	中心调研表功能完善	2024-07-05 14:59:05 +08:00
wangxiaoshuang	885af6d195	国际化修改 continuous-integration/drone/push Build is passing Details	2024-07-05 14:38:40 +08:00
wangxiaoshuang	98fe1f0365	下载功能暂时屏蔽 continuous-integration/drone/push Build is passing Details	2024-07-05 11:39:29 +08:00
wangxiaoshuang	74e86cbdbe	Merge branch 'uat' continuous-integration/drone/push Build is passing Details # Conflicts: # src/views/login/index.vue	2024-07-05 10:21:53 +08:00
wangxiaoshuang	6b06d2a5f0	Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web continuous-integration/drone/push Build is failing Details	2024-07-05 09:09:53 +08:00
wangxiaoshuang	6250e957f0	上传方式修改	2024-07-05 09:09:40 +08:00
caiyiling	9cb9478848	Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main continuous-integration/drone/push Build is passing Details	2024-07-04 18:01:04 +08:00
caiyiling	bd9ecf13e9	调研表布局调整	2024-07-04 18:00:47 +08:00
wangxiaoshuang	fe67ef0189	浏览器推荐版本更改 continuous-integration/drone/push Build is running Details	2024-07-04 18:00:22 +08:00
caiyiling	7283c5a5a1	中心调研登录跳转 continuous-integration/drone/push Build is passing Details	2024-07-04 17:33:22 +08:00
caiyiling	4d224c115d	根据用户访问设备跳转不同的中心调研表登录页面 continuous-integration/drone/push Build is running Details	2024-07-04 17:28:27 +08:00
caiyiling	b717530ae3	中心调研表移动端页面布局调整 continuous-integration/drone/push Build is passing Details	2024-07-04 17:14:34 +08:00
caiyiling	66e5380fce	Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main continuous-integration/drone/push Build is passing Details	2024-07-04 11:45:23 +08:00
wangxiaoshuang	9f73ae7e31	1 continuous-integration/drone/push Build is running Details	2024-07-04 11:45:10 +08:00
caiyiling	8876d24054	阅片页面功能优化	2024-07-04 11:45:03 +08:00
wangxiaoshuang	d5084e411b	浏览器推荐版本弹框 continuous-integration/drone/push Build is passing Details	2024-07-03 14:26:34 +08:00
wangxiaoshuang	cf7c7cbbc1	Merge branch 'uat' continuous-integration/drone/push Build is passing Details # Conflicts: # src/views/login/index.vue # src/views/trials/trials-layout/components/trialsNavbar.vue # src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue # src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue # src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue	2024-07-03 13:29:35 +08:00
wangxiaoshuang	ac272d1e94	版本推荐列表字段修改 continuous-integration/drone/push Build is failing Details	2024-07-03 10:00:14 +08:00
wangxiaoshuang	6a59ed80e2	1 continuous-integration/drone/push Build is failing Details	2024-07-02 15:57:15 +08:00
wangxiaoshuang	d0cefb09df	推荐版本记录删除	2024-07-02 14:42:05 +08:00
wangxiaoshuang	4c241b9acd	管理后台新增浏览器版本推荐 continuous-integration/drone/push Build is failing Details	2024-07-02 14:40:24 +08:00
wangxiaoshuang	e265b0c2af	pm新增的部位，支持编辑 continuous-integration/drone/push Build is failing Details	2024-07-01 15:12:38 +08:00
wangxiaoshuang	2f549846ba	临床数据上传列表添加文件大小字段 continuous-integration/drone/push Build is passing Details	2024-07-01 14:07:40 +08:00
wangxiaoshuang	d9f10055aa	邮箱管理发件邮箱配置清除默认值 continuous-integration/drone/push Build is passing Details	2024-07-01 11:06:47 +08:00
wangxiaoshuang	19c2c4eecb	影像上传不记入用户锁定和用户退出 continuous-integration/drone/push Build is passing Details	2024-07-01 11:01:33 +08:00
wangxiaoshuang	b3bff41d35	系统标准配置全局阅片、肿瘤学阅片时，没有字段 continuous-integration/drone/push Build is passing Details	2024-06-28 16:05:03 +08:00
wangxiaoshuang	0eb1289cf0	Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web continuous-integration/drone/push Build is passing Details	2024-06-28 15:58:50 +08:00
wangxiaoshuang	5048f040cc	zyss、zybs去除我的项目tab	2024-06-28 15:58:39 +08:00
caiyiling	62d7315401	Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main continuous-integration/drone/push Build is passing Details	2024-06-28 15:40:28 +08:00
caiyiling	13b083d2df	阅片页面添加多帧影像标记渲染	2024-06-28 15:39:30 +08:00
wangxiaoshuang	712d2cc89b	自定义独立阅片人的证书pdf浏览方式修改为pdfjs continuous-integration/drone/push Build is passing Details	2024-06-28 15:33:09 +08:00
wangxiaoshuang	9795f89ce9	定时锁定功能问题修复 continuous-integration/drone/push Build is passing Details	2024-06-28 15:21:18 +08:00
wangxiaoshuang	4eb9c2ff85	定时锁定功能问题修复 continuous-integration/drone/push Build is passing Details	2024-06-28 15:10:50 +08:00
wangxiaoshuang	d5f1ecbb04	定时锁定功能问题修复 continuous-integration/drone/push Build is running Details	2024-06-28 15:08:19 +08:00
wangxiaoshuang	a53fc5478b	临床数据上传流程优化	2024-06-28 15:07:57 +08:00
caiyiling	3ab5c46455	签署文档优化 continuous-integration/drone/push Build is passing Details	2024-06-28 11:38:23 +08:00
caiyiling	c37332e8e2	CRC回复影像质疑，增加自动进入下一任务 continuous-integration/drone/push Build is passing Details	2024-06-28 10:31:49 +08:00
caiyiling	79cc39918e	Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main continuous-integration/drone/push Build is passing Details	2024-06-27 16:43:32 +08:00
caiyiling	ccac950bcf	医学反馈bug修复	2024-06-27 16:43:01 +08:00
wangxiaoshuang	e0b095ebc9	登录页版本信息改为后端获取 continuous-integration/drone/push Build is running Details	2024-06-27 16:41:46 +08:00
wangxiaoshuang	898f6ed8f7	Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web continuous-integration/drone/push Build is passing Details	2024-06-27 16:25:23 +08:00
wangxiaoshuang	ced1be74b3	国家化新增模块、迭代字段，提供批量更新	2024-06-27 16:25:18 +08:00
caiyiling	e6926382fd	IR医学反馈添加自动跳转下一任务 continuous-integration/drone/push Build is passing Details	2024-06-27 16:17:05 +08:00
wangxiaoshuang	59f27b9d35	版本记录字段顺序调整 continuous-integration/drone/push Build is passing Details	2024-06-27 15:22:22 +08:00
wangxiaoshuang	12449e0ca0	版本记录新增发布状态和是否当前版本字段 continuous-integration/drone/push Build is passing Details	2024-06-27 15:16:48 +08:00
wangxiaoshuang	3b745051eb	临床数据、IQC问题、医学问题国际化问题修改 continuous-integration/drone/push Build is passing Details	2024-06-27 14:02:01 +08:00
wangxiaoshuang	81c21c995d	usa环境软件名称变更图片 continuous-integration/drone/push Build is passing Details	2024-06-27 13:21:03 +08:00
wangxiaoshuang	a2ffa87056	软件名称变更图片测试 continuous-integration/drone/push Build is passing Details	2024-06-27 09:44:13 +08:00