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

上传同名文件时进度条出错
国际化补充
2025-03-11 11:41:49 +08:00 · 2025-03-11 11:41:30 +08:00 · 2025-03-11 10:59:22 +08:00 · 2025-03-11 10:42:34 +08:00 · 2025-03-11 10:30:07 +08:00 · 2025-03-10 17:59:25 +08:00
526 changed files with 118158 additions and 42232 deletions
@@ -1,48 +1,58 @@
 module.exports = {
  root: true,
  parserOptions: {
-    parser: 'babel-eslint',
+    parser: '@babel/eslint-parser',
    sourceType: 'module'
  },
  globals: {
-    "zzSessionStorage": true
+    'zzSessionStorage': true
  },
  env: {
    browser: true,
    node: true,
    es6: true
  },
-  extends: ["plugin:vue/recommended"],
+  extends: ['plugin:vue/recommended'],

  // add your custom rules here
-  //it is base on https://github.com/vuejs/eslint-config-vue
+  // it is base on https://github.com/vuejs/eslint-config-vue
  rules: {
-    "vue/max-attributes-per-line": [
-      2,
+    // "rule-name": "off"
+    // "vue/max-attributes-per-line": [
+    //   2,
+    //   {
+    //     singleline: 10,
+    //     multiline: {
+    //       max: 1,
+    //       allowFirstLine: false
+    //     }
+    //   }
+    // ],
+    'vue/max-attributes-per-line': [
+      'error',
      {
        singleline: 10,
        multiline: {
-          max: 1,
-          allowFirstLine: false
+          max: 1
        }
      }
    ],
-    "vue/singleline-html-element-content-newline": "off",
-    "vue/multiline-html-element-content-newline": "off",
-    "vue/name-property-casing": ["error", "PascalCase"],
-    "vue/no-v-html": "off",
-    "accessor-pairs": 2,
-    "arrow-spacing": [
+    'vue/singleline-html-element-content-newline': 'off',
+    'vue/multiline-html-element-content-newline': 'off',
+    'vue/name-property-casing': ['error', 'PascalCase'],
+    'vue/no-v-html': 'off',
+    'accessor-pairs': 2,
+    'arrow-spacing': [
      2,
      {
        before: true,
        after: true
      }
    ],
-    "block-spacing": [2, "always"],
-    "brace-style": [
+    'block-spacing': [2, 'always'],
+    'brace-style': [
      2,
-      "1tbs",
+      '1tbs',
      {
        allowSingleLine: true
      }
@@ -50,31 +60,31 @@ module.exports = {
    camelcase: [
      0,
      {
-        properties: "always"
+        properties: 'always'
      }
    ],
-    "comma-dangle": [2, "never"],
-    "comma-spacing": [
+    'comma-dangle': [2, 'never'],
+    'comma-spacing': [
      2,
      {
        before: false,
        after: true
      }
    ],
-    "comma-style": [2, "last"],
-    "constructor-super": 2,
-    curly: [2, "multi-line"],
-    "dot-location": [2, "property"],
-    "eol-last": 2,
-    eqeqeq: ["error", "always", { null: "ignore" }],
-    "generator-star-spacing": [
+    'comma-style': [2, 'last'],
+    'constructor-super': 2,
+    curly: [2, 'multi-line'],
+    'dot-location': [2, 'property'],
+    'eol-last': 2,
+    eqeqeq: ['error', 'always', { null: 'ignore' }],
+    'generator-star-spacing': [
      2,
      {
        before: true,
        after: true
      }
    ],
-    "handle-callback-err": [2, "^(err|error)$"],
+    'handle-callback-err': [2, '^(err|error)$'],
    indent: [
      2,
      2,
@@ -82,197 +92,197 @@ module.exports = {
        SwitchCase: 1
      }
    ],
-    "jsx-quotes": [2, "prefer-single"],
-    "key-spacing": [
+    'jsx-quotes': [2, 'prefer-single'],
+    'key-spacing': [
      2,
      {
        beforeColon: false,
        afterColon: true
      }
    ],
-    "keyword-spacing": [
+    'keyword-spacing': [
      2,
      {
        before: true,
        after: true
      }
    ],
-    "new-cap": [
+    'new-cap': [
      2,
      {
        newIsCap: true,
        capIsNew: false
      }
    ],
-    "new-parens": 2,
-    "no-array-constructor": 2,
-    "no-caller": 2,
-    "no-console": "off",
-    "no-class-assign": 2,
-    "no-cond-assign": 2,
-    "no-const-assign": 2,
-    "no-control-regex": 0,
-    "no-delete-var": 2,
-    "no-dupe-args": 2,
-    "no-dupe-class-members": 2,
-    "no-dupe-keys": 2,
-    "no-duplicate-case": 2,
-    "no-empty-character-class": 2,
-    "no-empty-pattern": 2,
-    "no-eval": 2,
-    "no-ex-assign": 2,
-    "no-extend-native": 2,
-    "no-extra-bind": 2,
-    "no-extra-boolean-cast": 2,
-    "no-extra-parens": [2, "functions"],
-    "no-fallthrough": 2,
-    "no-floating-decimal": 2,
-    "no-func-assign": 2,
-    "no-implied-eval": 2,
-    "no-inner-declarations": [2, "functions"],
-    "no-invalid-regexp": 2,
-    "no-irregular-whitespace": 2,
-    "no-iterator": 2,
-    "no-label-var": 2,
-    "no-labels": [
+    'new-parens': 2,
+    'no-array-constructor': 2,
+    'no-caller': 2,
+    'no-console': 'off',
+    'no-class-assign': 2,
+    'no-cond-assign': 2,
+    'no-const-assign': 2,
+    'no-control-regex': 0,
+    'no-delete-var': 2,
+    'no-dupe-args': 2,
+    'no-dupe-class-members': 2,
+    'no-dupe-keys': 2,
+    'no-duplicate-case': 2,
+    'no-empty-character-class': 2,
+    'no-empty-pattern': 2,
+    'no-eval': 2,
+    'no-ex-assign': 2,
+    'no-extend-native': 2,
+    'no-extra-bind': 2,
+    'no-extra-boolean-cast': 2,
+    'no-extra-parens': [2, 'functions'],
+    'no-fallthrough': 2,
+    'no-floating-decimal': 2,
+    'no-func-assign': 2,
+    'no-implied-eval': 2,
+    'no-inner-declarations': [2, 'functions'],
+    'no-invalid-regexp': 2,
+    'no-irregular-whitespace': 2,
+    'no-iterator': 2,
+    'no-label-var': 2,
+    'no-labels': [
      2,
      {
        allowLoop: false,
        allowSwitch: false
      }
    ],
-    "no-lone-blocks": 2,
-    "no-mixed-spaces-and-tabs": 2,
-    "no-multi-spaces": 2,
-    "no-multi-str": 2,
-    "no-multiple-empty-lines": [
+    'no-lone-blocks': 2,
+    'no-mixed-spaces-and-tabs': 2,
+    'no-multi-spaces': 2,
+    'no-multi-str': 2,
+    'no-multiple-empty-lines': [
      2,
      {
        max: 1
      }
    ],
-    "no-native-reassign": 2,
-    "no-negated-in-lhs": 2,
-    "no-new-object": 2,
-    "no-new-require": 2,
-    "no-new-symbol": 2,
-    "no-new-wrappers": 2,
-    "no-obj-calls": 2,
-    "no-octal": 2,
-    "no-octal-escape": 2,
-    "no-path-concat": 2,
-    "no-proto": 2,
-    "no-redeclare": 2,
-    "no-regex-spaces": 2,
-    "no-return-assign": [2, "except-parens"],
-    "no-self-assign": 2,
-    "no-self-compare": 2,
-    "no-sequences": 2,
-    "no-shadow-restricted-names": 2,
-    "no-spaced-func": 2,
-    "no-sparse-arrays": 2,
-    "no-this-before-super": 2,
-    "no-throw-literal": 2,
-    "no-trailing-spaces": 2,
-    "no-undef": 2,
-    "no-undef-init": 2,
-    "no-unexpected-multiline": 2,
-    "no-unmodified-loop-condition": 2,
-    "no-unneeded-ternary": [
+    'no-native-reassign': 2,
+    'no-negated-in-lhs': 2,
+    'no-new-object': 2,
+    'no-new-require': 2,
+    'no-new-symbol': 2,
+    'no-new-wrappers': 2,
+    'no-obj-calls': 2,
+    'no-octal': 2,
+    'no-octal-escape': 2,
+    'no-path-concat': 2,
+    'no-proto': 2,
+    'no-redeclare': 2,
+    'no-regex-spaces': 2,
+    'no-return-assign': [2, 'except-parens'],
+    'no-self-assign': 2,
+    'no-self-compare': 2,
+    'no-sequences': 2,
+    'no-shadow-restricted-names': 2,
+    'no-spaced-func': 2,
+    'no-sparse-arrays': 2,
+    'no-this-before-super': 2,
+    'no-throw-literal': 2,
+    'no-trailing-spaces': 2,
+    'no-undef': 2,
+    'no-undef-init': 2,
+    'no-unexpected-multiline': 2,
+    'no-unmodified-loop-condition': 2,
+    'no-unneeded-ternary': [
      2,
      {
        defaultAssignment: false
      }
    ],
-    "no-unreachable": 2,
-    "no-unsafe-finally": 2,
-    "no-unused-vars": [
+    'no-unreachable': 2,
+    'no-unsafe-finally': 2,
+    'no-unused-vars': [
      2,
      {
-        vars: "all",
-        args: "none"
+        vars: 'all',
+        args: 'none'
      }
    ],
-    "no-useless-call": 2,
-    "no-useless-computed-key": 2,
-    "no-useless-constructor": 2,
-    "no-useless-escape": 0,
-    "no-whitespace-before-property": 2,
-    "no-with": 2,
-    "one-var": [
+    'no-useless-call': 2,
+    'no-useless-computed-key': 2,
+    'no-useless-constructor': 2,
+    'no-useless-escape': 0,
+    'no-whitespace-before-property': 2,
+    'no-with': 2,
+    'one-var': [
      2,
      {
-        initialized: "never"
+        initialized: 'never'
      }
    ],
-    "operator-linebreak": [
+    'operator-linebreak': [
      2,
-      "after",
+      'after',
      {
        overrides: {
-          "?": "before",
-          ":": "before"
+          '?': 'before',
+          ':': 'before'
        }
      }
    ],
-    "padded-blocks": [2, "never"],
+    'padded-blocks': [2, 'never'],
    quotes: [
      2,
-      "single",
+      'single',
      {
        avoidEscape: true,
        allowTemplateLiterals: true
      }
    ],
-    semi: [2, "never"],
-    "semi-spacing": [
+    semi: [2, 'never'],
+    'semi-spacing': [
      2,
      {
        before: false,
        after: true
      }
    ],
-    "space-before-blocks": [2, "always"],
-    "space-before-function-paren": [2, "never"],
-    "space-in-parens": [2, "never"],
-    "space-infix-ops": 2,
-    "space-unary-ops": [
+    'space-before-blocks': [2, 'always'],
+    'space-before-function-paren': [2, 'never'],
+    'space-in-parens': [2, 'never'],
+    'space-infix-ops': 2,
+    'space-unary-ops': [
      2,
      {
        words: true,
        nonwords: false
      }
    ],
-    "spaced-comment": [
+    'spaced-comment': [
      2,
-      "always",
+      'always',
      {
        markers: [
-          "global",
-          "globals",
-          "eslint",
-          "eslint-disable",
-          "*package",
-          "!",
-          ","
+          'global',
+          'globals',
+          'eslint',
+          'eslint-disable',
+          '*package',
+          '!',
+          ','
        ]
      }
    ],
-    "template-curly-spacing": [2, "never"],
-    "use-isnan": 2,
-    "valid-typeof": 2,
-    "wrap-iife": [2, "any"],
-    "yield-star-spacing": [2, "both"],
-    yoda: [2, "never"],
-    "prefer-const": 2,
-    //"no-debugger": process.env.NODE_ENV === "production" ? 2 : 0,
-    "object-curly-spacing": [
+    'template-curly-spacing': [2, 'never'],
+    'use-isnan': 2,
+    'valid-typeof': 2,
+    'wrap-iife': [2, 'any'],
+    'yield-star-spacing': [2, 'both'],
+    yoda: [2, 'never'],
+    'prefer-const': 2,
+    // "no-debugger": process.env.NODE_ENV === "production" ? 2 : 0,
+    'object-curly-spacing': [
      2,
-      "always",
+      'always',
      {
        objectsInObjects: false
      }
    ],
-    "array-bracket-spacing": [2, "never"]
+    'array-bracket-spacing': [2, 'never']
  }
-};
+}
@@ -10516,7 +10516,7 @@ class BaseViewer {

    const pageNumber = this._currentPageNumber,
          state = this.#scrollModePageState,
-          viewer = this.viewer;
+          viewmr = this.viewer;
    viewer.textContent = "";
    state.pages.length = 0;

@@ -5,3 +5,6 @@ npm install
 # 启动服务
 npm run dev

+# v1.9.0修改
+1. 角色修改，全局userId实际意义修改为userRoleId（用户角色id），新增identityUserId（新的用户id）
+
@@ -1,10 +1,12 @@
 module.exports = {
  presets: [
-    '@vue/cli-plugin-babel/preset',
+    // '@vue/cli-plugin-babel/preset',
+    // ["@babel/preset-env", { "modules": false }]
    '@babel/preset-env'
  ],
  plugins: [
-    '@babel/plugin-proposal-optional-chaining',
-    '@babel/plugin-proposal-nullish-coalescing-operator'
+    '@vue/babel-plugin-transform-vue-jsx'
+    // '@babel/plugin-proposal-optional-chaining',
+    // '@babel/plugin-proposal-nullish-coalescing-operator'
  ]
 }
@@ -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    
+       
+
       

    
@@ -14,87 +14,92 @@
    "i18n:en": "node i18nGenerate.js lang=en keyCol=5 valCol=7"
  },
  "dependencies": {
+    "@aws-sdk/client-s3": "^3.701.0",
+    "@cornerstonejs/adapters": "^2.19.7",
    "@cornerstonejs/calculate-suv": "^1.1.0",
-    "@cornerstonejs/core": "^1.27.4",
-    "@cornerstonejs/dicom-image-loader": "^1.27.4",
-    "@cornerstonejs/streaming-image-volume-loader": "1.23.2",
-    "@cornerstonejs/tools": "^1.27.4",
-    "@ffmpeg/core": "^0.10.0",
-    "@ffmpeg/ffmpeg": "^0.10.1",
-    "@microsoft/signalr": "^6.0.8",
-    "@riophae/vue-treeselect": "0.4.0",
+    "@cornerstonejs/core": "^2.19.7",
+    "@cornerstonejs/dicom-image-loader": "^2.19.7",
+    "@cornerstonejs/tools": "^2.19.7",
+    "@icr/polyseg-wasm": "^0.4.0",
+    "@microsoft/signalr": "^8.0.7",
+    "@riophae/vue-treeselect": "^0.4.0",
+    "@vue-office/docx": "^1.6.2",
+    "@vue-office/excel": "^1.7.11",
+    "@vue/composition-api": "^1.7.2",
    "ali-oss": "^6.17.1",
-    "axios": "0.18.1",
-    "babel-eslint": "7.2.3",
-    "copy-webpack-plugin": "^4.5.2",
+    "axios": "^0.18.1",
    "core-js": "^3.8.3",
    "cornerstone-core": "^2.6.1",
    "cornerstone-math": "^0.1.10",
    "cornerstone-tools": "^6.0.10",
    "cornerstone-wado-image-loader": "^4.13.2",
+    "crypto-js": "^4.2.0",
    "dcmjs": "^0.29.8",
    "dicom-parser": "^1.8.9",
    "dicomedit": "^0.1.0",
    "echarts": "^4.8.0",
-    "element-ui": "^2.15.8",
-    "exceljs": "^4.1.0",
+    "element-ui": "^2.15.14",
+    "exceljs": "^4.4.0",
    "file-saver": "^2.0.5",
    "hammerjs": "^2.0.8",
    "html2canvas": "^1.4.1",
-    "js-md5": "^0.7.3",
-    "jszip": "^3.7.1",
-    "moment": "^2.27.0",
-    "node-polyfill-webpack-plugin": "^2.0.1",
-    "node-sass": "^4.14.1",
-    "normalize.css": "7.0.0",
-    "nprogress": "0.2.0",
-    "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",
+    "js-md5": "^0.8.3",
+    "jsencrypt": "^3.3.2",
+    "jszip": "^3.10.1",
+    "minio": "^7.1.3",
+    "moment": "^2.30.1",
+    "moment-timezone": "^0.5.46",
+    "node-xlsx": "^0.24.0",
+    "normalize.css": "^8.0.1",
+    "nprogress": "^0.2.0",
+    "path-to-regexp": "^0.1.10",
+    "pdfobject": "^2.3.0",
+    "qrcodejs2": "^0.0.2",
+    "screenfull": "^6.0.2",
+    "sortablejs": "^1.15.5",
    "streamsaver": "^2.0.6",
-    "v-viewer": "^1.6.4",
+    "svg-sprite-loader": "^4.1.3",
+    "svgo": "^1.2.2",
+    "v-viewer": "^1.7.4",
    "vcrontab": "^0.3.5",
-    "vue": "^2.6.11",
-    "vue-clipboard2": "^0.3.1",
-    "vue-contextmenujs": "^1.3.13",
+    "vue": "^2.6.14",
+    "vue-clipboard2": "^0.3.3",
+    "vue-contextmenujs": "^1.4.11",
    "vue-count-to": "^1.0.13",
-    "vue-i18n": "^8.7.0",
-    "vue-pdf": "^4.3.0",
+    "vue-demi": "^0.14.10",
+    "vue-i18n": "^8.28.2",
    "vue-puzzle-vcode": "^1.1.10",
-    "vue-router": "3.0.6",
-    "vue-seamless-scroll": "^1.1.21",
+    "vue-router": "^3.0.6",
+    "vue-seamless-scroll": "^1.1.23",
    "vuedraggable": "^2.24.3",
-    "vuex": "3.1.0",
-    "webpack-aliyun-oss": "^0.4.9"
+    "vuex": "^3.1.0",
+    "webpack-aliyun-oss": "^0.3.13"
  },
  "devDependencies": {
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-    "@babel/plugin-proposal-optional-chaining": "^7.21.0",
-    "@vue/cli-plugin-babel": "~4.5.4",
-    "@vue/cli-plugin-eslint": "~4.5.4",
-    "@vue/cli-service": "~4.5.4",
-    "autoprefixer": "^9.5.1",
-    "aws-sdk": "^2.1532.0",
-    "babel-eslint": "^10.1.0",
-    "chalk": "2.4.2",
-    "connect": "3.6.6",
-    "eslint": "^6.7.2",
-    "eslint-plugin-vue": "^6.2.2",
-    "html-webpack-plugin": "3.2.0",
-    "minio": "^7.1.3",
-    "moment-timezone": "^0.5.45",
-    "node-xlsx": "^0.21.0",
-    "runjs": "^4.3.2",
-    "script-ext-html-webpack-plugin": "2.1.3",
-    "script-loader": "0.7.2",
-    "serve-static": "^1.13.2",
-    "svg-sprite-loader": "4.1.3",
-    "svgo": "1.2.2",
-    "vue-template-compiler": "^2.6.11"
+    "@babel/core": "^7.12.16",
+    "@babel/eslint-parser": "^7.12.16",
+    "@babel/plugin-transform-class-static-block": "^7.26.0",
+    "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
+    "@vue/cli-plugin-babel": "~5.0.0",
+    "@vue/cli-plugin-eslint": "~5.0.0",
+    "@vue/cli-service": "~5.0.0",
+    "autoprefixer": "^10.4.20",
+    "clean-webpack-plugin": "^4.0.0",
+    "copy-webpack-plugin": "^12.0.2",
+    "css-minimizer-webpack-plugin": "^7.0.0",
+    "eslint": "^7.32.0",
+    "eslint-plugin-vue": "^8.0.3",
+    "html-webpack-plugin": "^5.6.3",
+    "mini-css-extract-plugin": "^2.9.2",
+    "node-polyfill-webpack-plugin": "^4.0.0",
+    "path-browserify": "^1.0.1",
+    "process": "^0.11.10",
+    "sass": "^1.63.2",
+    "sass-loader": "^10.4.1",
+    "terser-webpack-plugin": "^5.3.10",
+    "vue-template-compiler": "^2.6.14",
+    "webpack": "^5.96.1",
+    "webpack-bundle-analyzer": "^4.10.2"
  },
  "eslintConfig": {
    "root": true,
@@ -102,19 +107,19 @@
      "node": true
    },
    "extends": [
-      "plugin:vue/essential"
+      "plugin:vue/essential",
+      "eslint:recommended"
    ],
    "parserOptions": {
-      "parser": "babel-eslint"
+      "parser": "@babel/eslint-parser",
+      "requireConfigFile": false
    },
    "rules": {}
  },
-  "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
-  },
  "browserslist": [
    "> 1%",
-    "last 2 versions"
+    "last 2 versions",
+    "not dead",
+    "not op_mini all"
  ]
 }
@@ -23,8 +23,8 @@
              <img src="./error_assets/zzlogo2.png" alt="">
              <img v-show="false" src="./error_assets/zzlogo3.png" alt="">
            </div>
-            <div class="login-image">
-              <img src="./error_assets/login-bg.png">
+            <div class="login-image login-image-usa">
+              <img src="./error_assets/login-bg.svg" style="max-width: 500px;max-height: 300px;">
            </div>
          </div>
          <div class="login-r">
@@ -148,7 +148,7 @@
    left: 50%;
    top: 50%;
    transform: translate(-50%,-50%);
-    width: 1200px;
+    width: 1100px;
    height: 600px;
    box-sizing: border-box;
    background: rgb(255, 255, 255);
@@ -179,7 +179,12 @@
  .login-container .login-body .login-l .login-image img{
    height: 100%;
  }
-
+  .login-container .login-body .login-l .login-image-usa {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+  }
  .login-container .login-body .login-r{
    position: relative;
    float: left;
@@ -23,8 +23,8 @@
          <img src="./error_assets/zzlogo3.png" alt="">
          <img v-show="false" src="./error_assets/zzlogo3.png" alt="">
        </div>
-        <div class="login-image">
-          <img src="./error_assets/login-bg.png">
+        <div class="login-image login-image-usa">
+          <img src="./error_assets/login-bg.svg" style="max-width: 500px;max-height: 300px;">
        </div>
      </div>
      <div class="login-r">
@@ -104,7 +104,7 @@
    left: 50%;
    top: 50%;
    transform: translate(-50%,-50%);
-    width: 1200px;
+    width: 1100px;
    height: 600px;
    box-sizing: border-box;
    background: rgb(255, 255, 255);
@@ -135,7 +135,12 @@
  .login-container .login-body .login-l .login-image img{
    height: 100%;
  }
-
+  .login-container .login-body .login-l .login-image-usa {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+  }
  .login-container .login-body .login-r{
    position: relative;
    float: left;
@@ -5,6 +5,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
    <meta http-equiv="pragram" content="no-cache">
+    <meta name="autocomplete" content="off">
    <meta http-equiv="Expires" content="0">
    <meta http-equiv="Pragma" content="no-cache">
    <meta http-equiv="Cache-control" content="no-store,no-cache,must-revalidate">
@@ -29,7 +30,6 @@
    </script>
    <% } else { %>
    <script>
-      console.log(2)
      window.zzSessionStorage = {
        setItem: (item, value) => {
          return sessionStorage.setItem(item, value)
@@ -0,0 +1,167 @@
+<!--
+	mitm.html is the lite "man in the middle"
+
+	This is only meant to signal the opener's messageChannel to
+	the service worker - when that is done this mitm can be closed
+    but it's better to keep it alive since this also stops the sw
+    from restarting
+
+	The service worker is capable of intercepting all request and fork their
+	own "fake" response - wish we are going to craft
+	when the worker then receives a stream then the worker will tell the opener
+	to open up a link that will start the download
+-->
+<script>
+// This will prevent the sw from restarting
+let keepAlive = () => {
+  keepAlive = () => {}
+  var ping = location.href.substr(0, location.href.lastIndexOf('/')) + '/ping'
+  var interval = setInterval(() => {
+    if (sw) {
+      sw.postMessage('ping')
+    } else {
+      fetch(ping).then(res => res.text(!res.ok && clearInterval(interval)))
+    }
+  }, 10000)
+}
+
+// message event is the first thing we need to setup a listner for
+// don't want the opener to do a random timeout - instead they can listen for
+// the ready event
+// but since we need to wait for the Service Worker registration, we store the
+// message for later
+let messages = []
+window.onmessage = evt => messages.push(evt)
+
+let sw = null
+let scope = ''
+
+function registerWorker() {
+  return navigator.serviceWorker.getRegistration('./').then(swReg => {
+    return swReg || navigator.serviceWorker.register('sw.js', { scope: './' })
+  }).then(swReg => {
+    const swRegTmp = swReg.installing || swReg.waiting
+
+    scope = swReg.scope
+
+    return (sw = swReg.active) || new Promise(resolve => {
+      swRegTmp.addEventListener('statechange', fn = () => {
+        if (swRegTmp.state === 'activated') {
+          swRegTmp.removeEventListener('statechange', fn)
+          sw = swReg.active
+          resolve()
+        }
+      })
+    })
+  })
+}
+
+// Now that we have the Service Worker registered we can process messages
+function onMessage (event) {
+  let { data, ports, origin } = event
+
+  // It's important to have a messageChannel, don't want to interfere
+  // with other simultaneous downloads
+  if (!ports || !ports.length) {
+    throw new TypeError("[StreamSaver] You didn't send a messageChannel")
+  }
+
+  if (typeof data !== 'object') {
+    throw new TypeError("[StreamSaver] You didn't send a object")
+  }
+
+  // the default public service worker for StreamSaver is shared among others.
+  // so all download links needs to be prefixed to avoid any other conflict
+  data.origin = origin
+
+  // if we ever (in some feature versoin of streamsaver) would like to
+  // redirect back to the page of who initiated a http request
+  data.referrer = data.referrer || document.referrer || origin
+
+  // pass along version for possible backwards compatibility in sw.js
+  data.streamSaverVersion = new URLSearchParams(location.search).get('version')
+
+  if (data.streamSaverVersion === '1.2.0') {
+    console.warn('[StreamSaver] please update streamsaver')
+  }
+
+  /** @since v2.0.0 */
+  if (!data.headers) {
+    console.warn("[StreamSaver] pass `data.headers` that you would like to pass along to the service worker\nit should be a 2D array or a key/val object that fetch's Headers api accepts")
+  } else {
+    // test if it's correct
+    // should thorw a typeError if not
+    new Headers(data.headers)
+  }
+
+  /** @since v2.0.0 */
+  if (typeof data.filename === 'string') {
+    console.warn("[StreamSaver] You shouldn't send `data.filename` anymore. It should be included in the Content-Disposition header option")
+    // Do what File constructor do with fileNames
+    data.filename = data.filename.replace(/\//g, ':')
+  }
+
+  /** @since v2.0.0 */
+  if (data.size) {
+    console.warn("[StreamSaver] You shouldn't send `data.size` anymore. It should be included in the content-length header option")
+  }
+
+  /** @since v2.0.0 */
+  if (data.readableStream) {
+    console.warn("[StreamSaver] You should send the readableStream in the messageChannel, not throught mitm")
+  }
+
+  /** @since v2.0.0 */
+  if (!data.pathname) {
+    console.warn("[StreamSaver] Please send `data.pathname` (eg: /pictures/summer.jpg)")
+    data.pathname = Math.random().toString().slice(-6) + '/' + data.filename
+  }
+
+  // remove all leading slashes
+  data.pathname = data.pathname.replace(/^\/+/g, '')
+
+  // remove protocol
+  let org = origin.replace(/(^\w+:|^)\/\//, '')
+
+  // set the absolute pathname to the download url.
+  data.url = new URL(`${scope + org}/${data.pathname}`).toString()
+
+  if (!data.url.startsWith(`${scope + org}/`)) {
+    throw new TypeError('[StreamSaver] bad `data.pathname`')
+  }
+
+  // This sends the message data as well as transferring
+  // messageChannel.port2 to the service worker. The service worker can
+  // then use the transferred port to reply via postMessage(), which
+  // will in turn trigger the onmessage handler on messageChannel.port1.
+
+  const transferable = data.readableStream
+    ? [ ports[0], data.readableStream ]
+    : [ ports[0] ]
+
+  if (!(data.readableStream || data.transferringReadable)) {
+    keepAlive()
+  }
+
+  return sw.postMessage(data, transferable)
+}
+
+if (window.opener) {
+  // The opener can't listen to onload event, so we need to help em out!
+  // (telling them that we are ready to accept postMessage's)
+  window.opener.postMessage('StreamSaver::loadedPopup', '*')
+}
+
+if (navigator.serviceWorker) {
+  registerWorker().then(() => {
+    window.onmessage = onMessage
+    messages.forEach(window.onmessage)
+  })
+}
+
+// FF v102 just started to supports transferable streams, but still needs to ping sw.js
+// even tough the service worker dose not have to do any kind of work and listen to any
+// messages... #305
+keepAlive()
+
+</script>
@@ -0,0 +1,130 @@
+/* global self ReadableStream Response */
+
+self.addEventListener('install', () => {
+  self.skipWaiting()
+})
+
+self.addEventListener('activate', event => {
+  event.waitUntil(self.clients.claim())
+})
+
+const map = new Map()
+
+// This should be called once per download
+// Each event has a dataChannel that the data will be piped through
+self.onmessage = event => {
+  // We send a heartbeat every x second to keep the
+  // service worker alive if a transferable stream is not sent
+  if (event.data === 'ping') {
+    return
+  }
+
+  const data = event.data
+  const downloadUrl = data.url || self.registration.scope + Math.random() + '/' + (typeof data === 'string' ? data : data.filename)
+  const port = event.ports[0]
+  const metadata = new Array(3) // [stream, data, port]
+
+  metadata[1] = data
+  metadata[2] = port
+
+  // Note to self:
+  // old streamsaver v1.2.0 might still use `readableStream`...
+  // but v2.0.0 will always transfer the stream through MessageChannel #94
+  if (event.data.readableStream) {
+    metadata[0] = event.data.readableStream
+  } else if (event.data.transferringReadable) {
+    port.onmessage = evt => {
+      port.onmessage = null
+      metadata[0] = evt.data.readableStream
+    }
+  } else {
+    metadata[0] = createStream(port)
+  }
+
+  map.set(downloadUrl, metadata)
+  port.postMessage({ download: downloadUrl })
+}
+
+function createStream (port) {
+  // ReadableStream is only supported by chrome 52
+  return new ReadableStream({
+    start (controller) {
+      // When we receive data on the messageChannel, we write
+      port.onmessage = ({ data }) => {
+        if (data === 'end') {
+          return controller.close()
+        }
+
+        if (data === 'abort') {
+          controller.error('Aborted the download')
+          return
+        }
+
+        controller.enqueue(data)
+      }
+    },
+    cancel (reason) {
+      console.log('user aborted', reason)
+      port.postMessage({ abort: true })
+    }
+  })
+}
+
+self.onfetch = event => {
+  const url = event.request.url
+
+  // this only works for Firefox
+  if (url.endsWith('/ping')) {
+    return event.respondWith(new Response('pong'))
+  }
+
+  const hijacke = map.get(url)
+
+  if (!hijacke) return null
+
+  const [ stream, data, port ] = hijacke
+
+  map.delete(url)
+
+  // Not comfortable letting any user control all headers
+  // so we only copy over the length & disposition
+  const responseHeaders = new Headers({
+    'Content-Type': 'application/octet-stream; charset=utf-8',
+
+    // To be on the safe side, The link can be opened in a iframe.
+    // but octet-stream should stop it.
+    'Content-Security-Policy': "default-src 'none'",
+    'X-Content-Security-Policy': "default-src 'none'",
+    'X-WebKit-CSP': "default-src 'none'",
+    'X-XSS-Protection': '1; mode=block',
+    'Cross-Origin-Embedder-Policy': 'require-corp'
+  })
+
+  let headers = new Headers(data.headers || {})
+
+  if (headers.has('Content-Length')) {
+    responseHeaders.set('Content-Length', headers.get('Content-Length'))
+  }
+
+  if (headers.has('Content-Disposition')) {
+    responseHeaders.set('Content-Disposition', headers.get('Content-Disposition'))
+  }
+
+  // data, data.filename and size should not be used anymore
+  if (data.size) {
+    console.warn('Depricated')
+    responseHeaders.set('Content-Length', data.size)
+  }
+
+  let fileName = typeof data === 'string' ? data : data.filename
+  if (fileName) {
+    console.warn('Depricated')
+    // Make filename RFC5987 compatible
+    fileName = encodeURIComponent(fileName).replace(/['()]/g, escape).replace(/\*/g, '%2A')
+    responseHeaders.set('Content-Disposition', "attachment; filename*=UTF-8''" + fileName)
+  }
+
+  event.respondWith(new Response(stream, { headers: responseHeaders }))
+
+  port.postMessage({ debug: 'Download started' })
+}
@@ -3,6 +3,7 @@
    <router-view />
    <div
      v-show="show"
+      v-if="$route.matched.length > 0"
      v-adaptive
      @click="openI18n"
      style="
@@ -22,12 +23,38 @@
    >
      i18n
    </div>
-    <el-drawer title="国际化" :visible.sync="drawer" direction="rtl" size="80%">
-      <div style="width: 320px">
-        <el-form label-width="100px" @submit.native.prevent size="small">
-          <el-form-item label="关键字">
+    <el-drawer
+      :title="$t('il8n:title')"
+      :visible.sync="drawer"
+      direction="rtl"
+      size="80%"
+    >
+      <div style="width: 800px">
+        <el-form
+          label-width="100px"
+          @submit.native.prevent
+          size="small"
+          :inline="true"
+          class="demo-form-inline"
+        >
+          <el-form-item :label="$t('il8n:search:keyword')">
            <el-input v-model="key" @input="keyChange" />
          </el-form-item>
+          <el-form-item :label="$t('il8n:search:state')">
+            <el-select
+              v-model="State"
+              clearable
+              filterable
+              @change="handleStateChange"
+            >
+              <el-option
+                v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
        </el-form>
      </div>
      <el-table
@@ -36,7 +63,12 @@
        height="100"
        style="width: 100%"
      >
-        <el-table-column prop="Code" label="标签" width="300">
+        <el-table-column
+          prop="Code"
+          :label="$t('il8n:table:label')"
+          width="300"
+          show-overflow-tooltip
+        >
        </el-table-column>
        <!--        <el-table-column-->
        <!--          prop="Description"-->
@@ -47,40 +79,62 @@
        <!--            {{scope.row.Description}}-->
        <!--          </template>-->
        <!--        </el-table-column>-->
-        <el-table-column prop="Value" label="英文">
+        <el-table-column prop="Value" :label="$t('il8n:table:en')">
          <template slot-scope="scope">
            <el-input
              v-model="scope.row.Value"
              @input="
                (e) => {
-                  $set(scope.row, 'Value', e);
+                  $set(scope.row, 'Value', e)
                }
              "
              size="mini"
            ></el-input>
          </template>
        </el-table-column>
-        <el-table-column prop="ValueCN" label="中文">
+        <el-table-column prop="ValueCN" :label="$t('il8n:table:cn')">
          <template slot-scope="scope">
            <el-input
              v-model="scope.row.ValueCN"
              @input="
                (e) => {
-                  $set(scope.row, 'ValueCN', e);
+                  $set(scope.row, 'ValueCN', e)
                }
              "
              size="mini"
            ></el-input>
          </template>
        </el-table-column>
+        <el-table-column prop="ValueCN" :label="$t('il8n:table:state')">
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.State"
+              clearable
+              filterable
+              size="mini"
+            >
+              <el-option
+                v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="Version" :label="$t('il8n:table:Version')">
+        </el-table-column>
      </el-table>
      <div style="text-align: right; padding-top: 10px; padding-right: 10px">
-        <el-button size="mini" @click="drawer = false">取消 </el-button>
-        <el-button size="mini" type="primary" @click="handleSave"
-          >保存</el-button
-        >
+        <el-button size="mini" @click="drawer = false"
+          >{{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="mini" type="primary" @click="handleSave">{{
+          $t('common:button:save')
+        }}</el-button>
      </div>
    </el-drawer>
+    <feedBack v-if="$route.matched.length > 0" />
  </div>
 </template>

@@ -88,12 +142,14 @@
 import {
  batchAddOrUpdateFrontInternationalization,
  getFrontInternationalizationList,
-} from "@/api/dictionary/dictionary";
-import { getTrialExtralConfig } from "@/api/trials";
-import Vue from "vue";
-import i18n from "./lang";
+} 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",
+  name: 'App',
+  components: { feedBack },
  data() {
    return {
      drawer: false,
@@ -101,36 +157,51 @@ export default {
      show: false,
      key: null,
      arr: [],
-    };
+      il8nExternal: false,
+      State: null,
+    }
  },
  mounted() {
-    this.show = process.env.VUE_APP_OSS_PATH === "/test/dist";
-  },
-  watch: {
-    "$route.query": {
-      async handler() {
-        if (
-          this.$route.query.trialId &&
-          this.$route.query.trialId !== this.$store.state.trials.config.trialId
-        ) {
-          let res = await getTrialExtralConfig({
-            TrialId: this.$route.query.trialId,
-          });
-          if (res.IsSuccess) {
-            this.$store.dispatch("trials/setConfig", {
-              trialId: this.$route.query.trialId,
-              ...res.Result,
-            });
-          }
-        }
-      },
-      immediate: true,
-      deep: true,
-    },
+    this.show = process.env.VUE_APP_OSS_PATH === '/test/dist'
+    Vue.prototype.$openI18n = this.openI18n
  },
+  // watch: {
+  //   '$route.query': {
+  //     async handler() {
+  //       if (!this.$route.query.trialId) {
+  //         this.$store.dispatch('trials/setConfig', {})
+  //       }
+  //       if (
+  //         this.$route.query.trialId &&
+  //         this.$route.query.trialId !==
+  //           this.$store.state.trials.config.trialId &&
+  //         this.$store.state.trials.whiteList.indexOf(this.$route.path) === -1
+  //       ) {
+  //         let res = await getTrialExtralConfig({
+  //           TrialId: this.$route.query.trialId,
+  //         })
+  //         console.log(222222222222)
+  //         res.Result.aa = { 阅片人: '采集人', 申办方: 'aaa' }
+  //         if (res.IsSuccess) {
+  //           this.$store.dispatch('trials/setConfig', {
+  //             trialId: this.$route.query.trialId,
+  //             ...res.Result,
+  //           })
+  //         }
+  //       }
+  //     },
+  //     immediate: true,
+  //     deep: true,
+  //   },
+  // },
  methods: {
+    handleStateChange() {
+      this.tableData.forEach((item) => {
+        item.State = this.State
+      })
+    },
    changeValue(target, attr, e) {
-      this.$set(target, attr, e);
+      this.$set(target, attr, e)
    },
    keyChange(v) {
      if (this.key) {
@@ -138,69 +209,111 @@ export default {
          [],
          this.arr.filter(
            (v) =>
-              ~v.Code.indexOf(this.key) ||
-              ~v.Value.indexOf(this.key) ||
-              ~v.ValueCN.indexOf(this.key)
+              (v.Code &&
+                ~v.Code.toLowerCase().indexOf(this.key.toLowerCase())) ||
+              (v.Value &&
+                ~v.Value.toLowerCase().indexOf(this.key.toLowerCase())) ||
+              (v.ValueCN &&
+                ~v.ValueCN.toLowerCase().indexOf(this.key.toLowerCase()))
          )
-        );
+        )
      } else {
-        this.tableData = Object.assign([], this.arr);
+        this.tableData = Object.assign([], this.arr)
      }
    },
    handleSave() {
-      this.$confirm("确定修改当前页面国际化内容？").then(() => {
-        batchAddOrUpdateFrontInternationalization(this.tableData).then(
-          async (res) => {
-            var zhMessages = {},
-              enMessages = {};
-            var Internationalization = await getFrontInternationalizationList();
-            Vue.prototype.$tl = Internationalization.Result;
-            this.tableData.forEach((v) => {
-              // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
-              // enMessages[v.Description + '_' + v.Code] = v.Value
-              zhMessages[v.Code] = v.ValueCN;
-              enMessages[v.Code] = v.Value;
-            });
-            i18n.mergeLocaleMessage("zh", zhMessages);
-            i18n.mergeLocaleMessage("en", enMessages);
-            this.drawer = false;
-            this.$message.success("国际化修改成功");
-          }
-        );
-      });
+      this.$confirm('确定修改当前页面国际化内容？')
+        .then(() => {
+          batchAddOrUpdateFrontInternationalization(this.tableData).then(
+            async (res) => {
+              var zhMessages = {},
+                enMessages = {}
+              var Internationalization =
+                await getFrontInternationalizationList()
+              Vue.prototype.$tl = Internationalization.Result
+              this.tableData.forEach((v) => {
+                // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
+                // enMessages[v.Description + '_' + v.Code] = v.Value
+                zhMessages[v.Code] = v.ValueCN
+                enMessages[v.Code] = v.Value
+              })
+              i18n.mergeLocaleMessage('zh', zhMessages)
+              i18n.mergeLocaleMessage('en', enMessages)
+              this.drawer = false
+              this.$message.success('国际化修改成功')
+              if (this.il8nExternal) {
+                this.$EventBus.$emit('il8nUpdate')
+              }
+            }
+          )
+        })
+        .catch((err) => {
+          console.log(err)
+        })
    },
-    openI18n() {
-      this.tableData = [];
-      this.key = null;
-      this.drawer = true;
-      let arr = [];
-      let tableData = this.$tl.map((v) => {
-        let a = { ...v };
-        // if (!a.Description) {
-        //   a.Description = this.$route.path
-        // }
-        return a;
-      });
+    openI18n(ARRAY) {
+      this.tableData = []
+      this.il8nExternal = false
+      this.State = null
+      this.key = null
+      this.drawer = true
+      let arr = []
+      let tableData = []
+      if (ARRAY && Array.isArray(ARRAY)) {
+        this.il8nExternal = true
+        let data = ARRAY.map((v) => {
+          let a = { ...v }
+
+          return a
+        })
+        tableData = data.map((item) => {
+          return {
+            Code: item.Code,
+            Description: item.Description,
+            FrontType: item.FrontType,
+            Module: item.Module,
+            Value: item.Value,
+            ValueCN: item.ValueCN,
+            State: item.State,
+            Version: item.Version,
+            InternationalizationType: item.InternationalizationType,
+          }
+        })
+        this.tableData = Object.assign([], tableData)
+        this.arr = Object.assign([], tableData)
+        return false
+      } else {
+        tableData = this.$tl.map((v) => {
+          let a = { ...v }
+          // if (!a.Description) {
+          //   a.Description = this.$route.path
+          // }
+          return a
+        })
+      }
      tableData = tableData.filter((v) => {
        // return  ~this.$path.indexOf(v.Description + '_' + v.Code)
-        return ~this.$path.indexOf(v.Code);
-      });
+        return ~this.$path.indexOf(v.Code)
+      })
      this.$path.forEach((v) => {
        let o = tableData.find((a) => {
-          return a.Code === v;
-        });
+          return a.Code === v
+        })
        if (o) {
-          arr.push(o);
+          arr.push(o)
        } else {
          arr.push({
            Code: v,
            Description: null,
            Value: null,
            ValueCN: null,
-          });
+            State: 0,
+            Version: this.$version.Version,
+            InternationalizationType: 0,
+          })
        }
-      });
-      this.arr = arr;
+      })
+      this.arr = arr
      if (this.key) {
        this.tableData = Object.assign(
          [],
@@ -210,15 +323,15 @@ export default {
              ~v.Value.indexOf(this.key) ||
              ~v.ValueCN.indexOf(this.key)
          )
-        );
+        )
      } else {
-        this.tableData = Object.assign([], this.arr);
+        this.tableData = Object.assign([], this.arr)
      }
      // console.log(JSON.stringify(this.$path))
      // console.log(JSON.stringify(this.tableData))
    },
  },
-};
+}
 </script>

 <style lang="scss">
@@ -243,7 +356,7 @@ input::-webkit-inner-spin-button {
  -webkit-appearance: none !important;
 }

-input[type="number"] {
+input[type='number'] {
  -moz-appearance: textfield !important;
 }

@@ -269,10 +382,13 @@ textarea {
  color: $light_gray;
  text-align: center;
  font-weight: bold;
-  font-family: "Times New Roman";
+  font-family: 'Times New Roman';
  text-shadow: 1px 0.5px 1.5px #666;
 }
 .title-logo {
  height: 40px;
 }
+.title-logo {
+  height: 40px;
+}
 </style>
@@ -44,11 +44,19 @@ export function updateUser(param) {
    data: param
  })
 }
-
-export function getUser(userId) {
+export function updateUserBasicInfo(param) {
  return request({
-    url: `/user/getUser/${userId}`,
-    method: 'get'
+    url: `/user/updateUserBasicInfo`,
+    method: 'put',
+    data: param
+  })
+}
+
+export function getUser(params) {
+  return request({
+    url: `/user/getUser`,
+    method: 'get',
+    params
  })
 }

@@ -277,3 +285,68 @@ 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
+  })
+}
+// 邮件事件消息列表
+export function getEventStoreRecordList(data) {
+  return request({
+    url: `/EventStoreRecord/getEventStoreRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 重新发布事件消息
+export function rePublishEvent(params) {
+  return request({
+    url: `/EventStoreRecord/rePublishEvent`,
+    method: 'get',
+    params
+  })
+}
+// userId获取doctorId
+export function useUserIDGetDoctorID(data) {
+  return request({
+    url: `/TrialSiteSurvey/useUserIDGetDoctorID`,
+    method: 'post',
+    data
+  })
+}
+
+// 管理端修改用户角色
+export function updateUserRoleInfo(data) {
+  return request({
+    url: `/User/updateUserRoleInfo`,
+    method: 'put',
+    data
+  })
+}
+// 管理端新增用户发送邮件
+export function addNewUserSendEmail(data) {
+  return request({
+    url: `/User/addNewUserSendEmail`,
+    method: 'post',
+    data
+  })
+}
+// 用户追溯
+export function getUserJoinedTrialList(data) {
+  return request({
+    url: `/TrialMaintenance/getUserJoinedTrialList`,
+    method: 'post',
+    data
+  })
+}
@@ -1013,4 +1013,239 @@ 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
+  })
+}
+
+export function getSystemCalculateQuestions(params) {
+  return request({
+    url: `/ReadingQuestion/getSystemCalculateQuestions`,
+    method: 'post',
+    data: params
+  })
+}
+
+export function getSystemCalculateTableQuestions(params) {
+  return request({
+    url: `/ReadingQuestion/getSystemCalculateTableQuestions`,
+    method: 'post',
+    data: params
+  })
+}
+// 添加pd/入组默认邮件
+export function batchAddEnrollOrPdEmailConfig(params) {
+  return request({
+    url: `/TrialEmailNoticeConfig/batchAddEnrollOrPdEmailConfig`,
+    method: 'post',
+    params
+  })
+}
+// 文件记录-系统文件列表
+export function getSysFileTypeList(data) {
+  return request({
+    url: `/SysFileType/getSysFileTypeList`,
+    method: 'post',
+    data
+  })
+}
+// 文件记录-新增/编辑系统文件
+export function addOrUpdateSysFileType(data) {
+  return request({
+    url: `/SysFileType/addOrUpdateSysFileType`,
+    method: 'post',
+    data
+  })
+}
+// 文件记录-删除系统文件
+export function deleteSysFileType(id) {
+  return request({
+    url: `/SysFileType/deleteSysFileType/${id}`,
+    method: 'delete'
+  })
+}
+// 项目文档-获取项目菜单
+export function getTrialFileTypeData(data) {
+  return request({
+    url: `/TrialFileType/getTrialFileTypeData`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-修改项目菜单启用
+export function setAuthorizedView(data) {
+  return request({
+    url: `/TrialFileType/setAuthorizedView`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-新增/修改项目菜单
+export function addOrUpdateTrialFileType(data) {
+  return request({
+    url: `/TrialFileType/addOrUpdateTrialFileType`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除项目菜单
+export function deleteTrialFileType(id) {
+  return request({
+    url: `/TrialFileType/deleteTrialFileType/${id}`,
+    method: 'delete',
+  })
+}
+// 项目文档-报告/文档列表
+export function getTrialFinalRecordList(data) {
+  return request({
+    url: `/TrialFinalRecord/getTrialFinalRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-报告/文档授权
+export function authorizedTrialFinalRecord(data) {
+  return request({
+    url: `/TrialFinalRecord/authorizedTrialFinalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-报告/文档新增/修改
+export function addOrUpdateTrialFinalRecord(data) {
+  return request({
+    url: `/TrialFinalRecord/addOrUpdateTrialFinalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除报告/文档
+export function deleteTrialFinalRecord(id) {
+  return request({
+    url: `/TrialFinalRecord/deleteTrialFinalRecord/${id}`,
+    method: 'delete',
+  })
+}
+// 项目文档-一般文件记录列表
+export function getTrialNormalRecordList(data) {
+  return request({
+    url: `/TrialNormalRecord/getTrialNormalRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-一般文件记录授权
+export function authorizedTTrialNormalRecord(data) {
+  return request({
+    url: `/TrialNormalRecord/authorizedTTrialNormalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-一般文件记录批量新增
+export function batchAddTrialNormalRecord(data) {
+  return request({
+    url: `/TrialNormalRecord/batchAddTrialNormalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-一般文件记录新增/修改
+export function addOrUpdateTrialNormalRecord(data) {
+  return request({
+    url: `/TrialNormalRecord/addOrUpdateTrialNormalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除一般文件记录
+export function deleteTrialNormalRecord(id) {
+  return request({
+    url: `/TrialNormalRecord/deleteTrialNormalRecord/${id}`,
+    method: 'delete',
+  })
+}
+// 项目文档-批量删除一般文件记录
+export function deleteTrialNormalRecordList(data) {
+  return request({
+    url: `/TrialNormalRecord/deleteTrialNormalRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-培训记录列表
+export function getTrialTrianingRecordList(data) {
+  return request({
+    url: `/TrialTrianingRecord/getTrialTrianingRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-培训记录新增/修改
+export function addOrUpdateTrialTrianingRecord(data) {
+  return request({
+    url: `/TrialTrianingRecord/addOrUpdateTrialTrianingRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-培训记录批量新增/修改
+export function batchAddTrialTrianingRecord(data) {
+  return request({
+    url: `/TrialTrianingRecord/batchAddTrialTrianingRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除培训记录
+export function deleteTrialTrianingRecord(id) {
+  return request({
+    url: `/TrialTrianingRecord/deleteTrialTrianingRecord/${id}`,
+    method: 'delete',
+  })
+}
+// 项目文档-培训记录授权
+export function authorizedTrialTrianingRecord(data) {
+  return request({
+    url: `/TrialTrianingRecord/authorizedTrialTrianingRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-阅片人简历
+export function getTrialDoctorList(data) {
+  return request({
+    url: `/DoctorList/getTrialDoctorList`,
+    method: 'post',
+    data
+  })
+}
@@ -51,4 +51,10 @@ export function batchAddOrUpdateFrontInternationalization(params) {
    data: params
  })
 }
-
+// 获取当前版本
+export function getCurrentPublishInfo() {
+  return request({
+    url: `/PublishLog/getCurrentPublishInfo`,
+    method: 'get'
+  })
+}
@@ -160,3 +160,100 @@ 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
+  })
+}
+// 导出下载记录
+export function getTrialDownloadList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getTrialDownloadList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出接收记录
+export function getSCPImageUploadList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getSCPImageUploadList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出接收检查影像记录
+export function getPatientList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getPatientList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+export function getCommonEvaluationList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getCommonEvaluationList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+export function getCommonJudgeRatioList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getCommonJudgeRatioList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出国际化列表
+export function GetInternationalizationList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/GetInternationalizationList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出一致性分析
+export function GetAnalysisTaskList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/GetAnalysisTaskList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出邮件配置
+export function GetEmailNoticeConfigList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/GetEmailNoticeConfigList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
@@ -8,11 +8,11 @@ export function requestPackageAndAnonymizImage(params) {
    })
 }
 // 获取影像上传列表
-export function getSubjectImageUploadList(params) {
+export function getSubjectImageUploadList(data) {
    return request({
        url: '/DownloadAndUpload/getSubjectImageUploadList',
-        method: 'get',
-        params
+        method: 'post',
+        data
    })
 }
 // 预上传
@@ -39,4 +39,68 @@ export function deleteTaskStudy(params) {
        method: 'delete',
        params
    })
+}
+// 获取iqc下载文件信息
+export function getCRCUploadedStudyInfo(data) {
+    return request({
+        url: '/DownloadAndUpload/getCRCUploadedStudyInfo',
+        method: 'post',
+        data
+    })
+}
+// 获取ir阅片和任务列表
+export function getSubjectImageDownloadSelectList(data) {
+    return request({
+        url: '/DownloadAndUpload/getSubjectImageDownloadSelectList',
+        method: 'post',
+        data
+    })
+}
+// 获取ir阅片和任务下载文件信息
+export function getIRReadingDownloadStudyInfo(data) {
+    return request({
+        url: '/DownloadAndUpload/getIRReadingDownloadStudyInfo',
+        method: 'post',
+        data
+    })
+}
+// 获取ir阅片和任务非dicom上传列表
+export function getIRUploadTaskNoneDicomStudyList(data) {
+    return request({
+        url: '/DownloadAndUpload/getIRUploadTaskNoneDicomStudyList',
+        method: 'post',
+        data
+    })
+}
+// 校验上传影像
+export function verifyIRStudyAllowUpload(data) {
+    return request({
+        url: '/DownloadAndUpload/verifyIRStudyAllowUpload',
+        method: 'post',
+        data
+    })
+}
+// 影像下载成功确认
+export function downloadImageSuccess(params) {
+    return request({
+        url: '/DownloadAndUpload/downloadImageSuccess',
+        method: 'post',
+        params
+    })
+}
+// 影像下载记录列表
+export function getTrialDownloadList(data) {
+    return request({
+        url: '/DownloadAndUpload/getTrialDownloadList',
+        method: 'post',
+        data
+    })
+}
+// 修改后处理检查类型
+export function updateTaskStudyModality(params) {
+    return request({
+        url: '/DownloadAndUpload/updateTaskStudyModality',
+        method: 'put',
+        params
+    })
 }
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-
+import requestDownload from '@/utils/request-download'
 export function addBaseLineLesion(param) {
  return request({
    url: '/report/addBaseLineLesion',
@@ -133,9 +133,11 @@ export function AddAdjudicationReport(param) {
  })
 }

-export function getVisitStudyList(trialId, subjectVisitId, isReading) {
+export function getVisitStudyList(trialId, subjectVisitId, isReading, visitTaskId) {
+  let url =  `/SubjectVisit/getVisitStudyList/${trialId}/${subjectVisitId}/${isReading}`
+  url = visitTaskId ? `${url}?visitTaskId=${visitTaskId}` : url
  return request({
-    url: `/SubjectVisit/getVisitStudyList/${trialId}/${subjectVisitId}/${isReading}`,
+    url: url,
    method: 'get'
  })
 }
@@ -187,3 +189,99 @@ export function setSkipReadingCache(param) {
    data: param
  })
 }
+export function resetReadingTask(param) {
+  return request({
+    url: `/ReadingImageTask/resetReadingTask`,
+    method: 'post',
+    data: param
+  })
+}
+export function getTaskUploadedDicomStudyList(param) {
+  return request({
+    url: `/DownloadAndUpload/getTaskUploadedDicomStudyList`,
+    method: 'post',
+    data: param
+  })
+}
+export function getIVUSTemplate(param) {
+  return requestDownload({
+    url: '/IVUSCalculate/getIVUSTemplate',
+    method: 'post',
+    responseType: 'blob',
+    data: param
+  })
+}
+export function uploadIVUSTemplate(param) {
+  return request({
+    url: `/IVUSCalculate/uploadIVUSTemplate`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function getOCTFCTTemplate(param) {
+  return requestDownload({
+    url: '/OCTCalculate/getOCTFCTTemplate',
+    method: 'post',
+    responseType: 'blob',
+    data: param
+  })
+}
+
+export function uploadOCTFCTTemplate(param) {
+  return request({
+    url: `/OCTCalculate/uploadOCTFCTTemplate`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function getOCTLipidAngleTemplate(param) {
+  return requestDownload({
+    url: '/OCTCalculate/getOCTLipidAngleTemplate',
+    method: 'post',
+    responseType: 'blob',
+    data: param
+  })
+}
+export function uploadOCTLipidAngleTemplate(param) {
+  return request({
+    url: `/OCTCalculate/uploadOCTLipidAngleTemplate`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function saveTableQuestionMark(param, type) {
+  return request({
+    url: `/saveTableQuestionMark/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function deleteTableQuestionMark(param, type) {
+  return request({
+    url: `/deleteTableQuestionMark/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function submitTaskRowInfo(param, type) {
+  return request({
+    url: `/SubmitTaskRowInfo/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function deleteSingleTableQuestionMark(param, type) {
+  return request({
+    url: `/DeleteSingleTableQuestionMark/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+
@@ -12,7 +12,8 @@ export function verifySendCode(param) {
  return request({
    url: '/TrialSiteSurvey/verifySendCode',
    method: 'post',
-    data: param
+    data: param,
+    clearToken: true
  })
 }

@@ -138,10 +138,11 @@ export function addOrUpdateResearchPublication(param) {
  })
 }

-export function getTrialExperience(doctorId) {
+export function getTrialExperience(data) {
  return request({
-    url: `/trialExperience/getTrialExperience/${doctorId}`,
-    method: 'get'
+    url: `/trialExperience/getTrialExperience`,
+    method: 'post',
+    data
  })
 }

@@ -236,10 +237,14 @@ export function downloadByAttachmentId(doctorId, attachmentIds) {
  })
 }

-export function getDetail(doctorId) {
+export function getDetail(doctorId, TrialId) {
  return request({
-    url: `/doctor/getDetail/${doctorId}`,
-    method: 'get'
+    url: `/doctor/getDetail`,
+    method: 'post',
+    data: {
+      DoctorId: doctorId,
+      TrialId
+    }
  })
 }

@@ -290,3 +295,75 @@ export function verifyEmialGetDoctorInfo(param) {
    data: param
  })
 }
+// 新增或编辑基本信息
+export function addOrUpdateDoctorBasicInfoAndEmployment(param) {
+  return request({
+    url: `/Doctor/addOrUpdateDoctorBasicInfoAndEmployment`,
+    method: 'post',
+    data: param
+  })
+}
+// 新增或编辑概述
+export function addOrUpdateGneralSituation(param) {
+  return request({
+    url: `/Doctor/addOrUpdateGneralSituation`,
+    method: 'post',
+    data: param
+  })
+}
+// 新增或编辑支付方式
+export function updatePaymentMode(param) {
+  return request({
+    url: `/Doctor/updatePaymentMode`,
+    method: 'post',
+    data: param
+  })
+}
+// 新增或编辑Publication
+export function addOrUpdateResearchPublicationInfo(param) {
+  return request({
+    url: `/ResearchPublication/addOrUpdateResearchPublicationInfo`,
+    method: 'post',
+    data: param
+  })
+}
+// 发送简历采集邮件
+export function doctorSendEmail(param) {
+  return request({
+    url: `/Doctor/sendEmail`,
+    method: 'post',
+    data: param
+  })
+}
+// 获取医生是否休假
+export function getIsVacation(param) {
+  return request({
+    url: `/Vacation/getIsVacation`,
+    method: 'post',
+    data: param
+  })
+}
+// 获取概述
+export function getSummarizeInfo(param) {
+  return request({
+    url: `/Doctor/getSummarizeInfo`,
+    method: 'post',
+    data: param
+  })
+}
+// 删除概述
+export function deleteSummarizeInfo(param) {
+  return request({
+    url: `/Doctor/deleteSummarizeInfo`,
+    method: 'post',
+    data: param
+  })
+}
+// pm通过邮箱新建或查询简历
+export function useEmialGetDoctorInfo(param) {
+  return request({
+    url: `/TrialSiteSurvey/useEmialGetDoctorInfo`,
+    method: 'post',
+    data: param
+  })
+}
@@ -286,10 +286,11 @@ export function trialSiteUserSummaryListExport(param) {
  })
 }

-export function getVisitStageList(trialId) {
+export function getVisitStageList(data) {
  return request({
-    url: `/visitPlan/getVisitStageList/${trialId}`,
-    method: 'get'
+    url: `/visitPlan/getVisitStageList`,
+    method: 'post',
+    data
  })
 }

@@ -1079,6 +1080,19 @@ export function setSeriesStatus(trialId, subjectVisitId, studyId, seriesId, stat
    method: 'put'
  })
 }
+export function setNodicomStudyState(params) {
+  return request({
+    url: `/QCOperation/setNodicomStudyState`,
+    method: 'put',
+    params
+  })
+}
+export function setInstanceStatus(trialId, subjectVisitId, seriesId, instanceId, state) {
+  return request({
+    url: `/QCOperation/setInstanceState/${trialId}/${subjectVisitId}/${seriesId}/${instanceId}/${state}`,
+    method: 'put'
+  })
+}

 export function getVisitQCStudyAndSeriesList(subjectVisitId) {
  return request({
@@ -1364,9 +1378,9 @@ export function getForwardList(param) {
  })
 }

-export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false) {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading = false) {
  return request({
-    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}`,
+    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
    method: 'get'
  })
 }
@@ -3675,6 +3689,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 +3745,253 @@ 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
+  })
+}
+//  一致性分析临床数据设置任务为有效
+export function getVisitClinicalDataName(data) {
+  return request({
+    url: `/ReadingClinicalData/getVisitClinicalDataName`,
+    method: 'post',
+    data
+  })
+}
+//  修改外部人员权限配置
+export function configTrialSPMInfo(data) {
+  return request({
+    url: `/TrialConfig/configTrialSPMInfo`,
+    method: 'post',
+    data
+  })
+}
+
+//  项目添加角色修改权限
+export function updateTrialUserRole(data) {
+  return request({
+    url: `/TrialMaintenance/updateTrialUserRole`,
+    method: 'put',
+    data
+  })
+}
+
+// 获取报表配置
+export function getTrialQuestionExportResult(data) {
+  return request({
+    url: `/ReadingQuestion/getTrialQuestionExportResult`,
+    method: 'post',
+    data
+  })
+}
+// 修改报表配置
+export function setTrialQuestionExportResult(data) {
+  return request({
+    url: `/ReadingQuestion/SetTrialQuestionExportResult`,
+    method: 'post',
+    data
+  })
+}
+// 项目加入人员发送邮件
+export function trialUserSendJoinEmail(data) {
+  return request({
+    url: `/TrialMaintenance/trialUserSendJoinEmail`,
+    method: 'post',
+    data
+  })
+}
+
+// 获取非Dicom标记
+export function getNoneDicomMarkListOutDto(data) {
+  return request({
+    url: `/ReadingImageTask/getNoneDicomMarkListOutDto`,
+    method: 'post',
+    data
+  })
+}
+// 添加非Dicom标记
+export function addNoneDicomMark(data) {
+  return request({
+    url: `/ReadingImageTask/addNoneDicomMark`,
+    method: 'post',
+    data
+  })
+}
+// 删除非Dicom标记
+export function deleteTrialFileType(id) {
+  return request({
+    url: `/ReadingImageTask/deleteTrialFileType/${id}`,
+    method: 'post'
+  })
+}
+
@@ -4,7 +4,8 @@ export function login(data) {
  return request({
    url: '/user/login',
    method: 'post',
-    data
+    data,
+    ENCRYPT: true
  })
 }
 export function loginOut(params) {
@@ -178,10 +179,33 @@ export function verifyMFACode(params) {
 }

 // 发送MFA邮件
-export function sendMFAEmail(params) {
+export function sendMFAEmail(data) {
  return request({
    url: `/User/sendMFAEmail`,
    method: 'post',
-    params
+    data
+  })
+}
+// 获取公钥
+export function getPublicKey() {
+  return request({
+    url: `/user/getPublicKey`,
+    method: 'get',
+  })
+}
+// 登陆获取角色
+export function getUserLoginRoleList(data) {
+  return request({
+    url: `/User/getUserLoginRoleList`,
+    method: 'post',
+    data,
+  })
+}
+// 登陆角色id获取token
+export function loginSelectUserRole(params) {
+  return request({
+    url: `/User/loginSelectUserRole`,
+    method: 'get',
+    params,
  })
 }
@@ -4,6 +4,7 @@
      <el-col :span="24">
        <div class="box">
          <div class="box-body">
+            <slot name="title-container" />
            <div class="search">
              <slot name="search-container" />
            </div>
@@ -24,42 +25,42 @@ export default {
  props: {
    noTitle: {
      type: Boolean,
-      default: false
-    }
+      default: false,
+    },
  },
  computed: {
    contentClass() {
      return this.noTitle ? 'content-notitle' : 'content'
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss">
-  .box-body{
-     padding:  0px;
-     background-color: #fff;
-     .el-card__body {
-      padding: 0px;
-    }
-    .search{
-      display: flex;
-      padding: 5px;
+.box-body {
+  padding: 0px;
+  background-color: #fff;
+  .el-card__body {
+    padding: 0px;
+  }
+  .search {
+    display: flex;
+    padding: 5px;

-      .mr5{
-        margin-right:5px;
-      }
-      .el-form-item{
-        margin-bottom: 10px;
-      }
+    .mr5 {
+      margin-right: 5px;
    }
-    .page{
-      text-align: right;
-      padding-top: 3px;
-    }
-    .el-button.is-circle {
-      padding: 9px;
-      font-weight: bold;
-      font-size: 14px;
+    .el-form-item {
+      margin-bottom: 10px;
    }
  }
+  .page {
+    text-align: right;
+    padding-top: 3px;
+  }
+  .el-button.is-circle {
+    padding: 9px;
+    font-weight: bold;
+    font-size: 14px;
+  }
+}
 </style>
@@ -13,6 +13,7 @@
          v-model="searchData[item.prop]"
          :placeholder="item.placeholder"
          size="mini"
+          clearable
          :style="{ width: item.width }"
          :readonly="item.readonly"
        />
@@ -22,6 +23,7 @@
          v-model="searchData[item.prop]"
          :placeholder="item.placeholder"
          size="mini"
+          clearable
          :style="{ width: item.width }"
          @change="item.change && item.change(that, searchData[item.prop])"
        >
@@ -37,6 +39,7 @@
          v-model="searchData[item.prop]"
          :placeholder="item.placeholder"
          size="mini"
+          clearable
          :style="{ width: item.width }"
          @change="item.change && item.change(that, searchData[item.prop])"
        >
@@ -96,6 +99,7 @@
          value-format="yyyy-MM-dd"
          format="yyyy-MM-dd"
          :picker-options="item.pickerOption"
+          clearable
        />
        <!-- 时间 -->
        <el-time-select
@@ -104,6 +108,7 @@
          :placeholder="item.placeholder"
          type=""
          :style="{ width: item.width }"
+          clearable
        />
        <!-- 日期时间 -->
        <el-date-picker
@@ -114,15 +119,17 @@
          value-format="yyyy-MM-dd HH:mm:ss"
          :disabled="item.disable && item.disable(searchData[item.prop])"
          :style="{ width: item.width }"
+          clearable
        />
        <!-- 日期时间段 -->
        <el-date-picker
          v-if="item.type === 'Daterange'"
          v-model="searchData[item.prop]"
          type="datetimerange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
+          :default-time="['00:00:00', '23:59:59']"
+          :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 }"
@@ -139,17 +146,19 @@
        <!-- 具名slot -->
        <slot v-if="item.type === 'Custom'" :name="item.slot" />
      </el-form-item>
-      <el-form-item v-for="item in searchHandle" :key="item.label">
-        <slot v-if="item.slot" :name="item.slot" />
-        <el-button
-          v-else
-          :type="item.type"
-          :size="item.size || size"
-          :icon="item.icon || ''"
-          @click="handleClick(item.emitKey)"
-          >{{ item.label }}</el-button
-        >
-      </el-form-item>
+      <div style="display: inline-block;width: fit-content;">
+        <el-form-item v-for="item in searchHandle" :key="item.label">
+          <slot v-if="item.slot" :name="item.slot" />
+          <el-button
+            v-else
+            :type="item.type"
+            :size="item.size || size"
+            :icon="item.icon || ''"
+            @click="handleClick(item.emitKey)"
+            >{{ item.label }}</el-button
+          >
+        </el-form-item>
+      </div>
    </el-form>
  </div>
 </template>
@@ -167,11 +176,11 @@ export default {
    },
    labelWidth: {
      type: String,
-      default: "",
+      default: '',
    },
    size: {
      type: String,
-      default: "mini",
+      default: 'mini',
    },
    searchForm: {
      type: Array,
@@ -189,10 +198,10 @@ export default {
  methods: {
    handleClick(emitKey) {
      // emit事件
-      this.$emit(`${emitKey}`);
+      this.$emit(`${emitKey}`)
    },
  },
-};
+}
 </script>
 <style lang="scss">
 .base-search-form {
@@ -8,10 +8,11 @@
      :visible.sync="config.visible"
      :close-on-click-modal="false"
      :show-close="config.showClose"
+      :top="config.top"
      :width="config.width"
      :fullscreen="config.fullscreen"
    >
-      <div class="base-modal-body">
+      <div class="base-modal-body" :style="config.bodyStyle">
        <slot name="dialog-body" />
      </div>
      <div slot="footer" class="base-modal-footer">
@@ -22,24 +23,26 @@
 </template>
 <script>
 export default {
-  name: "BaseDialog",
+  name: 'BaseDialog',
  props: {
    config: {
      type: Object,
      default: () => {
        return {
          visible: false,
-          title: "",
+          title: '',
          closeOnClickModal: false,
          showClose: true,
          appendToBody: false,
-          width: "100px",
+          width: '100px',
          fullscreen: false,
-        };
+          top: '15vh',
+          bodyStyle: '',
+        }
      },
    },
  },
-};
+}
 </script>
 <style lang="scss">
 .base-model-wrapper {
@@ -2,7 +2,7 @@
  <el-row>
    <el-col class="m-b-10" :span="24">
      <el-table
-        v-adaptive="{bottomOffset}"
+        v-adaptive="{ bottomOffset }"
        :data="list"
        :height="tableHeight"
        v-bind="$attrs"
@@ -15,15 +15,45 @@
      >
        <template v-for="(column, index) in columns">
          <slot name="front-slot" />
+          <el-table-column v-if="column.type === 'tip'" :key="index" width="35">
+            <template slot-scope="scope">
+              <span v-if="column.slot">
+                <!-- 具名slot -->
+                <slot v-if="column.slot" :name="column.slot" :scope="scope" />
+              </span>
+            </template>
+          </el-table-column>
          <!-- 序号 -->
-          <el-table-column v-if="column.type === 'selection'" :key="index" type="selection" width="55" />
+          <el-table-column
+            v-else-if="column.type === 'selection'"
+            :key="index"
+            type="selection"
+            width="55"
+          />
          <!-- 复选框 -->
-          <el-table-column v-else-if="column.type === 'index'" :key="index" type="index" width="50" />
+          <el-table-column
+            v-else-if="column.type === 'index'"
+            :key="index"
+            type="index"
+            width="50"
+          />
          <!-- 具体内容 -->
-          <el-table-column v-else :key="index" align="left" :label="column.label" :width="column.width" :min-width="column.minWidth" :show-overflow-tooltip="column.showOverflowTooltip || false" :sortable="column.sortable || false" :prop="column.prop">
+          <el-table-column
+            v-else
+            :key="index"
+            align="left"
+            :label="column.label"
+            :width="column.width"
+            :min-width="column.minWidth"
+            :show-overflow-tooltip="column.showOverflowTooltip || false"
+            :sortable="column.sortable || false"
+            :prop="column.prop"
+            :fixed="column.fixed"
+          >
            <template slot-scope="scope">
              <!-- 仅仅显示文字 -->
-              <span v-if="!column.hidden"> <!-- 如果hidden为true的时候 那么当前格可以不显示，可以选择显示自定义的slot-->
+              <span v-if="!column.hidden">
+                <!-- 如果hidden为true的时候 那么当前格可以不显示，可以选择显示自定义的slot-->
                <!-- 操作按钮 -->
                <span v-if="column.type === 'operate'">
                  <!-- <a v-for="(operate, i) in column.operates" :key="i" href="javascript:void(0)" class="operate-button" @click="handleClick(operate, scope.row)">
@@ -31,7 +61,17 @@
                    &nbsp;&nbsp;
                  </a> -->
                  <span v-for="(operate, i) in column.operates" :key="i">
-                    <el-button :size="operate.size || 'mini'" :type="operate.type || 'primary'" style="margin-right:5px;" @click="handleClick(operate, scope.row)">{{ operate.name }}</el-button>
+                    <el-button
+                      :size="operate.size || 'mini'"
+                      :type="operate.type || 'primary'"
+                      v-if="
+                        (operate.show && scope.row[operate.show]) ||
+                        !operate.show
+                      "
+                      style="margin-right: 5px"
+                      @click="handleClick(operate, scope.row)"
+                      >{{ operate.name }}</el-button
+                    >
                  </span>
                </span>
                <span v-else>
@@ -52,7 +92,12 @@
    </el-col>
    <!-- 分页部分 -->
    <el-col v-if="!hiddenPage" :span="24" class="page">
-      <pagination :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="pagination" />
+      <pagination
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="pagination"
+      />
    </el-col>
  </el-row>
 </template>
@@ -96,45 +141,44 @@ export default {
    // 核心数据
    list: {
      type: Array,
-      default: () => []
+      default: () => [],
    },

    // columns
    columns: {
      type: Array,
      required: true,
-      default: () => []
+      default: () => [],
    },
    // is hidden page for table
    hiddenPage: {
      type: Boolean,
-      default: false
+      default: false,
    },
    bottomOffset: {
      type: Number,
-      default: 45
+      default: 45,
    },
    searchData: {
      type: Object,
-      default: () => {}
+      default: () => {},
    },
    total: {
      type: Number,
-      default: 0
+      default: 0,
    },
    highlightCurrentRow: {
      type: Boolean,
-      default: false
-    }
+      default: false,
+    },
  },
  data() {
-    return {
-    }
+    return {}
  },
  computed: {
    tableHeight() {
      return 100
-    }
+    },
  },
  methods: {
    // 处理点击事件
@@ -157,12 +201,12 @@ export default {
    },
    pagination() {
      this.$emit('getList')
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-.page{
+.page {
  padding-top: 3px;
  text-align: right;
 }
@@ -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-id="stack.imageIds[stack.currentImageIdIndex]" @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,8 @@ export default {
      mousePosition: { x: '', y: '', mo: '' },
      markers: { top: '', right: '', bottom: '', left: '' },
      orientationMarkers: [],
-      originalMarkers: []
+      originalMarkers: [],
+      dcmTag: { visible: false, title: this.$t('trials:dicom-tag:title') }
    }
  },

@@ -200,7 +212,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
@@ -215,7 +227,7 @@ export default {
        cornerstoneTools.stopClip(this.canvas)
        this.toolState.clipPlaying = false
        this.loading = true
-        
+
        cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
          .then(image => {
            this.loading = false
@@ -250,7 +262,13 @@ export default {
              apiTool
            )
            if (!toolAlreadyAddedToElement) {
-              cornerstoneTools.addToolForElement(element, apiTool)
+              if (toolName === 'RectangleRoi') {
+                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true, showStatsText: true}})
+              } else if (toolName === 'EllipticalRoi') {
+                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true}})
+              } else {
+                cornerstoneTools.addToolForElement(element, apiTool)
+              }
            }
          }
          // Setup button listener
@@ -310,7 +328,7 @@ export default {
      // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip'])
      cornerstoneTools.addToolState(this.canvas, 'stack', this.stack)
      // cornerstoneTools.stackPrefetch.enable(this.canvas)
-      cornerstone.updateImage(element, true)
+      cornerstone.updateImage(element, true) 
      // cornerstoneTools.stackPrefetch.setConfiguration({ maxImagesToPrefetch: Infinity,
      // preserveExistingPool: true })
      // cornerstoneTools.stackPrefetch.enable(this.canvas)
@@ -364,8 +382,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
@@ -441,7 +459,7 @@ export default {
      if (!markers) {
        return
      }
-      
+
      this.orientationMarkers = [oppositeColumn, row, column, oppositeRow]
      this.originalMarkers = [oppositeColumn, row, column, oppositeRow]
      this.setMarkers()
@@ -636,7 +654,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) {
@@ -648,7 +666,7 @@ export default {
    },

    toggleClipPlay() {
-      if(this.loading) return
+      if (this.loading) return
      if (this.toolState.clipPlaying) {
        cornerstoneTools.stopClip(this.canvas)
        this.toolState.clipPlaying = false
@@ -668,7 +686,7 @@ export default {
    resetWwwc() {
      this.toolState.viewportInvert = false
      var viewport = cornerstone.getViewport(this.canvas)
-      viewport.invert = false
+      // viewport.invert = false
      var image = cornerstone.getImage(this.canvas)
      viewport.voi.windowWidth = image.windowWidth
      viewport.voi.windowCenter = image.windowCenter
@@ -707,7 +725,7 @@ export default {
        this.orientationMarkers = [...this.originalMarkers]
        this.setMarkers()
      }
-      
+
      var viewport = cornerstone.getViewport(this.canvas)
      viewport.hflip = false
      viewport.vflip = false
@@ -747,6 +765,9 @@ export default {
      var uid = cornerstone.getImage(this.canvas).data.string('x00080018')
      cornerstoneTools.SaveAs(this.canvas, `${uid}.png`)
    },
+    showTags() {
+      this.dcmTag.visible = true
+    },
    fitToWindow() {
      if (this.stack.seriesNumber) {
        cornerstone.fitToWindow(this.canvas)
@@ -0,0 +1,288 @@
+<template>
+  <div class="dcm-tag">
+    <el-input
+      v-model="search"
+      size="mini"
+      :placeholder="$t('trials:dicom-tag:keywords')"
+      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 * as cornerstone from 'cornerstone-core'
+import dicomParser from 'dicom-parser'
+export default {
+  name: 'DicomTags',
+  props: {
+    imageId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      list: [],
+      idx: 0,
+      search: ''
+    }
+  },
+  async mounted() {
+    const image = await cornerstone.loadAndCacheImage(this.imageId)
+    var dataSet = dicomParser.parseDicom(image.data.byteArray)
+    var output = []
+    this.dumpDataSet(dataSet, output)
+    this.list = output
+  },
+  methods: {
+    filterList(list) {
+      if (list.length === 0) return []
+      if (!this.search) {
+        return list
+      } else {
+        const search = isNaN(parseFloat(this.search)) ? this.search.toLowerCase() : String(this.search)
+        const arr = list.filter(data => {
+          if (data.tagCode && data.tagCode.toLowerCase().includes(search)) {
+            return data
+          } else if (data.tagName && data.tagName.toLowerCase().includes(search)) {
+            return data
+          } else if (data.value) {
+            let v = ''
+            if (!isNaN(parseFloat(data.value))) {
+              v = String(data.value)
+            } else {
+              v = data.value.toLowerCase()
+            }
+            if (v.includes(search)) {
+              return data
+            }
+          }
+        })
+        return arr
+      }
+    },
+    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()}`
+          if (!tag) {
+            const group = element.tag.substring(1, 5)
+            const el = element.tag.substring(5, 9)
+            elementObject.tagCode = ('(' + group + ',' + el + ')').toUpperCase()
+          } else {
+            elementObject.tagCode = tag ? tag.tag : ''
+            elementObject.tagName = tag ? tag.name : ''
+          }
+
+          elementObject.tagLength = element.length
+          elementObject.value = ''
+          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
+            } else {
+              if (tag !== undefined) {
+                vr = tag.vr
+              }
+            }
+            elementObject.vr = 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 {
+                    elementObject.value = dataSet.string(propertyName)
+                    // 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
+        }
+        console.log(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>
@@ -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)
          }
        })
      })
@@ -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;
@@ -21,7 +21,7 @@
      label-width="100px"
    >
      <!-- 邮箱 -->
-      <p class="tip">
+      <p class="tip_mfa">
        <i class="el-icon-warning" style="color: #409eff"></i>
        <span>{{ tip }}</span>
      </p>
@@ -83,7 +83,7 @@ export default {
      second: 60,
      form: {
        Code: null,
-        UserId: null,
+        IdentityUserId: null,
        EMail: null,
        username: null,
      },
@@ -115,7 +115,7 @@ export default {
  methods: {
    open(data) {
      let { UserId, status, username, EMail } = data;
-      this.form.UserId = UserId;
+      this.form.IdentityUserId = UserId;
      this.status = status ? status : "login";
      this.form.username = username;
      this.form.EMail = EMail;
@@ -134,10 +134,10 @@ export default {
        let res = await verifyMFACode(this.form);
        this.loading = false;
        if (res.IsSuccess) {
-          if (this.status === "login") {
-            this.$message.success(this.$t("mfa:message:verifySuccess"));
-          }
-          this.$emit("success", this.form.UserId);
+          // if (this.status === "login") {
+          //   this.$message.success(this.$t("mfa:message:verifySuccess"));
+          // }
+          this.$emit("success", this.form.IdentityUserId);
          this.cancel();
        }
      } catch (err) {
@@ -154,7 +154,7 @@ export default {
          this.timer = null;
        }
        let data = {
-          UserId: this.form.UserId,
+          IdentityUserId: this.form.IdentityUserId,
        };
        if (this.status === "lock") {
          data.MfaType = 1;
@@ -167,6 +167,7 @@ export default {
          this.timer = setInterval(() => {
            this.second--;
            if (this.second <= 0) {
+              this.flag = false;
              clearInterval(this.timer);
              this.timer = null;
            }
@@ -188,7 +189,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.tip {
+.tip_mfa {
  width: 86%;
  margin: auto;
  margin-bottom: 20px;
@@ -201,7 +202,7 @@ export default {
    margin-right: 5px;
  }
 }
-::v-deep .el-dialog__header{
+::v-deep .el-dialog__header {
  font-weight: bold;
 }
 </style>
@@ -9,7 +9,7 @@
    />
    <!-- <embed v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" style="width: 100%; height: 100%"> -->
    <!-- <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" width="100%" height="100%" frameborder="0" /> -->
-    <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${filePath}?userName=${currentUser}`" width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
+    <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${filePath}?userName=${currentUser}&COMPANY=${COMPANY}`" width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
    <!--    <pdf-->
    <!--      v-else-if="fileType.indexOf('pdf') !== -1"-->
    <!--      :src="`/static/pdfjs/web/viewer.html?file=${filePath}`">-->
@@ -40,7 +40,8 @@ export default {
  },
  data() {
    return {
-      currentUser: zzSessionStorage.getItem('userName')
+      currentUser: zzSessionStorage.getItem('userName'),
+      COMPANY:process.env.VUE_APP_COMPANY_NAME
    }
  },
  mounted() {
@@ -124,7 +124,7 @@ export default {
    inputChange(v) {
      this.resultFilter = this.options.filter((o) => {
        var reg = new RegExp(v, 'ig')
-        return reg.test(o.ResearchProgramNo) || reg.test(o.Indication)
+        return reg.test(o.ResearchProgramNo) || reg.test(o.Indication) || reg.test(o.ExperimentName)
      })
    },
    getTrialList() {
@@ -3,15 +3,16 @@
  <div class="trialsTab">
    <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"
-          />
+        <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab" style="background-color: #f5f7fa;">
+          <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>
@@ -21,11 +22,14 @@
        <i class="iconfont" style="font-size: 30px;color:#ccc">&#xe680;</i>
      </div>
      <!-- 返回项目列表 -->
-      <div class="my_icon_box" :title="$t('trials:trials:title:backTrialList')" @click="goBack">
+      <el-button type="primary" size="small" @click="goBack">
        <i class="iconfont">&#xe670;</i>
-        <!-- 返回 -->
        <span>{{ $t('trials:trials:title:back') }}</span>
-      </div>
+      </el-button>
+      <!-- <div class="my_icon_box" :title="$t('trials:trials:title:backTrialList')" @click="goBack">
+        <i class="iconfont">&#xe670;</i>
+        <span>{{ $t('trials:trials:title:back') }}</span>
+      </div> -->
    </div>
  </div>
 </template>
@@ -126,6 +130,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,9 +143,13 @@ 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() {
+      zzSessionStorage.removeItem('lastWorkbench')
      this.$router.push({ path: '/trials/trials-list' })
    },
    selectTrials(v) {
@@ -213,6 +225,9 @@ export default {
    .el-tabs__header{
      margin-bottom: 3px;
    }
+    .el-tabs__item.is-active{
+      font-weight: bold;
+    }
    position: relative;
    .el-input--medium .el-input__inner{
      height: 44px;line-height: 44px;width: 280px;
@@ -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>
@@ -99,7 +99,7 @@ export default {
        this.btnDisabled = false
        if (res.IsSuccess) {
          this.fileList[0].id = res.Result[0].Id
-          this.$message.success('Uploaded successfully')
+          this.$message.success(this.$t('trials:uploadDicomList:table:Uploaded'))
          this.$emit('getFileList', res.Result[0].Id, res.Result[0].Path)
        }
      })
@@ -113,13 +113,13 @@ export default {
      if (isValidFile) {
        this.fileList = []
      } else {
-        this.$alert('must be in pdf format')
+        this.$alert(this.$t('upload:rule:MUSTPDF'))
        return false
      }
    },
    beforeRemove(file, fileList) {
      if (file && file.status === 'success') {
-        return this.$confirm(`Sure to remove ${file.name}?`)
+        return this.$confirm(this.$t('system:reviewer:confirm:delete'))
      }
    },
    handleRemoveFile(file, fileList) {
@@ -146,7 +146,7 @@ export default {
      }
    },
    handleExceed(files, fileList) {
-      this.$message.warning(`Upload is currently limited to 1 file`)
+      this.$message.warning(this.$t('upload:rule:maxFile1'))
    },
    fileValid(fileName, typeArr) {
      var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
@@ -9,37 +9,51 @@
      :file-list="fileList"
      :accept="accept"
    >
-      <el-button size="small" type="primary" :disabled="isDisabled">{{ $t('common:button:upload') }}</el-button>
+      <el-button size="small" type="primary" :disabled="isDisabled">{{
+        $t('common:button:upload')
+      }}</el-button>
    </el-upload>
  </div>
 </template>
 <script>
-import { getAttachmentByType, uploadFile, saveAttachments, deleteAttachment } from '@/api/attachment'
+import {
+  getAttachmentByType,
+  uploadFile,
+  saveAttachments,
+  deleteAttachment,
+} from '@/api/attachment'
 export default {
  name: 'UploadFiles',
  props: {
    type: {
      type: String,
-      required: true
+      required: true,
    },
    doctorId: {
      type: String,
-      required: true
+      required: true,
    },
    accept: {
      type: String,
-      required: true
-    }
+      required: true,
+    },
  },
  data() {
    return {
      fileList: [],
      repeat: false,
-      isDisabled: false
+      isDisabled: false,
    }
  },
+  watch: {
+    doctorId() {
+      if (this.doctorId) {
+        this.initFileList()
+      }
+    },
+  },
  mounted() {
-    if(!this.doctorId) return
+    if (!this.doctorId) return
    this.initFileList()
  },
  methods: {
@@ -49,24 +63,28 @@ export default {
        lock: true,
        text: 'Loading',
        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.07)'
+        background: 'rgba(0, 0, 0, 0.07)',
      })
-      getAttachmentByType(this.doctorId, this.type).then(res => {
-        loading.close()
-        if (res.IsSuccess) {
-          if (res.Result.length > 0) {
-            this.fileList = this.formatterFileList(res.Result)
-            this.$emit('getFileList', this.fileList)
-          } else {
-            this.fileList = []
+      getAttachmentByType(this.doctorId, this.type)
+        .then((res) => {
+          loading.close()
+          if (res.IsSuccess) {
+            if (res.Result.length > 0) {
+              this.fileList = this.formatterFileList(res.Result)
+              this.$emit('getFileList', this.fileList)
+            } else {
+              this.fileList = []
+            }
          }
-        }
-      }).catch(() => { loading.close() })
+        })
+        .catch(() => {
+          loading.close()
+        })
    },

    formatterFileList(list) {
      var arr = []
-      list.forEach(item => {
+      list.forEach((item) => {
        const data = {
          DoctorId: item.DoctorId,
          Type: item.Type,
@@ -74,7 +92,7 @@ export default {
          FullPath: item.FullPath,
          FileName: item.FileName,
          CreateTime: item.CreateTime,
-          Id: item.Id
+          Id: item.Id,
        }
        arr.push(data)
      })
@@ -85,32 +103,42 @@ export default {
      // 检测文件后缀名
      if (this.checkFileSuffix(param.file.name)) {
        // 检测是否有重名文件
-        const isRepeat = this.fileList.some(item => item.FileName === param.file.name)
+        const isRepeat = this.fileList.some(
+          (item) => item.FileName === param.file.name
+        )
        if (isRepeat) {
-          this.$confirm('Override the existing resume?', {
-            type: 'warning',
-            distinguishCancelAndClose: true,
-            confirmButtonText: 'OK',
-            cancelButtonText: 'Cancel'
-          })
+          this.$confirm(
+            this.$t('curriculumVitae:resume:message:existingResume'),
+            {
+              type: 'warning',
+              distinguishCancelAndClose: true,
+            }
+          )
            .then(() => {
              // 重名覆盖
              this.repeat = true
              this.uploadFile(param.file)
            })
-            .catch(action => {})
+            .catch((action) => {})
        } else {
          this.uploadFile(param.file)
        }
      } else {
-        this.$alert(`Must be in ${this.accept} format`)
+        let str = this.accept.join(', ')
+        let message = this.$t(
+          'trials:readingUnit:qsList:message:imageFormat'
+        ).replace('xxx', str)
+        this.$alert(message)
      }
    },
    async uploadFile(file) {
      this.isDisabled = true
      var fileName = file.name
      file = await this.fileToBlob(file)
-      let res = await this.OSSclient.put(`/SystemData/reviewer/Agreements/${this.doctorId}/${fileName}`, file)
+      let res = await this.OSSclient.put(
+        `/SystemData/reviewer/Agreements/${this.doctorId}/${fileName}`,
+        file
+      )
      if (this.repeat) {
        const index = this.fileList.findIndex((item, index) => {
          return item.FileName === fileName
@@ -124,52 +152,60 @@ export default {
          Type: this.type,
          Path: this.$getObjectName(res.url),
          FullPath: this.$getObjectName(res.url),
-          FileName: fileName
+          FileName: fileName,
        }
        this.fileList.push(fileData)
      }
      this.saveUploadFiles()
    },
    saveUploadFiles() {
-      saveAttachments(this.fileList).then(res => {
-        this.fileList = this.formatterFileList(res.Result)
-        this.isDisabled = false
-        this.$message.success('Uploaded successfully')
-        this.$emit('getFileList', this.fileList)
-      }).catch(() => {
-        this.isDisabled = false
-      })
+      saveAttachments(this.fileList)
+        .then((res) => {
+          this.fileList = this.formatterFileList(res.Result)
+          this.isDisabled = false
+          this.$message.success(
+            this.$t('trials:uploadDicomList:table:Uploaded')
+          )
+          this.$emit('getFileList', this.fileList)
+        })
+        .catch(() => {
+          this.isDisabled = false
+        })
    },
    handleDeleteFile(file) {
-      this.$confirm('Sure to remove?', {
+      this.$confirm(this.$t('system:reviewer:confirm:delete'), {
        type: 'warning',
        distinguishCancelAndClose: true,
-
-      }).then(() => {
-        deleteAttachment(file.Id, file.Path)
-          .then(res => {
+      })
+        .then(() => {
+          deleteAttachment(file.Id, file.Path).then((res) => {
            if (res.IsSuccess) {
-              this.fileList.splice(this.fileList.findIndex(item => item.Id === file.Id), 1)
+              this.fileList.splice(
+                this.fileList.findIndex((item) => item.Id === file.Id),
+                1
+              )
              this.$emit('getFileList', this.fileList)
              this.$message({
                message: this.$t('common:message:deletedSuccessfully'),
-                type: 'success'
+                type: 'success',
              })
            }
          })
-      })
-        .catch(action => {})
+        })
+        .catch((action) => {})
    },
    checkFileSuffix(fileName) {
      var index = fileName.lastIndexOf('.')
      var suffix = fileName.substring(index + 1, fileName.length)
-      return this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === 1
-    }
-  }
+      return (
+        this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === 1
+      )
+    },
+  },
 }
 </script>
 <style>
-.uploadFiles-container{
+.uploadFiles-container {
  margin: 0 5px;
 }
 .uploadFiles-container .el-upload--text {
@@ -180,10 +180,10 @@
          <template v-if="question.Unit" slot="append">{{ question.Unit }}</template>
        </el-input>
        <span v-if="question.CustomCalculateMark === 11 && question.ClinicalQuestionType === 'number'" v-show="questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] <= questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId]" style="margin-left: 10px">
-          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}-{{ questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId] }}
+          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId] }}
        </span>
        <span v-if="question.CustomCalculateMark === 10 && question.ClinicalQuestionType === 'number' && questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId]" style="margin-left: 10px">
-          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}-{{ questionForm.CreateTime ? questionForm.CreateTime : parseTime(new Date(), '{y}-{m}-{d}') }}
+          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm.CreateTime ? questionForm.CreateTime : parseTime(new Date(), '{y}-{m}-{d}') }}
        </span>
        <!-- 生日不能大于截止日期 -->
        <span v-if="question.CustomCalculateMark === 11 && question.ClinicalQuestionType === 'number'" v-show="questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] > questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId]" style="margin-left: 10px;font-size: 12px;color:#f66">
@@ -193,7 +193,7 @@
    </el-col>
    <!-- eslint-disable vue/no-use-v-if-with-v-for -->
    <!-- eslint-disable vue/valid-v-for -->
-    <el-col v-for="(item) in question.Childrens" v-if="question.Childrens && question.Childrens.length>0 && question.ClinicalQuestionType !== 'table'" :span="['group', 'summary', 'table'].includes(item.ClinicalQuestionType) || item.Childrens.length > 0 ? 24 : 12">
+    <el-col v-for="(item) in question.Childrens" :key="item.Id" v-if="question.Childrens && question.Childrens.length>0 && question.ClinicalQuestionType !== 'table'" :span="['group', 'summary', 'table'].includes(item.ClinicalQuestionType) || item.Childrens.length > 0 ? 24 : 12">
      <QuestionFormItem
        :key="item.Id"
        :question="item"
@@ -593,7 +593,7 @@ export default {
 <style lang="scss" scoped>
 .my_dialog{
  .criterion-form-item{
-    >>>.el-form-item__content{
+    ::v-deep .el-form-item__content{
      width: auto;
    }
  }
@@ -614,7 +614,7 @@ export default {
    margin-bottom: 0px;
  }
  .disabled{
-    >>>.el-upload--picture-card {
+    ::v-deep .el-upload--picture-card {
      display: none;
    }
  }
@@ -222,7 +222,7 @@ export default {
 <style lang="scss" scoped>
 .my_dialog{
  .criterion-form-item{
-    >>>.el-form-item__content{
+    ::v-deep .el-form-item__content{
      width: auto;
    }
  }
@@ -233,7 +233,7 @@ export default {
    flex-direction: row;
    align-items: flex-start;
  }
-  >>>.el-form-item__content{
+  ::v-deep .el-form-item__content{
    width: 500px;
  }
  .el-input{
@@ -243,7 +243,7 @@ export default {
    margin-bottom: 0px;
  }
  .disabled{
-    >>>.el-upload--picture-card {
+    ::v-deep .el-upload--picture-card {
      display: none;
    }
  }
@@ -27,7 +27,7 @@
          size="small"
          type="primary"
          @click="close"
-          v-show="$route.path !== '/trials/trials-panel/visit/crc-upload'"
+          v-show="$route.path !== '/trials/trials-panel/visit/crc-upload'&&$route.path!=='/trials/trials-panel/visit/crc-question'"
        >
          {{ $t('common:button:cancel') }}
        </el-button>
@@ -0,0 +1,511 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    :fullscreen="true"
+    :close-on-click-modal="false"
+    :before-close="beforeClose"
+    :append-to-body="true"
+    v-loading="btnLoading"
+    class="downloadDicomAndNonedicom"
+  >
+    <span slot="title">{{ title }}</span>
+    <div class="top">
+      <span>{{ $t('download:top:title') }}</span>
+      <div class="btnBox">
+        <el-button
+          type="primary"
+          size="mini"
+          v-if="hasDicom"
+          @click.stop="getIRReadingDownloadStudyInfo('dicom')"
+        >
+          {{ $t('download:button:downloadDicom') }}
+        </el-button>
+        <el-button
+          type="primary"
+          size="mini"
+          v-if="hasNonedicom"
+          @click.stop="getIRReadingDownloadStudyInfo('noneDicom')"
+        >
+          {{ $t('download:button:downloadNonedicom') }}
+        </el-button>
+        <el-button
+          type="primary"
+          size="mini"
+          v-if="hasDicom || hasNonedicom"
+          @click.stop="getIRReadingDownloadStudyInfo('all')"
+        >
+          {{ $t('download:button:downloadAll') }}
+        </el-button>
+      </div>
+    </div>
+    <div class="tip">
+      <i class="el-icon-warning-outline"></i>
+      <div v-html="$t('download:tip:message')"></div>
+    </div>
+    <!--上传列表@selection-change="handleSelectionChange"-->
+    <el-table
+      ref="dicomFilesTable"
+      v-adaptive="{ bottomOffset: 85 }"
+      height="100"
+      :data="list"
+      :loading="loading"
+      class="dicomFiles-table"
+      @sort-change="handleSortByColumn"
+      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }"
+    >
+      <!-- <el-table-column
+        type="selection"
+        width="55"
+        :selectable="handleSelectable"
+      /> -->
+      <el-table-column type="index" width="40" />
+      <!--受试者-->
+      <el-table-column
+        :label="$t('download:table:subjectCode')"
+        min-width="130"
+        prop="SubjectCode"
+        show-overflow-tooltip
+      />
+      <!--任务名称-->
+      <el-table-column
+        :label="$t('download:table:taskName')"
+        min-width="130"
+        show-overflow-tooltip
+        prop="TaskBlindName"
+        sortable="custom"
+      />
+      <!--检查类型-->
+      <el-table-column
+        :label="$t('download:table:studyType')"
+        min-width="130"
+        show-overflow-tooltip
+        prop="IsDicom"
+        sortable="custom"
+      >
+        <template slot-scope="scope">
+          <span>{{ $fd('IsDicom', scope.row.IsDicom) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('download:table:orginalStudyListNum')"
+        min-width="150"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-if="
+              (scope.row.IsDicom &&
+                scope.row.DicomStudyList &&
+                scope.row.DicomStudyList.length >= 1) ||
+              (!scope.row.IsDicom &&
+                scope.row.NoneDicomStudyList &&
+                scope.row.NoneDicomStudyList.length >= 1)
+            "
+            type="text"
+            @click="handleOpenDialog(scope.row)"
+          >
+            <span>{{
+              scope.row.IsDicom
+                ? scope.row.DicomStudyList.length
+                : scope.row.NoneDicomStudyList.length
+            }}</span>
+          </el-button>
+          <span v-else>0</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('common:action:action')"
+        fixed="right"
+        width="150"
+      >
+        <template slot-scope="scope">
+          <!--预览--->
+          <el-button
+            circle
+            icon="el-icon-view"
+            :title="$t('download:button:preview')"
+            @click.stop="preview(scope.row)"
+          />
+          <!--下载--->
+          <el-button
+            circle
+            icon="el-icon-download"
+            :title="$t('download:button:download')"
+            @click.stop="getIRReadingDownloadStudyInfo('one', scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <study-view
+      v-if="model_cfg.visible"
+      :model_cfg="model_cfg"
+      :modelList="modelList"
+      :bodyPart="bodyPart"
+      :IsDicom="IsDicom"
+      :visitTaskId="modelTaskId"
+    />
+  </el-dialog>
+</template>
+<script>
+import {
+  getSubjectImageDownloadSelectList,
+  getIRReadingDownloadStudyInfo,
+  downloadImageSuccess,
+} from '@/api/load.js'
+import studyView from '@/components/uploadDicomAndNonedicom/study-view.vue'
+import store from '@/store'
+import { downLoadFile } from '@/utils/stream.js'
+import { getToken } from '@/utils/auth'
+let defaultSearchData = () => {
+  return {
+    SubjectId: null,
+    TrialReadingCriterionId: null,
+    SubjectCode: null,
+    Asc: false,
+    SortField: 'TaskBlindName',
+  }
+}
+export default {
+  name: 'downloadDicomAndNonedicom',
+  components: {
+    'study-view': studyView,
+  },
+  props: {
+    visible: {
+      required: true,
+      type: Boolean,
+      default: false,
+    },
+    SubjectId: {
+      type: String,
+      default: '',
+    },
+    TaskId: {
+      type: String,
+      default: '',
+    },
+    SubjectCode: {
+      type: String,
+      default: '',
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
+  },
+  data() {
+    return {
+      title: null,
+      loading: false,
+      list: [],
+      searchData: defaultSearchData(),
+      btnLoading: false,
+      hasDicom: false,
+      hasNonedicom: false,
+      // 检查数弹框
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '1000px',
+        title: '',
+        appendToBody: true,
+      },
+      modelList: [],
+      IsDicom: true,
+      open: null,
+      downloadId: null,
+      IsReadingTaskViewInOrder: 0, // 阅片规则
+      bodyPart: [],
+      modelTaskId: null,
+    }
+  },
+  async mounted() {
+    this.getList()
+    this.bodyPart = await this.$getBodyPart(this.$route.query.trialId)
+    this.title = `Download Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
+  },
+  beforeDestroy() {
+    store.dispatch('trials/setUnLock', false)
+  },
+  methods: {
+    beforeClose() {
+      this.$emit('update:visible', false)
+    },
+    // 获取列表
+    async getList() {
+      try {
+        this.searchData.SubjectId = this.SubjectId
+        this.searchData.TrialReadingCriterionId =
+          this.Criterion.TrialReadingCriterionId
+        this.searchData.SubjectCode = this.SubjectCode
+        if (this.TaskId) {
+          this.searchData.VisitTaskId = this.TaskId
+        }
+        this.loading = true
+        let res = await getSubjectImageDownloadSelectList(this.searchData)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list = res.Result
+          this.hasDicom = this.list.some((item) => item.IsDicom)
+          this.hasNonedicom = this.list.some((item) => !item.IsDicom)
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    // 获取下载文件信息
+    async getIRReadingDownloadStudyInfo(type, row) {
+      try {
+        let data = {
+          SubjectId: this.SubjectId || this.list[0].SubjectId,
+          TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId,
+          SubjectCode: this.SubjectCode || this.list[0].SubjectCode,
+          SubjectVisitTaskList: [],
+          DicomStudyIdList: [],
+          NoneDicomStudyIdList: [],
+        }
+        if (type === 'dicom' || type === 'all') {
+          this.list.forEach((item) => {
+            if (
+              item.IsDicom &&
+              item.DicomStudyList &&
+              item.DicomStudyList.length > 0
+            ) {
+              data.SubjectVisitTaskList.push({
+                SubjectvisitId: item.SourceSubjectVisitId,
+                TaskId: item.VisitTaskId,
+              })
+              let arr = item.DicomStudyList.map((d) => d.Id)
+              data.DicomStudyIdList = [...data.DicomStudyIdList, ...arr]
+            }
+          })
+        }
+        if (type === 'noneDicom' || type === 'all') {
+          this.list.forEach((item) => {
+            if (
+              !item.IsDicom &&
+              item.NoneDicomStudyList &&
+              item.NoneDicomStudyList.length > 0
+            ) {
+              data.SubjectVisitTaskList.push({
+                SubjectvisitId: item.SourceSubjectVisitId,
+                TaskId: item.VisitTaskId,
+              })
+              let arr = item.NoneDicomStudyList.map((d) => d.Id)
+              data.NoneDicomStudyIdList = [...data.NoneDicomStudyIdList, ...arr]
+            }
+          })
+        }
+        if (type === 'one') {
+          if (
+            row.IsDicom &&
+            row.DicomStudyList &&
+            row.DicomStudyList.length > 0
+          ) {
+            data.SubjectVisitTaskList.push({
+              SubjectvisitId: row.SourceSubjectVisitId,
+              TaskId: row.VisitTaskId,
+            })
+            let arr = row.DicomStudyList.map((d) => d.Id)
+            data.DicomStudyIdList = [...data.DicomStudyIdList, ...arr]
+          }
+          if (
+            !row.IsDicom &&
+            row.NoneDicomStudyList &&
+            row.NoneDicomStudyList.length > 0
+          ) {
+            data.SubjectVisitTaskList.push({
+              SubjectvisitId: row.SourceSubjectVisitId,
+              TaskId: row.VisitTaskId,
+            })
+            let arr = row.NoneDicomStudyList.map((d) => d.Id)
+            data.NoneDicomStudyIdList = [...data.NoneDicomStudyIdList, ...arr]
+          }
+        }
+        this.btnLoading = true
+        let res = await getIRReadingDownloadStudyInfo(data)
+        this.btnLoading = false
+        if (res.IsSuccess) {
+          this.downloadId = res.OtherInfo.PreDownloadId
+          this.IsReadingTaskViewInOrder = res.OtherInfo.IsReadingTaskViewInOrder
+          this.downloadImage(res.Result)
+        }
+      } catch (err) {
+        this.btnLoading = false
+        console.log(err)
+      }
+    },
+    // 打包下载
+    async downloadImage(data) {
+      try {
+        let { files, name, fileType } = this.formatDownloadFile(data)
+        let res = await downLoadFile(files, name, 'zip')
+        if (res && this.downloadId) {
+          this.downloadImageSuccess()
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    // 格式化下载文件路径
+    formatDownloadFile(list) {
+      let files = [],
+        name = `${list[0].SubjectCode}_${new Date().getTime()}.zip`
+      if (this.IsReadingTaskViewInOrder === 1) {
+        name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
+      }
+      if (this.IsReadingTaskViewInOrder === 0) {
+        name = `${list[0].TaskBlindName}.zip`
+      }
+      list.forEach((data) => {
+        if (data.StudyList && data.StudyList.length > 0) {
+          let StudyList = data.StudyList
+          StudyList.forEach((study) => {
+            if (study.SeriesList.length > 0) {
+              study.SeriesList.forEach((series) => {
+                if (series.InstancePathList.length > 0) {
+                  series.InstancePathList.forEach((instance) => {
+                    let fileName = instance.Path.split('/').pop()
+                    let obj = {
+                      name: `${data.SubjectCode}/${
+                        data.TaskBlindName
+                      }/${this.$fd('IsDicom', true)}/${
+                        study.StudyCode
+                      }/${fileName}`,
+                      url: this.OSSclientConfig.basePath + instance.Path,
+                    }
+                    if (this.IsReadingTaskViewInOrder === 0) {
+                      obj = {
+                        name: `${data.TaskBlindName}/${this.$fd(
+                          'IsDicom',
+                          true
+                        )}/${fileName}`,
+                        url: this.OSSclientConfig.basePath + instance.Path,
+                      }
+                    }
+                    files.push(obj)
+                  })
+                }
+              })
+            }
+          })
+        }
+        if (data.NoneDicomStudyList && data.NoneDicomStudyList.length > 0) {
+          let NoneDicomStudyList = data.NoneDicomStudyList
+          // 多文件
+          NoneDicomStudyList.forEach((study) => {
+            if (study.FileList.length > 0) {
+              study.FileList.forEach((item) => {
+                let obj = {
+                  name: `${data.SubjectCode}/${data.TaskBlindName}/${this.$fd(
+                    'IsDicom',
+                    false
+                  )}/${study.StudyCode}/${item.FileName}`,
+                  url: this.OSSclientConfig.basePath + item.Path,
+                }
+                if (this.IsReadingTaskViewInOrder === 0) {
+                  obj = {
+                    name: `${data.TaskBlindName}/${this.$fd(
+                      'IsDicom',
+                      false
+                    )}/${item.FileName}`,
+                    url: this.OSSclientConfig.basePath + item.Path,
+                  }
+                }
+                files.push(obj)
+              })
+            }
+          })
+        }
+      })
+      return { files, name }
+    },
+    // 影像下载成功确认
+    async downloadImageSuccess() {
+      try {
+        let params = {
+          TrialImageDownloadId: this.downloadId,
+        }
+        await downloadImageSuccess(params)
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    handleOpenDialog(item) {
+      this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
+      if (item.IsDicom) {
+        this.modelList = item.DicomStudyList
+      } else {
+        this.modelList = item.NoneDicomStudyList
+        this.modelList.forEach((data) => {
+          data.SourceSubjectVisitId = item.SourceSubjectVisitId
+        })
+      }
+      this.modelTaskId = item.VisitTaskId
+      this.IsDicom = item.IsDicom
+      this.model_cfg.visible = true
+    },
+    // 排序
+    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()
+    },
+    preview(row) {
+      if (!row.IsDicom) {
+        this.handlePreviewNoneDicomFiles(row)
+      } else {
+        this.handleViewReadingImages(row)
+      }
+    },
+    // 预览单个检查下非Dicom文件
+    handlePreviewNoneDicomFiles(row) {
+      if (this.open) {
+        this.open.close()
+      }
+      let trialId = this.$route.query.trialId
+      var token = getToken()
+      const routeData = this.$router.resolve({
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}`,
+      })
+      this.open = window.open(routeData.href, '_blank')
+    },
+    // 预览阅片影像
+    handleViewReadingImages(row) {
+      if (this.open) {
+        this.open.close()
+      }
+      var token = getToken()
+      let trialId = this.$route.query.trialId
+      const routeData = this.$router.resolve({
+        path: `/showvisitdicoms?page=download&trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
+      })
+      this.open = window.open(routeData.href, '_blank')
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.top {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 10px 0;
+}
+.tip {
+  display: flex;
+  align-items: flex-start;
+  margin-top: 5px;
+  i {
+    margin: 3px 5px 0 0;
+  }
+}
+</style>
@@ -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;
@@ -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;
+};
@@ -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', 'role:apm'])) {
+        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.form.ScreenshotList = this.form.ScreenshotList || []
+          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) {
+      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>
@@ -0,0 +1,250 @@
+<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}`,
+          })
+        })
+      }
+    },
+    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)
+      }
+      let name = this.$getObjectName(res.url)
+      this.fileList[index].url = this.OSSclientConfig.basePath + name
+      this.fileList[index].path = 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>
@@ -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;
@@ -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;
+};
@@ -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>
@@ -0,0 +1,126 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    v-dialogDrag
+    width="540px"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    append-to-body
+    :title="$t('toggleRole:tip:title')"
+    center
+    top="30vh"
+    :show-close="false"
+    :before-close="cancel"
+  >
+    <template v-if="hasRole">
+      <el-radio-group v-model="form.userRoleId" class="roles">
+        <el-radio
+          v-for="item in roles"
+          :key="item.Id"
+          :label="item.Id"
+          :disabled="item.IsUserRoleDisabled"
+          style="margin-bottom: 10px"
+        >
+          {{ item.UserTypeShortName }}
+        </el-radio>
+      </el-radio-group>
+    </template>
+
+    <div v-else style="text-align: center">
+      {{ $t('toggleRole:tip:noRole') }}
+    </div>
+    <div slot="footer">
+      <!-- 取消 -->
+      <el-button size="small" @click="cancel()">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <!-- 保存 -->
+      <el-button
+        type="primary"
+        size="small"
+        @click="save"
+        :disabled="saveDisabled"
+        :loading="loading"
+        v-if="hasRole"
+      >
+        {{ $t('common:button:confirm') }}
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+export default {
+  name: 'toggleRole',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      form: {
+        userRoleId: null,
+      },
+    }
+  },
+  created() {
+    this.form.userRoleId = zzSessionStorage.getItem('userId')
+  },
+  computed: {
+    roles() {
+      return this.$store.state.user.roles
+    },
+    hasRole() {
+      return this.roles && this.roles.length > 0
+    },
+    saveDisabled() {
+      return this.form.userRoleId === zzSessionStorage.getItem('userId')
+    },
+  },
+  methods: {
+    cancel() {
+      this.$emit('update:visible', false)
+      this.$emit('cancel')
+    },
+    async save() {
+      try {
+        if (!this.form.userRoleId)
+          return this.$message.warning(this.$t('toggleRole:ruleMessage:select'))
+          zzSessionStorage.removeItem('lastWorkbench')
+        this.$emit('save', this.form.userRoleId)
+      } catch (err) {
+        console.log(err)
+      }
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.roles {
+  max-width: 365px;
+  width: fit-content;
+  display: flex;
+  align-content: center;
+  // justify-content: center;
+  flex-wrap: wrap;
+  margin: auto;
+}
+
+::v-deep .el-radio__original {
+  display: none !important; /* 隐藏原生 radio 输入，但仍然允许交互 */
+}
+
+::v-deep.el-radio:focus:not(.is-focus):not(:active):not(.is-disabled)
+  .el-radio__inner {
+  box-shadow: none !important;
+}
+.el-radio {
+  width: 60px;
+}
+</style>
@@ -0,0 +1,117 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    :fullscreen="true"
+    :close-on-click-modal="false"
+    :before-close="beforeClose"
+    :append-to-body="true"
+    class="uploadDicomAndNonedicom"
+  >
+    <span slot="title">{{ title }}</span>
+    <el-tabs type="border-card" v-model="activeName">
+      <el-tab-pane
+        :label="$t('uploadDicomAndNonedicom:label:dicom')"
+        name="dicom"
+      >
+        <dicomFile
+          v-if="activeName === 'dicom'"
+          :SubjectId="SubjectId"
+          :SubjectCode="SubjectCode"
+          :Criterion="Criterion"
+          :TaskId="VisitTaskId"
+          :isUpload.sync="isUpload"
+          :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
+        />
+      </el-tab-pane>
+      <el-tab-pane
+        :label="$t('uploadDicomAndNonedicom:label:nonedicom')"
+        name="nonedicom"
+      >
+        <nonedicomFile
+          v-if="activeName === 'nonedicom'"
+          :SubjectId="SubjectId"
+          :SubjectCode="SubjectCode"
+          :Criterion="Criterion"
+          :VisitTaskId="VisitTaskId"
+          :isUpload.sync="isUpload"
+        />
+      </el-tab-pane>
+    </el-tabs>
+  </el-dialog>
+</template>
+<script>
+import dicomFile from './dicomFile.vue'
+import nonedicomFile from './nonedicomFile.vue'
+import store from '@/store'
+export default {
+  name: 'uploadDicomAndNonedicom',
+  components: { dicomFile, nonedicomFile },
+  props: {
+    visible: {
+      required: true,
+      type: Boolean,
+      default: false,
+    },
+    SubjectId: {
+      type: String,
+      default: '',
+    },
+    SubjectCode: {
+      type: String,
+      default: '',
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
+    VisitTaskId: {
+      type: String,
+      default: '',
+    },
+    isReadingTaskViewInOrder: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      title: '',
+      activeName: 'dicom',
+      isUpload: false,
+    }
+  },
+  mounted() {
+    this.title = `Upload Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
+    store.dispatch('trials/setUnLock', true)
+  },
+  methods: {
+    beforeClose() {
+      if (
+        this.$route.path !== '/trials/trials-panel/reading/readingTask' &&
+        this.isUpload
+      ) {
+        return window.location.reload()
+      }
+      this.$emit('update:visible', false)
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep.el-tabs--left .el-tabs__header.is-left {
+  margin-right: 0;
+}
+.uploadDicomAndNonedicom {
+  ::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item {
+    color: #909399;
+  }
+  ::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
+    color: #428bca;
+    background-color: #fff;
+    border-right-color: #dcdfe6;
+    border-left-color: #dcdfe6;
+  }
+}
+</style>
@@ -0,0 +1,919 @@
+<template>
+  <div class="nonedicomFile">
+    <div class="top">
+      <span>{{ $t('upload:nonedicom:title') }}</span>
+      <div class="tip">
+        <i class="el-icon-warning-outline"></i>
+        <div v-html="$t('upload:nonedicom:tip:message')"></div>
+      </div>
+    </div>
+    <!--检查列表-->
+    <el-table
+      :data="list"
+      style="width: 100%"
+      v-adaptive="{ bottomOffset: 60 }"
+      :loading="loading"
+      @sort-change="handleSortByColumn"
+      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }"
+    >
+      <!--受试者-->
+      <el-table-column
+        prop="SubjectCode"
+        :label="$t('upload:nonedicom:table:subject')"
+      />
+      <!--任务名称-->
+      <el-table-column
+        prop="TaskBlindName"
+        :label="$t('upload:nonedicom:table:taskName')"
+        sortable="custom"
+      />
+      <!--检查类型-->
+      <el-table-column
+        prop="Modality"
+        :label="$t('upload:nonedicom:table:molityType')"
+        sortable="custom"
+      >
+      </el-table-column>
+      <!--检查部位-->
+      <el-table-column
+        prop="BodyPart"
+        :label="$t('upload:nonedicom:table:bodyPart')"
+        sortable="custom"
+      />
+      <!--原文件数-->
+      <el-table-column
+        prop="FileCount"
+        :label="$t('upload:nonedicom:table:fileCount')"
+      >
+        <template slot-scope="scope">
+          <el-popover
+            v-if="scope.row.FileCount"
+            trigger="click"
+            placement="bottom"
+          >
+            <el-table :data="scope.row.FileList" height="300" size="small">
+              <!-- 文件名称 -->
+              <el-table-column
+                prop="FileName"
+                :label="$t('trials:audit:table:nonDicomsFileName')"
+                width="200"
+              />
+              <el-table-column
+                prop="FileSize"
+                :label="$t('trials:audit:table:nonDicomsFileSize')"
+                width="100"
+              >
+                <template slot-scope="scope">
+                  <span>{{
+                    scope.row.FileSize && scope.row.FileSize > 0
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
+                      : ''
+                  }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('common:action:action')" width="120">
+                <template slot-scope="files">
+                  <!-- 预览 -->
+                  <viewer
+                    :ref="files.row.Path"
+                    style="margin: 0 10px"
+                    :images="[`${OSSclientConfig.basePath}${files.row.Path}`]"
+                  >
+                    <el-button
+                      circle
+                      icon="el-icon-view"
+                      :title="$t('upload:nonedicom:button:preview')"
+                      :disabled="
+                        files.row.FileType &&
+                        files.row.FileType.indexOf('zip') >= 0
+                      "
+                      @click.native.prevent="previewFile(files.row)"
+                    />
+                    <img
+                      v-show="false"
+                      crossorigin="anonymous"
+                      :src="`${OSSclientConfig.basePath}${files.row.Path}`"
+                      alt="Image"
+                    />
+                  </viewer>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div slot="reference" class="name-wrapper">
+              <el-button type="text">
+                {{ scope.row.FileCount }}
+              </el-button>
+            </div>
+          </el-popover>
+          <span v-else>{{ scope.row.FileCount }}</span>
+        </template>
+      </el-table-column>
+      <!--后处理文件数-->
+      <el-table-column
+        prop="UploadedFileCount"
+        :label="$t('upload:nonedicom:table:uploadFileCount')"
+      >
+        <template slot-scope="scope">
+          <el-popover
+            v-if="scope.row.UploadedFileCount"
+            trigger="click"
+            placement="bottom"
+          >
+            <el-table
+              :data="scope.row.UploadedFileList"
+              height="300"
+              size="small"
+            >
+              <!-- 文件名称 -->
+              <el-table-column
+                prop="FileName"
+                :label="$t('trials:audit:table:nonDicomsFileName')"
+                width="200"
+              />
+              <el-table-column
+                prop="FileSize"
+                :label="$t('trials:audit:table:nonDicomsFileSize')"
+                width="100"
+              >
+                <template slot-scope="scope">
+                  <span>{{
+                    scope.row.FileSize && scope.row.FileSize > 0
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
+                      : ''
+                  }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('common:action:action')" width="120">
+                <template slot-scope="files">
+                  <!-- 预览 -->
+                  <viewer
+                    :ref="files.row.Path"
+                    style="margin: 0 10px"
+                    :images="[`${OSSclientConfig.basePath}${files.row.Path}`]"
+                  >
+                    <el-button
+                      circle
+                      icon="el-icon-view"
+                      :title="$t('upload:nonedicom:button:preview')"
+                      :disabled="
+                        files.row.FileType &&
+                        files.row.FileType.indexOf('zip') >= 0
+                      "
+                      @click.native.prevent="previewFile(files.row)"
+                    />
+                    <img
+                      v-show="false"
+                      crossorigin="anonymous"
+                      :src="`${OSSclientConfig.basePath}${files.row.Path}`"
+                      alt="Image"
+                    />
+                  </viewer>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div slot="reference" class="name-wrapper">
+              <el-button type="text">
+                {{ scope.row.UploadedFileCount }}
+              </el-button>
+            </div>
+          </el-popover>
+          <span v-else>{{ scope.row.UploadedFileCount }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('common:action:action')"
+        fixed="right"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <!--预览--->
+          <el-button
+            circle
+            :disabled="scope.row.UploadedFileCount <= 0"
+            icon="el-icon-view"
+            :title="$t('upload:nonedicom:button:preview')"
+            @click.stop="handlePreviewNoneDicomFiles(scope.row)"
+          />
+          <!--上传--->
+          <el-button
+            circle
+            icon="el-icon-upload2"
+            :title="$t('upload:nonedicom:button:upload')"
+            @click.native.prevent="handleUpload(scope.row)"
+          />
+          <!--删除--->
+          <el-button
+            :disabled="
+              scope.row.UploadedFileCount <= 0 ||
+              scope.row.ReadingTaskState === 2
+            "
+            circle
+            icon="el-icon-delete"
+            :title="$t('upload:nonedicom:button:delete')"
+            @click.stop="remove(scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 预览单个图像 -->
+    <el-dialog
+      v-if="imgObj.visible"
+      :visible.sync="imgObj.visible"
+      :title="$t('upload:nonedicom:dialogTitle:preview')"
+      append-to-body
+      width="565px"
+    >
+      <div
+        v-loading="imgObj.loading"
+        class="base-modal-body"
+        style="border: 2px solid #ccc; padding: 10px"
+      >
+        <el-image
+          :src="`${OSSclientConfig.basePath}${imgObj.url}`"
+          crossorigin="anonymous"
+          fit="fit"
+          style="height: 500px; width: 500px"
+          @error="imgObj.loading = false"
+          @load="imgObj.loading = false"
+        />
+      </div>
+    </el-dialog>
+    <!-- 上传非dicom文件 -->
+    <el-dialog
+      v-if="uploadVisible"
+      :visible.sync="uploadVisible"
+      :close-on-click-modal="false"
+      :title="$t('trials:uploadNonDicoms:dialogTitle:upload')"
+      width="800px"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+      @close="resetFileDiaolg"
+    >
+      <!-- 多文件上传 -->
+      <form id="inputForm" ref="uploadForm">
+        <el-divider content-position="left">{{
+          $t('trials:uploadNonDicoms:label:fileType')
+        }}</el-divider>
+        <div class="form-group">
+          <div class="upload" style="margin-right: 10px">
+            <input
+              multiple="multiple"
+              webkitdirectory=""
+              directory
+              accept="*/*"
+              type="file"
+              name="uploadFolder"
+              class="select-file"
+              title=""
+              @change="beginScanFiles($event)"
+              v-if="!btnLoading"
+            />
+            <div class="btn-select">
+              {{ $t('trials:uploadNonDicoms:button:selectFolder') }}
+            </div>
+          </div>
+          <div class="upload">
+            <input
+              class="select-file"
+              multiple=""
+              :accept="faccept.join(',')"
+              type="file"
+              name="uploadFile"
+              title=""
+              @change="beginScanFiles($event)"
+              v-if="!btnLoading"
+            />
+            <div class="btn-select">
+              {{ $t('trials:uploadNonDicoms:button:select') }}
+            </div>
+          </div>
+          <!-- <span style="margin-left: 10px">{{
+            $store.state.trials.uploadTip
+          }}</span> -->
+        </div>
+      </form>
+      <!-- 文件列表 -->
+      <el-table
+        ref="filesTable"
+        :data="fileList"
+        class="dicomFiles-table"
+        height="300"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          :selectable="(row, index) => row.status !== 2 && !btnLoading"
+        />
+        <el-table-column type="index" width="50" />
+        <!-- 文件名称 -->
+        <el-table-column
+          prop="name"
+          :label="$t('trials:uploadNonDicoms:table:fileName')"
+          min-width="100"
+        />
+        <!-- 文件大小 -->
+        <el-table-column
+          prop="size"
+          :label="$t('trials:uploadNonDicoms:table:fileSize')"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.size && scope.row.size > 0
+                ? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
+                : ''
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- 文件类型 -->
+        <el-table-column
+          prop="type"
+          :label="$t('trials:uploadNonDicoms:table:fileType')"
+        />
+        <!-- 上传状态 -->
+        <el-table-column
+          prop="status"
+          :label="$t('trials:uploadNonDicoms:table:uploadStatus')"
+          min-width="100"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              :type="['warning', 'info', 'success', 'danger'][scope.row.status]"
+              v-if="scope.row.status || scope.row.status === 0"
+              >{{ $fd('NoneDicomUploadStatus', scope.row.status) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('trials:uploadNonDicoms:table:failedFileCount')"
+          min-width="150"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-progress
+              color="#409eff"
+              :percentage="
+                ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
+                1
+              "
+            />
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('common:action:action')">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              icon="el-icon-delete"
+              circle
+              :disabled="btnLoading"
+              :title="$t('trials:crcUpload:action:delete')"
+              @click="handleRemoveFile(scope.row)"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="text-align: right; padding: 10px 0px">
+        <span style="margin-right: 10px">{{
+          $store.state.trials.uploadTip
+        }}</span>
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="selectArr.length == 0"
+          :loading="btnLoading"
+          @click="beginUpload"
+        >
+          {{ $t('trials:uploadNonDicoms:action:upload') }}
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  getIRUploadTaskNoneDicomStudyList,
+  deleteTaskStudy,
+} from '@/api/load.js'
+import { preArchiveStudy, uploadNoneDicomFile } from '@/api/trials'
+import store from '@/store'
+import { getToken } from '@/utils/auth'
+let defaultSearchData = () => {
+  return {
+    SubjectId: null,
+    TrialReadingCriterionId: null,
+    SubjectCode: null,
+    Asc: false,
+    SortField: 'TaskBlindName',
+  }
+}
+export default {
+  name: 'nonedicomFile',
+  props: {
+    SubjectId: {
+      type: String,
+      default: '',
+    },
+    SubjectCode: {
+      type: String,
+      default: '',
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
+    VisitTaskId: {
+      type: String,
+      default: '',
+    },
+    isUpload: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      searchData: defaultSearchData(),
+      imgObj: { url: '', visible: false, loading: false },
+      uploadVisible: false,
+      fileList: [],
+      selectArr: [],
+      successFileList: [],
+      isFail: false,
+      faccept: ['.jpg', '.jpeg', '.png', '.bmp', '.zip'],
+      fCount: 0,
+      btnLoading: false,
+      currentRow: {},
+      studyMonitorId: null,
+      open: null,
+    }
+  },
+  watch: {
+    isFail() {
+      if (this.isFail) {
+        this.$confirm(
+          this.$t('trials:visit:crcUpload:nomDicomFiles:failUpload'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t('common:button:confirm'),
+            cancelButtonText: this.$t('common:button:cancel'),
+          }
+        )
+          .then(() => {
+            this.beginUpload()
+          })
+          .catch((err) => {
+            this.btnLoading = false
+            console.log(err)
+          })
+      }
+    },
+    btnLoading() {
+      store.dispatch('trials/setUnLock', this.btnLoading)
+    },
+  },
+  created() {
+    this.getList()
+  },
+  beforeDestroy() {
+    store.dispatch('trials/setUnLock', false)
+  },
+  methods: {
+    async getList() {
+      try {
+        this.searchData.SubjectId = this.SubjectId
+        this.searchData.TrialReadingCriterionId =
+          this.Criterion.TrialReadingCriterionId
+        this.searchData.SubjectCode = this.SubjectCode
+        if (this.VisitTaskId) {
+          this.searchData.VisitTaskId = this.VisitTaskId
+        }
+        this.loading = true
+        let res = await getIRUploadTaskNoneDicomStudyList(this.searchData)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list = res.Result
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    // 扫描待上传文件
+    beginScanFiles(e) {
+      var files = [...e.target.files]
+      var sameFiles = []
+      files.forEach((file) => {
+        var extendName = file.name
+          .substring(file.name.lastIndexOf('.'))
+          .toLocaleLowerCase()
+        if (
+          this.faccept.indexOf(extendName) !== -1 &&
+          this.fileList.findIndex((v) => v.name === file.name) > -1
+        ) {
+          sameFiles.push(file.name)
+        }
+      })
+      var scope = this
+      if (sameFiles.length > 0) {
+        const h = this.$createElement
+        var msg = this.$t(
+          'trials:uploadNonDicoms:message:exsitSameFile'
+        ).replace('xxx', sameFiles.join(', '))
+        this.$msgbox({
+          message: h('div', { style: 'maxHeight:300px;overflow: auto;' }, [
+            h('p', null, msg),
+            h(
+              'p',
+              null,
+              this.$t('trials:uploadNonDicoms:message:isContinueUpload')
+            ),
+          ]),
+          type: 'warning',
+          showCancelButton: true,
+        })
+          .then(() => {
+            scope.pendingUploadQuene(files)
+          })
+          .catch(() => {
+            scope.resetUploadForm()
+          })
+      } else {
+        scope.pendingUploadQuene(files)
+      }
+    },
+    pendingUploadQuene(files) {
+      for (var i = 0; i < files.length; ++i) {
+        const fileName = files[i].name
+        var extendName = fileName
+          .substring(fileName.lastIndexOf('.'))
+          .toLocaleLowerCase()
+        if (this.faccept.indexOf(extendName) !== -1) {
+          files[i].id = `${files[i].lastModified}${files[i].name}`
+          let obj = {
+            name: files[i].name,
+            size: files[i].size,
+            type: extendName.split('.')[1],
+            status: 0,
+            file: files[i],
+            id: `${files[i].lastModified}${files[i].name}`,
+            fileType: files[i].type,
+            uploadFileSize: 0,
+          }
+          this.fileList.push(obj)
+          this.$refs.filesTable.toggleRowSelection(obj, true)
+        }
+      }
+      this.resetUploadForm()
+    },
+    handleRemoveFile(row) {
+      this.$confirm(this.$t('trials:uploadNonDicoms:message:delete'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+      })
+        .then(() => {
+          this.fileList.splice(
+            this.fileList.findIndex((item) => item.id === row.id),
+            1
+          )
+          let flag = this.successFileList.some((item) => item.id === row.id)
+          if (flag) {
+            this.successFileList.splice(
+              this.successFileList.findIndex((item) => item.id === row.id),
+              1
+            )
+          }
+        })
+        .catch(() => {})
+    },
+    resetUploadForm() {
+      this.$nextTick(() => {
+        this.$refs.uploadForm.reset()
+      })
+    },
+    // 打开上传文件弹窗
+    handleUpload(row) {
+      this.fileList = []
+      this.uploadVisible = true
+      this.fCount = 0
+      this.currentRow = { ...row }
+    },
+    resetFileDiaolg() {
+      this.btnLoading = false
+      this.uploadVisible = false
+      this.selectArr = []
+      this.successFileList = []
+      this.OSSclient.close()
+    },
+    // 预览文件
+    previewFile(row) {
+      // window.open(row.FullFilePath, '_blank')
+      // this.imgObj.url = row.FullFilePath || row.Path
+      // this.imgObj.loading = true
+      // this.imgObj.visible = true
+      this.$refs[row.Path].$viewer.show()
+    },
+    // 预览单个检查下非Dicom文件
+    handlePreviewNoneDicomFiles(row) {
+      if (this.open) {
+        this.open.close()
+      }
+      let trialId = this.$route.query.trialId
+      var token = getToken()
+      const routeData = this.$router.resolve({
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&visitTaskId=${row.VisitTaskId}&TokenKey=${token}`,
+      })
+      this.open = window.open(routeData.href, '_blank')
+    },
+    // 删除
+    async remove(item) {
+      try {
+        let confirm = await this.$confirm(
+          this.$t('upload:nonedicom:confirm:delMessage'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t('common:button:confirm'),
+            cancelButtonText: this.$t('common:button:cancel'),
+          }
+        )
+        if (confirm !== 'confirm') return
+        let params = {
+          VisitTaskId: item.VisitTaskId,
+          IsDicom: false,
+          NoneDicomStudyId: item.Id,
+        }
+        let res = await deleteTaskStudy(params)
+        if (res.IsSuccess) {
+          this.getList()
+          this.$emit('update:isUpload', true)
+          this.$message.success(
+            this.$t('trials:uploadImage:message:delSuccess')
+          )
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    // 排序
+    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()
+    },
+    // 获取待上传文件信息
+    handleSelectionChange(selection) {
+      this.selectArr = selection
+    },
+    // 开始上传文件
+    async beginUpload() {
+      this.btnLoading = true
+      this.isFail = false
+      const fileMaxSize = 1024 * 1024 * 1024 * 2 // 1G
+      var currentFilesSize = 0
+      this.selectArr.forEach((item) => {
+        currentFilesSize += item.size
+      })
+      if (currentFilesSize / fileMaxSize > 1) {
+        // 'Upload file size cannot exceed 1G'
+        this.$alert(this.$t('trials:uploadNonDicoms:message:uploadSize'))
+        this.btnLoading = false
+      } else {
+        this.selectArr.forEach((item) => (item.status = 0))
+        let num = this.selectArr.length > 6 ? 6 : this.selectArr.length
+        let funArr = []
+        let res = await preArchiveStudy({
+          subjectVisitId: this.currentRow.SourceSubjectVisitId,
+          isDicom: false,
+          FileCount: this.selectArr.length,
+        })
+        if (res.IsSuccess) {
+          this.studyMonitorId = res.Result
+          for (let i = 0; i < num; i++) {
+            funArr.push(this.handleUploadTask(this.selectArr, i))
+          }
+          if (funArr.length > 0) {
+            let res = await Promise.all(funArr)
+          }
+        } else {
+          this.isFail = true
+        }
+      }
+    },
+    // 并发上传
+    async handleUploadTask(arr, index) {
+      if (!this.uploadVisible) return
+      let file = this.fileList.filter((item) => item.id === arr[index].id)[0]
+      file.status = 1
+      let path = `/${this.$route.query.trialId}/TaskImage/${
+        this.currentRow.SubjectId
+      }/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
+        .substring(file.name.lastIndexOf('.'))
+        .toLocaleLowerCase()}`
+      file.curPath = path
+      const fileData = await this.fileToBlob(file.file)
+      let res = await this.fileToOss(path, fileData, file)
+      if (res) {
+        file.status = 2
+        this.successFileList.push({
+          fileName: file.name,
+          filePath: this.$getObjectName(res.url),
+          fileFize: file.size,
+          fileType: file.fileType,
+        })
+        let flag = arr.every((item) => item.status === 2)
+        if (flag) {
+          let RecordPath = await this.uploadRecord(arr)
+          return this.submitFile(this.successFileList, RecordPath)
+        }
+      } else {
+        file.status = 3
+      }
+      let flag = arr.every((item) => item.status > 1)
+      if (flag) {
+        let failFileList = arr.filter((item) => item.status === 3)
+        if (failFileList && failFileList.length > 0) {
+          let RecordPath = await this.uploadRecord(arr)
+          this.$refs.filesTable.clearSelection()
+          failFileList.forEach((row) => {
+            row.uploadFileSize = 0
+            this.$refs.filesTable.toggleRowSelection(row)
+          })
+          this.isFail = true
+          this.submitFile(this.successFileList, RecordPath, true)
+          return false
+        }
+      }
+      let ind = arr.findIndex((item) => item.status === 0)
+      if (ind >= 0) {
+        return this.handleUploadTask(arr, ind)
+      } else {
+        return false
+      }
+    },
+    // file上传到oss
+    async fileToOss(path, file, item) {
+      try {
+        let res = await this.OSSclient.multipartUpload(
+          {
+            path,
+            file,
+            speed: true,
+          },
+          (percentage, checkpoint, lastPer) => {
+            item.uploadFileSize += checkpoint.size * (percentage - lastPer)
+            if (item.uploadFileSize > file.fileSize) {
+              item.uploadFileSize = file.fileSize
+            }
+          }
+        )
+        if (res) {
+          return res
+        } else {
+          return false
+        }
+      } catch (err) {
+        console.log(err)
+        return false
+      }
+    },
+    // 非Dicom文件上传归档
+    submitFile(uploadedFileList, RecordPath, isReLoad = false) {
+      if (!this.uploadVisible) return
+      this.btnLoading = true
+      var params = {
+        trialId: this.$route.query.trialId,
+        subjectVisitId: this.currentRow.SourceSubjectVisitId,
+        noneDicomStudyId: this.currentRow.Id,
+        studyMonitorId: this.studyMonitorId,
+        VisitTaskId: this.currentRow.VisitTaskId,
+        uploadedFileList: uploadedFileList,
+      }
+      if (RecordPath) {
+        params.RecordPath = RecordPath.path
+        params.FailedFileCount = RecordPath.Record.Failed.length
+      }
+      uploadNoneDicomFile(params)
+        .then((res) => {
+          if (!isReLoad) {
+            this.resetFileDiaolg()
+          }
+          this.getList()
+          this.$emit('update:isUpload', true)
+          // 刷新父组件列表
+          this.$emit('getList')
+          this.$message.success(
+            this.$t('trials:uploadNonDicoms:message:uploadedSuccessfully')
+          )
+        })
+        .catch(() => {
+          this.btnLoading = false
+        })
+    },
+    // 上传提交记录
+    uploadRecord(arr) {
+      return new Promise(async (resolve) => {
+        try {
+          let Record = {
+            Failed: [],
+            Existed: [],
+            Uploaded: [],
+            FileCount: arr.length,
+          }
+          arr.forEach((item) => {
+            let file = this.fileList.find((data) => data.id === item.id)
+            if (file.status === 2) {
+              Record.Uploaded.push(file.curPath)
+            }
+            if (file.status === 3) {
+              Record.Failed.push(file.curPath)
+            }
+          })
+          let text = JSON.stringify(Record)
+          let logJsonBlob = this.generateTxtFile(text)
+          let logJsonObjectName = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId}/${this.currentRow.VisitTaskId}/${this.studyMonitorId}.txt`
+          let logRes
+          try {
+            logRes = await this.OSSclient.put(logJsonObjectName, logJsonBlob)
+            if (logRes && logRes.url) {
+              resolve({ path: this.$getObjectName(logRes.url), Record })
+            } else {
+              resolve(false)
+            }
+          } catch (e) {
+            resolve(false)
+          }
+        } catch (err) {
+          console.log(err)
+          resolve(false)
+        }
+      })
+    },
+    generateTxtFile(text) {
+      let blob = new Blob(['\ufeff', text], { type: 'text/plain' })
+      return blob
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.top {
+  margin: 10px 0;
+}
+.upload {
+  display: inline-block;
+  height: 30px;
+  width: 90px;
+  padding: 2px 10px;
+  line-height: 23px;
+  position: relative;
+  text-decoration: none;
+  border-radius: 3px;
+  overflow: hidden;
+  text-align: center;
+  background: #428bca;
+  border-color: #428bca;
+  color: #fff;
+  .select-file {
+    height: 30px;
+    width: 90px;
+    position: absolute;
+    overflow: hidden;
+    left: 0;
+    top: 0;
+    opacity: 0;
+    font-size: 0;
+  }
+  .btn-select {
+    //给显示在页面上的按钮写样式
+    width: 90px;
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    cursor: pointer;
+    border-radius: 24px;
+    overflow: hidden;
+    position: absolute;
+    top: 0;
+    left: 0;
+    pointer-events: none; //pointer-events:none用来控制该标签的点击穿透事件
+  }
+}
+.tip {
+  display: flex;
+  align-items: flex-start;
+  margin-top: 5px;
+  i {
+    margin: 3px 5px 0 0;
+  }
+}
+</style>
@@ -0,0 +1,291 @@
+<template>
+  <div v-if="model_cfg.visible">
+    <base-model :config="model_cfg">
+      <div slot="dialog-body">
+        <el-table :data="modelList" style="width: 100%" height="300">
+          <!--检查编号-->
+          <el-table-column
+            prop="StudyCode"
+            :label="$t('trials:uploadImage:table:StudyCode')"
+          />
+          <!--检查类型-->
+          <el-table-column
+            prop="ModalityForEdit"
+            :label="$t('trials:uploadImage:table:ModalityForEdit')"
+            v-if="IsDicom"
+          />
+          <!--检查模态-->
+          <el-table-column
+            prop="Modalities"
+            :label="$t('trials:uploadImage:table:Modalities')"
+            v-if="IsDicom"
+          />
+          <!--检查部位-->
+          <el-table-column
+            prop="BodyPartForEdit"
+            :label="$t('trials:uploadImage:table:BodyPartForEdit')"
+            v-if="IsDicom"
+          >
+            <template slot-scope="scope">
+              <span>{{
+                $fd(
+                  'Bodypart',
+                  scope.row.BodyPartForEdit,
+                  'Code',
+                  { Bodypart: bodyPart },
+                  'Name'
+                )
+              }}</span>
+            </template>
+          </el-table-column>
+          <!--序列数量-->
+          <el-table-column
+            prop="SeriesCount"
+            :label="$t('trials:uploadImage:table:SeriesCount')"
+            v-if="IsDicom"
+          />
+          <!--图像数量-->
+          <el-table-column
+            prop="InstanceCount"
+            :label="$t('trials:uploadImage:table:InstanceCount')"
+            v-if="IsDicom"
+          />
+          <!--检查时间-->
+          <el-table-column
+            prop="StudyTime"
+            :label="$t('trials:uploadImage:table:StudyTime')"
+            v-if="IsDicom"
+            min-width="130"
+          />
+          <!--检查模态-->
+          <el-table-column
+            prop="Modality"
+            :label="$t('trials:uploadImage:table:Modalities')"
+            v-if="!IsDicom"
+          />
+          <!--检查部位-->
+          <el-table-column
+            prop="BodyPart"
+            :label="$t('trials:uploadImage:table:BodyPartForEdit')"
+            v-if="!IsDicom"
+          >
+            <template slot-scope="scope">
+              <span>{{
+                $fd(
+                  'Bodypart',
+                  scope.row.BodyPart,
+                  'Code',
+                  { Bodypart: bodyPart },
+                  'Name'
+                )
+              }}</span>
+            </template>
+          </el-table-column>
+          <!--文件数量-->
+          <el-table-column
+            prop="FileCount"
+            :label="$t('trials:uploadImage:table:FileCount')"
+            v-if="!IsDicom"
+          />
+          <!--检查时间-->
+          <el-table-column
+            prop="ImageDate"
+            :label="$t('trials:uploadImage:table:StudyTime')"
+            v-if="!IsDicom"
+            min-width="130"
+          />
+          <el-table-column
+            :label="$t('common:action:action')"
+            fixed="right"
+            width="80"
+          >
+            <template slot-scope="scope">
+              <!--预览--->
+              <el-button
+                circle
+                icon="el-icon-view"
+                :title="$t('trials:uploadImage:button:preview')"
+                v-if="!isUpload"
+                @click.stop="preview(scope.row)"
+              />
+              <!--编辑--->
+              <el-button
+                circle
+                icon="el-icon-edit-outline"
+                :title="$t('trials:uploadImage:button:edit')"
+                v-else
+                @click.stop="openEdit(scope.row)"
+              />
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </base-model>
+    <!--新增检查部位-->
+    <base-model v-if="editModality_model.visible" :config="editModality_model">
+      <template slot="dialog-body">
+        <el-form
+          ref="editModalityform"
+          :inline="true"
+          :model="form"
+          class="demo-form-inline"
+          :rules="rules"
+        >
+          <el-form-item
+            :label="$t('trials:uploadImage:form:ModalityForEdit')"
+            prop="Modality"
+            label-width="150px"
+          >
+            <el-select v-model="form.Modality" placeholder="">
+              <el-option
+                v-for="item in TrialModality"
+                :key="item"
+                :label="item"
+                :value="item"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button
+          type="primary"
+          @click="updateTaskStudyModality"
+          :loading="loading"
+        >
+          {{ $t('common:button:confirm') }}
+        </el-button>
+        <el-button
+          @click="editModality_model.visible = false"
+          :loading="loading"
+        >
+          {{ $t('common:button:cancel') }}
+        </el-button>
+      </template>
+    </base-model>
+  </div>
+</template>
+<script>
+import baseModel from '@/components/BaseModel'
+import { getToken } from '@/utils/auth'
+import { updateTaskStudyModality } from '@/api/load.js'
+export default {
+  name: 'studyView',
+  props: {
+    model_cfg: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
+    bodyPart: {
+      type: Array,
+      default: () => {
+        return []
+      },
+    },
+    modelList: {
+      type: Array,
+      default: () => {
+        return []
+      },
+    },
+    TrialModality: {
+      type: Array,
+      default: () => {
+        return []
+      },
+    },
+    visitTaskId: {
+      type: String,
+    },
+    IsDicom: {
+      required: true,
+      type: Boolean,
+      default: true,
+    },
+    isUpload: {
+      required: true,
+      type: Boolean,
+      default: false,
+    },
+  },
+  components: {
+    'base-model': baseModel,
+  },
+  data() {
+    return {
+      form: {
+        Modality: null,
+        TaskStudyId: null,
+      },
+      editModality_model: {
+        visible: false,
+        title: this.$t('trials:uploadImage:button:edit'),
+        width: '500px',
+        appendToBody: true,
+      },
+      rules: {
+        Modality: [
+          {
+            required: true,
+            message: this.$t('trials:uploadImage:format:notModality'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
+      loading: false,
+    }
+  },
+  methods: {
+    // 预览
+    preview(row) {
+      let routeData = null
+      if (this.IsDicom) {
+        var token = getToken()
+        routeData = this.$router.resolve({
+          path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study&visitTaskId=${this.visitTaskId}`,
+        })
+      } else {
+        let trialId = this.$route.query.trialId
+        var token = getToken()
+        routeData = this.$router.resolve({
+          path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&TokenKey=${token}`,
+        })
+      }
+      window.open(routeData.href, '_blank')
+    },
+    // 打开编辑
+    openEdit(row) {
+      this.form.TaskStudyId = row.Id
+      this.form.Modality = row.ModalityForEdit
+      this.editModality_model.visible = true
+    },
+    // 修改检查类型
+    async updateTaskStudyModality() {
+      try {
+        let validate = await this.$refs.editModalityform.validate()
+        if (!validate) return false
+        this.loading = true
+        let res = await updateTaskStudyModality(this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.modelList.some((item) => {
+            if (this.form.TaskStudyId === item.Id) {
+              item.ModalityForEdit = this.form.Modality
+            }
+            return this.form.TaskStudyId === item.Id
+          })
+          this.editModality_model.visible = false
+          this.$emit('getList')
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+</style>
@@ -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)) {
@@ -565,7 +567,7 @@ export default {
      for (let i = 0; i < arr.length; i++) {
        let dicom = arr[i];
        if (dicom.StudyInstanceUid !== StudyInstanceUid) continue;
-        let thumbnailPath = `/${dicom.params.TrialId}/TaskImage/${dicom.params.SubjectId}/${dicom.params.VisitTaskId}/${dicom.StudyInstanceUid}/${dicom.SeriesInstanceUid}.png`;
+        let thumbnailPath = `/${dicom.params.TrialId}/TaskImage/${dicom.params.SubjectId}/${dicom.params.VisitTaskId}/${dicom.StudyInstanceUid}/${dicom.SeriesInstanceUid}.jpg`;
        if (!studyObj[dicom.StudyId]) {
          studyObj[dicom.StudyId] = {
            StudyId: dicom.StudyId,
@@ -747,6 +749,7 @@ export default {
  },
  beforeDestroy() {
    this.isClose = true;
+    store.dispatch("trials/setUnLock", false);
  },
 };
 </script>
@@ -66,13 +66,13 @@
      >
        <template slot-scope="scope">
          <!--下载--->
-          <el-button
+          <!-- <el-button
            v-if="!isUpload && Criterion.ImageDownloadEnum > 0"
            circle
            icon="el-icon-download"
            :title="$t('trials:uploadImage:button:download')"
            @click.stop="downloadImage(scope.row)"
-          />
+          /> -->
          <!--删除--->
          <el-button
            v-if="isUpload"
@@ -102,7 +102,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 +247,356 @@ export default {
    },
    // 打包下载
    async downloadImage(item) {
-      try {
-        await downloadImage(
-          this.$route.query.trialId,
-          item.SourceSubjectVisitId
-        );
-      } catch (err) {
-        console.log(err);
+      let zipName = "压缩包.zip";
+      let InstanceInfoList = [
+        {
+          Id: "e634352c-6465-32ba-04b3-824ec8d346a8",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/e634352c-6465-32ba-04b3-824ec8d346a8",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 1,
+        },
+        {
+          Id: "d4ad1dd2-747b-6de7-8ad4-3e81c58943dd",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/d4ad1dd2-747b-6de7-8ad4-3e81c58943dd",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 2,
+        },
+        {
+          Id: "6a1d1d12-2b4a-0368-c7e1-d44f7180b280",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6a1d1d12-2b4a-0368-c7e1-d44f7180b280",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 3,
+        },
+        {
+          Id: "7a8fb1b4-9ea8-1189-4ca6-b9a9b9547a39",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7a8fb1b4-9ea8-1189-4ca6-b9a9b9547a39",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 4,
+        },
+        {
+          Id: "8d00be19-5ac5-c608-dbd0-41f84cfacd95",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8d00be19-5ac5-c608-dbd0-41f84cfacd95",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 5,
+        },
+        {
+          Id: "729ded91-0eca-78f2-1c17-5182d4f27e3a",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/729ded91-0eca-78f2-1c17-5182d4f27e3a",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 6,
+        },
+        {
+          Id: "9e2fd28c-72fe-bb66-e0ce-40115cd82260",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9e2fd28c-72fe-bb66-e0ce-40115cd82260",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 7,
+        },
+        {
+          Id: "9b31613f-3c9e-28ad-fd9e-7001a69e09b5",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9b31613f-3c9e-28ad-fd9e-7001a69e09b5",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 8,
+        },
+        {
+          Id: "4982b453-d068-7e56-2acd-a361d8584f35",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4982b453-d068-7e56-2acd-a361d8584f35",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 9,
+        },
+        {
+          Id: "8279cf5a-2551-43ea-3fe4-673e88ba7e5a",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8279cf5a-2551-43ea-3fe4-673e88ba7e5a",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 10,
+        },
+        {
+          Id: "6424e9c5-d31b-9388-3b64-a56705ab6fc8",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6424e9c5-d31b-9388-3b64-a56705ab6fc8",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 11,
+        },
+        {
+          Id: "a73cf3f9-defa-0c22-dfdc-8c5bfb93c9a7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a73cf3f9-defa-0c22-dfdc-8c5bfb93c9a7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 12,
+        },
+        {
+          Id: "dbfaafea-f721-0a93-37c6-69bcc0d957c3",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/dbfaafea-f721-0a93-37c6-69bcc0d957c3",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 13,
+        },
+        {
+          Id: "52000ac1-6a5b-83e2-5468-4dfdf394e455",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/52000ac1-6a5b-83e2-5468-4dfdf394e455",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 14,
+        },
+        {
+          Id: "de34a347-41f4-1018-a710-48d81fa9aadc",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/de34a347-41f4-1018-a710-48d81fa9aadc",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 15,
+        },
+        {
+          Id: "251d6a13-26b7-935b-d765-0c5db1ed7dfc",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/251d6a13-26b7-935b-d765-0c5db1ed7dfc",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 16,
+        },
+        {
+          Id: "b22e93c8-3f6a-484a-a32b-f7626689f8da",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/b22e93c8-3f6a-484a-a32b-f7626689f8da",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 17,
+        },
+        {
+          Id: "6517400b-d4b5-db65-d026-8c06c40bf244",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6517400b-d4b5-db65-d026-8c06c40bf244",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 18,
+        },
+        {
+          Id: "8e70df99-525a-4ecd-5cf1-6c32698eaa3f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8e70df99-525a-4ecd-5cf1-6c32698eaa3f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 19,
+        },
+        {
+          Id: "7df907f2-b6a6-fd03-67ab-be86c497d412",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7df907f2-b6a6-fd03-67ab-be86c497d412",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 20,
+        },
+        {
+          Id: "ba31ba5b-728e-8301-273d-459fd3c65a43",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/ba31ba5b-728e-8301-273d-459fd3c65a43",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 21,
+        },
+        {
+          Id: "7528c70c-5ba1-59c1-413c-7bfc984c0066",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7528c70c-5ba1-59c1-413c-7bfc984c0066",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 22,
+        },
+        {
+          Id: "15dd574d-fc82-c5b7-fefb-497346d4abbb",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/15dd574d-fc82-c5b7-fefb-497346d4abbb",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 23,
+        },
+        {
+          Id: "6cd76aca-91fa-64ce-6077-af48c5e5b18b",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6cd76aca-91fa-64ce-6077-af48c5e5b18b",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 24,
+        },
+        {
+          Id: "2f0f9f4e-12b8-a6a8-d3f9-f43e2055653d",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/2f0f9f4e-12b8-a6a8-d3f9-f43e2055653d",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 25,
+        },
+        {
+          Id: "3c49f379-8548-67cd-1333-dde28219c6e9",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/3c49f379-8548-67cd-1333-dde28219c6e9",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 26,
+        },
+        {
+          Id: "910f43c8-123a-0753-aaf7-11081eef4268",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/910f43c8-123a-0753-aaf7-11081eef4268",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 27,
+        },
+        {
+          Id: "ffad6b36-74aa-1c7d-01eb-18524da91f6e",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/ffad6b36-74aa-1c7d-01eb-18524da91f6e",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 28,
+        },
+        {
+          Id: "9e2bf22d-8734-62ae-881a-7404064a95ce",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9e2bf22d-8734-62ae-881a-7404064a95ce",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 29,
+        },
+        {
+          Id: "eef8b291-ffdf-dbfb-244d-5e63dc5b8cc7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/eef8b291-ffdf-dbfb-244d-5e63dc5b8cc7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 30,
+        },
+        {
+          Id: "12b0de3a-243c-78b9-b006-82f2cc633a0f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/12b0de3a-243c-78b9-b006-82f2cc633a0f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 31,
+        },
+        {
+          Id: "4341ea87-7d54-2608-184e-01e5c976ce9f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4341ea87-7d54-2608-184e-01e5c976ce9f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 32,
+        },
+        {
+          Id: "4db2bac2-18eb-0589-d520-f297b2840e1d",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4db2bac2-18eb-0589-d520-f297b2840e1d",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 33,
+        },
+        {
+          Id: "9442c2a3-0972-67f7-afc3-6f1a47abefab",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9442c2a3-0972-67f7-afc3-6f1a47abefab",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 34,
+        },
+        {
+          Id: "a7fb75b0-0b09-5340-70cf-a11afd84b1ec",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a7fb75b0-0b09-5340-70cf-a11afd84b1ec",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 35,
+        },
+        {
+          Id: "753d7795-451a-bd32-69ea-fd58c1e89d63",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/753d7795-451a-bd32-69ea-fd58c1e89d63",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 36,
+        },
+        {
+          Id: "33bf7274-de0a-e8f9-f97a-c58fb2ea3aaf",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/33bf7274-de0a-e8f9-f97a-c58fb2ea3aaf",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 37,
+        },
+        {
+          Id: "adadae31-37a1-818d-3721-09a1d371c6a5",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/adadae31-37a1-818d-3721-09a1d371c6a5",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 38,
+        },
+        {
+          Id: "f64e8b0d-d2ab-b112-5705-92c23cfc5df6",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/f64e8b0d-d2ab-b112-5705-92c23cfc5df6",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 39,
+        },
+        {
+          Id: "781088b0-5afd-6eb3-5f87-9bfec210d490",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/781088b0-5afd-6eb3-5f87-9bfec210d490",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 40,
+        },
+        {
+          Id: "56df4cef-8053-bff3-21f7-1b1841a3d6e6",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/56df4cef-8053-bff3-21f7-1b1841a3d6e6",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 41,
+        },
+        {
+          Id: "a3e3dab9-7a61-f822-d113-42f46bc5e8ce",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a3e3dab9-7a61-f822-d113-42f46bc5e8ce",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 42,
+        },
+        {
+          Id: "1cc195b9-e498-179d-b927-6d706266decb",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/1cc195b9-e498-179d-b927-6d706266decb",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 43,
+        },
+        {
+          Id: "7dca834f-d959-898e-a0cb-5c8244c4c4a9",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7dca834f-d959-898e-a0cb-5c8244c4c4a9",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 44,
+        },
+        {
+          Id: "13eeba83-2e93-800e-e934-a56061633c64",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/13eeba83-2e93-800e-e934-a56061633c64",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 45,
+        },
+        {
+          Id: "971f0a62-92a3-6d04-53c5-51fa9155e28c",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/971f0a62-92a3-6d04-53c5-51fa9155e28c",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 46,
+        },
+        {
+          Id: "2959d06c-5ac7-f3b9-63d4-1a56e3974fc7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/2959d06c-5ac7-f3b9-63d4-1a56e3974fc7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 47,
+        },
+      ];
+      let path = "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com";
+      let files = new Array();
+      for (let i = 0; i < InstanceInfoList.length; i++) {
+        let item = InstanceInfoList[i];
+        let obj = {
+          name: "file" + i,
+          url: path + item.Path,
+        };
+        files.push(obj);
      }
+      store.dispatch("trials/setUnLock", true);
+      // let res = await downloadImage(zipName, files);
+      store.dispatch("trials/setUnLock", false);
    },
  },
+  beforeDestroy() {
+    store.dispatch("trials/setUnLock", false);
+  },
 };
 </script>
 <style lang="scss" scoped>
@@ -1,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>
@@ -1,6 +1,5 @@
 import { SubjectCheckConfig } from './module/Subject'

-console.log(SubjectCheckConfig.moduleType)
 export const checkConfig = {
  ModuleType: {
    ...SubjectCheckConfig.ModuleType
@@ -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>
@@ -10,7 +10,7 @@ const dialogDrag = Vue.directive('dialogDrag', {
    dragDom.style.cssText += ';top:0px;'

    // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
-    const sty = (function() {
+    const sty = (function () {
      if (window.document.currentStyle) {
        return (dom, attr) => dom.currentStyle[attr]
      } else {
@@ -47,8 +47,10 @@ const dialogDrag = Vue.directive('dialogDrag', {
        styL = +styL.replace(/\px/g, '')
        styT = +styT.replace(/\px/g, '')
      }
+      const oldMousemove = document.onmousemove

-      document.onmousemove = function(e) {
+      document.onmousemove = function (e) {
+        oldMousemove(e)
        // 通过事件委托，计算移动的距离
        let left = e.clientX - disX
        const top = e.clientY - disY
@@ -70,8 +72,8 @@ const dialogDrag = Vue.directive('dialogDrag', {
        dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`
      }

-      document.onmouseup = function(e) {
-        document.onmousemove = null
+      document.onmouseup = function (e) {
+        document.onmousemove = oldMousemove
        document.onmouseup = null
      }
    }
@@ -14,13 +14,13 @@

    <div class="right-menu">
      <div class="navbar-flex-wrapper">
-        <template v-if="device!=='mobile'">
+        <template v-if="device !== 'mobile'">
          <screenfull id="screenfull" class="right-menu-item hover-effect" />
        </template>
        <!-- <div class="avatar-container">
        <img src="@/assets/avatar.png" class="user-avatar">
      </div> -->
-        <div style="margin-left:20px;">
+        <div style="margin-left: 20px">
          <el-dropdown class="dropdown-container" trigger="click">
            <span class="el-dropdown-link">
              {{ `${name} (${userTypeShortName})` }}
@@ -30,10 +30,20 @@
            </span>
            <el-dropdown-menu slot="dropdown" class="user-dropdown">
              <el-dropdown-item v-if="!isReviewer">
-                <span style="display:block;" @click="editInfo">{{$t('system:navbar:button:Profile')}}</span>
+                <span style="display: block" @click="editInfo">{{
+                  $t('system:navbar:button:Profile')
+                }}</span>
+              </el-dropdown-item>
+              <!-- 切换角色 -->
+              <el-dropdown-item divided v-if="hasRole">
+                <span style="display: block" @click="openToggleRole">{{
+                  $t('system:navbar:button:toggleRole')
+                }}</span>
              </el-dropdown-item>
              <el-dropdown-item divided>
-                <span style="display:block;" @click="logout">{{$t('system:navbar:button:Log Out')}}</span>
+                <span style="display: block" @click="logout">{{
+                  $t('system:navbar:button:Log Out')
+                }}</span>
              </el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
@@ -41,38 +51,119 @@
        <TopLang></TopLang>
      </div>
    </div>
+    <toggleRole
+      v-if="toggleRoleVisible"
+      :visible.sync="toggleRoleVisible"
+      :loading="toggleRoleLoading"
+      @save="loginByRole"
+    />
  </div>
 </template>

 <script>
-import {mapGetters, mapMutations} from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import TopLang from './topLang'
-
-
+import toggleRole from '@/components/toggleRole'
+import { resetRouter } from '@/router'
 export default {
  components: {
    Breadcrumb,
    Hamburger,
    Screenfull,
-    TopLang
+    TopLang,
+    toggleRole,
  },
  data() {
    return {
      isReviewer: false,
-      userTypeShortName: zzSessionStorage.getItem('userTypeShortName')
+      toggleRoleVisible: false,
+      toggleRoleLoading: false,
    }
  },
  computed: {
-    ...mapGetters(['sidebar', 'name', 'device'])
+    ...mapGetters(['sidebar', 'name', 'device', 'userTypeShortName']),
+    roles() {
+      return this.$store.state.user.roles
+    },
+    hasRole() {
+      return this.roles && this.roles.length > 1
+    },
  },
  created() {
-    this.isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer'))
+    // this.isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer'))
  },
  methods: {
    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    openToggleRole() {
+      this.$store.dispatch('user/getUserInfo').then((res) => {
+        this.toggleRoleVisible = true
+      })
+    },
+    loginByRole(userRoleId) {
+      if (this.$store.state.user.userId === userRoleId) {
+        this.toggleRoleVisible = false
+        this.toggleRoleLoading = false
+        return false
+      }
+      this.toggleRoleLoading = true
+      this.$store
+        .dispatch('user/loginByRole', { userRoleId })
+        .then((res) => {
+          if (res) {
+            this.$store
+              .dispatch('permission/generateRoutes')
+              .then(async (res) => {
+                if (res && res.length > 0) {
+                  resetRouter()
+                  await this.$store.dispatch('global/getNoticeList')
+                  this.$router.addRoutes(res)
+                  this.toggleRoleLoading = false
+                  if (this.loginType === 'DevOps') {
+                    this.$router.replace({ path: res[0].path })
+                    return
+                  }
+                  if (this.hasPermi(['role:radmin'])) {
+                    this.$router.replace({ path: res[0].path })
+                    return
+                  }
+                  if (
+                    this.hasPermi([
+                      'role:air',
+                      'role:rpm',
+                      'role:rcrc',
+                      'role:rir',
+                    ])
+                  ) {
+                    history.replaceState(null, null, '/trials/trials-list')
+                    history.go(0)
+                  } else {
+                    history.replaceState(null, null, '/trials/trials-workbench')
+                    history.go(0)
+                  }
+                  this.toggleRoleVisible = false
+                  this.toggleRoleLoading = false
+                  this.$EventBus.$emit('reload')
+                } else {
+                  // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
+                  this.toggleRoleLoading = false
+                  this.$message.warning(this.$t('login:message:login2'))
+                }
+              })
+              .catch((err) => {
+                console.log(err)
+                this.toggleRoleLoading = false
+              })
+          } else {
+            this.toggleRoleLoading = false
+          }
+        })
+        .catch(() => {
+          this.toggleRoleLoading = false
+        })
+    },
    toggleSideBar() {
      this.$store.dispatch('app/toggleSideBar')
    },
@@ -84,23 +175,23 @@ export default {
      } else {
        this.$router.push(`/login`)
      }
-      this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      // //this.$i18n.locale = 'zh'
+      // //this.setLanguage('zh')
      this.$updateDictionary()
    },
    editInfo() {
      this.$router.push({ name: 'BaiscInfo' })
    },
-  }
+  },
 }
 </script>

 <style lang="scss" scoped>
-.navbar-flex-wrapper{
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-  }
+.navbar-flex-wrapper {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
 .navbar {
  height: 50px;
  overflow: hidden;
@@ -22,7 +22,7 @@
 import { mapGetters } from 'vuex'
 import Logo from './Logo'
 import SidebarItem from './SidebarItem'
-import variables from '@/styles/variables.scss'
+import variables from '@/styles/variables.module.scss'

 export default {
  components: { SidebarItem, Logo },
@@ -73,7 +73,7 @@ export default {
  position: relative;
  overflow: hidden;
  width: 100%;
-  /deep/ {
+  ::v-deep {
    .el-scrollbar__bar {
      bottom: 0px;
    }
@@ -57,7 +57,7 @@ export default {

 <style lang="scss" scoped>
@import "~@/styles/mixin.scss";
-@import "~@/styles/variables.scss";
+@import "~@/styles/variables.module.scss";

 .app-wrapper {
  @include clearfix;
@@ -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' // 浅绿色主题
@@ -16,7 +15,7 @@ import '@/styles/index.scss' // global css
 import App from './App'
 import store from './store'
 import router from './router'
-
+import WHITELIST from "./utils/whiteList"
 import '@/icons' // icon
 import '@/permission' // permission control
 import md5 from 'js-md5'
@@ -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)
@@ -145,6 +145,12 @@ Vue.config.productionTip = false
 Vue.prototype.$upload = () => {
  _vm.$forceUpdate()
 }
+Vue.prototype.$guid = () => {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+    return v.toString(16);
+  });
+}
 Vue.prototype.fileToBlob = (file) => {
  // 创建 FileReader 对象
  const reader = new FileReader()
@@ -168,7 +174,7 @@ var _vm
 async function VueInit() {
  var params
  var res
-  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct')) {
+  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct') || ~window.location.href.indexOf('/fusion')) {
    params = $q('TrialReadingCriterionId')
    res = await getBasicDataAllSelect(params)
  } else if (~window.location.href.indexOf('/ecrfPreview')) {
@@ -186,6 +192,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) => {
@@ -246,6 +255,19 @@ async function VueInit() {
    } catch (e) {
    }
  }
+  Vue.prototype.$company = (isShort = true) => {
+    let companyName = null
+    if (localStorage.getItem('CompanyInfo')) {
+      let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo'))
+      let isZh = zzSessionStorage.getItem('lang') === 'zh' || _vm.$i18n.locale == 'zh'
+      if (isZh) {
+        companyName = isShort ? CompanyInfo.CompanyShortNameCN : CompanyInfo.CompanyNameCN
+      } else {
+        companyName = isShort ? CompanyInfo.CompanyShortName : CompanyInfo.CompanyName
+      }
+    }
+    return companyName;
+  }
  Vue.prototype.$updateDictionary = function () {
    Vue.prototype.$d = function (code) {
      var dictInfo = res.Result
@@ -271,15 +293,23 @@ async function VueInit() {
    }()
    _vm.$forceUpdate()
  }
+  Vue.prototype.$EventBus = new Vue()
  Vue.prototype.$path = []
  var t = function (key) {
-    // if (![Vue.prototype.toPath + '_' + key].includes(Vue.prototype.$path)) {
    if (!~Vue.prototype.$path.indexOf(key)) {
-      // Vue.prototype.$path.push(Vue.prototype.toPath + '_' + key)
      Vue.prototype.$path.push(key)
    }
-    // return i18n.t(Vue.prototype.toPath + '_' + key)
-    return i18n.t(key)
+    let text = i18n.t(key)
+    if (Array.isArray(store.state.trials.config.TrialObjectNameList) && store.state.trials.config.TrialObjectNameList.length > 0) {
+      let arr = JSON.parse(JSON.stringify(store.state.trials.config.TrialObjectNameList))
+      arr.sort((a, b) => b.Name.length - a.Name.length)
+      arr.forEach(item => {
+        let test = new RegExp(item.Name, 'ig')
+        text = text.replace(test, item.TrialName)
+      })
+    }
+    // return i18n.t(key)
+    return text;
  }
  Vue.prototype.$t = t
  _vm = new Vue({
@@ -290,7 +320,8 @@ async function VueInit() {
    data: {
      unlock: {
        my_username: null,
-        my_password: null
+        my_password: null,
+        view: false
      }
    },
    render: h => h(App)
@@ -301,7 +332,7 @@ 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 (WHITELIST.includes(_vm.$route.path)) {
        return
      }
      if (_vm.$store.state.user.userId !== zzSessionStorage.getItem('userId')) {
@@ -358,19 +389,30 @@ async function VueInit() {
  }
  const h = _vm.$createElement
  /* eslint-disable */
-  window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME;
+  // 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 || WHITELIST.includes(_vm.$route.path)) {
      count = 0;
      localStorage.setItem('count', '0')
      return
    }
    _vm.$store.dispatch('user/logout').then(res => {
      // window.location.href = `/login`
-      if (_vm.$msgbox) {
-        _vm.$msgbox.close();
+      try {
+        if (_vm.$msgbox && _vm.$msgbox.close) {
+          _vm.$msgbox.close();
+        }
+      } catch (err) {
+        console.log(err)
      }
+      _vm.$FB.close();
+      _vm.$FBT.close();
+      _vm.$MFA.close();
      isOpen = false
      isLock = null
      zzSessionStorage.removeItem('isLock')
@@ -387,7 +429,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 || WHITELIST.includes(_vm.$route.path)) {
        count = 0;
        localStorage.setItem('count', '0')
        if (_vm.$route.path === '/login') {
@@ -409,25 +451,26 @@ async function VueInit() {
        beforeClose: (action, instance, done) => {
          if (action === 'confirm') {
            if (!_vm.unlock.my_username) {
-              _vm.$alert(_vm.$t("env:lock:msgBox:iupUser"))
+              _vm.$message.warning(_vm.$t("env:lock:msgBox:iupUser"))
              return
            }
            if (!_vm.unlock.my_password) {
-              _vm.$alert(_vm.$t("env:lock:msgBox:inpPassword"))
+              _vm.$message.warning(_vm.$t("env:lock:msgBox:inpPassword"))
              return
            }
            var my_username = zzSessionStorage.getItem('my_username')
            var my_password = zzSessionStorage.getItem('my_password')
            let my_userid = zzSessionStorage.getItem('userId')
-            let my_EMail = zzSessionStorage.getItem('my_EMail')
-            if (md5(_vm.unlock.my_password) === my_password && my_username === _vm.unlock.my_username) {
+            let my_EMail = zzSessionStorage.getItem('my_EMail') || ''
+            if (md5(_vm.unlock.my_password) === my_password && (my_username === _vm.unlock.my_username || my_EMail.toUpperCase() === vm.unlock.my_username.toUpperCase())) {
              resetReadingRestTime().then(() => {
              })
              const closeLock = (_vm) => {
                _vm.$message.success(_vm.$t("env:lock:msgBox:lockSuccess"))
                _vm.unlock = {
                  my_username: null,
-                  my_password: null
+                  my_password: null,
+                  view: false
                }
                isOpen = false
                count = 0;
@@ -440,22 +483,22 @@ 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: res.Result,
-                    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)
@@ -491,16 +534,21 @@ async function VueInit() {
            ]),
            h('el-form-item', {
              props: { label: _vm.$t("env:lock:msgBox:form:Password") },
+              attrs: {
+                style: "position: relative;"
+              }
            }, [
              h('input', {
                props: {
                  value: _vm.unlock.my_password
                },
+                ref: "unlock_my_password_input",
                attrs: {
                  id: 'my_password',
                  class: 'el-input__inner',
-                  type: 'password',
-                  autocomplete: 'new-password'
+                  type: _vm.unlock.view ? 'text' : 'password',
+                  autocomplete: 'new-password',
+                  style: "padding-right:25px"
                },
                on: {
                  change: (event) => {
@@ -510,7 +558,24 @@ async function VueInit() {
                    _vm.unlock.my_password = event.target.value
                  }
                }
-              })
+              }),
+              h('i', {
+                attrs: {
+                  id: 'my_password_view',
+                  class: "el-icon-view",
+                  style: "cursor: pointer;position: absolute;top:35%;right:10px"
+                },
+                on: {
+                  click: (event) => {
+                    _vm.unlock.view = !_vm.unlock.view
+                    if (_vm.unlock.view) {
+                      _vm.$refs['unlock_my_password_input'].type = "text"
+                    } else {
+                      _vm.$refs['unlock_my_password_input'].type = "password"
+                    }
+                  },
+                }
+              }),
            ])
          ])
        ])
@@ -518,5 +583,22 @@ 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('有新版本，请刷新页面');
+//   },
+// });


+export default _vm
@@ -1,22 +1,60 @@
 import router from './router'
+import { resetRouter } from '@/router'
 import store from './store'
 // import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
+import { getToken, removeToken } from '@/utils/auth'
 import Vue from 'vue'
 import { OSSclient } from './utils/oss'
+import WHITELIST from './utils/whiteList'
+import { getTrialExtralConfig } from '@/api/trials'
 // import getPageTitle from '@/utils/get-page-title'

 NProgress.configure({ showSpinner: false })

-const whiteList = ['/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
-
-router.beforeEach(async (to, from, next) => {
+const whiteList = WHITELIST
+store.state.trials.whiteList = whiteList
+router.beforeEach(async(to, from, next) => {
  NProgress.start()
  // 设置页面标题
-  // document.title = getPageTitle(to.meta.title)
-
+  // document.title = getPageTitle(to.meta.title) store.state.trials.whiteList.indexOf(to.path) === -1
+  if (!to.query.trialId) {
+    store.dispatch('trials/setConfig', {})
+  }
+  if (
+    to.query.trialId &&
+    to.query.trialId !==
+    store.state.trials.config.trialId
+  ) {
+    const res = await getTrialExtralConfig({
+      TrialId: to.query.trialId
+    })
+    if (res.IsSuccess) {
+      store.dispatch('trials/setConfig', {
+        trialId: to.query.trialId,
+        ...res.Result
+      })
+    }
+  }
+  if (!to.query.trialId) {
+    store.dispatch('trials/setConfig', {})
+  }
+  if (
+    to.query.trialId &&
+    to.query.trialId !==
+    store.state.trials.config.trialId
+  ) {
+    const res = await getTrialExtralConfig({
+      TrialId: to.query.trialId
+    })
+    if (res.IsSuccess) {
+      store.dispatch('trials/setConfig', {
+        trialId: to.query.trialId,
+        ...res.Result
+      })
+    }
+  }
  // 确定用户是否已登录
  const hasToken = getToken()
  Vue.prototype.toPath = to.path
@@ -24,16 +62,26 @@ router.beforeEach(async (to, from, next) => {
  if (hasToken) {
    if (to.path === '/login' || to.path === '/recompose' || to.path === '/email-recompose' || to.path === '/error' || to.path === '/ReviewersResearchForm' || to.path === '/ReviewersResearch') {
      if (to.path === '/ReviewersResearch') {
-        await this.$store.dispatch('user/logout')
-        OSSclient()
+        await OSSclient()
+        await store.dispatch('user/logout')
      }
      if (to.path === '/ReviewersResearchForm') {
-        OSSclient()
+        await OSSclient()
      }
      next()
      NProgress.done()
+    } else if (from.path === '/researchForm') {
+      removeToken()
+      const lang = to.query.lang || zzSessionStorage.getItem('lang')
+      next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`)
+      NProgress.done()
+    } else if (from.path === '/researchDetail_m') {
+      removeToken()
+      const lang = to.query.lang || zzSessionStorage.getItem('lang')
+      next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
+      NProgress.done()
    } else {
-      OSSclient()
+      await OSSclient()
      const hasGetUserInfo = store.getters.userId
      if (hasGetUserInfo) {
        next()
@@ -41,10 +89,13 @@ router.beforeEach(async (to, from, next) => {
        try {
          // 获取用户信息
          await store.dispatch('user/getInfo')
+          await store.dispatch('user/getUserInfo')
          const accessRoutes = await store.dispatch('permission/generateRoutes')
+          resetRouter()
          router.addRoutes(accessRoutes)
          next({ ...to, replace: true })
        } catch (error) {
+          console.log(error)
          // 删除token并进入登录页面以重新登录
          await store.dispatch('user/resetToken')
          next(`/login?redirect=${to.path}`)
@@ -55,14 +106,29 @@ 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') {
+        const lang = to.query.lang || zzSessionStorage.getItem('lang')
+        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=${lang}`)
+        } else {
+          next()
+        }
+      } else {
+        // 在免登录whiteList中，直接进入
+        if (to.path === '/readingDicoms' || to.path === '/noneDicomReading') {
+          await OSSclient()
+        }
+        next()
      }
-      next()
    } else {
      if (to.path === '/researchForm') {
-        next(`/researchLogin?`)
+        const lang = to.query.lang || zzSessionStorage.getItem('lang')
+        next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`)
+        NProgress.done()
+      } else if (to.path === '/researchDetail_m') {
+        const lang = to.query.lang || zzSessionStorage.getItem('lang')
+        next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
        NProgress.done()
      } else if (to.path === '/ReviewersResearchForm') {
        next(`/ReviewersResearch?`)
@@ -50,6 +50,11 @@ export const constantRoutes = [
    component: () => import('@/views/login/index'),
    hidden: true
  },
+  {
+    path: '/test',
+    component: () => import('@/views/test/index'),
+    hidden: true
+  },
  {
    path: '/resetpassword',
    component: () => import('@/views/forgetpassword/index'),
@@ -139,6 +144,12 @@ export const constantRoutes = [
    hidden: true,
    component: () => import('@/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt')
  },
+  {
+    path: '/fusion',
+    name: 'fusion',
+    hidden: true,
+    component: () => import('@/views/trials/trials-panel/reading/dicoms/components/Fusion/demo/index')
+  },

  {
    path: '/historyScreenshot',
@@ -201,6 +212,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'),
@@ -211,6 +234,11 @@ export const constantRoutes = [
    component: () => import('@/views/reviewers/ReviewersResearch'),
    hidden: true
  },
+  {
+    path: '/curriculumVitae',
+    component: () => import('@/views/reviewers/curriculumVitae/index'),
+    hidden: true
+  },
  {
    path: '/ReviewersResearchForm',
    component: () => import('@/views/reviewers/ReviewersResearchForm'),
@@ -3,10 +3,12 @@ const getters = {
  device: state => state.app.device,
  token: state => state.user.token,
  name: state => state.user.name,
+  userTypeShortName: state => state.user.userTypeShortName,
  permissions: state => state.user.permissions,
  tree: state => state.user.tree,
  userName: state => state.user.userName,
  userId: state => state.user.userId,
+  identityUserId: state => state.user.identityUserId,
  routes: state => state.permission.routes,
  asyncRoutes: state => state.permission.addRoutes,
  visitedViews: state => state.tagsView.visitedViews,
@@ -45,6 +47,9 @@ const getters = {
  language: state => state.lang.language,
  TotalNeedSignSystemDocCount: state => state.user.TotalNeedSignSystemDocCount,
  TotalNeedSignTrialDocCount: state => state.user.TotalNeedSignTrialDocCount,
-  TrialStatusStr: state => state.user.TrialStatusStr
+  IsFirstSysDocNeedSign: state => state.user.IsFirstSysDocNeedSign,
+  TrialStatusStr: state => state.user.TrialStatusStr,
+  lastViewportTaskId: state => state.noneDicomReview.lastViewportTaskId,
+  currentTaskState: state => state.noneDicomReview.currentTaskState
 }
 export default getters
@@ -12,7 +12,7 @@ import trials from './modules/trials'
 import financials from './modules/financials'
 import reading from './modules/reading'
 import lang from './modules/lang'
-
+import noneDicomReview from './modules/noneDicomReview'
 Vue.use(Vuex)

 const store = new Vuex.Store({
@@ -27,7 +27,8 @@ const store = new Vuex.Store({
    trials,
    financials,
    reading,
-    lang
+    lang,
+    noneDicomReview
  },
  getters
 })
@@ -0,0 +1,28 @@
+const getDefaultState = () => {
+  return {
+    lastViewportTaskId: null,
+    currentTaskState: 0
+  }
+}
+const state = getDefaultState
+
+const mutations = {
+
+}
+
+const actions = {
+  setLastViewportTaskId({ state }, id) {
+    state.lastViewportTaskId = id
+  },
+  setCurrentTaskState({ state }, taskState) {
+    state.currentTaskState = taskState
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+
@@ -35,26 +35,56 @@ const getDefaultState = () => {
  }
 }
 function getQuestions(questions) {
+  const criterionType = parseInt(localStorage.getItem('CriterionType'))
  questions.forEach(item => {
-    if (item.Type === 'table' && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
+    if ((item.Type === 'table' || item.Type === 'basicTable') && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
      item.TableQuestions.Answers.forEach(answerObj => {
-        answerObj.lesionPart = getQuestionAnswer(item.TableQuestions.Questions, 8, answerObj)
-        answerObj.loctation = getQuestionAnswer(item.TableQuestions.Questions, 6, answerObj)
-        answerObj.lesionLength = getQuestionAnswer(item.TableQuestions.Questions, 0, answerObj)
-        answerObj.lesionShort = getQuestionAnswer(item.TableQuestions.Questions, 1, answerObj)
        answerObj.isDicomReading = answerObj.IsDicomReading === 'True'
-        var isLymphLesion = getQuestionAnswer(item.TableQuestions.Questions, 2, answerObj)
-        isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
-        answerObj.isLymphLesion = isLymphLesion
-        answerObj.lesionState = getQuestionAnswer(item.TableQuestions.Questions, 7, answerObj)
-        var lesionNum = getQuestionAnswer(item.TableQuestions.Questions, 11, answerObj)
-        answerObj.lesionNum = lesionNum
+
        if (answerObj.RowId) {
-          var idx = item.TableQuestions.Questions.findIndex(i => i.QuestionMark === 11)
-          if (idx > -1) {
+          if (criterionType === 10) {
            // pcwg
+            var lesionNum = getQuestionAnswer(item.TableQuestions.Questions, 11, answerObj)
+            answerObj.lesionNum = lesionNum
            answerObj.saveTypeEnum = isNaN(parseInt(answerObj.lesionNum)) ? 1 : 2
+          } else if (criterionType === 19) {
+            // ivus
+            answerObj.area1 = getQuestionAnswer(item.TableQuestions.Questions, 1001, answerObj)
+            answerObj.area2 = getQuestionAnswer(item.TableQuestions.Questions, 1002, answerObj)
+            const v = getQuestionAnswer(item.TableQuestions.Questions, 1003, answerObj)
+            answerObj.diff = v
+            answerObj.saveTypeEnum = isNaN(parseFloat(v)) ? 1 : 2
+          } else if (criterionType === 20) {
+            // oct
+            if (item.LesionType === 101) {
+              answerObj.l1 = getQuestionAnswer(item.TableQuestions.Questions, 1011, answerObj)
+              answerObj.l2 = getQuestionAnswer(item.TableQuestions.Questions, 1012, answerObj)
+              answerObj.l3 = getQuestionAnswer(item.TableQuestions.Questions, 1013, answerObj)
+              const min = getQuestionAnswer(item.TableQuestions.Questions, 1014, answerObj)
+              answerObj.min = min
+              const mean = getQuestionAnswer(item.TableQuestions.Questions, 1015, answerObj)
+              answerObj.mean = mean
+              answerObj.saveTypeEnum = (isNaN(parseFloat(min)) || isNaN(parseFloat(mean))) ? 1 : 2
+            } else if (item.LesionType === 103) {
+              const angle = getQuestionAnswer(item.TableQuestions.Questions, 1016, answerObj)
+              answerObj.angle = angle
+              answerObj.saveTypeEnum = isNaN(parseFloat(angle)) ? 1 : 2
+            }
+          } else if (criterionType === 21) {
+            // MRI-PDFF
+            let isMeasurable = getQuestionAnswer(item.TableQuestions.Questions, 1105, answerObj)
+            answerObj.isMeasurable = isMeasurable
+            answerObj.mean = getQuestionAnswer(item.TableQuestions.Questions, 1104, answerObj)
+            answerObj.saveTypeEnum = parseInt(isMeasurable) === 1 && isNaN(parseFloat(answerObj.mean)) ? 1 : 2
          } else {
+            answerObj.lesionPart = getQuestionAnswer(item.TableQuestions.Questions, 8, answerObj)
+            answerObj.loctation = getQuestionAnswer(item.TableQuestions.Questions, 6, answerObj)
+            answerObj.lesionLength = getQuestionAnswer(item.TableQuestions.Questions, 0, answerObj)
+            answerObj.lesionShort = getQuestionAnswer(item.TableQuestions.Questions, 1, answerObj)
+            let isLymphLesion = getQuestionAnswer(item.TableQuestions.Questions, 2, answerObj)
+            isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
+            answerObj.isLymphLesion = isLymphLesion
+            answerObj.lesionState = getQuestionAnswer(item.TableQuestions.Questions, 7, answerObj)
            answerObj.saveTypeEnum = isNaN(parseInt(answerObj.lesionState)) ? 1 : 2
          }
        } else {
@@ -70,7 +100,7 @@ function getQuestions(questions) {
 }
 function findQuestionAndRemoveLesion(questions, obj) {
  for (var i = 0; i < questions.length; i++) {
-    if (questions[i].Type === 'table' && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType) && questions[i].TableQuestions.Answers.length > 0) {
+    if ((questions[i].Type === 'table' || questions[i].Type === 'basicTable') && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType) && questions[i].TableQuestions.Answers.length > 0) {
      var idx = questions[i].TableQuestions.Answers.findIndex(i => String(i.RowIndex) === String(obj.rowIndex))
      if (idx > -1) {
        questions[i].TableQuestions.Answers.splice(idx, 1)
@@ -86,7 +116,7 @@ function findQuestionAndRemoveLesion(questions, obj) {
 function findQuestionAndUpdateLesion(questions, obj) {
  for (var i = 0; i < questions.length; i++) {
    var item = questions[i]
-    if (item.Type === 'table' && item.Id === obj.questionId) {
+    if ((item.Type === 'table' || item.Type === 'basicTable') && item.Id === obj.questionId) {
      var idx = item.TableQuestions.Answers.findIndex(i => i.RowIndex === obj.rowIndex)
      item.TableQuestions.Answers[idx].isLymphLesion = obj.isLymphLesion
      item.TableQuestions.Answers[idx].loctation = obj.lesionOrgan
@@ -115,10 +145,10 @@ function findQuestionAndUpdateLesion(questions, obj) {
 }
 function findQuestionAndAddLesion(questions, obj) {
  for (var i = 0; i < questions.length; i++) {
-    if (questions[i].Type === 'table' && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType)) {
+    if ((questions[i].Type === 'table' || questions[i].Type === 'basicTable') && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType)) {
      var sourceObj = {}
      questions[i].TableQuestions.Questions.forEach(item => {
-        sourceObj[item.Id] = ''
+        sourceObj[item.Id] = null
      })
      var targetObj = Object.assign(sourceObj, obj.lesionObj)
      targetObj.IsCurrentTaskAdd = 'True'
@@ -483,6 +513,7 @@ const actions = {
    })
  },
  getMeasuredData({ state }, visitTaskId) {
+    console.log('getMeasuredData')
    return new Promise(resolve => {
      var index = state.visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId)
      if (state.visitTaskList[index].measureDataInit) {
@@ -499,6 +530,13 @@ const actions = {
              el.OtherMeasureData = JSON.parse(el.OtherMeasureData)
              el.OtherMeasureData.data.remark = el.OrderMarkName
            }
+            // if (el.TableQuestionMarkList.length > 0) {
+            //   let list = el.TableQuestionMarkList.map(i=>{
+            //     i.MeasureData = i.MeasureData ? JSON.parse(i.MeasureData) : ''
+            //     return i
+            //   })
+            //   el.TableQuestionMarkList = list
+            // }
            arr.push(el)
          })
          state.visitTaskList[index].MeasureData = arr
@@ -582,6 +620,13 @@ const actions = {
            el.MeasureData = JSON.parse(el.MeasureData)
            el.MeasureData.data.remark = el.OrderMarkName
          }
+          // if (el.TableQuestionMarkList.length > 0) {
+          //   let list = el.TableQuestionMarkList.map(i=>{
+          //     i.MeasureData = i.MeasureData ? JSON.parse(i.MeasureData) : ''
+          //     return i
+          //   })
+          //   el.TableQuestionMarkList = list
+          // }
          arr.push(el)
        })
        state.visitTaskList[index].MeasureData = arr
@@ -599,27 +644,40 @@ const actions = {
      resolve(noneDicomMeasureData)
    })
  },
-  addMeasuredData({ state }, obj) {
+  addMeasuredData({ state }, obj) { 
    return new Promise(resolve => {
+      const criterionType = parseInt(localStorage.getItem('CriterionType'))
      var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
      var measureData = state.visitTaskList[index].MeasureData
      // var idx = measureData.findIndex(item => item.MeasureData.uuid === obj.data.MeasureData.data.uuid)
-      var idx = measureData.findIndex(item => item.QuestionId === obj.data.QuestionId && item.RowIndex === obj.data.RowIndex)
-      if (idx > -1) {
-        for (const k in state.visitTaskList[index].MeasureData[idx]) {
-          if (k !== 'Id' && obj.data[k]) {
-            state.visitTaskList[index].MeasureData[idx][k] = obj.data[k]
+      
+      if (criterionType === 21) {
+        let i = measureData.findIndex(i=>i.TableQuestionId === obj.data.TableQuestionId)
+        if (i > -1) {
+          for (const k in state.visitTaskList[index].MeasureData[i]) {
+            if (k !== 'Id' && obj.data[k]) {
+              state.visitTaskList[index].MeasureData[i][k] = obj.data[k]
+            }
          }
+        } else {
+          state.visitTaskList[index].MeasureData.push(obj.data)
        }
-
-        // state.visitTaskList[index].MeasureData[idx].MeasureData = obj.data.MeasureData
-        console.log('更新标记成功', idx)
      } else {
-        state.visitTaskList[index].MeasureData.push(obj.data)
-        console.log('新增标记成功')
+        var idx = measureData.findIndex(item => item.QuestionId === obj.data.QuestionId && item.RowIndex === obj.data.RowIndex)
+        if (idx > -1) {
+          for (const k in state.visitTaskList[index].MeasureData[idx]) {
+            if (k !== 'Id' && obj.data[k]) {
+              state.visitTaskList[index].MeasureData[idx][k] = obj.data[k]
+            }
+          }
+          console.log('更新标记成功', idx)
+        } else {
+          state.visitTaskList[index].MeasureData.push(obj.data)
+          console.log('新增标记成功')
+        }
      }
+      
      // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
-      console.log(state.visitTaskList)
      resolve()
    })
  },
@@ -714,32 +772,45 @@ const actions = {
    return new Promise(resolve => {
      var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
      var measureData = state.visitTaskList[index].MeasureData
-
-      // var uuid = obj.measureData.data.uuid
-      // var idx = measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)
-      var idx = measureData.findIndex(item => item.QuestionId === obj.questionId && item.RowIndex === obj.rowIndex)
-      if (idx > -1) {
-        if (measureData[idx].FristAddTaskId) {
-          measureData[idx].MeasureData = ''
-          console.log('清除标记成功', idx)
-        } else {
-          measureData.splice(idx, 1)
-          console.log('移除标记成功', idx)
-        }
-        state.visitTaskList[index].MeasureData = measureData
-      } else if (obj.orderMarkName) {
+      const criterionType = parseInt(localStorage.getItem('CriterionType'))
+      if (criterionType === 21) {
        const i = measureData.findIndex(item => item.QuestionId === obj.questionId && item.OrderMarkName === obj.orderMarkName)
-        if (i > -1) {
-          if (measureData[i].FristAddTaskId) {
-            measureData[i].MeasureData = ''
-            console.log('清除标记成功', i)
-          } else {
-            measureData.splice(i, 1)
-            console.log('移除标记成功', i)
+          if (i > -1) {
+            if (measureData[i].FristAddTaskId) {
+              measureData[i].MeasureData = ''
+              console.log('清除标记成功', i)
+            } else {
+              measureData.splice(i, 1)
+              console.log('移除标记成功', i)
+            }
          }
-        }
        state.visitTaskList[index].MeasureData = measureData
+      } else {
+        var idx = measureData.findIndex(item => item.QuestionId === obj.questionId && item.RowIndex === obj.rowIndex)
+        if (idx > -1) {
+          if (measureData[idx].FristAddTaskId) {
+            measureData[idx].MeasureData = ''
+            console.log('清除标记成功', idx)
+          } else {
+            measureData.splice(idx, 1)
+            console.log('移除标记成功', idx)
+          }
+          state.visitTaskList[index].MeasureData = measureData
+        } else if (obj.orderMarkName) {
+          const i = measureData.findIndex(item => item.QuestionId === obj.questionId && item.OrderMarkName === obj.orderMarkName)
+          if (i > -1) {
+            if (measureData[i].FristAddTaskId) {
+              measureData[i].MeasureData = ''
+              console.log('清除标记成功', i)
+            } else {
+              measureData.splice(i, 1)
+              console.log('移除标记成功', i)
+            }
+          }
+          state.visitTaskList[index].MeasureData = measureData
+        }
      }
+      
      // if (idx > -1) {
      //   measureData.splice(idx, 1)

@@ -811,9 +882,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}|${index}`
-                    imageIds.push(imageId)
+                  if (study.IsCriticalSequence && instance.KeyFramesList.length > 0) {
+                    instance.KeyFramesList.map(i => {
+                      const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
+                      imageIds.push(imageId)
+                    })
+                  } else if (study.IsCriticalSequence && instance.KeyFramesList.length === 0) {
+                    // 兼容保存标记数据未存NumberOfFrames的情况，按序列展示
+                    for (let i = 0; i < instance.NumberOfFrames; i++) {
+                      const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
+                      imageIds.push(imageId)
+                    }
+                  } else {
+                    for (let i = 0; i < instance.NumberOfFrames; i++) {
+                      const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
+                      imageIds.push(imageId)
+                    }
                  }
                  instance.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${0}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
                } else {
@@ -1003,7 +1087,7 @@ const actions = {
    }
  },
  setImageloadedInfo({ state }, obj) {
-    console.log('setImageloadedInfo', obj)
+    // console.log('setImageloadedInfo', obj)
    // if(obj.instance === '20dd8fc9-51b0-ec63-942b-cb3006c72650')
    // var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
    // // const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount
@@ -1053,7 +1137,10 @@ const actions = {
    return new Promise(resolve => {
      var isReadingTaskViewInOrder = localStorage.getItem('isReadingTaskViewInOrder')
      if (parseInt(isReadingTaskViewInOrder) === 2) {
-        if (!state.lastCanvasTaskId) state.lastCanvasTaskId = taskId
+        if (!state.lastCanvasTaskId) {
+          console.log('setLastCanvasTaskId')
+          state.lastCanvasTaskId = taskId
+        }
      } else {
        state.lastCanvasTaskId = taskId
      }
@@ -9,6 +9,10 @@ const getDefaultState = () => {
    studyListQuery: null,
    unlock: false,
    config: {},
+    uploadTip: '0.00KB/s',
+    timer: null,
+    whiteList: [],
+    checkTaskId: null
  }
 }

@@ -1,5 +1,6 @@
 import { getToken, setToken, removeToken, setName, removeName } from '@/utils/auth'
-import { login, loginOut, getUserMenuTree, getUserPermissions } from '@/api/user'
+import { login, loginOut, getUserMenuTree, getUserPermissions, getUserLoginRoleList, loginSelectUserRole } from '@/api/user'
+import { getUser } from '@/api/admin'

 import { resetRouter } from '@/router'
 import md5 from 'js-md5'
@@ -7,22 +8,29 @@ const getDefaultState = () => {
  return {
    token: getToken(),
    name: '',
+    userTypeShortName: "",
    userName: '',
    userId: '',
+    identityUserId: '',
    avatar: '',
    permissions: [],
    tree: [],
    /* eslint-disable */
    TotalNeedSignSystemDocCount: eval(process.env.VUE_APP_WORD_FOR_PERMISSION) ? null : 0,
    TotalNeedSignTrialDocCount: eval(process.env.VUE_APP_WORD_FOR_PERMISSION) ? null : 0,
+    IsFirstSysDocNeedSign: false,
    TrialStatusStr: null,
-    isTestUser: false
+    isTestUser: false,
+    roles: []
  }
 }

 const state = getDefaultState()

 const mutations = {
+  SET_ROLES: (state, roles) => {
+    state.roles = roles
+  },
  RESET_STATE: (state) => {
    Object.assign(state, getDefaultState())
  },
@@ -34,6 +42,9 @@ const mutations = {
  SET_NAME: (state, name) => {
    state.name = name
  },
+  SET_USERTYPESHORTNAME: (state, userTypeShortName) => {
+    state.userTypeShortName = userTypeShortName
+  },
  SET_USERNAME: (state, name) => {
    state.userName = name
  },
@@ -49,9 +60,16 @@ const mutations = {
  SET_USERID: (state, id) => {
    state.userId = id
  },
+  SET_IDENTITYUSERID: (state, id) => {
+    state.identityUserId = id
+  },
  SET_ISTESTUSER: (state, isTestUser) => {
    state.isTestUser = eval(isTestUser)
  },
+  SET_IS_FIRST_SYSTEM_DOC_SIGN: (state, IsFirstSysDocNeedSign) => {
+    zzSessionStorage.setItem('IsFirstSysDocNeedSign', IsFirstSysDocNeedSign)
+    state.IsFirstSysDocNeedSign = IsFirstSysDocNeedSign
+  },
  SET_NEED_SIGN_SYSTEM_DOC_COUNT: (state, TotalNeedSignSystemDocCount) => {
    /* eslint-disable */
    if (eval(process.env.VUE_APP_WORD_FOR_PERMISSION) && !state.isTestUser) {
@@ -78,6 +96,9 @@ const mutations = {
 }

 const actions = {
+  setRoles({ commit }, roles) {
+    commit('SET_ROLES', roles)
+  },
  changeUserName({ commit }, userName) {
    commit('SET_USERNAME', userName)
  },
@@ -91,13 +112,15 @@ const actions = {
      if (UserId) {
        data.UserId = UserId;
      }
-      login(data).then(async response => {
+      getUserLoginRoleList(data).then(async response => {
        if (response.IsSuccess) {
          zzSessionStorage.removeItem('lastWorkbench')
          zzSessionStorage.setItem('my_username', username.trim())
          zzSessionStorage.setItem('my_password', md5(password))
          zzSessionStorage.setItem('my_EMail', response.Result.BasicInfo.EMail)
+          localStorage.setItem('CompanyInfo', JSON.stringify(response.Result.CompanyInfo))
          const data = response.Result
+          commit('SET_ROLES', data.BasicInfo.AccountList)
          if (data.BasicInfo.IsFirstAdd || data.BasicInfo.LoginState === 1) {
            try {
              zzSessionStorage.setItem('userId', data.BasicInfo.Id)
@@ -113,25 +136,24 @@ const actions = {
              zzSessionStorage.setItem('IsReviewer', data.BasicInfo.IsReviewer)
              zzSessionStorage.setItem('userName', data.BasicInfo.UserName)
              commit('SET_TOKEN', data.JWTStr)
-              commit('SET_NAME', data.BasicInfo.RealName)
-              zzSessionStorage.setItem('realName', data.BasicInfo.RealName)
+              // commit('SET_NAME', data.BasicInfo.UserName)
              zzSessionStorage.setItem('isTestUser', data.BasicInfo.IsTestUser)
              commit('SET_ISTESTUSER', data.BasicInfo.IsTestUser)
              commit('SET_USERNAME', data.BasicInfo.UserName)
-              commit('SET_USERID', data.BasicInfo.Id)
              setToken(data.JWTStr)
-              setName(data.BasicInfo.RealName)
-              const userString = decodeURIComponent(escape(window.atob(data.JWTStr.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
-              const user = JSON.parse(userString)
-              zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
-              zzSessionStorage.setItem('userId', user.id)
-              zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
-              var permissions = await getUserPermissions()
-              var menuTree = await getUserMenuTree()
-              commit('SET_TREE', menuTree.Result)
-              commit('SET_PERMISSIONS', permissions.Result)
-              zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
-              zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
+              // setName(data.BasicInfo.RealName)
+              // const userString = decodeURIComponent(escape(window.atob(data.JWTStr.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
+              // const user = JSON.parse(userString)
+              // zzSessionStorage.setItem('userId', user.identityUserId)
+              // commit('SET_IDENTITYUSERID', user.identityUserId)
+              // zzSessionStorage.setItem('identityUserId', user.identityUserId)
+              // zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
+              // var permissions = await getUserPermissions()
+              // var menuTree = await getUserMenuTree()
+              // commit('SET_TREE', menuTree.Result)
+              // commit('SET_PERMISSIONS', permissions.Result)
+              // zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
+              // zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
            } catch (e) {
              console.log(e)
            }
@@ -145,6 +167,51 @@ const actions = {
      })
    })
  },
+  loginByRole({ commit }, userInfo) {
+    const { userRoleId } = userInfo
+    let params = {
+      userRoleId
+    }
+    return new Promise((resolve, reject) => {
+
+      loginSelectUserRole(params).then(async response => {
+        if (response.IsSuccess) {
+          const data = response.Result
+
+          try {
+            commit('SET_TOKEN', data)
+            setToken(data)
+            commit('SET_USERID', userRoleId)
+            zzSessionStorage.setItem('userId', userRoleId)
+            const userString = decodeURIComponent(escape(window.atob(data.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
+            const user = JSON.parse(userString)
+            zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
+            commit('SET_USERTYPESHORTNAME', user.userTypeShortName)
+            commit('SET_NAME', user.fullName)
+            setName(user.fullName)
+            commit('SET_IDENTITYUSERID', user.identityUserId)
+            zzSessionStorage.setItem('identityUserId', user.identityUserId)
+            zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
+            var permissions = await getUserPermissions()
+            var menuTree = await getUserMenuTree()
+            commit('SET_TREE', menuTree.Result)
+            commit('SET_PERMISSIONS', permissions.Result)
+            zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
+            zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
+            zzSessionStorage.removeItem('lastWorkbench')
+          } catch (e) {
+            console.log(e)
+          }
+          resolve(response.Result)
+
+        } else {
+          reject(response.ErrorMessage)
+        }
+      }).catch(() => {
+        reject()
+      })
+    })
+  },
  setTree({ commit }, tree) {
    commit('SET_TREE', tree)
  },
@@ -154,6 +221,9 @@ const actions = {
  setTotalNeedSignSystemDocCount({ commit }, TotalNeedSignSystemDocCount) {
    commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', TotalNeedSignSystemDocCount)
  },
+  setIsFirstSysDocNeedSign({ commit }, IsFirstSysDocNeedSign) {
+    commit('SET_IS_FIRST_SYSTEM_DOC_SIGN', IsFirstSysDocNeedSign)
+  },
  setTotalNeedSignTrialDocCount({ commit }, TotalNeedSignTrialDocCount) {
    commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', TotalNeedSignTrialDocCount)
  },
@@ -169,32 +239,69 @@ const actions = {
    commit('SET_PERMISSIONS', JSON.parse(zzSessionStorage.getItem('permissions')))
    commit('SET_ISTESTUSER', zzSessionStorage.getItem('isTestUser'))
    const user = JSON.parse(userString)
-    commit('SET_NAME', zzSessionStorage.getItem('realName'))
-    commit('SET_USERID', user.id)
+    commit('SET_NAME', zzSessionStorage.getItem('Name'))
+    commit('SET_USERTYPESHORTNAME', user.userTypeShortName)
+    commit('SET_IDENTITYUSERID', user.identityUserId)
+    commit('SET_USERID', user.userRoleId)
    commit('SET_USERNAME', zzSessionStorage.getItem('userName'))
    commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')))
    commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignTrialDocCount')))
-    console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))
-    console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
+    commit('SET_IS_FIRST_SYSTEM_DOC_SIGN', zzSessionStorage.getItem('IsFirstSysDocNeedSign'))
+    // console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))
+    // console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
    zzSessionStorage.setItem('userName', user.name)
-    zzSessionStorage.setItem('userId', user.id)
+    zzSessionStorage.setItem('userId', user.userRoleId)
+    zzSessionStorage.setItem('identityUserId', user.identityUserId)
    zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
    zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
    return user
  },
  updateInfo({ commit, state }) {
-    commit('SET_NAME', zzSessionStorage.getItem('realName'))
+    commit('SET_NAME', zzSessionStorage.getItem('Name'))
+  },
+  // 获取用户信息
+  getUserInfo({ commit, state }) {
+    return new Promise((resolve, reject) => {
+      getUser().then(res => {
+        if (res.Result) {
+          commit('SET_ROLES', res.Result.AccountList)
+        }
+        resolve(res.Result)
+      }).catch(err => {
+        reject(err)
+      })
+    })
  },
  // user logout
  async logout({ commit, state }) {
    try {
      removeToken() // must remove  token  first
      await loginOut({
-        Userd: zzSessionStorage.getItem('userId')
+        UserRoleId: zzSessionStorage.getItem('userId'),
+        IdentityUserId: zzSessionStorage.getItem('identityUserId'),
      })
      resetRouter()
      removeName()
+      let lang = zzSessionStorage.getItem('lang')
      zzSessionStorage.clear()
+      zzSessionStorage.setItem('lang', lang)
+      commit('RESET_STATE')
+    } catch (e) {
+      console.log(e)
+    }
+  },
+  async resetData({ commit, state }) {
+    try {
+      removeToken() // must remove  token  first
+      // await loginOut({
+      //   UserRoleId: zzSessionStorage.getItem('userId'),
+      //   IdentityUserId: zzSessionStorage.getItem('identityUserId'),
+      // })
+      resetRouter()
+      removeName()
+      let lang = zzSessionStorage.getItem('lang')
+      zzSessionStorage.clear()
+      zzSessionStorage.setItem('lang', lang)
      commit('RESET_STATE')
    } catch (e) {
      console.log(e)
@@ -47,3 +47,6 @@
 .el-range-separator {
  box-sizing: content-box;
 }
+.el-select-dropdown__wrap{
+  max-height: 350px;
+}
@@ -1,4 +1,4 @@
-@import "./variables.scss";
+@import "./variables.module.scss";
@import "./mixin.scss";
@import "./transition.scss";
@import "./element-ui.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,234 @@ 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 {
+    margin-top: 15px;
    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;
+}
@@ -71,29 +71,49 @@ $sideBarWidth: 200px;
      border: none;
      height: 100%;
      width: 100% !important;
+      background-color: $menuBg;
    }

    // menu hover
    .submenu-title-noDropdown,
    .el-submenu__title {
+      color: $menuText !important;
      &:hover {
        background-color: $menuHover !important;
+        color: $menuActiveText !important;
      }
    }

    .is-active>.el-submenu__title {
      color: $subMenuActiveText !important;
    }
-
-    & .nest-menu .el-submenu>.el-submenu__title,
-    & .el-submenu .el-menu-item {
+    .el-menu-item {
+      color: $menuText !important;
+    }
+    .el-menu-item:focus, 
+    .el-menu-item:hover {
+      background-color: $subMenuBg !important;
+      color: $menuActiveText !important;
+    }
+    .el-submenu .el-menu-item {
      min-width: $sideBarWidth !important;
      background-color: $subMenuBg !important;
-
+      
      &:hover {
        background-color: $subMenuHover !important;
+        
      }
    }
+    // &.nest-menu .el-submenu>.el-submenu__title,
+    // &.el-submenu .el-menu-item {
+    //   min-width: $sideBarWidth !important;
+    //   background-color: $subMenuBg !important;
+      
+    //   &:hover {
+    //     background-color: $subMenuHover !important;
+        
+    //   }
+    // }
  }

  .hideSidebar {
@@ -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) => {
@@ -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)
    }
@@ -40,8 +40,9 @@ Vue.directive('dialogDrag', {
        styL = +styL.replace(/\px/g, '')
        styT = +styT.replace(/\px/g, '')
      }
-
+      const oldMousemove = document.onmousemove
      document.onmousemove = function(e) {
+        oldMousemove(e)
        // 通过事件委托，计算移动的距离
        let left = e.clientX - disX
        let top = e.clientY - disY
@@ -63,7 +64,7 @@ Vue.directive('dialogDrag', {
      }

      document.onmouseup = function(e) {
-        document.onmousemove = null
+        document.onmousemove = oldMousemove
        document.onmouseup = null
      }
      return false
@@ -0,0 +1,44 @@
+// crypto.js
+import CryptoJS from 'crypto-js';
+import { JSEncrypt } from "jsencrypt";
+import { getPublicKey } from "@/api/user.js"
+export const Crypto = {
+    AES: {
+        encrypt: function (plaintext, secretKey) {
+            return CryptoJS.AES.encrypt(plaintext, CryptoJS.enc.Utf8.parse(secretKey), {
+                mode: CryptoJS.mode.ECB,
+                padding: CryptoJS.pad.Pkcs7,
+                iv: ''
+            }).ciphertext.toString(CryptoJS.enc.Base64);
+        },
+        decrypt: function (ciphertext, secretKey) {
+            const bytes = CryptoJS.AES.decrypt(ciphertext, secretKey);
+            return bytes.toString(CryptoJS.enc.Utf8);
+        }
+    }
+};
+export const Encrypt = {
+    encrypt: async function (plaintext) {
+        let PublicKey = null;
+        if (sessionStorage.getItem('PublicKey')) {
+            PublicKey = atob(sessionStorage.getItem('PublicKey'));
+        } else {
+            try {
+                let res = await getPublicKey();
+                if (res.IsSuccess) {
+                    PublicKey = atob(res.Result)
+                    sessionStorage.setItem('PublicKey', res.Result)
+                } else {
+                    return false;
+                }
+            } catch (err) {
+                console.log(err)
+            }
+        }
+        let encryptor = new JSEncrypt()
+        encryptor.setPublicKey(PublicKey)
+        return encryptor.encrypt(plaintext)
+
+    },
+
+};
@@ -0,0 +1,30 @@
+import { Encrypt, Crypto } from "./crypto";
+export const encryptConfig = async (config) => {
+    let secretKey = randomRange(32, 32);
+    let encryptSecretKey = await Encrypt.encrypt(secretKey); // 密钥进行非对称加密
+    if (encryptSecretKey) {
+        config.headers['X-Encrypted-Key'] = encryptSecretKey;
+    }
+    if (config.data && Object.prototype.toString.call(config.data) === '[object Object]') {
+        Object.keys(config.data).forEach(async key => {
+            config.data[key] = Crypto.AES.encrypt(config.data[key], secretKey)
+            console.log(config.data[key], 'KEY')
+            // config.data[key] = await Encrypt.encrypt(config.data[key])
+        })
+    }
+    return config;
+}
+const randomRange = (min, max, charStr) => {
+    var returnStr = "",
+        range;
+    if (typeof max == 'string') {
+        charStr = max;
+    }
+    range = ((max && typeof max == 'number') ? Math.round(Math.random() * (max - min)) + min : min);
+    charStr = charStr || 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    for (var i = 0; i < range; i++) {
+        var index = Math.round(Math.random() * (charStr.length - 1));
+        returnStr += charStr.substring(index, index + 1);
+    }
+    return returnStr;
+}
@@ -34,7 +34,7 @@ export function parseTime(time, cFormat) {
  const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
    const value = formatObj[key]
    // Note: getDay() returns 0 on Sunday
-    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] }
+    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
    return value.toString().padStart(2, '0')
  })
  return time_str
@@ -51,12 +51,44 @@ export function param2Obj(url) {
  }
  return JSON.parse(
    '{"' +
-      decodeURIComponent(search)
-        .replace(/"/g, '\\"')
-        .replace(/&/g, '","')
-        .replace(/=/g, '":"')
-        .replace(/\+/g, ' ') +
-      '"}'
+    decodeURIComponent(search)
+      .replace(/"/g, '\\"')
+      .replace(/&/g, '","')
+      .replace(/=/g, '":"')
+      .replace(/\+/g, ' ') +
+    '"}'
  )
 }

+export function deepClone(source, map = new WeakMap()) {
+  // 处理基本类型和函数（直接返回）
+  if (typeof source !== 'object' || source === null) {
+    return source;
+  }
+
+  // 处理循环引用
+  if (map.has(source)) {
+    return map.get(source);
+  }
+
+  // 创建新容器
+  const target = Array.isArray(source) ? [] : {};
+  map.set(source, target);  // 记录克隆关系
+
+  // 克隆普通键值
+  for (const key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      target[key] = deepClone(source[key], map);
+    }
+  }
+
+  // 克隆Symbol键值（ES6+）
+  const symbolKeys = Object.getOwnPropertySymbols(source);
+  for (const symKey of symbolKeys) {
+    if (source.propertyIsEnumerable(symKey)) {
+      target[symKey] = deepClone(source[symKey], map);
+    }
+  }
+
+  return target;
+}
@@ -0,0 +1,103 @@
+import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
+function parseImageId(imageId) {
+  // build a url by parsing out the url scheme and frame index from the imageId
+  const firstColonIndex = imageId.indexOf(':');
+
+  let url = imageId.substring(firstColonIndex + 1);
+  const frameIndex = url.indexOf('frame=');
+
+  let frame;
+
+  if (frameIndex !== -1) {
+    const frameStr = url.substr(frameIndex + 6);
+
+    frame = parseInt(frameStr, 10);
+    url = url.substr(0, frameIndex - 1);
+  }
+
+  return {
+    scheme: imageId.substr(0, firstColonIndex),
+    url,
+    frame,
+  };
+}
+function getNumberValues(dataSet, tag, minimumLength) {
+  const values = [];
+  const valueAsString = dataSet.string(tag);
+
+  if (!valueAsString) {
+    return;
+  }
+  const split = valueAsString.split('\\');
+
+  if (minimumLength && split.length < minimumLength) {
+    return;
+  }
+  for (let i = 0; i < split.length; i++) {
+    values.push(parseFloat(split[i]));
+  }
+
+  return values;
+}
+function metaDataProvider(type, imageId) {
+  const parsedImageId = parseImageId(imageId);
+  const dataSet = cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.get(parsedImageId.url);
+
+  if (!dataSet) {
+    return;
+  }
+  if (type === 'imagePlaneModule') {
+    const imageOrientationPatient = getNumberValues(dataSet, 'x00200037', 6);
+    const imagePositionPatient = getNumberValues(dataSet, 'x00200032', 3);
+    const pixelSpacing = getNumberValues(dataSet, 'x00280030', 2);
+    const imagePixelSpacing = getNumberValues(dataSet, 'x00181164', 2);
+    const estimatedRadiographicMagnificationFactor = getNumberValues(dataSet, 'x00181114', 2);
+    let columnPixelSpacing = null;
+
+    let rowPixelSpacing = null;
+
+    if (pixelSpacing) {
+      rowPixelSpacing = pixelSpacing[0];
+      columnPixelSpacing = pixelSpacing[1];
+    } else if (imagePixelSpacing && estimatedRadiographicMagnificationFactor) {
+      rowPixelSpacing = imagePixelSpacing[0] / estimatedRadiographicMagnificationFactor[0];
+      columnPixelSpacing = imagePixelSpacing[1] / estimatedRadiographicMagnificationFactor[1];
+    } else if (imagePixelSpacing && !estimatedRadiographicMagnificationFactor) {
+      rowPixelSpacing = imagePixelSpacing[0];
+      columnPixelSpacing = imagePixelSpacing[1];
+    }
+
+    let rowCosines = null;
+
+    let columnCosines = null;
+
+    if (imageOrientationPatient) {
+      rowCosines = [
+        parseFloat(imageOrientationPatient[0]),
+        parseFloat(imageOrientationPatient[1]),
+        parseFloat(imageOrientationPatient[2]),
+      ];
+      columnCosines = [
+        parseFloat(imageOrientationPatient[3]),
+        parseFloat(imageOrientationPatient[4]),
+        parseFloat(imageOrientationPatient[5]),
+      ];
+    }
+
+    return {
+      frameOfReferenceUID: dataSet.string('x00200052'),
+      rows: dataSet.uint16('x00280010'),
+      columns: dataSet.uint16('x00280011'),
+      imageOrientationPatient,
+      rowCosines,
+      columnCosines,
+      imagePositionPatient,
+      sliceThickness: dataSet.floatString('x00180050'),
+      sliceLocation: dataSet.floatString('x00201041'),
+      pixelSpacing,
+      rowPixelSpacing,
+      columnPixelSpacing,
+    };
+  }
+}
+export default metaDataProvider;
@@ -0,0 +1,457 @@
+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 < shardSize) {
+        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 });
+        if (existBucket === 'true') {
+            progressFn(1, fileInformation.file, 0);
+            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 - lastPercentage);
+                            } else {
+                                console.log("未查询到时间")
+                                if (timeList.length > 0) {
+                                    bytesReceivedPerSecond[timeList[timeList.length - 1]] += fileInformation.file.size * (percentage - lastPercentage);
+                                } else {
+                                    bytesReceivedPerSecond[time] = fileInformation.file.size * (percentage - lastPercentage);
+                                }
+                            }
+                        }
+                    }
+                } 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);
+    // 将传入文件的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 }) {
+    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)
+}
+
@@ -0,0 +1,161 @@
+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 - checkData[saveFileId]);
+                    } else {
+                        // console.log("未查询到时间")
+                        if (timeList.length > 0) {
+                            bytesReceivedPerSecond[timeList[timeList.length - 1]] += data.file.size * (percentage - checkData[saveFileId]);
+                        } else {
+                            bytesReceivedPerSecond[time] = data.file.size * (percentage - checkData[saveFileId]);
+                        }
+                    }
+                }
+                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);
+        } else if (res.res.status === 404) {
+            delete savaData[saveFileId];
+            saveFinishedData(savaData);
+        }
+        return res;
+    } catch (e) {
+        console.log(e);
+        delete savaData[saveFileId];
+        saveFinishedData(savaData);
+        // 捕获超时异常。
+        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(() => {
+        // console.log(Object.assign({}, bytesReceivedPerSecond))
+        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)
+}
@@ -3,36 +3,51 @@ 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()
+  let res = null;
+  if (localStorage.getItem('stsToken')) {
+    res = JSON.parse(localStorage.getItem('stsToken'))
+  } else {
+    res = await GetObjectStoreToken()
+    localStorage.setItem('stsToken', JSON.stringify(res))
+  }
+
+  // res.Result.ObjectStoreUse = 'AWS';
  Vue.prototype.OSSclientConfig = { ...res.Result[res.Result.ObjectStoreUse] }
  Vue.prototype.OSSclientConfig.ObjectStoreUse = res.Result.ObjectStoreUse;
  Vue.prototype.OSSclientConfig.basePath = Vue.prototype.OSSclientConfig.viewEndpoint
  switch (res.Result.ObjectStoreUse) {
    case 'AliyunOSS':
      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) {
+        put: async function (objectName, object) {
+          OSSclient = await RefreshClient(OSSclient)
          return new Promise(async (resolve, reject) => {
            try {
              let _vm = router.default.app
              if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
                var objectItem = objectName.split('/')
-                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+                // objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+                objectItem[objectItem.length - 1] = `${objectItem[objectItem.length - 1].substring(
+                  0,
+                  objectItem[objectItem.length - 1].lastIndexOf('.')
+                )}__${new Date().getTime()}${objectItem[objectItem.length - 1].substring(
+                  objectItem[objectItem.length - 1].lastIndexOf('.')
+                ).toLocaleLowerCase()}`
                objectName = objectItem.join('/')
              }
              let res = await OSSclient.put(objectName, object)
@@ -49,6 +64,52 @@ async function ossGenerateSTS() {
              reject()
            }
          })
+        },
+        multipartUpload: async (data, progress) => {
+          OSSclient = await RefreshClient(OSSclient)
+          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[config.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]
+                objectItem[objectItem.length - 1] = `${objectItem[objectItem.length - 1].substring(
+                  0,
+                  objectItem[objectItem.length - 1].lastIndexOf('.')
+                )}__${new Date().getTime()}${objectItem[objectItem.length - 1].substring(
+                  objectItem[objectItem.length - 1].lastIndexOf('.')
+                ).toLocaleLowerCase()}`
+                data.path = objectItem.join('/')
+              }
+              let res = await customerHttp(OSSclient, data, progress);
+              if (res) {
+                resolve({
+                  name: data.path,
+                  url: Vue.prototype.OSSclientConfig.viewEndpoint + decodeUtf8(res.name)
+                })
+              } else {
+                reject()
+              }
+            } catch (err) {
+              console.log(err)
+              reject(err)
+            }
+          })
+        },
+        close: () => {
+          OSSclose();
        }
      }
      break
@@ -86,49 +147,127 @@ async function ossGenerateSTS() {
              console.log(e)
            }
          })
+        },
+        close: () => {
+          return false
        }
      }
      break
    case 'AWS':
-      let aws = new Minio.Client(Vue.prototype.OSSclientConfig);
+      Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+      let aws = new S3Client({
+        endpoint: Vue.prototype.OSSclientConfig.viewEndpoint,
+        region: Vue.prototype.OSSclientConfig.region,
+        s3ForcePathStyle: true,
+        signatureVersion: 'v4',
+        forcePathStyle: true,
+        // SessionToken: '',
+        credentials: {
+          accessKeyId: Vue.prototype.OSSclientConfig.accessKeyId,
+          secretAccessKey: Vue.prototype.OSSclientConfig.secretAccessKey,
+          sessionToken: Vue.prototype.OSSclientConfig.sessionToken
+        }
+      });
      Vue.prototype.OSSclient = {
-        put: function (objectName, object) {
-          return new Promise(async (resolve, reject) => {
-            try {
-              var name = objectName.split('/')[objectName.split('/').length - 1]
-              let _vm = router.default.app
-              if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
-                var objectItem = objectName.split('/')
-                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
-                objectName = objectItem.join('/')
-              }
-              const reader = new FileReader();
-              reader.onload = (ex) => {
-                const bufferStream = new stream.PassThrough()
-                bufferStream.end(Buffer.from(ex.target.result))
-                aws.putObject(Vue.prototype.OSSclientConfig.bucketName, objectName, bufferStream, function (err, etag) {
-                  if (err) {
-                    console.log(err)
-                    reject()
-                  } else {
-                    console.log(objectName);
-                    resolve({
-                      name: objectName,
-                      url: Vue.prototype.OSSclientConfig.viewEndpoint + decodeUtf8(objectName)
-                    })
-                  }
-                })
-              };
-              reader.readAsArrayBuffer(object);
-            } catch (e) {
-              console.log(e)
-            }
-          })
+        put: async function (objectName, object) {
+          let data = {
+            file: object,
+            path: objectName
+          }
+          aws = await RefreshClient(aws);
+          return uploadAWS(aws, data, () => { });
+        },
+        multipartUpload: async (data, progress) => {
+          aws = await RefreshClient(aws);
+          return uploadAWS(aws, data, progress);
+        },
+        close: () => {
+          AWSclose();
        }
      }
  }
  return
 }
+// AWS上传函数
+function uploadAWS(aws, data, progress) {
+  return new Promise(async (resolve, reject) => {
+    try {
+      const { file, path } = data;
+      if (!file || !path) return reject('file and path be required');
+      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]
+        objectItem[objectItem.length - 1] = `${objectItem[objectItem.length - 1].substring(
+          0,
+          objectItem[objectItem.length - 1].lastIndexOf('.')
+        )}__${new Date().getTime()}${objectItem[objectItem.length - 1].substring(
+          objectItem[objectItem.length - 1].lastIndexOf('.')
+        ).toLocaleLowerCase()}`
+        data.path = objectItem.join('/')
+      }
+      let bucketName = data.path.split("/")[1] || Vue.prototype.OSSclientConfig.bucket
+      let curPath = data.path;
+      data.path = data.path.replace(`/${bucketName}/`, '');
+      await exist(aws, bucketName, data, progress, (path, status) => {
+        if (status === 'success') {
+          resolve({
+            name: decodeUtf8(curPath),
+            url: Vue.prototype.OSSclientConfig.viewEndpoint + decodeUtf8(curPath)
+          })
+        } else {
+          reject()
+        }
+      });
+
+    } catch (err) {
+      console.log(err)
+      reject(err)
+    }
+  })
+}
+// client过期刷新
+async function RefreshClient(client) {
+  let config = await getSTSToken(Vue.prototype.OSSclientConfig.expiration);
+  if (config) {
+    // config.Result.ObjectStoreUse = 'AWS'
+    switch (config.Result.ObjectStoreUse) {
+      case 'AliyunOSS': {
+        Vue.prototype.OSSclientConfig = { ...config.Result[config.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
+        return new OSS(Vue.prototype.OSSclientConfig);
+      }
+      case "MinIO": {
+        return client;
+      }
+      case "AWS": {
+        Vue.prototype.OSSclientConfig = { ...config.Result[config.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
+        return new S3Client({
+          endpoint: Vue.prototype.OSSclientConfig.viewEndpoint,
+          region: Vue.prototype.OSSclientConfig.region,
+          s3ForcePathStyle: true,
+          signatureVersion: 'v4',
+          forcePathStyle: true,
+          credentials: {
+            accessKeyId: Vue.prototype.OSSclientConfig.accessKeyId,
+            secretAccessKey: Vue.prototype.OSSclientConfig.secretAccessKey,
+            sessionToken: Vue.prototype.OSSclientConfig.sessionToken
+          }
+        });
+      }
+    }
+
+  } else {
+    return client;
+  }
+}
 function decodeUtf8(bytes) {
  let str = bytes.split('?');
  let str2 = str[0].split('/');
@@ -138,6 +277,48 @@ 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;
+        localStorage.setItem('stsToken', JSON.stringify(res))
+        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);
+  const now = new Date();
+  // 如果有效期不足五分钟，视为过期。
+  return expireDate.getTime() - now.getTime() <= 300000;
+
+}

 export const OSSclient = ossGenerateSTS
@@ -113,10 +113,14 @@ export const parseDicom = (file, name = false) => {
                    }
                })
                uintKey.forEach(key => {
-                    res[key] = data.uint16(dicom[key])
+                    if (res.hasOwnProperty(key)) {
+                        res[key] = data.uint16(dicom[key])
+                    }
                })
                intStringKey.forEach(key => {
-                    res[key] = data.intString(dicom[key])
+                    if (res.hasOwnProperty(key)) {
+                        res[key] = data.intString(dicom[key])
+                    }
                })
                defaultKey.forEach(key => {
                    if (!res[key] && res.hasOwnProperty(key)) {
@@ -185,8 +189,8 @@ const dicomToPng = (imageId, width, height) => {
    return new Promise((resolve) => {
        cornerstone.loadImage(imageId).then(async (image) => {
            let canvas = document.createElement("canvas");
-            canvas.width = width;
-            canvas.height = height;
+            canvas.width = (width * 60) / height
+            canvas.height = 60
            if (image) {
                cornerstone.renderToCanvas(canvas, image);
                // 将 Canvas 图像对象转换为 PNG 格式
@@ -14,8 +14,7 @@ service.interceptors.request.use(
  config => {
    config.headers['Content-Type'] = 'application/json;charset=UTF-8'
    var language = zzSessionStorage.getItem('lang')
-    config.headers['Accept-Language'] = language === 'en'?'en-US,en;q=0.5':'zh-CN,zh;q=0.9'
-    console.log(config.headers)
+    config.headers['Accept-Language'] = language === 'en'?'en-US,en;q=0.5':'zh-CN,zh;q=0.9'    
    if (store.getters.token) {
      config.headers.Authorization = `Bearer ${store.getters.token}`
    }
@@ -90,9 +89,9 @@ service.interceptors.response.use(
          })
          store.dispatch('user/logout').then(() => {
            router.push(`/login`)
-            this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
-            this.$updateDictionary()
+            //this.$i18n.locale = 'zh'
+            //this.setLanguage('zh')
+            // this.$updateDictionary()
          })
        }
      } else {
@@ -2,9 +2,10 @@ import axios from 'axios'
 import { Message, MessageBox, Alert } from 'element-ui'
 import store from '@/store'
 import router from '@/router'
-import Vue from 'vue'
+import WHITELIST from "./whiteList"
 import moment from 'moment-timezone';
-console.log(moment.tz.guess())
+import { encryptConfig } from "@/utils/encrypt"
+const ROUTER = require('@/router');
 axios.defaults.withCredentials = false
 const service = axios.create({
  baseURL: '/api',
@@ -16,18 +17,28 @@ var path
 // var lang = store.state.lang.language

 service.interceptors.request.use(
-  config => {
+  async config => {
    path = router && router.app && router.app._route && router.app._route.path
    config.headers['Content-Type'] = 'application/json;charset=UTF-8'
    var language = zzSessionStorage.getItem('lang')
    config.headers['Accept-Language'] = language === 'en' ? 'en-US,en;q=0.5' : 'zh-CN,zh;q=0.9'
    config.headers['TimeZoneId'] = moment.tz.guess()
-    if (store.getters.token) {
+    if (config.ENCRYPT) {
+      try {
+        config = await encryptConfig(config)
+      } catch (err) {
+        console.log(err)
+      }
+    }
+    if (store.getters.token && !config.clearToken) {
      config.headers.Authorization = `Bearer ${store.getters.token}`
    }
    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 (!path || WHITELIST.some(item => item === path)) {
          return config
        }
        if (store.state.user.userId !== zzSessionStorage.getItem('userId')) {
@@ -80,10 +91,20 @@ service.interceptors.response.use(
      const status = error.response.status
      if (error.response.data && (error.response.data.Code === -1 || error.response.data.Code === -2)) {
        store.dispatch('user/logout').then(() => {
+          let _vm = ROUTER.default.app
+          try {
+            if (_vm.$msgbox && _vm.$msgbox.close) {
+              _vm.$msgbox.close();
+            }
+          } catch (err) {
+            console.log(err)
+          }
          router.push(`/login`)
-          this.$i18n.locale = 'zh'
-          this.setLanguage('zh')
-          this.$updateDictionary()
+          // if (!this.$i18n.locale) {
+          //   //this.$i18n.locale = 'zh'
+          //   //this.setLanguage('zh')
+          // }
+          // this.$updateDictionary()
        })
      }
      switch (status) {
@@ -113,9 +134,9 @@ service.interceptors.response.use(
          }
          store.dispatch('user/logout').then(() => {
            router.push(`/login`)
-            this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
-            this.$updateDictionary()
+            // //this.$i18n.locale = 'zh'
+            // //this.setLanguage('zh')
+            // this.$updateDictionary()
          })
        } else {
          setTimer({
@@ -129,6 +150,7 @@ service.interceptors.response.use(
          setTimer([message, store.state.lang.language === 'en' ? 'Warning' : '警告', {
            type: 'warning',
            showCancelButton: false,
+            confirmButtonText: store.state.lang.language === 'en' ? 'ok' : "确定",
            callback: action => { }
          }], 'confirm')
        }
@@ -139,6 +161,7 @@ service.interceptors.response.use(
        [store.state.lang.language === 'en' ? 'Please check your network，and try again later！' : '请检查网络，稍后重试！', store.state.lang.language === 'en' ? 'Warning' : '警告', {
          type: 'warning',
          showCancelButton: false,
+          confirmButtonText: store.state.lang.language === 'en' ? 'ok' : "确定",
          callback: action => { }
        }], "confirm"
      )
@@ -157,6 +180,8 @@ const setTimer = (obj, type) => {
      Message(obj)
    }
    if (type === 'confirm') {
+      obj[2].closeOnClickModal = false
+      obj[2].closeOnPressEscape = false
      MessageBox.confirm(...obj)
    }
    clearTimeout(timer);
@@ -0,0 +1,106 @@
+import streamSaver from "streamsaver";
+import "streamsaver/examples/zip-stream.js";
+import store from '@/store'
+streamSaver.mitm = `${window.location.origin}/mitm.html?version=2.0.0`
+// 下载文件并压缩
+function zipFiles(zipName, files) {
+    return new Promise((resolve) => {
+        try {
+            console.log("同步下载打包开始时间：" + new Date());
+            store.dispatch('trials/setUnLock', true)
+            files = formatFiles(files)
+            // 创建压缩文件输出流  
+            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 {
+                        let { name, url } = fileInfo.value;
+                        // url = decodeUtf8(url); // 待定，可能做过特殊处理
+                        return fetch(url).then(res => {
+                            ctrl.enqueue({
+                                name,
+                                stream: () => res.body
+                            });
+                        })
+                    }
+                }
+            });
+            if (window.WritableStream && readableZipStream.pipeTo) {
+                // 开始下载  
+                readableZipStream
+                    .pipeTo(zipFileOutputStream)
+                    .then(() => {
+                        console.log("同步下载打包结束时间：" + new Date());
+                        store.dispatch('trials/setUnLock', false)
+                        resolve(true)
+                    }).catch(err => {
+                        console.log(err);
+                        resolve(false)
+                    });
+            } else {
+                resolve(false)
+            }
+        } catch (err) {
+            console.log(err);
+            resolve(false)
+        }
+    })
+
+}
+// 下载文件并修改名称
+async function updateFile(file, name) {
+    return new Promise(async resolve => {
+        try {
+            store.dispatch('trials/setUnLock', true)
+            const fileOutputStream = streamSaver.createWriteStream(name);
+            // file = decodeUtf8(file);
+            let res = await fetch(file);
+            res.body.pipeTo(fileOutputStream).then(() => {
+                store.dispatch('trials/setUnLock', true)
+                resolve(true)
+            }).catch(err => {
+                console.log(err)
+                resolve(false)
+            });
+        } catch (err) {
+            console.log(err)
+            resolve(false)
+        }
+    })
+}
+//  同名文件修改名称
+function formatFiles(files) {
+    let fileObj = {};
+    files.forEach(file => {
+        let arr = Object.keys(fileObj);
+        if (!~arr.indexOf(file.name)) {
+            fileObj[file.name] = 1;
+        } else {
+            let name = file.name;
+            file.name = name.split(".")[0] + `(${fileObj[name]})` + name
+                .substring(name.lastIndexOf('.'))
+                .toLocaleLowerCase()
+            fileObj[name]++;
+        }
+    })
+    return files;
+}
+function decodeUtf8(bytes) {
+    let str = bytes.split('?');
+    let str2 = str[0].split('/');
+    let name = str2[str2.length - 1];
+    name = encodeURIComponent(name);
+    str.shift();
+    str2.pop();
+    return str2.join("/") + '/' + name;
+}
+export async function downLoadFile(file, name, type = 'file') {
+    if (type === 'zip') return await zipFiles(name, file);
+    return await updateFile(file, name)
+
+}
@@ -1,199 +0,0 @@
-import JSZip from "jszip";
-import axios from "axios";
-import { saveAs } from "file-saver";
-import Vue from 'vue';
-import store from "@/store";
-import {
-    requestPackageAndAnonymizImage,
-} from "@/api/load.js";
-let flag = {};
-export const resetFlag = () => {
-    flag = {};
-    store.dispatch("trials/setUnLock", false);
-}
-export const downloadImage = async (id, id2, IsDicom = true) => {
-    if (flag[`${id2}_${IsDicom}`]) return Vue.prototype.$message.warning(Vue.prototype.$t('trials:upload:tip:uploading'));
-    flag[`${id2}_${IsDicom}`] = true
-    try {
-        let params = {
-            TrialId: id,
-            SubjectVisitId: id2,
-            IsDicom: IsDicom
-        }
-        store.dispatch("trials/setUnLock", true);
-        let res = await requestPackageAndAnonymizImage(params);
-        if (res.IsSuccess) {
-            if (!res.Result) {
-                flag[`${id2}_${IsDicom}`] = false;
-                Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not"))
-                return 1;
-            }
-            Vue.prototype.$message.success(Vue.prototype.$t("trials:upload:message:startUpload"));
-            let href = Vue.prototype.OSSclientConfig.basePath + res.Result;
-            download(href, res.OtherInfo.FileName, { id2, IsDicom })
-            return 2;
-            // let a = document.createElement("a");
-            // // let fileName =
-            // //     res.Result.split("/")[res.Result.split("/").length - 1];
-            // a.download = res.OtherInfo.FileName;
-            // a.href = href;
-            // a.click();
-            // URL.revokeObjectURL(href);
-            // let timer = setTimeout(() => {
-            //     a = null;
-            //     href = null;
-            //     timer = null;
-            // }, 500)
-            // return 2;
-        } else {
-            flag[`${id2}_${IsDicom}`] = false;
-            return false;
-        }
-    } catch (err) {
-        flag[`${id2}_${IsDicom}`] = false;
-        console.log(err);
-    }
-};
-const setfolder = async (item) => {
-    const zip = new JSZip(); // 创建实例对象
-    let patientIds = item.PatientList.map(i => i.PatientIdStr);
-    let zipName = `${item.SubjectCode}_${patientIds.join(',')}`;
-    let zipObj = {};
-    const promises = [];
-    for (let visit of item.VisitList) {
-        if (!zipObj[`${visit.VisitName}`]) {
-            zipObj[`${visit.VisitName}`] = zip.folder(visit.VisitName);
-        }
-        for (let study of visit.StudyList) {
-            let date = study.StudyTime.split(" ")[0];
-            for (let series of study.SeriesList) {
-                if (
-                    !zipObj[
-                    `${visit.VisitName}${series.Modality}`
-                    ]
-                ) {
-                    zipObj[
-                        `${visit.VisitName}${series.Modality}`
-                    ] = zipObj[`${visit.VisitName}`].folder(
-                        `${date}_${series.Modality}`
-                    );
-                }
-                for (let instance of series.InstancePathList) {
-                    let obj = {
-                        subjectCode: item.SubjectCode,
-                        visitName: visit.VisitName,
-                        date: study.StudyTime.split(" ")[0],
-                        modality: series.Modality,
-                        instancePath: instance.Path,
-                        dicomName: instance.Path.split("/Dicom/")[1],
-                    };
-                    const promise = handleBatchDown(
-                        obj,
-                        zipObj[
-                        `${visit.VisitName}${series.Modality}`
-                        ],
-                    );
-                    promises.push(promise);
-                }
-            }
-        }
-    }
-    // 生成 zip 文件
-    Promise.all(promises)
-        .then(() => {
-            // 生成zip 文件
-            zip
-                .generateAsync({
-                    type: "blob",
-                    compression: "DEFLATE", // STORE: 默认不压缩， DEFLATE：需要压缩
-                    compressionOptions: {
-                        level: 9, // 压缩等级 1~9   1 压缩速度最快， 9 最优压缩方式
-                    },
-                })
-                .then((res) => {
-                    saveAs(res, zipName + ".zip"); // 使用FileSaver.saveAs保存文件，文件名可自定义
-                    flag[`${id2}_${IsDicom}`] = false;
-                    zipObj = null;
-                });
-        })
-        .catch((reason) => { flag[`${id2}_${IsDicom}`] = false; });
-};
-const handleBatchDown = async (item, zip) => {
-    return new Promise((resolve) => {
-        getFileData(
-            Vue.prototype.OSSclientConfig.basePath + item.instancePath
-        ).then((res) => {
-            const fileName = item.dicomName + ".dcm";
-            zip.file(fileName, res.data, { binary: true });
-            resolve();
-        });
-    });
-};
-const getFileData = (fileUrl) => {
-    return new Promise((resolve, reject) => {
-        axios(fileUrl, {
-            method: "GET",
-            responseType: "blob", // 返回的数据会被强制转为blob类型 ，转换成arraybuffer 也行
-        })
-            .then((res) => {
-                resolve(res);
-            })
-            .catch((error) => {
-                reject(error);
-            });
-    });
-};
-export const fileDownload = (content, filename) => {
-    const eleLink = document.createElement("a");
-    eleLink.download = filename;
-    eleLink.style.display = "none";
-    const blob = new Blob([content]);
-    eleLink.href = URL.createObjectURL(blob);
-    document.body.appendChild(eleLink);
-    eleLink.click();
-    document.body.removeChild(eleLink);
-};
-let download = async (downloadUrl, downloadFileName, res) => {
-    const blob = await getBlob(downloadUrl);
-    flag[`${res.id2}_${res.IsDicom}`] = false;
-    store.dispatch("trials/setUnLock", false);
-    saveAsB(blob, downloadFileName);
-}
-
-let getBlob = (url) => {
-    return new Promise((resolve, reject) => {
-        const xhr = new XMLHttpRequest();
-
-        xhr.open('GET', url, true);
-        xhr.responseType = 'blob';
-        xhr.onload = () => {
-            if (xhr.status === 200) {
-                resolve(xhr.response);
-            } else {
-                reject(new Error(`Request failed with status ${xhr.status}`));
-            }
-        };
-        xhr.onerror = () => {
-            reject(new Error('Request failed'));
-        };
-
-        xhr.send();
-    });
-}
-
-let saveAsB = (blob, filename) => {
-    const link = document.createElement('a');
-    const body = document.body;
-
-    link.href = window.URL.createObjectURL(blob);
-    link.download = filename;
-
-    // hide the link
-    link.style.display = 'none';
-    body.appendChild(link);
-
-    link.click();
-    body.removeChild(link);
-
-    window.URL.revokeObjectURL(link.href);
-}
--- a/Show More
+++ b/Show More