Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

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

.env.usa

@@ -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

.env.usa_prod

@@ -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

irc_vue_drone.yml

@@ -1,6 +1,6 @@
 kind: pipeline
 type: ssh
-name: ssh-linux-test-irc-publish
+name: ssh-linux-uat-irc-publish
 
 platform:
   os: Linux
@@ -24,6 +24,38 @@ steps:
 trigger:
   branch:
     - uat    
+    
+---    
+    
+kind: pipeline
+type: ssh
+name: ssh-linux-test-irc-publish
+
+platform:
+  os: Linux
+  arch: 386
+  
+clone:
+  disable: true  #禁用默认克隆
+  
+server:
+  host: 106.14.89.110
+  user: root
+  password:
+    from_secret: local_pwd
+
+steps:
+- name: publish-test-irc-vue
+  commands:
+  - echo start publish test-irc-vue
+  - cd /opt/1panel/hang/vue/test-irc
+  - sh test-irc.sh v${DRONE_BUILD_NUMBER}
+  
+trigger:
+  branch:
+    - main    
+       
+
        
 
     

package-lock.json

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

package.json

@@ -27,11 +27,12 @@
     "axios": "0.18.1",
     "babel-eslint": "7.2.3",
     "copy-webpack-plugin": "^4.5.2",
+    "@aws-sdk/client-s3": "^3.370.0",
     "core-js": "^3.8.3",
-    "cornerstone-core": "^2.3.0",
-    "cornerstone-math": "^0.1.8",
-    "cornerstone-tools": "^6.0.8",
-    "cornerstone-wado-image-loader": "^3.1.2",
+    "cornerstone-core": "^2.6.1",
+    "cornerstone-math": "^0.1.10",
+    "cornerstone-tools": "^6.0.10",
+    "cornerstone-wado-image-loader": "^4.13.2",
     "dcmjs": "^0.29.8",
     "dicom-parser": "^1.8.9",
     "dicomedit": "^0.1.0",
@@ -51,9 +52,11 @@
     "path-to-regexp": "2.4.0",
     "pdfobject": "^2.2.8",
     "popper.js": "^1.16.1",
+    "qrcodejs2": "0.0.2",
     "sass-loader": "^8.0.0",
     "screenfull": "^4.2.0",
     "sortablejs": "^1.15.0",
+    "streamsaver": "^2.0.6",
     "v-viewer": "^1.6.4",
     "vcrontab": "^0.3.5",
     "vue": "^2.6.11",

src/App.vue

@@ -3,6 +3,7 @@
     <router-view />
     <div
       v-show="show"
+      v-if="$route.matched.length > 0"
       v-adaptive
       @click="openI18n"
       style="
@@ -81,6 +82,7 @@
         >
       </div>
     </el-drawer>
+    <feedBack v-if="$route.matched.length > 0" />
   </div>
 </template>
 
@@ -90,10 +92,12 @@ import {
   getFrontInternationalizationList,
 } from "@/api/dictionary/dictionary";
 import { getTrialExtralConfig } from "@/api/trials";
