样式调整

Merge branch 'uat' of https://gitea.frp.extimaging.com/XCKJ/irc_web into uat
样式调整
2024-08-02 14:41:27 +08:00 · 2024-08-02 14:19:27 +08:00 · 2024-08-02 14:19:15 +08:00 · 2024-08-02 14:17:29 +08:00 · 2024-08-02 14:17:17 +08:00 · 2024-08-02 14:10:11 +08:00
105 changed files with 2973 additions and 9218 deletions
@@ -2,7 +2,7 @@
 ENV = 'usa'
 NODE_ENV = 'usa'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-12/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-30/'

 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
@@ -2,7 +2,7 @@
 ENV = 'usa'
 NODE_ENV = 'usa'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-11/'
+VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-30/'

 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
@@ -19,7 +19,6 @@
      "version": "2.2.1",
      "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.1.tgz",
      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
-      "dev": true,
      "requires": {
        "@jridgewell/gen-mapping": "^0.3.0",
        "@jridgewell/trace-mapping": "^0.3.9"
@@ -29,7 +28,6 @@
      "version": "7.23.5",
      "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.23.5.tgz",
      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
-      "dev": true,
      "requires": {
        "@babel/highlight": "^7.23.4",
        "chalk": "^2.4.2"
@@ -38,14 +36,12 @@
    "@babel/compat-data": {
      "version": "7.23.5",
      "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.23.5.tgz",
-      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
-      "dev": true
+      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw=="
    },
    "@babel/core": {
      "version": "7.23.6",
      "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.23.6.tgz",
      "integrity": "sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==",
-      "dev": true,
      "requires": {
        "@ampproject/remapping": "^2.2.0",
        "@babel/code-frame": "^7.23.5",
@@ -67,14 +63,34 @@
        "json5": {
          "version": "2.2.3",
          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
-          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-          "dev": true
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
        },
        "semver": {
          "version": "6.3.1",
          "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+        }
+      }
+    },
+    "@babel/eslint-parser": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmmirror.com/@babel/eslint-parser/-/eslint-parser-7.24.8.tgz",
+      "integrity": "sha512-nYAikI4XTGokU2QX7Jx+v4rxZKhKivaQaREZjuW3mrJrbdWJ5yUfohnoUULge+zEEaKjPYNxhoRgUKktjXtbwA==",
+      "requires": {
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.1"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
+        },
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
        }
      }
    },
@@ -82,7 +98,6 @@
      "version": "7.23.6",
      "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.23.6.tgz",
      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
-      "dev": true,
      "requires": {
        "@babel/types": "^7.23.6",
        "@jridgewell/gen-mapping": "^0.3.2",
@@ -112,7 +127,6 @@
      "version": "7.23.6",
      "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
-      "dev": true,
      "requires": {
        "@babel/compat-data": "^7.23.5",
        "@babel/helper-validator-option": "^7.23.5",
@@ -125,7 +139,6 @@
          "version": "5.1.1",
          "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz",
          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
          "requires": {
            "yallist": "^3.0.2"
          }
@@ -133,14 +146,12 @@
        "semver": {
          "version": "6.3.1",
          "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
        },
        "yallist": {
          "version": "3.1.1",
          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
        }
      }
    },
@@ -204,14 +215,12 @@
    "@babel/helper-environment-visitor": {
      "version": "7.22.20",
      "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
    },
    "@babel/helper-function-name": {
      "version": "7.23.0",
      "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dev": true,
      "requires": {
        "@babel/template": "^7.22.15",
        "@babel/types": "^7.23.0"
@@ -221,7 +230,6 @@
      "version": "7.22.5",
      "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
      "requires": {
        "@babel/types": "^7.22.5"
      }
@@ -239,7 +247,6 @@
      "version": "7.22.15",
      "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
-      "dev": true,
      "requires": {
        "@babel/types": "^7.22.15"
      }
@@ -248,7 +255,6 @@
      "version": "7.23.3",
      "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
-      "dev": true,
      "requires": {
        "@babel/helper-environment-visitor": "^7.22.20",
        "@babel/helper-module-imports": "^7.22.15",
@@ -298,7 +304,6 @@
      "version": "7.22.5",
      "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
      "requires": {
        "@babel/types": "^7.22.5"
      }
@@ -316,7 +321,6 @@
      "version": "7.22.6",
      "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
      "requires": {
        "@babel/types": "^7.22.5"
      }
@@ -324,20 +328,17 @@
    "@babel/helper-string-parser": {
      "version": "7.23.4",
      "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
-      "dev": true
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ=="
    },
    "@babel/helper-validator-identifier": {
      "version": "7.22.20",
      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-      "dev": true
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
    },
    "@babel/helper-validator-option": {
      "version": "7.23.5",
      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
-      "dev": true
+      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw=="
    },
    "@babel/helper-wrap-function": {
      "version": "7.22.20",
@@ -354,7 +355,6 @@
      "version": "7.23.6",
      "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.23.6.tgz",
      "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==",
-      "dev": true,
      "requires": {
        "@babel/template": "^7.22.15",
        "@babel/traverse": "^7.23.6",
@@ -365,7 +365,6 @@
      "version": "7.23.4",
      "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.23.4.tgz",
      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
-      "dev": true,
      "requires": {
        "@babel/helper-validator-identifier": "^7.22.20",
        "chalk": "^2.4.2",
@@ -375,8 +374,7 @@
        "js-tokens": {
          "version": "4.0.0",
          "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-          "dev": true
+          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
        }
      }
    },
@@ -1326,7 +1324,6 @@
      "version": "7.22.15",
      "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.22.15.tgz",
      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
-      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.22.13",
        "@babel/parser": "^7.22.15",
@@ -1337,7 +1334,6 @@
      "version": "7.23.6",
      "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.23.6.tgz",
      "integrity": "sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==",
-      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.23.5",
        "@babel/generator": "^7.23.6",
@@ -1354,8 +1350,7 @@
        "globals": {
          "version": "11.12.0",
          "resolved": "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
+          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
        }
      }
    },
@@ -1363,7 +1358,6 @@
      "version": "7.23.6",
      "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.23.6.tgz",
      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
-      "dev": true,
      "requires": {
        "@babel/helper-string-parser": "^7.23.4",
        "@babel/helper-validator-identifier": "^7.22.20",
@@ -1373,8 +1367,7 @@
        "to-fast-properties": {
          "version": "2.0.0",
          "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-          "dev": true
+          "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
        }
      }
    },
@@ -1581,11 +1574,15 @@
        }
      }
    },
+    "@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmmirror.com/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="
+    },
    "@jridgewell/gen-mapping": {
      "version": "0.3.3",
      "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
-      "dev": true,
      "requires": {
        "@jridgewell/set-array": "^1.0.1",
        "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -1595,31 +1592,61 @@
    "@jridgewell/resolve-uri": {
      "version": "3.1.1",
      "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
-      "dev": true
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="
    },
    "@jridgewell/set-array": {
      "version": "1.1.2",
      "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "dev": true
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
    },
    "@jridgewell/sourcemap-codec": {
      "version": "1.4.15",
      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
    },
    "@jridgewell/trace-mapping": {
      "version": "0.3.20",
      "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
-      "dev": true,
      "requires": {
        "@jridgewell/resolve-uri": "^3.1.0",
        "@jridgewell/sourcemap-codec": "^1.4.14"
      }
    },
+    "@jsdevtools/coverage-istanbul-loader": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmmirror.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz",
+      "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==",
+      "requires": {
+        "convert-source-map": "^1.7.0",
+        "istanbul-lib-instrument": "^4.0.3",
+        "loader-utils": "^2.0.0",
+        "merge-source-map": "^1.1.0",
+        "schema-utils": "^2.7.0"
+      },
+      "dependencies": {
+        "convert-source-map": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-1.9.0.tgz",
+          "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+        },
+        "json5": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
+        },
+        "loader-utils": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        }
+      }
+    },
    "@kitware/vtk.js": {
      "version": "27.3.1",
      "resolved": "https://registry.npmmirror.com/@kitware/vtk.js/-/vtk.js-27.3.1.tgz",
@@ -1718,6 +1745,25 @@
        "glob-to-regexp": "^0.3.0"
      }
    },
+    "@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmmirror.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "requires": {
+        "eslint-scope": "5.1.1"
+      },
+      "dependencies": {
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
+          }
+        }
+      }
+    },
    "@node-ipc/js-queue": {
      "version": "2.0.3",
      "resolved": "https://registry.npmmirror.com/@node-ipc/js-queue/-/js-queue-2.0.3.tgz",
@@ -2820,6 +2866,36 @@
            }
          }
        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          },
+          "dependencies": {
+            "has-flag": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+              "dev": true,
+              "optional": true
+            },
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
        "chokidar": {
          "version": "2.1.8",
          "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-2.1.8.tgz",
@@ -3054,7 +3130,6 @@
          "dev": true,
          "optional": true,
          "requires": {
-            "bindings": "^1.5.0",
            "nan": "^2.12.1"
          }
        },
@@ -3199,6 +3274,13 @@
            }
          }
        },
+        "json5": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+          "dev": true,
+          "optional": true
+        },
        "locate-path": {
          "version": "3.0.0",
          "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-3.0.0.tgz",
@@ -3442,6 +3524,32 @@
          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
          "dev": true
        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.8.3",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          },
+          "dependencies": {
+            "loader-utils": {
+              "version": "2.0.4",
+              "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+              "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+              }
+            }
+          }
+        },
        "webpack-dev-middleware": {
          "version": "3.7.3",
          "resolved": "https://registry.npmmirror.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz",
@@ -5072,16 +5180,6 @@
      "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
    },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
    "bl": {
      "version": "4.1.0",
      "resolved": "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz",
@@ -5365,7 +5463,6 @@
      "version": "4.22.2",
      "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.22.2.tgz",
      "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
-      "dev": true,
      "requires": {
        "caniuse-lite": "^1.0.30001565",
        "electron-to-chromium": "^1.4.601",
@@ -5645,8 +5742,7 @@
    "caniuse-lite": {
      "version": "1.0.30001568",
      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001568.tgz",
-      "integrity": "sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A==",
-      "dev": true
+      "integrity": "sha512-vSUkH84HontZJ88MiNrOau1EBrCqEQYgkC5gIySiDlpsm8sGVrhU7Kx4V6h0tnqaHzIHZv08HlJIwPbL4XL9+A=="
    },
    "case-sensitive-paths-webpack-plugin": {
      "version": "2.4.0",
@@ -6407,8 +6503,7 @@
    "convert-source-map": {
      "version": "2.0.0",
      "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
    },
    "cookie": {
      "version": "0.5.0",
@@ -6518,12 +6613,32 @@
      }
    },
    "cornerstone-wado-image-loader": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmmirror.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-3.3.2.tgz",
-      "integrity": "sha512-Yy0DtfSMlflMS5RMQhX9YnXiYYkZz99nnXG2qtBRvzvSdwqiElIpE13sKw0Ohi4mqNwrWRx0xt8utk0HKnAXyw==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmmirror.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-4.13.2.tgz",
+      "integrity": "sha512-NGqH44bY1VMY8OYuVykkLriNtZQrmoZU/S6f/1t1xX3rMc+WUMNN+yi4Nu3jp6nckLdH/bVGiigoJXrp0dTrAg==",
      "requires": {
-        "dicom-parser": "^1.8.3",
-        "pako": "^1.0.10"
+        "@babel/eslint-parser": "^7.19.1",
+        "@cornerstonejs/codec-charls": "^1.2.3",
+        "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
+        "@cornerstonejs/codec-openjpeg": "^1.2.2",
+        "@cornerstonejs/codec-openjph": "^2.4.2",
+        "coverage-istanbul-loader": "^3.0.5",
+        "date-format": "^4.0.14",
+        "dicom-parser": "^1.8.9",
+        "pako": "^2.0.4",
+        "uuid": "^9.0.0"
+      },
+      "dependencies": {
+        "pako": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmmirror.com/pako/-/pako-2.1.0.tgz",
+          "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug=="
+        },
+        "uuid": {
+          "version": "9.0.1",
+          "resolved": "https://registry.npmmirror.com/uuid/-/uuid-9.0.1.tgz",
+          "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
+        }
      }
    },
    "cosmiconfig": {
@@ -6550,6 +6665,14 @@
        }
      }
    },
+    "coverage-istanbul-loader": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmmirror.com/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz",
+      "integrity": "sha512-xsw2phF0VNqUPk47V/vHXkdcTyl0tkMSmaZfLrTOhoPhPMXFelNju7utl5s7I93KXzipqDEK0YwofQSSflPz8A==",
+      "requires": {
+        "@jsdevtools/coverage-istanbul-loader": "3.0.5"
+      }
+    },
    "crc-32": {
      "version": "1.2.2",
      "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
@@ -7043,6 +7166,11 @@
      "resolved": "https://registry.npmmirror.com/date-fns/-/date-fns-1.30.1.tgz",
      "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="
    },
+    "date-format": {
+      "version": "4.0.14",
+      "resolved": "https://registry.npmmirror.com/date-format/-/date-format-4.0.14.tgz",
+      "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg=="
+    },
    "dateformat": {
      "version": "2.2.0",
      "resolved": "https://registry.npmmirror.com/dateformat/-/dateformat-2.2.0.tgz",
@@ -7555,8 +7683,7 @@
    "electron-to-chromium": {
      "version": "1.4.611",
      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.611.tgz",
-      "integrity": "sha512-ZtRpDxrjHapOwxtv+nuth5ByB8clyn8crVynmRNGO3wG3LOp8RTcyZDqwaI6Ng6y8FCK2hVZmJoqwCskKbNMaw==",
-      "dev": true
+      "integrity": "sha512-ZtRpDxrjHapOwxtv+nuth5ByB8clyn8crVynmRNGO3wG3LOp8RTcyZDqwaI6Ng6y8FCK2hVZmJoqwCskKbNMaw=="
    },
    "elegant-spinner": {
      "version": "1.0.1",
@@ -7763,8 +7890,7 @@
    "escalade": {
      "version": "3.1.1",
      "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
    },
    "escape-html": {
      "version": "1.0.3",
@@ -8027,7 +8153,6 @@
      "version": "4.3.0",
      "resolved": "https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz",
      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
      "requires": {
        "estraverse": "^5.2.0"
      },
@@ -8035,16 +8160,14 @@
        "estraverse": {
          "version": "5.3.0",
          "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
        }
      }
    },
    "estraverse": {
      "version": "4.3.0",
      "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
    },
    "esutils": {
      "version": "2.0.3",
@@ -8484,13 +8607,6 @@
      "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
    },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
    "filesize": {
      "version": "3.6.1",
      "resolved": "https://registry.npmmirror.com/filesize/-/filesize-3.6.1.tgz",
@@ -8820,8 +8936,7 @@
    "gensync": {
      "version": "1.0.0-beta.2",
      "resolved": "https://registry.npmmirror.com/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
    },
    "get-caller-file": {
      "version": "2.0.5",
@@ -10409,6 +10524,29 @@
      "resolved": "https://registry.npmmirror.com/isstream/-/isstream-0.1.2.tgz",
      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
    },
+    "istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmmirror.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg=="
+    },
+    "istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "requires": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+        }
+      }
+    },
    "javascript-stringify": {
      "version": "2.1.0",
      "resolved": "https://registry.npmmirror.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz",
@@ -10460,8 +10598,7 @@
    "jsesc": {
      "version": "2.5.2",
      "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
    },
    "json-parse-better-errors": {
      "version": "1.0.2",
@@ -11139,7 +11276,6 @@
      "version": "1.1.0",
      "resolved": "https://registry.npmmirror.com/merge-source-map/-/merge-source-map-1.1.0.tgz",
      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-      "dev": true,
      "requires": {
        "source-map": "^0.6.1"
      },
@@ -11147,8 +11283,7 @@
        "source-map": {
          "version": "0.6.1",
          "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
        }
      }
    },
@@ -11864,8 +11999,7 @@
    "node-releases": {
      "version": "2.0.14",
      "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-      "dev": true
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
    },
    "node-sass": {
      "version": "4.14.1",
@@ -17112,7 +17246,6 @@
      "version": "1.0.13",
      "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
-      "dev": true,
      "requires": {
        "escalade": "^3.1.1",
        "picocolors": "^1.0.0"
@@ -17460,94 +17593,6 @@
        }
      }
    },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "json5": {
-          "version": "2.2.3",
-          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
-          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
-          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
    "vue-pdf": {
      "version": "4.3.0",
      "resolved": "https://registry.npmmirror.com/vue-pdf/-/vue-pdf-4.3.0.tgz",
@@ -17807,7 +17852,6 @@
          "dev": true,
          "optional": true,
          "requires": {
-            "bindings": "^1.5.0",
            "nan": "^2.12.1"
          }
        },
@@ -28,10 +28,10 @@
    "babel-eslint": "7.2.3",
    "copy-webpack-plugin": "^4.5.2",
    "core-js": "^3.8.3",
-    "cornerstone-core": "^2.3.0",
-    "cornerstone-math": "^0.1.8",
-    "cornerstone-tools": "^6.0.8",
-    "cornerstone-wado-image-loader": "^3.1.2",
+    "cornerstone-core": "^2.6.1",
+    "cornerstone-math": "^0.1.10",
+    "cornerstone-tools": "^6.0.10",
+    "cornerstone-wado-image-loader": "^4.13.2",
    "dcmjs": "^0.29.8",
    "dicom-parser": "^1.8.9",
    "dicomedit": "^0.1.0",
@@ -275,7 +275,4 @@ textarea {
 .title-logo {
  height: 40px;
 }
-.title-logo {
-  height: 40px;
-}
 </style>
@@ -277,19 +277,3 @@ 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,36 +1013,4 @@ 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,10 +51,4 @@ export function batchAddOrUpdateFrontInternationalization(params) {
    data: params
  })
 }
-// 获取当前版本
-export function getCurrentPublishInfo() {
-  return request({
-    url: `/PublishLog/getCurrentPublishInfo`,
-    method: 'get'
-  })
-}
+
@@ -3675,54 +3675,6 @@ export function getTrialSiteSelectList(params) {
    params
  })
 }