+import feedBack from "@/views/trials/trials-layout/components/feedBack";
 import Vue from "vue";
 import i18n from "./lang";
 export default {
   name: "App",
+  components: { feedBack },
   data() {
     return {
       drawer: false,
@@ -111,7 +115,9 @@ export default {
       async handler() {
         if (
           this.$route.query.trialId &&
-          this.$route.query.trialId !== this.$store.state.trials.config.trialId
+          this.$route.query.trialId !==
+            this.$store.state.trials.config.trialId &&
+          this.$store.state.trials.whiteList.indexOf(this.$route.path) === -1
         ) {
           let res = await getTrialExtralConfig({
             TrialId: this.$route.query.trialId,
@@ -275,4 +281,7 @@ textarea {
 .title-logo {
   height: 40px;
 }
+.title-logo {
+  height: 40px;
+}
 </style>

src/api/admin.js

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

src/api/dictionary.js

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

src/api/dictionary/dictionary.js

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

src/api/export.js

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

src/api/load.js

@@ -39,4 +39,12 @@ export function deleteTaskStudy(params) {
         method: 'delete',
         params
     })
+}
+// 获取iqc下载文件信息
+export function getCRCUploadedStudyInfo(data) {
+    return request({
+        url: '/DownloadAndUpload/getCRCUploadedStudyInfo',
+        method: 'post',
+        data
+    })
 }

src/api/reading.js

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

src/api/trials.js

@@ -3675,6 +3675,54 @@ 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({
@@ -3683,3 +3731,178 @@ export function getTrialExtralConfig(params) {
     params
   })
 }
+// 项目新增或修改dicomAE配置
+export function addOrUpdateDicomAE(data) {
+  return request({
+    url: `/TrialDicomAE/addOrUpdateDicomAE`,
+    method: 'post',
+    data
+  })
+}
+// 测试dicomAE链接
+export function testSCPServerConnect(data) {
+  return request({
+    url: `/TrialDicomAE/testSCPServerConnect`,
+    method: 'post',
+    data
+  })
+}
+// 获取dicomAE默认值
+export function getTrialPacsConfigInfo(params) {
+  return request({
+    url: `/TrialConfig/getTrialPacsConfigInfo`,
+    method: 'get',
+    params
+  })
+}
+// dicomAE配置签名
+export function ConfigTrialPACSInfoConfirm(data) {
+  return request({
+    url: `/Inspection/configTrialBasicInfo/ConfigTrialPACSInfoConfirm`,
+    method: 'post',
+    data
+  })
+}
+// 获取推送记录
+export function getSCPImageUploadList(data) {
+  return request({
+    url: `/Patient/getSCPImageUploadList`,
+    method: 'post',
+    data
+  })
+}
+// 获取影像检查患者列表
+export function getPatientList(data) {
+  return request({
+    url: `/Patient/getPatientList`,
+    method: 'post',
+    data
+  })
+}
+// 获取影像检查患者检查列表
+export function getPatientStudyList(data) {
+  return request({
+    url: `/Patient/getPatientStudyList`,
+    method: 'post',
+    data
+  })
+}
+// 获取接收方AE列表
+export function getDicomCalledAEList(params) {
+  return request({
+    url: `/Patient/getDicomCalledAEList`,
+    method: 'get',
+    params
+  })
+}
+// 获取发送方AE列表
+export function getDicomCallingAEList(params) {
+  return request({
+    url: `/Patient/getDicomCallingAEList`,
+    method: 'get',
+    params
+  })
+}
+// CRCpacs上传检查列表
+export function getVisitPatientStudyFilterList(data) {
+  return request({
+    url: `/Patient/getVisitPatientStudyFilterList`,
+    method: 'post',
+    data
+  })
+}
+// CRCpacs上传检查校验
+export function verifyPacsImage(data) {
+  return request({
+    url: `/Patient/verifyPacsImage`,
+    method: 'post',
+    data
+  })
+}
+// CRCpacs上传检查
+export function submitVisitStudyBinding(data) {
+  return request({
+    url: `/Patient/submitVisitStudyBinding`,
+    method: 'post',
+    data
+  })
+}
+// 获取pacs检查技术
+export function getDicomModalityList(params) {
+  return request({
+    url: `/Patient/getDicomModalityList`,
+    method: 'get',
+    params
+  })
+}
+// 获取患者序列信息
+export function getPatientSeriesList(scpStudyId) {
+  return request({
+    url: `/Patient/getPatientSeriesList?scpStudyId=${scpStudyId}`,
+    method: 'get'
+  })
+}
+// 获取反馈列表
+export function getUserFeedBackList(data) {
+  return request({
+    url: `/UserFeedBack/getUserFeedBackList`,
+    method: 'post',
+    data
+  })
+}
+// 更新反馈状态
+export function batchUpdateFeedBackState(data) {
+  return request({
+    url: `/UserFeedBack/batchUpdateFeedBackState`,
+    method: 'put',
+    data
+  })
+}
+// 新增或修改意见反馈
+export function addOrUpdateUserFeedBack(data) {
+  return request({
+    url: `/UserFeedBack/addOrUpdateUserFeedBack`,
+    method: 'post',
+    data
+  })
+}
+// 获取反馈详情
+export function getUserFeedBackInfo(data) {
+  return request({
+    url: `/UserFeedBack/getUserFeedBackInfo`,
+    method: 'post',
+    data
+  })
+}
+//  一致性分析获取临床数据列表
+export function getConsistencyAnalysisReadingClinicalDataList(data) {
+  return request({
+    url: `/ReadingClinicalData/getConsistencyAnalysisReadingClinicalDataList`,
+    method: 'post',
+    data
+  })
+}
+//  新增或修改一致性分析临床数据
+export function addOrUpdateConsistencyAnalysisReadingClinicalData(data) {
+  return request({
+    url: `/ReadingClinicalData/addOrUpdateConsistencyAnalysisReadingClinicalData`,
+    method: 'post',
+    data
+  })
+}
+//  一致性分析临床数据签名
+export function signConsistencyAnalysisReadingClinicalData(data) {
+  return request({
+    url: `/Inspection/ReadingClinicalData/SignConsistencyAnalysisReadingClinicalData`,
+    method: 'post',
+    data
+  })
+}
+//  一致性分析临床数据设置任务为有效
+export function setTaskValid(data) {
+  return request({
+    url: `/ReadingClinicalData/setTaskValid`,
+    method: 'post',
+    data
+  })
+}

src/components/BaseForm/search-form.vue

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

src/components/Dicom/DicomCanvas.vue

@@ -81,16 +81,25 @@
     <!-- <div v-show="stack.firstImageLoading" class="load-indicator">
       Loading Series #{{ stack.seriesNumber }}...
     </div>-->
+    <el-dialog
+      v-if="dcmTag.visible"
+      :visible.sync="dcmTag.visible"
+      :close-on-click-modal="false"
+      :title="dcmTag.title"
+      width="1000px"
+      custom-class="base-dialog-wrapper"
+      append-to-body
+    >
+      <DicomTags :image-data="imageData" @close="dcmTag.visible = false" />
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import Vue from 'vue'
-import Contextmenu from 'vue-contextmenujs'
-Vue.use(Contextmenu)
 import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneMath from 'cornerstone-math'
 import * as cornerstoneTools from 'cornerstone-tools'
+
 const scroll = cornerstoneTools.import('util/scrollToIndex')
 import Hammer from 'hammerjs'
 import getOrientationString from '@/views/trials/trials-panel/reading/dicoms/tools/OrientationMarkers/getOrientationString'
@@ -108,8 +117,10 @@ cornerstoneTools.toolColors.setActiveColor('rgb(0, 255, 0)')
 // cornerstoneTools.init({ showSVGCursors: true })
 cornerstoneTools.init()
 const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
+import DicomTags from './DicomTags'
 export default {
   name: 'DicomCanvas',
+  components: { DicomTags },
   data() {
     return {
       loading: false,
@@ -164,7 +175,9 @@ export default {
       mousePosition: { x: '', y: '', mo: '' },
       markers: { top: '', right: '', bottom: '', left: '' },
       orientationMarkers: [],
-      originalMarkers: []
+      originalMarkers: [],
+      dcmTag: { visible: false, title: 'DICOM Tags' },
+      imageData: null
     }
   },
 
@@ -200,7 +213,7 @@ export default {
         this.stack.seriesId = dicomSeries.seriesId
         this.stack.seriesNumber = dicomSeries.seriesNumber
         this.stack.imageIds = dicomSeries.imageIds
-        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex ? dicomSeries.imageIdIndex : 0
+        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length ? dicomSeries.imageIdIndex : 0
         this.stack.firstImageLoading = true
         this.stack.description = dicomSeries.description
         this.toolState.viewportInvert = false
@@ -212,6 +225,8 @@ export default {
         this.toolState.clipPlaying = false
         const element = this.$refs.canvas
         cornerstone.enable(element)
+        cornerstoneTools.stopClip(this.canvas)
+        this.toolState.clipPlaying = false
         this.loading = true
 
         cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
@@ -362,8 +377,8 @@ export default {
       if (this.dicomInfo.thick) {
         this.dicomInfo.thick = this.dicomInfo.thick.toFixed(2)
       }
-      let newImageIdIndex = this.stack.imageIds.findIndex(i=>i===e.detail.image.imageId)
-      if(newImageIdIndex === -1) return
+      const newImageIdIndex = this.stack.imageIds.findIndex(i => i === e.detail.image.imageId)
+      if (newImageIdIndex === -1) return
       this.stack.currentImageIdIndex = newImageIdIndex
       this.stack.imageIdIndex = newImageIdIndex
       this.series.imageIdIndex = newImageIdIndex
@@ -439,7 +454,7 @@ export default {
       if (!markers) {
         return
       }
-      
+
       this.orientationMarkers = [oppositeColumn, row, column, oppositeRow]
       this.originalMarkers = [oppositeColumn, row, column, oppositeRow]
       this.setMarkers()
@@ -634,7 +649,7 @@ export default {
       enabledElement.renderingTools.renderCanvasData = renderCanvasData
     },
     scrollPage(offset) {
-      if(this.loading) return
+      if (this.loading) return
       var index = this.stack.currentImageIdIndex + offset
       if (index < 0) index = 0
       else if (index >= this.stack.imageIds.length) {
@@ -646,7 +661,7 @@ export default {
     },
 
     toggleClipPlay() {
-      if(this.loading) return
+      if (this.loading) return
       if (this.toolState.clipPlaying) {
         cornerstoneTools.stopClip(this.canvas)
         this.toolState.clipPlaying = false
@@ -705,7 +720,7 @@ export default {
         this.orientationMarkers = [...this.originalMarkers]
         this.setMarkers()
       }
-      
+
       var viewport = cornerstone.getViewport(this.canvas)
       viewport.hflip = false
       viewport.vflip = false
@@ -745,6 +760,13 @@ export default {
       var uid = cornerstone.getImage(this.canvas).data.string('x00080018')
       cornerstoneTools.SaveAs(this.canvas, `${uid}.png`)
     },
+    showTags() {
+      var image = cornerstone.getImage(this.canvas)
+      // var dataSet = dicomParser.parseDicom(image.data.byteArray)
+      // console.log('showTags', dataSet)
+      this.dcmTag.visible = true
+      this.imageData = image.data
+    },
     fitToWindow() {
       if (this.stack.seriesNumber) {
         cornerstone.fitToWindow(this.canvas)
@@ -871,194 +893,197 @@ export default {
       synchronizer.remove(this.$refs.canvas)
       this.setAllToolsPassive()
     },
-    onContextmenu(event) {
-      const colormapsList = cornerstone.colors.getColormapsList()
-      const colorItems = []
-      colorItems.push({
-        label: '默认值',
-        onClick: () => {
-          this.setColormap()
-        }
-      })
-      colormapsList.forEach(colormap => {
-        const item = {}
-        item.label = colormap.name
-        item.onClick = () => {
-          this.setColormap(colormap.id)
-        }
-        colorItems.push(item)
-      })
-      this.$contextmenu({
-        items: [
-          {
-            label: '移动',
-            divided: true,
-            onClick: () => {
-              this.setToolActive('Pan')
-            }
-          },
-          {
-            label: '缩放',
-            divided: true,
-            children: [
-              {
-                label: '自由缩放',
-                onClick: () => {
-                  this.setToolActive('Zoom')
-                }
-              },
-              {
-                label: '适应图像',
-                onClick: () => {
-                  this.fitToWindow()
-                }
-              },
-              {
-                label: '适应窗口',
-                onClick: () => {
-                  this.fitToImage()
-                }
-              }
-            ]
-          },
-          {
-            label: '透镜',
-            divided: true,
-            onClick: () => {
-              this.setToolActive('Magnify')
-            }
-          },
-          {
-            label: '旋转',
-            divided: true,
-            children: [
-              {
-                label: '默认值',
-                onClick: () => {
-                  this.resetRotate()
-                }
-              },
-              {
-                label: '自由旋转',
-                onClick: () => {
-                  this.setToolActive('Rotate')
-                }
-              },
-              {
-                label: '水平翻转',
-                onClick: () => {
-                  this.setRotate(true, false, 0)
-                }
-              },
-              {
-                label: '垂直翻转',
-                onClick: () => {
-                  this.setRotate(false, true, 0)
-                }
-              },
-              {
-                label: '左转90度',
-                onClick: () => {
-                  this.setRotate(false, false, -90)
-                }
-              },
-              {
-                label: '右转90度',
-                onClick: () => {
-                  this.setRotate(false, false, 90)
-                }
-              }
-            ]
-          },
+    onContextmenu(e) {
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
+      // const colormapsList = cornerstone.colors.getColormapsList()
+      // const colorItems = []
+      // colorItems.push({
+      //   label: '默认值',
+      //   onClick: () => {
+      //     this.setColormap()
+      //   }
+      // })
+      // colormapsList.forEach(colormap => {
+      //   const item = {}
+      //   item.label = colormap.name
+      //   item.onClick = () => {
+      //     this.setColormap(colormap.id)
+      //   }
+      //   colorItems.push(item)
+      // })
+      // this.$contextmenu({
+      //   items: [
+      //     {
+      //       label: '移动',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.setToolActive('Pan')
+      //       }
+      //     },
+      //     {
+      //       label: '缩放',
+      //       divided: true,
+      //       children: [
+      //         {
+      //           label: '自由缩放',
+      //           onClick: () => {
+      //             this.setToolActive('Zoom')
+      //           }
+      //         },
+      //         {
+      //           label: '适应图像',
+      //           onClick: () => {
+      //             this.fitToWindow()
+      //           }
+      //         },
+      //         {
+      //           label: '适应窗口',
+      //           onClick: () => {
+      //             this.fitToImage()
+      //           }
+      //         }
+      //       ]
+      //     },
+      //     {
+      //       label: '透镜',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.setToolActive('Magnify')
+      //       }
+      //     },
+      //     {
+      //       label: '旋转',
+      //       divided: true,
+      //       children: [
+      //         {
+      //           label: '默认值',
+      //           onClick: () => {
+      //             this.resetRotate()
+      //           }
+      //         },
+      //         {
+      //           label: '自由旋转',
+      //           onClick: () => {
+      //             this.setToolActive('Rotate')
+      //           }
+      //         },
+      //         {
+      //           label: '水平翻转',
+      //           onClick: () => {
+      //             this.setRotate(true, false, 0)
+      //           }
+      //         },
+      //         {
+      //           label: '垂直翻转',
+      //           onClick: () => {
+      //             this.setRotate(false, true, 0)
+      //           }
+      //         },
+      //         {
+      //           label: '左转90度',
+      //           onClick: () => {
+      //             this.setRotate(false, false, -90)
+      //           }
+      //         },
+      //         {
+      //           label: '右转90度',
+      //           onClick: () => {
+      //             this.setRotate(false, false, 90)
+      //           }
+      //         }
+      //       ]
+      //     },
 
-          {
-            label: '测量',
-            divided: true,
-            minWidth: 0,
-            children: [
-              {
-                label: '探针',
-                onClick: () => {
-                  this.setToolActive('Probe')
-                }
-              },
-              {
-                label: '长度测量',
-                onClick: () => {
-                  this.setToolActive('Length')
-                }
-              },
-              {
-                label: '角度测量',
-                onClick: () => {
-                  this.setToolActive('Angle')
-                }
-              },
-              {
-                label: 'Cobb测量',
-                onClick: () => {
-                  this.setToolActive('CobbAngle')
-                }
-              },
-              {
-                label: '椭圆测量',
-                onClick: () => {
-                  this.setToolActive('EllipticalRoi')
-                }
-              },
-              {
-                label: '矩形测量',
-                onClick: () => {
-                  this.setToolActive('RectangleRoi')
-                }
-              },
-              {
-                label: '多边形标记',
-                onClick: () => {
-                  this.setToolActive('FreehandRoi')
-                }
-              },
-              {
-                label: '十字线',
-                onClick: () => {
-                  this.setToolActive('Bidirectional')
-                }
-              },
-              {
-                label: '文字标注',
-                onClick: () => {
-                  this.setToolActive('ArrowAnnotate')
-                }
-              }
-            ]
-          },
-          {
-            label: '调窗',
-            divided: true,
-            onClick: () => {
-              this.setToolActive('Wwwc')
-            }
-          },
-          {
-            label: '反色',
-            divided: true,
-            onClick: () => {
-              this.toggleInvert()
-            }
-          },
-          {
-            label: '伪彩',
-            children: colorItems
-          }
-        ],
-        event,
-        // x: event.clientX,
-        // y: event.clientY,
-        customClass: 'class-a',
-        zIndex: 3,
-        minWidth: 100
-      })
-      return false
+      //     {
+      //       label: '测量',
+      //       divided: true,
+      //       minWidth: 0,
+      //       children: [
+      //         {
+      //           label: '探针',
+      //           onClick: () => {
+      //             this.setToolActive('Probe')
+      //           }
+      //         },
+      //         {
+      //           label: '长度测量',
+      //           onClick: () => {
+      //             this.setToolActive('Length')
+      //           }
+      //         },
+      //         {
+      //           label: '角度测量',
+      //           onClick: () => {
+      //             this.setToolActive('Angle')
+      //           }
+      //         },
+      //         {
+      //           label: 'Cobb测量',
+      //           onClick: () => {
+      //             this.setToolActive('CobbAngle')
+      //           }
+      //         },
+      //         {
+      //           label: '椭圆测量',
+      //           onClick: () => {
+      //             this.setToolActive('EllipticalRoi')
+      //           }
+      //         },
+      //         {
+      //           label: '矩形测量',
+      //           onClick: () => {
+      //             this.setToolActive('RectangleRoi')
+      //           }
+      //         },
+      //         {
+      //           label: '多边形标记',
+      //           onClick: () => {
+      //             this.setToolActive('FreehandRoi')
+      //           }
+      //         },
+      //         {
+      //           label: '十字线',
+      //           onClick: () => {
+      //             this.setToolActive('Bidirectional')
+      //           }
+      //         },
+      //         {
+      //           label: '文字标注',
+      //           onClick: () => {
+      //             this.setToolActive('ArrowAnnotate')
+      //           }
+      //         }
+      //       ]
+      //     },
+      //     {
+      //       label: '调窗',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.setToolActive('Wwwc')
+      //       }
+      //     },
+      //     {
+      //       label: '反色',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.toggleInvert()
+      //       }
+      //     },
+      //     {
+      //       label: '伪彩',
+      //       children: colorItems
+      //     }
+      //   ],
+      //   event,
+      //   // x: event.clientX,
+      //   // y: event.clientY,
+      //   customClass: 'class-a',
+      //   zIndex: 3,
+      //   minWidth: 100
+      // })
+      // return false
     },
     getToolSate() {
       const toolROITypes = [

src/components/Dicom/DicomTags.vue

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

src/components/Dicom/DicomViewer.vue

@@ -182,7 +182,7 @@
             <svg-icon icon-class="fitToImage" style="font-size:20px;" />
           </button>
           <!-- <button title="旋转" class="btn-link dropdown" data-tool="Rotate" @click="setToolActive($event,'Rotate')"> -->
-          
+
         </div>
       </div>
       <!-- 测量标注 -->
@@ -233,6 +233,10 @@
           <button :title="$t('trials:dicom-show:image')" class="btn-link" @click="currentDicomCanvas.saveImage()">
             <svg-icon icon-class="image" style="font-size:20px;" />
           </button>
+          <!-- 标签 -->
+          <button :title="$t('trials:dicom-show:tags')" class="btn-link" @click="currentDicomCanvas.showTags()">
+            <svg-icon icon-class="dictionary" style="font-size:20px;" />
+          </button>
         </div>
       </div>
       <div class="measureTool-wrapper">
@@ -405,7 +409,8 @@ export default {
     loadImageStack(dicomSeries) {
       this.currentDicomCanvas.toolState.clipPlaying = false
       this.$nextTick(() => {
-        this.currentDicomCanvas.loadImageStack(dicomSeries)
+        const series = Object.assign({}, dicomSeries)
+        this.currentDicomCanvas.loadImageStack(series)
       })
     },
     loadOtherImageStack(seriesList) {
@@ -415,7 +420,8 @@ export default {
         Array.from(elements).forEach((element, index) => {
           const canvasIndex = element.getAttribute('data-index')
           if (index < seriesList.length && element.style.display !== 'none') {
-            this.$refs[`dicomCanvas${canvasIndex}`].loadImageStack(seriesList[index])
+            const series = Object.assign({}, seriesList[index])
+            this.$refs[`dicomCanvas${canvasIndex}`].loadImageStack(series)
           }
         })
       })

src/components/MFA/fun.js

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

src/components/MFA/index.vue

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

src/components/TrialsTab/index.vue

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

src/components/UploadFile/index.vue

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

src/components/feedBack/fun.js

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

src/components/feedBack/index.js

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

src/components/feedBack/index.vue

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

src/components/feedBack/uploadImage.vue

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

src/components/feedBackTable/fun.js

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

src/components/feedBackTable/index.js

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

src/components/feedBackTable/index.vue

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

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

@@ -224,6 +224,7 @@ import {
   addOrUpdateArchiveTaskStudy,
 } from "@/api/load.js";
 import { parseDicom, getThumbnail, dicomToOSS } from "@/utils/parseDicom.js";
+import store from "@/store";
 export default {
   name: "uploadList",
   props: {
@@ -262,6 +263,7 @@ export default {
   },
   watch: {
     isLoad() {
+      store.dispatch("trials/setUnLock", this.isLoad);
       if (!this.isLoad) {
         this.$refs.file.value = null;
         if (this.dicomList.some((item) => item.isUpload === 3)) {
@@ -747,6 +749,7 @@ export default {
   },
   beforeDestroy() {
     this.isClose = true;
+    store.dispatch("trials/setUnLock", false);
   },
 };
 </script>

src/components/uploadImage/index.vue

@@ -66,13 +66,13 @@
       >
         <template slot-scope="scope">
           <!--下载--->
-          <el-button
+          <!-- <el-button
             v-if="!isUpload && Criterion.ImageDownloadEnum > 0"
             circle
             icon="el-icon-download"
             :title="$t('trials:uploadImage:button:download')"
             @click.stop="downloadImage(scope.row)"
-          />
+          /> -->
           <!--删除--->
           <el-button
             v-if="isUpload"
@@ -103,6 +103,7 @@ import uploadList from "./components/upload-list.vue";
 import studyView from "./components/study-view.vue";
 import { getSubjectImageUploadList, deleteTaskStudy } from "@/api/load.js";
 import { downloadImage } from "@/utils/uploadZip.js";
+import store from "@/store";
 export default {
   name: "uploadImage",
   props: {
@@ -247,16 +248,356 @@ export default {
     },
     // 打包下载
     async downloadImage(item) {
-      try {
-        await downloadImage(
-          this.$route.query.trialId,
-          item.SourceSubjectVisitId
-        );
-      } catch (err) {
-        console.log(err);
+      let zipName = "压缩包.zip";
+      let InstanceInfoList = [
+        {
+          Id: "e634352c-6465-32ba-04b3-824ec8d346a8",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/e634352c-6465-32ba-04b3-824ec8d346a8",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 1,
+        },
+        {
+          Id: "d4ad1dd2-747b-6de7-8ad4-3e81c58943dd",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/d4ad1dd2-747b-6de7-8ad4-3e81c58943dd",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 2,
+        },
+        {
+          Id: "6a1d1d12-2b4a-0368-c7e1-d44f7180b280",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6a1d1d12-2b4a-0368-c7e1-d44f7180b280",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 3,
+        },
+        {
+          Id: "7a8fb1b4-9ea8-1189-4ca6-b9a9b9547a39",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7a8fb1b4-9ea8-1189-4ca6-b9a9b9547a39",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 4,
+        },
+        {
+          Id: "8d00be19-5ac5-c608-dbd0-41f84cfacd95",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8d00be19-5ac5-c608-dbd0-41f84cfacd95",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 5,
+        },
+        {
+          Id: "729ded91-0eca-78f2-1c17-5182d4f27e3a",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/729ded91-0eca-78f2-1c17-5182d4f27e3a",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 6,
+        },
+        {
+          Id: "9e2fd28c-72fe-bb66-e0ce-40115cd82260",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9e2fd28c-72fe-bb66-e0ce-40115cd82260",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 7,
+        },
+        {
+          Id: "9b31613f-3c9e-28ad-fd9e-7001a69e09b5",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9b31613f-3c9e-28ad-fd9e-7001a69e09b5",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 8,
+        },
+        {
+          Id: "4982b453-d068-7e56-2acd-a361d8584f35",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4982b453-d068-7e56-2acd-a361d8584f35",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 9,
+        },
+        {
+          Id: "8279cf5a-2551-43ea-3fe4-673e88ba7e5a",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8279cf5a-2551-43ea-3fe4-673e88ba7e5a",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 10,
+        },
+        {
+          Id: "6424e9c5-d31b-9388-3b64-a56705ab6fc8",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6424e9c5-d31b-9388-3b64-a56705ab6fc8",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 11,
+        },
+        {
+          Id: "a73cf3f9-defa-0c22-dfdc-8c5bfb93c9a7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a73cf3f9-defa-0c22-dfdc-8c5bfb93c9a7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 12,
+        },
+        {
+          Id: "dbfaafea-f721-0a93-37c6-69bcc0d957c3",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/dbfaafea-f721-0a93-37c6-69bcc0d957c3",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 13,
+        },
+        {
+          Id: "52000ac1-6a5b-83e2-5468-4dfdf394e455",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/52000ac1-6a5b-83e2-5468-4dfdf394e455",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 14,
+        },
+        {
+          Id: "de34a347-41f4-1018-a710-48d81fa9aadc",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/de34a347-41f4-1018-a710-48d81fa9aadc",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 15,
+        },
+        {
+          Id: "251d6a13-26b7-935b-d765-0c5db1ed7dfc",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/251d6a13-26b7-935b-d765-0c5db1ed7dfc",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 16,
+        },
+        {
+          Id: "b22e93c8-3f6a-484a-a32b-f7626689f8da",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/b22e93c8-3f6a-484a-a32b-f7626689f8da",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 17,
+        },
+        {
+          Id: "6517400b-d4b5-db65-d026-8c06c40bf244",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6517400b-d4b5-db65-d026-8c06c40bf244",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 18,
+        },
+        {
+          Id: "8e70df99-525a-4ecd-5cf1-6c32698eaa3f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8e70df99-525a-4ecd-5cf1-6c32698eaa3f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 19,
+        },
+        {
+          Id: "7df907f2-b6a6-fd03-67ab-be86c497d412",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7df907f2-b6a6-fd03-67ab-be86c497d412",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 20,
+        },
+        {
+          Id: "ba31ba5b-728e-8301-273d-459fd3c65a43",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/ba31ba5b-728e-8301-273d-459fd3c65a43",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 21,
+        },
+        {
+          Id: "7528c70c-5ba1-59c1-413c-7bfc984c0066",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7528c70c-5ba1-59c1-413c-7bfc984c0066",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 22,
+        },
+        {
+          Id: "15dd574d-fc82-c5b7-fefb-497346d4abbb",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/15dd574d-fc82-c5b7-fefb-497346d4abbb",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 23,
+        },
+        {
+          Id: "6cd76aca-91fa-64ce-6077-af48c5e5b18b",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6cd76aca-91fa-64ce-6077-af48c5e5b18b",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 24,
+        },
+        {
+          Id: "2f0f9f4e-12b8-a6a8-d3f9-f43e2055653d",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/2f0f9f4e-12b8-a6a8-d3f9-f43e2055653d",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 25,
+        },
+        {
+          Id: "3c49f379-8548-67cd-1333-dde28219c6e9",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/3c49f379-8548-67cd-1333-dde28219c6e9",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 26,
+        },
+        {
+          Id: "910f43c8-123a-0753-aaf7-11081eef4268",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/910f43c8-123a-0753-aaf7-11081eef4268",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 27,
+        },
+        {
+          Id: "ffad6b36-74aa-1c7d-01eb-18524da91f6e",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/ffad6b36-74aa-1c7d-01eb-18524da91f6e",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 28,
+        },
+        {
+          Id: "9e2bf22d-8734-62ae-881a-7404064a95ce",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9e2bf22d-8734-62ae-881a-7404064a95ce",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 29,
+        },
+        {
+          Id: "eef8b291-ffdf-dbfb-244d-5e63dc5b8cc7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/eef8b291-ffdf-dbfb-244d-5e63dc5b8cc7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 30,
+        },
+        {
+          Id: "12b0de3a-243c-78b9-b006-82f2cc633a0f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/12b0de3a-243c-78b9-b006-82f2cc633a0f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 31,
+        },
+        {
+          Id: "4341ea87-7d54-2608-184e-01e5c976ce9f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4341ea87-7d54-2608-184e-01e5c976ce9f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 32,
+        },
+        {
+          Id: "4db2bac2-18eb-0589-d520-f297b2840e1d",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4db2bac2-18eb-0589-d520-f297b2840e1d",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 33,
+        },
+        {
+          Id: "9442c2a3-0972-67f7-afc3-6f1a47abefab",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9442c2a3-0972-67f7-afc3-6f1a47abefab",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 34,
+        },
+        {
+          Id: "a7fb75b0-0b09-5340-70cf-a11afd84b1ec",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a7fb75b0-0b09-5340-70cf-a11afd84b1ec",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 35,
+        },
+        {
+          Id: "753d7795-451a-bd32-69ea-fd58c1e89d63",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/753d7795-451a-bd32-69ea-fd58c1e89d63",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 36,
+        },
+        {
+          Id: "33bf7274-de0a-e8f9-f97a-c58fb2ea3aaf",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/33bf7274-de0a-e8f9-f97a-c58fb2ea3aaf",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 37,
+        },
+        {
+          Id: "adadae31-37a1-818d-3721-09a1d371c6a5",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/adadae31-37a1-818d-3721-09a1d371c6a5",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 38,
+        },
+        {
+          Id: "f64e8b0d-d2ab-b112-5705-92c23cfc5df6",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/f64e8b0d-d2ab-b112-5705-92c23cfc5df6",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 39,
+        },
+        {
+          Id: "781088b0-5afd-6eb3-5f87-9bfec210d490",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/781088b0-5afd-6eb3-5f87-9bfec210d490",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 40,
+        },
+        {
+          Id: "56df4cef-8053-bff3-21f7-1b1841a3d6e6",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/56df4cef-8053-bff3-21f7-1b1841a3d6e6",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 41,
+        },
+        {
+          Id: "a3e3dab9-7a61-f822-d113-42f46bc5e8ce",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a3e3dab9-7a61-f822-d113-42f46bc5e8ce",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 42,
+        },
+        {
+          Id: "1cc195b9-e498-179d-b927-6d706266decb",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/1cc195b9-e498-179d-b927-6d706266decb",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 43,
+        },
+        {
+          Id: "7dca834f-d959-898e-a0cb-5c8244c4c4a9",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7dca834f-d959-898e-a0cb-5c8244c4c4a9",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 44,
+        },
+        {
+          Id: "13eeba83-2e93-800e-e934-a56061633c64",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/13eeba83-2e93-800e-e934-a56061633c64",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 45,
+        },
+        {
+          Id: "971f0a62-92a3-6d04-53c5-51fa9155e28c",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/971f0a62-92a3-6d04-53c5-51fa9155e28c",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 46,
+        },
+        {
+          Id: "2959d06c-5ac7-f3b9-63d4-1a56e3974fc7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/2959d06c-5ac7-f3b9-63d4-1a56e3974fc7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 47,
+        },
+      ];
+      let path = "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com";
+      let files = new Array();
+      for (let i = 0; i < InstanceInfoList.length; i++) {
+        let item = InstanceInfoList[i];
+        let obj = {
+          name: "file" + i,
+          url: path + item.Path,
+        };
+        files.push(obj);
       }
+      store.dispatch("trials/setUnLock", true);
+      let res = await downloadImage(zipName, files);
+      store.dispatch("trials/setUnLock", false);
     },
   },
+  beforeDestroy() {
+    store.dispatch("trials/setUnLock", false);
+  },
 };
 </script>
 <style lang="scss" scoped>

src/components/videos/index.vue

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

src/const/sign-code.vue

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

src/main.js

@@ -1,10 +1,9 @@
 
 import Vue from 'vue'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
-
+// import { createVersionPolling } from "@/utils/version-polling.esm.js";
 import ElementUI, { MessageBox } from 'element-ui'
-import { getBasicDataAllSelect, getFrontInternationalizationList } from '@/api/dictionary/dictionary'
-import { sendMFAEmail } from "@/api/user.js";
+import { getBasicDataAllSelect, getFrontInternationalizationList, getCurrentPublishInfo } from '@/api/dictionary/dictionary'
 import { resetReadingRestTime } from '@/api/trials/reading'
 // import 'element-ui/lib/theme-chalk/index.css'
 import './assets/css/theme-blue/index.css' // 浅绿色主题
@@ -29,25 +28,22 @@ Vue.use(permission)
 
 import Viewer from 'v-viewer'
 import './assets/css/viewer.css'
-
-Vue.use(Viewer)
 Viewer.setDefaults({
-  Options: {
-    'inline': true,
-    'button': true,
-    'navbar': true,
-    'title': true,
-    'toolbar': true,
-    'tooltip': true,
-    'movable': true,
-    'zoomable': true,
-    'rotatable': true,
-    'scalable': true,
-    'transition': true,
-    'keyboard': true,
-    'url': 'data-source'
+  // navbar: true, //底部缩略图
+  toolbar: {
+    zoomIn: true,
+    zoomOut: true,
+    reset: true,
+    prev: true,
+    next: true,
+    rotateLeft: true,
+    rotateRight: true,
+    flipHorizontal: true,
+    flipVertical: true,
   }
 })
+Vue.use(Viewer)
+
 
 import hasPermi from './directive/permission'
 Vue.use(hasPermi)
@@ -60,6 +56,10 @@ import Preview from '@/components/Preview/index'
 Vue.use(Preview)
 import MFA from '@/components/MFA/index'
 Vue.use(MFA)
+import FB from '@/components/feedBack/index'
+Vue.use(FB)
+import FBT from '@/components/feedBackTable/index'
+Vue.use(FBT)
 import adaptive from '@/directive/adaptive/index'
 // 表格自适应指令
 Vue.use(adaptive)
@@ -130,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();
   }
@@ -185,6 +186,9 @@ async function VueInit() {
     zhMessages[v.Code] = v.ValueCN
     enMessages[v.Code] = v.Value
   })
+  // 获取版本信息
+  let PublishInfo = await getCurrentPublishInfo();
+  Vue.prototype.$version = PublishInfo.Result;
   // 获取检查部位
   Vue.prototype.$getBodyPart = (id) => {
     return new Promise(async (resolve, reject) => {
@@ -300,13 +304,13 @@ async function VueInit() {
   if (eval(process.env.VUE_APP_LOGIN_FOR_PERMISSION)) {
     setInterval(() => {
       var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-      if (_vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      if (_vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
         return
       }
       if (_vm.$store.state.user.userId !== zzSessionStorage.getItem('userId')) {
         window.location.href = `/login`
         zzSessionStorage.removeItem('lastWorkbench')
-        _vm.$alert(lang === 'en' ? 'The same browser only allows one user account to be logged in at a time.' : '同一浏览器只允许同时登陆一个账户', {
+        _vm.$alert(_vm.$t("env:sso:tip"), {
           type: 'warning',
         })
       }
@@ -357,23 +361,35 @@ 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'
-    if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+    if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
       count = 0;
       localStorage.setItem('count', '0')
       return
     }
     _vm.$store.dispatch('user/logout').then(res => {
       // window.location.href = `/login`
-      _vm.$msgbox.close();
+      if (_vm.$msgbox) {
+        _vm.$msgbox.close();
+      }
+      _vm.$FB.close();
+      _vm.$FBT.close();
+      _vm.$MFA.close();
       isOpen = false
       isLock = null
       zzSessionStorage.removeItem('isLock')
       router.push("/login")
     }).then(() => {
-      _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登陆！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', {
+      // _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登陆！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', {
+      //   type: 'warning',
+      // })
+      _vm.$alert(_vm.$t("env:loginOut"), {
         type: 'warning',
       })
     })
@@ -381,7 +397,7 @@ async function VueInit() {
   } : () => { }, process.env.VUE_APP_LOGOUT_FOR_TIME,
     eval(process.env.VUE_APP_LOCK_FOR_PERMISSION) ? () => {
       var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-      if (_vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
         count = 0;
         localStorage.setItem('count', '0')
         if (_vm.$route.path === '/login') {
@@ -397,17 +413,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')
@@ -418,7 +434,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
@@ -434,26 +450,26 @@ async function VueInit() {
                   done()
                 }, 500)
               }
-              if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) {
-                sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => {
-                  done();
-                  Vue.prototype.$MFA({
-                    status: "lock",
-                    UserId: my_userid,
-                    EMail: my_EMail,
-                    username: my_username,
-                    callBack: () => {
-                      closeLock(_vm)
-                    },
-                  })
-                })
-              } else {
-                closeLock(_vm)
-              }
+              // if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) {
+              //   sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => {
+              //     done();
+              //     Vue.prototype.$MFA({
+              //       status: "lock",
+              //       UserId: my_userid,
+              //       EMail: res.Result,
+              //       username: my_username,
+              //       callBack: () => {
+              //         closeLock(_vm)
+              //       },
+              //     })
+              //   })
+              // } else {
+              closeLock(_vm)
+              // }
 
             } else {
               // console.log(111)
-              _vm.$message.error(lang === 'zh' ? '请输入正确用户名密码' : 'Please enter the correct password.')
+              _vm.$message.error(_vm.$t('env:lock:msgBox:userFail'))
             }
           }
         },
@@ -462,7 +478,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: {
@@ -484,7 +500,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: {
@@ -512,5 +528,21 @@ async function VueInit() {
     } : () => { }, process.env.VUE_APP_LOCK_FOR_TIME)
 }
 VueInit()
+// createVersionPolling({
+//   appETagKey: "__APP_ETAG__",
+//   pollingInterval: 5 * 60 * 1000, // 单位为毫秒
+//   silent: process.env.NODE_ENV === false, // 开发环境下不检测
+//   onUpdate: (self) => {
+//     // 当检测到有新版本时，执行的回调函数，可以在这里提示用户刷新页面
+//     const result = confirm(_vm.$t("versionPolling:tip"));
+//     if (result) {
+//       self.onRefresh();
+//     } else {
+//       self.onCancel();
+//     }
+//     // 强制更新可以用alert
+//     // alert('有新版本，请刷新页面');
+//   },
+// });
 
 

src/permission.js

@@ -10,8 +10,8 @@ import { OSSclient } from './utils/oss'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
-
+const whiteList = ['/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
+store.state.trials.whiteList = whiteList;
 router.beforeEach(async (to, from, next) => {
   NProgress.start()
   // 设置页面标题
@@ -55,15 +55,28 @@ router.beforeEach(async (to, from, next) => {
   } else {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
-      // 在免登录whiteList中，直接进入
-      if (to.path === '/readingDicoms' || to.path === '/noneDicomReading') {
-        OSSclient()
+      if (to.path === '/researchLogin') {
+        console.log(to)
+        const flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
+        if (flag) {
+          next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${to.query.lang}`)
+        } else {
+          next()
+        }
+      } else {
+        // 在免登录whiteList中，直接进入
+        if (to.path === '/readingDicoms' || to.path === '/noneDicomReading') {
+          OSSclient()
+        }
+        next()
       }
-      next()
     } else {
       if (to.path === '/researchForm') {
         next(`/researchLogin?`)
         NProgress.done()
+      } else if (to.path === '/researchDetail_m') {
+        next(`/researchLogin_m?`)
+        NProgress.done()
       } else if (to.path === '/ReviewersResearchForm') {
         next(`/ReviewersResearch?`)
         NProgress.done()

src/router/index.js

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

src/store/getters.js

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

src/store/modules/reading.js

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

src/store/modules/trials.js

@@ -9,6 +9,10 @@ const getDefaultState = () => {
     studyListQuery: null,
     unlock: false,
     config: {},
+    uploadTip: '0.00kb/s',
+    timer: null,
+    whiteList: [],
+    checkTaskId: null
   }
 }
 

src/styles/index.scss

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

src/utils/dcmUpload/anonymization.js

@@ -1,6 +1,5 @@
 import dicomParser from "dicom-parser";
 import dcmjs from './dcmjs'
-import { encoder } from "./encoder";
 
 export const anonymization = function (file, config) {
   return new Promise(async (resolve, reject) => {

src/utils/dcmUpload/dcmUpload.js

@@ -1,14 +1,14 @@
 import Vue from 'vue'
 import { anonymization } from './anonymization'
-export const dcmUpload = async function (name, file, config) {
+export const dcmUpload = async function (data, config, progressFn) {
   return new Promise(async resolve => {
     try {
       // let blob = await encoder(file, config)
-      let blob = await fileToBlob(file)
+      let blob = await fileToBlob(data.file)
       if (config) {
-        blob = await anonymization(file, config)
+        blob = await anonymization(data.file, config)
       }
-      let res = await Vue.prototype.OSSclient.put(name, blob.blob)
+      let res = await Vue.prototype.OSSclient.multipartUpload(Object.assign(data, { file: blob.blob }), progressFn)
       resolve({
         ...res,
         image: blob.pixelDataElement
@@ -19,7 +19,7 @@ export const dcmUpload = async function (name, file, config) {
 
 
     } catch (e) {
-      console.log(file, 'warning')
+      console.log(data.file, 'warning')
       resolve(false)
       console.log(e)
     }

src/utils/multipartUpload/aws.js

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

src/utils/multipartUpload/oss.js

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

src/utils/oss.js

@@ -3,17 +3,16 @@ const router = require('@/router');
 const Minio = require('minio')
 const stream = require('stream')
 import Vue from 'vue'
+import { customerHttp, OSSclose } from "@/utils/multipartUpload/oss"
+import { exist, AWSclose } from "@/utils/multipartUpload/aws"
 const { GetObjectStoreToken } = require('../api/user.js')
+const {
+  S3Client,
+} = require("@aws-sdk/client-s3");
 
 Vue.prototype.OSSclientConfig = {
 }
 
-function blobToBuffer(blob, fileName) {
-  return new Promise((resolve, reject) => {
-    const file = new File([blob], fileName);
-    resolve(file)
-  })
-}
 
 async function ossGenerateSTS() {
   let res = await GetObjectStoreToken()
@@ -23,12 +22,23 @@ async function ossGenerateSTS() {
   switch (res.Result.ObjectStoreUse) {
     case 'AliyunOSS':
       Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+      Vue.prototype.OSSclientConfig.stsToken = Vue.prototype.OSSclientConfig.securityToken
       Vue.prototype.OSSclientConfig.timeout = 10 * 60 * 1000
       let OSSclient = new OSS(Vue.prototype.OSSclientConfig)
       Vue.prototype.OSSclient = {
         put: function (objectName, object) {
           return new Promise(async (resolve, reject) => {
             try {
+              let config = await getSTSToken(Vue.prototype.OSSclientConfig.Expiration);
+              if (config) {
+                Vue.prototype.OSSclientConfig = { ...config.Result[res.Result.ObjectStoreUse] }
+                Vue.prototype.OSSclientConfig.ObjectStoreUse = config.Result.ObjectStoreUse;
+                Vue.prototype.OSSclientConfig.basePath = Vue.prototype.OSSclientConfig.viewEndpoint;
+                Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+                Vue.prototype.OSSclientConfig.stsToken = Vue.prototype.OSSclientConfig.securityToken
+                Vue.prototype.OSSclientConfig.timeout = 10 * 60 * 1000
+                OSSclient = new OSS(Vue.prototype.OSSclientConfig);
+              }
               let _vm = router.default.app
               if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
                 var objectItem = objectName.split('/')
@@ -49,6 +59,45 @@ async function ossGenerateSTS() {
               reject()
             }
           })
+        },
+        multipartUpload: (data, progress) => {
+          return new Promise(async (resolve, reject) => {
+            try {
+              const { file, path } = data;
+              if (!file || !path) return reject('file and path be required');
+              let config = await getSTSToken(Vue.prototype.OSSclientConfig.Expiration);
+              if (config) {
+                Vue.prototype.OSSclientConfig = { ...config.Result[res.Result.ObjectStoreUse] }
+                Vue.prototype.OSSclientConfig.ObjectStoreUse = config.Result.ObjectStoreUse;
+                Vue.prototype.OSSclientConfig.basePath = Vue.prototype.OSSclientConfig.viewEndpoint;
+                Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+                Vue.prototype.OSSclientConfig.stsToken = Vue.prototype.OSSclientConfig.securityToken
+                Vue.prototype.OSSclientConfig.timeout = 10 * 60 * 1000
+                OSSclient = new OSS(Vue.prototype.OSSclientConfig);
+              }
+              let _vm = router.default.app
+              if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
+                var objectItem = data.path.split('/')
+                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+                data.path = objectItem.join('/')
+              }
+              let res = await customerHttp(OSSclient, data, progress);
+              if (res) {
+                resolve({
+                  name: data.path,
+                  url: Vue.prototype.OSSclientConfig.viewEndpoint + res.name
+                })
+              } else {
+                reject()
+              }
+            } catch (err) {
+              console.log(err)
+              reject(err)
+            }
+          })
+        },
+        close: () => {
+          OSSclose();
         }
       }
       break
@@ -86,6 +135,9 @@ async function ossGenerateSTS() {
               console.log(e)
             }
           })
+        },
+        close: () => {
+          return false
         }
       }
       break
@@ -124,6 +176,47 @@ async function ossGenerateSTS() {
               console.log(e)
             }
           })
+        },
+        multipartUpload: (data, progress) => {
+          return new Promise(async (resolve, reject) => {
+            try {
+              const { file, path } = data;
+              if (!file || !path) return reject('file and path be required');
+              let config = await getSTSToken(Vue.prototype.OSSclientConfig.Expiration);
+              if (config) {
+                Vue.prototype.OSSclientConfig = { ...config.Result[res.Result.ObjectStoreUse] }
+                Vue.prototype.OSSclientConfig.ObjectStoreUse = config.Result.ObjectStoreUse;
+                Vue.prototype.OSSclientConfig.basePath = Vue.prototype.OSSclientConfig.viewEndpoint;
+                Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+                Vue.prototype.OSSclientConfig.stsToken = Vue.prototype.OSSclientConfig.securityToken
+                Vue.prototype.OSSclientConfig.timeout = 10 * 60 * 1000
+                OSSclient = new S3Client(Vue.prototype.OSSclientConfig);
+              }
+              let _vm = router.default.app
+              if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
+                var objectItem = data.path.split('/')
+                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+                data.path = objectItem.join('/')
+              }
+              await exist(OSSclient, Vue.prototype.OSSclientConfig.bucket, data, progress, (res) => {
+                if (res) {
+                  resolve({
+                    name: data.path,
+                    url: Vue.prototype.OSSclientConfig.viewEndpoint + res.name
+                  })
+                } else {
+                  reject()
+                }
+              });
+
+            } catch (err) {
+              console.log(err)
+              reject(err)
+            }
+          })
+        },
+        close: () => {
+          AWSclose();
         }
       }
   }
@@ -138,6 +231,47 @@ function decodeUtf8(bytes) {
   str2.pop();
   return str2.join("/") + '/' + name;
 }
+const queue = []
+let loading = false;
+// 获取凭证
+function getSTSToken(credentials) {
+  return new Promise(async (resolve, reject) => {
+    let isExpired = isCredentialsExpired(credentials);
+    if (!isExpired) {
+      if (loading) {
+        queue.push({ resolve, reject })
+      }
+      if (!loading) {
+        loading = true;
+        let res = await GetObjectStoreToken();
+        loading = false;
+        resolve(res)
+        let p = queue.shift();
+        while (p) {
+          p.resolve(res)
+          p = queue.shift();
+        }
+      }
 
+    } else {
+      console.log("凭证未过期");
+      resolve(false)
+    }
+
+  })
+}
+/**
+* oss判断临时凭证是否到期。
+**/
+function isCredentialsExpired(credentials) {
+  if (!credentials) {
+    return true;
+  }
+  const expireDate = new Date(credentials.Expiration);
+  const now = new Date();
+  // 如果有效期不足五分钟，视为过期。
+  return expireDate.getTime() - now.getTime() <= 300000;
+
+}
 
 export const OSSclient = ossGenerateSTS

src/utils/request.js

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

src/utils/stream.js

@@ -0,0 +1,48 @@
+import streamSaver from "streamsaver";
+import "streamsaver/examples/zip-stream.js";
+
+// 下载文件并压缩
+function zipFiles(zipName, files) {
+    console.log("同步下载打包开始时间：" + new Date());
+    // 创建压缩文件输出流  
+    const zipFileOutputStream = streamSaver.createWriteStream(zipName);
+    // 创建下载文件流  
+    const fileIterator = files.values();
+    const readableZipStream = new ZIP({
+        async pull(ctrl) {
+            const fileInfo = fileIterator.next();
+            if (fileInfo.done) {//迭代终止  
+                ctrl.close();
+            } else {
+                const { name, url } = fileInfo.value;
+                return fetch(url).then(res => {
+                    ctrl.enqueue({
+                        name,
+                        stream: () => res.body
+                    });
+                })
+            }
+        }
+    });
+    if (window.WritableStream && readableZipStream.pipeTo) {
+        // 开始下载  
+        readableZipStream
+            .pipeTo(zipFileOutputStream)
+            .then(() => console.log("同步下载打包结束时间：" + new Date()));
+    }
+}
+// 下载文件并修改名称
+async function updateFile(file, name) {
+    try {
+        const fileOutputStream = streamSaver.createWriteStream(name);
+        let res = await fetch(file);
+        res.body.pipeTo(fileOutputStream);
+    } catch (err) {
+        console.log(err)
+    }
+}
+export function downLoadFile(file, name, type = 'file') {
+    if (type === 'zip') return zipFiles(name, file);
+    return updateFile(file, name)
+
+}

src/utils/uploadZip.js

@@ -1,16 +1,23 @@
-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 = {}
+    flag = {};
+    store.state.trials.uploadTip = null;
+    if (store.state.trials.timer) {
+        clearInterval(store.state.trials.timer);
+        store.state.trials.timer = null;
+    }
+    store.dispatch("trials/setUnLock", false);
 }
 export const downloadImage = async (id, id2, IsDicom = true) => {
-    if (flag[`${id2}_${IsDicom}`]) return Vue.prototype.$message.warning(Vue.prototype.$t('trials:upload:tip:uploading'));
+    // if (flag[`${id2}_${IsDicom}`]) return Vue.prototype.$message.warning(Vue.prototype.$t('trials:upload:tip:uploading'));
+    if (flag[`${id2}_${IsDicom}`]) return false;
     flag[`${id2}_${IsDicom}`] = true
     try {
         let params = {
@@ -18,30 +25,46 @@ export const downloadImage = async (id, id2, IsDicom = true) => {
             SubjectVisitId: id2,
             IsDicom: IsDicom
         }
+        store.dispatch("trials/setUnLock", true);
         let res = await requestPackageAndAnonymizImage(params);
         if (res.IsSuccess) {
             if (!res.Result) {
                 flag[`${id2}_${IsDicom}`] = false;
-                Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not"))
-                return 1;
+                // Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not"))
+                let message = Vue.prototype.$t('trials:upload:tip:uploading').replace("xxx", res.OtherInfo.FileName);
+                store.state.trials.uploadTip = message;
+                if (!store.state.trials.timer) {
+                    store.state.trials.timer = setInterval(() => {
+                        downloadImage(id, id2, IsDicom);
+                    }, 2000);
+                }
+                return false;
             }
-            Vue.prototype.$message.success(Vue.prototype.$t("trials:upload:message:startUpload"));
+            if (store.state.trials.timer) {
+                clearInterval(store.state.trials.timer);
+                store.state.trials.timer = null;
+            }
+            let fileName = res.Result.split("/").pop();
             let href = Vue.prototype.OSSclientConfig.basePath + res.Result;
-            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;
+            if (fileName !== res.OtherInfo.FileName) {
+                let message = Vue.prototype.$t('trials:upload:tip:uploading').replace("xxx", res.OtherInfo.FileName);
+                store.state.trials.uploadTip = message;
+                // Vue.prototype.$message.success(Vue.prototype.$t("trials:upload:message:startUpload"));
+                return download(href, res.OtherInfo.FileName, { id2, IsDicom });
+
+            }
+            let a = document.createElement("a");
+            a.download = res.OtherInfo.FileName;
+            a.href = href;
+            a.click();
+            URL.revokeObjectURL(href);
+            let timer = setTimeout(() => {
+                a = null;
+                href = null;
+                timer = null;
+            }, 500)
+            store.state.trials.uploadTip = null;
+            return true;
         } else {
             flag[`${id2}_${IsDicom}`] = false;
             return false;
@@ -51,95 +74,6 @@ export const downloadImage = async (id, id2, IsDicom = true) => {
         console.log(err);
     }
 };
-const setfolder = async (item) => {
-    const zip = new JSZip(); // 创建实例对象
-    let patientIds = item.PatientList.map(i => i.PatientIdStr);
-    let zipName = `${item.SubjectCode}_${patientIds.join(',')}`;
-    let zipObj = {};
-    const promises = [];
-    for (let visit of item.VisitList) {
-        if (!zipObj[`${visit.VisitName}`]) {
-            zipObj[`${visit.VisitName}`] = zip.folder(visit.VisitName);
-        }
-        for (let study of visit.StudyList) {
-            let date = study.StudyTime.split(" ")[0];
-            for (let series of study.SeriesList) {
-                if (
-                    !zipObj[
-                    `${visit.VisitName}${series.Modality}`
-                    ]
-                ) {
-                    zipObj[
-                        `${visit.VisitName}${series.Modality}`
-                    ] = zipObj[`${visit.VisitName}`].folder(
-                        `${date}_${series.Modality}`
-                    );
-                }
-                for (let instance of series.InstancePathList) {
-                    let obj = {
-                        subjectCode: item.SubjectCode,
-                        visitName: visit.VisitName,
-                        date: study.StudyTime.split(" ")[0],
-                        modality: series.Modality,
-                        instancePath: instance.Path,
-                        dicomName: instance.Path.split("/Dicom/")[1],
-                    };
-                    const promise = handleBatchDown(
-                        obj,
-                        zipObj[
-                        `${visit.VisitName}${series.Modality}`
-                        ],
-                    );
-                    promises.push(promise);
-                }
-            }
-        }
-    }
-    // 生成 zip 文件
-    Promise.all(promises)
-        .then(() => {
-            // 生成zip 文件
-            zip
-                .generateAsync({
-                    type: "blob",
-                    compression: "DEFLATE", // STORE: 默认不压缩， DEFLATE：需要压缩
-                    compressionOptions: {
-                        level: 9, // 压缩等级 1~9   1 压缩速度最快， 9 最优压缩方式
-                    },
-                })
-                .then((res) => {
-                    saveAs(res, zipName + ".zip"); // 使用FileSaver.saveAs保存文件，文件名可自定义
-                    flag[`${id2}_${IsDicom}`] = false;
-                    zipObj = null;
-                });
-        })
-        .catch((reason) => { flag[`${id2}_${IsDicom}`] = false; });
-};
-const handleBatchDown = async (item, zip) => {
-    return new Promise((resolve) => {
-        getFileData(
-            Vue.prototype.OSSclientConfig.basePath + item.instancePath
-        ).then((res) => {
-            const fileName = item.dicomName + ".dcm";
-            zip.file(fileName, res.data, { binary: true });
-            resolve();
-        });
-    });
-};
-const getFileData = (fileUrl) => {
-    return new Promise((resolve, reject) => {
-        axios(fileUrl, {
-            method: "GET",
-            responseType: "blob", // 返回的数据会被强制转为blob类型 ，转换成arraybuffer 也行
-        })
-            .then((res) => {
-                resolve(res);
-            })
-            .catch((error) => {
-                reject(error);
-            });
-    });
-};
 export const fileDownload = (content, filename) => {
     const eleLink = document.createElement("a");
     eleLink.download = filename;
@@ -153,7 +87,10 @@ export const fileDownload = (content, filename) => {
 let download = async (downloadUrl, downloadFileName, res) => {
     const blob = await getBlob(downloadUrl);
     flag[`${res.id2}_${res.IsDicom}`] = false;
+    store.state.trials.uploadTip = null;
+    store.dispatch("trials/setUnLock", false);
     saveAsB(blob, downloadFileName);
+    return true;
 }
 
 let getBlob = (url) => {
@@ -192,4 +129,40 @@ let saveAsB = (blob, filename) => {
     body.removeChild(link);
 
     window.URL.revokeObjectURL(link.href);
-}
+}
+
+// 前端流式打包下载
+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
+                        })
+                    })
+                }
+            }
+        });
+        if (window.WritableStream && readableZipStream.pipeTo) {
+            // 开始下载  
+            readableZipStream
+                .pipeTo(zipFileOutputStream)
+                .then(() => { console.log("同步下载打包结束时间：" + new Date()); resolve(true) })
+        } else {
+            resolve(false);
+        }
+    })
+
+};

src/utils/version-polling.esm.js

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

src/views/blindResumeInfo/components/StatusInfo.vue

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

src/views/blindResumeInfo/info.vue

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

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

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

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

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

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

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

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

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

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

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

src/views/dictionary/checkConfig/index.vue

@@ -49,7 +49,7 @@
       <el-table-column prop="Identification" label="标识" :show-overflow-tooltip="true" min-width="200px" />
       <el-table-column prop="OptTypeValueCN" label="操作类型" show-overflow-tooltip width="100px" />
       <el-table-column prop="ObjectTypeValueCN" label="对象类型" show-overflow-tooltip min-width="100px" />
-      <el-table-column prop="ChildrenTypeValueCN" label="数据类型" show-overflow-tooltip min-width="100px" show-overflow-tooltip />
+      <el-table-column prop="ChildrenTypeValueCN" label="数据类型" show-overflow-tooltip min-width="100px"/>
       <el-table-column
         prop="Sort"
         label="显示顺序"
@@ -110,7 +110,7 @@
 
     <!-- 添加或修改菜单对话框 -->
     <el-dialog :title="title" top="100px" :close-on-click-modal="false" id="check_config" :visible.sync="open" :width="form.DataType === 'Table' ? '1280px' : '680px'" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
           <el-row>
             <el-col v-show="title !== '复制'" :span="24">
               <el-divider content-position="left">基本信息</el-divider>
@@ -372,6 +372,16 @@
                         <el-input :disabled="!scope.row.IsFixedColumn" v-model="scope.row.FixedColumnName" placeholder="固定列名"/>
                       </template>
                     </el-table-column>
+                    <el-table-column
+                      prop="FixedColumnEnName"
+                      min-width="120"
+                      label="固定列名EN"
+                      show-overflow-tooltip
+                    >
+                      <template slot-scope="scope">
+                        <el-input :disabled="!scope.row.IsFixedColumn" v-model="scope.row.FixedColumnEnName" placeholder="固定列名EN"/>
+                      </template>
+                    </el-table-column>
                     <el-table-column
                       prop="ColumnName"
                       min-width="120"
@@ -382,6 +392,16 @@
                         <el-input :disabled="scope.row.IsFixedColumn" v-model="scope.row.ColumnName" placeholder="列字段名"/>
                       </template>
                     </el-table-column>
+                    <el-table-column
+                      prop="ColumnEnName"
+                      min-width="120"
+                      label="列字段名En"
+                      show-overflow-tooltip
+                    >
+                      <template slot-scope="scope">
+                        <el-input :disabled="scope.row.IsFixedColumn" v-model="scope.row.ColumnEnName" placeholder="列字段名En"/>
+                      </template>
+                    </el-table-column>
                     <el-table-column
                       prop="ColumnValue"
                       min-width="120"
@@ -415,6 +435,16 @@
                         <el-input :disabled="!scope.row.IsMerge" v-model="scope.row.MergeColumnName" placeholder="合并组"/>
                       </template>
                     </el-table-column>
+                    <el-table-column
+                      prop="MergeColumnEnName"
+                      min-width="120"
+                      label="合并组EN"
+                      show-overflow-tooltip
+                    >
+                      <template slot-scope="scope">
+                        <el-input :disabled="!scope.row.IsMerge" v-model="scope.row.MergeColumnEnName" placeholder="合并组EN"/>
+                      </template>
+                    </el-table-column>
                     <el-table-column
                       prop="IsPicture"
                       min-width="120"
@@ -489,6 +519,14 @@
                     <el-input v-model="form.ChildDataLabel" placeholder="请输入子数据Lable" />
                   </el-form-item>
                 </el-col>
+                <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.DataType === 'Array'" :span="12">
+                  <el-form-item>
+                  <span slot="label">
+                    子数据LableEN
+                  </span>
+                    <el-input v-model="form.ChildDataEnLabel" placeholder="请输入子数据LableEN" />
+                  </el-form-item>
+                </el-col>
                 <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.DataType === 'Array'" :span="12">
                   <el-form-item>
                     <span slot="label">
@@ -559,6 +597,11 @@
                     <el-input v-model="form.ForeignKeyText" placeholder="请输入数据库字段to" />
                   </el-form-item>
                 </el-col>
+                <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.EnumType === 'Foreign'" :span="12">
+                  <el-form-item label="字段toEN">
+                    <el-input v-model="form.ForeignKeyEnText" placeholder="请输入数据库字段toEN" />
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-col>
             <el-col v-show="title !== '复制'" :span="24">
@@ -821,10 +864,13 @@ export default {
         ListName: null,
         IsFixedColumn: false,
         FixedColumnName: null,
+        FixedColumnEnName: null,
         ColumnName: null,
+        ColumnEnName: null,
         ColumnValue: null,
         IsMerge: false,
         MergeColumnName: null,
+        MergeColumnEnName: null,
         IsPicture: false,
         IsDynamicTranslate: false,
         IsNeedTransalate: false,
@@ -1111,6 +1157,7 @@ export default {
         IsSpecialType: false,
         DataType: '',
         ChildDataLabel: null,
+        ChildDataEnLabel: null,
         ChildDataValue: null,
         DateType: null,
         DictionaryCode: null,
@@ -1118,6 +1165,7 @@ export default {
         ForeignKeyTableName: null,
         ForeignKeyValue: null,
         ForeignKeyText: null,
+        ForeignKeyEnText: null,
         TableConfigList: [],
         UrlConfig: {
           RoutePath: null,

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

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

src/views/dictionary/template/browser/form.vue

@@ -0,0 +1,214 @@
+<template>
+  <base-model :config="config">
+    <div slot="dialog-body">
+      <el-form
+        ref="browserForm"
+        :model="form"
+        label-width="140px"
+        size="small"
+        :rules="rules"
+      >
+        <div class="base-dialog-body">
+          <el-form-item
+            :label="$t('dictionary:browser:form:title')"
+            prop="Title"
+          >
+            <el-input v-model="form.Title" />
+          </el-form-item>
+          <el-form-item
+            :label="$t('dictionary:browser:form:exploreType')"
+            prop="ExploreType"
+          >
+            <el-input v-model="form.ExploreType" />
+          </el-form-item>
+          <el-form-item
+            :label="$t('dictionary:browser:form:version')"
+            prop="Version"
+          >
+            <el-input v-model="form.Version" type="textarea" rows="5" />
+          </el-form-item>
+          <el-form-item
+            :label="$t('dictionary:browser:form:downloadUrl')"
+            prop="DownloadUrl"
+          >
+            <el-input v-model="form.DownloadUrl" />
+          </el-form-item>
+          <el-form-item :label="$t('dictionary:browser:form:addFile')">
+            <el-upload
+              class="upload-demo"
+              action
+              :before-upload="beforeUpload"
+              :http-request="handleUploadFile"
+              :on-preview="handlePreview"
+              :on-remove="handleRemoveFile"
+              :show-file-list="true"
+              :limit="1"
+              :file-list="fileList"
+            >
+              <el-button
+                size="small"
+                type="primary"
+                :disabled="fileList.length > 0"
+                >{{ $t("common:button:upload") }}</el-button
+              >
+            </el-upload>
+          </el-form-item>
+          <el-form-item :label="$t('dictionary:browser:form:isDeleted')">
+            <el-switch
+              v-model="form.IsDeleted"
+              :active-value="false"
+              :inactive-value="true"
+            >
+            </el-switch>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div slot="dialog-footer">
+      <el-button size="small" @click="canel">
+        {{ $t("dictionary:browser:button:canel") }}
+      </el-button>
+      <el-button size="small" type="primary" :loading="loading" @click="save">
+        {{ $t("dictionary:browser:button:save") }}
+      </el-button>
+    </div>
+  </base-model>
+</template>
+<script>
+import baseModel from "@/components/BaseModel";
+import { addOrUpdateExploreRecommend } from "@/api/dictionary";
+export default {
+  props: {
+    config: {
+      required: true,
+      default: () => {
+        return {};
+      },
+    },
+    data: {
+      required: true,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  components: {
+    "base-model": baseModel,
+  },
+  data() {
+    return {
+      form: {
+        Version: null,
+        Title: null,
+        IsDeleted: true,
+        ExploreType: null,
+        DownloadUrl: null,
+        Path: null,
+        FileName: null,
+      },
+      rules: {
+        Title: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        ExploreType: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        Version: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        DownloadUrl: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: ["blur", "change"],
+          },
+        ],
+      },
+      fileList: [],
+      loading: false,
+    };
+  },
+  created() {
+    if (this.config.status === "edit") {
+      Object.keys(this.form).forEach((key) => {
+        this.form[key] = this.data[key];
+      });
+      if (this.form.FileName) {
+        this.fileList[0] = {
+          name: this.form.FileName,
+          path: this.form.Path,
+          fullPath: this.form.Path,
+        };
+      }
+    }
+  },
+  methods: {
+    async save() {
+      try {
+        let validate = await this.$refs.browserForm.validate();
+        if (!validate) return false;
+        this.loading = true;
+        if (this.config.status === "edit") {
+          this.form.Id = this.data.Id;
+        }
+        let res = await addOrUpdateExploreRecommend(this.form);
+        if (res.IsSuccess) {
+          this.$emit("close");
+          this.$emit("getList");
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
+    },
+    canel() {
+      this.$emit("close");
+    },
+    handleRemoveFile() {
+      this.form.FileName = null;
+      this.form.Path = null;
+      this.fileList = [];
+    },
+    beforeUpload() {
+      if (this.fileList.length > 0) {
+        this.$alert(this.$t("dictionary:bbrowser:msg:message1"));
+        return;
+      }
+    },
+    handlePreview(row, r2) {
+      if (row.fullPath) {
+        window.open(row.fullPath, "_blank");
+      }
+    },
+    async handleUploadFile(param) {
+      this.loading = true;
+      var file = await this.fileToBlob(param.file);
+      const res = await this.OSSclient.put(
+        `/System/Browser/${param.file.name}`,
+        file
+      );
+      this.fileList.push({
+        name: param.file.name,
+        path: this.$getObjectName(res.url),
+        fullPath: this.$getObjectName(res.url),
+        url: this.$getObjectName(res.url),
+      });
+      this.form.Path = this.$getObjectName(res.url);
+      this.form.FileName = param.file.name;
+      this.loading = false;
+    },
+  },
+};
+</script>

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

@@ -0,0 +1,252 @@
+<template>
+  <box-content>
+    <!-- 搜索框 -->
+    <div class="search">
+      <el-form :inline="true" size="mini" class="base-search-form">
+        <el-form-item :label="$t('dictionary:browser:search:title')">
+          <el-input v-model="searchData.Title" style="width: 100px" />
+        </el-form-item>
+        <el-form-item :label="$t('dictionary:browser:search:version')">
+          <el-input v-model="searchData.Version" style="width: 100px" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleReset">{{
+            $t("dictionary:browser:button:reset")
+          }}</el-button>
+          <el-button type="primary" @click="handleSearch">{{
+            $t("dictionary:browser:button:search")
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <span style="margin-left: auto">
+        <el-button type="primary" size="mini" @click="handleAdd">
+          {{ $t("dictionary:browser:button:add") }}
+        </el-button>
+      </span>
+    </div>
+
+    <!-- 浏览器推荐版本列表 -->
+    <el-table
+      v-loading="loading"
+      v-adaptive="{ bottomOffset: 45 }"
+      :data="list"
+      stripe
+      height="100"
+      style="width: 100%"
+      @sort-change="handleSortByColumn"
+    >
+      <el-table-column type="index" width="40" />
+
+      <el-table-column
+        prop="Title"
+        :label="$t('dictionary:browser:table:title')"
+        sortable="custom"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ExploreType"
+        :label="$t('dictionary:browser:table:exploreType')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="Version"
+        :label="$t('dictionary:browser:table:version')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="DownloadUrl"
+        :label="$t('dictionary:browser:table:path')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="FileName"
+        :label="$t('dictionary:browser:table:fileName')"
+        show-overflow-tooltip
+        sortable="custom"
+      >
+        <template slot-scope="scope">
+          <a
+            :href="OSSclientConfig.basePath + scope.row.Path"
+            target="_blank"
+            style="color: #428bca"
+          >
+            {{ scope.row.FileName }}
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="IsDeleted"
+        :label="$t('dictionary:browser:table:IsDeleted')"
+        show-overflow-tooltip
+        sortable="custom"
+      >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.IsDeleted" type="danger">{{
+            $fd("IsSiteDisable", scope.row.IsDeleted)
+          }}</el-tag>
+          <el-tag v-else>{{
+            $fd("IsSiteDisable", scope.row.IsDeleted)
+          }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="UpdateTime"
+        :label="$t('dictionary:browser:table:updateTime')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        :label="$t('dictionary:browser:table:action')"
+        width="200"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleEdit(scope.row)">
+            {{ $t("dictionary:browser:button:edit") }}
+          </el-button>
+          <el-button type="text" @click="handleDelete(scope.row)">
+            {{ $t("dictionary:browser:button:delete") }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页组件 -->
+    <pagination
+      class="page"
+      :total="total"
+      :page.sync="searchData.PageIndex"
+      :limit.sync="searchData.PageSize"
+      @pagination="getList"
+    />
+    <browser-form
+      :config="config"
+      :data="rowData"
+      v-if="config.visible"
+      @close="close"
+      @getList="getList"
+    />
+  </box-content>
+</template>
+<script>
+import {
+  getExploreRecommendList,
+  deleteExploreRecommend,
+} from "@/api/dictionary";
+import Pagination from "@/components/Pagination";
+import BoxContent from "@/components/BoxContent";
+import browserForm from "./form.vue";
+const searchDataDefault = () => {
+  return {
+    Version: null,
+    Title: null,
+    DownloadUrl: null,
+    FileName: null,
+    IsDeleted: null,
+    PageIndex: 1,
+    PageSize: 20,
+    Asc: false,
+    SortField: null,
+  };
+};
+export default {
+  name: "browser",
+  components: { BoxContent, Pagination, browserForm },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      loading: false,
+      list: [],
+      total: 0,
+      rowData: {},
+      config: {
+        visible: false,
+        showClose: true,
+        width: "600px",
+        title: "",
+        appendToBody: true,
+        status: "add",
+      },
+    };
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    async getList() {
+      try {
+        this.loading = true;
+        let res = await getExploreRecommendList(this.searchData);
+        if (res.IsSuccess) {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
+    },
+    // 新增
+    handleAdd() {
+      this.rowData = {};
+      this.config.title = this.$t("dictionary:browser:form:title:add");
+      this.config.status = "add";
+      this.config.visible = true;
+    },
+    // 编辑
+    handleEdit(row) {
+      this.rowData = { ...row };
+      this.config.title = this.$t("dictionary:browser:form:title:edit");
+      this.config.status = "edit";
+      this.config.visible = true;
+    },
+    // 删除
+    handleDelete(row) {
+      this.$confirm(this.$t("dictionary:browser:message:deleteMessage"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        deleteExploreRecommend(row.Id).then((res) => {
+          if (res.IsSuccess) {
+            this.list.splice(
+              this.list.findIndex((item) => item.Id === row.Id),
+              1
+            );
+            this.$message.success(
+              this.$t("common:message:deletedSuccessfully")
+            );
+          }
+        });
+      });
+    },
+    // 查询
+    handleSearch() {
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+    // 重置
+    handleReset() {
+      this.searchData = searchDataDefault();
+      this.getList();
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
+      } else {
+        this.searchData.Asc = false;
+      }
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+    close() {
+      this.config.visible = false;
+    },
+  },
+};
+</script>

src/views/dictionary/template/browser/tip.vue

@@ -0,0 +1,109 @@
+<template>
+  <div class="browserTip" v-if="visible">
+    <i class="el-icon-warning-outline"></i>
+    <span v-html="tip"></span>
+  </div>
+</template>
+<script>
+import { getExploreRecommentInfo } from "@/api/dictionary";
+export default {
+  name: "browserTip",
+  data() {
+    return {
+      form: {},
+      tip: this.$t("browser:tip:changeBorwser"),
+      visible: false,
+    };
+  },
+  methods: {
+    async getInfo() {
+      try {
+        let res = await getExploreRecommentInfo();
+        if (res.IsSuccess) {
+          return res.Result;
+        }
+        return false;
+      } catch (err) {
+        console.log(err);
+        return false;
+      }
+    },
+    async open() {
+      try {
+        let browserType = this.getExplore();
+        let type = browserType.split(": ")[0];
+        let No = browserType.split(": ")[1].split(".")[0];
+        console.log(type, No);
+        if (type !== "Chrome" && type !== "Edge") {
+          this.tip = this.$t("browser:tip:changeBorwser");
+          return (this.visible = true);
+        }
+        let res = await this.getInfo();
+        if (!res) return this.$t("dictionary:browser:tip:getError");
+        let currentType = res.filter(
+          (item) => item.ExploreType.toLowerCase() === type.toLowerCase()
+        )[0];
+        if (No < currentType.Version) {
+          this.tip = `<span>${this.$t("browser:tip:borwserversionLow")}</span>`;
+          res.forEach((item, index) => {
+            this.tip += `<a href="${item.DownloadUrl}" target="_blank" style="color:#428bca">${item.Title}</a>`;
+            if (index < res.length - 1) {
+              this.tip += "、";
+            }
+          });
+          return (this.visible = true);
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    getExplore() {
+      var Sys = {};
+      var ua = navigator.userAgent.toLowerCase();
+      var s;
+      (s = ua.match(/rv:([\d.]+)\) like gecko/))
+        ? (Sys.ie = s[1])
+        : (s = ua.match(/msie ([\d\.]+)/))
+        ? (Sys.ie = s[1])
+        : (s = ua.match(/edg\/([\d\.]+)/) || ua.match(/edge\/([\d\.]+)/))
+        ? (Sys.edge = s[1])
+        : (s = ua.match(/firefox\/([\d\.]+)/))
+        ? (Sys.firefox = s[1])
+        : (s = ua.match(/(?:opera|opr).([\d\.]+)/))
+        ? (Sys.opera = s[1])
+        : (s = ua.match(/chrome\/([\d\.]+)/))
+        ? (Sys.chrome = s[1])
+        : (s = ua.match(/version\/([\d\.]+).*safari/))
+        ? (Sys.safari = s[1])
+        : 0;
+      // 根据关系进行判断
+      if (Sys.ie) return "IE: " + Sys.ie;
+      if (Sys.edge) return "Edge: " + Sys.edge;
+      if (Sys.firefox) return "Firefox: " + Sys.firefox;
+      if (Sys.chrome) return "Chrome: " + Sys.chrome;
+      if (Sys.opera) return "Opera: " + Sys.opera;
+      if (Sys.safari) return "Safari: " + Sys.safari;
+      return "Unkonwn";
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.browserTip {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 40px;
+  background-color: rgba(250, 205, 145, 0.129411764705882);
+  display: flex;
+  align-items: center;
+  padding: 0 20px;
+  color: #555;
+  i {
+    color: red;
+    font-size: 24px;
+    margin-right: 10px;
+  }
+}
+</style>

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

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

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

@@ -113,13 +113,13 @@
               width="55">
             </el-table-column>
             <el-table-column
-              prop="raw.ValueCN"
+              prop="ValueCN"
               label="中文值"
               show-overflow-tooltip
             >
             </el-table-column>
             <el-table-column
-              prop="raw.Value"
+              prop="Value"
               label="英文值"
               show-overflow-tooltip
             >

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

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

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

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

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

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

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

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

src/views/dictionary/template/index.vue

@@ -25,56 +25,68 @@
       <el-tab-pane label="签名管理" name="sign">
         <Sign v-if="activeTab == 'sign'" />
       </el-tab-pane>
+      <el-tab-pane label="浏览器推荐" name="browser">
+        <Browser v-if="activeTab == 'browser'" />
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 <script>
-import QcQuestions from './components/QcQuestions.vue'
-import CriterionsTmp from './components/CriterionsTmp'
-import ClinicalData from './components/ClinicalDataConfig'
-import MedicalAudit from './components/MedicalAudit'
-import Anonymization from './components/Anonymization'
-import IncreaseFields from './components/IncreaseFields'
-import Email from './email/index.vue'
-import Sign from './sign/index.vue'
+import QcQuestions from "./components/QcQuestions.vue";
+import CriterionsTmp from "./components/CriterionsTmp";
+import ClinicalData from "./components/ClinicalDataConfig";
+import MedicalAudit from "./components/MedicalAudit";
+import Anonymization from "./components/Anonymization";
+import IncreaseFields from "./components/IncreaseFields";
+import Email from "./email/index.vue";
+import Sign from "./sign/index.vue";
+import Browser from "./browser/index.vue";
 export default {
-  name: 'Questions',
+  name: "Questions",
   components: {
-    QcQuestions, CriterionsTmp, ClinicalData, Anonymization, IncreaseFields, Email, Sign,
-    MedicalAudit
+    QcQuestions,
+    CriterionsTmp,
+    ClinicalData,
+    Anonymization,
+    IncreaseFields,
+    Email,
+    Sign,
+    MedicalAudit,
+    Browser,
   },
   data() {
     return {
-      activeTab: 'qc'
-    }
-  }, mounted() {
+      activeTab: "qc",
+    };
+  },
+  mounted() {
     if (this.$route.query.tabActive) {
-      this.activeTab = this.$route.query.tabActive
+      this.activeTab = this.$route.query.tabActive;
     } else {
-      this.activeTab = 'qc'
+      this.activeTab = "qc";
     }
   },
   methods: {
     clickTab(tab, event) {
-      this.$router.push({ path: `/dictionary/template?tabActive=${tab.name}` })
-    }
-  }
-}
+      this.$router.push({ path: `/dictionary/template?tabActive=${tab.name}` });
+    },
+  },
+};
 </script>
 <style lang="scss">
-.question-wrapper{
-  .el-tabs{
+.question-wrapper {
+  .el-tabs {
     height: 100%;
     display: flex;
     flex-direction: column;
   }
   .el-tabs__header {
     height: 40px;
-    margin-bottom:5px;
+    margin-bottom: 5px;
   }
-  .el-tabs__content{
+  .el-tabs__content {
     flex: 1;
-    .el-tab-pane{
+    .el-tab-pane {
       height: 100%;
     }
   }

src/views/feedBack/index.vue

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

src/views/login/index.vue

@@ -18,15 +18,11 @@
         <div
           :class="{
             'login-image': true,
-            'login-image-usa': NODE_ENV === 'usa',
+            'login-image-usa': true,
           }"
         >
-          <svg-icon
-            icon-class="login-bg"
-            style="width: 90%; height: 90%"
-            v-if="NODE_ENV === 'usa'"
-          />
-          <img src="@/assets/login-bg.png" v-else />
+          <svg-icon icon-class="login-bg" style="width: 90%; height: 90%" />
+          <!-- <img src="@/assets/login-bg.png" v-else /> -->
         </div>
       </div>
       <div class="login-r">
@@ -119,7 +115,12 @@
             {{ $t("login:button:login") }}
           </el-button>
           <div style="text-align: right">
-            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
+            <TopLang
+              v-if="
+                VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' &&
+                NODE_ENV !== 'usa'
+              "
+            />
             <!-- Forget password? -->
             <el-button
               type="text"
@@ -183,7 +184,7 @@
           {{ $t("login:title:system_title") }}
         </p>
         <p style="margin-bottom: 20px" v-else>{{ $t("login:title:system") }}</p>
-        <p style="margin-bottom: 20px">V1.5.3.001</p>
+        <p style="margin-bottom: 20px">V{{ $version.Version }}</p>
         <p style="margin-bottom: 20px" v-if="language === 'zh'">
           Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
           版权所有
@@ -202,6 +203,7 @@
         >
       </div>
     </el-dialog>
+    <browserTip ref="browserTip" />
   </div>
 </template>
 
@@ -210,13 +212,14 @@ 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 },
+  components: { TopLang, Vcode, browserTip },
   data() {
     return {
-      NODE_ENV: process.env.NODE_ENV,
+      NODE_ENV: process.env.NODE_ENV, // process.env.NODE_ENV
       VUE_APP_OSS_CONFIG_REGION: process.env.VUE_APP_OSS_CONFIG_REGION,
       aboutVisible: false,
       loginForm: {
@@ -259,6 +262,17 @@ export default {
   computed: {
     ...mapGetters(["asyncRoutes", "routes", "language"]),
   },
+  watch: {
+    "$i18n.locale": {
+      handler() {
+        if (this.$refs.browserTip) {
+          this.$refs.browserTip.open();
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
   mounted() {
     this.loginType = this.$route.query.loginType;
     this.location = this.$route.query.location;
@@ -269,7 +283,7 @@ export default {
       this.setLanguage("en");
       this.$updateDictionary();
     } else {
-      if (this.location === "USA") {
+      if (this.location === "USA" || this.NODE_ENV === "usa") {
         this.$i18n.locale = "en";
         this.setLanguage("en");
         this.$updateDictionary();
@@ -279,6 +293,7 @@ export default {
         // this.$updateDictionary()
       }
     }
+    this.$refs.browserTip.open();
   },
   methods: {
     ...mapMutations({ setLanguage: "lang/setLanguage" }),

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

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

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

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

src/views/research-mobile/components/BasicInfo.vue

@@ -0,0 +1,310 @@
+<template>
+  <div class="research_bs_content">
+    <el-form ref="researchBSForm" label-position="left" :model="form" :rules="rules">
+      <div class="basic_content form-label-width">
+        <el-form-item :label="$t('trials:researchForm:title:researchSurveyStatus')">
+          <el-tag>{{ $fd('ResearchRecord', state) }}</el-tag>
+        </el-form-item>
+        <!-- 项目编号 -->
+        <el-form-item :label="$t('trials:researchForm:form:trialId')">
+          <span>{{ form.TrialCode }}</span>
+        </el-form-item>
+        <!-- 试验方案号 -->
+        <el-form-item :label="$t('trials:researchForm:form:researchNo')">
+          <span>{{ form.ResearchProgramNo }}</span>
+        </el-form-item>
+        <!-- 试验名称 -->
+        <el-form-item :label="$t('trials:researchForm:form:researchName')">
+          <span>{{ form.ExperimentName }}</span>
+        </el-form-item>
+        <!-- 适应症类型 -->
+        <el-form-item :label="$t('trials:researchForm:form:decleareType')">
+          <span>{{ form.IndicationType }}</span>
+        </el-form-item>
+      </div>
+      <div class="login_content">
+        <div class="form-label-width">
+          <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="TrialSiteId">
+            <el-select
+              v-model="form.TrialSiteId"
+              filterable
+              style="width:100%;"
+              :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
+              @change="handleSiteChange"
+            >
+              <el-option
+                v-for="(item,index) of siteOptions"
+                :key="index"
+                :label="item.TrialSiteAliasName"
+                :value="item.TrialSiteId"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 中心编号 -->
+          <el-form-item v-if="form.TrialSiteId" :label="$t('trials:researchForm:form:siteId')">
+            <el-input v-model="form.TrialSiteCode" disabled />
+          </el-form-item>
+          <!-- 联系人 -->
+          <el-form-item :label="$t('trials:researchForm:form:contactor')" prop="UserName">
+            <el-input v-model="form.UserName" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
+          </el-form-item>
+          <!-- 联系电话 -->
+          <el-form-item
+            :label="$t('trials:researchForm:form:contactorPhone')"
+            prop="Phone"
+          >
+            <el-input v-model="form.Phone" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
+          </el-form-item>
+          <!-- 联系邮箱 -->
+          <el-form-item :label="$t('trials:researchForm:form:contactorEmail')">
+            <el-input v-model="form.Email" disabled />
+          </el-form-item>
+          <!-- 平均刻盘周期（天） -->
+          <el-form-item :label="$t('trials:researchForm:form:engravingCycle')">
+            <el-input-number v-model="form.AverageEngravingCycle" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" controls-position="right" :min="0" style="width:100%;" />
+          </el-form-item>
+        </div>
+        <!-- 请确认参与本项目影像采集的影像技师具备对应的资质（如：“技师证”，对应设备的“大型设备上岗证”） -->
+        <el-form-item v-if="!notShowFieldList.includes('IsConfirmImagingTechnologist')" :label="$t('trials:researchForm:form:isQualified')">
+          <el-radio-group v-model="form.IsConfirmImagingTechnologist" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :key="`IsConfirmImagingTechnologist${item.value}`"
+              :label="item.value"
+            >{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- 原因 -->
+        <el-form-item
+          v-if="!notShowFieldList.includes('NotConfirmReson') && form.IsConfirmImagingTechnologist === false"
+          :label="$t('trials:researchForm:form:notQualifiedReason')"
+        >
+          <el-input
+            v-model="form.NotConfirmReson"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4}"
+            :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
+          />
+        </el-form-item>
+        <!-- 研究单位疗效评估人员类型 -->
+        <el-form-item v-if="!notShowFieldList.includes('EfficacyEvaluatorType')" :label="$t('trials:researchForm:form:staffType')">
+          <el-radio-group v-model="form.EfficacyEvaluatorType" :disabled="!(state === 0 && userTypeEnumInt === 0)|| isHistory">
+            <el-radio v-for="item of $d.EfficacyEvaluatorType" :key="`EfficacyEvaluatorType${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- 是否严格按照研究单位影像手册参数完成图像采集 -->
+        <el-form-item v-if="!notShowFieldList.includes('IsFollowStudyParameters')">
+          <span slot="label" v-html="$t('trials:researchForm:form:isFollowStudyParam')" />
+          <el-radio-group v-model="form.IsFollowStudyParameters" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+            <el-radio v-for="item of $d.YesOrNo" :key="`IsFollowStudyParameters${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- 不能严格按照研究单位影像手册参数采集图像原因 -->
+        <el-form-item
+          v-if="!notShowFieldList.includes('NotFollowReson') && !form.IsFollowStudyParameters"
+        >
+          <span slot="label" v-html="$t('trials:researchForm:form:notFollowStudyParam')" />
+          <el-input
+            v-model="form.NotFollowReson"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4}"
+            :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
+          />
+        </el-form-item>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { getTrialSiteSelect } from '@/api/trials'
+import { addOrUpdateTrialSiteSurvey } from '@/api/research'
+export default {
+  name: 'ResearchBasicInfo',
+  props: {
+    isHistory: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    var checkPhone = (rule, value, callback) => {
+      const phoneReg = /^[0-9]+$/
+      if (!value) {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        setTimeout(() => {
+          if (phoneReg.test(value)) {
+            callback()
+          } else {
+            callback(new Error(this.$t('trials:researchForm:formRule:phone')))
+          }
+        }, 100)
+      }
+    }
+    return {
+      form: {
+        Id: '',
+        Sponsor: '', // 申办方
+        ResearchProgramNo: '', // 方案号
+        ExperimentName: '',
+        TrialCode: '', // 项目编号
+        TrialSiteCode: '',
+        TrialSiteAliasName: '',
+        IndicationType: '', // 适应症
+        TrialSiteId: '', // 研究单位名称
+        UserName: '', // 联系人
+        Phone: '', // 联系人电话
+        Email: '', // 联系人邮箱
+        AverageEngravingCycle: '',
+        IsConfirmImagingTechnologist: '',
+        NotConfirmReson: '',
+        EfficacyEvaluatorType: '',
+        IsFollowStudyParameters: '',
+        NotFollowReson: ''
+      },
+      rules: {
+        TrialSiteId: [
+          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' }
+        ],
+        UserName: [
+          { required: true, validator: (rule, value, callback) => { !value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback() }, trigger: 'blur' },
+          { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: ['blur', 'change'] }
+        ],
+        Phone: [
+          { required: true, validator: checkPhone, trigger: 'blur' }
+        ]
+      },
+      siteOptions: [],
+      loading: false,
+      state: null,
+      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
+      isShow: false,
+      notShowFieldList: []
+    }
+  },
+  methods: {
+    // 保存基本信息
+    handleSave(isAutoCommit) {
+      return new Promise(async(resolve) => {
+        try {
+          const valid = await this.$refs['researchBSForm'].validate()
+          if (valid) {
+            this.loading = true
+            const param = {
+              id: this.form.Id,
+              trialId: this.$route.query.trialId,
+              trialSiteId: this.form.TrialSiteId,
+              userName: this.form.UserName,
+              phone: this.form.Phone,
+              email: this.form.Email,
+              averageEngravingCycle: this.form.AverageEngravingCycle,
+              isConfirmImagingTechnologist: this.form.IsConfirmImagingTechnologist,
+              notConfirmReson: this.form.NotConfirmReson,
+              efficacyEvaluatorType: this.form.EfficacyEvaluatorType,
+              isFollowStudyParameters: this.form.IsFollowStudyParameters,
+              notFollowReson: this.form.NotFollowReson
+            }
+            const res = await addOrUpdateTrialSiteSurvey(param)
+            this.loading = false
+            if (res.IsSuccess && !isAutoCommit) {
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+            }
+            resolve(true)
+          } else {
+            if (isAutoCommit) {
+              this.$message.error(this.$t('trials:researchForm:button:msg1'))
+            }
+            resolve(false)
+          }
+        } catch (e) {
+          console.log(e)
+          resolve(false)
+        }
+      })
+    },
+    // 初始化
+    async initForm(trialInfo, trialSiteSurvey, notShowFieldList) {
+      // 获取项目下的site
+      const { Result } = await getTrialSiteSelect(this.$route.query.trialId)
+      this.siteOptions = Result
+      this.form.Id = trialSiteSurvey.Id
+      this.form.Sponsor = trialInfo.Sponsor // 申办方
+      this.form.ResearchProgramNo = trialInfo.ResearchProgramNo // 方案号
+      this.form.ExperimentName = trialInfo.ExperimentName
+      this.form.TrialCode = trialInfo.TrialCode // 项目编号
+      this.form.TrialSiteCode = trialSiteSurvey.TrialSiteCode
+      this.form.TrialSiteAliasName = trialSiteSurvey.TrialSiteAliasName // 项目别称
+      this.form.IndicationType = trialInfo.IndicationType // 适应症
+      this.form.TrialSiteId = trialSiteSurvey.TrialSiteId
+      this.form.UserName = trialSiteSurvey.UserName // 联系人
+      this.form.Phone = trialSiteSurvey.Phone // 联系人电话
+      this.form.Email = trialSiteSurvey.Email // 联系人邮箱
+      this.form.AverageEngravingCycle = trialSiteSurvey.AverageEngravingCycle
+      this.form.IsConfirmImagingTechnologist = trialSiteSurvey.IsConfirmImagingTechnologist
+      this.form.NotConfirmReson = trialSiteSurvey.NotConfirmReson
+      this.form.EfficacyEvaluatorType = trialSiteSurvey.EfficacyEvaluatorType
+      this.form.IsFollowStudyParameters = trialSiteSurvey.IsFollowStudyParameters
+      this.form.NotFollowReson = trialSiteSurvey.NotFollowReson
+      this.state = trialSiteSurvey.State
+      this.isShow = true
+      if (!notShowFieldList) return
+      this.notShowFieldList = notShowFieldList
+    },
+    handleSiteChange(val) {
+      var selected = this.siteOptions.find(item => item.TrialSiteId === val)
+      if (selected) {
+        this.form.TrialSiteCode = selected.TrialSiteCode
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.research_bs_content{
+
+  .basic_content{
+    padding: 0 20px;
+    background: #fff;
+
+  }
+  .login_content{
+    padding: 5px 20px;
+    margin-top: 5px;
+    background: #fff;
+    /deep/.el-form-item {
+      padding-bottom: 20px;
+      
+    }
+  }
+  .code_content{
+    display:flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    .el-input{
+      margin-right: 10px;
+    }
+  }
+  .form-label-width{
+    /deep/.el-form-item__label{
+      width: 140px;
+    }
+    /deep/.el-form-item__content{
+      margin-left: 140px;
+    }
+  }
+  .submit_content{
+    margin-top: 20px;
+    text-align: center;
+  }
+
+  /deep/.el-form-item {
+    margin-bottom: 0px;
+    padding-top: 5px;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+
+}
+</style>

src/views/research-mobile/components/EquipmentForm.vue

@@ -0,0 +1,168 @@
+<template>
+  <div
+    v-loading="loading"
+    class="equipment_form_content"
+  >
+    <el-form
+      ref="equipmentForm"
+      :model="form"
+      :rules="rules"
+      label-position="left"
+    >
+      <!-- 扫描设备 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:equipment')" prop="EquipmentTypeId">
+        <el-select
+          v-model="form.EquipmentTypeId"
+          style="width:100%"
+        >
+          <el-option
+            v-for="item of $d.SiteSurvey_ScanEquipmentType"
+            :key="item.id"
+            :label="item.label"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 扫描参数 -->
+      <el-form-item v-if="isShowParameters" :label="$t('trials:equiptResearch:form:param')">
+        <el-input v-model="form.Parameters" />
+      </el-form-item>
+      <!-- 扫描仪器制造商名称 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:manufacturer')">
+        <el-input v-model="form.ManufacturerName" />
+      </el-form-item>
+      <!-- 扫描仪型号 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:model')">
+        <el-input v-model="form.ScannerType" />
+      </el-form-item>
+      <!-- 备注 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:remark')">
+        <el-input v-model="form.Note" />
+      </el-form-item>
+      <div style="text-align: center;padding:20px 0px;">
+        <!-- 取消 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleCancel"
+        >
+          {{ $t("common:button:cancel") }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleSave"
+        >
+          {{ $t("common:button:save") }}
+        </el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { addOrUpdateTrialSiteEquipmentSurvey } from '@/api/research'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'EquipmentForm',
+  props: {
+    equipmentInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    trialSiteSurveyEquipmentType: {
+      type: String,
+      default: ''
+    },
+    isShowParameters: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      form: {
+        Id: '',
+        EquipmentTypeId: '',
+        Parameters: '',
+        ManufacturerName: '',
+        ScannerType: '',
+        Note: '',
+        TrialSiteSurveyId: ''
+      },
+      rules: {
+        EquipmentTypeId: [
+          { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
+        ]
+      },
+      loading: false,
+      dictionaryList: {}
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    async initForm() {
+      Object.keys(this.equipmentInfo).forEach(key => {
+        this.form[key] = this.equipmentInfo[key]
+      })
+    },
+    // 保存参与者信息
+    async handleSave() {
+      try {
+        const validate = await this.$refs.equipmentForm.validate()
+        if (!validate) return
+        this.loading = true
+        if (!this.form.TrialSiteSurveyId) {
+          this.form.TrialSiteSurveyId = getQueryString('trialSiteSurveyId')
+        }
+        const trialId = getQueryString('trialId')
+        const res = await addOrUpdateTrialSiteEquipmentSurvey(trialId, this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.$emit('getList')
+          this.$emit('close')
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    handleTrialRoleChange(v) {
+      if (v === 1) {
+        // crc
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.crcId
+      } else if (v === 2) {
+        // cra
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.craId
+      } else {
+        this.form.IsGenerateAccount = false
+        this.form.UserTypeId = ''
+      }
+    },
+    // 取消保存
+    handleCancel() {
+      this.$emit('close')
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.equipment_form_content{
+  padding: 0 10px;
+  /deep/.el-form-item {
+    margin-bottom: 0px;
+    padding: 5px 0 20px 0;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+}
+</style>

src/views/research-mobile/components/Equipments.vue

@@ -0,0 +1,219 @@
+<template>
+  <div class="equipments_content">
+    <div class="title">
+      <div>{{ $t('trials:equiptResearch:title:equiptResearch') }}</div>
+      <div v-if="state === 0 && userTypeEnumInt === 0 && !isHistory">
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">
+          {{ $t('common:button:add') }}
+        </el-button>
+      </div>
+    </div>
+    <div v-for="item in list" :key="item.name" class="equipment_info">
+      <div class="p_icon">
+        <i class="el-icon-receiving" />
+      </div>
+      <div class="p_info">
+        <div
+          class="p_info_basic"
+          :style="{maxWidth:w+'px','white-space': 'nowrap',
+                   overflow: 'hidden',
+                   'text-overflow': 'ellipsis'}"
+        >
+          <div class="p_text">{{ item.EquipmentType }}</div>
+          <div v-if="isShowParameters" class="p_text" style="margin-left:10px">{{ item.Parameters }}</div>
+          <div class="p_text" style="margin-left:10px">{{ item.ManufacturerName }}</div>
+        </div>
+        <div class="p_text">{{ item.ScannerType }}</div>
+        <div class="p_text">{{ item.Note }}</div>
+      </div>
+      <div v-if="state === 0 && userTypeEnumInt === 0 && !isHistory" class="p_func">
+        <el-button type="text" @click="handleEdit(item)">
+          <i class="el-icon-edit-outline" style="font-size: 20px;" />
+        </el-button>
+        <el-button type="text" @click="handleDelete(item)">
+          <i class="el-icon-delete" style="font-size: 20px;" />
+        </el-button>
+      </div>
+    </div>
+    <!-- 添加/编辑设备信息 -->
+    <el-drawer
+      :title="title"
+      :visible.sync="formVisible"
+      direction="btt"
+      size="70%"
+    >
+      <EquipmentForm
+        v-if="formVisible"
+        :equipment-info="equipmentInfo"
+        :is-show-parameters="isShowParameters"
+        @getList="getList"
+        @close="close"
+      />
+    </el-drawer>
+  </div>
+</template>
+<script>
+import { getTrialSiteEquipmentSurveyList, deleteTrialSiteEquipmentSurvey } from '@/api/research'
+import EquipmentForm from './EquipmentForm'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'EquipmentsResearch',
+  components: { EquipmentForm },
+  props: {
+    trialSiteSurveyEquipmentType: {
+      type: String,
+      default: ''
+    },
+    isHistory: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      list: [],
+      formVisible: false,
+      title: '',
+      equipmentInfo: {},
+      w: 0,
+      loading: false,
+      userTypeEnumInt: 0,
+      state: null,
+      trialSiteSurveyId: '',
+      trialId: '',
+      isShowParameters: false
+    }
+  },
+  mounted() {
+    this.w = document.body.clientWidth - 200
+    if (zzSessionStorage.getItem('userTypeEnumInt')) {
+      this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+    }
+    this.trialSiteSurveyId = getQueryString('trialSiteSurveyId')
+    this.trialId = getQueryString('trialId')
+  },
+  methods: {
+    // 获取列表数据
+    async getList() {
+      try {
+        this.loading = true
+        const res = await getTrialSiteEquipmentSurveyList(this.trialSiteSurveyId)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list = res.Result
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 新增
+    handleAdd() {
+      this.equipmentInfo = {}
+      this.title = this.$t('trials:equiptResearch:dialogTitle:add')
+      this.formVisible = true
+    },
+    // 编辑
+    handleEdit(obj) {
+      this.equipmentInfo = Object.assign({ ...obj })
+      this.title = this.$t('trials:equiptResearch:dialogTitle:edit')
+      this.formVisible = true
+    },
+    // 删除
+    async handleDelete(obj) {
+      try {
+        const confirm = await this.$confirm(
+          this.$t('trials:staffResearch:message:confirmDel'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        this.loading = true
+        const res = await deleteTrialSiteEquipmentSurvey(obj.Id, this.trialId)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list.splice(this.list.findIndex((item) => item.Id === obj.Id), 1)
+          this.$message.success(this.$t('trials:equiptResearch:message:delSuccessfully'))
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, isShowParameters) {
+      this.isShowParameters = isShowParameters
+      this.list = TrialSiteEquipmentSurveyList
+      this.state = trialSiteSurvey.State
+      this.$forceUpdate()
+      console.log(this.list)
+    },
+    // 关闭窗口
+    close() {
+      this.formVisible = false
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.equipments_content{
+  background: #fff;
+  padding: 10px;
+  .title{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+  .equipment_info{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    align-items: center;
+    border-top: 1px solid #f5f7fa;
+    .p_icon{
+      width: 70px;
+      font-size: 25px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .p_info{
+      position: relative;
+      flex:1;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-evenly;
+      // border-right: 1px solid #f5f7fa;
+      font-size: 13px;
+    }
+    .p_info:after {
+        content: '';
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+        right: 0;
+        height: 50px;
+        width: 1px;
+        background-color: #f5f7fa;
+    }
+    .p_info_basic{
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+    }
+    .p_text{
+      line-height: 25px;
+      color: #82848a;
+    }
+    .p_func{
+      width: 80px;
+      padding: 0 10px;
+      text-align: center;
+    }
+  }
+}
+
+</style>

src/views/research-mobile/components/HistoricalParticipantForm.vue

@@ -0,0 +1,304 @@
+<template>
+  <div
+    v-loading="loading"
+    class="participants_form_content"
+  >
+    <el-form
+      ref="participantForm"
+      :model="form"
+      :rules="rules"
+      label-width="80px"
+      label-position="left"
+    >
+      <!-- 姓 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:lastName')"
+        prop="LastName"
+      >
+        <span>{{ form.LastName }}</span>
+      </el-form-item>
+      <!-- 名 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:firstName')"
+        prop="FirstName"
+      >
+        <span>{{ form.FirstName }}</span>
+      </el-form-item>
+      <!-- 电话号码 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:phone')"
+        prop="Phone"
+      >
+        <span>{{ form.Phone }}</span>
+      </el-form-item>
+      <!-- 邮箱 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:email')"
+        prop="Email"
+      >
+        <span>{{ form.Email }}</span>
+      </el-form-item>
+      <!-- 单位 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:organization')"
+        prop="OrganizationName"
+      >
+        <span>{{ form.Email }}</span>
+      </el-form-item>
+      <!-- 用户类型 -->
+      <el-form-item v-if="form.IsGenerateAccount" :label="$t('trials:staffResearch:form:userType')" prop="UserTypeId">
+        <el-select v-model="form.UserTypeId" style="width: 100%" disabled>
+          <el-option v-for="item of userTypeOptions" :key="item.Id" :label="item.UserTypeShortName" :value="item.Id">
+            <span>{{ item.UserType }}</span>
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <!-- 更新状态 -->
+      <el-form-item :label="$t('trials:staffResearch:form:updateState')">
+        <el-radio-group v-model="form.IsHistoryUserDeleted" style="width: 100%">
+          <el-radio v-for="item of $d.IsUserExitTrial" :key="`IsHistoryUserDeleted${item.value}`" :label="item.value">{{
+            item.label }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        v-if="errorMsg"
+        label=""
+      >
+        <span
+          v-if="errorMsg"
+          style="font-size: 12px; color: #f66"
+        >
+          {{ errorMsg }}
+        </span>
+      </el-form-item>
+      <div style="text-align: center;padding:20px 0px;">
+        <!-- 取消 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleCancel"
+        >
+          {{ $t("common:button:cancel") }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleSave"
+        >
+          {{ $t("common:button:save") }}
+        </el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { addOrUpdateTrialSiteUserSurvey } from '@/api/research'
+import { getUserTypeList } from '@/api/research'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'ParticipantForm',
+  props: {
+    participantInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    state: {
+      type: Number,
+      required: true
+    }
+  },
+  data() {
+    var validateEmail = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        var reg =
+          /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.form.Email && reg.test(this.form.Email)) {
+          this.sendDisabled = false
+          callback()
+        } else {
+          callback(new Error(this.$t('trials:researchForm:formRule:email')))
+          this.sendDisabled = true
+        }
+      }
+    }
+    return {
+      form: {
+        Id: '',
+        LastName: null,
+        FirstName: null,
+        TrialRoleCode: null,
+        UserTypeId: null,
+        Phone: null,
+        Email: null,
+        OrganizationName: '',
+        IsGenerateAccount: false,
+        IsHistoryUserDeleted: ''
+      },
+      rules: {
+        LastName: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
+        ],
+        FirstName: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
+        ],
+        TrialRoleCode: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur', 'change']
+          }
+        ],
+        UserTypeId: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur']
+          }
+        ],
+        Phone: [
+          {
+            max: 50,
+            message: this.$t('common:ruleMessage:maxLength') + ' 50',
+            trigger: 'blur'
+          }
+        ],
+        Email: [
+          { required: true, validator: validateEmail, trigger: ['blur'] }
+        ],
+        IsHistoryUserDeleted: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur', 'change']
+          }
+        ]
+      },
+      userRoles: [],
+      userTypeOptions: [],
+      userTypeEnumInt: 0,
+      errorMsg: '',
+      loading: false
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    async initForm() {
+      this.loading = true
+      const res = await getUserTypeList(3)
+      if (res.IsSuccess) {
+        this.userTypeOptions = res.Result
+        var crcObj = res.Result.find((i) => i.UserTypeEnum === 2)
+        this.crcId = crcObj ? crcObj.Id : ''
+        var craObj = res.Result.find((i) => i.UserTypeEnum === 9)
+        this.craId = craObj ? craObj.Id : ''
+      }
+      Object.keys(this.participantInfo).forEach((key) => {
+        this.form[key] = this.participantInfo[key]
+      })
+      if (zzSessionStorage.getItem('userTypeEnumInt')) {
+        this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+      }
+      this.loading = false
+    },
+    // 保存参与者信息
+    async handleSave() {
+      try {
+        const validate = await this.$refs.participantForm.validate()
+        if (!validate) return
+        this.loading = true
+        if (!this.form.TrialSiteSurveyId) {
+          this.form.TrialSiteSurveyId = getQueryString('trialSiteSurveyId')
+        }
+        const trialId = getQueryString('trialId')
+        const res = await addOrUpdateTrialSiteUserSurvey(trialId, this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(
+            this.$t('common:message:savedSuccessfully')
+          )
+
+          this.$emit('close', { id: res.Result, errorMessage: '' })
+        }
+      } catch (e) {
+        if (e.Result && e.Result.Id && e.ErrorMessage) {
+          this.$emit('close', {
+            id: e.Result.Id,
+            errorMessage: e.ErrorMessage
+          })
+        } else {
+          console.log(e)
+        }
+        this.loading = false
+      }
+    },
+    handleTrialRoleChange(v) {
+      if (v === 1) {
+        // crc
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.crcId
+      } else if (v === 2) {
+        // cra
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.craId
+      } else {
+        this.form.IsGenerateAccount = false
+        this.form.UserTypeId = ''
+      }
+    },
+    // 取消保存
+    handleCancel() {
+      this.$emit('close')
+    },
+    handleIsCorrectChange(val) {
+      if (!val) {
+        this.form.IsGenerateAccount = false
+      }
+    },
+    handleIsGenerateAccountChange(val) {
+      if (!val) {
+        this.form.UserTypeId = ''
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.participants_form_content{
+  padding: 0 10px;
+  /deep/.el-form-item {
+     margin-bottom: 0px;
+    padding: 5px 0 20px 0;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+}
+</style>

src/views/research-mobile/components/HistoricalParticipants.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="participants_content">
+    <div class="title">
+      <div>{{ $t('trials:staffResearch:title:historicalStaff') }}</div>
+    </div>
+    <div v-for="item in list" :key="item.Id" class="participant_info">
+      <div class="p_icon">
+        <i class="el-icon-user" />
+      </div>
+      <div class="p_info">
+        <div
+          class="p_info_basic"
+          :style="{maxWidth:w+'px','white-space': 'nowrap',overflow: 'hidden','text-overflow': 'ellipsis'}"
+        >
+          <div class="p_text">{{ `${item.LastName} / ${item.FirstName}` }}</div>
+          <div class="p_text" style="margin:0 10px">{{ $fd('SiteSurvey_UserRoles',item.TrialRoleCode) }}</div> 
+        </div>
+        <div class="p_text">{{ item.Phone }}</div>
+        <div class="p_text">{{ item.Email }}</div>
+        <div class="p_text">{{ item.OrganizationName }}</div>
+      </div>
+      <div v-if="state === 0 && (userTypeEnumInt===0 ) && !isHistory" class="p_func">
+        <!-- 编辑 -->
+        <el-button
+          v-if="userTypeEnumInt===0"
+          type="text"
+          @click="editParticipant(item)"
+        >
+          <i class="el-icon-edit-outline" style="font-size: 20px;" />
+        </el-button>
+      </div>
+    </div>
+
+    <!-- 编辑人员信息 -->
+    <el-drawer
+      :title="title"
+      :visible.sync="formVisible"
+      direction="btt"
+      size="70%"
+    >
+      <HistoricalParticipantForm
+        v-if="formVisible"
+        :state="state"
+        :participant-info="participantInfo"
+        @getList="getList"
+        @close="close"
+      />
+    </el-drawer>
+  </div>
+</template>
+<script>
+import { getTrialSiteUserSurveyList } from '@/api/research'
+import HistoricalParticipantForm from './HistoricalParticipantForm'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'HisParticipantsResearch',
+  components: { HistoricalParticipantForm },
+  props: {
+    isHistory: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      formVisible: false,
+      title: '',
+      participantInfo: null,
+      w: 0,
+      state: null,
+      trialSiteSurveyId: '',
+      trialId: '',
+      userTypeEnumInt: 0,
+      warningList: []
+    }
+  },
+  mounted() {
+    this.w = document.body.clientWidth - 200
+    if (zzSessionStorage.getItem('userTypeEnumInt')) {
+      this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+    }
+    this.trialSiteSurveyId = getQueryString('trialSiteSurveyId')
+    this.trialId = getQueryString('trialId')
+  },
+  methods: {
+    // 获取参与者列表数据
+    async getList() {
+      try {
+        this.loading = true
+        var params = {
+          trialSiteSurveyId: this.trialSiteSurveyId,
+          isHistoryUser: true
+        }
+        const res = await getTrialSiteUserSurveyList(params)
+        this.loading = false
+        if (res.IsSuccess) {
+          res.Result.map(item => {
+            var obj = this.warningList.find(i => i.id === item.Id)
+            if (obj) {
+              item.ErrorMessage = obj.errorMessage
+            }
+          })
+          this.list = res.Result
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 编辑
+    editParticipant(row) {
+      this.participantInfo = Object.assign({ ...row })
+      this.title = this.$t('trials:staffResearch:dialogTitle:edit')
+      this.formVisible = true
+    },
+    // 初始化列表
+    initList(trialSiteUserSurveyList, trialSiteSurvey) {
+      this.list = trialSiteUserSurveyList
+      this.state = trialSiteSurvey.State
+      this.$forceUpdate()
+    },
+    // 关闭窗口
+    async close(obj) {
+      this.formVisible = false
+      var idx = this.warningList.findIndex(i => i.id === obj.id)
+      if (idx > -1) {
+        this.warningList[idx].errorMessage = obj.errorMessage
+      } else {
+        this.warningList.push({ id: obj.id, errorMessage: obj.errorMessage })
+      }
+      this.getList()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.participants_content{
+  background: #fff;
+  padding: 10px;
+  .title{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+  .participant_info{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    align-items: center;
+    border-top: 1px solid #f5f7fa;
+    .p_icon{
+      width: 70px;
+      font-size: 25px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .p_info{
+      position: relative;
+      flex:1;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-evenly;
+      // border-right: 1px solid #f5f7fa;
+      font-size: 13px;
+    }
+    .p_info:after {
+        content: '';
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+        right: 0;
+        height: 50px;
+        width: 1px;
+        background-color: #f5f7fa;
+    }
+    .p_info_basic{
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+    }
+    .p_text{
+      line-height: 25px;
+      color: #82848a;
+    }
+    .p_func{
+      width: 80px;
+      padding: 0 10px;
+      text-align: center;
+    }
+  }
+}
+
+</style>

src/views/research-mobile/components/Notes.vue

@@ -0,0 +1,47 @@
+<template>
+  <div class="research_note">
+    <div class="title">
+      {{ $t('trials:equiptResearch:form:precautions') }}
+    </div>
+    <ol v-if="siteSurveyNoteInfo">
+      <div v-if="$i18n.locale === 'zh'" v-html="siteSurveyNoteInfo.ReplaceContentCN" />
+      <div v-else v-html="siteSurveyNoteInfo.ReplaceContent" />
+    </ol>
+    <ol v-else>
+      <!-- 只要有可能，请确保受试者使用上述指定的扫描仪器采集影像。 -->
+      <li>{{ $t('trials:equiptResearch:form:item1') }}</li>
+      <!-- 请确保对每位受试者的扫描参数在整个研究过程中保持一致。 -->
+      <li>{{ $t('trials:equiptResearch:form:item2') }}</li>
+      <!-- 试验过程中，如果有任何人员、设备或扫描仪器的替换，请立即通知我们。 -->
+      <li>{{ $t('trials:equiptResearch:form:item3') }}</li>
+      <!-- 请保存好原始（未经压缩的；非重建的）数据。 -->
+      <li>{{ $t('trials:equiptResearch:form:item4') }}</li>
+    </ol>
+  </div>
+</template>
+<script>
+export default {
+  name: 'ResearchNotes',
+  data() {
+    return {
+      siteSurveyNoteInfo: null
+    }
+  },
+  methods: {
+    initPage(siteSurveyNoteInfo) {
+      this.siteSurveyNoteInfo = siteSurveyNoteInfo
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.research_note{
+  background: #fff;
+  padding: 10px;
+  li{
+    line-height: 20px;
+    font-size: 14px;
+    color: #82848a;
+  }
+}
+</style>

src/views/research-mobile/components/ParticipantForm.vue

@@ -0,0 +1,318 @@
+<template>
+  <div
+    v-loading="loading"
+    class="participants_form_content"
+  >
+    <el-form
+      ref="participantForm"
+      :model="form"
+      :rules="rules"
+      label-width="80px"
+      label-position="left"
+    >
+      <!-- 姓 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:lastName')"
+        prop="LastName"
+      >
+        <el-input
+          v-model="form.LastName"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <!-- 名 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:firstName')"
+        prop="FirstName"
+      >
+        <el-input
+          v-model="form.FirstName"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <!-- 角色 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:role')"
+        prop="TrialRoleCode"
+      >
+        <el-select
+          v-model="form.TrialRoleCode"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+          style="width:100%"
+          @change="handleTrialRoleChange"
+        >
+          <el-option
+            v-for="item of $d.SiteSurvey_UserRoles"
+            :key="item.id"
+            :label="item.label"
+            :value="parseInt(item.value)"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 电话号码 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:phone')"
+        prop="Phone"
+      >
+        <el-input
+          v-model="form.Phone"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <!-- 邮箱 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:email')"
+        prop="Email"
+      >
+        <el-input
+          v-model="form.Email"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <!-- 单位 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:organization')"
+        prop="OrganizationName"
+      >
+        <el-input
+          v-model="form.OrganizationName"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <el-form-item
+        v-if="errorMsg"
+        label=""
+      >
+        <span
+          v-if="errorMsg"
+          style="font-size: 12px; color: #f66"
+        >
+          {{ errorMsg }}
+        </span>
+      </el-form-item>
+      <div style="text-align: center;padding:20px 0px;">
+        <!-- 取消 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleCancel"
+        >
+          {{ $t("common:button:cancel") }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleSave"
+        >
+          {{ $t("common:button:save") }}
+        </el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { addOrUpdateTrialSiteUserSurvey } from '@/api/research'
+import { getUserTypeList } from '@/api/research'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'ParticipantForm',
+  props: {
+    participantInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    state: {
+      type: Number,
+      required: true
+    }
+  },
+  data() {
+    var validateEmail = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        var reg =
+          /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.form.Email && reg.test(this.form.Email)) {
+          this.sendDisabled = false
+          callback()
+        } else {
+          callback(new Error(this.$t('trials:researchForm:formRule:email')))
+          this.sendDisabled = true
+        }
+      }
+    }
+    return {
+      form: {
+        Id: '',
+        LastName: null,
+        FirstName: null,
+        TrialRoleCode: null,
+        UserTypeId: null,
+        Phone: null,
+        Email: null,
+        OrganizationName: '',
+        IsGenerateAccount: false,
+        IsDisable: false
+      },
+      rules: {
+        LastName: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
+        ],
+        FirstName: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
+        ],
+        TrialRoleCode: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur', 'change']
+          }
+        ],
+        UserTypeId: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur']
+          }
+        ],
+        Phone: [
+          {
+            max: 50,
+            message: this.$t('common:ruleMessage:maxLength') + ' 50',
+            trigger: 'blur'
+          }
+        ],
+        Email: [
+          { required: true, validator: validateEmail, trigger: ['blur'] }
+        ]
+      },
+      userRoles: [],
+      userTypeOptions: [],
+      userTypeEnumInt: 0,
+      errorMsg: '',
+      crcId: '',
+      craId: '',
+      loading: false
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    async initForm() {
+      this.loading = true
+      const res = await getUserTypeList(3)
+      if (res.IsSuccess) {
+        this.userTypeOptions = res.Result
+        var crcObj = res.Result.find((i) => i.UserTypeEnum === 2)
+        this.crcId = crcObj ? crcObj.Id : ''
+        var craObj = res.Result.find((i) => i.UserTypeEnum === 9)
+        this.craId = craObj ? craObj.Id : ''
+      }
+      Object.keys(this.participantInfo).forEach((key) => {
+        this.form[key] = this.participantInfo[key]
+      })
+      if (zzSessionStorage.getItem('userTypeEnumInt')) {
+        this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+      }
+      this.loading = false
+    },
+    // 保存参与者信息
+    async handleSave() {
+      try {
+        const validate = await this.$refs.participantForm.validate()
+        if (!validate) return
+        this.loading = true
+        if (!this.form.TrialSiteSurveyId) {
+          this.form.TrialSiteSurveyId = getQueryString('trialSiteSurveyId')
+        }
+        const trialId = getQueryString('trialId')
+        const res = await addOrUpdateTrialSiteUserSurvey(trialId, this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(
+            this.$t('common:message:savedSuccessfully')
+          )
+
+          this.$emit('close', { id: res.Result, errorMessage: '' })
+        }
+      } catch (e) {
+        if (e.Result && e.Result.Id && e.ErrorMessage) {
+          this.$emit('close', {
+            id: e.Result.Id,
+            errorMessage: e.ErrorMessage
+          })
+        } else {
+          console.log(e)
+        }
+        this.loading = false
+      }
+    },
+    handleTrialRoleChange(v) {
+      if (v === 1) {
+        // crc
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.crcId
+      } else if (v === 2) {
+        // cra
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.craId
+      } else {
+        this.form.IsGenerateAccount = false
+        this.form.UserTypeId = ''
+      }
+    },
+    // 取消保存
+    handleCancel() {
+      this.$emit('close')
+    },
+    handleIsCorrectChange(val) {
+      if (!val) {
+        this.form.IsGenerateAccount = false
+      }
+    },
+    handleIsGenerateAccountChange(val) {
+      if (!val) {
+        this.form.UserTypeId = ''
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.participants_form_content{
+  padding: 0 10px;
+  /deep/.el-form-item {
+    margin-bottom: 0px;
+    padding: 5px 0 20px 0;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+}
+</style>

src/views/research-mobile/components/Participants.vue

@@ -0,0 +1,249 @@
+<template>
+  <div class="participants_content">
+    <div class="title">
+      <div>{{ $t('trials:staffResearch:title:newStaff') }}</div>
+      <div v-if="state === 0 && userTypeEnumInt === 0 && !isHistory">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="addParticipant"
+        >
+          {{ $t('common:button:add') }}
+        </el-button>
+      </div>
+    </div>
+    <div v-for="item in list" :key="item.Id" class="participant_info">
+      <div class="p_icon">
+        <i class="el-icon-user" />
+      </div>
+      <div class="p_info">
+        <div
+          class="p_info_basic"
+          :style="{maxWidth:w+'px','white-space': 'nowrap',overflow: 'hidden','text-overflow': 'ellipsis'}"
+        >
+          <div class="p_text">{{ `${item.LastName} / ${item.FirstName}` }}</div>
+          <div class="p_text" style="margin:0 10px">{{ $fd('SiteSurvey_UserRoles',item.TrialRoleCode) }}</div>
+        </div>
+        <div class="p_text">{{ item.Phone }}</div>
+        <div class="p_text">{{ item.Email }}</div>
+        <div class="p_text">{{ item.OrganizationName }}</div>
+      </div>
+      <div v-if="state === 0 && (userTypeEnumInt===0 ) && !isHistory" class="p_func">
+        <!-- 编辑 -->
+        <el-button
+          type="text"
+          :disabled="state!==0 || item.IsGenerateSuccess"
+          @click="editParticipant(item)"
+        >
+          <i class="el-icon-edit-outline" style="font-size: 20px;" />
+        </el-button>
+        <!-- 移除 -->
+        <el-button
+          type="text"
+          :disabled="state!==0 || item.IsGenerateSuccess"
+          @click="removeParticipant(item)"
+        >
+          <i class="el-icon-delete" style="font-size: 20px;" />
+        </el-button>
+      </div>
+    </div>
+
+    <!-- 添加/编辑人员信息 -->
+    <el-drawer
+      :title="title"
+      :visible.sync="formVisible"
+      direction="btt"
+      size="70%"
+    >
+      <ParticipantForm
+        v-if="formVisible"
+        :state="state"
+        :participant-info="participantInfo"
+        @getList="getList"
+        @close="close"
+      />
+    </el-drawer>
+  </div>
+</template>
+<script>
+import { getTrialSiteUserSurveyList, deleteTrialSiteUserSurvey } from '@/api/research'
+import ParticipantForm from './ParticipantForm'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'ParticipantsResearch',
+  components: { ParticipantForm },
+  props: {
+    isHistory: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      formVisible: false,
+      title: '',
+      participantInfo: null,
+      w: 0,
+      state: null,
+      trialSiteSurveyId: '',
+      trialId: '',
+      userTypeEnumInt: 0,
+      warningList: []
+    }
+  },
+  mounted() {
+    this.w = document.body.clientWidth - 200
+    if (zzSessionStorage.getItem('userTypeEnumInt')) {
+      this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+    }
+    this.trialSiteSurveyId = getQueryString('trialSiteSurveyId')
+    this.trialId = getQueryString('trialId')
+  },
+  methods: {
+    // 获取参与者列表数据
+    async getList() {
+      try {
+        this.loading = true
+        var params = {
+          trialSiteSurveyId: this.trialSiteSurveyId,
+          isHistoryUser: false
+        }
+        const res = await getTrialSiteUserSurveyList(params)
+        this.loading = false
+        if (res.IsSuccess) {
+          res.Result.map(item => {
+            var obj = this.warningList.find(i => i.id === item.Id)
+            if (obj) {
+              item.ErrorMessage = obj.errorMessage
+            }
+          })
+          this.list = res.Result
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 新增
+    addParticipant() {
+      this.participantInfo = {}
+      this.title = this.$t('trials:staffResearch:dialogTitle:add')
+      this.formVisible = true
+    },
+    // 编辑
+    editParticipant(obj) {
+      this.participantInfo = Object.assign({ ...obj })
+      this.title = this.$t('trials:staffResearch:dialogTitle:edit')
+      this.formVisible = true
+    },
+    // 删除
+    async removeParticipant(obj) {
+      try {
+        const confirm = await this.$confirm(
+          this.$t('trials:staffResearch:message:confirmDel'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        this.loading = true
+        const res = await deleteTrialSiteUserSurvey(obj.Id, this.trialId)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list.splice(this.list.findIndex((item) => item.Id === obj.Id), 1)
+          this.$message.success(this.$t('trials:staffResearch:message:delSuccessfully'))
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    isExistIncorrect() {
+      return this.list.some(item => item.IsCorrect === false)
+    },
+
+    // 初始化列表
+    initList(trialSiteUserSurveyList, trialSiteSurvey) {
+      this.list = trialSiteUserSurveyList
+      this.state = trialSiteSurvey.State
+      this.$forceUpdate()
+    },
+    // 关闭窗口
+    async close(obj) {
+      this.formVisible = false
+      var idx = this.warningList.findIndex(i => i.id === obj.id)
+      if (idx > -1) {
+        this.warningList[idx].errorMessage = obj.errorMessage
+      } else {
+        this.warningList.push({ id: obj.id, errorMessage: obj.errorMessage })
+      }
+      this.getList()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.participants_content{
+  background: #fff;
+  padding: 10px;
+  .title{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+  .participant_info{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    align-items: center;
+    border-top: 1px solid #f5f7fa;
+    .p_icon{
+      width: 70px;
+      font-size: 25px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .p_info{
+      position: relative;
+      flex:1;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-evenly;
+      // border-right: 1px solid #f5f7fa;
+      font-size: 13px;
+    }
+    .p_info:after {
+        content: '';
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+        right: 0;
+        height: 50px;
+        width: 1px;
+        background-color: #f5f7fa;
+    }
+    .p_info_basic{
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+    }
+    .p_text{
+      line-height: 25px;
+      color: #82848a;
+    }
+    .p_func{
+      width: 80px;
+      padding: 0 10px;
+      text-align: center;
+    }
+  }
+}
+
+</style>

src/views/research-mobile/detail.vue

@@ -0,0 +1,221 @@
+<template>
+  <div v-loading="loading" class="research_detal_wrapper">
+    <div class="d_title">{{ $t('trials:researchForm:title:question') }}</div>
+    <div class="d_content">
+
+      <!-- 项目基本信息 -->
+      <BasicInfo ref="basicInfo" />
+      <!-- 历史人员 -->
+      <HistoricalParticipants ref="historicalParticipant" class="mt5" />
+      <!-- 新增人员 -->
+      <Participants ref="participants" class="mt5" />
+      <!-- 设备调研 -->
+      <Equipments ref="equipments" class="mt5" />
+      <!-- 备注 -->
+      <Notes ref="notes" class="mt5" />
+    </div>
+    <div class="d_footer">
+      <div class="d_func_row">
+        <div
+          v-if="state === 0 && userTypeEnumInt === 0"
+          class="d_func"
+          @click="handleSave"
+        >
+          {{ $t('common:button:save') }}
+        </div>
+        <div
+          v-if="(state === 0 && userTypeEnumInt === 0)"
+          class="d_func"
+          @click="handleSubmit('submit')"
+        >
+          {{ $t('trials:researchForm:button:submit') }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getSiteSurveyInfo, trialSurveySubmit } from '@/api/research'
+import { getQueryString } from '@/utils/history.js'
+import BasicInfo from './components/BasicInfo'
+import HistoricalParticipants from './components/HistoricalParticipants'
+import Participants from './components/Participants'
+import Equipments from './components/Equipments'
+import Notes from './components/Notes'
+export default {
+  name: 'ResearchMobileDetail',
+  components: {
+    BasicInfo,
+    HistoricalParticipants,
+    Participants, Equipments, Notes
+  },
+  data() {
+    return {
+      trialId: this.$route.query.trialId,
+      trialSiteSurveyId: '',
+      loading: false,
+      state: null,
+      userTypeEnumInt: 0,
+      rejectVisible: false,
+      rejectForm: { reason: '' },
+      siteSurveyNoteInfo: null
+    }
+  },
+  mounted() {
+    this.trialSiteSurveyId = getQueryString('trialSiteSurveyId')
+    this.initPage()
+    if (zzSessionStorage.getItem('userTypeEnumInt')) {
+      this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+    }
+  },
+  methods: {
+    // 初始化页面
+    async initPage() {
+      try {
+        this.loading = true
+        const res = await getSiteSurveyInfo(this.trialId, this.trialSiteSurveyId)
+        if (res.Result) {
+          if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
+            this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
+          }
+          this.state = res.Result.TrialSiteSurvey.State
+          this.$refs['basicInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig ? res.Result.SiteSurveyFiledConfig.NotShowFieldList : null)
+          var historicalArr = []
+          var newArr = []
+          res.Result.TrialSiteUserSurveyList.map(i => {
+            if (i.IsHistoryUser) {
+              historicalArr.push(i)
+            } else {
+              newArr.push(i)
+            }
+          })
+
+          this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
+          this.$refs['participants'].initList(newArr, res.Result.TrialSiteSurvey)
+          this.$refs['equipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey, !(res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0))
+          this.$refs['notes'].initPage(this.siteSurveyNoteInfo)
+        }
+        this.loading = false
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 保存
+    handleSave() {
+      this.$refs['basicInfo'].handleSave(false)
+    },
+    // 提交
+    async handleSubmit(type) {
+      if (this.userTypeEnumInt === 0) {
+        try {
+          this.loading = true
+          const res = await this.$refs['basicInfo'].handleSave(true)
+          this.loading = false
+          if (res) {
+            this.submit(type)
+          }
+        } catch (e) {
+          this.loading = false
+          console.log(e)
+        }
+      } else {
+        this.submit(type)
+      }
+    },
+    async submit(type) {
+      try {
+        const confirm = await this.$confirm(
+          this.userTypeEnumInt === 0 ? this.$t('trials:researchForm:message:submitWarning') : this.$t('trials:researchForm:message:submitWarning2'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        var param = {
+          TrialId: this.trialId,
+          TrialSiteSurveyId: this.trialSiteSurveyId
+        }
+        const res = await trialSurveySubmit(param)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.initPage()
+          if (type === 'approve') {
+            this.$message.success(this.$t('common:message:approvedSuccessfully'))
+          } else {
+            this.$message.success(this.$t('trials:researchForm:message:savedSuccessfully'))
+          }
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 退出
+    handleBack() {
+      this.$router.push({ path: `/researchLogin_m?trialId=${this.trialId}&lang=${this.$i18n.locale}` })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.research_detal_wrapper{
+  background-color:#f5f7fa;
+  .d_title{
+    margin-bottom: 5px;
+    line-height: 80px;
+    font-size: 28px;
+    font-weight: bold;
+    text-align: center;
+    background: #fff;
+    position: sticky;
+    top: 0;
+    z-index: 10;
+  }
+  // .d_content{
+
+  // }
+  .d_footer{
+    position: sticky;
+    bottom: 0;
+    z-index: 10;
+    background-color: #f8f8f8;
+    line-height: 50px;
+    text-align: center;
+    // padding: 20px;
+  }
+  .d_func_row{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+  }
+  .d_func{
+    flex: 1;
+    margin: 20px;
+    color: #fff;
+    background-color: #428bca;
+    border-color: #428bca;
+    padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    transition: .1s;
+    font-weight: 500;
+    box-sizing: border-box;
+    outline: 0;
+    text-align: center;
+    line-height: 1;
+    white-space: nowrap;
+    cursor: pointer;
+    &:hover{
+      background: #68a2d5;
+      border-color: #68a2d5;
+      color: #fff;
+    }
+  }
+  .mt5{
+    margin-top: 5px
+  }
+}
+
+</style>

src/views/research-mobile/login.vue

@@ -0,0 +1,406 @@
+<template>
+  <div class="research_login_m_content">
+    <div class="title">{{ $t('trials:researchForm:title:question') }}</div>
+    <el-form
+      ref="loginForm"
+      v-loading="loading"
+      label-position="left"
+      label-width="120px"
+      :model="form"
+      :rules="rules"
+    >
+      <div class="basic_content">
+        <!-- 项目编号 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:trialId')"
+        >
+          <span>{{ form.TrialCode }}</span>
+        </el-form-item>
+        <!-- 试验方案号 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:researchNo')"
+        >
+          <span>{{ form.ResearchProgramNo }}</span>
+        </el-form-item>
+        <!-- 试验名称 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:researchName')"
+        >
+          <span>{{ form.ExperimentName }}</span>
+        </el-form-item>
+        <!-- 适应症类型 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:decleareType')"
+        >
+          <span>{{ form.IndicationType }}</span>
+        </el-form-item>
+      </div>
+      <div class="login_content">
+        <el-form-item
+          :label="$t('trials:researchForm:form:siteName')"
+          prop="SiteId"
+        >
+          <el-select
+            v-model="form.TrialSiteId"
+            filterable
+            style="width:100%;"
+            @change="handleSiteChange"
+          >
+            <el-option
+              v-for="(item,index) of siteOptions"
+              :key="index"
+              :label="item.TrialSiteAliasName"
+              :value="item.TrialSiteId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="form.TrialSiteId && isHaveSiteSurveyRecord"
+          label=""
+          style="text-align:right;"
+        >
+          <!-- 更新调研表 -->
+          <el-link
+            v-if="!form.IsUpdate"
+            type="primary"
+            @click="form.IsUpdate = true"
+          >
+            {{ $t('trials:researchForm:button:updateQsForm') }}
+          </el-link>
+          <!-- 取消更新调研表 -->
+          <el-link
+            v-else
+            type="primary"
+            @click="form.IsUpdate = false;form.ReplaceUserEmailOrPhone=''"
+          >
+            {{ $t('trials:researchForm:button:cancelUpdateQsForm') }}
+          </el-link>
+        </el-form-item>
+
+        <!-- 原调研表填写人邮箱 -->
+        <el-form-item
+          v-if="form.IsUpdate"
+          :label="$t('trials:researchForm:form:originalEmail')"
+          prop="ReplaceUserEmailOrPhone"
+        >
+          <el-input
+            v-model="form.ReplaceUserEmailOrPhone"
+            autocomplete="new-password"
+          />
+        </el-form-item>
+        <!-- 联系邮箱 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:contactorEmail')"
+          prop="EmailOrPhone"
+        >
+          <el-input
+            v-model="form.EmailOrPhone"
+            autocomplete="new-password"
+          />
+        </el-form-item>
+        <el-form-item
+          :label="$t('trials:researchForm:form:verifyCode')"
+        >
+          <div class="code_content">
+            <el-input
+              v-model="form.VerificationCode"
+              autocomplete="new-password"
+            />
+            <el-button
+              type="primary"
+              :disabled="sendDisabled || !form.EmailOrPhone || count > 0"
+              @click="handleSendCode"
+            >
+              {{ this.$t('trials:researchForm:button:send') }} {{ sendTitle ? `${sendTitle}` : null }}
+            </el-button>
+          </div>
+        </el-form-item>
+        <div class="submit_content">
+          <el-button
+            size="large"
+            type="primary"
+            @click="onSubmit"
+          >
+            {{ $t('common:button:submit') }}
+          </el-button>
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { sendVerifyCode, verifySendCode, getTrialSurveyInitInfo } from '@/api/research'
+import { getUserMenuTree, getUserPermissions } from '@/api/user'
+import store from '@/store'
+import { mapGetters, mapMutations } from 'vuex'
+export default {
+  name: 'ResearchMobileLogin',
+  data() {
+    var checkPhone = (rule, value, callback) => {
+      const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
+      if (!value) {
+        return callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      }
+      setTimeout(() => {
+        if (!Number.isInteger(+value)) {
+          callback(new Error(this.$t('trials:researchForm:formRule:phone')))
+        } else {
+          if (phoneReg.test(value)) {
+            callback()
+          } else {
+            callback(new Error(this.$t('trials:researchForm:formRule:phone')))
+          }
+        }
+      }, 100)
+    }
+    var validateEmail = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
+          callback()
+        } else {
+          callback(new Error(this.$t('trials:researchForm:formRule:email')))
+        }
+      }
+    }
+    var validateReplaceEmail = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.form.ReplaceUserEmailOrPhone && reg.test(this.form.ReplaceUserEmailOrPhone)) {
+          callback()
+        } else {
+          callback(new Error(this.$t('trials:researchForm:formRule:email')))
+        }
+      }
+    }
+    return {
+      trialId: '',
+      form: {
+        Sponsor: null, // 申办方
+        ResearchProgramNo: null, // 方案号
+        TrialCode: null, // 项目编号
+        IndicationType: null, // 适应症
+        ExperimentName: '',
+        TrialSiteId: null, // 研究单位名称
+        UserName: null, // 联系人
+        Phone: '', // 联系人电话
+        EmailOrPhone: '',
+        TrialSiteCode: '',
+        IsUpdate: false,
+        ReplaceUserEmailOrPhone: '',
+        VerificationCode: ''
+      },
+      rules: {
+        TrialSiteId: [
+          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: ['blur'] }
+        ],
+        UserName: [
+          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: ['blur'] },
+          { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: 'blur' }
+        ],
+        Phone: [
+          { required: true, validator: checkPhone, trigger: ['blur'] }
+        ],
+        EmailOrPhone: [
+          { required: true, validator: validateEmail, trigger: ['blur', 'change'] }
+        ],
+        ReplaceUserEmailOrPhone: [
+          { required: true, validator: validateReplaceEmail, trigger: ['blur'] }
+        ],
+        VerificationCode: [{ required: true, validator: (rule, value, callback) => { !value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback() }, trigger: ['blur'] }]
+      },
+      siteOptions: [],
+      loading: false,
+      sendDisabled: false,
+      btnLoading: false,
+      sendTitle: '',
+      count: '',
+      timer: null,
+      msg: '',
+      lang: 'zh',
+      isHaveSiteSurveyRecord: false
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'asyncRoutes',
+      'routes',
+      'language'
+    ])
+  },
+  mounted() {
+    this.$i18n.locale = this.$route.query.lang
+    this.setLanguage(this.$route.query.lang)
+    this.$updateDictionary()
+    if (this.$route.query.trialId) {
+      this.trialId = this.$route.query.trialId
+      this.initPage()
+    }
+  },
+  methods: {
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    // 初始化页面
+    async initPage() {
+      try {
+        this.loading = true
+        const res = await getTrialSurveyInitInfo(this.trialId)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.siteOptions = res.Result.TrialSiteSelectList
+        }
+        Object.keys(this.form).forEach(key => {
+          if (res.Result.hasOwnProperty(key)) {
+            this.form[key] = res.Result[key]
+          }
+        })
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 提交
+    async onSubmit() {
+      const validate = await this.$refs.loginForm.validate()
+      if (!validate) return
+      try {
+        this.loading = true
+        if (!this.form.IsUpdate) {
+          this.form.ReplaceUserEmailOrPhone = ''
+        }
+        const param = {
+          trialSiteId: this.form.TrialSiteId,
+          userName: this.form.UserName,
+          phone: this.form.Phone,
+          verificationType: 0,
+          emailOrPhone: this.form.EmailOrPhone,
+          verificationCode: this.form.VerificationCode,
+          isUpdate: this.form.IsUpdate,
+          replaceUserEmailOrPhone: this.form.ReplaceUserEmailOrPhone,
+          trialId: this.trialId
+        }
+        const res = await verifySendCode(param)
+
+        if (res.IsSuccess) {
+          zzSessionStorage.clear()
+          this.$i18n.locale = this.$route.query.lang
+          this.setLanguage(this.$route.query.lang)
+          store.dispatch('user/setToken', res.Result.Token)
+          zzSessionStorage.setItem('TokenKey', res.Result.Token)
+          var permissions = await getUserPermissions()
+          var menuTree = await getUserMenuTree()
+          store.dispatch('user/setTree', menuTree.Result)
+          store.dispatch('user/setPermissions', permissions.Result)
+          this.$router.push({ path: `/researchDetail_m?trialId=${this.trialId}&trialSiteSurveyId=${res.Result.TrialSiteSurveyId}` })
+          this.loading = false
+        }
+      } catch (e) {
+        this.loading = false
+        this.sendDisabled = false
+      }
+    },
+    handleSiteChange(val) {
+      this.isHaveSiteSurveyRecord = false
+      var selected = this.siteOptions.find(item => item.TrialSiteId === val)
+      if (selected) {
+        this.form.TrialSiteCode = selected.TrialSiteCode
+        this.isHaveSiteSurveyRecord = selected.IsHaveSiteSurveyRecord
+      }
+    },
+    // 发送验证码
+    async handleSendCode() {
+      try {
+        this.loading = true
+        const param = {
+          Email: this.form.EmailOrPhone,
+          TrialId: this.trialId
+        }
+        const res = await sendVerifyCode(param)
+        if (res.IsSuccess) {
+          this.getCode()
+          this.loading = false
+          const msg = this.$t('trials:researchForm:tip:sendCode').replace('xxx', this.form.EmailOrPhone)
+          this.$message.success(msg)
+        } else {
+          this.$alert(res.ErrorMessage)
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    getCode() {
+      const TIME_COUNT = 60
+      if (!this.timer) {
+        this.count = TIME_COUNT
+        this.sendDisabled = true
+        this.timer = setInterval(() => {
+          if (this.count > 0 && this.count <= TIME_COUNT) {
+            this.sendTitle = `(${this.count}s)`
+            this.count--
+          } else {
+            this.sendDisabled = false
+            this.sendTitle = ''
+            clearInterval(this.timer)
+            this.timer = null
+          }
+        }, 1000)
+      }
+    },
+    onCancel() {
+      this.$refs['loginForm'].resetFields()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.research_login_m_content{
+  background-color:#f5f7fa;
+  .title{
+    margin-bottom: 5px;
+    line-height: 80px;
+    font-size: 28px;
+    font-weight: bold;
+    text-align: center;
+    background: #fff;
+  }
+  .basic_content{
+    padding: 0 20px;
+    background: #fff;
+  }
+  .login_content{
+    padding: 5px 20px;
+    margin-top: 5px;
+    background: #fff;
+    /deep/.el-form-item {
+      padding-bottom: 20px;
+    }
+  }
+  .code_content{
+    display:flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    .el-input{
+      margin-right: 10px;
+    }
+  }
+  .submit_content{
+    margin-top: 20px;
+    text-align: center;
+  }
+
+  /deep/.el-form-item {
+    margin-bottom: 0px;
+    padding-top: 5px;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+  
+
+}
+</style>

src/views/research/components/ResearchForm.vue

@@ -6,7 +6,7 @@
         {{ $t('trials:researchForm:title:question') }}
       </h2>
       <div style="display: flex;justify-content: space-between;">
-        <div>调研表状态：<el-tag>{{ $fd('ResearchRecord', state) }}</el-tag></div>
+        <div>{{ $t('trials:researchForm:title:state') }}<el-tag>{{ $fd('ResearchRecord', state) }}</el-tag></div>
 
       </div>
     </div>
@@ -26,7 +26,7 @@
         <h4>{{ $t('trials:staffResearch:title:newStaff') }}</h4>
         <ParticipantList ref="researchParticipants" :is-history="true" @refreshPage="refreshPage" @getList="initPage" />
       </el-card>
-
+ 
       <!-- 设备调研 -->
       <el-card shadow="hover" class="mt10">
         <h4>{{ $t('trials:equiptResearch:title:equiptResearch') }}</h4>
@@ -35,9 +35,12 @@
 
       <!-- 其他信息调研 -->
       <el-card shadow="hover" class="mt10">
-        <!-- 注意事项 -->
         <h4>{{ $t('trials:equiptResearch:form:precautions') }}</h4>
-        <ol>
+        <ol v-if="siteSurveyNoteInfo">
+          <div v-if="$i18n.locale === 'zh'" v-html="siteSurveyNoteInfo.ReplaceContentCN" />
+          <div v-else v-html="siteSurveyNoteInfo.ReplaceContent" />
+        </ol>
+        <ol v-else>
           <!-- 只要有可能，请确保受试者使用上述指定的扫描仪器采集影像。 -->
           <li>{{ $t('trials:equiptResearch:form:item1') }}</li>
           <!-- 请确保对每位受试者的扫描参数在整个研究过程中保持一致。 -->
@@ -148,7 +151,8 @@ export default {
       rejectForm: { reason: '' },
       btnLoading: false,
       isFullscreen: false,
-      historyVisible: false
+      historyVisible: false,
+      siteSurveyNoteInfo: null
     }
   },
   mounted() {
@@ -165,6 +169,9 @@ export default {
         if (res.Result) {
           // this.trialSiteSurveyEquipmentType = res.Result.TrialInfo.TrialSiteSurveyEquipmentType
           // this.trialSiteSurveyUserRoles = res.Result.TrialInfo.TrialSiteSurveyUserRoles
+          if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
+            this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
+          }
           var historicalArr = []
           var newArr = []
           res.Result.TrialSiteUserSurveyList.map(i => {
@@ -176,11 +183,11 @@ export default {
           })
           this.state = res.Result.TrialSiteSurvey.State
           this.siteId = res.Result.TrialSiteSurvey.TrialSiteId
-          this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey)
+          this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig ? res.Result.SiteSurveyFiledConfig.NotShowFieldList : null)
           this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
           this.$refs['researchParticipants'].initList(newArr, res.Result.TrialSiteSurvey)
           // this.$refs['researchParticipants'].initList(res.Result.TrialSiteUserSurveyList, res.Result.TrialSiteSurvey)
-          this.$refs['researchEquipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey)
+          this.$refs['researchEquipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey, !(res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0))
           this.isExistIncorrect = res.Result.TrialSiteUserSurveyList.every(item => item.IsCorrect === false)
         }
         this.loading = false

src/views/research/form.vue

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

src/views/research/login.vue

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

src/views/resumeInfo/components/StatusInfo.vue

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

src/views/resumeInfo/index.vue

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

src/views/reviewers/components/Agreements.vue

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

src/views/reviewers/components/GcpCertificate.vue

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

src/views/reviewers/components/Resumes.vue

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

src/views/system/i18n/components/BatchAddForm.vue

@@ -6,122 +6,162 @@
         v-loading="loading"
         :model="form"
         size="small"
+        :rules="rules"
       >
         <el-form-item label="国际化类型" prop="InternationalizationType">
           <el-radio-group v-model="form.InternationalizationType">
             <el-radio
               v-for="item of $d.InternationalizationType"
-              :key="'InternationalizationType'+item.value"
+              :key="'InternationalizationType' + item.value"
               :label="item.value"
-            >{{ item.label }}</el-radio>
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
         <el-form-item label="状态" prop="State">
           <el-radio-group v-model="form.State">
             <el-radio
               v-for="item of $d.InternationalizationKeyState"
-              :key="'InternationalizationKeyState'+item.value"
+              :key="'InternationalizationKeyState' + item.value"
               :label="item.value"
-            >{{ item.label }}</el-radio>
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
-        <el-table
-          :data="form.AddList"
-          style="width: 100%"
-          height="300"
-        >
-          <el-table-column
-            prop=""
-            label="功能模块/服务名"
-          >
+        <el-form-item label="迭代" prop="PublishLogId">
+          <el-select v-model="form.PublishLogId" clearable filterable>
+            <el-option
+              v-for="item in PublishVersionList"
+              :key="item.Id"
+              :label="item.Version"
+              :value="item.Id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-table :data="form.AddList" style="width: 100%" height="300">
+          <el-table-column prop="" label="功能模块/服务名">
             <template slot-scope="scope">
               <el-form-item
                 label=""
-                :prop="`AddList.${scope.$index}.Description`"
+                :prop="`AddList.${scope.$index}.Module`"
                 :rules="[
-                  { required: true,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  { max: 200, message: `${$t('common:ruleMessage:maxLength')} 200` }
+                  {
+                    max: 200,
+                    message: `${$t('common:ruleMessage:maxLength')} 200`,
+                    trigger: ['change', 'blur'],
+                  },
                 ]"
               >
                 <el-input
-                  v-model="scope.row.Description"
+                  v-model="scope.row.Module"
                   type="textarea"
                   maxlength="200"
-                  :autosize="{ minRows: 2, maxRows: 4}"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
                 />
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column
-            prop=""
-            label="标识"
-          >
+          <el-table-column prop="" label="标识">
             <template slot-scope="scope">
               <el-form-item
                 label=""
                 :prop="`AddList.${scope.$index}.Code`"
                 :rules="[
-                  { required: true,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  { max: 200, message: `${$t('common:ruleMessage:maxLength')} 200` }
+                  {
+                    required: true,
+                    message: $t('common:ruleMessage:specify'),
+                    trigger: ['change', 'blur'],
+                  },
+                  {
+                    max: 200,
+                    message: `${$t('common:ruleMessage:maxLength')} 200`,
+                  },
                 ]"
               >
                 <el-input
                   v-model="scope.row.Code"
                   type="textarea"
                   maxlength="200"
-                  :autosize="{ minRows: 2, maxRows: 4}"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
                 />
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column
-            prop=""
-            label="中文值"
-          >
+          <el-table-column prop="" label="中文值">
             <template slot-scope="scope">
               <el-form-item
                 label=""
                 :prop="`AddList.${scope.$index}.ValueCN`"
                 :rules="[
-                  { required: true,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  { max: 1000, message: `${$t('common:ruleMessage:maxLength')} 1000` }
+                  {
+                    required: true,
+                    message: $t('common:ruleMessage:specify'),
+                    trigger: ['change', 'blur'],
+                  },
+                  {
+                    max: 1000,
+                    message: `${$t('common:ruleMessage:maxLength')} 1000`,
+                  },
                 ]"
               >
                 <el-input
                   v-model="scope.row.ValueCN"
                   type="textarea"
                   maxlength="1000"
-                  :autosize="{ minRows: 2, maxRows: 4}"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
                 />
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column
-            prop=""
-            label="英文值"
-          >
+          <el-table-column prop="" label="英文值">
             <template slot-scope="scope">
               <el-form-item
                 label=""
                 :prop="`AddList.${scope.$index}.Value`"
                 :rules="[
-                  { required: true,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  { max: 1000, message: `${$t('common:ruleMessage:maxLength')} 1000` }
+                  {
+                    required: true,
+                    message: $t('common:ruleMessage:specify'),
+                    trigger: ['change', 'blur'],
+                  },
+                  {
+                    max: 1000,
+                    message: `${$t('common:ruleMessage:maxLength')} 1000`,
+                  },
                 ]"
               >
                 <el-input
                   v-model="scope.row.Value"
                   type="textarea"
                   maxlength="1000"
-                  :autosize="{ minRows: 2, maxRows: 4}"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
                 />
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column
-            align="right"
-            width="100"
-          >
+          <el-table-column prop="" label="说明">
+            <template slot-scope="scope">
+              <el-form-item
+                label=""
+                :prop="`AddList.${scope.$index}.Description`"
+                :rules="[
+                  {
+                    max: 200,
+                    message: `${$t('common:ruleMessage:maxLength')} 200`,
+                    trigger: ['change', 'blur'],
+                  },
+                ]"
+              >
+                <el-input
+                  v-model="scope.row.Description"
+                  type="textarea"
+                  maxlength="200"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
+                />
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="right" width="100">
             <template slot="header">
               <!-- 新增 -->
               <el-button
@@ -129,7 +169,8 @@
                 type="primary"
                 icon="el-icon-plus"
                 @click="handleAdd"
-              >{{ $t('common:button:new') }}</el-button>
+                >{{ $t("common:button:new") }}</el-button
+              >
             </template>
             <template slot-scope="scope">
               <!-- 删除 -->
@@ -138,81 +179,97 @@
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.$index)"
-              >{{ $t('common:button:delete') }}</el-button>
+                >{{ $t("common:button:delete") }}</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
       </el-form>
-
     </template>
     <template slot="dialog-footer">
-      <el-button size="small" type="primary" @click="handleCancle">取消</el-button>
-      <el-button size="small" type="primary" @click="handleSave">保存</el-button>
+      <el-button size="small" type="primary" @click="handleCancle"
+        >取消</el-button
+      >
+      <el-button size="small" type="primary" @click="handleSave"
+        >保存</el-button
+      >
     </template>
   </base-model>
 </template>
 <script>
-import { batchAddInternationalization } from '@/api/admin'
-import BaseModel from '@/components/BaseModel'
+import { batchAddInternationalization } from "@/api/admin";
+import BaseModel from "@/components/BaseModel";
 const formDataDefault = () => {
   return {
     State: 0,
     InternationalizationType: 1,
-    AddList: []
-  }
-}
+    PublishLogId: null,
+    AddList: [],
+  };
+};
 export default {
-  name: 'BatcnAddForm',
+  name: "BatcnAddForm",
   components: { BaseModel },
   data() {
     return {
       loading: false,
       form: formDataDefault(),
-      model_cfg: { visible: false, showClose: true, width: '800px', title: '', appendToBody: true }
-    }
-  },
-  mounted() {
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: "800px",
+        title: "",
+        appendToBody: true,
+      },
+      rules: {
+        PublishLogId: [{ required: true, message: "请选择", trigger: "blur" }],
+      },
+      PublishVersionList: [],
+    };
   },
+  mounted() {},
   methods: {
-
-    openDialog(title, data) {
-      this.model_cfg.visible = true
-      this.model_cfg.title = title
-      this.form = formDataDefault()
+    openDialog(title, data, options = []) {
+      this.PublishVersionList = options;
+      this.model_cfg.visible = true;
+      this.model_cfg.title = title;
+      this.form = formDataDefault();
     },
     handleSave() {
-      this.$refs.batcnAddForm.validate(valid => {
-        if (!valid) return
-        this.loading = true
-        batchAddInternationalization(this.form).then(res => {
-          this.loading = false
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.model_cfg.visible = false
-          this.$emit('getList')
-        }).catch(() => {
-          this.loading = false
-        })
-      })
+      this.$refs.batcnAddForm.validate((valid) => {
+        if (!valid) return;
+        this.loading = true;
+        batchAddInternationalization(this.form)
+          .then((res) => {
+            this.loading = false;
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.model_cfg.visible = false;
+            this.$emit("getList");
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     handleCancle() {
-      this.model_cfg.visible = false
+      this.model_cfg.visible = false;
     },
     handleAdd() {
       this.form.AddList.push({
-        Description: '',
-        Code: '',
-        ValueCN: '',
-        Value: ''
-      })
+        Description: "",
+        Code: "",
+        ValueCN: "",
+        Value: "",
+      });
     },
     handleDelete(index) {
-      this.$confirm('是否确认删除？', {
-        type: 'warning',
-        distinguishCancelAndClose: true
+      this.$confirm("是否确认删除？", {
+        type: "warning",
+        distinguishCancelAndClose: true,
       }).then(() => {
-        this.form.AddList.splice(index, 1)
-      })
-    }
-  }
-}
+        this.form.AddList.splice(index, 1);
+      });
+    },
+  },
+};
 </script>

src/views/system/i18n/components/I18nForm.vue

@@ -9,147 +9,216 @@
         label-width="130px"
         size="small"
       >
-        <el-form-item label="国际化类型" prop="InternationalizationType">
+        <el-form-item
+          label="国际化类型"
+          prop="InternationalizationType"
+          v-if="status !== 'batch'"
+        >
           <el-radio-group v-model="form.InternationalizationType">
             <el-radio
               v-for="item of $d.InternationalizationType"
-              :key="'InternationalizationType'+item.value"
+              :key="'InternationalizationType' + item.value"
               :label="item.value"
-            >{{ item.label }}</el-radio>
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="功能模块/服务名" prop="Description">
+        <el-form-item
+          label="功能模块/服务名"
+          prop="Module"
+          v-if="status !== 'batch'"
+        >
           <el-input
-            v-model="form.Description"
+            v-model="form.Module"
             type="textarea"
             maxlength="200"
-            :autosize="{ minRows: 2, maxRows: 4}"
+            :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
-        <el-form-item label="标识" prop="Code">
+        <el-form-item label="标识" prop="Code" v-if="status !== 'batch'">
           <el-input
             v-model="form.Code"
             type="textarea"
             maxlength="200"
-            :autosize="{ minRows: 2, maxRows: 4}"
+            :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
-        <el-form-item label="中文值" prop="ValueCN">
+        <el-form-item label="中文值" prop="ValueCN" v-if="status !== 'batch'">
           <el-input
             v-model="form.ValueCN"
             type="textarea"
             maxlength="1000"
-            :autosize="{ minRows: 2, maxRows: 4}"
+            :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
-        <el-form-item label="英文值" prop="Value">
+        <el-form-item label="英文值" prop="Value" v-if="status !== 'batch'">
           <el-input
             v-model="form.Value"
             type="textarea"
             maxlength="1000"
-            :autosize="{ minRows: 2, maxRows: 4}"
+            :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
-
         <el-form-item label="状态" prop="State">
           <el-radio-group v-model="form.State">
             <el-radio
               v-for="item of $d.InternationalizationKeyState"
-              :key="'InternationalizationKeyState'+item.value"
+              :key="'InternationalizationKeyState' + item.value"
               :label="item.value"
-            >{{ item.label }}</el-radio>
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="说明" prop="Description" v-if="status !== 'batch'">
+          <el-input
+            v-model="form.Description"
+            type="textarea"
+            maxlength="200"
+            :autosize="{ minRows: 2, maxRows: 4 }"
+          />
+        </el-form-item>
+        <el-form-item label="迭代" prop="PublishLogId">
+          <el-select v-model="form.PublishLogId" clearable filterable>
+            <el-option
+              v-for="item in PublishVersionList"
+              :key="item.Id"
+              :label="item.Version"
+              :value="item.Id"
+            />
+          </el-select>
+        </el-form-item>
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button size="small" type="primary" @click="handleCancle">取消</el-button>
-      <el-button size="small" type="primary" @click="handleSave">保存</el-button>
+      <el-button size="small" type="primary" @click="handleCancle"
+        >取消</el-button
+      >
+      <el-button size="small" type="primary" @click="handleSave"
+        >保存</el-button
+      >
     </template>
   </base-model>
 </template>
 <script>
-import { addOrUpdateInternationalization } from '@/api/admin'
-import BaseModel from '@/components/BaseModel'
+import { addOrUpdateInternationalization } from "@/api/admin";
+import BaseModel from "@/components/BaseModel";
 const formDataDefault = () => {
   return {
     Id: null,
     State: 0,
     Description: null,
+    Module: null,
     Code: null,
     Value: null,
     ValueCN: null,
-    InternationalizationType: 1
-  }
-}
+    InternationalizationType: 1,
+    PublishLogId: null,
+  };
+};
 export default {
-  name: 'I18nForm',
+  name: "I18nForm",
   components: { BaseModel },
   data() {
     return {
+      status: "add", // add update batch
       loading: false,
       form: formDataDefault(),
       rules: {
-        State: [
-          { required: true, message: '请选择', trigger: 'blur' }
+        State: [{ required: true, message: "请选择", trigger: "blur" }],
+        Module: [
+          {
+            max: 200,
+            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
+            trigger: "blur",
+          },
         ],
         Description: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }
+          {
+            max: 200,
+            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
+            trigger: "blur",
+          },
         ],
         Code: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }
+          { required: true, message: "请注明", trigger: "blur" },
+          {
+            max: 200,
+            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
+          },
         ],
         Value: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 1000, message: `${this.$t('common:ruleMessage:maxLength')} 1000` }
+          { required: true, message: "请注明", trigger: "blur" },
+          {
+            max: 1000,
+            message: `${this.$t("common:ruleMessage:maxLength")} 1000`,
+          },
         ],
         ValueCN: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 1000, message: `${this.$t('common:ruleMessage:maxLength')} 1000` }
+          { required: true, message: "请注明", trigger: "blur" },
+          {
+            max: 1000,
+            message: `${this.$t("common:ruleMessage:maxLength")} 1000`,
+          },
         ],
         InternationalizationType: [
-          { required: true, message: '请选择', trigger: 'blur' }
-        ]
+          { required: true, message: "请选择", trigger: "blur" },
+        ],
+        PublishLogId: [{ required: true, message: "请选择", trigger: "blur" }],
       },
-      model_cfg: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true }
-    }
-  },
-  mounted() {
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: "600px",
+        title: "",
+        appendToBody: true,
+      },
+      PublishVersionList: [],
+    };
   },
+  mounted() {},
   methods: {
-
-    openDialog(title, data) {
-      this.model_cfg.visible = true
-      this.model_cfg.title = title
+    openDialog(title, data, options = [], status) {
+      this.PublishVersionList = options;
+      this.status = status;
+      this.model_cfg.visible = true;
+      this.model_cfg.title = title;
       if (Object.keys(data).length > 0) {
         for (const k in this.form) {
           if (data.hasOwnProperty(k)) {
-            this.form[k] = data[k]
+            this.form[k] = data[k];
           }
         }
       } else {
-        this.form = formDataDefault()
+        this.form = formDataDefault();
       }
     },
     handleSave() {
-      this.$refs.i18nForm.validate(valid => {
-        if (!valid) return
-        this.loading = true
-        addOrUpdateInternationalization(this.form).then(res => {
-          this.loading = false
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.model_cfg.visible = false
-          this.$emit('getList')
-        }).catch(() => {
-          this.loading = false
-        })
-      })
+      this.$refs.i18nForm.validate((valid) => {
+        if (!valid) return;
+        this.loading = true;
+        if (this.status === "batch") {
+          return this.$emit("batch", this.form);
+        }
+        addOrUpdateInternationalization(this.form)
+          .then((res) => {
+            this.loading = false;
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.model_cfg.visible = false;
+            this.$emit("getList");
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     handleCancle() {
-      this.model_cfg.visible = false
-    }
-  }
-}
+      this.model_cfg.visible = false;
+    },
+  },
+};
 </script>
+<style lang="scss" scoped>
+::v-deep .el-select {
+  width: 100%;
+}
+</style>

src/views/system/i18n/index.vue

@@ -7,11 +7,11 @@
             v-model="searchData.InternationalizationType"
             clearable
             filterable
-            style="width:130px;"
+            style="width: 130px"
           >
             <el-option
               v-for="item of $d.InternationalizationType"
-              :key="'InternationalizationType'+item.value"
+              :key="'InternationalizationType' + item.value"
               :label="item.label"
               :value="item.value"
             />
@@ -19,10 +19,10 @@
         </el-form-item>
         <el-form-item label="功能模块/服务名">
           <el-input
-            v-model="searchData.Description"
+            v-model="searchData.Module"
             size="small"
             clearable
-            style="width:130px;"
+            style="width: 130px"
           />
         </el-form-item>
         <el-form-item label="标识">
@@ -30,7 +30,7 @@
             v-model="searchData.Code"
             size="small"
             clearable
-            style="width:130px;"
+            style="width: 130px"
           />
         </el-form-item>
         <el-form-item label="中文值">
@@ -38,27 +38,55 @@
             v-model="searchData.ValueCN"
             size="small"
             clearable
-            style="width:130px;"
+            style="width: 130px"
           />
         </el-form-item>
         <el-form-item label="英文值">
           <el-input
             v-model="searchData.Value"
             size="small"
-            style="width:130px;"
+            style="width: 130px"
             clearable
           />
         </el-form-item>
         <el-form-item label="状态">
-          <el-select v-model="searchData.State" clearable filterable style="width:130px;">
+          <el-select
+            v-model="searchData.State"
+            clearable
+            filterable
+            style="width: 130px"
+          >
             <el-option
               v-for="item of $d.InternationalizationKeyState"
-              :key="'InternationalizationKeyState'+item.value"
+              :key="'InternationalizationKeyState' + item.value"
               :label="item.label"
               :value="item.value"
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="说明">
+          <el-input
+            v-model="searchData.Description"
+            size="small"
+            clearable
+            style="width: 130px"
+          />
+        </el-form-item>
+        <el-form-item label="迭代">
+          <el-select
+            v-model="searchData.PublishLogId"
+            clearable
+            filterable
+            style="width: 130px"
+          >
+            <el-option
+              v-for="item in PublishVersionList"
+              :key="item.Id"
+              :label="item.Version"
+              :value="item.Id"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -84,20 +112,27 @@
           >
             批量新增
           </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-edit-outline"
+            size="mini"
+            :disabled="selectTableList.length <= 0"
+            @click="handleBatchUpdate"
+          >
+            批量更新
+          </el-button>
         </el-form-item>
       </el-form>
       <el-table
         v-loading="loading"
-        v-adaptive="{bottomOffset:45}"
+        v-adaptive="{ bottomOffset: 45 }"
         height="100"
         :data="list"
         class="table"
         @sort-change="handleSortByColumn"
-      >
-        <el-table-column
-          type="index"
-          width="50"
-        />
+        @selection-change="handleSelectionChange"
+        ><el-table-column type="selection" width="50" />
+        <el-table-column type="index" width="50" />
         <el-table-column
           label="国际化类型"
           prop="InternationalizationType"
@@ -106,21 +141,42 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.InternationalizationType === 0" type="primary">
-              {{ $fd('InternationalizationType', scope.row.InternationalizationType) }}
+            <el-tag
+              v-if="scope.row.InternationalizationType === 0"
+              type="primary"
+            >
+              {{
+                $fd(
+                  "InternationalizationType",
+                  scope.row.InternationalizationType
+                )
+              }}
             </el-tag>
-            <el-tag v-else-if="scope.row.InternationalizationType === 1" type="warning">
-              {{ $fd('InternationalizationType', scope.row.InternationalizationType) }}
+            <el-tag
+              v-else-if="scope.row.InternationalizationType === 1"
+              type="warning"
+            >
+              {{
+                $fd(
+                  "InternationalizationType",
+                  scope.row.InternationalizationType
+                )
+              }}
             </el-tag>
             <el-tag v-else>
-              {{ $fd('InternationalizationType', scope.row.InternationalizationType) }}
+              {{
+                $fd(
+                  "InternationalizationType",
+                  scope.row.InternationalizationType
+                )
+              }}
             </el-tag>
           </template>
         </el-table-column>
         <el-table-column
           label="功能模块/服务名"
-          prop="Description"
-          min-width="100"
+          prop="Module"
+          min-width="120"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -154,16 +210,30 @@
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.State === 0" type="danger">
-              {{ $fd('InternationalizationKeyState', scope.row.State) }}
+              {{ $fd("InternationalizationKeyState", scope.row.State) }}
             </el-tag>
             <el-tag v-else-if="scope.row.State === 1" type="primary">
-              {{ $fd('InternationalizationKeyState', scope.row.State) }}
+              {{ $fd("InternationalizationKeyState", scope.row.State) }}
             </el-tag>
             <el-tag v-else>
-              {{ $fd('InternationalizationKeyState', scope.row.State) }}
+              {{ $fd("InternationalizationKeyState", scope.row.State) }}
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column
+          label="说明"
+          prop="Description"
+          min-width="100"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <el-table-column
+          label="迭代"
+          prop="Version"
+          min-width="100"
+          show-overflow-tooltip
+          sortable="custom"
+        />
         <el-table-column
           label="更新时间"
           prop="UpdateTime"
@@ -197,11 +267,10 @@
             >
               删除
             </el-button>
-
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination" style="text-align: right;margin-top:5px;">
+      <div class="pagination" style="text-align: right; margin-top: 5px">
         <pagination
           :total="total"
           :page.sync="searchData.PageIndex"
@@ -209,20 +278,22 @@
           @pagination="getList"
         />
       </div>
-      <i18n-form
-        ref="i18nForm"
-        @getList="getList"
-      />
+      <i18n-form ref="i18nForm" @getList="getList" @batch="batch" />
       <BatchAddForm ref="batcnAddForm" @getList="getList" />
     </div>
   </div>
 </template>
 <script>
-import { getInternationalizationList, deleteInternationalization } from '@/api/admin'
-import Pagination from '@/components/Pagination'
-import I18nForm from './components/I18nForm.vue'
-import BatchAddForm from './components/BatchAddForm.vue'
-import moment from 'moment'
+import {
+  getInternationalizationList,
+  deleteInternationalization,
+  getPublishVersionSelect,
+  batchUpdateInternationalInfo,
+} from "@/api/admin";
+import Pagination from "@/components/Pagination";
+import I18nForm from "./components/I18nForm.vue";
+import BatchAddForm from "./components/BatchAddForm.vue";
+import moment from "moment";
 const searchDataDefault = () => {
   return {
     Description: null,
@@ -230,14 +301,16 @@ const searchDataDefault = () => {
     ValueCN: null,
     InternationalizationType: null,
     State: null,
+    Module: null,
+    PublishLogId: null,
     Asc: true,
-    SortField: '',
+    SortField: "",
     PageIndex: 1,
-    PageSize: 20
-  }
-}
+    PageSize: 20,
+  };
+};
 export default {
-  name: 'I18n',
+  name: "I18n",
   components: { Pagination, I18nForm, BatchAddForm },
   data() {
     return {
@@ -245,100 +318,169 @@ export default {
       searchData: searchDataDefault(),
       list: [],
       total: 0,
-      loading: false
-    }
+      loading: false,
+      PublishVersionList: [],
+      selectTableList: [],
+    };
   },
   mounted() {
-    this.getList()
+    this.getList();
+    this.getPublishVersionSelect();
   },
   methods: {
+    // 获取迭代
+    async getPublishVersionSelect() {
+      try {
+        let res = await getPublishVersionSelect();
+        if (res.IsSuccess) {
+          this.PublishVersionList = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
     getList() {
-      this.loading = true
-      getInternationalizationList(this.searchData).then((res) => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => {
-        this.loading = false
-      })
+      this.loading = true;
+      getInternationalizationList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    // 批量更新
+    handleBatchUpdate() {
+      this.$nextTick(() => {
+        this.$refs["i18nForm"].openDialog(
+          "批量更新",
+          {},
+          this.PublishVersionList,
+          "batch"
+        );
+      });
+    },
+    async batch(row) {
+      let { PublishLogId, State } = row;
+      let data = {
+        PublishLogId,
+        State,
+        IdList: this.selectTableList.map((item) => item.Id),
+      };
+      try {
+        let res = await batchUpdateInternationalInfo(data);
+        if (res.IsSuccess) {
+          this.$message.success(this.$t("common:message:updatedSuccessfully"));
+          this.getList();
+          this.$nextTick(() => {
+            this.$refs["i18nForm"].handleCancle();
+          });
+        }
+      } catch (err) {
+        console.log(err);
+      }
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['i18nForm'].openDialog('新增', {})
-      })
+        this.$refs["i18nForm"].openDialog(
+          "新增",
+          {},
+          this.PublishVersionList,
+          "add"
+        );
+      });
     },
     handleBatchAdd() {
       this.$nextTick(() => {
-        this.$refs['batcnAddForm'].openDialog('批量新增', {})
-      })
+        this.$refs["batcnAddForm"].openDialog(
+          "批量新增",
+          {},
+          this.PublishVersionList
+        );
+      });
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['i18nForm'].openDialog('编辑', row)
-      })
+        this.$refs["i18nForm"].openDialog(
+          "编辑",
+          row,
+          this.PublishVersionList,
+          "update"
+        );
+      });
     },
     // 重置列表查询
     handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
     },
     // 删除
     handleDelete(row) {
-      this.$confirm('是否确认删除？', {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          this.loading = true
-          deleteInternationalization(row.Id)
-            .then(res => {
-              this.loading = false
-              if (res.IsSuccess) {
-                this.getList()
-                this.$message.success(this.$t('common:message:deletedSuccessfully'))
-              }
-            }).catch(() => { this.loading = false })
-        })
+      this.$confirm("是否确认删除？", {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.loading = true;
+        deleteInternationalization(row.Id)
+          .then((res) => {
+            this.loading = false;
+            if (res.IsSuccess) {
+              this.getList();
+              this.$message.success(
+                this.$t("common:message:deletedSuccessfully")
+              );
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+    // 选择
+    handleSelectionChange(val) {
+      this.selectTableList = val;
+    },
+  },
+};
+</script>
+<style lang="scss">
+.log {
+  height: 100%;
+  box-sizing: border-box;
+  display: flex;
+  padding: 10px;
+  border-radius: 5px;
+  .left {
+    display: flex;
+    flex-direction: column;
+    width: 0;
+    flex-grow: 4;
+    // border-right: 1px solid #ccc;
+    .filter-container {
+      display: flex;
+      align-items: center;
+      margin: 5px;
+    }
+    .data-table {
+      flex: 1;
+      padding: 5px 0px;
+    }
+    .pagination-container {
+      text-align: right;
     }
   }
 }
-</script>
-<style lang="scss">
-  .log {
-    height: 100%;
-    box-sizing: border-box;
-    display: flex;
-    padding: 10px;
-    border-radius: 5px;
-    .left {
-      display: flex;
-      flex-direction: column;
-      width: 0;
-      flex-grow: 4;
-      // border-right: 1px solid #ccc;
-      .filter-container {
-        display: flex;
-        align-items: center;
-        margin: 5px;
-      }
-      .data-table {
-        flex: 1;
-        padding: 5px 0px;
-      }
-      .pagination-container {
-        text-align: right;
-      }
-    }
-  }
 </style>

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

@@ -10,46 +10,72 @@
         size="small"
       >
         <el-form-item label="发布版本" prop="Version">
-          <el-input
-            v-model="form.Version"
-          />
+          <el-input v-model="form.Version" />
         </el-form-item>
         <el-form-item label="更新功能" prop="UpdateContent">
           <el-input
             v-model="form.UpdateContent"
             type="textarea"
             maxlength="1000"
-            :autosize="{ minRows: 4, maxRows: 5}"
+            :autosize="{ minRows: 4, maxRows: 5 }"
           />
         </el-form-item>
-        <el-form-item label="发布日期" prop="PublishTime">
+        <el-form-item label="发布状态" prop="State">
+          <el-select v-model="form.State" placeholder="请选择">
+            <el-option
+              v-for="item in $d.PublishStatus"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发布日期">
           <el-date-picker
             v-model="form.PublishTime"
             type="date"
             value-format="yyyy-MM-dd HH:mm:ss"
           />
         </el-form-item>
+        <el-form-item label="是否当前版本" prop="IsCurrentVersion">
+          <el-select v-model="form.IsCurrentVersion" placeholder="请选择">
+            <el-option
+              v-for="item in $d.YesOrNo"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button size="small" type="primary" @click="handleCancle">取消</el-button>
-      <el-button size="small" type="primary" @click="handleSave">保存</el-button>
+      <el-button size="small" type="primary" @click="handleCancle"
+        >取消</el-button
+      >
+      <el-button size="small" type="primary" @click="handleSave"
+        >保存</el-button
+      >
     </template>
   </base-model>
 </template>
 <script>
-import { addOrUpdatePublishLog } from '@/api/admin'
-import BaseModel from '@/components/BaseModel'
+import { addOrUpdatePublishLog } from "@/api/admin";
+import BaseModel from "@/components/BaseModel";
 const formDataDefault = () => {
   return {
     Id: null,
     Version: null,
     PublishTime: null,
-    UpdateContent: null
-  }
-}
+    UpdateContent: null,
+    State: null,
+    IsCurrentVersion: null,
+  };
+};
 export default {
-  name: 'LogForm',
+  name: "LogForm",
   components: { BaseModel },
   data() {
     return {
@@ -57,54 +83,73 @@ export default {
       form: formDataDefault(),
       rules: {
         Version: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` }
+          { required: true, message: "请注明", trigger: "blur" },
+          { max: 50, message: `${this.$t("common:ruleMessage:maxLength")} 50` },
         ],
-        PublishTime: [
-          { required: true, message: '请注明', trigger: 'blur' }
+        // PublishTime: [
+        //   { required: true, message: '请注明', trigger: 'blur' }
+        // ],
+        IsCurrentVersion: [
+          { required: true, message: "请选择", trigger: "blur" },
         ],
+        State: [{ required: true, message: "请选择", trigger: "blur" }],
         UpdateContent: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 1000, message: `${this.$t('common:ruleMessage:maxLength')} 500` }
-        ]
+          { required: true, message: "请注明", trigger: "blur" },
+          {
+            max: 1000,
+            message: `${this.$t("common:ruleMessage:maxLength")} 500`,
+          },
+        ],
       },
-      model_cfg: { visible: false, showClose: true, width: '500px', title: '', appendToBody: true }
-    }
-  },
-  mounted() {
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: "500px",
+        title: "",
+        appendToBody: true,
+      },
+    };
   },
+  mounted() {},
   methods: {
-
     openDialog(title, data) {
-      this.model_cfg.visible = true
-      this.model_cfg.title = title
+      this.model_cfg.visible = true;
+      this.model_cfg.title = title;
       if (Object.keys(data).length > 0) {
         for (const k in this.form) {
           if (data.hasOwnProperty(k)) {
-            this.form[k] = data[k]
+            this.form[k] = data[k];
           }
         }
       } else {
-        this.form = formDataDefault()
+        this.form = formDataDefault();
       }
     },
     handleSave() {
-      this.$refs.LogForm.validate(valid => {
-        if (!valid) return
-        this.loading = true
-        addOrUpdatePublishLog(this.form).then(res => {
-          this.loading = false
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.model_cfg.visible = false
-          this.$emit('getList')
-        }).catch(() => {
-          this.loading = false
-        })
-      })
+      this.$refs.LogForm.validate((valid) => {
+        if (!valid) return;
+        this.loading = true;
+        addOrUpdatePublishLog(this.form)
+          .then((res) => {
+            this.loading = false;
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.model_cfg.visible = false;
+            this.$emit("getList");
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     handleCancle() {
-      this.model_cfg.visible = false
-    }
-  }
-}
+      this.model_cfg.visible = false;
+    },
+  },
+};
 </script>
+<style lang="scss" scoped>
+::v-deep .el-select,
+.el-date-editor {
+  width: 100%;
+}
+</style>

src/views/system/log/index.vue

@@ -2,25 +2,11 @@
   <div class="log">
     <div ref="leftContainer" class="left">
       <el-form :inline="true">
-        <el-form-item
-          label="发布版本"
-          prop="Version"
-        >
-          <el-input
-            v-model="searchData.Version"
-            size="small"
-            clearable
-          />
+        <el-form-item label="发布版本" prop="Version">
+          <el-input v-model="searchData.Version" size="small" clearable />
         </el-form-item>
-        <el-form-item
-          label="更新功能"
-          prop="UpdateContent"
-        >
-          <el-input
-            v-model="searchData.UpdateContent"
-            size="small"
-            clearable
-          />
+        <el-form-item label="更新功能" prop="UpdateContent">
+          <el-input v-model="searchData.UpdateContent" size="small" clearable />
         </el-form-item>
         <el-form-item>
           <el-button
@@ -43,17 +29,14 @@
       </el-form>
       <el-table
         v-loading="loading"
-        v-adaptive="{bottomOffset:45}"
+        v-adaptive="{ bottomOffset: 45 }"
         height="100"
         :data="list"
         class="table"
         @sort-change="handleSortByColumn"
-        :default-sort="{prop:'PublishTime',order:'descending'}"
+        :default-sort="{ prop: 'PublishTime', order: 'descending' }"
       >
-        <el-table-column
-          type="index"
-          width="50"
-        />
+        <el-table-column type="index" width="50" />
         <el-table-column
           label="发布版本"
           prop="Version"
@@ -67,6 +50,16 @@
           min-width="150"
           show-overflow-tooltip
         />
+        <el-table-column
+          label="发布状态"
+          prop="State"
+          min-width="150"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ $fd("PublishStatus", scope.row.State) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           label="发布日期"
           prop="PublishTime"
@@ -75,10 +68,23 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ scope.row.PublishTime?moment(scope.row.PublishTime).format('YYYY-MM-DD'):'' }}
+            {{
+              scope.row.PublishTime
+                ? moment(scope.row.PublishTime).format("YYYY-MM-DD")
+                : ""
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="是否当前版本"
+          prop="IsCurrentVersion"
+          min-width="150"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ $fd("YesOrNo", scope.row.IsCurrentVersion) }}</span>
           </template>
         </el-table-column>
-
         <el-table-column
           label="操作"
           fixed="right"
@@ -103,11 +109,10 @@
             >
               删除
             </el-button>
-
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination" style="text-align: right;margin-top:5px;">
+      <div class="pagination" style="text-align: right; margin-top: 5px">
         <pagination
           :total="total"
           :page.sync="searchData.PageIndex"
@@ -115,28 +120,25 @@
           @pagination="getList"
         />
       </div>
-      <log-form
-        ref="LogForm"
-        @getList="getList"
-      />
+      <log-form ref="LogForm" @getList="getList" />
     </div>
   </div>
 </template>
 <script>
-import { getPublishLogList, deletePublishLog } from '@/api/admin'
-import Pagination from '@/components/Pagination'
-import LogForm from './components/LogForm.vue'
-import moment from 'moment'
+import { getPublishLogList, deletePublishLog } from "@/api/admin";
+import Pagination from "@/components/Pagination";
+import LogForm from "./components/LogForm.vue";
+import moment from "moment";
 const searchDataDefault = () => {
   return {
     Version: null,
     UpdateContent: null,
     Asc: false,
-    SortField: 'PublishTime',
+    SortField: "PublishTime",
     PageIndex: 1,
-    PageSize: 20
-  }
-}
+    PageSize: 20,
+  };
+};
 export default {
   components: { Pagination, LogForm },
   data() {
@@ -145,95 +147,101 @@ export default {
       searchData: searchDataDefault(),
       list: [],
       total: 0,
-      loading: false
-    }
+      loading: false,
+    };
   },
   mounted() {
-    this.getList()
+    this.getList();
   },
   methods: {
     getList() {
-      this.loading = true
-      getPublishLogList(this.searchData).then((res) => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => {
-        this.loading = false
-      })
+      this.loading = true;
+      getPublishLogList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['LogForm'].openDialog('新增', {})
-      })
+        this.$refs["LogForm"].openDialog("新增", {});
+      });
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['LogForm'].openDialog('编辑', row)
-      })
+        this.$refs["LogForm"].openDialog("编辑", row);
+      });
     },
     // 重置列表查询
     handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
     },
     // 删除
     handleDelete(row) {
-      this.$confirm('是否确认删除？', {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          this.loading = true
-          deletePublishLog(row.Id)
-            .then(res => {
-              this.loading = false
-              if (res.IsSuccess) {
-                this.getList()
-                this.$message.success(this.$t('common:message:deletedSuccessfully'))
-              }
-            }).catch(() => { this.loading = false })
-        })
+      this.$confirm("是否确认删除？", {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.loading = true;
+        deletePublishLog(row.Id)
+          .then((res) => {
+            this.loading = false;
+            if (res.IsSuccess) {
+              this.getList();
+              this.$message.success(
+                this.$t("common:message:deletedSuccessfully")
+              );
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+  },
+};
+</script>
+<style lang="scss">
+.log {
+  height: 100%;
+  box-sizing: border-box;
+  display: flex;
+  padding: 10px;
+  border-radius: 5px;
+  .left {
+    display: flex;
+    flex-direction: column;
+    width: 0;
+    flex-grow: 4;
+    // border-right: 1px solid #ccc;
+    .filter-container {
+      display: flex;
+      align-items: center;
+      margin: 5px;
+    }
+    .data-table {
+      flex: 1;
+      padding: 5px 0px;
+    }
+    .pagination-container {
+      text-align: right;
     }
   }
 }
-</script>
-<style lang="scss">
-  .log {
-    height: 100%;
-    box-sizing: border-box;
-    display: flex;
-    padding: 10px;
-    border-radius: 5px;
-    .left {
-      display: flex;
-      flex-direction: column;
-      width: 0;
-      flex-grow: 4;
-      // border-right: 1px solid #ccc;
-      .filter-container {
-        display: flex;
-        align-items: center;
-        margin: 5px;
-      }
-      .data-table {
-        flex: 1;
-        padding: 5px 0px;
-      }
-      .pagination-container {
-        text-align: right;
-      }
-    }
-  }
 </style>

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

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