-
-export function getNextIRMedicalFeedback(param) {
-  return request({
-    url: `/ReadingMedicalReview/getNextIRMedicalFeedback`,
-    method: 'post',
-    data: param
-  })
-}
-
-export function getNextCRCChallenge(param) {
-  return request({
-    url: `/QCList/getNextCRCChallenge`,
-    method: 'post',
-    data: param
-  })
-}
-
-// 获取中心dicomae列表
-export function getTrialSiteDicomAEList(param) {
-  return request({
-    url: `/TrialSiteDicomAE/getTrialSiteDicomAEList`,
-    method: 'post',
-    data: param
-  })
-}
-// 新增或修改中心dicomae信息
-export function addOrUpdateTrialSiteDicomAE(param) {
-  return request({
-    url: `/TrialSiteDicomAE/addOrUpdateTrialSiteDicomAE`,
-    method: 'post',
-    data: param
-  })
-}
-// 删除中心dicomae信息
-export function deleteTrialSiteDicomAE(id) {
-  return request({
-    url: `/TrialSiteDicomAE/deleteTrialSiteDicomAE/${id}`,
-    method: 'delete',
-  })
-}
-// 获取项目中dicomAE配置
-export function getTrialDicomAE(params) {
-  return request({
-    url: `/TrialDicomAE/getTrialDicomAE`,
-    method: 'get',
-    params
-  })
-}
 // 获取项目配置
 export function getTrialExtralConfig(params) {
  return request({
@@ -3731,66 +3683,3 @@ export function getTrialExtralConfig(params) {
    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,8 +212,10 @@ export default {
        this.toolState.clipPlaying = false
        const element = this.$refs.canvas
        cornerstone.enable(element)
+        cornerstoneTools.stopClip(this.canvas)
+        this.toolState.clipPlaying = false
        this.loading = true
-
+        
        cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
          .then(image => {
            this.loading = false
@@ -871,194 +873,197 @@ export default {
      synchronizer.remove(this.$refs.canvas)
      this.setAllToolsPassive()
    },
-    onContextmenu(event) {
-      const colormapsList = cornerstone.colors.getColormapsList()
-      const colorItems = []
-      colorItems.push({
-        label: '默认值',
-        onClick: () => {
-          this.setColormap()
-        }
-      })
-      colormapsList.forEach(colormap => {
-        const item = {}
-        item.label = colormap.name
-        item.onClick = () => {
-          this.setColormap(colormap.id)
-        }
-        colorItems.push(item)
-      })
-      this.$contextmenu({
-        items: [
-          {
-            label: '移动',
-            divided: true,
-            onClick: () => {
-              this.setToolActive('Pan')
-            }
-          },
-          {
-            label: '缩放',
-            divided: true,
-            children: [
-              {
-                label: '自由缩放',
-                onClick: () => {
-                  this.setToolActive('Zoom')
-                }
-              },
-              {
-                label: '适应图像',
-                onClick: () => {
-                  this.fitToWindow()
-                }
-              },
-              {
-                label: '适应窗口',
-                onClick: () => {
-                  this.fitToImage()
-                }
-              }
-            ]
-          },
-          {
-            label: '透镜',
-            divided: true,
-            onClick: () => {
-              this.setToolActive('Magnify')
-            }
-          },
-          {
-            label: '旋转',
-            divided: true,
-            children: [
-              {
-                label: '默认值',
-                onClick: () => {
-                  this.resetRotate()
-                }
-              },
-              {
-                label: '自由旋转',
-                onClick: () => {
-                  this.setToolActive('Rotate')
-                }
-              },
-              {
-                label: '水平翻转',
-                onClick: () => {
-                  this.setRotate(true, false, 0)
-                }
-              },
-              {
-                label: '垂直翻转',
-                onClick: () => {
-                  this.setRotate(false, true, 0)
-                }
-              },
-              {
-                label: '左转90度',
-                onClick: () => {
-                  this.setRotate(false, false, -90)
-                }
-              },
-              {
-                label: '右转90度',
-                onClick: () => {
-                  this.setRotate(false, false, 90)
-                }
-              }
-            ]
-          },
+    onContextmenu(e) {
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
+      // const colormapsList = cornerstone.colors.getColormapsList()
+      // const colorItems = []
+      // colorItems.push({
+      //   label: '默认值',
+      //   onClick: () => {
+      //     this.setColormap()
+      //   }
+      // })
+      // colormapsList.forEach(colormap => {
+      //   const item = {}
+      //   item.label = colormap.name
+      //   item.onClick = () => {
+      //     this.setColormap(colormap.id)
+      //   }
+      //   colorItems.push(item)
+      // })
+      // this.$contextmenu({
+      //   items: [
+      //     {
+      //       label: '移动',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.setToolActive('Pan')
+      //       }
+      //     },
+      //     {
+      //       label: '缩放',
+      //       divided: true,
+      //       children: [
+      //         {
+      //           label: '自由缩放',
+      //           onClick: () => {
+      //             this.setToolActive('Zoom')
+      //           }
+      //         },
+      //         {
+      //           label: '适应图像',
+      //           onClick: () => {
+      //             this.fitToWindow()
+      //           }
+      //         },
+      //         {
+      //           label: '适应窗口',
+      //           onClick: () => {
+      //             this.fitToImage()
+      //           }
+      //         }
+      //       ]
+      //     },
+      //     {
+      //       label: '透镜',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.setToolActive('Magnify')
+      //       }
+      //     },
+      //     {
+      //       label: '旋转',
+      //       divided: true,
+      //       children: [
+      //         {
+      //           label: '默认值',
+      //           onClick: () => {
+      //             this.resetRotate()
+      //           }
+      //         },
+      //         {
+      //           label: '自由旋转',
+      //           onClick: () => {
+      //             this.setToolActive('Rotate')
+      //           }
+      //         },
+      //         {
+      //           label: '水平翻转',
+      //           onClick: () => {
+      //             this.setRotate(true, false, 0)
+      //           }
+      //         },
+      //         {
+      //           label: '垂直翻转',
+      //           onClick: () => {
+      //             this.setRotate(false, true, 0)
+      //           }
+      //         },
+      //         {
+      //           label: '左转90度',
+      //           onClick: () => {
+      //             this.setRotate(false, false, -90)
+      //           }
+      //         },
+      //         {
+      //           label: '右转90度',
+      //           onClick: () => {
+      //             this.setRotate(false, false, 90)
+      //           }
+      //         }
+      //       ]
+      //     },

-          {
-            label: '测量',
-            divided: true,
-            minWidth: 0,
-            children: [
-              {
-                label: '探针',
-                onClick: () => {
-                  this.setToolActive('Probe')
-                }
-              },
-              {
-                label: '长度测量',
-                onClick: () => {
-                  this.setToolActive('Length')
-                }
-              },
-              {
-                label: '角度测量',
-                onClick: () => {
-                  this.setToolActive('Angle')
-                }
-              },
-              {
-                label: 'Cobb测量',
-                onClick: () => {
-                  this.setToolActive('CobbAngle')
-                }
-              },
-              {
-                label: '椭圆测量',
-                onClick: () => {
-                  this.setToolActive('EllipticalRoi')
-                }
-              },
-              {
-                label: '矩形测量',
-                onClick: () => {
-                  this.setToolActive('RectangleRoi')
-                }
-              },
-              {
-                label: '多边形标记',
-                onClick: () => {
-                  this.setToolActive('FreehandRoi')
-                }
-              },
-              {
-                label: '十字线',
-                onClick: () => {
-                  this.setToolActive('Bidirectional')
-                }
-              },
-              {
-                label: '文字标注',
-                onClick: () => {
-                  this.setToolActive('ArrowAnnotate')
-                }
-              }
-            ]
-          },
-          {
-            label: '调窗',
-            divided: true,
-            onClick: () => {
-              this.setToolActive('Wwwc')
-            }
-          },
-          {
-            label: '反色',
-            divided: true,
-            onClick: () => {
-              this.toggleInvert()
-            }
-          },
-          {
-            label: '伪彩',
-            children: colorItems
-          }
-        ],
-        event,
-        // x: event.clientX,
-        // y: event.clientY,
-        customClass: 'class-a',
-        zIndex: 3,
-        minWidth: 100
-      })
-      return false
+      //     {
+      //       label: '测量',
+      //       divided: true,
+      //       minWidth: 0,
+      //       children: [
+      //         {
+      //           label: '探针',
+      //           onClick: () => {
+      //             this.setToolActive('Probe')
+      //           }
+      //         },
+      //         {
+      //           label: '长度测量',
+      //           onClick: () => {
+      //             this.setToolActive('Length')
+      //           }
+      //         },
+      //         {
+      //           label: '角度测量',
+      //           onClick: () => {
+      //             this.setToolActive('Angle')
+      //           }
+      //         },
+      //         {
+      //           label: 'Cobb测量',
+      //           onClick: () => {
+      //             this.setToolActive('CobbAngle')
+      //           }
+      //         },
+      //         {
+      //           label: '椭圆测量',
+      //           onClick: () => {
+      //             this.setToolActive('EllipticalRoi')
+      //           }
+      //         },
+      //         {
+      //           label: '矩形测量',
+      //           onClick: () => {
+      //             this.setToolActive('RectangleRoi')
+      //           }
+      //         },
+      //         {
+      //           label: '多边形标记',
+      //           onClick: () => {
+      //             this.setToolActive('FreehandRoi')
+      //           }
+      //         },
+      //         {
+      //           label: '十字线',
+      //           onClick: () => {
+      //             this.setToolActive('Bidirectional')
+      //           }
+      //         },
+      //         {
+      //           label: '文字标注',
+      //           onClick: () => {
+      //             this.setToolActive('ArrowAnnotate')
+      //           }
+      //         }
+      //       ]
+      //     },
+      //     {
+      //       label: '调窗',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.setToolActive('Wwwc')
+      //       }
+      //     },
+      //     {
+      //       label: '反色',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.toggleInvert()
+      //       }
+      //     },
+      //     {
+      //       label: '伪彩',
+      //       children: colorItems
+      //     }
+      //   ],
+      //   event,
+      //   // x: event.clientX,
+      //   // y: event.clientY,
+      //   customClass: 'class-a',
+      //   zIndex: 3,
+      //   minWidth: 100
+      // })
+      // return false
    },
    getToolSate() {
      const toolROITypes = [
@@ -91,21 +91,21 @@ export default {
        Code: [
          {
            required: true,
-            message: this.$t("common:ruleMessage:specify"),
+            message: this.$t("mfa:ruleMessage:specify"),
            trigger: "blur",
          },
        ],
        EMail: [
          {
            required: true,
-            message: this.$t("common:ruleMessage:specify"),
+            message: this.$t("mfa:ruleMessage:specify"),
            trigger: "blur",
          },
        ],
        username: [
          {
            required: true,
-            message: this.$t("common:ruleMessage:specify"),
+            message: this.$t("mfa:ruleMessage:specify"),
            trigger: "blur",
          },
        ],
@@ -201,4 +201,7 @@ export default {
    margin-right: 5px;
  }
 }
+::v-deep .el-dialog__header{
+  font-weight: bold;
+}
 </style>
@@ -4,15 +4,14 @@
    <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">
-          <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-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"
+          />
        </el-tabs>
      </el-tab-pane>
    </el-tabs>
@@ -127,10 +126,6 @@ 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
      }
@@ -140,9 +135,6 @@ 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,7 +224,6 @@ import {
  addOrUpdateArchiveTaskStudy,
 } from "@/api/load.js";
 import { parseDicom, getThumbnail, dicomToOSS } from "@/utils/parseDicom.js";
-import store from "@/store";
 export default {
  name: "uploadList",
  props: {
@@ -263,7 +262,6 @@ 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)) {
@@ -749,7 +747,6 @@ 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,7 +103,6 @@ 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: {
@@ -248,356 +247,16 @@ export default {
    },
    // 打包下载
    async downloadImage(item) {
-      let zipName = "压缩包.zip";
-      let InstanceInfoList = [
-        {
-          Id: "e634352c-6465-32ba-04b3-824ec8d346a8",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/e634352c-6465-32ba-04b3-824ec8d346a8",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 1,
-        },
-        {
-          Id: "d4ad1dd2-747b-6de7-8ad4-3e81c58943dd",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/d4ad1dd2-747b-6de7-8ad4-3e81c58943dd",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 2,
-        },
-        {
-          Id: "6a1d1d12-2b4a-0368-c7e1-d44f7180b280",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6a1d1d12-2b4a-0368-c7e1-d44f7180b280",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 3,
-        },
-        {
-          Id: "7a8fb1b4-9ea8-1189-4ca6-b9a9b9547a39",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7a8fb1b4-9ea8-1189-4ca6-b9a9b9547a39",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 4,
-        },
-        {
-          Id: "8d00be19-5ac5-c608-dbd0-41f84cfacd95",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8d00be19-5ac5-c608-dbd0-41f84cfacd95",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 5,
-        },
-        {
-          Id: "729ded91-0eca-78f2-1c17-5182d4f27e3a",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/729ded91-0eca-78f2-1c17-5182d4f27e3a",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 6,
-        },
-        {
-          Id: "9e2fd28c-72fe-bb66-e0ce-40115cd82260",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9e2fd28c-72fe-bb66-e0ce-40115cd82260",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 7,
-        },
-        {
-          Id: "9b31613f-3c9e-28ad-fd9e-7001a69e09b5",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9b31613f-3c9e-28ad-fd9e-7001a69e09b5",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 8,
-        },
-        {
-          Id: "4982b453-d068-7e56-2acd-a361d8584f35",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4982b453-d068-7e56-2acd-a361d8584f35",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 9,
-        },
-        {
-          Id: "8279cf5a-2551-43ea-3fe4-673e88ba7e5a",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8279cf5a-2551-43ea-3fe4-673e88ba7e5a",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 10,
-        },
-        {
-          Id: "6424e9c5-d31b-9388-3b64-a56705ab6fc8",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6424e9c5-d31b-9388-3b64-a56705ab6fc8",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 11,
-        },
-        {
-          Id: "a73cf3f9-defa-0c22-dfdc-8c5bfb93c9a7",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a73cf3f9-defa-0c22-dfdc-8c5bfb93c9a7",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 12,
-        },
-        {
-          Id: "dbfaafea-f721-0a93-37c6-69bcc0d957c3",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/dbfaafea-f721-0a93-37c6-69bcc0d957c3",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 13,
-        },
-        {
-          Id: "52000ac1-6a5b-83e2-5468-4dfdf394e455",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/52000ac1-6a5b-83e2-5468-4dfdf394e455",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 14,
-        },
-        {
-          Id: "de34a347-41f4-1018-a710-48d81fa9aadc",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/de34a347-41f4-1018-a710-48d81fa9aadc",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 15,
-        },
-        {
-          Id: "251d6a13-26b7-935b-d765-0c5db1ed7dfc",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/251d6a13-26b7-935b-d765-0c5db1ed7dfc",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 16,
-        },
-        {
-          Id: "b22e93c8-3f6a-484a-a32b-f7626689f8da",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/b22e93c8-3f6a-484a-a32b-f7626689f8da",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 17,
-        },
-        {
-          Id: "6517400b-d4b5-db65-d026-8c06c40bf244",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6517400b-d4b5-db65-d026-8c06c40bf244",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 18,
-        },
-        {
-          Id: "8e70df99-525a-4ecd-5cf1-6c32698eaa3f",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8e70df99-525a-4ecd-5cf1-6c32698eaa3f",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 19,
-        },
-        {
-          Id: "7df907f2-b6a6-fd03-67ab-be86c497d412",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7df907f2-b6a6-fd03-67ab-be86c497d412",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 20,
-        },
-        {
-          Id: "ba31ba5b-728e-8301-273d-459fd3c65a43",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/ba31ba5b-728e-8301-273d-459fd3c65a43",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 21,
-        },
-        {
-          Id: "7528c70c-5ba1-59c1-413c-7bfc984c0066",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7528c70c-5ba1-59c1-413c-7bfc984c0066",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 22,
-        },
-        {
-          Id: "15dd574d-fc82-c5b7-fefb-497346d4abbb",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/15dd574d-fc82-c5b7-fefb-497346d4abbb",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 23,
-        },
-        {
-          Id: "6cd76aca-91fa-64ce-6077-af48c5e5b18b",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6cd76aca-91fa-64ce-6077-af48c5e5b18b",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 24,
-        },
-        {
-          Id: "2f0f9f4e-12b8-a6a8-d3f9-f43e2055653d",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/2f0f9f4e-12b8-a6a8-d3f9-f43e2055653d",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 25,
-        },
-        {
-          Id: "3c49f379-8548-67cd-1333-dde28219c6e9",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/3c49f379-8548-67cd-1333-dde28219c6e9",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 26,
-        },
-        {
-          Id: "910f43c8-123a-0753-aaf7-11081eef4268",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/910f43c8-123a-0753-aaf7-11081eef4268",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 27,
-        },
-        {
-          Id: "ffad6b36-74aa-1c7d-01eb-18524da91f6e",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/ffad6b36-74aa-1c7d-01eb-18524da91f6e",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 28,
-        },
-        {
-          Id: "9e2bf22d-8734-62ae-881a-7404064a95ce",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9e2bf22d-8734-62ae-881a-7404064a95ce",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 29,
-        },
-        {
-          Id: "eef8b291-ffdf-dbfb-244d-5e63dc5b8cc7",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/eef8b291-ffdf-dbfb-244d-5e63dc5b8cc7",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 30,
-        },
-        {
-          Id: "12b0de3a-243c-78b9-b006-82f2cc633a0f",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/12b0de3a-243c-78b9-b006-82f2cc633a0f",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 31,
-        },
-        {
-          Id: "4341ea87-7d54-2608-184e-01e5c976ce9f",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4341ea87-7d54-2608-184e-01e5c976ce9f",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 32,
-        },
-        {
-          Id: "4db2bac2-18eb-0589-d520-f297b2840e1d",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4db2bac2-18eb-0589-d520-f297b2840e1d",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 33,
-        },
-        {
-          Id: "9442c2a3-0972-67f7-afc3-6f1a47abefab",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9442c2a3-0972-67f7-afc3-6f1a47abefab",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 34,
-        },
-        {
-          Id: "a7fb75b0-0b09-5340-70cf-a11afd84b1ec",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a7fb75b0-0b09-5340-70cf-a11afd84b1ec",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 35,
-        },
-        {
-          Id: "753d7795-451a-bd32-69ea-fd58c1e89d63",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/753d7795-451a-bd32-69ea-fd58c1e89d63",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 36,
-        },
-        {
-          Id: "33bf7274-de0a-e8f9-f97a-c58fb2ea3aaf",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/33bf7274-de0a-e8f9-f97a-c58fb2ea3aaf",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 37,
-        },
-        {
-          Id: "adadae31-37a1-818d-3721-09a1d371c6a5",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/adadae31-37a1-818d-3721-09a1d371c6a5",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 38,
-        },
-        {
-          Id: "f64e8b0d-d2ab-b112-5705-92c23cfc5df6",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/f64e8b0d-d2ab-b112-5705-92c23cfc5df6",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 39,
-        },
-        {
-          Id: "781088b0-5afd-6eb3-5f87-9bfec210d490",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/781088b0-5afd-6eb3-5f87-9bfec210d490",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 40,
-        },
-        {
-          Id: "56df4cef-8053-bff3-21f7-1b1841a3d6e6",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/56df4cef-8053-bff3-21f7-1b1841a3d6e6",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 41,
-        },
-        {
-          Id: "a3e3dab9-7a61-f822-d113-42f46bc5e8ce",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a3e3dab9-7a61-f822-d113-42f46bc5e8ce",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 42,
-        },
-        {
-          Id: "1cc195b9-e498-179d-b927-6d706266decb",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/1cc195b9-e498-179d-b927-6d706266decb",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 43,
-        },
-        {
-          Id: "7dca834f-d959-898e-a0cb-5c8244c4c4a9",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7dca834f-d959-898e-a0cb-5c8244c4c4a9",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 44,
-        },
-        {
-          Id: "13eeba83-2e93-800e-e934-a56061633c64",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/13eeba83-2e93-800e-e934-a56061633c64",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 45,
-        },
-        {
-          Id: "971f0a62-92a3-6d04-53c5-51fa9155e28c",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/971f0a62-92a3-6d04-53c5-51fa9155e28c",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 46,
-        },
-        {
-          Id: "2959d06c-5ac7-f3b9-63d4-1a56e3974fc7",
-          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/2959d06c-5ac7-f3b9-63d4-1a56e3974fc7",
-          HtmlPath: "",
-          NumberOfFrames: 0,
-          InstanceNumber: 47,
-        },
-      ];
-      let path = "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com";
-      let files = new Array();
-      for (let i = 0; i < InstanceInfoList.length; i++) {
-        let item = InstanceInfoList[i];
-        let obj = {
-          name: "file" + i,
-          url: path + item.Path,
-        };
-        files.push(obj);
+      try {
+        await downloadImage(
+          this.$route.query.trialId,
+          item.SourceSubjectVisitId
+        );
+      } catch (err) {
+        console.log(err);
      }
-      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,5 +1,6 @@
 <script>
-export default {
+export default
+{
  processSignature: {
    LogicalConfigConfirmation: 101, // 逻辑配置确认：逻辑配置确认操作
    ProcessConfigConfirmation: 102, // 流程配置确认：流程配置确认操作
@@ -24,11 +25,9 @@ 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>
@@ -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, getCurrentPublishInfo } from '@/api/dictionary/dictionary'
+import { getBasicDataAllSelect, getFrontInternationalizationList } from '@/api/dictionary/dictionary'
 import { sendMFAEmail } from "@/api/user.js";
 import { resetReadingRestTime } from '@/api/trials/reading'
 // import 'element-ui/lib/theme-chalk/index.css'
@@ -44,7 +44,6 @@ Viewer.setDefaults({
    'rotatable': true,
    'scalable': true,
    'transition': true,
-    'fullscreen': true,
    'keyboard': true,
    'url': 'data-source'
  }
@@ -131,7 +130,8 @@ Vue.prototype.$validatePassword = (rule, value, callback) => {
  /* eslint-disable */
  var reg1 = eval(process.env.VUE_APP_PASSWORD_FOR_PERMISSION) ? new RegExp(`${process.env.VUE_APP_PASSWORD_FOR_REGULAR}`) : /.*/g; //密码必须是8位以上、必须含有字母、数字、特殊符号
  if (!reg1.test(value)) {
-    callback(lang === 'zh' ? new Error("密码必须包含：1）8 – 32 个字符；2）至少1个数字；3) 至少1个大写字母；4）至少1个小写字母；5）至少1个特殊字符 (~!-@#$%^&*_+?)") : new Error('Passwords must have: 1) 8 - 32 characters; 2) At least 1 number; 3) At least 1 uppercase letter; 4) At least 1 lowercase letter; 5) At least 1 special character (~!-@#$%^&*_+?) '))
+    callback(
+      new Error(_vm.$t('env:regExp:formatPassword')))
  } else {
    callback();
  }
@@ -186,9 +186,6 @@ 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) => {
@@ -310,7 +307,7 @@ async function VueInit() {
      if (_vm.$store.state.user.userId !== zzSessionStorage.getItem('userId')) {
        window.location.href = `/login`
        zzSessionStorage.removeItem('lastWorkbench')
-        _vm.$alert(lang === 'en' ? 'The same browser only allows one user account to be logged in at a time.' : '同一浏览器只允许同时登陆一个账户', {
+        _vm.$alert(_vm.$t("env:sso:tip"), {
          type: 'warning',
        })
      }
@@ -361,10 +358,6 @@ 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'
@@ -375,13 +368,18 @@ async function VueInit() {
    }
    _vm.$store.dispatch('user/logout').then(res => {
      // window.location.href = `/login`
-      _vm.$msgbox.close();
+      if (_vm.$msgbox) {
+        _vm.$msgbox.close();
+      }
      isOpen = false
      isLock = null
      zzSessionStorage.removeItem('isLock')
      router.push("/login")
    }).then(() => {
-      _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登录！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', {
+      // _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登陆！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', {
+      //   type: 'warning',
+      // })
+      _vm.$alert(_vm.$t("env:loginOut"), {
        type: 'warning',
      })
    })
@@ -389,7 +387,7 @@ async function VueInit() {
  } : () => { }, process.env.VUE_APP_LOGOUT_FOR_TIME,
    eval(process.env.VUE_APP_LOCK_FOR_PERMISSION) ? () => {
      var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-      if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      if (_vm.$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') {
@@ -405,17 +403,17 @@ async function VueInit() {
      isOpen = true
      zzSessionStorage.setItem('isLock', 'true')
      _vm.$msgbox({
-        title: lang === 'zh' ? '已锁定' : 'Locked',
-        confirmButtonText: lang === 'zh' ? '解锁' : 'Unlock',
+        title: _vm.$t("env:lock:msgBox:title"),
+        confirmButtonText: _vm.$t("env:lock:msgBox:confirmButtonText"),
        showClose: false,
        beforeClose: (action, instance, done) => {
          if (action === 'confirm') {
            if (!_vm.unlock.my_username) {
-              _vm.$alert(lang === 'zh' ? '请输入您的用户名解锁' : 'Please enter your user name to unlock.')
+              _vm.$alert(_vm.$t("env:lock:msgBox:iupUser"))
              return
            }
            if (!_vm.unlock.my_password) {
-              _vm.$alert(lang === 'zh' ? '请输入您的密码解锁' : 'Please enter the correct password to unlock.')
+              _vm.$alert(_vm.$t("env:lock:msgBox:inpPassword"))
              return
            }
            var my_username = zzSessionStorage.getItem('my_username')
@@ -426,7 +424,7 @@ async function VueInit() {
              resetReadingRestTime().then(() => {
              })
              const closeLock = (_vm) => {
-                _vm.$message.success(lang === 'zh' ? '解锁成功，请继续操作' : 'Unlocked successfully. Please continue operation.')
+                _vm.$message.success(_vm.$t("env:lock:msgBox:lockSuccess"))
                _vm.unlock = {
                  my_username: null,
                  my_password: null
@@ -448,7 +446,7 @@ async function VueInit() {
                  Vue.prototype.$MFA({
                    status: "lock",
                    UserId: my_userid,
-                    EMail: my_EMail,
+                    EMail: res.Result,
                    username: my_username,
                    callBack: () => {
                      closeLock(_vm)
@@ -461,7 +459,7 @@ async function VueInit() {

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

 NProgress.configure({ showSpinner: false })

-const whiteList = ['/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
+const whiteList = ['/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']

 router.beforeEach(async (to, from, next) => {
  NProgress.start()
@@ -55,28 +55,15 @@ router.beforeEach(async (to, from, next) => {
  } else {
    /* has no token*/
    if (whiteList.indexOf(to.path) !== -1) {
-      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()
+      // 在免登录whiteList中，直接进入
+      if (to.path === '/readingDicoms' || to.path === '/noneDicomReading') {
+        OSSclient()
      }
+      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()
@@ -201,18 +201,6 @@ 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,6 +41,7 @@ const getters = {
  lastCanvasTaskId: state => state.reading.lastCanvasTaskId,
  imageQuality: state => state.reading.imageQuality,
  imageQualityIssues: state => state.reading.imageQualityIssues,
+  currentLoadIns: state => state.reading.currentLoadIns,
  language: state => state.lang.language,
  TotalNeedSignSystemDocCount: state => state.user.TotalNeedSignSystemDocCount,
  TotalNeedSignTrialDocCount: state => state.user.TotalNeedSignTrialDocCount,
@@ -30,7 +30,8 @@ const getDefaultState = () => {
    activeSeries: {},
    lastCanvasTaskId: '',
    imageQuality: null,
-    imageQualityIssues: null
+    imageQualityIssues: null,
+    currentLoadIns: []
  }
 }
 function getQuestions(questions) {
@@ -139,6 +140,22 @@ function getQuestionAnswer(questions, questionMark, answers) {
    return ''
  }
 }
+// function getKeySeriesInfo(keyInstance, series) {
+//   const obj = {}
+//   const set = new Set()
+//   var instances = series.instanceList.concat(keyInstance).filter((item) => {
+//     if (set.has(item)) {
+//       return true
+//     } else {
+//       set.add(item)
+//       return false
+//     }
+//   })
+//   instances.map(item => {
+//     obj[item] = { seriesId: series.seriesId, studyIndex: series.studyIndex, seriesIndex: series.seriesIndex }
+//   })
+//   return obj
+// }

 const state = getDefaultState

@@ -759,7 +776,17 @@ const actions = {
        resolve()
      } else {
        var studyList = []
+        var keyImages = []
        getReadingVisitStudyList(obj.trialId, obj.subjectVisitId, obj.visitTaskId).then(res => {
+          const i = res.Result.findIndex(i => i.IsCriticalSequence)
+          if (i > -1) {
+            const seriesList = res.Result[i].SeriesList && res.Result[i].SeriesList
+            seriesList.map(i => {
+              i.InstanceInfoList.map(k => {
+                keyImages.push({ instanceId: k.Id })
+              })
+            })
+          }
          res.Result.forEach((study, studyIndex) => {
            const data = {}
            data.StudyId = study.StudyId
@@ -785,16 +812,22 @@ const actions = {
              series.InstanceInfoList.forEach(instance => {
                if (instance.NumberOfFrames && instance.NumberOfFrames > 1) {
                  for (let i = 0; i < instance.NumberOfFrames; i++) {
-                    const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}`
+                    const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
                    imageIds.push(imageId)
                  }
-                  instance.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${0}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}`
+                  instance.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${0}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
                } else {
-                  const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}`
+                  const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
                  imageIds.push(imageId)
                  instance.ImageId = imageId
                }
-
+                if (!study.IsCriticalSequence && series.IsBeMark) {
+                  const i = keyImages.findIndex(i => i.instanceId === instance.Id)
+                  if (i > -1) {
+                    keyImages[i].studyIndex = studyIndex
+                    keyImages[i].seriesIndex = seriesIndex
+                  }
+                }
                instanceList.push(instance.Id)
              })
              seriesList.push({
@@ -837,6 +870,7 @@ const actions = {
          })
          state.visitTaskList[index].StudyList = studyList
          state.visitTaskList[index].studyListInit = true
+          state.visitTaskList[index].KeyImages = keyImages
          // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
          resolve()
        }).catch(() => { resolve() })
@@ -895,11 +929,114 @@ const actions = {
      resolve()
    })
  },
+  setImageLoadedProgress({ state }, obj) {
+    const studyIndex = parseInt(obj.idx.split('|')[0])
+    const seriesIndex = parseInt(obj.idx.split('|')[1])
+    const visitTaskIndex = parseInt(obj.idx.split('|')[2])
+    let pStudyIndex = null
+    let pSeriesIndex = null
+    let pSeries = null
+    try {
+      const study = state.visitTaskList[visitTaskIndex].StudyList[studyIndex]
+      const series = state.visitTaskList[visitTaskIndex].StudyList[studyIndex].SeriesList[seriesIndex]
+      const keyImages = state.visitTaskList[visitTaskIndex].KeyImages
+      if (study.IsCriticalSequence) {
+        const i = keyImages.findIndex(i => i.instanceId === obj.instanceId)
+        if (i > -1) {
+          pStudyIndex = keyImages[i].studyIndex
+          pSeriesIndex = keyImages[i].seriesIndex
+        }
+      } else if (series.isBeMark) {
+        if (keyImages.length > 0) {
+          pStudyIndex = 0
+          pSeriesIndex = 0
+        }
+      }
+      if (pStudyIndex !== null && pSeriesIndex !== null) {
+        pSeries = state.visitTaskList[visitTaskIndex].StudyList[pStudyIndex].SeriesList[pSeriesIndex]
+      }
+
+      var prefetchInstanceCount = series.prefetchInstanceCount
+      var instanceCount = series.instanceCount
+      var prefetchInstanceCount2 = pSeries ? pSeries.prefetchInstanceCount : null
+      var instanceCount2 = pSeries ? pSeries.instanceCount : null
+      if (series.imageloadedArr.indexOf(obj.instanceId) < 0) {
+        const i = state.currentLoadIns.findIndex(i => i.instanceId === obj.instanceId)
+        if (i > -1) {
+          prefetchInstanceCount = prefetchInstanceCount + obj.percentComplete - state.currentLoadIns[i].percentComplete
+          prefetchInstanceCount2 = prefetchInstanceCount2 !== null ? prefetchInstanceCount2 + obj.percentComplete - state.currentLoadIns[i].percentComplete : null
+          state.currentLoadIns[i].percentComplete = obj.percentComplete
+          if (obj.percentComplete >= 100) {
+            state.currentLoadIns.splice(i, 1)
+          }
+        } else {
+          if (obj.percentComplete !== 100) {
+            state.currentLoadIns.push({ instanceId: obj.instanceId, percentComplete: obj.percentComplete })
+          }
+          prefetchInstanceCount = prefetchInstanceCount + obj.percentComplete
+          prefetchInstanceCount2 = prefetchInstanceCount2 !== null ? prefetchInstanceCount2 + obj.percentComplete : null
+        }
+        series.prefetchInstanceCount = prefetchInstanceCount
+        if (pSeries) {
+          pSeries.prefetchInstanceCount = prefetchInstanceCount2
+        }
+        if (obj.percentComplete >= 100) {
+          series.imageloadedArr.push(obj.instanceId)
+          if (pSeries) {
+            pSeries.imageloadedArr.push(obj.instanceId)
+          }
+        }
+      }
+
+      if (prefetchInstanceCount >= instanceCount * 100) {
+        series.prefetchInstanceCount = instanceCount * 100
+        // 设置当前序列状态为已下载完成
+        series.loadStatus = true
+      }
+      if (prefetchInstanceCount2 !== null && instanceCount2 !== null && prefetchInstanceCount2 >= instanceCount2 * 100) {
+        pSeries.prefetchInstanceCount = instanceCount2 * 100
+        // 设置当前序列状态为已下载完成
+        pSeries.loadStatus = true
+      }
+    } catch (e) {
+      console.log('error')
+    }
+  },
  setImageloadedInfo({ state }, obj) {
-    var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
-    const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount
-    state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount = prefetchInstanceCount + 100
-    state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr.push(obj.imageId)
+    console.log('setImageloadedInfo', obj)
+    // if(obj.instance === '20dd8fc9-51b0-ec63-942b-cb3006c72650')
+    // var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
+    // // const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount
+    // const instanceList = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].instanceList
+    // const idx = state.visitTaskList[index].StudyList.findIndex(i => i.IsCriticalSequence)
+
+    // if (!state.visitTaskList[index].StudyList[obj.studyIndex].IsCriticalSequence) {
+    //   // 当前下载的非关键序列
+    //   console.log('当前下载的非关键序列')
+    //   if (idx > -1) {
+    //     const keyInstance = state.visitTaskList[index].StudyList[idx].SeriesList[0].instanceList
+    //     obj.markedImages = getKeySeriesInfo(keyInstance, state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex])
+    //     instanceList.map(i => {
+    //       if (obj.markedImages.hasOwnProperty(i) && state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr.indexOf(i) < 0) {
+    //         state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr.push(i)
+    //         state.visitTaskList[index].StudyList[idx].SeriesList[0].prefetchInstanceCount = state.visitTaskList[index].StudyList[idx].SeriesList[0].prefetchInstanceCount + 100
+    //       }
+    //     })
+    //     if (state.visitTaskList[index].StudyList[idx].SeriesList[0].imageloadedArr >= state.visitTaskList[index].StudyList[idx].SeriesList[0].instanceCount) {
+    //       state.visitTaskList[index].StudyList[idx].SeriesList[0].loadStatus = true
+    //     }
+    //   }
+    // }
+    // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].instanceCount * 100
+    // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr = instanceList
+    // state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].loadStatus = true
+    // const imageloadedArr = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr
+    // if (imageloadedArr.indexOf())
+
+    // if (state.visitTaskList[index].StudyList[0].IsCriticalSequence){
+    //   state.visitTaskList[index].StudyList[0].SeriesList[0].prefetchInstanceCount = prefetchInstanceCount + 100
+    //   state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].imageloadedArr.push(obj.imageId)
+    // }
  },
  setStatus({ state }, obj) {
    var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
@@ -1,5 +1,6 @@
 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) => {
@@ -1,14 +1,18 @@
 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";
-import streamSaver from "streamsaver";
-import "streamsaver/examples/zip-stream.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
+    if (flag[`${id2}_${IsDicom}`]) return Vue.prototype.$message.warning(Vue.prototype.$t('trials:upload:tip:uploading'));
    flag[`${id2}_${IsDicom}`] = true
    try {
        let params = {
@@ -16,28 +20,33 @@ export const downloadImage = async (id, id2, IsDicom = true) => {
            SubjectVisitId: id2,
            IsDicom: IsDicom
        }
+        store.dispatch("trials/setUnLock", true);
        let res = await requestPackageAndAnonymizImage(params);
-        flag[`${id2}_${IsDicom}`] = false;
        if (res.IsSuccess) {
            if (!res.Result) {
+                flag[`${id2}_${IsDicom}`] = false;
                Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not"))
                return 1;
            }
-            let a = document.createElement("a");
+            Vue.prototype.$message.success(Vue.prototype.$t("trials:upload:message:startUpload"));
            let href = Vue.prototype.OSSclientConfig.basePath + res.Result;
-            // 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)
+            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) {
@@ -111,35 +120,80 @@ const setfolder = async (item) => {
 };
 const handleBatchDown = async (item, zip) => {
    return new Promise((resolve) => {
-        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
-                        })
-                    })
-                }
-            }
+        getFileData(
+            Vue.prototype.OSSclientConfig.basePath + item.instancePath
+        ).then((res) => {
+            const fileName = item.dicomName + ".dcm";
+            zip.file(fileName, res.data, { binary: true });
+            resolve();
        });
-        if (window.WritableStream && readableZipStream.pipeTo) {
-            // 开始下载  
-            readableZipStream
-                .pipeTo(zipFileOutputStream)
-                .then(() => { console.log("同步下载打包结束时间：" + new Date()); resolve(true) })
-        } else {
-            resolve(false);
-        }
-    })
-
+    });
 };
+const getFileData = (fileUrl) => {
+    return new Promise((resolve, reject) => {
+        axios(fileUrl, {
+            method: "GET",
+            responseType: "blob", // 返回的数据会被强制转为blob类型 ，转换成arraybuffer 也行
+        })
+            .then((res) => {
+                resolve(res);
+            })
+            .catch((error) => {
+                reject(error);
+            });
+    });
+};
+export const fileDownload = (content, filename) => {
+    const eleLink = document.createElement("a");
+    eleLink.download = filename;
+    eleLink.style.display = "none";
+    const blob = new Blob([content]);
+    eleLink.href = URL.createObjectURL(blob);
+    document.body.appendChild(eleLink);
+    eleLink.click();
+    document.body.removeChild(eleLink);
+};
+let download = async (downloadUrl, downloadFileName, res) => {
+    const blob = await getBlob(downloadUrl);
+    flag[`${res.id2}_${res.IsDicom}`] = false;
+    store.dispatch("trials/setUnLock", false);
+    saveAsB(blob, downloadFileName);
+}
+
+let getBlob = (url) => {
+    return new Promise((resolve, reject) => {
+        const xhr = new XMLHttpRequest();
+
+        xhr.open('GET', url, true);
+        xhr.responseType = 'blob';
+        xhr.onload = () => {
+            if (xhr.status === 200) {
+                resolve(xhr.response);
+            } else {
+                reject(new Error(`Request failed with status ${xhr.status}`));
+            }
+        };
+        xhr.onerror = () => {
+            reject(new Error('Request failed'));
+        };
+
+        xhr.send();
+    });
+}
+
+let saveAsB = (blob, filename) => {
+    const link = document.createElement('a');
+    const body = document.body;
+
+    link.href = window.URL.createObjectURL(blob);
+    link.download = filename;
+
+    // hide the link
+    link.style.display = 'none';
+    body.appendChild(link);
+
+    link.click();
+    body.removeChild(link);
+
+    window.URL.revokeObjectURL(link.href);
+}
@@ -56,28 +56,20 @@
                                trigger="hover"
                                popper-class="instance_frame_wrapper"
                              >
-                                <div
-                                  v-for="(instance, idx) in item.instanceInfoList"
-                                  :key="instance.Id"
-                                  class="frame_content"
-                                  :style="{'margin-bottom':idx<item.instanceInfoList.length-1? '5px':'0px'}"
-                                  @click="showMultiFrames(item, index, instance)"
-                                >
-                                  <!-- <div>
-                                        <img
-                                          class="image-preview"
-                                          :src="series.previewImageUrl"
-                                          crossorigin="anonymous"
-                                          alt=""
-                                          style="width: 40px;height:40px;"
-                                          fit="fill"
-                                        >
-                                      </div> -->
-                                  <div>
-                                    <div>{{ instance.InstanceNumber }}</div>
-                                    <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                                  </div>
+                                <div class="frame_list">
+                                  <div
+                                    v-for="(instance, idx) in item.instanceInfoList"
+                                    :key="instance.Id"
+                                    class="frame_content"
+                                    :style="{'margin-bottom':idx<item.instanceInfoList.length-1? '5px':'0px'}"
+                                    @click="showMultiFrames(item, index, instance)"
+                                  >
+                                    <div>
+                                      <div>{{ instance.InstanceNumber }}</div>
+                                      <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
+                                    </div>

+                                  </div>
                                </div>
                                <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
                              </el-popover>
@@ -155,7 +147,8 @@ import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
+const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
+cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
  components: {
    'dicom-viewer': dicomViewer
@@ -658,7 +651,7 @@ export default {
        const seriesIndex = params.seriesIndex
        var prefetchInstanceCount = this.seriesList[seriesIndex].prefetchInstanceCount
        var instanceCount = this.seriesList[seriesIndex].instanceCount
-        if (this.seriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
+        if (this.seriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0 && this.seriesList[seriesIndex].imageloadedArr.length < this.seriesList[seriesIndex].instanceCount) {
          const i = this.currentLoadIns.findIndex(i => i.imageId === imageId)
          if (i > -1) {
            prefetchInstanceCount = prefetchInstanceCount - this.currentLoadIns[i].percentComplete + percentComplete
@@ -884,6 +877,18 @@ export default {
  border: 1px solid #2c2c2c;
  padding: 5px;
 }
+.frame_list{
+  max-height: 500px;
+  overflow-y: auto;
+}
+.instance_frame_wrapper ::-webkit-scrollbar {
+  width: 7px;
+  height: 7px;
+}
+.instance_frame_wrapper  ::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background: #d0d0d0;
+}
 .frame_content{
  height: 50px;
  padding: 5px;
@@ -200,28 +200,20 @@
                                    trigger="hover"
                                    popper-class="instance_frame_wrapper"
                                  >
-                                    <div
-                                      v-for="(instance, idx) in seriesItem.instanceInfoList"
-                                      :key="instance.Id"
-                                      class="frame_content"
-                                      :style="{'margin-bottom':idx<seriesItem.instanceInfoList.length-1? '5px':'0px'}"
-                                      @click="showMultiFrames(studyIndex,seriesItem, index, instance)"
-                                    >
-                                      <!-- <div>
-                                        <img
-                                          class="image-preview"
-                                          :src="series.previewImageUrl"
-                                          crossorigin="anonymous"
-                                          alt=""
-                                          style="width: 40px;height:40px;"
-                                          fit="fill"
-                                        >
-                                      </div> -->
-                                      <div>
-                                        <div>{{ instance.InstanceNumber }}</div>
-                                        <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                                      </div>
+                                    <div class="frame_list">
+                                      <div
+                                        v-for="(instance, idx) in seriesItem.instanceInfoList"
+                                        :key="instance.Id"
+                                        class="frame_content"
+                                        :style="{'margin-bottom':idx<seriesItem.instanceInfoList.length-1? '5px':'0px'}"
+                                        @click="showMultiFrames(studyIndex,seriesItem, index, instance)"
+                                      >
+                                        <div>
+                                          <div>{{ instance.InstanceNumber }}</div>
+                                          <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
+                                        </div>

+                                      </div>
                                    </div>
                                    <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
                                  </el-popover>
@@ -274,7 +266,8 @@ import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 cornerstoneWADOImageLoader.external.dicomParser = dicomParser
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
+const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
+cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
  name: 'DicomsOfVisit',
  components: {
@@ -690,7 +683,7 @@ export default {
        const seriesIndex = params.idx.split('|')[1]
        var prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount
        var instanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount
-        if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
+        if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0 && this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.length < this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount) {
          const i = this.currentLoadIns.findIndex(i => i.imageId === imageId)
          if (i > -1) {
            prefetchInstanceCount = prefetchInstanceCount - this.currentLoadIns[i].percentComplete + percentComplete
@@ -900,6 +893,18 @@ export default {
  border: 1px solid #2c2c2c;
  padding: 5px;
 }
+.frame_list{
+  max-height: 500px;
+  overflow-y: auto;
+}
+.instance_frame_wrapper ::-webkit-scrollbar {
+  width: 7px;
+  height: 7px;
+}
+.instance_frame_wrapper  ::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background: #d0d0d0;
+}
 .frame_content{
  height: 50px;
  padding: 5px;
@@ -1,214 +0,0 @@
-<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>
@@ -1,252 +0,0 @@
-<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>
@@ -1,109 +0,0 @@
-<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="ValueCN"
+              prop="raw.ValueCN"
              label="中文值"
              show-overflow-tooltip
            >
            </el-table-column>
            <el-table-column
-              prop="Value"
+              prop="raw.Value"
              label="英文值"
              show-overflow-tooltip
            >
@@ -25,68 +25,56 @@
      <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 Browser from "./browser/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'
 export default {
-  name: "Questions",
+  name: 'Questions',
  components: {
-    QcQuestions,
-    CriterionsTmp,
-    ClinicalData,
-    Anonymization,
-    IncreaseFields,
-    Email,
-    Sign,
-    MedicalAudit,
-    Browser,
+    QcQuestions, CriterionsTmp, ClinicalData, Anonymization, IncreaseFields, Email, Sign,
+    MedicalAudit
  },
  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%;
    }
  }
@@ -119,7 +119,7 @@
            {{ $t("login:button:login") }}
          </el-button>
          <div style="text-align: right">
-            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
+            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
            <!-- Forget password? -->
            <el-button
              type="text"
@@ -183,7 +183,7 @@
          {{ $t("login:title:system_title") }}
        </p>
        <p style="margin-bottom: 20px" v-else>{{ $t("login:title:system") }}</p>
-        <p style="margin-bottom: 20px">V{{ $version.Version }}</p>
+        <p style="margin-bottom: 20px">V1.5.4.001</p>
        <p style="margin-bottom: 20px" v-if="language === 'zh'">
          Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
          版权所有
@@ -202,7 +202,6 @@
        >
      </div>
    </el-dialog>
-    <browserTip ref="browserTip" />
  </div>
 </template>

@@ -211,14 +210,13 @@ 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";
 export default {
  name: "Login",
-  components: { TopLang, Vcode, browserTip },
+  components: { TopLang, Vcode },
  data() {
    return {
-      NODE_ENV: process.env.NODE_ENV, // process.env.NODE_ENV
+      NODE_ENV: process.env.NODE_ENV,
      VUE_APP_OSS_CONFIG_REGION: process.env.VUE_APP_OSS_CONFIG_REGION,
      aboutVisible: false,
      loginForm: {
@@ -271,7 +269,7 @@ export default {
      this.setLanguage("en");
      this.$updateDictionary();
    } else {
-      if (this.location === "USA") {
+      if (this.location === "USA" || this.NODE_ENV === "usa") {
        this.$i18n.locale = "en";
        this.setLanguage("en");
        this.$updateDictionary();
@@ -281,7 +279,6 @@ export default {
        // this.$updateDictionary()
      }
    }
-    this.$refs.browserTip.open();
  },
  methods: {
    ...mapMutations({ setLanguage: "lang/setLanguage" }),
@@ -121,7 +121,7 @@ export default {
    // 获取非Dicom检查信息
    getNoneDicomList() {
      this.loading = true
-      getNoneDicomStudyList(this.subjectVisitId, this.studyId, true).then(res => {
+      getNoneDicomStudyList(this.subjectVisitId, this.studyId).then(res => {
        this.studyList = res.Result
        this.loading = false
        const studyIndex = this.studyList.findIndex(item => {
@@ -62,7 +62,7 @@ export default {
    // 获取非Dicom检查信息
    getNoneDicomList() {
      this.loading = true
-      getNoneDicomStudyList(this.subjectVisitId, '', true).then(res => {
+      getNoneDicomStudyList(this.subjectVisitId, '').then(res => {
        this.noneDicomStudyList = res.Result
        this.loading = false
        const study = this.noneDicomStudyList.find((item, index) => {
@@ -1,310 +0,0 @@
-<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>
@@ -1,168 +0,0 @@
-<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>
@@ -1,219 +0,0 @@
-<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>
@@ -1,304 +0,0 @@
-<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>
@@ -1,198 +0,0 @@
-<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>
@@ -1,47 +0,0 @@
-<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>
@@ -1,318 +0,0 @@
-<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>
@@ -1,249 +0,0 @@
-<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>
@@ -1,221 +0,0 @@
-<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>
@@ -1,406 +0,0 @@
-<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:Agreements:tap:must') }}</p>
+      <p>{{ $t('system:GcpCertificate:tap:must') }}</p>
    </div>
    <div v-if="!$route.query.ReviewStatus">
      <el-table :data="agreementList" size="small">
@@ -6,162 +6,122 @@
        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-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}.Module`"
-                :rules="[
-                  {
-                    max: 200,
-                    message: `${$t('common:ruleMessage:maxLength')} 200`,
-                    trigger: ['change', 'blur'],
-                  },
-                ]"
-              >
-                <el-input
-                  v-model="scope.row.Module"
-                  type="textarea"
-                  maxlength="200"
-                  :autosize="{ minRows: 2, maxRows: 4 }"
-                />
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <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`,
-                  },
-                ]"
-              >
-                <el-input
-                  v-model="scope.row.Code"
-                  type="textarea"
-                  maxlength="200"
-                  :autosize="{ minRows: 2, maxRows: 4 }"
-                />
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <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`,
-                  },
-                ]"
-              >
-                <el-input
-                  v-model="scope.row.ValueCN"
-                  type="textarea"
-                  maxlength="1000"
-                  :autosize="{ minRows: 2, maxRows: 4 }"
-                />
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <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`,
-                  },
-                ]"
-              >
-                <el-input
-                  v-model="scope.row.Value"
-                  type="textarea"
-                  maxlength="1000"
-                  :autosize="{ minRows: 2, maxRows: 4 }"
-                />
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column prop="" label="说明">
+        <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`"
                :rules="[
-                  {
-                    max: 200,
-                    message: `${$t('common:ruleMessage:maxLength')} 200`,
-                    trigger: ['change', 'blur'],
-                  },
+                  { required: true,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
+                  { max: 200, message: `${$t('common:ruleMessage:maxLength')} 200` }
                ]"
              >
                <el-input
                  v-model="scope.row.Description"
                  type="textarea"
                  maxlength="200"
-                  :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}.Code`"
+                :rules="[
+                  { 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}"
+                />
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <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` }
+                ]"
+              >
+                <el-input
+                  v-model="scope.row.ValueCN"
+                  type="textarea"
+                  maxlength="1000"
+                  :autosize="{ minRows: 2, maxRows: 4}"
+                />
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <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` }
+                ]"
+              >
+                <el-input
+                  v-model="scope.row.Value"
+                  type="textarea"
+                  maxlength="1000"
+                  :autosize="{ minRows: 2, maxRows: 4}"
+                />
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="right"
+            width="100"
+          >
            <template slot="header">
              <!-- 新增 -->
              <el-button
@@ -169,8 +129,7 @@
                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">
              <!-- 删除 -->
@@ -179,97 +138,81 @@
                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,
-    PublishLogId: null,
-    AddList: [],
-  };
-};
+    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,
-      },
-      rules: {
-        PublishLogId: [{ required: true, message: "请选择", trigger: "blur" }],
-      },
-      PublishVersionList: [],
-    };
+      model_cfg: { visible: false, showClose: true, width: '800px', title: '', appendToBody: true }
+    }
+  },
+  mounted() {
  },
-  mounted() {},
  methods: {
-    openDialog(title, data, options = []) {
-      this.PublishVersionList = options;
-      this.model_cfg.visible = true;
-      this.model_cfg.title = title;
-      this.form = formDataDefault();
+
+    openDialog(title, data) {
+      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,216 +9,147 @@
        label-width="130px"
        size="small"
      >
-        <el-form-item
-          label="国际化类型"
-          prop="InternationalizationType"
-          v-if="status !== 'batch'"
-        >
+        <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="Module"
-          v-if="status !== 'batch'"
-        >
-          <el-input
-            v-model="form.Module"
-            type="textarea"
-            maxlength="200"
-            :autosize="{ minRows: 2, maxRows: 4 }"
-          />
-        </el-form-item>
-        <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 }"
-          />
-        </el-form-item>
-        <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 }"
-          />
-        </el-form-item>
-        <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 }"
-          />
-        </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"
-              :label="item.value"
-              >{{ item.label }}</el-radio
-            >
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="说明" prop="Description" v-if="status !== 'batch'">
+        <el-form-item label="功能模块/服务名" prop="Description">
          <el-input
            v-model="form.Description"
            type="textarea"
            maxlength="200"
-            :autosize="{ minRows: 2, maxRows: 4 }"
+            :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 label="标识" prop="Code">
+          <el-input
+            v-model="form.Code"
+            type="textarea"
+            maxlength="200"
+            :autosize="{ minRows: 2, maxRows: 4}"
+          />
+        </el-form-item>
+        <el-form-item label="中文值" prop="ValueCN">
+          <el-input
+            v-model="form.ValueCN"
+            type="textarea"
+            maxlength="1000"
+            :autosize="{ minRows: 2, maxRows: 4}"
+          />
+        </el-form-item>
+        <el-form-item label="英文值" prop="Value">
+          <el-input
+            v-model="form.Value"
+            type="textarea"
+            maxlength="1000"
+            :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"
+              :label="item.value"
+            >{{ item.label }}</el-radio>
+          </el-radio-group>
        </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,
-    PublishLogId: null,
-  };
-};
+    InternationalizationType: 1
+  }
+}
 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" }],
-        Module: [
-          {
-            max: 200,
-            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
-            trigger: "blur",
-          },
+        State: [
+          { required: true, message: '请选择', trigger: 'blur' }
        ],
        Description: [
-          {
-            max: 200,
-            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
-            trigger: "blur",
-          },
+          { required: true, message: '请注明', trigger: 'blur' },
+          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }
        ],
        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" },
-        ],
-        PublishLogId: [{ required: true, message: "请选择", trigger: "blur" }],
+          { required: true, message: '请选择', trigger: 'blur' }
+        ]
      },
-      model_cfg: {
-        visible: false,
-        showClose: true,
-        width: "600px",
-        title: "",
-        appendToBody: true,
-      },
-      PublishVersionList: [],
-    };
+      model_cfg: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true }
+    }
+  },
+  mounted() {
  },
-  mounted() {},
  methods: {
-    openDialog(title, data, options = [], status) {
-      this.PublishVersionList = options;
-      this.status = status;
-      this.model_cfg.visible = true;
-      this.model_cfg.title = title;
+
+    openDialog(title, data) {
+      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;
-        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;
-          });
-      });
+      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
+        })
+      })
    },
    handleCancle() {
-      this.model_cfg.visible = false;
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-::v-deep .el-select {
-  width: 100%;
+      this.model_cfg.visible = false
+    }
+  }
 }
-</style>
+</script>
@@ -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.Module"
+            v-model="searchData.Description"
            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,55 +38,27 @@
            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"
@@ -112,27 +84,20 @@
          >
            批量新增
          </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"
-        @selection-change="handleSelectionChange"
-        ><el-table-column type="selection" width="50" />
-        <el-table-column type="index" width="50" />
+      >
+        <el-table-column
+          type="index"
+          width="50"
+        />
        <el-table-column
          label="国际化类型"
          prop="InternationalizationType"
@@ -141,42 +106,21 @@
          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="Module"
-          min-width="120"
+          prop="Description"
+          min-width="100"
          show-overflow-tooltip
          sortable="custom"
        />
@@ -210,30 +154,16 @@
        >
          <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"
@@ -267,10 +197,11 @@
            >
              删除
            </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"
@@ -278,22 +209,20 @@
          @pagination="getList"
        />
      </div>
-      <i18n-form ref="i18nForm" @getList="getList" @batch="batch" />
+      <i18n-form
+        ref="i18nForm"
+        @getList="getList"
+      />
      <BatchAddForm ref="batcnAddForm" @getList="getList" />
    </div>
  </div>
 </template>
 <script>
-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";
+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'
 const searchDataDefault = () => {
  return {
    Description: null,
@@ -301,16 +230,14 @@ 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 {
@@ -318,169 +245,100 @@ export default {
      searchData: searchDataDefault(),
      list: [],
      total: 0,
-      loading: false,
-      PublishVersionList: [],
-      selectTableList: [],
-    };
+      loading: false
+    }
  },
  mounted() {
-    this.getList();
-    this.getPublishVersionSelect();
+    this.getList()
  },
  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;
-        });
-    },
-    // 批量更新
-    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);
-      }
+      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
+      })
    },
    handleAdd() {
      this.$nextTick(() => {
-        this.$refs["i18nForm"].openDialog(
-          "新增",
-          {},
-          this.PublishVersionList,
-          "add"
-        );
-      });
+        this.$refs['i18nForm'].openDialog('新增', {})
+      })
    },
    handleBatchAdd() {
      this.$nextTick(() => {
-        this.$refs["batcnAddForm"].openDialog(
-          "批量新增",
-          {},
-          this.PublishVersionList
-        );
-      });
+        this.$refs['batcnAddForm'].openDialog('批量新增', {})
+      })
    },
    handleEdit(row) {
      this.$nextTick(() => {
-        this.$refs["i18nForm"].openDialog(
-          "编辑",
-          row,
-          this.PublishVersionList,
-          "update"
-        );
-      });
+        this.$refs['i18nForm'].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;
-        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();
-    },
-    // 选择
-    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;
+      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;
+      }
+    }
+  }
 </style>
@@ -10,72 +10,46 @@
        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="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-form-item label="发布日期" prop="PublishTime">
          <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,
-    State: null,
-    IsCurrentVersion: null,
-  };
-};
+    UpdateContent: null
+  }
+}
 export default {
-  name: "LogForm",
+  name: 'LogForm',
  components: { BaseModel },
  data() {
    return {
@@ -83,73 +57,54 @@ 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' }
-        // ],
-        IsCurrentVersion: [
-          { required: true, message: "请选择", trigger: "blur" },
+        PublishTime: [
+          { 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,
-      },
-    };
+      model_cfg: { visible: false, showClose: true, width: '500px', title: '', appendToBody: true }
+    }
+  },
+  mounted() {
  },
-  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;
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-::v-deep .el-select,
-.el-date-editor {
-  width: 100%;
+      this.model_cfg.visible = false
+    }
+  }
 }
-</style>
+</script>
@@ -2,11 +2,25 @@
  <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
@@ -29,14 +43,17 @@
      </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"
@@ -50,16 +67,6 @@
          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"
@@ -68,23 +75,10 @@
          sortable="custom"
        >
          <template slot-scope="scope">
-            {{
-              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>
+            {{ scope.row.PublishTime?moment(scope.row.PublishTime).format('YYYY-MM-DD'):'' }}
          </template>
        </el-table-column>
+
        <el-table-column
          label="操作"
          fixed="right"
@@ -109,10 +103,11 @@
            >
              删除
            </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"
@@ -120,25 +115,28 @@
          @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() {
@@ -147,101 +145,95 @@ 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();
-    },
-  },
-};
-</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;
+      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;
+      }
+    }
+  }
 </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"
@@ -41,7 +41,11 @@
          <!-- 工作台 -->
          <span slot="title">{{ $t("trials:menuTitle:workbench") }}</span>
        </el-menu-item>
-        <el-menu-item v-if="!hasPermi(['role:zys','role:zyss','role:zybs'])" index="2" :disabled="TotalNeedSignSystemDocCount !== 0">
+        <el-menu-item
+          v-if="!hasPermi(['role:zys'])"
+          index="2"
+          :disabled="TotalNeedSignSystemDocCount !== 0"
+        >
          <i class="el-icon-box" />
          <!-- 我的项目 -->
          <span slot="title">
@@ -89,7 +93,7 @@
          }}</el-menu-item>
        </el-submenu>
      </el-menu>
-      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
+      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
    </div>
  </div>
 </template>
@@ -158,7 +162,7 @@ export default {
          this.logout();
          break;
        case "4-4":
-          this.go("/system");
+          this.go("/dashboard/list");
          break;
        case "1":
          this.go("/trials/trials-workbench");
@@ -323,7 +323,6 @@ export default {
    },
    // 关闭签名弹窗
    closeSignDialog(isSave) {
-      this.duration = 0
      this.signVisible = false
      if (isSave) {
        this.currentIsConfirm = true
@@ -5,14 +5,9 @@
      <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"
@@ -25,21 +20,17 @@
            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>
        <!-- 审核人 -->
@@ -48,19 +39,14 @@
            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"
@@ -69,19 +55,8 @@
        </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>
        <!-- 更新时间 -->
@@ -91,42 +66,34 @@
            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>
@@ -136,7 +103,7 @@
      <el-table
        ref="siteResearchList"
        v-loading="loading"
-        v-adaptive="{ bottomOffset: 60 }"
+        v-adaptive="{bottomOffset:60}"
        :data="list"
        stripe
        height="100"
@@ -186,11 +153,7 @@
          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>
        <!-- 审核人 -->
@@ -201,7 +164,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>
        <!-- 状态 -->
@@ -212,18 +175,10 @@
          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>
        <!-- 是否废除 -->
@@ -234,12 +189,8 @@
          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>
        <!-- 更新时间 -->
@@ -249,7 +200,9 @@
          min-width="150"
          show-overflow-tooltip
        />
-        <el-table-column width="150">
+        <el-table-column
+          width="150"
+        >
          <template slot-scope="scope">
            <!-- 查看 -->
            <el-button
@@ -261,9 +214,7 @@
            />
            <!-- 审批 -->
            <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')"
@@ -272,9 +223,7 @@
            />
            <!-- 废除 -->
            <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')"
@@ -286,13 +235,7 @@
      </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>

    <!-- 中心人员 -->
@@ -303,12 +246,10 @@
      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>

    <!-- 调查表 -->
@@ -324,87 +265,53 @@
    <!-- 调查表链接 -->
    <base-model :config="share_model">
      <template slot="dialog-body">
-        <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>
+          <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>
      </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 QRCode from "qrcodejs2";
+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'

 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 {
@@ -416,223 +323,117 @@ export default {
      siteOptions: [],
      researchUserVisible: false,
      researchInfoVisible: false,
-      share_model: {
-        visible: false,
-        title: this.$t("trials:researchRecord:title:shark"),
-        width: "800px",
-      },
-      shareLink: "",
-      researchState: this.$d.ResearchRecord,
-      qrcode: null,
-    };
+      share_model: { visible: false, title: '', width: '500px' },
+      shareLink: '',
+      researchState: this.$d.ResearchRecord
+    }
  },
  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"));
-        });
-    },
-    // 创建二维码
-    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")
-            );
-          }
-        );
-      });
+          this.$message.success(this.$t('trials:researchRecord:message:copySuccessfully'))
+        }
+      ).catch(() => {
+        // 复制失败
+        this.$alert(this.$t('trials:researchRecord:message:copyFailed'))
+      })
    },
    // 获取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;
-      this.$nextTick(() => {
-        this.creatQrCode();
-      });
+      const trialId = this.trialId
+      this.shareLink = `${location.protocol}//${location.host}/researchLogin?trialId=${trialId}&lang=${this.$i18n.locale}`
+      this.share_model.visible = true
    },
    // 重置
    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();
-    },
-  },
-  beforeDestroy() {
-    if (this.qrcode) {
-      this.qrcode = null;
+      this.searchData.SortField = column.prop
+      this.getList()
    }
-  },
-};
+  }
+}
 </script>
-<style lang="scss" scoped>
-.shareLink {
-  padding-right: 20px;
-  width: 50%;
-  position: relative;
-  .shareLinkBtn{
-    position: absolute;
-    bottom: 0px;
-    left: 0px;
-  }
-}
-.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,8 +140,7 @@
          >
            <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="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> -->
+                <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>
@@ -475,17 +474,6 @@ 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,28 +203,30 @@
          >
            <i slot="default" class="el-icon-plus" />
            <div slot="file" slot-scope="{file}">
-              <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)"
+              <viewer :images="images" :ref="file.url">
+                <img
+                  class="el-upload-list__item-thumbnail"
+                  :src="OSSclientConfig.basePath + file.url"
+                  alt=""
+                  crossorigin="anonymous"
                >
-                  <i class="el-icon-zoom-in" />
-                </span>
+                <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
+                    v-if="adInfo.ReadingTaskState < 2"
+                    class="el-upload-list__item-delete"
+                    @click="handleRemove(file)"
+                  >
+                    <i class="el-icon-delete" />
+                  </span>
                </span>
-              </span>
+              </viewer>
            </div>
          </el-upload>
          
@@ -303,9 +305,6 @@
      </div>
      <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
    </el-dialog>
-    <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
-      <img :src="imageUrl"  crossorigin="anonymous" alt="">
-    </viewer>
  </div>
 </template>
 <script>
@@ -388,7 +387,8 @@ export default {
      judgeResultArmEnum: '',
      criterionType: null,
      openWindow: null,
-      isFixed: false
+      isFixed: false,
+      images: []
    }
  },
  // watch: {
@@ -707,9 +707,9 @@ export default {
    },
    // 预览图片
    handlePictureCardPreview(file) {
-      this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.imgVisible = true
-      this.$refs.viewer.$viewer.show()
+      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
+      // this.imageUrl = this.OSSclientConfig.basePath + file.url
+      this.$refs[file.url].$viewer.show()
    },
    // 删除图片
    handleRemove(file, fileList) {
@@ -13,7 +13,7 @@
    <!-- 临床数据 -->
    <div v-if="stack.isExistsClinicalData" class="info-cd" @click.stop="handleViewCD($event)">
      <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:clinicalData')" placement="bottom">
-        <svg-icon icon-class="documentation" class="svg-icon"/>
+        <svg-icon icon-class="documentation" class="svg-icon" />
      </el-tooltip>

    </div>
@@ -899,7 +899,7 @@ export default {
          } else {
            cornerstoneTools.setToolEnabledForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
          }
-          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame) || !data.MeasureData.frame) && data.MeasureData) {
+          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame && data.MeasureData) || (!this.stack.isExistMutiFrames && data.MeasureData))) {
            const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type)
            if (toolState && toolState.data.length > 0) {
              var idx = toolState.data.findIndex(item => item.uuid === data.MeasureData.data.uuid)
@@ -1054,7 +1054,7 @@ export default {
        this.stack.studyId = dicomSeries.studyId
        this.stack.seriesNumber = dicomSeries.seriesNumber
        this.stack.imageIds = dicomSeries.imageIds
-        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex ? dicomSeries.imageIdIndex : 0
+        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length - 1 ? dicomSeries.imageIdIndex : 0
        this.stack.imageIdIndex = dicomSeries.imageIdIndex
        this.stack.firstImageLoading = true
        this.stack.visitTaskId = dicomSeries.visitTaskId
@@ -1203,7 +1203,7 @@ export default {
        this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
        this.stack.instanceId = instanceId
        this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
-        this.resetWwwc()
+        // this.resetWwwc()
        resolve()
      })
    },
@@ -1941,6 +1941,9 @@ export default {
      for (const [key, value] of searchParams.entries()) {
        params[key] = value
      }
+      if (isNaN(params.frame)){
+        params.frame = 0
+      }
      return params
    },
    preventDefault(e) {
@@ -878,7 +878,7 @@ export default {
    activeSeries: {
      immediate: true,
      handler(v) {
-        console.log('activeSeries', v)
+        // console.log('activeSeries', v)
        if (v && v.isCurrentTask && this.studyList.length === 0) {
          this.activeTaskInfo.taskName = v.taskBlindName
          this.activeTaskInfo.visitTaskId = v.visitTaskId
@@ -1021,6 +1021,10 @@ export default {
      if (!this.petctWindow) return
      this.petctWindow.postMessage({ type: 'readingPageUpdate', data: data }, window.location)
    })
+    DicomEvent.$on('resetPage', () => {
+      if (!this.petctWindow) return
+      this.petctWindow.postMessage({ type: 'resetPage' }, window.location)
+    })
    DicomEvent.$on('setReadingState', (data) => {
      if (!this.petctWindow) return
      this.petctWindow.postMessage({ type: 'setReadingState', data: data }, window.location)
@@ -1058,28 +1062,30 @@ export default {
    })
  },
  methods: {
-    getWwcTpl() {
-      const loading = this.$loading({ fullscreen: true })
-      getUserWLTemplateList().then(res => {
+    async getWwcTpl() {
+      // const loading = this.$loading({ fullscreen: true })
+      try {
+        const res = await getUserWLTemplateList()
        this.customWwcTpl = []
        res.Result.map(i => {
          this.customWwcTpl.push({ label: i.TemplateName, wc: i.WL, ww: i.WW })
        })
        this.wwwcArr = [...this.defaultWwwc, ...this.customWwcTpl]
-        loading.close()
-      }).catch(() => { loading.close() })
+      } catch (e) {
+        console.log(e)
+      }
    },
-    getHotKeys() {
-      const loading = this.$loading({ fullscreen: true })
-      getDoctorShortcutKey({ imageToolType: 0 }).then(res => {
+    async getHotKeys() {
+      // const loading = this.$loading({ fullscreen: true })
+      try {
+        const res = await getDoctorShortcutKey({ imageToolType: 0 })
        res.Result.map(item => {
          this.hotKeyList.push({ id: item.Id, altKey: item.AltKey, ctrlKey: item.CtrlKey, shiftKey: item.ShiftKey, metaKey: item.MetaKey, key: item.Keyboardkey, code: item.Code, text: item.Text, shortcutKeyEnum: item.ShortcutKeyEnum })
        })
        this.bindHotKey()
-        loading.close()
-      }).catch(() => {
-        loading.close()
-      })
+      } catch (e) {
+        console.log(e)
+      }
    },
    resetHotkeyList(arr) {
      this.hotKeyList = []
@@ -1102,7 +1108,7 @@ export default {
      var container = this.$refs['container']
      // window.addEventListener
      container.addEventListener('keydown', event => {
-        console.log(event)
+        // console.log(event)
        event.preventDefault()

        var idx = this.hotKeyList.findIndex(i => i.code === event.code && i.ctrlKey === event.ctrlKey && i.shiftKey === event.shiftKey && i.altKey === event.altKey)
@@ -7,7 +7,7 @@
        {{ language==='en'?question.GroupEnName:question.GroupName }}
      </h4>
    </div>
-    <template v-else-if="((question.QuestionType === 56 || question.QuestionType === 57) && question.IsBaseLineTask)" />
+    <template v-else-if="((question.QuestionType === 56) && question.IsBaseLineTask)" />
    <template v-else>
      <el-form-item
        v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0"
@@ -29,7 +29,7 @@
                  class="title"
                >
                  {{ item.QuestionName }}
-                  <span v-if="isFirstChangeTask && item.TableQuestions.Answers.length > 0" style="color:red;font-size: 12px;">(请重新评估)</span>
+                  <span v-if="isFirstChangeTask && item.TableQuestions.Answers.length > 0" style="color:red;font-size: 12px;">{{ $t("trials:reading:dicom:IRecist:reevaluate") }}</span>
                </div>
                <div v-else class="title">
                  {{ item.QuestionName }}
@@ -72,6 +72,13 @@ import DicomEvent from './DicomEvent'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import { mapGetters } from 'vuex'
+import * as dicomParser from 'dicom-parser'
+import * as cornerstone from 'cornerstone-core'
+import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
+cornerstoneWADOImageLoader.external.dicomParser = dicomParser
+cornerstoneWADOImageLoader.external.cornerstone = cornerstone
+const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
+cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
  name: 'ReadPage',
  components: {
@@ -210,14 +217,20 @@ export default {
        this.$refs[this.activeTaskVisitId][0].selectSeries(data)
      })
    })
+    cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
+    window.addEventListener('beforeunload', e => {
+      cornerstone.imageCache.purgeCache()
+    })
  },
  beforeDestroy() {
+    cornerstone.imageCache.purgeCache()
    DicomEvent.$off('getNextVisitInfo')
    DicomEvent.$off('toggleSeries')
    DicomEvent.$off('isCanActiveNoneDicomTool')
    DicomEvent.$off('removeNoneDicomMeasureData')
    DicomEvent.$off('addNoneDicomMeasureData')
    DicomEvent.$off('selectSeries')
+    window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
  },
  methods: {
    async getVisitInfo() {
@@ -400,7 +413,7 @@ export default {
        idx > -1 ? obj = seriesList[idx] : ''
      }
      if (obj) {
-        const index = Math.floor(obj.imageIds.length * ((baseSeries.imageIdIndex + 1) / baseSeries.instanceCount))
+        const index = Math.floor(obj.imageIds.length * ((baseSeries.imageIdIndex + 1) / baseSeries.imageIds))
        obj.imageIdIndex = index > 0 ? index - 1 : 0
      }
      return obj
@@ -488,6 +501,16 @@ export default {
        seriesInfo = this.getLinkedSeries(baseSeries, visitTaskId, visitTaskIdx)
      }
      return seriesInfo
+    },
+    cornerstoneimageloadprogress(e) {
+      const imageId = e.detail.imageId
+      const params = {}
+      const searchParams = new URLSearchParams(imageId.split('?')[1])
+      for (const [key, value] of searchParams.entries()) {
+        params[key] = value
+      }
+      params.percentComplete = e.detail.percentComplete
+      store.dispatch('reading/setImageLoadedProgress', params)
    }
  }
 }
@@ -67,28 +67,20 @@
                        trigger="hover"
                        popper-class="instance_frame_wrapper"
                      >
-                        <div
+                        <div class="frame_list">
+                          <div
                          v-for="(instance, idx) in series.instanceInfoList"
                          :key="instance.Id"
                          class="frame_content"
                          :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
                          @click.stop="showMultiFrames(index,series, i, instance)"
                        >
-                          <!-- <div>
-                                        <img
-                                          class="image-preview"
-                                          :src="series.previewImageUrl"
-                                          crossorigin="anonymous"
-                                          alt=""
-                                          style="width: 40px;height:40px;"
-                                          fit="fill"
-                                        >
-                                      </div> -->
                          <div>
                            <div>{{ instance.InstanceNumber }}</div>
                            <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
                          </div>

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

@@ -270,18 +255,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) {
@@ -360,8 +345,27 @@ export default {
            this.studyIndex = sIdx
            this.seriesIndex = 0
            this.activeNames = [`${this.studyList[sIdx].StudyId}`]
-
-            this.loadImages(this.visitTaskList[idx])
+            // 下载关键序列
+            const i = this.studyList.findIndex(i => i.IsCriticalSequence)
+            if (i > -1 && this.studyList[i].SeriesList[0].length > 0) {
+              const series = this.studyList[i].SeriesList[0]
+              if (!series.loadStatus) {
+                let priority = parseInt(new Date().getTime())
+                if (series.isExistMutiFrames) {
+                  series.instanceInfoList.map(image => {
+                    priority = priority - 1
+                    this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, studyIndex: i, seriesIndex: 0, visitTaskId: series.visitTaskId, priority })
+                  })
+                } else {
+                  series.imageIds.map(imageId => {
+                    priority = priority - 1
+                    this.imageList.push({ imageId: imageId, seriesId: series.seriesId, studyIndex: i, seriesIndex: 0, visitTaskId: series.visitTaskId, priority })
+                  })
+                }
+              }
+            }
+            this.loopLoad()
+            // this.loadImages(this.visitTaskList[idx])
          }
        }
        this.isRender = true
@@ -369,7 +373,6 @@ export default {
    },

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

-    const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
+    // const maximumSizeInBytes = 1024 * 1024 * 1024 * 3 // 1 GB
    // const maximumSizeInBytes = 1024 * 1024 * 500
-    cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
+    // cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
    this.customWwc = {
      visible: false,
      title: this.$t('trials:reading:dagTitle:wwwcCustom')
@@ -993,6 +993,7 @@ export default {
      }
      console.log('getMeasureData')
    })
+    
    DicomEvent.$on('getScreenshots', (callback) => {
      var base64Str =
        this.$refs[
@@ -1051,11 +1052,11 @@ export default {
      this.uploadStatus = status
      this.uploadImageVisible = true
    },
-    getWwcTpl() {
-      const loading = this.$loading({ fullscreen: true })
-      getUserWLTemplateList()
-        .then((res) => {
-          this.customWwcTpl = []
+    async getWwcTpl() {
+      // const loading = this.$loading({ fullscreen: true })
+      try {
+        let res = await getUserWLTemplateList()
+        this.customWwcTpl = []
          res.Result.map((i) => {
            this.customWwcTpl.push({
              label: i.TemplateName,
@@ -1064,35 +1065,32 @@ export default {
            })
          })
          this.wwwcArr = [...this.defaultWwwc, ...this.customWwcTpl]
-          loading.close()
-        })
-        .catch(() => {
-          loading.close()
-        })
+      } catch(e) {
+        console.log(e)
+      }
+      
    },
-    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
-            })
+    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
          })
-          this.bindHotKey()
-          loading.close()
-        })
-        .catch(() => {
-          loading.close()
        })
+        this.bindHotKey()
+      } catch(e) {
+        console.log(e)
+      }
    },
    resetHotkeyList(arr) {
      this.hotKeyList = []
@@ -74,6 +74,13 @@ import DicomEvent from "./../components/DicomEvent";
 import store from "@/store";
 import { getToken } from "@/utils/auth";
 import { mapGetters } from "vuex";
+import * as dicomParser from 'dicom-parser'
+import * as cornerstone from 'cornerstone-core'
+import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
+cornerstoneWADOImageLoader.external.dicomParser = dicomParser
+cornerstoneWADOImageLoader.external.cornerstone = cornerstone
+const maximumSizeInBytes = 1024 * 1024 * 1024 * 6
+cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
 export default {
  name: "CustomizeReadPage",
  components: {
@@ -229,6 +236,10 @@ export default {
        this.$refs[this.activeTaskVisitId][0].selectSeries(data);
      });
    });
+    cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
+    window.addEventListener('beforeunload', e => {
+      cornerstone.imageCache.purgeCache()
+    })
  },
  beforeDestroy() {
    DicomEvent.$off("getNextVisitInfo");
@@ -237,6 +248,7 @@ export default {
    DicomEvent.$off("removeNoneDicomMeasureData");
    DicomEvent.$off("addNoneDicomMeasureData");
    DicomEvent.$off("selectSeries");
+    window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
  },
  methods: {
    async getVisitInfo() {
@@ -523,7 +535,7 @@ export default {
      if (obj) {
        let index = Math.floor(
          obj.imageIds.length *
-            ((baseSeries.imageIdIndex + 1) / baseSeries.instanceCount)
+            ((baseSeries.imageIdIndex + 1) / baseSeries.imageIds)
        );
        obj.imageIdIndex = index > 0 ? index - 1 : 0;
      }
@@ -646,6 +658,16 @@ export default {
      }
      return seriesInfo;
    },
+    cornerstoneimageloadprogress(e) {
+      const imageId = e.detail.imageId
+      const params = {}
+      const searchParams = new URLSearchParams(imageId.split('?')[1])
+      for (const [key, value] of searchParams.entries()) {
+        params[key] = value
+      }
+      params.percentComplete = e.detail.percentComplete
+      store.dispatch('reading/setImageLoadedProgress', params)
+    }
  },
 };
 </script>
@@ -67,28 +67,30 @@
                        trigger="hover"
                        popper-class="instance_frame_wrapper"
                      >
-                        <div
-                          v-for="(instance, idx) in series.instanceInfoList"
-                          :key="instance.Id"
-                          class="frame_content"
-                          :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
-                          @click.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 class="frame_list">
+                          <div
+                            v-for="(instance, idx) in series.instanceInfoList"
+                            :key="instance.Id"
+                            class="frame_content"
+                            :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
+                            @click.stop="showMultiFrames(index,series, i, instance)"
+                          >
+                            <!-- <div>
+                                          <img
+                                            class="image-preview"
+                                            :src="series.previewImageUrl"
+                                            crossorigin="anonymous"
+                                            alt=""
+                                            style="width: 40px;height:40px;"
+                                            fit="fill"
+                                          >
+                                        </div> -->
+                            <div>
+                              <div>{{ instance.InstanceNumber }}</div>
+                              <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
+                            </div>

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

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

@@ -812,139 +802,6 @@ export default {
      requestPoolManager.removeTask(series.seriesId)
      this.$set(this.studyList[studyIndex].SeriesList[seriesIndex], 'isLoading', false)
    },
-    async imageLoaded(image, seriesUid) {
-      // await store.dispatch('reading/updateStudyList', { visitTaskId: image.visitTaskId, imageId: image.imageId, seriesUid })
-      // console.log(this.studyList[image.studyIndex].SeriesList[image.seriesIndex])
-      if (image.studyIndex > -1 && image.seriesIndex > -1) {
-        var prefetchInstanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount
-        var instanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].instanceCount
-        if (this.studyList[image.studyIndex].SeriesList[image.seriesIndex].imageloadedArr.indexOf(image.imageId) < 0) {
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].imageloadedArr.push(image.imageId)
-          prefetchInstanceCount = prefetchInstanceCount + 1
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount = prefetchInstanceCount
-        }
-        if (prefetchInstanceCount >= instanceCount) {
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].loadStatus = true
-        }
-      }
-
-      // store.dispatch('reading/updateSeriesList', { visitTaskindex: this.visitTaskIdx, studyIndex: image.studyIndex, seriesIndex: image.seriesIndex, imageId: image.imageId })
-    },
-    // instance下载成功回调
-    async cornerstoneImageLoaded(e) {
-      // var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
-      // if (idx === -1) return
-      // this.studyList = this.visitTaskList[idx].StudyList
-      // if (!this.studyList || this.studyList.length === 0) {
-      //   return
-      // }
-      // if (!this.visitTaskList[idx].IsInit) {
-      //   const loading = this.$loading({ fullscreen: true })
-      //   await store.dispatch('reading/getMeasuredData', this.visitTaskList[idx].VisitTaskId)
-      //   await store.dispatch('reading/getStudyInfo', { trialId: this.trialId, subjectVisitId: this.visitTaskList[idx].VisitId, visitTaskId: this.visitTaskList[idx].VisitTaskId, taskBlindName: this.visitTaskList[idx].TaskBlindName })
-      //   await store.dispatch('reading/getReadingQuestionAndAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[idx].VisitTaskId })
-      //   await store.dispatch('reading/getDicomReadingQuestionAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[idx].VisitTaskId })
-      //   await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[idx].VisitTaskId })
-      //   loading.close()
-      // }
-      // await store.dispatch('reading/updateStudyList', { visitTaskId: this.visitTaskId, imageId: e.detail.image.imageId, seriesUid: e.detail.image.data.string('x0020000e') })
-      // const uri = e.detail.image.sharedCacheKey
-      // const index = this.cachedImages.findIndex(item => item.uri === uri)
-      // if (index === -1) {
-      //   this.cachedImages.push({ uri: uri, timestamp: new Date().getTime() })
-      // } else {
-      //   this.cachedImages[index].timestamp = new Date().getTime()
-      // }
-      // var imageId = e.detail.image.imageId
-      // var seriesUid = e.detail.image.data.string('x0020000e')
-      // var studyIndex = -1
-      // var seriesIndex = -1
-      // for (let i = 0; i < this.studyList.length; ++i) {
-      //   for (let j = 0; j < this.studyList[i].SeriesList.length; ++j) {
-      //     if (this.studyList[i].SeriesList[j].seriesUid === seriesUid) {
-      //       studyIndex = i
-      //       seriesIndex = j
-      //       break
-      //     }
-      //   }
-      //   if (studyIndex > 0) break
-      // }
-      // if (seriesIndex < 0) return
-
-      // const imageIdIndex = this.studyList[studyIndex].SeriesList[seriesIndex].imageIds.indexOf(imageId)
-      // if (imageIdIndex < 0) return
-      // if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
-      //   if (this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount >= this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount) {
-      //     // 设置当前序列状态为已下载完成
-      //     this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
-      //   }
-      // }
-    },
-    cornerstoneimageloadprogress(e) {
-      const imageId = e.detail.imageId
-      const percentComplete = e.detail.percentComplete
-      const params = {}
-      const searchParams = new URLSearchParams(imageId.split('?')[1])
-      for (const [key, value] of searchParams.entries()) {
-        params[key] = value
-      }
-      if (this.visitTaskId === params.visitTaskId) {
-        const studyIndex = params.idx.split('|')[0]
-        const seriesIndex = params.idx.split('|')[1]
-        
-        const seriesId = this.studyList[studyIndex].SeriesList[seriesIndex].seriesId
-        const i = this.keySeriesLoad.findIndex(i => i.seriesId === seriesId)
-        if (this.studyList[studyIndex].IsCriticalSequence && percentComplete >= 100) {
-          // 关键序列处理
-          if (i === -1) {
-            this.keySeriesLoad.push({ seriesId: seriesId, loadCount: 1, imageIds: [imageId] })
-          } else {
-            ++this.keySeriesLoad[i].loadCount
-            this.keySeriesLoad[i].imageIds.push(imageId)
-          } 
-        }
-        if (!this.studyList[studyIndex].IsCriticalSequence && i > -1) {
-          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount + 100 * this.keySeriesLoad[i].loadCount
-          this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr = [this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr, this.keySeriesLoad[i].imageIds]
-          this.keySeriesLoad.splice(i, 1)
-        }
-        var prefetchInstanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount
-        var instanceCount = this.studyList[studyIndex].SeriesList[seriesIndex].instanceCount
-        if (this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.indexOf(imageId) < 0) {
-          const i = this.currentLoadIns.findIndex(i => i.imageId === imageId)
-          if (i > -1) {
-            prefetchInstanceCount = prefetchInstanceCount - this.currentLoadIns[i].percentComplete + percentComplete
-            this.currentLoadIns[i].percentComplete = percentComplete
-            if (percentComplete === 100) {
-              this.currentLoadIns.splice(i, 1)
-            }
-          } else {
-            if (percentComplete !== 100) {
-              this.currentLoadIns.push({ imageId, percentComplete })
-            }
-            prefetchInstanceCount = prefetchInstanceCount + percentComplete
-          }
-          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = prefetchInstanceCount
-          if (percentComplete >= 100) {
-            this.studyList[studyIndex].SeriesList[seriesIndex].imageloadedArr.push(imageId)
-          }
-        }
-        if (prefetchInstanceCount >= instanceCount * 100) {
-          this.studyList[studyIndex].SeriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
-          // 设置当前序列状态为已下载完成
-          this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true
-        }
-      }
-    },
-    cornerstoneimagecachechanged(e) {
-      const cacheInfo = cornerstone.imageCache.getCacheInfo()
-      console.log(cacheInfo)
-    },
-    cornerstoneimagecachefull(e) {
-      console.log('超过内存了')
-    }
  }
 }
 </script>
@@ -1099,6 +956,18 @@ export default {
  border: 1px solid #2c2c2c;
  padding: 5px;
 }
+.frame_list{
+  max-height: 500px;
+  overflow-y: auto;
+}
+.instance_frame_wrapper ::-webkit-scrollbar {
+  width: 7px;
+  height: 7px;
+}
+.instance_frame_wrapper  ::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background: #d0d0d0;
+}
 .frame_content{
  height: 50px;
  padding: 5px;
@@ -77,12 +77,23 @@
                  <!-- 本次医学审核相关截图（如适用）如下： -->
                  {{ $t('trials:medicalFeedback:message:msg5') }}
                  <ol>
-                    <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 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>
                  </ol>
                </div>
@@ -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,13 +369,12 @@
        :row-data="currentRow"
        @getList="getList"
        @close="auditVisible=false"
-        @nextTask="nextTask"
      />
    </el-dialog>
  </BaseContainer>
 </template>
 <script>
-import { getIRMedicalFeedbackList, getNextIRMedicalFeedback } from '@/api/trials'
+import { getIRMedicalFeedbackList } from '@/api/trials'
 import { getTrialCriterionList } from '@/api/trials/reading'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
@@ -457,26 +456,6 @@ 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,20 +138,22 @@
        >
          <i slot="default" class="el-icon-plus" />
          <div slot="file" slot-scope="{file}">
-            <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 :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>
          </div>
        </el-upload>
        <el-dialog
@@ -237,8 +239,8 @@ export default {
      this.visitTaskArmList = JudgeInfo.VisitTaskArmList
    },
    handlePictureCardPreview(file) {
-      this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.imgVisible = true
+      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
+      this.$refs[file.url].$viewer.show()
    },
    handleViewDetail(visitTaskId) {
      console.log(this.rowData)
@@ -77,12 +77,23 @@
                  <!-- 本次医学审核相关截图（如适用）如下： -->
                  {{ $t('trials:medicalFeedback:message:msg5') }}
                  <ol>
-                    <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 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>
                  </ol>
                </div>
@@ -92,28 +92,30 @@
        >
          <i slot="default" class="el-icon-plus" />
          <div slot="file" slot-scope="{file}">
-            <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)"
+            <viewer :images="images" :ref="file.url">
+              <img
+                class="el-upload-list__item-thumbnail"
+                :src="OSSclientConfig.basePath + file.url"
+                crossOrigin="anonymous"
+                alt=""
              >
-                <i class="el-icon-zoom-in" />
-              </span>
+              <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
+                  v-if="!isSendMessage && auditState!==2"
+                  class="el-upload-list__item-delete"
+                  @click="handleRemove(file)"
+                >
+                  <i class="el-icon-delete" />
+                </span>
              </span>
-            </span>
+            </viewer>
          </div>
        </el-upload>
        <!-- <el-dialog
@@ -130,9 +132,9 @@
      </el-form-item>

    </el-form>
-    <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
+    <!-- <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
      <img :src="imageUrl"  crossorigin="anonymous" alt="">
-    </viewer>
+    </viewer> -->
    <el-dialog
      v-if="chatVisible"
      :visible.sync="chatVisible"
@@ -222,7 +224,8 @@ export default {
      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
      isClosedDialog: false,
      isSendMessage: false,
-      closeQuestionVisible: false
+      closeQuestionVisible: false,
+      images:[]
    }
  },
  mounted() {
@@ -382,9 +385,9 @@ export default {
    },
    // 预览图片
    handlePictureCardPreview(file) {
-      this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.imgVisible = true
-      this.$refs.viewer.$viewer.show()
+      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
+      // this.imageUrl = this.OSSclientConfig.basePath + file.url
+      this.$refs[file.url].$viewer.show()
    },
    // 删除图片
    handleRemove(file, fileList) {
@@ -394,7 +397,7 @@ export default {
    },
    initializeViewer() {
      Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
+        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true}
      })
    }
  }
@@ -67,10 +67,6 @@
      <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>

    <!--签名框 -->
@@ -225,20 +221,7 @@ 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">确认</el-button>
+        <el-button type="primary" @click="handleConfirmCD">{{$t("common:button:confirm")}}</el-button>
      </span>
    </el-dialog>

@@ -136,7 +136,8 @@ export default {
    this.readingTool = this.$router.currentRoute.query.readingTool
    this.isNewSubject = this.$router.currentRoute.query.isNewSubject
    if (this.isNewSubject && this.isReadingTaskViewInOrder) {
-      this.$message.success(`已开始受试者${this.subjectCode}阅片任务`)
+      let message = this.$t('trials:reading:noneDicom:message:startRead').replace("xxx",this.subjectCode);
+      this.$message.success(message)
      changeURLStatic('isNewSubject', '')
    }
    if (this.$router.currentRoute.query.TokenKey) {
@@ -313,8 +313,9 @@
                </div>
                <el-tag type="danger">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
              </el-tooltip>
-              <el-tag v-if="scope.row.RequestReReadingResultEnum === 1" type="primary">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
-              <el-tag v-if="scope.row.RequestReReadingResultEnum === 0" type="warning">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
+              <el-tag v-else-if="scope.row.RequestReReadingResultEnum === 1" type="primary">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
+              <el-tag v-else-if="scope.row.RequestReReadingResultEnum === 0" type="warning">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
+              <el-tag v-else type="info">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
            </div>
          </template>
        </el-table-column>
@@ -784,7 +785,7 @@ export default {
        this.signVisible = false
      }
    },
-    confirmReReading(row, type, open, signInfo) {
+    async confirmReReading(row, type, open, signInfo) {
      if (open) {
        this.rowData = { ...row }
        this.ConfirmReReadingVisible = true
@@ -794,41 +795,41 @@ export default {
        return
      }
      if (type === 2) {
-        this.$refs.reasonForm.validate((valid) => {
-          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
-          })
-        })
+        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
+        }
        return
      }
      var params = {
@@ -848,21 +849,29 @@ export default {
      }
      this.loading = true
      this.btnLoading = true
-      confirmReReading(params).then(() => {
+      try {
+        let res = await confirmReReading(params)
        this.loading = false
        this.btnLoading = false
-        // this.$message.success(`${type === 1 ? '同意' : '拒绝'}申请成功`)
-        // 同意申请成功/拒绝申请成功
-        this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`)
-        this.ReReadingOrBackVisible = false
        this.$refs['signForm'].btnLoading = false
-        this.signVisible = false
-        this.getList()
-      }).catch(() => {
+        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.loading = false
        this.$refs['signForm'].btnLoading = false
        this.btnLoading = false
-      })
+      }
    },
    assignSubjectTaskToDoctor(row, type) {
      this.rowData = { ...row }
@@ -135,25 +135,12 @@ 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)
-  //   }
-  // },
-  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
-      };
+  watch: {
+    activeTab(v) {
+      console.log(v)
    }
  },
  mounted() {
@@ -17,6 +17,21 @@
          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 { addDefaultQuestions , batchDeteteCriterionMedicineQuestion, getReadingMedicineTrialQuestionList, deleteReadingMedicineTrialQuestion, confirmReadingMedicineQuestion, verifyReadingMedicineQuestion, verifyIsCanConfirm } from '@/api/trials'
+import { 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,6 +382,7 @@ export default {
      this.CurrentCriterionType = this.trialCriterionList.find(v => {
        return v.TrialReadingCriterionId === this.trialReadingCriterionId
      }).CriterionType
+      console.log(this.CurrentCriterionType)
    }
  },
  mounted() {
@@ -389,23 +390,6 @@ 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
    },
@@ -449,8 +433,7 @@ export default {
    },
    // 打开系统模板配置项
    handleAdd() {
-      // this.addVisible = true
-      this.addDefaultQuestions();
+      this.addVisible = true
    },
    handleEdit(row) {
      this.currentRow = { ...row }
@@ -1,127 +0,0 @@
-<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>
@@ -1,183 +0,0 @@
-<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,13 +16,23 @@
        </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>
@@ -31,60 +41,120 @@
            {{ $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(", ")
@@ -94,14 +164,29 @@
        </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)
@@ -111,45 +196,53 @@
          }}</el-tag>
        </template>
      </el-table-column>
-      <!-- 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 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">
+      <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)" />
+          <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 circle :title="$t('common:button:config')" icon="el-icon-setting"
-            @click="handleConfig(scope.row, 'add')" />
+          <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)"
+          />
        </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 -->
@@ -162,31 +255,66 @@
    <!-- 修改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>
@@ -197,14 +325,29 @@
      <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>
@@ -214,33 +357,72 @@
    <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)
@@ -250,18 +432,37 @@
              }}</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>
@@ -270,11 +471,12 @@
    <!-- 导入 -->
    <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>
@@ -294,7 +496,6 @@ 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: "",
@@ -310,7 +511,7 @@ const getListQueryDefault = () => {
 };
 export default {
  name: "Participant",
-  components: { Pagination, CRCForm, BaseModel, UploadExcel, dicomAEList },
+  components: { Pagination, CRCForm, BaseModel, UploadExcel },
  data() {
    return {
      list: [],
@@ -409,10 +610,6 @@ 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
@@ -694,23 +891,19 @@ 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;
  }
@@ -7,6 +7,23 @@
        <el-form-item :label="$t('trials:qcCfg:table:questionName')">
          <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
        </el-form-item>
+        <!-- 语言类型 -->
+        <el-form-item
+          :label="$t('common:title:languageType')"
+        >
+          <el-select
+            v-model="searchData.LanguageType"
+            style="width:120px;"
+            clearable
+          >
+            <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')">
          <el-select v-model="searchData.Type" clearable style="width:120px;">
@@ -53,6 +70,16 @@
        :label="$t('trials:qcCfg:table:questionName')"
        show-overflow-tooltip
      />
+      <!-- 审核问题 -->
+      <el-table-column
+        prop="LanguageType"
+        :label="$t('common:title:languageType')"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ $fd('LanguageType', scope.row.LanguageType) }}
+        </template>
+      </el-table-column>
      <!-- 类型 -->
      <el-table-column
        prop="Type"
@@ -113,7 +140,6 @@ import { getQCQuestionConfigureList } from '@/api/dictionary'
 import { batchAddTrialQCQuestionConfigure } from '@/api/trials'
 import BoxContent from '@/components/BoxContent'
 import Pagination from '@/components/Pagination'
-import { mapGetters } from 'vuex'

 const searchDataDefault = () => {
  return {
@@ -141,23 +167,15 @@ export default {
      selectArr: []
    }
  },
-  computed: {
-    ...mapGetters(['language'])
-  },
-  created(){
-    this.trialId = this.$route.query.trialId;
-    this.getList();
+  mounted() {
+    this.trialId = this.$route.query.trialId
+    this.getList()
  },
  methods: {
    // 获取受试者列表信息
    getList() {
      this.loading = true
-      this.searchData.TrialId = this.trialId;
-      if (this.$i18n.locale === 'zh') {
-        this.searchData.LanguageType = 0
-      } else {
-        this.searchData.LanguageType = 1
-      }
+      this.searchData.TrialId = this.trialId
      getQCQuestionConfigureList(this.searchData).then(res => {
        this.loading = false
        this.list = res.Result.CurrentPageData
@@ -196,7 +214,7 @@ export default {
    },
    // 重置
    handleReset() {
-      this.searchData = searchDataDefault();
+      this.searchData = searchDataDefault()
      this.getList()
    }
  }
@@ -27,7 +27,7 @@
      </el-form-item>
      <!-- 分组名称 -->
      <el-form-item
-        v-if="(form.Type === 'group' && !isLook) || (isLook && $i18n.locale !== 'en')"
+        v-if="(form.Type === 'group' &&  $i18n.locale !== 'en')"
        :label="$t('trials:readingUnit:qsList:title:groupName')"
        prop="GroupName"
      >
@@ -37,7 +37,7 @@
      </el-form-item>
      <!-- 分组名称(En) -->
      <el-form-item
-        v-if="(form.Type === 'group' && !isLook) || (isLook && $i18n.locale !== 'zh')"
+        v-if="(form.Type === 'group' &&  $i18n.locale !== 'zh')"
        :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
        prop="GroupEnName"
      >
@@ -47,7 +47,7 @@
      </el-form-item>
      <!-- 问题名称 -->
      <el-form-item
-        v-if="(form.Type !== 'group' && !isLook) || (isLook && $i18n.locale !== 'en')"
+        v-if="(form.Type !== 'group' && $i18n.locale !== 'en' )"
        :label="$t('trials:readingUnit:qsList:title:qsName')"
        prop="QuestionName"
      >
@@ -57,7 +57,7 @@
      </el-form-item>
      <!-- 问题名称(En) -->
      <el-form-item
-        v-if="(form.Type !== 'group' && !isLook) || (isLook && $i18n.locale !== 'zh')"
+        v-if="(form.Type !== 'group' && $i18n.locale !== 'zh')"
        :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
        prop="QuestionEnName"
      >
@@ -791,6 +791,8 @@ export default {
        ],
        QuestionName: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
+        QuestionEnName:[{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
        TypeValue: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
          {validator: validateTypeVal, trigger: ['blur', 'change']},
          {max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200`}],
@@ -974,6 +976,16 @@ export default {
      this.$refs.qsForm.validate(valid => {
        if (!valid) return
        this.loading = true
+        if(this.form.QuestionName && this.$i18n.locale === 'zh'){
+          this.form.QuestionEnName = this.form.QuestionName;
+        }else if(this.form.QuestionEnName && this.$i18n.locale === 'en'){
+          this.form.QuestionName = this.form.QuestionEnName;
+        }
+        if(this.form.GroupName && this.$i18n.locale === 'zh'){
+          this.form.GroupEnName = this.form.GroupName;
+        }else if(this.$i18n.locale === 'en' && this.form.GroupEnName){
+          this.form.GroupName = this.form.GroupEnName;
+        }
        var params = Object.assign({}, this.form)
        params.TrialId = this.$route.query.trialId
        params.ReadingCriterionPageId = this.data.ReadingCriterionPageId
@@ -146,7 +146,7 @@
      <el-table-column
        prop=""
        :label="$t('common:action:action')"
-        width="280"
+        width="300"
        show-overflow-tooltip
      >
        <template slot-scope="scope">
@@ -35,7 +35,7 @@
        />
      </el-form-item>
      <el-form-item
-        v-if="form.Type !== 'group'"
+        v-if="form.Type !== 'group'&& $i18n.locale !== 'en'"
        :label="$t('trials:readingUnit:qsList:title:qsName')"
        prop="QuestionName"
      >
@@ -44,7 +44,7 @@
        />
      </el-form-item>
      <el-form-item
-        v-if="form.Type !== 'group'"
+        v-if="form.Type !== 'group'&& $i18n.locale !== 'zh'"
        :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
        prop="QuestionEnName"
      >
@@ -553,7 +553,8 @@ export default {
        ],
        QuestionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
-
+        QuestionEnName:[{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
        TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
          { validator: validateTypeVal, trigger: 'blur' },
          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
@@ -695,6 +696,11 @@ export default {
      this.$refs.tableQsForm.validate(valid => {
        if (!valid) return
        this.loading = true
+        if(this.form.QuestionName && this.$i18n.locale === 'zh'){
+          this.form.QuestionEnName = this.form.QuestionName;
+        }else if(this.form.QuestionEnName && this.$i18n.locale === 'en'){
+          this.form.QuestionName = this.form.QuestionEnName;
+        }
        var params = Object.assign({}, this.form)
        params.TrialId = this.$route.query.trialId
        params.ReadingQuestionId = this.readingQuestionId
@@ -29,12 +29,14 @@
      <!-- 名称 -->
      <el-table-column
        prop="QuestionName"
+        v-if="$i18n.locale === 'zh'"
        :label="$t('trials:readingUnit:qsList:title:qsName')"
        show-overflow-tooltip
      />
      <!-- 名称(EN) -->
      <el-table-column
        prop="QuestionEnName"
+        v-if="$i18n.locale === 'en'"
        :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
        show-overflow-tooltip
      />
@@ -16,12 +16,10 @@
        <el-input
          v-model="form.ClinicalDataSetEnName"
          :disabled="data.IsFromSystemData === true"
-          @input="form.ClinicalDataSetName = form.ClinicalDataSetEnName"
-          @blur="form.ClinicalDataSetName = form.ClinicalDataSetEnName"
        />
      </el-form-item>
      <!-- 临床数据名称 -->
-      <!-- <el-form-item
+      <el-form-item
        :label="$t('trials:processCfg:title:clinicalDataName')+ '（CN）'"
        prop="ClinicalDataSetName"
      >
@@ -29,7 +27,7 @@
          v-model="form.ClinicalDataSetName"
          :disabled="data.IsFromSystemData === true"
        />
-      </el-form-item> -->
+      </el-form-item>
      <!-- 上传人 -->
      <el-form-item
        :label="$t('trials:processCfg:title:uploader')"
@@ -1,546 +0,0 @@
-<template>
-  <div>
-    <el-form
-      ref="dicomConfigForm"
-      v-loading="loading"
-      :model="form"
-      label-width="300px"
-      style="width: 800px"
-      :rules="rules"
-      size="small"
-    >
-      <!-- pacs直连 -->
-      <el-form-item
-        :label="$t('trials:dicomCfg:form:pacsLine')"
-        prop="IsPACSConnect"
-      >
-        <el-radio-group
-          v-model="form.IsPACSConnect"
-          :disabled="form.IsTrialPACSConfirmed && !isEdit"
-          @change="changeConnect"
-        >
-          <el-radio
-            v-for="item of $d.PACSConnectMode"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <template v-if="form.IsPACSConnect">
-        <!--AE名称-->
-        <el-form-item
-          :label="$t('trials:dicomCfg:form:CalledAE')"
-          prop="CalledAE"
-        >
-          <el-input
-            v-model="form.CalledAE"
-            style="width: 80%"
-            :disabled="form.IsTrialPACSConfirmed && !isEdit"
-            clearable
-            maxlength="16"
-          />
-        </el-form-item>
-        <!-- IP地址 -->
-        <el-form-item :label="$t('trials:dicomCfg:form:Ip')" prop="Ip">
-          <el-input
-            v-model="form.Ip"
-            style="width: 80%"
-            :disabled="form.IsTrialPACSConfirmed && !isEdit"
-            clearable
-          />
-        </el-form-item>
-        <!-- 端口 -->
-        <el-form-item :label="$t('trials:dicomCfg:form:Port')" prop="Port">
-          <el-input
-            v-model.number="form.Port"
-            type="number"
-            clearable
-            style="width: 80%"
-            :disabled="form.IsTrialPACSConfirmed && !isEdit"
-          />
-        </el-form-item>
-        <!--状态-->
-        <el-form-item
-          :label="$t('trials:dicomCfg:form:IsTestOK')"
-          prop="IsTestOK"
-        >
-          <el-tag
-            :type="form.IsTestOK ? 'success' : 'danger'"
-            effect="plain"
-            v-if="form.IsTestOK !== null"
-          >
-            {{ $fd("DicomTest", form.IsTestOK) }}
-          </el-tag>
-        </el-form-item>
-      </template>
-      <el-form-item>
-        <!-- 测试DICOM AE -->
-        <el-button
-          v-if="
-            isEdit &&
-            hasPermi(['trials:trials-panel:setting:trial-config:save']) &&
-            form.IsPACSConnect
-          "
-          type="primary"
-          @click.stop="testSCPServerConnect"
-        >
-          {{ $t("common:button:DicomTest") }}
-        </el-button>
-        <!-- 保存 -->
-        <el-button
-          v-if="
-            form.IsTrialPACSConfirmed === false &&
-            hasPermi(['trials:trials-panel:setting:trial-config:save'])
-          "
-          type="primary"
-          @click="addOrUpdateDicomAE"
-        >
-          {{ $t("common:button:save") }}
-        </el-button>
-        <!-- 配置确认:disabled="!form.IsTestOK" -->
-        <el-button
-          v-if="
-            form.IsTrialPACSConfirmed === false &&
-            hasPermi(['trials:trials-panel:setting:trial-config:save'])
-          "
-          type="primary"
-          @click="handleConfirm"
-        >
-          {{ $t("trials:trialCfg:button:confirm") }}
-        </el-button>
-        <!-- 配置更新 -->
-        <el-button
-          v-if="
-            form.IsTrialPACSConfirmed === true &&
-            !isEdit &&
-            hasPermi(['trials:trials-panel:setting:trial-config:save'])
-          "
-          type="primary"
-          @click="isEdit = true"
-        >
-          {{ $t("trials:trialCfg:button:update") }}
-        </el-button>
-        <!-- 配置更新确认:disabled="!form.IsTestOK" -->
-        <el-button
-          v-if="
-            form.IsTrialPACSConfirmed === true &&
-            isEdit &&
-            hasPermi(['trials:trials-panel:setting:trial-config:save'])
-          "
-          type="primary"
-          @click="handleUpdate"
-        >
-          {{ $t("trials:trialCfg:button:updateAndConfirm") }}
-        </el-button>
-      </el-form-item>
-    </el-form>
-    <!-- 配置信息签名框 -->
-    <el-dialog
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
-      <div slot="title">
-        <span style="font-size: 18px">{{ $t("common:dialogTitle:sign") }}</span>
-        <span style="font-size: 12px; margin-left: 5px">{{
-          `(${$t("common:label:sign")}${currentUser})`
-        }}</span>
-      </div>
-      <SignForm
-        ref="signForm"
-        :sign-code-enum="signCode"
-        @closeDialog="closeSignDialog"
-      />
-    </el-dialog>
-    <!-- 配置信息确认框 -->
-    <el-dialog
-      v-if="confirmVisible"
-      :visible.sync="confirmVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      :title="$t('trials:trialCfg:dialogTitle:cfgConfirm')"
-      custom-class="base-dialog-wrapper"
-    >
-      <div class="base-dialog-body">
-        <el-table :data="confirmData" border style="width: 100%" size="small">
-          <!-- 配置项 -->
-          <el-table-column
-            prop="Name"
-            :label="$t('trials:trialCfg:table:cfgItem')"
-            show-overflow-tooltip
-          />
-          <!-- 配置值 -->
-          <el-table-column
-            prop="NewVal"
-            :label="$t('trials:trialCfg:table:cfgVal')"
-            show-overflow-tooltip
-          />
-        </el-table>
-      </div>
-      <div
-        class="base-dialog-footer"
-        style="text-align: right; margin-top: 10px"
-      >
-        <!-- 确认 -->
-        <el-button size="small" type="primary" @click="handleConfirmConfigData">
-          {{ $t("trials:trialCfg:button:confirmCfg") }}
-        </el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 配置信息更新框 -->
-    <el-dialog
-      v-if="updateVisible"
-      :visible.sync="updateVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      :title="$t('trials:trialCfg:dialogTitle:cfgConfirm')"
-      custom-class="base-dialog-wrapper"
-    >
-      <div class="base-dialog-body">
-        <el-table :data="confirmData" border style="width: 100%" size="small">
-          <!-- 配置项 -->
-          <el-table-column
-            prop="Name"
-            :label="$t('trials:trialCfg:table:cfgItem')"
-            show-overflow-tooltip
-          />
-          <!-- 配置值（更改前） -->
-          <el-table-column
-            prop="OldVal"
-            :label="`${$t('trials:trialCfg:table:cfgVal')} （${$t(
-              'trials:trialCfg:table:beforeChange'
-            )}）`"
-            show-overflow-tooltip
-          />
-          <!-- 配置值（更改后） -->
-          <el-table-column
-            prop="NewVal"
-            :label="`${$t('trials:trialCfg:table:cfgVal')} （${$t(
-              'trials:trialCfg:table:updated'
-            )}）`"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <span
-                :class="{ fontColor: scope.row.NewVal !== scope.row.OldVal }"
-                >{{ scope.row.NewVal }}</span
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div
-        class="base-dialog-footer"
-        style="text-align: right; margin-top: 10px"
-      >
-        <!-- 确认 -->
-        <el-button size="small" type="primary" @click="handleUpdateConfigData">
-          {{ $t("trials:trialCfg:button:confirmCfg") }}
-        </el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import {
-  getTrialDicomAE,
-  addOrUpdateDicomAE,
-  testSCPServerConnect,
-  ConfigTrialPACSInfoConfirm,
-} from "@/api/trials";
-import SignForm from "@/views/trials/components/newSignForm";
-import const_ from "@/const/sign-code";
-export default {
-  name: "dicomConfig",
-  components: { SignForm },
-  data() {
-    return {
-      loading: false,
-      form: {
-        IsTestOK: null,
-        IsPACSConnect: true,
-        IsTrialPACSConfirmed: false,
-        CalledAE: null,
-        Ip: null,
-        Port: null,
-        Modality: null,
-      },
-      initialForm: {},
-      rules: {
-        IsPACSConnect: [
-          {
-            required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
-          },
-        ],
-        CalledAE: [
-          {
-            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",
-          },
-        ],
-      },
-      isEdit: false,
-      Id: null,
-      signVisible: false,
-      signCode: null,
-      currentUser: zzSessionStorage.getItem("userName"),
-      confirmData: [],
-      confirmVisible: false,
-      updateVisible: false,
-    };
-  },
-  methods: {
-    changeConnect(val) {
-      if (!val) {
-        this.form.CalledAE = null;
-        this.form.Ip = null;
-        this.form.Port = null;
-        this.form.Modality = null;
-        this.form.IsTestOK = null;
-      }
-    },
-    initForm(res) {
-      this.getInfo();
-    },
-    // 测试dicomAE
-    async testSCPServerConnect() {
-      try {
-        let res = await this.addOrUpdateDicomAE();
-        if (!res) return;
-        this.loading = true;
-        let d = await testSCPServerConnect(res);
-        this.loading = false;
-        if (d.IsSuccess) {
-          this.form.IsTestOK = d.Result;
-        }
-      } catch (err) {
-        console.log(err);
-        this.loading = false;
-      }
-    },
-    // 获取配置
-    async getInfo() {
-      try {
-        let data = {
-          TrialId: this.$route.query.trialId,
-        };
-        this.loading = true;
-        let res = await getTrialDicomAE(data);
-        this.loading = false;
-        if (res.IsSuccess) {
-          this.form.IsPACSConnect = res.OtherInfo.IsPACSConnect;
-          this.form.IsTrialPACSConfirmed = res.OtherInfo.IsTrialPACSConfirmed;
-          if (!res.OtherInfo.IsTrialPACSConfirmed) {
-            this.isEdit = true;
-          }
-          this.form.IsTestOK = res.Result.IsTestOK;
-          this.form.CalledAE = res.Result.CalledAE;
-          this.form.Ip = res.Result.IP;
-          this.form.Port = res.Result.Port;
-          this.Id = res.Result.Id;
-
-          this.initialForm.IsPACSConnect = res.OtherInfo.IsPACSConnect;
-          this.initialForm.IsTrialPACSConfirmed =
-            res.OtherInfo.IsTrialPACSConfirmed;
-          this.initialForm.IsTestOK = res.Result.IsTestOK;
-          this.initialForm.CalledAE = res.Result.CalledAE;
-          this.initialForm.Ip = res.Result.IP;
-          this.initialForm.Port = res.Result.Port;
-        }
-      } catch (err) {
-        console.log(err);
-        this.loading = false;
-      }
-    },
-    // 新增或修改配置
-    async addOrUpdateDicomAE() {
-      try {
-        let validate = await this.$refs.dicomConfigForm.validate();
-        if (!validate) return;
-        if (this.Id) {
-          this.form.Id = this.Id;
-        }
-        this.form.TrialId = this.$route.query.trialId;
-        this.loading = true;
-        let res = await addOrUpdateDicomAE(this.form);
-        this.loading = false;
-        if (res.IsSuccess) {
-          // this.$emit("refresh");
-          return res.Result;
-        }
-        return false;
-      } catch (err) {
-        console.log(err);
-        this.loading = false;
-        return false;
-      }
-    },
-    // 关闭签名框
-    closeSignDialog(isSign, signInfo) {
-      if (isSign) {
-        this.signConfirm(signInfo);
-      } else {
-        this.signVisible = false;
-      }
-    },
-    async signConfirm(signInfo) {
-      try {
-        let data = {
-          data: {
-            TrialId: this.$route.query.trialId,
-            IsPACSConnect: this.form.IsPACSConnect,
-            IsTrialPACSConfirmed: true,
-          },
-          signInfo,
-        };
-        let res = await ConfigTrialPACSInfoConfirm(data);
-        if (res.IsSuccess) {
-          this.signVisible = false;
-          this.confirmVisible = false;
-          this.updateVisible = false;
-          this.isEdit = false;
-          res = await this.addOrUpdateDicomAE();
-          if (res) this.$emit("refresh");
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    },
-    // 配置更新
-    handleUpdateConfigData() {
-      const { DicomConfigUpdates } = const_.processSignature;
-      this.signCode = DicomConfigUpdates;
-      this.signVisible = true;
-    },
-    // 配置确认
-    handleConfirmConfigData() {
-      const { DicomConfigConfirmation } = const_.processSignature;
-      this.signCode = DicomConfigConfirmation;
-      this.signVisible = true;
-    },
-    // 打开配置信息确认框
-    handleConfirm() {
-      this.$refs["dicomConfigForm"].validate(async (valid) => {
-        if (!valid) return;
-        this.getConfigArr();
-        this.confirmVisible = true;
-      });
-    },
-
-    // 打开配置信息更新框
-    handleUpdate() {
-      this.$refs["dicomConfigForm"].validate(async (valid) => {
-        if (!valid) return;
-        this.getConfigArr();
-        this.updateVisible = true;
-      });
-    },
-    // 配置信息数组结构
-    getConfigArr() {
-      this.confirmData = [
-        {
-          Name: this.$t("trials:dicomCfg:form:pacsLine"), // pacs直连
-          NewVal: this.$fd("PACSConnectMode", this.form.IsPACSConnect),
-          OldVal: this.$fd("PACSConnectMode", this.initialForm.IsPACSConnect),
-        },
-        {
-          Name: this.$t("trials:dicomCfg:form:CalledAE"), // AE名称
-          NewVal: this.form.CalledAE,
-          OldVal: this.initialForm.CalledAE,
-        },
-        {
-          Name: this.$t("trials:dicomCfg:form:Ip"), // IP地址
-          NewVal: this.form.Ip,
-          OldVal: this.initialForm.Ip,
-        },
-        {
-          Name: this.$t("trials:dicomCfg:form:Port"),
-          NewVal: this.form.Port,
-          OldVal: this.initialForm.Port,
-        },
-        {
-          Name: this.$t("trials:dicomCfg:form:IsTestOK"), // 状态
-          NewVal: this.$fd("DicomTest", this.form.IsTestOK),
-          OldVal: this.$fd("DicomTest", this.initialForm.IsTestOK),
-        },
-      ];
-    },
-  },
-};
-</script>
-<style lang="scss" scoped></style>
@@ -578,18 +578,7 @@
            prop="Name"
            :label="$t('trials:logincCfg:form:bodypart')"
          >
-            <template slot-scope="scope">
-              <div class="bodyPartName">
-                <span :title="scope.row.Name">{{ scope.row.Name }}</span>
-                <el-button
-                  v-if="scope.row.IsHandAdd"
-                  circle
-                  icon="el-icon-edit-outline"
-                  :title="$t('trials:logincCfg:form:bodypart:edit')"
-                  @click.stop="handleEditBodyPart(scope.row)"
-                />
-              </div>
-            </template>
+            <template slot-scope="scope">{{ scope.row.Name }}</template>
          </el-table-column>
        </el-table>
      </div>
@@ -615,7 +604,7 @@
        </el-button>
      </div>
    </el-dialog>
-    <!--选择检查技术-->
+
    <el-dialog
      v-if="modalityListVisible"
      :visible.sync="modalityListVisible"
@@ -685,7 +674,6 @@
        </el-button>
      </div>
    </el-dialog>
-    <!--新增检查部位-->
    <base-model v-if="addBodyPart_model.visible" :config="addBodyPart_model">
      <template slot="dialog-body">
        <el-form
@@ -703,7 +691,8 @@
            <el-input
              v-model="addBodyPartForm.bodyPartStr"
              clearable
-              :maxlength="50"
+              type="textarea"
+              :rows="2"
              @focus="errMessage = null"
            ></el-input>
            <span class="errTip" v-if="errMessage">{{ errMessage }}</span>
@@ -885,7 +874,6 @@ export default {
      },
      addBodyPartForm: {
        bodyPartStr: null,
-        Id: null,
      },
      addBodyPartrules: {
        bodyPartStr: [
@@ -1006,9 +994,6 @@ export default {
          NameCN: str,
          TrialId: this.$route.query.trialId,
        };
-        if(this.addBodyPartForm.Id){
-          data.Id = this.addBodyPartForm.Id;
-        }
        let res = await addOrUpdateTrialBodyPart(data);
        if (res.IsSuccess) {
          this.getTrialBodyPartList(data);
@@ -1017,7 +1002,6 @@ export default {
          );
          this.addBodyPart_model.visible = false;
          this.addBodyPartForm.bodyPartStr = null;
-          this.addBodyPartForm.Id = null;
        }
      } catch (err) {
        console.log(err);
@@ -1027,13 +1011,6 @@ export default {
        }
      }
    },
-    // 编辑检查部位
-    handleEditBodyPart(item) {
-      this.addBodyPartForm.bodyPartStr = item.Code;
-      this.addBodyPartForm.Id = item.Id;
-      this.addBodyPart_model.title = this.$t("trials:setting:button:edit");
-      this.addBodyPart_model.visible = true;
-    },
    handleSetBodyPart() {
      this.bodyPartListVisible = true;
      this.$nextTick(() => {
@@ -1458,21 +1435,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.bodyPartName {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  height: 100%;
-  span {
-    display: inline-block;
-    max-width: 80%;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    -o-text-overflow: ellipsis;
-  }
-}
 .logincal-config-form {
  .fontColor {
    color: red;
@@ -1,14 +1,7 @@
 <template>
-  <el-collapse
-    v-model="activeCollapse"
-    v-loading="loading"
-    class="setting-config"
-  >
+  <el-collapse v-model="activeCollapse" v-loading="loading" class="setting-config">
    <!-- 逻辑配置 -->
-    <el-collapse-item
-      :title="$t('trials:trialConfig:title:logincCfg')"
-      name="1"
-    >
+    <el-collapse-item :title="$t('trials:trialConfig:title:logincCfg')" name="1">
      <LogicalConfig ref="logicalConfig" @refresh="getConfigInfo" />
    </el-collapse-item>
    <!-- 流程配置 -->
@@ -19,58 +12,50 @@
    <el-collapse-item :title="$t('trials:trialCfg:title:urgentCfg')" name="3">
      <UrgentConfig ref="urgentConfig" @refresh="getConfigInfo" />
    </el-collapse-item>
-    <!--dicom接入配置-->
-    <el-collapse-item :title="$t('trials:trialCfg:title:dicomCfg')" name="4">
-      <dicomConfig ref="dicomConfig" @refresh="getConfigInfo" />
-    </el-collapse-item>
  </el-collapse>
 </template>
 <script>
-import { getTrialConfigInfo } from "@/api/trials";
-import LogicalConfig from "./components/logicalConfig";
-import ProcessConfig from "./components/processConfig";
-import UrgentConfig from "./components/urgentConfig";
-import dicomConfig from "./components/dicomConfig.vue";
+import { getTrialConfigInfo } from '@/api/trials'
+import LogicalConfig from './components/logicalConfig'
+import ProcessConfig from './components/processConfig'
+import UrgentConfig from './components/urgentConfig'
 export default {
-  name: "SubjectConfig",
-  components: { LogicalConfig, ProcessConfig, UrgentConfig, dicomConfig },
+  name: 'SubjectConfig',
+  components: { LogicalConfig, ProcessConfig, UrgentConfig },
  data() {
    return {
-      activeCollapse: ["1", "2", "3", "4"],
+      activeCollapse: ['1', '2', '3'],
      form: {},
-      loading: false,
-    };
+      loading: false
+    }
  },
  mounted() {
-    this.getConfigInfo();
+    this.getConfigInfo()
  },
  methods: {
    getConfigInfo() {
-      this.loading = true;
-      const trialId = this.$route.query.trialId;
-      getTrialConfigInfo(trialId)
-        .then((res) => {
-          this.loading = false;
-          if (Object.keys(res.Result).length) {
-            this.form = { ...res.Result };
-          }
-          this.$refs["logicalConfig"].initForm(res.Result);
-          this.$refs["processConfig"].initForm(res.Result);
-          this.$refs["urgentConfig"].initForm(res.Result);
-          this.$refs["dicomConfig"].initForm(res.Result);
-        })
-        .catch((_) => {
-          this.loading = false;
-        });
-    },
-  },
-};
-</script>
-<style lang="scss">
-.setting-config {
-  .el-collapse-item__header {
-    background: #e5ecef;
-    padding-left: 10px;
+      this.loading = true
+      const trialId = this.$route.query.trialId
+      getTrialConfigInfo(trialId).then(res => {
+        this.loading = false
+        if (Object.keys(res.Result).length) {
+          this.form = { ...res.Result }
+        }
+        this.$refs['logicalConfig'].initForm(res.Result)
+        this.$refs['processConfig'].initForm(res.Result)
+        this.$refs['urgentConfig'].initForm(res.Result)
+      }).catch(_ => { this.loading = false })
+    }
+
  }
 }
+</script>
+<style lang="scss">
+.setting-config{
+  .el-collapse-item__header{
+    background:#e5ecef;
+    padding-left:10px;
+  }
+}
+
 </style>
@@ -83,19 +83,6 @@
            width="190"
            show-overflow-tooltip
          />
-          <!-- 文件大小 -->
-          <el-table-column
-            prop="size"
-            :label="$t('trials:uploadClinicalData:table:fileSize')"
-          >
-            <template slot-scope="scope">
-              <span>{{
-                scope.row.size && scope.row.size > 0
-                  ? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
-                  : 0
-              }}</span>
-            </template>
-          </el-table-column>
          <el-table-column
            :label="$t('common:action:action')"
            width="100"
@@ -289,7 +276,7 @@ export default {
        const fileName = files[i].name
        var extendName = fileName.substring(fileName.lastIndexOf('.')).toLocaleLowerCase()
        if (this.faccept.indexOf(extendName) !== -1) {
-          this.fileList.push({ FileName: fileName, Path: '', Status: 0, Files: files[i], size:files[i].size, type:fileName.split('.')[1] })
+          this.fileList.push({ FileName: fileName, Path: '', Status: 0, Files: files[i] })
        }
      }
    },
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    :visible.sync="visible"
-    :close-on-click-modal="false"
-    :fullscreen="true"
-    custom-class="upload-dialog"
-    :before-close="beforeCloseStudyDig"
-  >
-    <span slot="title"
-      >{{ $t("trials:imageInspect:viewStudy:message:viewStudy") }}（{{
-        $t("trials:imageInspect:viewStudy:message:patientInfo")
-      }}：{{ Patient.PatientIdStr }}，{{ Patient.PatientName }}）</span
-    >
-    <div class="search">
-      <el-form :inline="true" class="base-search-form">
-        <!-- 检查类型 -->
-        <el-form-item
-          :label="$t('trials:imageInspect:viewStudy:table:modality')"
-        >
-          <el-select
-            v-model="searchData.Modalities"
-            clearable
-            style="width: 140px"
-          >
-            <el-option
-              v-for="item of $d.modalType"
-              :key="item.id"
-              :label="item.label"
-              :value="item.label"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <!-- 检查日期 -->
-        <el-form-item
-          :label="$t('trials:imageInspect:viewStudy:table:studyDate')"
-        >
-          <el-date-picker
-            v-model="dateValue"
-            type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            :default-time="['00:00:00', '23:59:59']"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <!-- 查询 -->
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t("common:button:search") }}
-          </el-button>
-          <!-- 重置 -->
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
-            {{ $t("common:button:reset") }}
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-    <!--检查列表-->
-    <el-table
-      ref="viewStudyList"
-      v-loading="loading"
-      v-adaptive="{ bottomOffset: 60 }"
-      :data="list"
-      stripe
-      height="100"
-      @sort-change="handleSortByColumn"
-      :default-sort="{ prop: 'StudyTime', order: 'descending' }"
-    >
-      <el-table-column type="index" width="40" />
-      <!--检查描述-->
-      <el-table-column
-        align="center"
-        prop="Description"
-        :label="$t('trials:imageInspect:viewStudy:table:studyDescription')"
-        show-overflow-tooltip
-        min-width="120"
-        sortable="custom"
-      ></el-table-column>
-      <!--检查类型-->
-      <el-table-column
-        align="center"
-        prop="Modalities"
-        :label="$t('trials:imageInspect:viewStudy:table:modality')"
-        show-overflow-tooltip
-        min-width="120"
-        sortable="custom"
-      ></el-table-column>
-      <!--Called AE-->
-      <el-table-column
-        prop="CalledAE"
-        :label="$t('trials:imageInspect:viewStudy:table:CalledAE')"
-        show-overflow-tooltip
-        min-width="120"
-      >
-      </el-table-column>
-      <!--Calling AE-->
-      <el-table-column
-        prop="CallingAE"
-        :label="$t('trials:imageInspect:viewStudy:table:CallingAE')"
-        show-overflow-tooltip
-        min-width="120"
-      >
-      </el-table-column>
-      <!--序列数量-->
-      <el-table-column
-        align="center"
-        prop="SeriesCount"
-        :label="$t('trials:imageInspect:viewStudy:table:seriesCount')"
-        show-overflow-tooltip
-        min-width="100"
-        sortable="custom"
-      ></el-table-column>
-      <!--图像数量-->
-      <el-table-column
-        align="center"
-        prop="InstanceCount"
-        :label="$t('trials:imageInspect:viewStudy:table:instanceCount')"
-        show-overflow-tooltip
-        min-width="100"
-        sortable="custom"
-      ></el-table-column>
-      <!--检查日期-->
-      <el-table-column
-        align="center"
-        prop="StudyTime"
-        :label="$t('trials:imageInspect:viewStudy:table:studyDate')"
-        show-overflow-tooltip
-        min-width="180"
-        sortable="custom"
-      ></el-table-column>
-      <!--操作-->
-      <el-table-column :label="$t('common:action:action')" min-width="150">
-        <template slot-scope="scope">
-          <!-- 影像 -->
-          <el-button
-            circle
-            icon="el-icon-view"
-            :title="$t('trials:imageInspect:viewStudy:button:image')"
-            @click.stop="image(scope.row)"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页组件 -->
-    <!-- <pagination
-      class="page"
-      :total="total"
-      :page.sync="searchData.PageIndex"
-      :limit.sync="searchData.PageSize"
-      @pagination="getList"
-    /> -->
-  </el-dialog>
-</template>
-<script>
-import Pagination from "@/components/Pagination";
-import { getPatientStudyList } from "@/api/trials.js";
-import { getToken } from "@/utils/auth";
-
-const defaultSearchData = () => {
-  return {
-    Modalities: null,
-    EarliestStudyTime: null,
-    LatestStudyTime: null,
-    PatientId: null,
-    Asc: false,
-    SortField: "StudyTime",
-  };
-};
-export default {
-  name: "viewStudyList",
-  components: { Pagination },
-  props: {
-    visible: {
-      required: true,
-      default: false,
-    },
-    Patient: {
-      required: true,
-      default: () => {
-        return {};
-      },
-    },
-  },
-  data() {
-    return {
-      // 查询
-      searchData: defaultSearchData(),
-      dateValue: [],
-      // 可加入项目列表
-      loading: false,
-      list: [],
-      newWindow: null,
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    // 关闭弹框
-    beforeCloseStudyDig() {
-      if (this.newWindow) {
-        this.newWindow.close();
-      }
-      this.$emit("update:visible", false);
-    },
-    // 获取列表
-    async getList() {
-      let data = {};
-      Object.keys(this.searchData).forEach((key) => {
-        data[key] = this.searchData[key];
-      });
-      data.PatientId = this.Patient.PatientId;
-      if (this.dateValue && this.dateValue[0] && this.dateValue[1]) {
-        data.EarliestStudyTime = this.$moment(this.dateValue[0]).format(
-          "YYYY-MM-DD HH:mm:ss"
-        );
-        data.LatestStudyTime = this.$moment(this.dateValue[1]).format(
-          "YYYY-MM-DD HH:mm:ss"
-        );
-      } else {
-        data.EarliestStudyTime = null;
-        data.LatestStudyTime = null;
-      }
-
-      try {
-        this.loading = true;
-        let res = await getPatientStudyList(data);
-        this.loading = false;
-        if (res.IsSuccess) {
-          this.list = res.Result;
-        }
-      } catch (err) {
-        this.loading = false;
-        console.log(err);
-      }
-    },
-    // 查询
-    handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
-    },
-    // 重置
-    handleReset() {
-      this.reset();
-      this.getList();
-    },
-    // 初始化
-    reset() {
-      this.searchData = defaultSearchData();
-      this.dateValue = [];
-    },
-    // 查看影像
-    image(item) {
-      let token = getToken();
-      const routeData = this.$router.resolve({
-        path: `/showdicom?studyId=${item.SCPStudyId}&TokenKey=${token}&type=Patient`,
-      });
-      this.newWindow = window.open(routeData.href, "_blank");
-    },
-    // 查看报告
-    report() {},
-    // 表格排序
-    handleSortByColumn(sort) {
-      this.searchData.SortField = sort.prop;
-      if (sort.order === "ascending") this.searchData.Asc = true;
-      if (sort.order === "descending") this.searchData.Asc = false;
-      if (!sort.order) this.searchData.SortField = null;
-      this.getList();
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>
@@ -1,369 +0,0 @@
-<template>
-  <BaseContainer>
-    <template slot="search-container">
-      <el-form :inline="true">
-        <!--病历号-->
-        <el-form-item
-          :label="$t('trials:imageInspect:table:patientIdStr')"
-          prop="PatientIdStr"
-        >
-          <el-input
-            v-model="searchData.PatientIdStr"
-            size="small"
-            clearable
-            style="width: 120px"
-          />
-        </el-form-item>
-        <!--患者姓名-->
-        <el-form-item
-          :label="$t('trials:imageInspect:table:patientName')"
-          prop="PatientName"
-        >
-          <el-input
-            v-model="searchData.PatientName"
-            size="small"
-            clearable
-            style="width: 120px"
-          />
-        </el-form-item>
-        <!--接收端AE-->
-        <el-form-item
-          :label="$t('trials:imageInspect:table:calledAE')"
-          prop="CalledAE"
-        >
-          <el-select
-            v-model="searchData.CalledAE"
-            clearable
-            style="width: 120px"
-          >
-            <el-option
-              v-for="item of calledAEList"
-              :key="item"
-              :value="item"
-              :label="item"
-            />
-          </el-select>
-        </el-form-item>
-        <!--发送端AE-->
-        <el-form-item
-          :label="$t('trials:imageInspect:table:callingAE')"
-          prop="CallingAE"
-        >
-          <el-select
-            v-model="searchData.CallingAE"
-            clearable
-            style="width: 120px"
-          >
-            <el-option
-              v-for="item of callingAEList"
-              :key="item"
-              :value="item"
-              :label="item"
-            />
-          </el-select>
-        </el-form-item>
-        <!--所在中心-->
-        <el-form-item
-          :label="$t('trials:imageInspect:table:trialSiteKeyInfo')"
-          prop="TrialSiteKeyInfo"
-        >
-          <el-input
-            v-model="searchData.TrialSiteKeyInfo"
-            size="small"
-            clearable
-            style="width: 150px"
-            :placeholder="
-              $t('trials:imageInspect:placeholder:trialSiteKeyInfo')
-            "
-          />
-        </el-form-item>
-        <!--最新接受日期-->
-        <el-form-item :label="$t('trials:imageInspect:table:createTime')">
-          <el-date-picker
-            v-model="datetimerange"
-            type="datetimerange"
-            :default-time="['00:00:00', '23:59:59']"
-            :start-placeholder="$t('trials:loginLog:table:beginTime')"
-            :end-placeholder="$t('trials:loginLog:table:endTime')"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            @change="handleDatetimeChange"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t("common:button:search") }}
-          </el-button>
-          <!-- 重置 -->
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
-            {{ $t("common:button:reset") }}
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </template>
-    <template slot="main-container">
-      <el-table
-        v-loading="loading"
-        v-adaptive="{ bottomOffset: 60 }"
-        height="100"
-        :data="list"
-        class="table"
-        @sort-change="handleSortByColumn"
-        :default-sort="{ prop: 'LatestPushTime', order: 'descending' }"
-      >
-        <el-table-column type="index" width="50" />
-        <!--病历号-->
-        <el-table-column
-          :label="$t('trials:imageInspect:table:patientIdStr')"
-          prop="PatientIdStr"
-          min-width="90"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--患者姓名-->
-        <el-table-column
-          :label="$t('trials:imageInspect:table:patientName')"
-          prop="PatientName"
-          min-width="90"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--出生日期-->
-        <el-table-column
-          :label="$t('trials:imageInspect:table:patientBirthDate')"
-          prop="PatientBirthDate"
-          min-width="90"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--性别-->
-        <el-table-column
-          :label="$t('trials:imageInspect:table:patientSex')"
-          prop="PatientSex"
-          min-width="90"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--接收端AE-->
-        <el-table-column
-          :label="$t('trials:imageInspect:table:calledAEList')"
-          prop="CalledAEList"
-          min-width="90"
-          show-overflow-tooltip
-          sortable="custom"
-          ><template slot-scope="scope">
-            {{ scope.row.CallingAEList.join(", ") }}
-          </template>
-        </el-table-column>
-        <!--发送端AE-->
-        <el-table-column
-          :label="$t('trials:imageInspect:table:callingAEList')"
-          prop="CallingAEList"
-          min-width="90"
-          show-overflow-tooltip
-          sortable="custom"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.CallingAEList.join(", ") }}
-          </template>
-        </el-table-column>
-        <!--检查-->
-        <el-table-column
-          :label="$t('trials:imageInspect:table:studyCount')"
-          prop="StudyCount"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        >
-          <template slot-scope="scope">
-            <el-button
-              v-if="scope.row.StudyCount >= 1"
-              type="text"
-              @click="handleOpenDialog(scope.row, 'study')"
-            >
-              <span>{{ scope.row.StudyCount }}</span>
-            </el-button>
-            <span v-else>{{ scope.row.StudyCount }}</span>
-          </template>
-        </el-table-column>
-        <!--所在中心-->
-        <el-table-column
-          :label="$t('trials:imageInspect:table:trialSiteCodeAndName')"
-          prop="TrialSiteCode"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.trialSiteCode }},{{ scope.row.trialSiteName }}
-          </template>
-        </el-table-column>
-        <!--受试者ID-->
-        <el-table-column
-          :label="$t('trials:imageInspect:table:subjectCode')"
-          prop="SubjectCode"
-          min-width="90"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--最新接收时间-->
-        <el-table-column
-          :label="$t('trials:imageInspect:table:lastestPushTime')"
-          prop="LatestPushTime"
-          min-width="90"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-      </el-table>
-      <!-- 分页组件 -->
-      <pagination
-        class="page"
-        :total="total"
-        :page.sync="searchData.PageIndex"
-        :limit.sync="searchData.PageSize"
-        @pagination="getList"
-      />
-    </template>
-    <!--查看检查列表-->
-    <viewStudy
-      v-if="visible"
-      :visible.sync="visible"
-      :Patient="selectPatient"
-      @getList="getList"
-    />
-  </BaseContainer>
-</template>
-  <script>
-import {
-  getPatientList,
-  getDicomCalledAEList,
-  getDicomCallingAEList,
-} from "@/api/trials";
-import BaseContainer from "@/components/BaseContainer";
-import Pagination from "@/components/Pagination";
-import moment from "moment";
-import viewStudy from "./components/view-study";
-const searchDataDefault = () => {
-  return {
-    PatientIdStr: null,
-    PatientName: null,
-    CallingAE: null,
-    CalledAE: null,
-    BeginPushTime: null,
-    EndPushTime: null,
-    SubejctCode: null,
-    TrialSiteKeyInfo: null,
-    PageIndex: 1,
-    PageSize: 20,
-    Asc: true,
-    SortField: "LatestPushTime",
-  };
-};
-export default {
-  components: { BaseContainer, Pagination, viewStudy },
-  data() {
-    return {
-      moment,
-      searchData: searchDataDefault(),
-      list: [],
-      total: 0,
-      loading: false,
-      datetimerange: [],
-      calledAEList: [],
-      callingAEList: [],
-      visible: false,
-      selectPatient: {},
-    };
-  },
-  created() {
-    this.getCalledAEList();
-    this.getCallingAEList();
-  },
-  mounted() {
-    this.getList();
-  },
-  methods: {
-    // 打开弹框
-    handleOpenDialog(item) {
-      this.visible = true;
-      this.selectPatient = item;
-    },
-    // 获取接收端AE列表
-    async getCalledAEList() {
-      try {
-        let params = {
-          TrialId: this.$route.query.trialId,
-        };
-        let res = await getDicomCalledAEList(params);
-        if (res.IsSuccess) {
-          this.calledAEList = res.Result;
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    },
-    // 获取发送端端AE列表
-    async getCallingAEList() {
-      try {
-        let params = {
-          TrialId: this.$route.query.trialId,
-        };
-        let res = await getDicomCallingAEList(params);
-        if (res.IsSuccess) {
-          this.callingAEList = res.Result;
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    },
-    getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.$route.query.trialId;
-      getPatientList(this.searchData)
-        .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
-        })
-        .catch(() => {
-          this.loading = false;
-        });
-    },
-    handleDatetimeChange(val) {
-      if (val) {
-        this.searchData.BeginPushTime = val[0];
-        this.searchData.EndPushTime = val[1];
-      } else {
-        this.searchData.BeginPushTime = "";
-        this.searchData.EndPushTime = "";
-      }
-    },
-    handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
-    },
-    // 重置列表查询
-    handleReset() {
-      this.datetimerange = null;
-      this.handleDatetimeChange();
-      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();
-    },
-  },
-};
-</script>
-  
@@ -128,13 +128,13 @@
          show-overflow-tooltip
          sortable="custom"
        />
-        <el-table-column
+        <!-- <el-table-column
          :label="$t('trials:loginLog:table:IPRegion')"
          prop="IPRegion"
          min-width="90"
          show-overflow-tooltip
          sortable="custom"
-        />
+        /> -->
        <el-table-column
          v-if="!isMine"
          :label="$t('trials:loginLog:table:incorrectUserName')"
@@ -1,311 +0,0 @@
-<template>
-  <BaseContainer>
-    <template slot="search-container">
-      <el-form :inline="true">
-        <!--所在中心-->
-        <el-form-item
-          :label="$t('trials:pushRecord:table:trialSiteKeyInfo')"
-          prop="TrialSiteKeyInfo"
-        >
-          <el-input
-            v-model="searchData.TrialSiteKeyInfo"
-            size="small"
-            clearable
-            style="width: 150px"
-            :placeholder="$t('trials:pushRecord:placeholder:trialSiteKeyInfo')"
-          />
-        </el-form-item>
-        <!--接收端AE-->
-        <el-form-item
-          :label="$t('trials:pushRecord:table:calledAE')"
-          prop="CalledAE"
-        >
-          <el-select
-            v-model="searchData.CalledAE"
-            clearable
-            style="width: 120px"
-          >
-            <el-option
-              v-for="item of calledAEList"
-              :key="item"
-              :value="item"
-              :label="item"
-            />
-          </el-select>
-        </el-form-item>
-        <!--发送端AE-->
-        <el-form-item
-          :label="$t('trials:pushRecord:table:callingAE')"
-          prop="CallingAE"
-        >
-          <el-select
-            v-model="searchData.CallingAE"
-            clearable
-            style="width: 120px"
-          >
-            <el-option
-              v-for="item of callingAEList"
-              :key="item"
-              :value="item"
-              :label="item"
-            />
-          </el-select>
-        </el-form-item>
-        <!--最新接受日期-->
-        <el-form-item :label="$t('trials:pushRecord:table:createTime')">
-          <el-date-picker
-            v-model="datetimerange"
-            type="datetimerange"
-            :default-time="['00:00:00', '23:59:59']"
-            :start-placeholder="$t('trials:loginLog:table:beginTime')"
-            :end-placeholder="$t('trials:loginLog:table:endTime')"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            @change="handleDatetimeChange"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t("common:button:search") }}
-          </el-button>
-          <!-- 重置 -->
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
-            {{ $t("common:button:reset") }}
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </template>
-    <template slot="main-container">
-      <el-table
-        v-loading="loading"
-        v-adaptive="{ bottomOffset: 60 }"
-        height="100"
-        :data="list"
-        class="table"
-        @sort-change="handleSortByColumn"
-        :default-sort="{ prop: 'StartTime', order: 'descending' }"
-      >
-        <el-table-column type="index" width="50" />
-        <!--中心编号-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:trialSiteCode')"
-          prop="TrialSiteCode"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--中心名称-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:trialSiteAliasName')"
-          prop="TrialSiteAliasName"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--发送端AE-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:callingAEList')"
-          prop="CallingAEList"
-          min-width="90"
-          show-overflow-tooltip
-          sortable="custom"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.CallingAEList.join(", ") }}
-          </template>
-        </el-table-column>
-        <!--发送端IP-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:callingAEIP')"
-          prop="CallingAEIP"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--接收端AE-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:calledAEList')"
-          prop="CalledAEList"
-          min-width="90"
-          show-overflow-tooltip
-          sortable="custom"
-          ><template slot-scope="scope">
-            {{ scope.row.CallingAEList.join(", ") }}
-          </template>
-        </el-table-column>
-
-        <!--检查数-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:studyCount')"
-          prop="StudyCount"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--图像数量-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:fileCount')"
-          prop="FileCount"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--图像大小-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:fileSize')"
-          prop="FileSize"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--推送开始时间-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:startTime')"
-          prop="StartTime"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--推送结束时间-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:endTime')"
-          prop="EndTime"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-      </el-table>
-      <!-- 分页组件 -->
-      <pagination
-        class="page"
-        :total="total"
-        :page.sync="searchData.PageIndex"
-        :limit.sync="searchData.PageSize"
-        @pagination="getList"
-      />
-    </template>
-  </BaseContainer>
-</template>
-    <script>
-import {
-  getSCPImageUploadList,
-  getDicomCalledAEList,
-  getDicomCallingAEList,
-} from "@/api/trials";
-import BaseContainer from "@/components/BaseContainer";
-import Pagination from "@/components/Pagination";
-import moment from "moment";
-const searchDataDefault = () => {
-  return {
-    CallingAE: null,
-    CalledAE: null,
-    StartTime: null,
-    EndTime: null,
-    TrialSiteKeyInfo: null,
-    PageIndex: 1,
-    PageSize: 20,
-    Asc: true,
-    SortField: "StartTime",
-  };
-};
-export default {
-  components: { BaseContainer, Pagination },
-  data() {
-    return {
-      moment,
-      searchData: searchDataDefault(),
-      list: [],
-      total: 0,
-      loading: false,
-      datetimerange: [],
-      calledAEList: [],
-      callingAEList: [],
-    };
-  },
-  created() {
-    this.getCalledAEList();
-    this.getCallingAEList();
-  },
-  mounted() {
-    this.getList();
-  },
-  methods: {
-    // 获取接收端AE列表
-    async getCalledAEList() {
-      try {
-        let params = {
-          TrialId: this.$route.query.trialId,
-        };
-        let res = await getDicomCalledAEList(params);
-        if (res.IsSuccess) {
-          this.calledAEList = res.Result;
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    },
-    // 获取发送端端AE列表
-    async getCallingAEList() {
-      try {
-        let params = {
-          TrialId: this.$route.query.trialId,
-        };
-        let res = await getDicomCallingAEList(params);
-        if (res.IsSuccess) {
-          this.callingAEList = res.Result;
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    },
-    getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.$route.query.trialId;
-      getSCPImageUploadList(this.searchData)
-        .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
-        })
-        .catch(() => {
-          this.loading = false;
-        });
-    },
-    handleDatetimeChange(val) {
-      if (val) {
-        this.searchData.StartTime = val[0];
-        this.searchData.EndTime = val[1];
-      } else {
-        this.searchData.StartTime = "";
-        this.searchData.EndTime = "";
-      }
-    },
-    handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
-    },
-    // 重置列表查询
-    handleReset() {
-      this.datetimerange = null;
-      this.handleDatetimeChange();
-      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();
-    },
-  },
-};
-</script>
-    
@@ -92,14 +92,6 @@
        >
          {{ $t('trials:crcQuestion:button:close') }}
        </el-button>
-        <!-- 下一任务 -->
-        <el-button
-          v-hasPermi="['trials:trials-panel:visit:crc-upload:nextTask']"
-          type="primary"
-          @click="getNextTask"
-        >
-          {{ $t('trials:crcQuestion:button:nextTask') }}
-        </el-button>
      </div>
    </div>

@@ -263,11 +255,9 @@ export default {
          UserTypeEnum: this.data.UserTypeEnum
        }
      )
-      if (this.data.DialogList && this.data.DialogList.length > 0) {
-        this.data.DialogList.forEach(element => {
-          recordContent.push(element)
-        })
-      }
+      this.data.DialogList.forEach(element => {
+        recordContent.push(element)
+      })
      this.recordContent = recordContent
      this.setScrollHeight()
    },
@@ -360,11 +350,6 @@ export default {
        this.uploadBtnLoading = false
      })
    },
-    // 获取下一任务
-    getNextTask() {
-      this.loading = true
-      this.$emit('getNextTask', this.data.Id)
-    },
    close() {
      this.$emit('close')
    },
@@ -128,7 +128,7 @@
          prop="QCProcessEnum"
          :label="$t('trials:crcQuestion:table:qCProcessEnum')"
          show-overflow-tooltip
-          min-width="130"
+          min-width="80"
          sortable="custom"
        >
          <template slot-scope="scope">
@@ -258,12 +258,12 @@
      width="800px"
      :title="$t('trials:crcQuestion:dialogTitle:message1') + `(${currentQCRow.SubjectCode} ${currentQCRow.VisitName})`"
    >
-      <chat-form ref="chatForm" :data="currentQCRow" user-type="crc" :body-parts="otherInfo.BodyPartTypes" :modalities="otherInfo.Modalitys" :subject-visit-id="currentQCRow.Id" :clinical-enum="otherInfo.ClinicalInformationTransmissionEnum" @close="close" @getDialogList="getDialogList" @getNextTask="getNextTask"/>
+      <chat-form ref="chatForm" :data="currentQCRow" user-type="crc" :body-parts="otherInfo.BodyPartTypes" :modalities="otherInfo.Modalitys" :subject-visit-id="currentQCRow.Id" :clinical-enum="otherInfo.ClinicalInformationTransmissionEnum" @close="close" @getDialogList="getDialogList" />
    </el-dialog>
  </BaseContainer>
 </template>
 <script>
-import { getCRCChallengeList, getTrialSiteSelect, getTrialVisitStageSelect, getQCChallengeDialogList, getNextCRCChallenge } from '@/api/trials'
+import { getCRCChallengeList, getTrialSiteSelect, getTrialVisitStageSelect, getQCChallengeDialogList } from '@/api/trials'
 import { getQCChallengeList_Export } from '@/api/export'
 import ChatForm from './components/chatForm'
 import BaseContainer from '@/components/BaseContainer'
@@ -332,29 +332,6 @@ export default {
    close() {
      this.chatVisible = false
    },
-    async getNextTask(qcChallengeId) {
-      try {
-        const params = {
-          trialId: this.trialId,
-          qcChallengeId: qcChallengeId
-        }
-        const res = await getNextCRCChallenge(params)
-        if (res.IsSuccess) {
-          const res2 =  await getQCChallengeDialogList(res.Result.Id)
-          if (res2.IsSuccess) {
-            Object.assign(res.Result, res2.Result[0])
-            this.chatVisible = false
-            this.currentQCRow = res.Result
-            this.$nextTick(() => {
-              this.chatVisible = true
-            })
-          }
-        }
-      } catch (e) {
-        this.chatVisible = false
-        console.log(e)
-      }
-    },
    getDialogList() {
      this.loading = true
      getQCChallengeDialogList(this.currentQCRow.Id).then(res => {
@@ -4,27 +4,21 @@
      <el-tab-pane
        v-for="cd in clinicalDatas"
        :key="cd.ClinicalDataTrialSetId"
-        :label="
-          $i18n.locale === 'zh'
-            ? cd.ClinicalDataSetName
-            : cd.ClinicalDataSetEnName
-        "
+        :label="$i18n.locale === 'zh' ? cd.ClinicalDataSetName : cd.ClinicalDataSetEnName"
      >
        <!-- 格式化录入 -->
        <div v-if="cd.ClinicalUploadType === 0">
          <!-- 既往放疗史 -->
-          <h4>{{ $t("trials:uploadClinicalData:title:pastTreatment") }}</h4>
-          <div v-if="allowAddOrEdit" style="text-align: right">
+          <h4>{{ $t('trials:uploadClinicalData:title:pastTreatment') }}</h4>
+          <div v-if="(allowAddOrEdit)" style="text-align:right">
            <!-- 新增 -->
            <el-button
              type="primary"
              icon="el-icon-plus"
              size="small"
-              @click.native.prevent="
-                addPreviousHistory(cd.ClinicalDataTrialSetId)
-              "
+              @click.native.prevent="addPreviousHistory(cd.ClinicalDataTrialSetId)"
            >
-              {{ $t("common:button:new") }}
+              {{ $t('common:button:new') }}
            </el-button>
          </div>

@@ -32,7 +26,10 @@
            :data="cd.ClinicalTableData.PreviousHistoryList"
            style="width: 100%"
          >
-            <el-table-column type="index" width="50" />
+            <el-table-column
+              type="index"
+              width="50"
+            />
            <!-- 放疗部位 -->
            <el-table-column
              prop="Position"
@@ -44,11 +41,7 @@
              :label="$t('trials:uploadClinicalData:table:beginDate')"
            >
              <template slot-scope="scope">
-                {{
-                  scope.row.StartTime
-                    ? moment(scope.row.StartTime).format("YYYY-MM-DD")
-                    : ""
-                }}
+                {{ scope.row.StartTime?moment(scope.row.StartTime).format('YYYY-MM-DD'):'' }}
              </template>
            </el-table-column>
            <!-- 结束日期 -->
@@ -57,11 +50,7 @@
              :label="$t('trials:uploadClinicalData:table:endDate')"
            >
              <template slot-scope="scope">
-                {{
-                  scope.row.EndTime
-                    ? moment(scope.row.EndTime).format("YYYY-MM-DD")
-                    : ""
-                }}
+                {{ scope.row.EndTime?moment(scope.row.EndTime).format('YYYY-MM-DD'):'' }}
              </template>
            </el-table-column>
            <!-- 病灶是否PD -->
@@ -70,7 +59,7 @@
              :label="$t('trials:uploadClinicalData:table:isPD')"
            >
              <template slot-scope="scope">
-                {{ $fd("IsPdEnum", scope.row.IsPD) }}
+                {{ $fd('IsPdEnum', scope.row.IsPD) }}
              </template>
            </el-table-column>
            <el-table-column
@@ -81,19 +70,16 @@
              <template slot-scope="scope">
                <!-- 编辑 -->
                <el-button
-                  v-if="allowAddOrEdit"
+                  v-if="( allowAddOrEdit)"
                  icon="el-icon-edit-outline"
                  circle
                  :title="$t('common:button:edit')"
                  size="small"
-                  @click.native.prevent="editRow(scope.row, 1)"
+                  @click.native.prevent="editRow(scope.row,1)"
                />
                <!-- 移除 -->
                <el-button
-                  v-if="
-                    data.SubmitState * 1 < 2 ||
-                    (data.SubmitState === 2 && data.IsQCConfirmedReupload)
-                  "
+                  v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
                  icon="el-icon-delete"
                  circle
                  :title="$t('common:button:delete')"
@@ -104,22 +90,25 @@
            </el-table-column>
          </el-table>
          <!-- 既往手术史 -->
-          <h4>{{ $t("trials:uploadClinicalData:title:pastSurgery") }}</h4>
-          <div v-if="allowAddOrEdit" style="text-align: right">
+          <h4>{{ $t('trials:uploadClinicalData:title:pastSurgery') }}</h4>
+          <div v-if="( allowAddOrEdit)" style="text-align:right">
            <el-button
              type="primary"
              icon="el-icon-plus"
              size="small"
              @click="addPreviousSurgery(cd.ClinicalDataTrialSetId)"
            >
-              {{ $t("common:button:new") }}
+              {{ $t('common:button:new') }}
            </el-button>
          </div>
          <el-table
            :data="cd.ClinicalTableData.PreviousSurgeryList"
            style="width: 100%"
          >
-            <el-table-column type="index" width="50" />
+            <el-table-column
+              type="index"
+              width="50"
+            />
            <!-- 手术名称 -->
            <el-table-column
              prop="OperationName"
@@ -131,11 +120,7 @@
              :label="$t('trials:uploadClinicalData:table:surgeryDate')"
            >
              <template slot-scope="scope">
-                {{
-                  scope.row.OperationTime
-                    ? moment(scope.row.OperationTime).format("YYYY-MM-DD")
-                    : ""
-                }}
+                {{ scope.row.OperationTime?moment(scope.row.OperationTime).format('YYYY-MM-DD'):'' }}
              </template>
            </el-table-column>

@@ -147,7 +132,7 @@
              <template slot-scope="scope">
                <!-- 编辑 -->
                <el-button
-                  v-if="allowAddOrEdit"
+                  v-if="(allowAddOrEdit)"
                  icon="el-icon-edit-outline"
                  circle
                  :title="$t('common:button:edit')"
@@ -156,10 +141,7 @@
                />
                <!-- 移除 -->
                <el-button
-                  v-if="
-                    data.SubmitState * 1 < 2 ||
-                    (data.SubmitState === 2 && data.IsQCConfirmedReupload)
-                  "
+                  v-if="data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload)"
                  icon="el-icon-delete"
                  circle
                  :title="$t('common:button:delete')"
@@ -170,8 +152,8 @@
            </el-table-column>
          </el-table>
          <!-- 既往其他治疗史 -->
-          <h4>{{ $t("trials:uploadClinicalData:title:others") }}</h4>
-          <div v-if="allowAddOrEdit" style="text-align: right">
+          <h4>{{ $t('trials:uploadClinicalData:title:others') }}</h4>
+          <div v-if="(allowAddOrEdit)" style="text-align:right">
            <!-- 新增 -->
            <el-button
              type="primary"
@@ -179,14 +161,17 @@
              size="small"
              @click="addPreviousOther(cd.ClinicalDataTrialSetId)"
            >
-              {{ $t("common:button:new") }}
+              {{ $t('common:button:new') }}
            </el-button>
          </div>
          <el-table
            :data="cd.ClinicalTableData.PreviousOtherList"
            style="width: 100%"
          >
-            <el-table-column type="index" width="50" />
+            <el-table-column
+              type="index"
+              width="50"
+            />
            <!-- 治疗类型 -->
            <el-table-column
              prop="TreatmentType"
@@ -198,11 +183,7 @@
              :label="$t('trials:uploadClinicalData:table:treatmentbeginDate')"
            >
              <template slot-scope="scope">
-                {{
-                  scope.row.StartTime
-                    ? moment(scope.row.StartTime).format("YYYY-MM-DD")
-                    : ""
-                }}
+                {{ scope.row.StartTime?moment(scope.row.StartTime).format('YYYY-MM-DD'):'' }}
              </template>
            </el-table-column>
            <!-- 结束日期 -->
@@ -211,11 +192,7 @@
              :label="$t('trials:uploadClinicalData:table:treatmentendDate')"
            >
              <template slot-scope="scope">
-                {{
-                  scope.row.EndTime
-                    ? moment(scope.row.EndTime).format("YYYY-MM-DD")
-                    : ""
-                }}
+                {{ scope.row.EndTime?moment(scope.row.EndTime).format('YYYY-MM-DD'):'' }}
              </template>
            </el-table-column>

@@ -227,7 +204,7 @@
              <template slot-scope="scope">
                <!-- 编辑 -->
                <el-button
-                  v-if="allowAddOrEdit"
+                  v-if="( allowAddOrEdit)"
                  icon="el-icon-edit-outline"
                  circle
                  :title="$t('common:button:edit')"
@@ -236,10 +213,7 @@
                />
                <!-- 移除 -->
                <el-button
-                  v-if="
-                    data.SubmitState * 1 < 2 ||
-                    (data.SubmitState === 2 && data.IsQCConfirmedReupload)
-                  "
+                  v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
                  icon="el-icon-delete"
                  circle
                  :title="$t('common:button:delete')"
@@ -252,7 +226,7 @@
        </div>
        <!-- PDF录入 -->
        <div v-if="cd.ClinicalUploadType === 1">
-          <div v-if="allowAddOrEdit" style="text-align: right">
+          <div v-if="(allowAddOrEdit)" style="text-align:right">
            <!-- 下载模板 -->
            <el-button
              v-if="cd.Path"
@@ -262,78 +236,42 @@
              :loading="downloadLoading"
              @click.native.prevent="handleDownloadTpl(cd)"
            >
-              {{ $t("trials:uploadClinicalData:button:downloadTemplate") }}
+              {{ $t('trials:uploadClinicalData:button:downloadTemplate') }}
            </el-button>
-            <div
-              id="directoryInputWrapper"
-              class="btn btn-link"
-              style="
-                position: relative;
-                overflow: hidden;
-                display: inline-block;
-              "
+            <!-- 新增 -->
+            <el-button
+              icon="el-icon-plus"
+              type="primary"
+              size="small"
+              @click.native.prevent="addFile(cd.Id,cd.ClinicalDataTrialSetId)"
            >
-              <!-- 新增 -->
-              <el-button
-                icon="el-icon-plus"
-                type="primary"
-                size="small"
-                :disabled="btnLoading"
-                :loading="btnLoading"
-              >
-                {{ $t("common:button:new") }}
-              </el-button>
-              <input
-                type="file"
-                name="file"
-                multiple
-                ref="file"
-                style="
-                  position: absolute;
-                  top: 0;
-                  left: 0;
-                  width: 100%;
-                  height: 100%;
-                  opacity: 0;
-                  cursor: pointer;
-                "
-                :accept="faccept.join(',')"
-                @change="
-                  ($event) =>
-                    beginScanFiles($event, cd.Id, cd.ClinicalDataTrialSetId)
-                "
-              />
-            </div>
+              {{ $t('common:button:new') }}
+            </el-button>
          </div>
-          <el-table :data="cd.PDFFileList" style="width: 100%">
-            <el-table-column type="index" width="50" />
+          <el-table
+            :data="cd.PDFFileList"
+            style="width: 100%"
+          >
+            <el-table-column
+              type="index"
+              width="50"
+            />
            <!-- 文件名称 -->
            <el-table-column
              prop="FileName"
              :label="$t('trials:uploadClinicalData:table:fileName')"
              width="250"
            />
-            <!-- 文件大小 -->
-            <el-table-column
-              prop="Size"
-              :label="$t('trials:uploadClinicalData:table:fileSize')"
-              width="150"
-            >
-            <template slot-scope="scope">
-              <span>{{
-                scope.row.Size && scope.row.Size > 0
-                  ? `${(scope.row.Size / 1024 / 1024).toFixed(2)}MB`
-                  : 0
-              }}</span>
-            </template>
-            </el-table-column>
            <!-- 上传时间 -->
            <el-table-column
              prop="CreateTime"
              :label="$t('trials:uploadClinicalData:table:uploadedTime')"
              width="200"
            />
-            <el-table-column :label="$t('common:action:action')" width="200">
+            <el-table-column
+              :label="$t('common:action:action')"
+              width="200"
+            >
              <template slot-scope="scope">
                <!-- 预览 -->
                <el-button
@@ -345,7 +283,7 @@
                />
                <!-- 移除 -->
                <el-button
-                  v-if="allowAddOrEdit"
+                  v-if="(allowAddOrEdit)"
                  icon="el-icon-delete"
                  circle
                  :title="$t('common:button:delete')"
@@ -395,13 +333,7 @@
      append-to-body
      custom-class="base-dialog-wrapper"
    >
-      <PreviousRadiotherapy
-        v-if="prVisible"
-        :data="currentRow"
-        :subject-visit-id="subjectVisitId"
-        @closePRDialog="closePRDialog"
-        @refresh="refresh"
-      />
+      <PreviousRadiotherapy v-if="prVisible" :data="currentRow" :subject-visit-id="subjectVisitId" @closePRDialog="closePRDialog" @refresh="refresh" />
    </el-dialog>
    <!-- 既往手术史  -->
    <el-dialog
@@ -413,14 +345,7 @@
      append-to-body
      custom-class="base-dialog-wrapper"
    >
-      <PreviousSurgery
-        v-if="psVisible"
-        :data="currentRow"
-        :parent-data="data"
-        :subject-visit-id="subjectVisitId"
-        @closePSDialog="closePSDialog"
-        @refresh="refresh"
-      />
+      <PreviousSurgery v-if="psVisible" :data="currentRow" :parent-data="data" :subject-visit-id="subjectVisitId" @closePSDialog="closePSDialog" @refresh="refresh" />
    </el-dialog>
    <!-- 既往其他治疗史 -->
    <el-dialog
@@ -432,14 +357,7 @@
      append-to-body
      custom-class="base-dialog-wrapper"
    >
-      <PreviousOther
-        v-if="poVisible"
-        :data="currentRow"
-        :parent-data="data"
-        :subject-visit-id="subjectVisitId"
-        @closePODialog="closePODialog"
-        @refresh="refresh"
-      />
+      <PreviousOther v-if="poVisible" :data="currentRow" :parent-data="data" :subject-visit-id="subjectVisitId" @closePODialog="closePODialog" @refresh="refresh" />
    </el-dialog>
    <!-- 上传文件 -->
    <el-dialog
@@ -451,14 +369,7 @@
      append-to-body
      custom-class="base-dialog-wrapper"
    >
-      <PreviousFiles
-        v-if="upVisible"
-        :data="currentRow"
-        :parent-data="data"
-        :subject-visit-id="subjectVisitId"
-        @closeUpDialog="closeUpDialog"
-        @refresh="refresh"
-      />
+      <PreviousFiles v-if="upVisible" :data="currentRow" :parent-data="data" :subject-visit-id="subjectVisitId" @closeUpDialog="closeUpDialog" @refresh="refresh" />
    </el-dialog>
    <!-- 预览文件 -->
    <el-dialog
@@ -469,79 +380,57 @@
      append-to-body
      custom-class="base-dialog-wrapper"
    >
-      <div
-        class="base-modal-body"
-        style="border: 2px solid #ccc; padding: 10px"
-      >
-        <PreviewFile
-          v-if="previewObj.visible"
-          :file-path="previewObj.filePath"
-          :file-type="previewObj.fileType"
-        />
+      <div class="base-modal-body" style="border:2px solid #ccc;padding: 10px">
+        <PreviewFile v-if="previewObj.visible" :file-path="previewObj.filePath" :file-type="previewObj.fileType" />
      </div>
    </el-dialog>
  </div>
 </template>
 <script>
-import {
-  deleteReadingClinicalDataPDF,
-  deletePreviousHistory,
-  deletePreviousOther,
-  deletePreviousSurgery,
-  DownloadTrialClinicalFile,
-  addOrUpdateReadingClinicalData,
-  getCRCClinicalData,
-} from "@/api/trials";
-import PreviousRadiotherapy from "./previousRadiotherapy";
-import PreviousSurgery from "./previousSurgery";
-import PreviousOther from "./previousOther";
-import PreviousFiles from "./previousFiles";
-import clinicalDataQuestions from "@/components/clinicalDataQuestions";
-import PreviewFile from "@/components/PreviewFile/index";
-import moment from "moment";
+import { deleteReadingClinicalDataPDF, deletePreviousHistory, deletePreviousOther, deletePreviousSurgery,
+  DownloadTrialClinicalFile } from '@/api/trials'
+import { getCRCClinicalData } from '@/api/trials'
+import PreviousRadiotherapy from './previousRadiotherapy'
+import PreviousSurgery from './previousSurgery'
+import PreviousOther from './previousOther'
+import PreviousFiles from './previousFiles'
+import clinicalDataQuestions from '@/components/clinicalDataQuestions'
+import PreviewFile from '@/components/PreviewFile/index'
+import moment from 'moment'
 export default {
-  name: "ClinicalData",
-  components: {
-    PreviousRadiotherapy,
-    PreviousSurgery,
-    PreviousOther,
-    PreviousFiles,
-    clinicalDataQuestions,
-    PreviewFile,
-  },
+  name: 'ClinicalData',
+  components: { PreviousRadiotherapy, PreviousSurgery, PreviousOther, PreviousFiles, clinicalDataQuestions,PreviewFile },
  props: {
    data: {
      type: Object,
      default() {
-        return {};
-      },
+        return {}
+      }
    },
    subjectVisitId: {
      type: String,
-      required: true,
+      required: true
    },
    enumType: {
      type: Number,
-      default: 0,
+      default: 0
    },
    allowAddOrEdit: {
      type: Boolean,
-      default: false,
-    },
+      default: false
+    }
+
  },
  data() {
    return {
-      faccept: [".pdf"],
      isShow: false,
-      userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
+      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
      loading: false,
      PreviousHistoryList: [],
      PreviousSurgeryList: [],
      PreviousOtherList: [],
      PreviousPDFList: [],
      fileList: [],
-      addFileList: [],
-      btnLoading: false,
      currentRow: {},
      prVisible: false,
      psVisible: false,
@@ -551,302 +440,186 @@ export default {
      moment,
      downloadLoading: false,
      clinicalDatas: [],
-      previewObj: { visible: false, filePath: "", fileType: "" },
-    };
+      previewObj:{visible:false,filePath:'',fileType:''}
+    }
  },
  mounted() {
-    this.getClinicalData();
+    this.getClinicalData()
  },
  methods: {
-    beginScanFiles(e, id, clinicalDataTrialSetId) {
-      this.currentRow = {
-        Id: id,
-        ClinicalDataTrialSetId: clinicalDataTrialSetId,
-        SubjectId: this.data.SubjectId,
-      };
-      this.currentRow.TrialId = this.$route.query.trialId;
-      var files = e.target.files;
-      this.fileList= [];
-      for (var i = 0; i < files.length; ++i) {
-        const fileName = files[i].name;
-        var extendName = fileName
-          .substring(fileName.lastIndexOf("."))
-          .toLocaleLowerCase();
-        if (this.faccept.indexOf(extendName) !== -1) {
-          let obj = {
-            size:files[i].size,
-            type:extendName.split('.')[1],
-            file:files[i],
-          }
-          this.fileList.push(obj);
-        }
-      }
-      this.handleUploadFile();
-      this.$refs.file.value = null;
-    },
-    async handleUploadFile() {
-      this.btnLoading = true;
-      this.loading = true;
-      this.addFileList = [];
-      try {
-        for (var i = 0; i < this.fileList.length; ++i) {
-          const file = await this.fileToBlob(this.fileList[i].file);
-          var timestamp = Date.now();
-          const res = await this.OSSclient.put(
-            `/${this.trialId}/ClinicalData/${timestamp}_${this.fileList[i].file.name}`,
-            file
-          );
-          this.addFileList.push({
-            fileName: this.fileList[i].file.name,
-            path: this.$getObjectName(res.url),
-            url: this.$getObjectName(res.url),
-            type: this.fileList[i].type,
-            size: this.fileList[i].size,
-          });
-        }
-        this.saveClinicalData();
-      } catch (err) {
-        console.log(err);
-        this.btnLoading = false;
-        this.loading = false;
-      }
-    },
-    saveClinicalData() {
-      this.btnLoading = true;
-      this.loading = true;
-      var param = {
-        id: this.currentRow.Id,
-        trialId: this.currentRow.TrialId,
-        subjectId: this.currentRow.SubjectId,
-        readingId: this.subjectVisitId,
-        clinicalDataTrialSetId: this.currentRow.ClinicalDataTrialSetId,
-        isVisit: true,
-        deleteFileIds: [],
-        addFileList: this.addFileList,
-      };
-      // if (this.studyData.StudyId) {
-      //   param.StudyId = this.studyData.StudyId;
-      // }
-      addOrUpdateReadingClinicalData(param)
-        .then((response) => {
-          this.btnLoading = false;
-          this.loading = false;
-          // 刷新文件列表并关闭弹窗
-          this.getClinicalData();
-          this.$message.success(
-            this.$t("trials:uploadClinicalData:message:uploadSuccessfully")
-          );
-        })
-        .catch(() => {
-          this.btnLoading = false;
-          this.loading = false;
-        });
-    },
    getClinicalData() {
-      this.loading = true;
-      this.data.TrialId = this.$route.query.trialId;
+      this.loading = true
+      this.data.TrialId = this.$route.query.trialId
      var param = {
        subjectVisitId: this.subjectVisitId,
        trialId: this.trialId,
        subjectId: this.data.SubjectId,
-        isBaseLine: this.data.IsBaseLine,
-      };
-      getCRCClinicalData(param)
-        .then((res) => {
-          this.clinicalDatas = res.Result;
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-        });
+        isBaseLine: this.data.IsBaseLine
+      }
+      getCRCClinicalData(param).then(res => {
+        this.clinicalDatas = res.Result
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
    },
    // 打开编辑框
    editRow(row, type) {
      if (type === 1) {
-        this.prVisible = true;
+        this.prVisible = true
      } else if (type === 2) {
-        this.psVisible = true;
+        this.psVisible = true
      } else if (type === 3) {
-        this.poVisible = true;
+        this.poVisible = true
      }
-      this.currentRow = { ...row };
-      this.currentRow.TrialId = this.$route.query.trialId;
+      this.currentRow = { ...row }
+      this.currentRow.TrialId = this.$route.query.trialId
    },
    // 根据ID删除既往放疗史
    deletePreviousHistory(row) {
-      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: "warning",
-        distinguishCancelAndClose: true,
-      }).then(() => {
-        this.loading = true;
-        deletePreviousHistory(
-          this.$route.query.trialId,
-          this.subjectVisitId,
-          row.Id
-        )
-          .then((res) => {
-            this.loading = false;
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          this.loading = true
+          deletePreviousHistory(this.$route.query.trialId, this.subjectVisitId, row.Id).then(res => {
+            this.loading = false
            if (res.IsSuccess) {
-              this.getClinicalData();
-              this.$message.success(
-                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
-              );
-              this.$emit("getList");
+              this.getClinicalData()
+              this.$message.success(this.$t('trials:uploadedDicoms:message:deleteSuccessfully'))
+              this.$emit('getList')
            }
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      });
+          }).catch(() => { this.loading = false })
+        })
    },
    // 根据ID删除既往手术史
    deletePreviousSurgery(row) {
-      console.log(this.$route.query.trialId);
-      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: "warning",
-        distinguishCancelAndClose: true,
-      }).then(() => {
-        // row.Type = '既往手术史'
-        this.loading = true;
-        deletePreviousSurgery(
-          this.$route.query.trialId,
-          this.subjectVisitId,
-          row.Id
-        )
-          .then((res) => {
-            this.loading = false;
-            if (res.IsSuccess) {
-              this.getClinicalData();
-              this.$message.success(
-                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
-              );
-              this.$emit("getList");
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      });
+      console.log(this.$route.query.trialId)
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          // row.Type = '既往手术史'
+          this.loading = true
+          deletePreviousSurgery(this.$route.query.trialId, this.subjectVisitId, row.Id)
+            .then(res => {
+              this.loading = false
+              if (res.IsSuccess) {
+                this.getClinicalData()
+                this.$message.success(this.$t('trials:uploadedDicoms:message:deleteSuccessfully'))
+                this.$emit('getList')
+              }
+            }).catch(() => { this.loading = false })
+        })
    },
    // 根据ID删除既往其他资料史
    deletePreviousOther(row) {
-      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: "warning",
-        distinguishCancelAndClose: true,
-      }).then(() => {
-        // row.Type = '既往其他治疗史'
-        this.loading = true;
-        deletePreviousOther(
-          this.$route.query.trialId,
-          this.subjectVisitId,
-          row.Id
-        )
-          .then((res) => {
-            this.loading = false;
-            if (res.IsSuccess) {
-              this.getClinicalData();
-              this.$message.success(
-                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
-              );
-              this.$emit("getList");
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      });
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          // row.Type = '既往其他治疗史'
+          this.loading = true
+          deletePreviousOther(this.$route.query.trialId, this.subjectVisitId, row.Id)
+            .then(res => {
+              this.loading = false
+              if (res.IsSuccess) {
+                this.getClinicalData()
+                this.$message.success(this.$t('trials:uploadedDicoms:message:deleteSuccessfully'))
+                this.$emit('getList')
+              }
+            }).catch(() => { this.loading = false })
+        })
    },
    // 文件预览
    preview(row) {
-      if (!row.Path) return;
-      this.previewObj.fileName = row.FileName;
-      this.previewObj.filePath = row.Path;
-      this.previewObj.fileType = "pdf";
-      this.previewObj.visible = true;
+      if (!row.Path) return
+      this.previewObj.fileName = row.FileName
+      this.previewObj.filePath = row.Path
+      this.previewObj.fileType ='pdf'
+      this.previewObj.visible = true
      // window.open(this.OSSclientConfig.basePath + path, '_blank')
    },
    addPreviousHistory(clinicalDataTrialSetId) {
-      console.log(clinicalDataTrialSetId);
-      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId };
-      this.currentRow.TrialId = this.$route.query.trialId;
-      this.prVisible = true;
+      console.log(clinicalDataTrialSetId)
+      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId }
+      this.currentRow.TrialId = this.$route.query.trialId
+      this.prVisible = true
    },
    addPreviousSurgery(clinicalDataTrialSetId) {
-      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId };
-      this.currentRow.TrialId = this.$route.query.trialId;
-      this.psVisible = true;
+      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId }
+      this.currentRow.TrialId = this.$route.query.trialId
+      this.psVisible = true
    },
    addPreviousOther(clinicalDataTrialSetId) {
-      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId };
-      this.currentRow.TrialId = this.$route.query.trialId;
-      this.poVisible = true;
+      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId }
+      this.currentRow.TrialId = this.$route.query.trialId
+      this.poVisible = true
    },
    // 关闭既往放疗史窗口并刷新列表
    closePRDialog() {
-      this.prVisible = false;
-      this.currentRow.TrialId = this.$route.query.trialId;
+      this.prVisible = false
+      this.currentRow.TrialId = this.$route.query.trialId
    },
    closePSDialog() {
-      this.psVisible = false;
-      this.currentRow.TrialId = this.$route.query.trialId;
+      this.psVisible = false
+      this.currentRow.TrialId = this.$route.query.trialId
    },
    closePODialog() {
-      this.poVisible = false;
-      this.currentRow.TrialId = this.$route.query.trialId;
+      this.poVisible = false
+      this.currentRow.TrialId = this.$route.query.trialId
    },
    closeUpDialog() {
-      this.upVisible = false;
-      this.currentRow.TrialId = this.$route.query.trialId;
+      this.upVisible = false
+      this.currentRow.TrialId = this.$route.query.trialId
    },
    refresh() {
-      this.getClinicalData();
-      this.$emit("getList");
+      this.getClinicalData()
+      this.$emit('getList')
    },
    // 添加文件
    addFile(id, clinicalDataTrialSetId) {
-      this.currentRow = {
-        Id: id,
-        ClinicalDataTrialSetId: clinicalDataTrialSetId,
-        SubjectId: this.data.SubjectId,
-      };
-      this.currentRow.TrialId = this.$route.query.trialId;
-      this.upVisible = true;
+      this.currentRow = { Id: id, ClinicalDataTrialSetId: clinicalDataTrialSetId, SubjectId: this.data.SubjectId }
+      this.currentRow.TrialId = this.$route.query.trialId
+      this.upVisible = true
    },
    // 删除文件
    deleteFile(id) {
-      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: "warning",
-        distinguishCancelAndClose: true,
-      }).then(() => {
-        this.loading = true;
-        deleteReadingClinicalDataPDF(id)
-          .then((res) => {
-            this.loading = false;
-            if (res.IsSuccess) {
-              this.getClinicalData();
-              this.$emit("getList");
-              this.$message.success(
-                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
-              );
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      });
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          this.loading = true
+          deleteReadingClinicalDataPDF(id)
+            .then(res => {
+              this.loading = false
+              if (res.IsSuccess) {
+                this.getClinicalData()
+                this.$emit('getList')
+                this.$message.success(this.$t('trials:uploadedDicoms:message:deleteSuccessfully'))
+              }
+            }).catch(() => {
+              this.loading = false
+            })
+        })
    },
    handleDownloadTpl(cd) {
-      window.open(this.OSSclientConfig.basePath + cd.Path);
-    },
-  },
-};
+      window.open(this.OSSclientConfig.basePath + cd.Path)
+    }
+  }
+
+}
 </script>
 <style lang="scss">
-.clinical-data-wrapper {
-  .box-title {
-    padding: 12px;
-    margin-bottom: 10px;
-    background-color: #dcdfe6;
-  }
+.clinical-data-wrapper{
+  .box-title{
+      padding: 12px;
+      margin-bottom: 10px;
+      background-color: #dcdfe6;
+    }
 }
 </style>
@@ -193,389 +193,365 @@
      </el-table-column>
    </el-table>
    <!-- 多文件上传 -->
-    <el-divider content-position="left">{{
-      $t("trials:uploadedDicoms:title:dicomFilesOnly")
-    }}</el-divider>
-    <el-tabs v-model="uploadActiveName">
-      <!-- 本地上传 -->
-      <el-tab-pane
-        :label="$t('trials:uploadedDicoms:tab:uploadFile')"
-        name="file"
-      >
-        <form id="inputForm" ref="uploadForm" enctype="multipart/form-data">
-          <div class="form-group">
-            <div id="directoryInputWrapper" class="btn btn-link file-input">
-              <el-button
-                type="primary"
-                :disabled="btnLoading"
-                :loading="btnLoading"
-                size="small"
-                >{{
-                  $t("trials:uploadedDicomsicom:button:selectFolder")
-                }}</el-button
-              >
-              <input
-                type="file"
-                name="file"
-                ref="pathClear"
-                :disabled="btnLoading"
-                webkitdirectory
-                multiple
-                @change="beginScanFiles($event)"
-              />
+    <form id="inputForm" ref="uploadForm" enctype="multipart/form-data">
+      <el-divider content-position="left">{{
+        $t("trials:uploadedDicoms:title:dicomFilesOnly")
+      }}</el-divider>
+      <div class="form-group">
+        <div id="directoryInputWrapper" class="btn btn-link file-input">
+          <el-button
+            type="primary"
+            :disabled="btnLoading"
+            :loading="btnLoading"
+            size="small"
+            >{{
+              $t("trials:uploadedDicomsicom:button:selectFolder")
+            }}</el-button
+          >
+          <input
+            type="file"
+            name="file"
+            ref="pathClear"
+            :disabled="btnLoading"
+            webkitdirectory
+            multiple
+            @change="beginScanFiles($event)"
+          />
+        </div>
+      </div>
+    </form>
+
+    <!-- 文件列表 -->
+    <el-table
+      ref="dicomFilesTable"
+      :data="uploadQueues"
+      :row-key="(row) => row.studyIndex"
+      class="dicomFiles-table"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        type="selection"
+        width="55"
+        :selectable="handleSelectable"
+      />
+      <el-table-column type="index" width="40" />
+      <el-table-column min-width="200" show-overflow-tooltip>
+        <template slot="header">
+          <el-tooltip placement="top">
+            <div slot="content">
+              {{ $t("trials:uploadDicomList:table:studyDetail1") }}<br />
+              {{ $t("trials:uploadDicomList:table:studyDetail2") }}<br />
+              {{ $t("trials:uploadedDicoms:table:studyDate") }}
+            </div>
+            <span>{{ $t("trials:uploadDicomList:table:studyInfo") }}</span>
+          </el-tooltip>
+        </template>
+        <template slot-scope="scope">
+          <div style="line-height: 15px">
+            <div>
+              <div>
+                <span v-if="scope.row.dicomInfo.accNumber"
+                  ><span style="font-weight: 500">Acc:</span>
+                  {{ scope.row.dicomInfo.accNumber }}</span
+                >
+                <span v-else style="color: #f44336">N/A</span>
+              </div>
+              <div style="display: inline-block; margin-right: 2px">
+                <span v-if="scope.row.dicomInfo.modality.length > 0">
+                  {{ scope.row.dicomInfo.modality.join("、") }},</span
+                >
+                <span v-else style="color: #f44336">N/A,</span>
+              </div>
+              <div style="display: inline-block; margin-right: 2px">
+                <span v-if="scope.row.seriesList.length"
+                  >{{ scope.row.seriesList.length }} Series,</span
+                >
+                <span v-else style="color: #f44336">N/A,</span>
+              </div>
+              <div style="display: inline-block">
+                <span v-if="scope.row.fileList.length"
+                  >{{ scope.row.fileList.length }} Instances</span
+                >
+                <span v-else style="color: #f44336">N/A</span>
+              </div>
+            </div>
+
+            <div>
+              <div style="display: inline-block; margin-right: 2px">
+                <span v-if="scope.row.dicomInfo.bodyPart">
+                  {{ scope.row.dicomInfo.bodyPart }},
+                </span>
+                <span v-else style="color: #f44336">N/A, </span>
+              </div>
+              <div style="display: inline-block">
+                <span v-if="scope.row.dicomInfo.description">
+                  {{ scope.row.dicomInfo.description }}</span
+                >
+                <span v-else style="color: #f44336">N/A</span>
+              </div>
+            </div>
+            <div>
+              {{ scope.row.dicomInfo.studyTime }}
            </div>
          </div>
-        </form>
+        </template>
+      </el-table-column>
+      <el-table-column min-width="130" show-overflow-tooltip>
+        <template slot="header">
+          <el-tooltip placement="top">
+            <div slot="content">
+              {{ $t("trials:uploadDicomList:table:pId") }}<br />
+              {{ $t("trials:uploadDicomList:table:patientName") }}<br />
+              {{ $t("trials:uploadDicomList:table:pInfo") }}
+            </div>
+            <span>{{ $t("trials:uploadDicomList:table:patientInfo") }}</span>
+          </el-tooltip>
+        </template>
+        <template slot-scope="scope">
+          <div style="line-height: 15px">
+            <div>
+              <span v-if="scope.row.dicomInfo.patientId"
+                ><span style="font-weight: 500">PID: </span
+                >{{ scope.row.dicomInfo.patientId }}</span
+              >
+              <span v-else style="color: #f44336">N/A</span>
+            </div>
+            <div>
+              <span
+                :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']"
+              >
+                {{
+                  scope.row.dicomInfo.patientName
+                    ? scope.row.dicomInfo.patientName
+                    : "N/A"
+                }}
+              </span>
+            </div>
+            <div>
+              <span
+                :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']"
+              >
+                {{
+                  scope.row.dicomInfo.patientSex
+                    ? scope.row.dicomInfo.patientSex
+                    : "N/A"
+                }},
+              </span>

-        <!-- 文件列表 -->
-        <el-table
-          ref="dicomFilesTable"
-          :data="uploadQueues"
-          :row-key="(row) => row.studyIndex"
-          class="dicomFiles-table"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            type="selection"
-            width="55"
-            :selectable="handleSelectable"
+              <span
+                :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']"
+              >
+                {{
+                  scope.row.dicomInfo.patientAge
+                    ? scope.row.dicomInfo.patientAge
+                    : "N/A"
+                }},
+              </span>
+
+              <span
+                :class="[
+                  scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
+                ]"
+              >
+                {{
+                  scope.row.dicomInfo.patientBirthDate
+                    ? scope.row.dicomInfo.patientBirthDate
+                    : "N/A"
+                }}
+              </span>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('trials:uploadDicomList:table:failedFileCount')"
+        min-width="120"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <el-progress
+            color="#409eff"
+            :percentage="
+              (scope.row.dicomInfo.failedFileCount * 100) /
+              scope.row.dicomInfo.fileCount
+            "
+            :show-text="false"
          />
-          <el-table-column type="index" width="40" />
-          <el-table-column min-width="200" show-overflow-tooltip>
-            <template slot="header">
-              <el-tooltip placement="top">
-                <div slot="content">
-                  {{ $t("trials:uploadDicomList:table:studyDetail1") }}<br />
-                  {{ $t("trials:uploadDicomList:table:studyDetail2") }}<br />
-                  {{ $t("trials:uploadedDicoms:table:studyDate") }}
-                </div>
-                <span>{{ $t("trials:uploadDicomList:table:studyInfo") }}</span>
-              </el-tooltip>
-            </template>
-            <template slot-scope="scope">
-              <div style="line-height: 15px">
-                <div>
-                  <div>
-                    <span v-if="scope.row.dicomInfo.accNumber"
-                      ><span style="font-weight: 500">Acc:</span>
-                      {{ scope.row.dicomInfo.accNumber }}</span
-                    >
-                    <span v-else style="color: #f44336">N/A</span>
-                  </div>
-                  <div style="display: inline-block; margin-right: 2px">
-                    <span v-if="scope.row.dicomInfo.modality.length > 0">
-                      {{ scope.row.dicomInfo.modality.join("、") }},</span
-                    >
-                    <span v-else style="color: #f44336">N/A,</span>
-                  </div>
-                  <div style="display: inline-block; margin-right: 2px">
-                    <span v-if="scope.row.seriesList.length"
-                      >{{ scope.row.seriesList.length }} Series,</span
-                    >
-                    <span v-else style="color: #f44336">N/A,</span>
-                  </div>
-                  <div style="display: inline-block">
-                    <span v-if="scope.row.fileList.length"
-                      >{{ scope.row.fileList.length }} Instances</span
-                    >
-                    <span v-else style="color: #f44336">N/A</span>
-                  </div>
-                </div>
-
-                <div>
-                  <div style="display: inline-block; margin-right: 2px">
-                    <span v-if="scope.row.dicomInfo.bodyPart">
-                      {{ scope.row.dicomInfo.bodyPart }},
-                    </span>
-                    <span v-else style="color: #f44336">N/A, </span>
-                  </div>
-                  <div style="display: inline-block">
-                    <span v-if="scope.row.dicomInfo.description">
-                      {{ scope.row.dicomInfo.description }}</span
-                    >
-                    <span v-else style="color: #f44336">N/A</span>
-                  </div>
-                </div>
-                <div>
-                  {{ scope.row.dicomInfo.studyTime }}
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column min-width="130" show-overflow-tooltip>
-            <template slot="header">
-              <el-tooltip placement="top">
-                <div slot="content">
-                  {{ $t("trials:uploadDicomList:table:pId") }}<br />
-                  {{ $t("trials:uploadDicomList:table:patientName") }}<br />
-                  {{ $t("trials:uploadDicomList:table:pInfo") }}
-                </div>
-                <span>{{
-                  $t("trials:uploadDicomList:table:patientInfo")
-                }}</span>
-              </el-tooltip>
-            </template>
-            <template slot-scope="scope">
-              <div style="line-height: 15px">
-                <div>
-                  <span v-if="scope.row.dicomInfo.patientId"
-                    ><span style="font-weight: 500">PID: </span
-                    >{{ scope.row.dicomInfo.patientId }}</span
-                  >
-                  <span v-else style="color: #f44336">N/A</span>
-                </div>
-                <div>
-                  <span
-                    :class="[
-                      scope.row.dicomInfo.patientName ? '' : 'colorOfRed',
-                    ]"
-                  >
-                    {{
-                      scope.row.dicomInfo.patientName
-                        ? scope.row.dicomInfo.patientName
-                        : "N/A"
-                    }}
-                  </span>
-                </div>
-                <div>
-                  <span
-                    :class="[
-                      scope.row.dicomInfo.patientSex ? '' : 'colorOfRed',
-                    ]"
-                  >
-                    {{
-                      scope.row.dicomInfo.patientSex
-                        ? scope.row.dicomInfo.patientSex
-                        : "N/A"
-                    }},
-                  </span>
-
-                  <span
-                    :class="[
-                      scope.row.dicomInfo.patientAge ? '' : 'colorOfRed',
-                    ]"
-                  >
-                    {{
-                      scope.row.dicomInfo.patientAge
-                        ? scope.row.dicomInfo.patientAge
-                        : "N/A"
-                    }},
-                  </span>
-
-                  <span
-                    :class="[
-                      scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
-                    ]"
-                  >
-                    {{
-                      scope.row.dicomInfo.patientBirthDate
-                        ? scope.row.dicomInfo.patientBirthDate
-                        : "N/A"
-                    }}
-                  </span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="$t('trials:uploadDicomList:table:failedFileCount')"
-            min-width="120"
-            show-overflow-tooltip
+          <span
+            >{{ scope.row.dicomInfo.failedFileCount }} /
+            {{ scope.row.dicomInfo.fileCount }}</span
          >
-            <template slot-scope="scope">
-              <el-progress
-                color="#409eff"
-                :percentage="
-                  (scope.row.dicomInfo.failedFileCount * 100) /
-                  scope.row.dicomInfo.fileCount
-                "
-                :show-text="false"
-              />
-              <span
-                >{{ scope.row.dicomInfo.failedFileCount }} /
-                {{ scope.row.dicomInfo.fileCount }}</span
-              >
-            </template>
-          </el-table-column>
+        </template>
+      </el-table-column>

-          <el-table-column
-            :label="$t('trials:uploadDicomList:table:status')"
-            min-width="140"
-            show-overflow-tooltip
+      <el-table-column
+        :label="$t('trials:uploadDicomList:table:status')"
+        min-width="140"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <span
+            v-if="
+              !scope.row.dicomInfo.failedFileCount &&
+              !scope.row.dicomInfo.isInit
+            "
          >
-            <template slot-scope="scope">
-              <span
-                v-if="
-                  !scope.row.dicomInfo.failedFileCount &&
-                  !scope.row.dicomInfo.isInit
-                "
-              >
-                {{ $t("trials:uploadDicomList:table:status1") }}</span
-              >
-              <span
-                style="color: #409eff"
-                v-else-if="
-                  !scope.row.dicomInfo.failedFileCount &&
-                  scope.row.dicomInfo.isInit &&
-                  btnLoading
-                "
-                >{{ $t("trials:uploadDicomList:table:status2") }}</span
-              >
-              <span
-                style="color: #409eff"
-                v-else-if="
-                  scope.row.dicomInfo.failedFileCount <
-                    scope.row.dicomInfo.fileCount &&
-                  !scope.row.uploadState.record
-                "
-                >{{ $t("trials:uploadDicomList:table:status2") }}</span
-              >
-              <span
-                style="color: #2cc368"
-                v-else-if="
-                  scope.row.dicomInfo.failedFileCount ===
-                  scope.row.dicomInfo.fileCount
-                "
-                >{{ $t("trials:uploadDicomList:table:status3") }}</span
-              >
-              <span
-                style="color: #f66"
-                v-else-if="
-                  scope.row.uploadState.record &&
-                  scope.row.uploadState.record.fileCount === 0
-                "
-                >{{ $t("trials:uploadDicomList:table:status5") }}</span
-              >
-              <span style="color: #f66" v-else>{{
-                $t("trials:uploadDicomList:table:Failed")
+            {{ $t("trials:uploadDicomList:table:status1") }}</span
+          >
+          <span
+            style="color: #409eff"
+            v-else-if="
+              !scope.row.dicomInfo.failedFileCount &&
+              scope.row.dicomInfo.isInit &&
+              btnLoading
+            "
+            >{{ $t("trials:uploadDicomList:table:status2") }}</span
+          >
+          <span
+            style="color: #409eff"
+            v-else-if="
+              scope.row.dicomInfo.failedFileCount <
+                scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
+            "
+            >{{ $t("trials:uploadDicomList:table:status2") }}</span
+          >
+          <span
+            style="color: #2cc368"
+            v-else-if="
+              scope.row.dicomInfo.failedFileCount ===
+              scope.row.dicomInfo.fileCount
+            "
+            >{{ $t("trials:uploadDicomList:table:status3") }}</span
+          >
+          <span
+            style="color: #f66"
+            v-else-if="
+              scope.row.uploadState.record &&
+              scope.row.uploadState.record.fileCount === 0
+            "
+            >{{ $t("trials:uploadDicomList:table:status5") }}</span
+          >
+          <span style="color: #f66" v-else>{{
+            $t("trials:uploadDicomList:table:Failed")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('trials:uploadDicomList:table:record')"
+        min-width="140"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <el-tooltip placement="top" v-if="scope.row.uploadState.record">
+            <div slot="content">
+              <div style="max-height: 500px; overflow-y: auto">
+                {{ $t("trials:uploadDicomList:table:Existed") }}:
+                <div v-if="scope.row.uploadState.record.Existed.length">
+                  <div
+                    v-for="item of scope.row.uploadState.record.Existed"
+                    :key="item"
+                    style="font-size: 12px; color: #baa72a"
+                  >
+                    {{ item }}
+                  </div>
+                </div>
+                <div v-else>&nbsp;</div>
+                {{ $t("trials:uploadDicomList:table:Uploaded") }}:
+                <div v-if="scope.row.uploadState.record.Uploaded.length">
+                  <div
+                    v-for="item of scope.row.uploadState.record.Uploaded"
+                    :key="item"
+                    style="font-size: 12px; color: #24b837"
+                  >
+                    {{ item }}
+                  </div>
+                </div>
+                <div v-else>&nbsp;</div>
+                <br />
+                {{ $t("trials:uploadDicomList:table:Failed") }}:
+                <div v-if="scope.row.uploadState.record.Failed.length">
+                  <div
+                    v-for="item of scope.row.uploadState.record.Failed"
+                    :key="item"
+                    style="font-size: 12px; color: #f66"
+                  >
+                    {{ item }}
+                  </div>
+                </div>
+                <div v-else>&nbsp;</div>
+              </div>
+            </div>
+            <el-button size="mini" style="cursor: pointer">
+              <span style="font-size: 12px; color: #baa72a">{{
+                scope.row.uploadState.record.Existed.length
              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="$t('trials:uploadDicomList:table:record')"
-            min-width="140"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <el-tooltip placement="top" v-if="scope.row.uploadState.record">
-                <div slot="content">
-                  <div style="max-height: 500px; overflow-y: auto">
-                    {{ $t("trials:uploadDicomList:table:Existed") }}:
-                    <div v-if="scope.row.uploadState.record.Existed.length">
-                      <div
-                        v-for="item of scope.row.uploadState.record.Existed"
-                        :key="item"
-                        style="font-size: 12px; color: #baa72a"
-                      >
-                        {{ item }}
-                      </div>
-                    </div>
-                    <div v-else>&nbsp;</div>
-                    {{ $t("trials:uploadDicomList:table:Uploaded") }}:
-                    <div v-if="scope.row.uploadState.record.Uploaded.length">
-                      <div
-                        v-for="item of scope.row.uploadState.record.Uploaded"
-                        :key="item"
-                        style="font-size: 12px; color: #24b837"
-                      >
-                        {{ item }}
-                      </div>
-                    </div>
-                    <div v-else>&nbsp;</div>
-                    <br />
-                    {{ $t("trials:uploadDicomList:table:Failed") }}:
-                    <div v-if="scope.row.uploadState.record.Failed.length">
-                      <div
-                        v-for="item of scope.row.uploadState.record.Failed"
-                        :key="item"
-                        style="font-size: 12px; color: #f66"
-                      >
-                        {{ item }}
-                      </div>
-                    </div>
-                    <div v-else>&nbsp;</div>
-                  </div>
-                </div>
-                <el-button size="mini" style="cursor: pointer">
-                  <span style="font-size: 12px; color: #baa72a">{{
-                    scope.row.uploadState.record.Existed.length
-                  }}</span>
-                  /
-                  <span style="font-size: 12px; color: #24b837">{{
-                    scope.row.uploadState.record.Uploaded.length
-                  }}</span>
-                  /
-                  <span style="font-size: 12px; color: #f66">{{
-                    scope.row.uploadState.record.Failed.length
-                  }}</span>
-                </el-button>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-show="isScan"
-            :label="$t('common:action:action')"
-            width="200"
-          >
-            <template slot-scope="scope">
-              <!-- 预览 -->
-              <!--          :disabled="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && scope.row.dicomInfo.failedFileCount !== 0"-->
-              <el-button
-                icon="el-icon-view"
-                circle
-                :disabled="
-                  scope.row.uploadState.stateCode !== '' &&
-                  scope.row.dicomInfo.failedFileCount <
-                    scope.row.dicomInfo.fileCount &&
-                  !scope.row.uploadState.record
-                "
-                :title="$t('trials:uploadedDicoms:action:preview')"
-                size="small"
-                @click="handlePreview(scope.row.dicomInfo.studyUid)"
-              />
-              <!-- 移除 -->
-              <el-button
-                icon="el-icon-delete"
-                circle
-                :title="$t('trials:uploadedDicoms:action:delete')"
-                size="small"
-                :disabled="
-                  scope.row.uploadState.stateCode !== '' &&
-                  scope.row.dicomInfo.failedFileCount <
-                    scope.row.dicomInfo.fileCount &&
-                  !scope.row.uploadState.record
-                "
-                @click="handleDelete(scope.$index, scope.row)"
-              />
-            </template>
-          </el-table-column>
-        </el-table>
-        <div style="text-align: right; padding: 10px 0px">
-          <!-- 关闭 -->
-          <!-- <el-button :disabled="btnLoading" size="small" type="primary" @click="cancel">
+              /
+              <span style="font-size: 12px; color: #24b837">{{
+                scope.row.uploadState.record.Uploaded.length
+              }}</span>
+              /
+              <span style="font-size: 12px; color: #f66">{{
+                scope.row.uploadState.record.Failed.length
+              }}</span>
+            </el-button>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-show="isScan"
+        :label="$t('common:action:action')"
+        width="200"
+      >
+        <template slot-scope="scope">
+          <!-- 预览 -->
+          <!--          :disabled="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && scope.row.dicomInfo.failedFileCount !== 0"-->
+          <el-button
+            icon="el-icon-view"
+            circle
+            :disabled="
+              scope.row.uploadState.stateCode !== '' &&
+              scope.row.dicomInfo.failedFileCount <
+                scope.row.dicomInfo.fileCount &&
+              !scope.row.uploadState.record
+            "
+            :title="$t('trials:uploadedDicoms:action:preview')"
+            size="small"
+            @click="handlePreview(scope.row.dicomInfo.studyUid)"
+          />
+          <!-- 移除 -->
+          <el-button
+            icon="el-icon-delete"
+            circle
+            :title="$t('trials:uploadedDicoms:action:delete')"
+            size="small"
+            :disabled="
+              scope.row.uploadState.stateCode !== '' &&
+              scope.row.dicomInfo.failedFileCount <
+                scope.row.dicomInfo.fileCount &&
+              !scope.row.uploadState.record
+            "
+            @click="handleDelete(scope.$index, scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <div style="text-align: right; padding: 10px 0px">
+      <!-- 关闭 -->
+      <!-- <el-button :disabled="btnLoading" size="small" type="primary" @click="cancel">
        {{ $t('trials:uploadDicomList:button:close') }}
      </el-button> -->
-          <!-- 上传 -->
-          <el-button
-            size="small"
-            type="primary"
-            :disabled="selectArr.length == 0 || !isScan"
-            :loading="btnLoading"
-            @click="beginUploadQueues"
-          >
-            {{ $t("trials:uploadDicomList:button:upload") }}
-          </el-button>
-        </div>
-      </el-tab-pane>
-      <!-- pacs上传 -->
-      <el-tab-pane
-        :label="$t('trials:uploadNonDicoms:tab:uploadPacs')"
-        name="pacs"
-        :disabled="btnLoading"
+      <!-- 上传 -->
+      <el-button
+        size="small"
+        type="primary"
+        :disabled="selectArr.length == 0 || !isScan"
+        :loading="btnLoading"
+        @click="beginUploadQueues"
      >
-        <uploadDicomPacs v-if="uploadActiveName === 'pacs'" />
-      </el-tab-pane>
-    </el-tabs>
+        {{ $t("trials:uploadDicomList:button:upload") }}
+      </el-button>
+    </div>
+
    <!-- 预览影像模态框 -->
    <el-dialog
      v-if="previewVisible"
@@ -782,10 +758,9 @@ import { dcmUpload } from "@/utils/dcmUpload/dcmUpload";
 import { convertBytes } from "@/utils/dicom-character-set";
 import moment from "moment";
 import store from "@/store";
-import uploadDicomPacs from "./uploadDiocmPacs.vue";
 export default {
  name: "UploadDicomFiles",
-  components: { DicomPreview, uploadPetClinicalData, uploadDicomPacs },
+  components: { DicomPreview, uploadPetClinicalData },
  props: {
    data: {
      type: Object,
@@ -808,7 +783,6 @@ export default {
  },
  data() {
    return {
-      uploadActiveName: "file",
      editStudyInfoVisible: false,
      studyForm: {
        StudyCode: "",
@@ -908,7 +882,7 @@ export default {
          modality: this.studyForm.Modality,
          bodyPart: this.studyForm.BodyPart,
        };
-        updateModality(this.data.TrialId, params)
+        updateModality(this.trialId, params)
          .then((res) => {
            this.btnLoading = false;
            if (res.IsSuccess) {
@@ -2001,7 +1975,7 @@ export default {
      }
      var arr = bodyPart.split(separator);
      var newArr = arr.map((i) => {
-        return this.$fd("Bodypart", i.trim(), "Code", this.BodyPart, "Name");
+        return this.$fd("Bodypart", i.trim(), "Code", this.BodyPart,'Name');
      });
      return newArr.join(" | ");
    },
@@ -1,311 +0,0 @@
-<template>
-  <BaseContainer>
-    <template slot="search-container">
-      <el-form :inline="true">
-        <!--所在中心-->
-        <el-form-item
-          :label="$t('trials:pushRecord:table:trialSiteKeyInfo')"
-          prop="TrialSiteKeyInfo"
-        >
-          <el-input
-            v-model="searchData.TrialSiteKeyInfo"
-            size="small"
-            clearable
-            style="width: 150px"
-            :placeholder="$t('trials:pushRecord:placeholder:trialSiteKeyInfo')"
-          />
-        </el-form-item>
-        <!--接收端AE-->
-        <el-form-item
-          :label="$t('trials:pushRecord:table:calledAE')"
-          prop="CalledAE"
-        >
-          <el-select
-            v-model="searchData.CalledAE"
-            clearable
-            style="width: 120px"
-          >
-            <el-option
-              v-for="item of calledAEList"
-              :key="item"
-              :value="item"
-              :label="item"
-            />
-          </el-select>
-        </el-form-item>
-        <!--发送端AE-->
-        <el-form-item
-          :label="$t('trials:pushRecord:table:callingAE')"
-          prop="CallingAE"
-        >
-          <el-select
-            v-model="searchData.CallingAE"
-            clearable
-            style="width: 120px"
-          >
-            <el-option
-              v-for="item of callingAEList"
-              :key="item"
-              :value="item"
-              :label="item"
-            />
-          </el-select>
-        </el-form-item>
-        <!--最新接受日期-->
-        <el-form-item :label="$t('trials:pushRecord:table:createTime')">
-          <el-date-picker
-            v-model="datetimerange"
-            type="datetimerange"
-            :default-time="['00:00:00', '23:59:59']"
-            :start-placeholder="$t('trials:loginLog:table:beginTime')"
-            :end-placeholder="$t('trials:loginLog:table:endTime')"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            @change="handleDatetimeChange"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t("common:button:search") }}
-          </el-button>
-          <!-- 重置 -->
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
-            {{ $t("common:button:reset") }}
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </template>
-    <template slot="main-container">
-      <el-table
-        v-loading="loading"
-        v-adaptive="{ bottomOffset: 120 }"
-        height="100"
-        :data="list"
-        class="table"
-        @sort-change="handleSortByColumn"
-        :default-sort="{ prop: 'StartTime', order: 'descending' }"
-      >
-        <el-table-column type="index" width="50" />
-        <!--中心编号-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:trialSiteCode')"
-          prop="TrialSiteCode"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--中心名称-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:trialSiteAliasName')"
-          prop="TrialSiteAliasName"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--发送端AE-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:callingAEList')"
-          prop="CallingAEList"
-          min-width="90"
-          show-overflow-tooltip
-          sortable="custom"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.CallingAEList.join(", ") }}
-          </template>
-        </el-table-column>
-        <!--发送端IP-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:callingAEIP')"
-          prop="CallingAEIP"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--接收端AE-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:calledAEList')"
-          prop="CalledAEList"
-          min-width="90"
-          show-overflow-tooltip
-          sortable="custom"
-          ><template slot-scope="scope">
-            {{ scope.row.CallingAEList.join(", ") }}
-          </template>
-        </el-table-column>
-
-        <!--检查数-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:studyCount')"
-          prop="StudyCount"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--图像数量-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:fileCount')"
-          prop="FileCount"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--图像大小-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:fileSize')"
-          prop="FileSize"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--推送开始时间-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:startTime')"
-          prop="StartTime"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--推送结束时间-->
-        <el-table-column
-          :label="$t('trials:pushRecord:table:endTime')"
-          prop="EndTime"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-      </el-table>
-      <!-- 分页组件 -->
-      <pagination
-        class="page"
-        :total="total"
-        :page.sync="searchData.PageIndex"
-        :limit.sync="searchData.PageSize"
-        @pagination="getList"
-      />
-    </template>
-  </BaseContainer>
-</template>
-      <script>
-import {
-  getSCPImageUploadList,
-  getDicomCalledAEList,
-  getDicomCallingAEList,
-} from "@/api/trials";
-import BaseContainer from "@/components/BaseContainer";
-import Pagination from "@/components/Pagination";
-import moment from "moment";
-const searchDataDefault = () => {
-  return {
-    CallingAE: null,
-    CalledAE: null,
-    StartTime: null,
-    EndTime: null,
-    TrialSiteKeyInfo: null,
-    PageIndex: 1,
-    PageSize: 20,
-    Asc: true,
-    SortField: "StartTime",
-  };
-};
-export default {
-  components: { BaseContainer, Pagination },
-  data() {
-    return {
-      moment,
-      searchData: searchDataDefault(),
-      list: [],
-      total: 0,
-      loading: false,
-      datetimerange: [],
-      calledAEList: [],
-      callingAEList: [],
-    };
-  },
-  created() {
-    this.getCalledAEList();
-    this.getCallingAEList();
-  },
-  mounted() {
-    this.getList();
-  },
-  methods: {
-    // 获取接收端AE列表
-    async getCalledAEList() {
-      try {
-        let params = {
-          TrialId: this.$route.query.trialId,
-        };
-        let res = await getDicomCalledAEList(params);
-        if (res.IsSuccess) {
-          this.calledAEList = res.Result;
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    },
-    // 获取发送端端AE列表
-    async getCallingAEList() {
-      try {
-        let params = {
-          TrialId: this.$route.query.trialId,
-        };
-        let res = await getDicomCallingAEList(params);
-        if (res.IsSuccess) {
-          this.callingAEList = res.Result;
-        }
-      } catch (err) {
-        console.log(err);
-      }
-    },
-    getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.$route.query.trialId;
-      getSCPImageUploadList(this.searchData)
-        .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
-        })
-        .catch(() => {
-          this.loading = false;
-        });
-    },
-    handleDatetimeChange(val) {
-      if (val) {
-        this.searchData.StartTime = val[0];
-        this.searchData.EndTime = val[1];
-      } else {
-        this.searchData.StartTime = "";
-        this.searchData.EndTime = "";
-      }
-    },
-    handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
-    },
-    // 重置列表查询
-    handleReset() {
-      this.datetimerange = null;
-      this.handleDatetimeChange();
-      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();
-    },
-  },
-};
-</script>
-      
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
caiyiling	f8837d8cef	样式调整 continuous-integration/drone/push Build is passing Details	2024-08-02 14:41:27 +08:00
caiyiling	be3719c0d2	Merge branch 'uat' of https://gitea.frp.extimaging.com/XCKJ/irc_web into uat continuous-integration/drone/push Build is passing Details	2024-08-02 14:19:27 +08:00
caiyiling	51e0322f6d	样式调整	2024-08-02 14:19:15 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	7c379c9566	Merge branch 'uat' of https://gitea.frp.extimaging.com/XCKJ/irc_web into uat continuous-integration/drone/push Build is running Details	2024-08-02 14:17:29 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	38b9e092a4	国际化问题修改	2024-08-02 14:17:17 +08:00
caiyiling	23c0e4e675	Merge branch 'uat' of https://gitea.frp.extimaging.com/XCKJ/irc_web into uat continuous-integration/drone/push Build is running Details	2024-08-02 14:10:11 +08:00
caiyiling	0aaa38e751	质控样式调整	2024-08-02 14:09:52 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	ce1bd2df25	国际化问题修改 continuous-integration/drone/push Build is running Details	2024-08-02 14:08:42 +08:00
caiyiling	ea413ffe0b	影像质控样式调整 continuous-integration/drone/push Build is passing Details	2024-08-02 14:00:23 +08:00
caiyiling	f87935f6f5	审核通过时间查询条件更改 continuous-integration/drone/push Build is passing Details	2024-08-02 13:44:39 +08:00
caiyiling	3819f5af0b	影像上传和影像指控页面添加审核完成时间 continuous-integration/drone/push Build is passing Details	2024-08-02 11:41:50 +08:00
caiyiling	43bdf0cc19	影像重传bug修复 continuous-integration/drone/push Build is passing Details	2024-08-01 16:34:07 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	8ee3847791	阅片单元表格操作栏宽度加宽 continuous-integration/drone/push Build is passing Details	2024-07-31 14:04:05 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	c9e99339d5	阅片单元问题配置问题名称中英文问题 continuous-integration/drone/push Build is passing Details	2024-07-31 13:39:43 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	e593aedd46	阅片单元问题配置问题名称中英文问题 continuous-integration/drone/push Build is passing Details	2024-07-31 13:23:56 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	65e4bf94ad	阅片单元问题配置问题名称中英文问题 continuous-integration/drone/push Build is passing Details	2024-07-31 13:11:13 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	e81b7897e7	mfa标题加粗 continuous-integration/drone/push Build is passing Details	2024-07-31 11:17:56 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	ab65a9f1c7	阅片单元问题配置问题名称中英文问题	2024-07-31 11:17:32 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	4b6c589881	锁定MFA验证邮箱加密 continuous-integration/drone/push Build is passing Details	2024-07-31 10:06:54 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	73a6935fb8	管理后台默认访问页面修改	2024-07-31 10:06:19 +08:00
caiyiling	ec96011d4b	多帧样式更改 continuous-integration/drone/push Build is passing Details	2024-07-30 18:57:07 +08:00
caiyiling	750c465b18	医学审核更改 continuous-integration/drone/push Build is passing Details	2024-07-30 17:04:16 +08:00
caiyiling	db4632fb9b	关键帧渲染问题修复 continuous-integration/drone/push Build is passing Details	2024-07-30 16:28:11 +08:00
caiyiling	1eae9eda28	多帧下载及进度条维护 continuous-integration/drone/push Build is passing Details	2024-07-30 14:55:59 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	fbb41e3fd9	1 continuous-integration/drone/push Build is passing Details	2024-07-30 13:42:24 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	7311252d3c	Merge branch 'uat' into uat_us	2024-07-30 13:33:09 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	b43202076c	ip所在地暂时屏蔽 continuous-integration/drone/push Build is passing Details	2024-07-30 13:32:17 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	2e11c881f5	1	2024-07-30 10:43:24 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	535d30b6df	logo调整	2024-07-30 10:18:31 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	be14515286	更改版本号v1.5.4 continuous-integration/drone/push Build is passing Details	2024-07-30 09:32:22 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	84a8f6ec75	操作限制相关国际化添加国际化	2024-07-30 09:32:00 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	e16a02eaff	检查部位修改为文本域 continuous-integration/drone/push Build is passing Details	2024-07-29 17:35:12 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	22193bb291	检查部位输入限制提升至500 continuous-integration/drone/push Build is passing Details	2024-07-29 17:17:22 +08:00
caiyiling	e1b6bec85b	dicom预览更改 continuous-integration/drone/push Build is passing Details	2024-07-26 14:42:51 +08:00
caiyiling	8b6714806e	dicom预览更改 continuous-integration/drone/push Build is passing Details	2024-07-26 13:21:12 +08:00
caiyiling	16581bd7b9	预览更改 continuous-integration/drone/push Build is passing Details	2024-07-26 11:41:30 +08:00
caiyiling	057d23d34b	依赖包更新 continuous-integration/drone/push Build is failing Details	2024-07-26 10:39:49 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	47fc6c5ef0	mfa国际化修改	2024-07-25 14:54:41 +08:00
caiyiling	fd70c3ee2c	1 continuous-integration/drone/push Build is passing Details	2024-07-25 14:19:56 +08:00
caiyiling	de638b1436	同意重阅申请更改 continuous-integration/drone/push Build is passing Details	2024-07-25 14:08:50 +08:00
caiyiling	ca18abe26e	重阅跟踪--审批结果新增状态 continuous-integration/drone/push Build is passing Details	2024-07-25 13:44:38 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	a0eaf2f64a	美国uat发布	2024-07-24 13:10:42 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	f32abfe230	1	2024-07-19 14:34:21 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	3f5092bcbb	1	2024-07-19 13:28:43 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	f0e6c5b9de	Merge branch 'uat' into uat_us	2024-07-19 13:24:35 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	16b6f5f8b1	上传监控修复、非dicom上传和指控下载排除自动登出 continuous-integration/drone/push Build was killed Details	2024-07-19 10:14:20 +08:00
wangxiaoshuang	04bd72e90f	下载问题修复 continuous-integration/drone/push Build is passing Details	2024-07-17 19:30:26 +08:00
wangxiaoshuang	d7fcd79cb2	下载问题修复 continuous-integration/drone/push Build is passing Details	2024-07-17 19:16:42 +08:00
wangxiaoshuang	bebd4c4aa0	重复下载提示 continuous-integration/drone/push Build is passing Details	2024-07-17 17:36:52 +08:00
wangxiaoshuang	81506cc337	下载文件改名 continuous-integration/drone/push Build is passing Details	2024-07-17 16:49:39 +08:00
caiyiling	13f105faa5	Merge branch 'uat' of https://gitea.frp.extimaging.com/XCKJ/irc_web into uat continuous-integration/drone/push Build is passing Details	2024-07-17 14:59:51 +08:00
caiyiling	32ded49982	裁判阅片及医学审核预览图片问题修复	2024-07-17 14:59:10 +08:00
wangxiaoshuang	3ae982d422	国际化修改	2024-07-17 13:35:18 +08:00
wangxiaoshuang	05ab287e81	修改版本号 continuous-integration/drone/push Build is passing Details	2024-07-17 13:05:32 +08:00
wangxiaoshuang	978aacf085	非dicom阅片国际化修改	2024-07-17 11:16:38 +08:00
wangxiaoshuang	67ceadcc9c	登录日志访问ip屏蔽	2024-07-15 13:48:36 +08:00