影像浏览问题修复

# Conflicts:
#	src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue

.env.development

@@ -5,7 +5,8 @@ NODE_ENV = 'development'
 VUE_APP_BASE_PATH = '/'
 
 VUE_APP_IS_TEST = false
-
+# onlyoffice地址
+VUE_APP_ONLYOFFICE_URL = "https://onlyoffice.test.extimaging.com"
 # base api
 VUE_APP_BASE_API = 'http://123.56.94.154:7000'
 

.env.prod

@@ -5,6 +5,9 @@ NODE_ENV = 'prod'
 # base public path
 VUE_APP_BASE_PATH = '/'
 
+# onlyoffice地址
+VUE_APP_ONLYOFFICE_URL = "https://office.extimaging.com"
+
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
 

.env.production

@@ -3,6 +3,8 @@ ENV = 'production'
 NODE_ENV = 'production'
 # base public path
 VUE_APP_BASE_PATH = '/'
+# onlyoffice地址
+VUE_APP_ONLYOFFICE_URL = "https://onlyoffice.test.extimaging.com"
 
 VUE_APP_IS_TEST = true
 

.env.prop

@@ -2,6 +2,9 @@
 ENV = 'prop'
 NODE_ENV = 'prop'
 
+# base public path
+VUE_APP_BASE_PATH = '/'
+
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
 

.env.uat

@@ -4,6 +4,9 @@ NODE_ENV = 'production'
 # base public path
 VUE_APP_BASE_PATH = '/'
 
+# onlyoffice地址
+VUE_APP_ONLYOFFICE_URL = "https://onlyoffice.test.extimaging.com"
+
 # base public path
 VUE_APP_BASE_PATH = '/'
 

.env.usa

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

.env.usa_prod

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

.eslintrc.js

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

.svn/pristine/a5/a510475a0912f21efb3b36f41ecdfc3f783e4b6d.svn-base

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

README-zh.md

@@ -5,3 +5,6 @@ npm install
 # 启动服务
 npm run dev
 
+# v1.9.0修改
+1. 角色修改，全局userId实际意义修改为userRoleId（用户角色id），新增identityUserId（新的用户id）
+

babel.config.js

@@ -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',
+    '@vue/babel-plugin-transform-vue-jsx'
-    '@babel/plugin-proposal-nullish-coalescing-operator'
+    // '@babel/plugin-proposal-optional-chaining',
+    // '@babel/plugin-proposal-nullish-coalescing-operator'
   ]
 }

irc_vue_drone.yml

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

package.json

@@ -14,85 +14,94 @@
     "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/core": "^2.19.7",
-    "@cornerstonejs/dicom-image-loader": "^1.27.4",
+    "@cornerstonejs/dicom-image-loader": "^2.19.7",
-    "@cornerstonejs/streaming-image-volume-loader": "1.23.2",
+    "@cornerstonejs/tools": "^2.19.7",
-    "@cornerstonejs/tools": "^1.27.4",
+    "@icr/polyseg-wasm": "^0.4.0",
-    "@ffmpeg/core": "^0.10.0",
+    "@microsoft/signalr": "^8.0.7",
-    "@ffmpeg/ffmpeg": "^0.10.1",
+    "@riophae/vue-treeselect": "^0.4.0",
-    "@microsoft/signalr": "^6.0.8",
+    "@vue-office/docx": "^1.6.2",
-    "@riophae/vue-treeselect": "0.4.0",
+    "@vue-office/excel": "^1.7.11",
+    "@vue/composition-api": "^1.7.2",
     "ali-oss": "^6.17.1",
-    "axios": "0.18.1",
+    "axios": "^0.18.1",
-    "babel-eslint": "7.2.3",
-    "copy-webpack-plugin": "^4.5.2",
     "core-js": "^3.8.3",
-    "cornerstone-core": "^2.3.0",
+    "cornerstone-core": "^2.6.1",
-    "cornerstone-math": "^0.1.8",
+    "cornerstone-math": "^0.1.10",
-    "cornerstone-tools": "^6.0.8",
+    "cornerstone-tools": "^6.0.10",
-    "cornerstone-wado-image-loader": "^3.1.2",
+    "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",
+    "element-ui": "^2.15.14",
-    "exceljs": "^4.1.0",
+    "exceljs": "^4.4.0",
     "file-saver": "^2.0.5",
     "hammerjs": "^2.0.8",
     "html2canvas": "^1.4.1",
-    "js-md5": "^0.7.3",
+    "js-md5": "^0.8.3",
-    "jszip": "^3.7.1",
+    "jsencrypt": "^3.3.2",
-    "moment": "^2.27.0",
+    "jszip": "^3.10.1",
-    "node-polyfill-webpack-plugin": "^2.0.1",
+    "minio": "^7.1.3",
-    "node-sass": "^4.14.1",
+    "moment": "^2.30.1",
-    "normalize.css": "7.0.0",
+    "moment-timezone": "^0.5.46",
-    "nprogress": "0.2.0",
+    "node-xlsx": "^0.24.0",
-    "path-to-regexp": "2.4.0",
+    "normalize.css": "^8.0.1",
-    "pdfobject": "^2.2.8",
+    "nprogress": "^0.2.0",
-    "popper.js": "^1.16.1",
+    "path-to-regexp": "^0.1.10",
-    "sass-loader": "^8.0.0",
+    "pdfobject": "^2.3.0",
-    "screenfull": "^4.2.0",
+    "prismjs": "^1.30.0",
-    "sortablejs": "^1.15.0",
+    "qrcodejs2": "^0.0.2",
-    "v-viewer": "^1.6.4",
+    "screenfull": "^6.0.2",
+    "sortablejs": "^1.15.5",
+    "streamsaver": "^2.0.6",
+    "svg-sprite-loader": "^4.1.3",
+    "svgo": "^1.2.2",
+    "v-viewer": "^1.7.4",
     "vcrontab": "^0.3.5",
-    "vue": "^2.6.11",
+    "vue": "^2.6.14",
-    "vue-clipboard2": "^0.3.1",
+    "vue-clipboard2": "^0.3.3",
-    "vue-contextmenujs": "^1.3.13",
+    "vue-contextmenujs": "^1.4.11",
     "vue-count-to": "^1.0.13",
-    "vue-i18n": "^8.7.0",
+    "vue-demi": "^0.14.10",
-    "vue-pdf": "^4.3.0",
+    "vue-i18n": "^8.28.2",
+    "vue-prism-editor": "^1.3.0",
     "vue-puzzle-vcode": "^1.1.10",
-    "vue-router": "3.0.6",
+    "vue-router": "^3.0.6",
-    "vue-seamless-scroll": "^1.1.21",
+    "vue-seamless-scroll": "^1.1.23",
     "vuedraggable": "^2.24.3",
-    "vuex": "3.1.0",
+    "vuex": "^3.1.0",
-    "webpack-aliyun-oss": "^0.4.9"
+    "webpack-aliyun-oss": "^0.3.13"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
+    "@babel/core": "^7.12.16",
-    "@babel/plugin-proposal-optional-chaining": "^7.21.0",
+    "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "~4.5.4",
+    "@babel/plugin-transform-class-static-block": "^7.26.0",
-    "@vue/cli-plugin-eslint": "~4.5.4",
+    "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
-    "@vue/cli-service": "~4.5.4",
+    "@vue/cli-plugin-babel": "~5.0.0",
-    "autoprefixer": "^9.5.1",
+    "@vue/cli-plugin-eslint": "~5.0.0",
-    "aws-sdk": "^2.1532.0",
+    "@vue/cli-service": "~5.0.0",
-    "babel-eslint": "^10.1.0",
+    "autoprefixer": "^10.4.20",
-    "chalk": "2.4.2",
+    "clean-webpack-plugin": "^4.0.0",
-    "connect": "3.6.6",
+    "copy-webpack-plugin": "^12.0.2",
-    "eslint": "^6.7.2",
+    "css-minimizer-webpack-plugin": "^7.0.0",
-    "eslint-plugin-vue": "^6.2.2",
+    "eslint": "^7.32.0",
-    "html-webpack-plugin": "3.2.0",
+    "eslint-plugin-vue": "^8.0.3",
-    "minio": "^7.1.3",
+    "html-webpack-plugin": "^5.6.3",
-    "moment-timezone": "^0.5.45",
+    "mini-css-extract-plugin": "^2.9.2",
-    "node-xlsx": "^0.21.0",
+    "node-polyfill-webpack-plugin": "^4.0.0",
-    "runjs": "^4.3.2",
+    "path-browserify": "^1.0.1",
-    "script-ext-html-webpack-plugin": "2.1.3",
+    "process": "^0.11.10",
-    "script-loader": "0.7.2",
+    "sass": "^1.63.2",
-    "serve-static": "^1.13.2",
+    "sass-loader": "^10.4.1",
-    "svg-sprite-loader": "4.1.3",
+    "terser-webpack-plugin": "^5.3.10",
-    "svgo": "1.2.2",
+    "vue-template-compiler": "^2.6.14",
-    "vue-template-compiler": "^2.6.11"
+    "webpack": "^5.96.1",
+    "webpack-bundle-analyzer": "^4.10.2"
   },
   "eslintConfig": {
     "root": true,
@@ -100,19 +109,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"
   ]
 }

public/error.html

@@ -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">
+            <div class="login-image login-image-usa">
-              <img src="./error_assets/login-bg.png">
+              <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;

public/errorEN.html

@@ -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">
+        <div class="login-image login-image-usa">
-          <img src="./error_assets/login-bg.png">
+          <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;

public/index.html

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

public/mitm.html

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

public/sw.js

@@ -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' })
+}

src/App.vue

@@ -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%">
+    <el-drawer
-      <div style="width: 320px">
+      :title="$t('il8n:title')"
-        <el-form label-width="100px" @submit.native.prevent size="small">
+      :visible.sync="drawer"
-          <el-form-item label="关键字">
+      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
@@ -35,8 +62,15 @@
         v-adaptive="{ bottomOffset: 50 }"
         height="100"
         style="width: 100%"
+        @sort-change="handleSortByColumn"
       >
-        <el-table-column prop="Code" label="标签" width="300">
+        <el-table-column
+          prop="Code"
+          :label="$t('il8n:table:label')"
+          width="300"
+          show-overflow-tooltip
+          sortable="custom"
+        >
         </el-table-column>
         <!--        <el-table-column-->
         <!--          prop="Description"-->
@@ -47,40 +81,78 @@
         <!--            {{scope.row.Description}}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column prop="Value" label="英文">
+        <el-table-column
+          prop="Value"
+          :label="$t('il8n:table:en')"
+          sortable="custom"
+        >
           <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')"
+          sortable="custom"
+        >
           <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')"
+          sortable="custom"
+        >
+          <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')"
+          sortable="custom"
+        >
+        </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" @click="drawer = false"
-        <el-button size="mini" type="primary" @click="handleSave"
+          >{{ $t('common:button:cancel') }}
-          >保存</el-button
+        </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 +160,14 @@
 import {
   batchAddOrUpdateFrontInternationalization,
   getFrontInternationalizationList,
-} from "@/api/dictionary/dictionary";
+} from '@/api/dictionary/dictionary'
-import { getTrialExtralConfig } from "@/api/trials";
+import { getTrialExtralConfig } from '@/api/trials'
-import Vue from "vue";
+import feedBack from '@/views/trials/trials-layout/components/feedBack'
-import i18n from "./lang";
+import Vue from 'vue'
+import i18n from './lang'
 export default {
-  name: "App",
+  name: 'App',
+  components: { feedBack },
   data() {
     return {
       drawer: false,
@@ -101,36 +175,63 @@ export default {
       show: false,
       key: null,
       arr: [],
-    };
+      il8nExternal: false,
+      State: null,
+    }
   },
   mounted() {
-    this.show = process.env.VUE_APP_OSS_PATH === "/test/dist";
+    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.$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,
-    },
   },
+  // 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: {
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.tableData.sort((a, b) =>
+          a[column.prop].localeCompare(b[column.prop])
+        )
+      } else {
+        this.tableData.sort((a, b) =>
+          b[column.prop].localeCompare(a[column.prop])
+        )
+      }
+    },
+    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 +239,111 @@ export default {
           [],
           this.arr.filter(
             (v) =>
-              ~v.Code.indexOf(this.key) ||
+              (v.Code &&
-              ~v.Value.indexOf(this.key) ||
+                ~v.Code.toLowerCase().indexOf(this.key.toLowerCase())) ||
-              ~v.ValueCN.indexOf(this.key)
+              (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(() => {
+      this.$confirm(this.$t("i18n:confirm:updatei18n"))
-        batchAddOrUpdateFrontInternationalization(this.tableData).then(
+        .then(() => {
-          async (res) => {
+          batchAddOrUpdateFrontInternationalization(this.tableData).then(
-            var zhMessages = {},
+            async (res) => {
-              enMessages = {};
+              var zhMessages = {},
-            var Internationalization = await getFrontInternationalizationList();
+                enMessages = {}
-            Vue.prototype.$tl = Internationalization.Result;
+              var Internationalization =
-            this.tableData.forEach((v) => {
+                await getFrontInternationalizationList()
-              // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
+              Vue.prototype.$tl = Internationalization.Result
-              // enMessages[v.Description + '_' + v.Code] = v.Value
+              this.tableData.forEach((v) => {
-              zhMessages[v.Code] = v.ValueCN;
+                // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
-              enMessages[v.Code] = v.Value;
+                // enMessages[v.Description + '_' + v.Code] = v.Value
-            });
+                zhMessages[v.Code] = v.ValueCN
-            i18n.mergeLocaleMessage("zh", zhMessages);
+                enMessages[v.Code] = v.Value
-            i18n.mergeLocaleMessage("en", enMessages);
+              })
-            this.drawer = false;
+              i18n.mergeLocaleMessage('zh', zhMessages)
-            this.$message.success("国际化修改成功");
+              i18n.mergeLocaleMessage('en', enMessages)
-          }
+              this.drawer = false
-        );
+              this.$message.success(this.$t("i18n:message:updatei18nSuccessfully"))
-      });
+              if (this.il8nExternal) {
+                this.$EventBus.$emit('il8nUpdate')
+              }
+            }
+          )
+        })
+        .catch((err) => {
+          console.log(err)
+        })
     },
-    openI18n() {
+    openI18n(ARRAY) {
-      this.tableData = [];
+      this.tableData = []
-      this.key = null;
+      this.il8nExternal = false
-      this.drawer = true;
+      this.State = null
-      let arr = [];
+      this.key = null
-      let tableData = this.$tl.map((v) => {
+      this.drawer = true
-        let a = { ...v };
+      let arr = []
-        // if (!a.Description) {
+      let tableData = []
-        //   a.Description = this.$route.path
+      if (ARRAY && Array.isArray(ARRAY)) {
-        // }
+        this.il8nExternal = true
-        return a;
+        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 +353,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 +386,7 @@ input::-webkit-inner-spin-button {
   -webkit-appearance: none !important;
 }
 
-input[type="number"] {
+input[type='number'] {
   -moz-appearance: textfield !important;
 }
 
@@ -269,10 +412,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>

src/api/admin.js

@@ -44,11 +44,19 @@ export function updateUser(param) {
     data: param
   })
 }
-
+export function updateUserBasicInfo(param) {
-export function getUser(userId) {
   return request({
-    url: `/user/getUser/${userId}`,
+    url: `/user/updateUserBasicInfo`,
-    method: 'get'
+    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
+  })
+}

src/api/dictionary.js

@@ -212,7 +212,20 @@ export function getSystemDocumentList(param) {
     data: param
   })
 }
-
+export function publishSystemDocument(param) {
+  return request({
+    url: `/SystemDocument/publishSystemDocument`,
+    method: 'post',
+    data: param
+  })
+}
+export function outLineSystemDocument(param) {
+  return request({
+    url: `/SystemDocument/outLineSystemDocument`,
+    method: 'post',
+    data: param
+  })
+}
 export function addOrUpdateSystemDocument(param) {
   return request({
     url: `/SystemDocument/addOrUpdateSystemDocument`,
@@ -220,6 +233,29 @@ export function addOrUpdateSystemDocument(param) {
     data: param
   })
 }
+// 新增/修改通用培训附件
+export function addOrUpdateSystemDocumentAttachment(param) {
+  return request({
+    url: `/SystemDocument/addOrUpdateSystemDocumentAttachment`,
+    method: 'post',
+    data: param
+  })
+}
+// 通用培训附件列表
+export function getSystemDocumentAttachmentList(param) {
+  return request({
+    url: `/SystemDocument/getSystemDocumentAttachmentList`,
+    method: 'post',
+    data: param
+  })
+}
+// 删除通用培训附件
+export function deleteSystemDocumentAttachment(systemDocumentAttachmentId) {
+  return request({
+    url: `/SystemDocument/deleteSystemDocumentAttachment/${systemDocumentAttachmentId}`,
+    method: 'delete',
+  })
+}
 
 export function deleteSystemDocument(id) {
   return request({
@@ -382,10 +418,11 @@ export function addOrUpdateBasicDic(param) {
   })
 }
 
-export function getDictionaryChildList(id) {
+export function getDictionaryChildList(data) {
   return request({
-    url: `/Dictionary/getChildList/${id}`,
+    url: `/Dictionary/getChildList`,
-    method: 'get'
+    method: 'post',
+    data
   })
 }
 
@@ -1014,3 +1051,349 @@ export function getTrialSiteList(params) {
     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
+  })
+}
+// 项目文档-上传同意入项记录
+export function uploadTrialFileTypeFile(data) {
+  return request({
+    url: `/TrialFileType/uploadTrialFileTypeFile`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-获取上传同意入项记录
+export function getTrialFileTypeFile(data) {
+  return request({
+    url: `/TrialFileType/getTrialFileTypeFile`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除上传同意入项记录
+export function deleteTrialTypeFile(params) {
+  return request({
+    url: `/TrialFileType/deleteTrialTypeFile`,
+    method: 'post',
+    params
+  })
+}
+// 项目文档-获取资质材料列表
+export function getTrialAttachments(data) {
+  return request({
+    url: `/Attachment/getTrialAttachments`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-修改资质材料稽查状态
+export function setAuthorizedViewC(data) {
+  return request({
+    url: `/Attachment/setAuthorizedView`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-上传资质材料
+export function saveTrialAttachments(data) {
+  return request({
+    url: `/Attachment/saveTrialAttachments`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-资质材料(获取医生列表)
+export function getTrialDoctorListC(data) {
+  return request({
+    url: `/Attachment/getTrialDoctorList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-修改资质材料
+export function updateTrialAttachments(data) {
+  return request({
+    url: `/Attachment/updateTrialAttachments`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除资质材料
+export function deleteAttachment(data) {
+  return request({
+    url: `/Attachment/deleteAttachment`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-获取历史记录列表
+export function getTrialHistoryRecordFileList(data) {
+  return request({
+    url: `/TrialHistoryRecordFile/getTrialHistoryRecordFileList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-新增/修改历史记录
+export function addOrUpdateTrialHistoryRecordFile(data) {
+  return request({
+    url: `/TrialHistoryRecordFile/addOrUpdateTrialHistoryRecordFile`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-批量新增历史记录
+export function batchAddTrialHistoryRecordFile(data) {
+  return request({
+    url: `/TrialHistoryRecordFile/batchAddTrialHistoryRecordFile`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除历史记录
+export function deleteTrialHistoryRecordFile(id) {
+  return request({
+    url: `/TrialHistoryRecordFile/deleteTrialHistoryRecordFile/${id}`,
+    method: 'delete',
+  })
+}
+// 邮件管理-批量修改邮件
+export function batchUpdateEmail(data) {
+  return request({
+    url: `/EmailNoticeConfig/batchUpdateEmail`,
+    method: 'post',
+    data
+  })
+}

src/api/dictionary/checkConfig.js

@@ -45,10 +45,19 @@ export function changeFrontAuditSort(param) {
   })
 }
 
-export function getModuleTypeDescriptionList(param) {
+export function getModuleTypeDescriptionList(params) {
   return request({
-    url: `${param === '' ? '/FrontAuditConfig/getModuleTypeDescriptionList' : '/FrontAuditConfig/getModuleTypeDescriptionList?moduleTypeId=' + param}`,
+    url: `/FrontAuditConfig/getModuleTypeDescriptionList`,
-    method: 'get'
+    method: 'get',
+    params
+  })
+}
+
+export function getModuleTypeList(data) {
+  return request({
+    url: `/FrontAuditConfig/getModuleTypeList`,
+    method: 'post',
+    data
   })
 }
 

src/api/dictionary/dictionary.js

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

src/api/export.js

@@ -72,7 +72,14 @@ export function getReadingTaskList_Export(param) {
     data: param
   })
 }
-
+export function getTrialVisitImageStatList_Export(param) {
+  return requestDownload({
+    url: '/ExcelExport/getTrialVisitImageStatList_Export',
+    method: 'post',
+    responseType: 'blob',
+    data: param
+  })
+}
 export function getReReadingTaskList_Export(param) {
   return requestDownload({
     url: '/ExcelExport/getReReadingTaskList_Export',
@@ -160,3 +167,109 @@ 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 getSysDocumentConfirmList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getSysDocumentConfirmList_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
+  })
+}

src/api/load.js

@@ -8,11 +8,11 @@ export function requestPackageAndAnonymizImage(params) {
     })
 }
 // 获取影像上传列表
-export function getSubjectImageUploadList(params) {
+export function getSubjectImageUploadList(data) {
     return request({
         url: '/DownloadAndUpload/getSubjectImageUploadList',
-        method: 'get',
+        method: 'post',
-        params
+        data
     })
 }
 // 预上传
@@ -40,3 +40,67 @@ export function deleteTaskStudy(params) {
         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
+    })
+}

src/api/reading.js

@@ -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
+  })
+}
+
+

src/api/research.js

@@ -12,7 +12,8 @@ export function verifySendCode(param) {
   return request({
     url: '/TrialSiteSurvey/verifySendCode',
     method: 'post',
-    data: param
+    data: param,
+    clearToken: true
   })
 }
 

src/api/reviewers.js

@@ -138,10 +138,11 @@ export function addOrUpdateResearchPublication(param) {
   })
 }
 
-export function getTrialExperience(doctorId) {
+export function getTrialExperience(data) {
   return request({
-    url: `/trialExperience/getTrialExperience/${doctorId}`,
+    url: `/trialExperience/getTrialExperience`,
-    method: 'get'
+    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}`,
+    url: `/doctor/getDetail`,
-    method: 'get'
+    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
+  })
+}

src/api/trials.js

@@ -286,10 +286,11 @@ export function trialSiteUserSummaryListExport(param) {
   })
 }
 
-export function getVisitStageList(trialId) {
+export function getVisitStageList(data) {
   return request({
-    url: `/visitPlan/getVisitStageList/${trialId}`,
+    url: `/visitPlan/getVisitStageList`,
-    method: 'get'
+    method: 'post',
+    data
   })
 }
 
@@ -1034,7 +1035,27 @@ export function getQCVisitList(param) {
     data: param
   })
 }
-
+export function getImageBackList(param) {
+  return request({
+    url: `/QCList/getImageBackList`,
+    method: 'post',
+    data: param
+  })
+}
+export function getImageBackApplyUserList(params) {
+  return request({
+    url: `/QCList/getImageBackApplyUserList`,
+    method: 'get',
+    params
+  })
+}
+export function auditImageBack(params) {
+  return request({
+    url: `/QCOperation/auditImageBack`,
+    method: 'put',
+    params
+  })
+}
 export function getQCChallengeList(param) {
   return request({
     url: `/QCList/getQCChallengeList`,
@@ -1079,6 +1100,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 +1398,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'
   })
 }
@@ -1585,6 +1619,13 @@ export function getDocumentConfirmList(param) {
     data: param
   })
 }
+export function getSysDocumentConfirmList(param) {
+  return request({
+    url: `/TrialDocument/getSysDocumentConfirmList`,
+    method: 'post',
+    data: param
+  })
+}
 export function getTrialUserSelect(trialId) {
   return request({
     url: `/TrialDocument/getTrialUserSelect/${trialId}`,
@@ -1599,6 +1640,13 @@ export function getTrialDocAndSystemDocType(trialId) {
   })
 }
 
+export function getSysDocSignUserList() {
+  return request({
+    url: `/TrialDocument/getSysDocSignUserList`,
+    method: 'get'
+  })
+}
+
 export function updateSubjectStatus(param) {
   return request({
     url: `/Subject/updateSubjectStatus`,
@@ -3294,6 +3342,13 @@ export function getReReadingApplyToBeDoneList(param) {
     data: param
   })
 }
+export function getPMImageBackToBeDoneList(param) {
+  return request({
+    url: `/PersonalWorkstation/getPMImageBackToBeDoneList`,
+    method: 'post',
+    data: param
+  })
+}
 
 export function deleteClinicalForm(param) {
   return request({
@@ -3675,6 +3730,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 +3786,415 @@ 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'
+  })
+}
+
+// 工作台-获取稽查文档
+export function getAuditDocumentData(data) {
+  return request({
+    url: `/AuditDocument/getAuditDocumentData`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-新增稽查文档
+export function addAuditDocument(data) {
+  return request({
+    url: `/AuditDocument/addAuditDocument`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-获取当前目录层级
+export function getBreadcrumbData(data) {
+  return request({
+    url: `/AuditDocument/getBreadcrumbData`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-修改稽查文档
+export function updateAuditDocument(data) {
+  return request({
+    url: `/AuditDocument/updateAuditDocument`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-删除稽查文档
+export function deleteAuditDocument(data) {
+  return request({
+    url: `/AuditDocument/deleteAuditDocument`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档获取历史版本
+export function getHistoricalVersion(data) {
+  return request({
+    url: `/AuditDocument/getHistoricalVersion`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档设置当前版本
+export function setCurrentVersion(data) {
+  return request({
+    url: `/AuditDocument/setCurrentVersion`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档移动
+export function movieFileOrFolder(data) {
+  return request({
+    url: `/AuditDocument/movieFileOrFolder`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档复制
+export function copyFileOrFolder(data) {
+  return request({
+    url: `/AuditDocument/copyFileOrFolder`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档授权
+export function setIsAuthorization(data) {
+  return request({
+    url: `/AuditDocument/setIsAuthorization`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档新增文件夹
+export function addFolder(data) {
+  return request({
+    url: `/AuditDocument/addFolder`,
+    method: 'post',
+    data
+  })
+}
+
+
+// 配置-项目文档发布
+export function publishTrialDocument(data) {
+  return request({
+    url: `/TrialDocument/publishTrialDocument`,
+    method: 'post',
+    data
+  })
+}
+// 配置-获取项目文档附件列表
+export function getTrialDocumentAttachmentList(data) {
+  return request({
+    url: `/TrialDocument/getTrialDocumentAttachmentList`,
+    method: 'post',
+    data
+  })
+}
+// 配置-新增或修改项目文档附件
+export function addOrUpdateTrialDocumentAttachment(data) {
+  return request({
+    url: `/TrialDocument/addOrUpdateTrialDocumentAttachment`,
+    method: 'post',
+    data
+  })
+}
+// 配置-删除项目文档附件
+export function deleteTrialDocumentAttachment(data) {
+  return request({
+    url: `/TrialDocument/deleteTrialDocumentAttachment/${data}`,
+    method: 'delete',
+  })
+}
+
+// 配置-获取稽查管理列表
+export function getTrialShowInspection(data) {
+  return request({
+    url: `/Inspection/getTrialShowInspection`,
+    method: 'post',
+    data
+  })
+}
+// 配置-设置稽查管理配置
+export function setTrialShowInspection(data) {
+  return request({
+    url: `/Inspection/setTrialShowInspection`,
+    method: 'post',
+    data
+  })
+}
+// 影像汇总-获取列表
+export function getTrialVisitImageStatList(data) {
+  return request({
+    url: `/DownloadAndUpload/getTrialVisitImageStatList`,
+    method: 'post',
+    data
+  })
+}
+// 影像汇总-获取统计
+export function getTrialVisitImageStatInfo(params) {
+  return request({
+    url: `/DownloadAndUpload/getTrialVisitImageStatInfo`,
+    method: 'get',
+    params
+  })
+}
+// 影像汇总-影像下载
+export function getExportSubjectVisitImageList(data) {
+  return request({
+    url: `/DownloadAndUpload/getExportSubjectVisitImageList`,
+    method: 'post',
+    data
+  })
+}

src/api/trials/reading.js

@@ -346,9 +346,9 @@ export function getReReadingOrBackInfluenceTaskList(taskId, isReReading, applyId
   })
 }
 
-export function PMSetTaskBack(trialId, taskId) {
+export function PMSetTaskBack(trialId, taskId, pmBackReason) {
   return request({
-    url: `/VisitTask/PMSetTaskBack/${trialId}/${taskId}`,
+    url: `/VisitTask/PMSetTaskBack/${trialId}/${taskId}/${pmBackReason}`,
     method: 'put'
   })
 }
@@ -459,9 +459,9 @@ export function setMedicalReviewInvalid(params) {
   })
 }
 
-export function getTrialCriterionList(trialId) {
+export function getTrialCriterionList(trialId, isRandom = false) {
   return request({
-    url: `/VisitTask/getTrialCriterionList?TrialId=${trialId}`,
+    url: `/VisitTask/getTrialCriterionList?TrialId=${trialId}&isRandom=${isRandom}`,
     method: 'get'
   })
 }
@@ -480,3 +480,11 @@ export function resetReadingRestTime() {
     method: 'post'
   })
 }
+// 设置随机排序
+export function setRandomTaskOrder(data) {
+  return request({
+    url: `/VisitTask/setRandomTaskOrder`,
+    method: 'post',
+    data
+  })
+}

src/api/trials/setting.js

@@ -110,4 +110,12 @@ export function addOrUpdateTrialBodyPart(data) {
     data
   })
 }
+// 修改检查名称列表
+export function updateTrialStudyNameList(data) {
+  return request({
+    url: `/TrialConfig/updateTrialStudyNameList`,
+    method: 'post',
+    data
+  })
+}
 

src/api/trials/visit.js

@@ -287,4 +287,12 @@ export function forwardSVDicomImage(param) {
     data: param
   })
 }
+// crc、iqc申请影像退回
+export function requestImageBack(params) {
+  return request({
+    url: `/QCOperation/requestImageBack`,
+    method: 'put',
+    params
+  })
+}
 

src/api/user.js

@@ -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,41 @@ 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,
+  })
+}
+// 忽略异地登录
+export function setIsIgnoreUncommonly(data) {
+  return request({
+    url: `/User/setIsIgnoreUncommonly`,
+    method: 'post',
+    data,
   })
 }

src/components/BaseContainer/index.vue

@@ -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{
+.box-body {
-     padding:  0px;
+  padding: 0px;
-     background-color: #fff;
+  background-color: #fff;
-     .el-card__body {
+  .el-card__body {
-      padding: 0px;
+    padding: 0px;
-    }
+  }
-    .search{
+  .search {
-      display: flex;
+    display: flex;
-      padding: 5px;
+    padding: 5px;
 
-      .mr5{
+    .mr5 {
-        margin-right:5px;
+      margin-right: 5px;
-      }
-      .el-form-item{
-        margin-bottom: 10px;
-      }
     }
-    .page{
+    .el-form-item {
-      text-align: right;
+      margin-bottom: 10px;
-      padding-top: 3px;
-    }
-    .el-button.is-circle {
-      padding: 9px;
-      font-weight: bold;
-      font-size: 14px;
     }
   }
+  .page {
+    text-align: right;
+    padding-top: 3px;
+  }
+  .el-button.is-circle {
+    padding: 9px;
+    font-weight: bold;
+    font-size: 14px;
+  }
+}
 </style>

src/components/BaseForm/search-form.vue

@@ -1,7 +1,7 @@
 <!-- 搜索表单 -->
 <template>
   <div class="base-search-form">
-    <el-form :size="size" :inline="true" :label-width="labelWidth">
+    <el-form :inline="true" :label-width="labelWidth">
       <el-form-item
         v-for="item in searchForm"
         :key="item.prop"
@@ -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="至"
+          :default-time="['00:00:00', '23:59:59']"
-          start-placeholder="开始时间"
+          :range-separator="$t('baseForm:daterange:rangeSeparator')"
-          end-placeholder="结束时间"
+          :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,18 @@
         <!-- 具名slot -->
         <slot v-if="item.type === 'Custom'" :name="item.slot" />
       </el-form-item>
-      <el-form-item v-for="item in searchHandle" :key="item.label">
+      <div style="display: inline-block;width: fit-content;">
-        <slot v-if="item.slot" :name="item.slot" />
+        <el-form-item v-for="item in searchHandle" :key="item.label">
-        <el-button
+          <slot v-if="item.slot" :name="item.slot" />
-          v-else
+          <el-button
-          :type="item.type"
+            v-else
-          :size="item.size || size"
+            :type="item.type"
-          :icon="item.icon || ''"
+            :icon="item.icon || ''"
-          @click="handleClick(item.emitKey)"
+            @click="handleClick(item.emitKey)"
-          >{{ item.label }}</el-button
+            >{{ item.label }}</el-button
-        >
+          >
-      </el-form-item>
+        </el-form-item>
+      </div>
     </el-form>
   </div>
 </template>
@@ -167,11 +175,11 @@ export default {
     },
     labelWidth: {
       type: String,
-      default: "",
+      default: '',
     },
     size: {
       type: String,
-      default: "mini",
+      default: 'mini',
     },
     searchForm: {
       type: Array,
@@ -189,10 +197,10 @@ export default {
   methods: {
     handleClick(emitKey) {
       // emit事件
-      this.$emit(`${emitKey}`);
+      this.$emit(`${emitKey}`)
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .base-search-form {

src/components/BaseModel/index.vue

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

src/components/BaseTable/index.vue

@@ -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,16 @@
                     &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
+                      :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 +91,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 +140,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 +200,12 @@ export default {
     },
     pagination() {
       this.$emit('getList')
-    }
+    },
-  }
+  },
 }
 </script>
 <style lang="scss" scoped>
-.page{
+.page {
   padding-top: 3px;
   text-align: right;
 }

src/components/Dicom/DicomCanvas.vue

@@ -1,15 +1,7 @@
 <template>
-  <div
+  <div id="canvas" ref="canvas" v-loading="loading" element-loading-text="Loading..."
-    id="canvas"
+    element-loading-background="rgba(0, 0, 0, 0.8)" style="width:100%;height:100%;position:relative;"
-    ref="canvas"
+    class="cornerstone-element" @contextmenu.prevent="onContextmenu" @mouseup="sliderMouseup">
-    v-loading="loading"
-    element-loading-text="Loading..."
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    style="width:100%;height:100%;position:relative;"
-    class="cornerstone-element"
-    @contextmenu.prevent="onContextmenu"
-    @mouseup="sliderMouseup"
-  >
     <div v-show="dicomInfo.series" class="info-series">
       <div>Series #{{ dicomInfo.series }}</div>
       <div>Image #{{ dicomInfo.frame }}</div>
@@ -26,9 +18,11 @@
       <div v-show="dicomInfo.location">Location {{ dicomInfo.location }}mm</div> -->
       <!-- <div v-show="toolState.clipPlaying">FPS {{ dicomInfo.fps }}</div> -->
       <div v-show="mousePosition.mo">
-        Pos: {{ mousePosition.x?mousePosition.x.toFixed(0):'' }}, {{ mousePosition.y?mousePosition.y.toFixed(0):'' }}
+        Pos: {{ mousePosition.x ? mousePosition.x.toFixed(0) : '' }}, {{ mousePosition.y ? mousePosition.y.toFixed(0) :
+          '' }}
       </div>
-      <div v-if="(dicomInfo.modality === 'CT' || dicomInfo.modality === 'DR' || dicomInfo.modality === 'CR') && mousePosition.mo">
+      <div
+        v-if="(dicomInfo.modality === 'CT' || dicomInfo.modality === 'DR' || dicomInfo.modality === 'CR') && mousePosition.mo">
         HU: {{ mousePosition.mo }}
       </div>
       <div v-else-if="(dicomInfo.modality === 'PT' && mousePosition.suv)">
@@ -53,8 +47,12 @@
       <!-- <div v-show="dicomInfo.acc">ACC {{ dicomInfo.acc }}</div> -->
       <!-- <div>{{ dicomInfo.time }}</div> -->
     </div>
-    <div ref="sliderBox" class="my_slider_box" style="position: absolute;right: 1px;height: calc(100% - 100px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer" @click.stop="goViewer($event)">
+    <div ref="sliderBox" class="my_slider_box"
-      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @mousedown="sliderMousedown($event)" />
+      style="position: absolute;right: 1px;height: calc(100% - 100px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer"
+      @click.stop="goViewer($event)">
+      <div :style="{ top: height + '%' }"
+        style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move"
+        @mousedown="sliderMousedown($event)" />
     </div>
     <div style="position: absolute;left: 50%;top: 15px;color: #f44336;">
       {{ markers.top }}
@@ -81,16 +79,18 @@
     <!-- <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>
+      <dicom-tags :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 +108,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 +166,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,18 +203,20 @@ 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
         this.toolState.dicomInfoVisible = false
-        var imageId = this.stack.imageIds[this.stack.currentImageIdIndex]
+        // var imageId = this.stack.imageIds[this.stack.currentImageIdIndex]
-        var instanceId = imageId.split('/')[imageId.split('/').length - 1]
+        // var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-        instanceId = instanceId.split('.')[0]
+        // instanceId = instanceId.split('.')[0]
-        this.stack.instanceId = instanceId
+        // this.stack.instanceId = instanceId
         this.toolState.clipPlaying = false
         const element = this.$refs.canvas
         cornerstone.enable(element)
+        cornerstoneTools.stopClip(this.canvas)
+        this.toolState.clipPlaying = false
         this.loading = true
 
         cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
@@ -248,7 +253,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
@@ -326,9 +337,9 @@ export default {
       //   return
       // }
       // this.stack.instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
-      var instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
+      // var instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
-      instanceId = instanceId.split('.')[0]
+      // instanceId = instanceId.split('.')[0]
-      this.stack.instanceId = instanceId
+      // this.stack.instanceId = instanceId
       this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
       this.resetWwwc()
     },
@@ -348,9 +359,8 @@ export default {
         data.string('x00080030')
       )
       this.dicomInfo.series = data.string('x00200011')
-      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${
+      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${this.stack.imageIds.length
-        this.stack.imageIds.length
+        }`
-      }`
       this.dicomInfo.size = `${data.uint16('x00280011')}x${data.uint16(
         'x00280010'
       )}`
@@ -362,12 +372,13 @@ 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)
+      const newImageIdIndex = this.stack.imageIds.findIndex(i => i === e.detail.image.imageId)
-      if(newImageIdIndex === -1) return
+      if (newImageIdIndex === -1) return
       this.stack.currentImageIdIndex = newImageIdIndex
       this.stack.imageIdIndex = newImageIdIndex
       this.series.imageIdIndex = newImageIdIndex
       this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
+      this.resetWwwc()
     },
     stackScrollCallback(e) {
       const { detail } = e
@@ -395,15 +406,16 @@ export default {
     },
 
     onImageRendered(e) {
-      var imageId = e.detail.image.imageId
+      // var imageId = e.detail.image.imageId
-      var instanceId = imageId.split('/')[imageId.split('/').length - 1]
+      // var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-      instanceId = instanceId.split('.')[0]
+      // instanceId = instanceId.split('.')[0]
 
-      if (this.imageId !== instanceId) {
+      // if (this.imageId !== instanceId) {
-        this.getOrientationMarker(e.detail.element)
+      //   this.getOrientationMarker(e.detail.element)
-        this.imageId = instanceId
+      //   this.imageId = instanceId
-      }
+      // }
-      this.stack.instanceId = instanceId
+      this.getOrientationMarker(e.detail.element)
+      // this.stack.instanceId = instanceId
       var viewport = e.detail.viewport
       this.dicomInfo.wwwc = `${Math.round(
         viewport.voi.windowWidth
@@ -634,7 +646,7 @@ export default {
       enabledElement.renderingTools.renderCanvasData = renderCanvasData
     },
     scrollPage(offset) {
-      if(this.loading) return
+      if (this.loading) return
       var index = this.stack.currentImageIdIndex + offset
       if (index < 0) index = 0
       else if (index >= this.stack.imageIds.length) {
@@ -646,7 +658,7 @@ export default {
     },
 
     toggleClipPlay() {
-      if(this.loading) return
+      if (this.loading) return
       if (this.toolState.clipPlaying) {
         cornerstoneTools.stopClip(this.canvas)
         this.toolState.clipPlaying = false
@@ -657,7 +669,7 @@ export default {
       cornerstoneTools.getToolState(
         this.canvas,
         'playClip'
-      ).data[0].loop = false
+      ).data[0].loop = true
     },
     setFps(fps) {
       this.dicomInfo.fps = fps
@@ -666,7 +678,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
@@ -745,6 +757,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)
@@ -871,194 +886,197 @@ export default {
       synchronizer.remove(this.$refs.canvas)
       this.setAllToolsPassive()
     },
-    onContextmenu(event) {
+    onContextmenu(e) {
-      const colormapsList = cornerstone.colors.getColormapsList()
+      e.stopImmediatePropagation()
-      const colorItems = []
+      e.stopPropagation()
-      colorItems.push({
+      e.preventDefault()
-        label: '默认值',
+      // const colormapsList = cornerstone.colors.getColormapsList()
-        onClick: () => {
+      // const colorItems = []
-          this.setColormap()
+      // colorItems.push({
-        }
+      //   label: '默认值',
-      })
+      //   onClick: () => {
-      colormapsList.forEach(colormap => {
+      //     this.setColormap()
-        const item = {}
+      //   }
-        item.label = colormap.name
+      // })
-        item.onClick = () => {
+      // colormapsList.forEach(colormap => {
-          this.setColormap(colormap.id)
+      //   const item = {}
-        }
+      //   item.label = colormap.name
-        colorItems.push(item)
+      //   item.onClick = () => {
-      })
+      //     this.setColormap(colormap.id)
-      this.$contextmenu({
+      //   }
-        items: [
+      //   colorItems.push(item)
-          {
+      // })
-            label: '移动',
+      // this.$contextmenu({
-            divided: true,
+      //   items: [
-            onClick: () => {
+      //     {
-              this.setToolActive('Pan')
+      //       label: '移动',
-            }
+      //       divided: true,
-          },
+      //       onClick: () => {
-          {
+      //         this.setToolActive('Pan')
-            label: '缩放',
+      //       }
-            divided: true,
+      //     },
-            children: [
+      //     {
-              {
+      //       label: '缩放',
-                label: '自由缩放',
+      //       divided: true,
-                onClick: () => {
+      //       children: [
-                  this.setToolActive('Zoom')
+      //         {
-                }
+      //           label: '自由缩放',
-              },
+      //           onClick: () => {
-              {
+      //             this.setToolActive('Zoom')
-                label: '适应图像',
+      //           }
-                onClick: () => {
+      //         },
-                  this.fitToWindow()
+      //         {
-                }
+      //           label: '适应图像',
-              },
+      //           onClick: () => {
-              {
+      //             this.fitToWindow()
-                label: '适应窗口',
+      //           }
-                onClick: () => {
+      //         },
-                  this.fitToImage()
+      //         {
-                }
+      //           label: '适应窗口',
-              }
+      //           onClick: () => {
-            ]
+      //             this.fitToImage()
-          },
+      //           }
-          {
+      //         }
-            label: '透镜',
+      //       ]
-            divided: true,
+      //     },
-            onClick: () => {
+      //     {
-              this.setToolActive('Magnify')
+      //       label: '透镜',
-            }
+      //       divided: true,
-          },
+      //       onClick: () => {
-          {
+      //         this.setToolActive('Magnify')
-            label: '旋转',
+      //       }
-            divided: true,
+      //     },
-            children: [
+      //     {
-              {
+      //       label: '旋转',
-                label: '默认值',
+      //       divided: true,
-                onClick: () => {
+      //       children: [
-                  this.resetRotate()
+      //         {
-                }
+      //           label: '默认值',
-              },
+      //           onClick: () => {
-              {
+      //             this.resetRotate()
-                label: '自由旋转',
+      //           }
-                onClick: () => {
+      //         },
-                  this.setToolActive('Rotate')
+      //         {
-                }
+      //           label: '自由旋转',
-              },
+      //           onClick: () => {
-              {
+      //             this.setToolActive('Rotate')
-                label: '水平翻转',
+      //           }
-                onClick: () => {
+      //         },
-                  this.setRotate(true, false, 0)
+      //         {
-                }
+      //           label: '水平翻转',
-              },
+      //           onClick: () => {
-              {
+      //             this.setRotate(true, false, 0)
-                label: '垂直翻转',
+      //           }
-                onClick: () => {
+      //         },
-                  this.setRotate(false, true, 0)
+      //         {
-                }
+      //           label: '垂直翻转',
-              },
+      //           onClick: () => {
-              {
+      //             this.setRotate(false, true, 0)
-                label: '左转90度',
+      //           }
-                onClick: () => {
+      //         },
-                  this.setRotate(false, false, -90)
+      //         {
-                }
+      //           label: '左转90度',
-              },
+      //           onClick: () => {
-              {
+      //             this.setRotate(false, false, -90)
-                label: '右转90度',
+      //           }
-                onClick: () => {
+      //         },
-                  this.setRotate(false, false, 90)
+      //         {
-                }
+      //           label: '右转90度',
-              }
+      //           onClick: () => {
-            ]
+      //             this.setRotate(false, false, 90)
-          },
+      //           }
+      //         }
+      //       ]
+      //     },
 
-          {
+      //     {
-            label: '测量',
+      //       label: '测量',
-            divided: true,
+      //       divided: true,
-            minWidth: 0,
+      //       minWidth: 0,
-            children: [
+      //       children: [
-              {
+      //         {
-                label: '探针',
+      //           label: '探针',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('Probe')
+      //             this.setToolActive('Probe')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '长度测量',
+      //           label: '长度测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('Length')
+      //             this.setToolActive('Length')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '角度测量',
+      //           label: '角度测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('Angle')
+      //             this.setToolActive('Angle')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: 'Cobb测量',
+      //           label: 'Cobb测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('CobbAngle')
+      //             this.setToolActive('CobbAngle')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '椭圆测量',
+      //           label: '椭圆测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('EllipticalRoi')
+      //             this.setToolActive('EllipticalRoi')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '矩形测量',
+      //           label: '矩形测量',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('RectangleRoi')
+      //             this.setToolActive('RectangleRoi')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '多边形标记',
+      //           label: '多边形标记',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('FreehandRoi')
+      //             this.setToolActive('FreehandRoi')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '十字线',
+      //           label: '十字线',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('Bidirectional')
+      //             this.setToolActive('Bidirectional')
-                }
+      //           }
-              },
+      //         },
-              {
+      //         {
-                label: '文字标注',
+      //           label: '文字标注',
-                onClick: () => {
+      //           onClick: () => {
-                  this.setToolActive('ArrowAnnotate')
+      //             this.setToolActive('ArrowAnnotate')
-                }
+      //           }
-              }
+      //         }
-            ]
+      //       ]
-          },
+      //     },
-          {
+      //     {
-            label: '调窗',
+      //       label: '调窗',
-            divided: true,
+      //       divided: true,
-            onClick: () => {
+      //       onClick: () => {
-              this.setToolActive('Wwwc')
+      //         this.setToolActive('Wwwc')
-            }
+      //       }
-          },
+      //     },
-          {
+      //     {
-            label: '反色',
+      //       label: '反色',
-            divided: true,
+      //       divided: true,
-            onClick: () => {
+      //       onClick: () => {
-              this.toggleInvert()
+      //         this.toggleInvert()
-            }
+      //       }
-          },
+      //     },
-          {
+      //     {
-            label: '伪彩',
+      //       label: '伪彩',
-            children: colorItems
+      //       children: colorItems
-          }
+      //     }
-        ],
+      //   ],
-        event,
+      //   event,
-        // x: event.clientX,
+      //   // x: event.clientX,
-        // y: event.clientY,
+      //   // y: event.clientY,
-        customClass: 'class-a',
+      //   customClass: 'class-a',
-        zIndex: 3,
+      //   zIndex: 3,
-        minWidth: 100
+      //   minWidth: 100
-      })
+      // })
-      return false
+      // return false
     },
     getToolSate() {
       const toolROITypes = [
@@ -1109,6 +1127,7 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
+
 .info-image {
   position: absolute;
   left: 10px;
@@ -1128,6 +1147,7 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
+
 .info-instance {
   position: absolute;
   right: 15px;
@@ -1160,6 +1180,7 @@ export default {
   margin: 10px;
   cursor: default;
 }
+
 .menu__item:hover {
   color: #ff0000;
 }
@@ -1179,7 +1200,8 @@ li:hover {
   background-color: #e0e0e2;
   color: white;
 }
-.my_slider_box:after{
+
+.my_slider_box:after {
   content: '';
   position: absolute;
   bottom: -20px;

src/components/Dicom/DicomTags.vue

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

src/components/Dicom/DicomViewer.vue

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

src/components/MFA/fun.js

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

src/components/MFA/index.vue

@@ -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,
       },
@@ -91,21 +91,21 @@ export default {
         Code: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
+            message: this.$t("mfa:ruleMessage:specify"),
             trigger: "blur",
           },
         ],
         EMail: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
+            message: this.$t("mfa:ruleMessage:specify"),
             trigger: "blur",
           },
         ],
         username: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
+            message: this.$t("mfa:ruleMessage:specify"),
             trigger: "blur",
           },
         ],
@@ -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") {
+          // if (this.status === "login") {
-            this.$message.success(this.$t("mfa:message:verifySuccess"));
+          //   this.$message.success(this.$t("mfa:message:verifySuccess"));
-          }
+          // }
-          this.$emit("success", this.form.UserId);
+          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,4 +202,7 @@ export default {
     margin-right: 5px;
   }
 }
+::v-deep .el-dialog__header {
+  font-weight: bold;
+}
 </style>

src/components/PreviewFile/index.vue

@@ -1,28 +1,30 @@
 <template>
   <div class="preview-wrapper">
-    <iframe
+    <iframe v-if="fileType.indexOf('jpg') !== -1 || fileType.indexOf('png') !== -1" frameborder="0" :src="filePath"
-      v-if="fileType.indexOf('jpg') !== -1 || fileType.indexOf('png') !== -1"
+      width="100%" height="100%" />
-      frameborder="0"
-      :src="filePath"
-      width="100%"
-      height="100%"
-    />
     <!-- <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}`">-->
     <!--    </pdf>-->
-    <div v-else>
+    <video :src="`${OSSclientConfig.basePath}${filePath}`" style="width: 100%;height: 99%;" autoplay controls
+      controlsList="nodownload" v-else-if="fileType.indexOf('mp4') !== -1"></video>
+    <iframe v-else
+      :src="`/static/onlyOffice/viewer.html?url=${OSSclientConfig.basePath}${filePath}?onlyOffice_url=${onlyOffice_url}&type=${fileType}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
+      width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
+    <!-- <div v-else>
       {{ $t('common:message:downloadFile') }}
       <el-link type="primary" @click="downLoadFile">{{ $t('common:button:download') }}</el-link>
-    </div>
+    </div> -->
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex'
-
+import DOCUMENTTYPE from "@/utils/onlyOffice_type.js"
 export default {
   name: 'PreviewFile',
   computed: {
@@ -36,11 +38,22 @@ export default {
     fileType: {
       type: String,
       required: true
-    }
+    },
+    title: {
+      type: String,
+      default: ''
+    },
   },
   data() {
     return {
-      currentUser: zzSessionStorage.getItem('userName')
+      currentUser: zzSessionStorage.getItem('userName'),
+      COMPANY: process.env.VUE_APP_COMPANY_NAME,
+      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL
+    }
+  },
+  computed: {
+    documentType() {
+      return DOCUMENTTYPE[`.${this.fileType}`]
     }
   },
   mounted() {
@@ -61,14 +74,16 @@ export default {
 }
 </script>
 <style lang="scss">
-.preview-wrapper{
+.preview-wrapper {
   height: 100%;
-  width:100%;
+  width: 100%;
   padding: 10px;
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;

src/components/Preview_onlyoffice/fun.js

@@ -0,0 +1,23 @@
+import Vue from "vue";
+import OnlyOffice from "./index.vue";
+
+const PreviewConstructor = Vue.extend(OnlyOffice);
+
+const onlyOffice = options => {
+    const { path, type, title } = options;
+    if (!path) throw `path is requred.but ${path}`
+    const id = `OnlyOffice_${new Date().getTime()}`;
+    const instance = new PreviewConstructor();
+    instance.id = id;
+    instance.vm = instance.$mount();
+    if (instance.vm.visible) return;
+    document.body.appendChild(instance.vm.$el);
+    instance.vm.open(path, type, title);
+    instance.vm.$on("closed", () => {
+        instance.vm.docEditor = null
+        document.body.removeChild(instance.vm.$el);
+        instance.vm.$destroy();
+    });
+    return instance.vm;
+}
+export default onlyOffice;

src/components/Preview_onlyoffice/index.js

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

src/components/Preview_onlyoffice/index.vue

@@ -0,0 +1,46 @@
+<template>
+  <el-dialog v-if="visible" :visible.sync="visible" :title="title" :fullscreen="true" append-to-body
+    custom-class="base-dialog-wrapper" @close="handleClose">
+    <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
+      <iframe v-if="visible"
+        :src="`/static/onlyOffice/viewer.html?url=${OSSclientConfig.basePath}${path}?onlyOffice_url=${onlyOffice_url}&type=${type}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
+        width="100%" height="99%" frameborder="0" crossorigin="anonymous" />
+    </div>
+  </el-dialog>
+</template>
+<script>
+import DOCUMENTTYPE from "@/utils/onlyOffice_type.js"
+export default {
+  name: "OnlyOffice",
+  data() {
+    return {
+      visible: false,
+      path: null,
+      type: null,
+      title: null,
+      documentType: null,
+      currentUser: zzSessionStorage.getItem('userName'),
+      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL
+    };
+  },
+  methods: {
+
+    open(path, type, title) {
+      this.path = path;
+      this.type = type.toLowerCase();
+      this.documentType = DOCUMENTTYPE[`.${this.type}`]
+      this.title = title;
+      this.visible = true;
+    },
+    handleClose() {
+      this.$emit("closed");
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+#placeholder {
+  width: 100%;
+  height: 100%;
+}
+</style>

src/components/Preview_video/fun.js

@@ -0,0 +1,23 @@
+import Vue from "vue";
+import Video from "./index.vue";
+
+const PreviewConstructor = Vue.extend(Video);
+
+const video = options => {
+    const { path, type, title } = options;
+    if (!path) throw `path is requred.but ${path}`
+    const id = `OnlyOffice_${new Date().getTime()}`;
+    const instance = new PreviewConstructor();
+    instance.id = id;
+    instance.vm = instance.$mount();
+    if (instance.vm.visible) return;
+    document.body.appendChild(instance.vm.$el);
+    instance.vm.open(path, type, title);
+    instance.vm.$on("closed", () => {
+        instance.vm.docEditor = null
+        document.body.removeChild(instance.vm.$el);
+        instance.vm.$destroy();
+    });
+    return instance.vm;
+}
+export default video;

src/components/Preview_video/index.js

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

src/components/Preview_video/index.vue

@@ -0,0 +1,38 @@
+<template>
+  <el-dialog v-if="visible" :visible.sync="visible" :title="title" :fullscreen="true" append-to-body
+    custom-class="base-dialog-wrapper" @close="handleClose">
+    <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
+      <video :src="path" style="width: 100%;height: 99%;" autoplay controls controlsList="nodownload"></video>
+    </div>
+  </el-dialog>
+</template>
+<script>
+export default {
+  name: "Video",
+  data() {
+    return {
+      visible: false,
+      path: null,
+      type: null,
+      title: null,
+    };
+  },
+  methods: {
+
+    open(path, type, title) {
+      this.path = this.OSSclientConfig.basePath + path;
+      this.title = title;
+      this.visible = true;
+    },
+    handleClose() {
+      this.$emit("closed");
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+#placeholder {
+  width: 100%;
+  height: 100%;
+}
+</style>

src/components/TrialsSelect/index.vue

@@ -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() {

src/components/TrialsTab/index.vue

@@ -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-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab" style="background-color: #f5f7fa;">
-          <el-tab-pane
+          <template v-for="item1 of item.children">
-            v-for="item1 of item.children"
+            <el-tab-pane
-            v-if="TrialConfig && isShow(item1.path)"
+              v-if="TrialConfig && isShow(item1.path)"
-            :key="`tab1${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'))"
+              :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)"
+              :label="$t(item1.LanguageMark)"
-            :name="item1.path"
+              :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;

src/components/UploadFile/index.vue

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

src/components/UploadFiles/index.vue

@@ -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 => {
+      getAttachmentByType(this.doctorId, this.type)
-        loading.close()
+        .then((res) => {
-        if (res.IsSuccess) {
+          loading.close()
-          if (res.Result.length > 0) {
+          if (res.IsSuccess) {
-            this.fileList = this.formatterFileList(res.Result)
+            if (res.Result.length > 0) {
-            this.$emit('getFileList', this.fileList)
+              this.fileList = this.formatterFileList(res.Result)
-          } else {
+              this.$emit('getFileList', this.fileList)
-            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?', {
+          this.$confirm(
-            type: 'warning',
+            this.$t('curriculumVitae:resume:message:existingResume'),
-            distinguishCancelAndClose: true,
+            {
-            confirmButtonText: 'OK',
+              type: 'warning',
-            cancelButtonText: 'Cancel'
+              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 => {
+      saveAttachments(this.fileList)
-        this.fileList = this.formatterFileList(res.Result)
+        .then((res) => {
-        this.isDisabled = false
+          this.fileList = this.formatterFileList(res.Result)
-        this.$message.success('Uploaded successfully')
+          this.isDisabled = false
-        this.$emit('getFileList', this.fileList)
+          this.$message.success(
-      }).catch(() => {
+            this.$t('trials:uploadDicomList:table:Uploaded')
-        this.isDisabled = false
+          )
-      })
+          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(() => {
+        .then(() => {
-        deleteAttachment(file.Id, file.Path)
+          deleteAttachment(file.Id, file.Path).then((res) => {
-          .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 {

src/components/clinicalDataQuestions/components/QuestionFormItem.vue

@@ -1,21 +1,16 @@
 <template>
   <div class="criterion-form-item">
-    <div
+    <div v-if="!!question.QuestionName && question.ClinicalQuestionType === 'group'"
-      v-if="!!question.QuestionName && question.ClinicalQuestionType==='group'"
+      style="font-weight: bold;font-size: 16px;margin: 5px 0px;margin-bottom: 10px">
-      style="font-weight: bold;font-size: 16px;margin: 5px 0px;margin-bottom: 10px"
+      {{ language === 'en' ? question.QuestionEnName : question.QuestionName }}
-    >
+    </div>
-      {{ language==='en'?question.QuestionEnName:question.QuestionName }}
+    <div v-else-if="question.ClinicalQuestionType === 'summary'"
+      style="background:#f3f3f3;border-radius:4px;font-size: 12px;margin: 5px 0px;margin-bottom: 10px;font-size: 12px;padding: 10px">
+      {{ language === 'en' ? question.QuestionEnName : question.QuestionName }}
     </div>
     <div
-      v-else-if="question.ClinicalQuestionType==='summary'"
+      v-else-if="question.ClinicalQuestionType === 'table' && ((question.ClinicalQuestionShowEnum === 1 && question.ParentTriggerValue === questionForm[question.ParentId].toString()) || question.ClinicalQuestionShowEnum === 0)"
-      style="background:#f3f3f3;border-radius:4px;font-size: 12px;margin: 5px 0px;margin-bottom: 10px;font-size: 12px;padding: 10px"
+      style="font-weight: bold;font-size: 14px;margin: 5px 0px;">
-    >
-      {{ language==='en'?question.QuestionEnName:question.QuestionName }}
-    </div>
-    <div
-      v-else-if="question.ClinicalQuestionType==='table' && ((question.ClinicalQuestionShowEnum===1 && question.ParentTriggerValue === questionForm[question.ParentId].toString()) || question.ClinicalQuestionShowEnum===0)"
-      style="font-weight: bold;font-size: 14px;margin: 5px 0px;"
-    >
       <div style="display: flex;justify-content: space-between;">
         <span>
           {{ question.QuestionName }}
@@ -25,27 +20,17 @@
           {{ $t('trials:readingUnit:qsList:title:add') }}
         </el-button>
       </div>
-      <el-table
+      <el-table :data="questionForm[question.Id]">
-        :data="questionForm[question.Id]"
+        <el-table-column v-for="item of question.TableQuestions" :key="item.Id" :prop="item.Id"
-      >
+          :label="item.QuestionName" min-width="100" show-overflow-tooltip />
-        <el-table-column
+        <el-table-column :label="$t('common:action:action')" min-width="100" show-overflow-tooltip>
-          v-for="item of question.TableQuestions"
-          :key="item.Id"
-          :prop="item.Id"
-          :label="item.QuestionName"
-          min-width="100"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          :label="$t('common:action:action')"
-          min-width="100"
-          show-overflow-tooltip
-        >
           <template slot-scope="scope">
             <el-button type="text" size="mini" @click="openAddTableCol(question, scope.$index)">
               {{ $t('common:button:edit') }}
             </el-button>
-            <el-button type="text" size="mini" v-if="scope.row.IsCurrentTaskAdd === 'True' || !question.IsCopyLesions || IsBaseline" @click="deleteTableCol(question, scope.$index)">
+            <el-button type="text" size="mini"
+              v-if="scope.row.IsCurrentTaskAdd === 'True' || !question.IsCopyLesions || IsBaseline"
+              @click="deleteTableCol(question, scope.$index)">
               {{ $t('common:button:delete') }}
             </el-button>
           </template>
@@ -54,187 +39,109 @@
     </div>
     <el-col v-else :span="12">
       <el-form-item
-        v-if="(question.ClinicalQuestionShowEnum===1 && question.ParentTriggerValue === questionForm[question.ParentId].toString()) || question.ClinicalQuestionShowEnum===0"
+        v-if="(question.ClinicalQuestionShowEnum === 1 && question.ParentTriggerValue === questionForm[question.ParentId].toString()) || question.ClinicalQuestionShowEnum === 0"
-        :label="`${question.QuestionName}`"
+        :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
-        :prop="question.Id"
+          {
-        :rules="[
+            required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && (question.RelevanceValue === questionForm[question.RelevanceId].toString()))) && question.ClinicalQuestionType !== 'summary' && question.ClinicalQuestionType !== 'group' && question.ClinicalQuestionType !== 'table',
-          { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && (question.RelevanceValue === questionForm[question.RelevanceId].toString()))) && question.ClinicalQuestionType !== 'summary' && question.ClinicalQuestionType!=='group' && question.ClinicalQuestionType!=='table',
+            message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']
-            message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']}
+          }
-        ]"
+        ]" :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' ? 'uploadWrapper' : '']">
-        :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
-      >
         <!-- 输入框 -->
-        <el-input
+        <el-input v-if="question.ClinicalQuestionType === 'input'" v-model="questionForm[question.Id]"
-          v-if="question.ClinicalQuestionType==='input'"
-          v-model="questionForm[question.Id]"
           :disabled="question.TableQuestionType === 2"
-          :max-length="question.MaxAnswerLength ? question.MaxAnswerLength : 200"
+          :max-length="question.MaxAnswerLength ? question.MaxAnswerLength : 200" />
-        />
         <!-- 多行文本输入框 -->
-        <el-input
+        <el-input v-if="question.ClinicalQuestionType === 'textarea'" v-model="questionForm[question.Id]"
-          v-if="question.ClinicalQuestionType==='textarea'"
+          type="textarea" :max-length="question.MaxAnswerLength ? question.MaxAnswerLength : 200"
-          v-model="questionForm[question.Id]"
+          :autosize="{ minRows: 2, maxRows: 4 }" />
-          type="textarea"
-          :max-length="question.MaxAnswerLength ? question.MaxAnswerLength : 200"
-          :autosize="{ minRows: 2, maxRows: 4}"
-        />
         <!-- 下拉框 -->
-        <el-select
+        <el-select v-if="question.ClinicalQuestionType === 'select'" v-model="questionForm[question.Id]" clearable
-          v-if="question.ClinicalQuestionType==='select'"
-          v-model="questionForm[question.Id]"
-          clearable
           :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode"
-          @change="((val)=>{formItemChange(val, question)})"
+          @change="((val) => { formItemChange(val, question) })">
-        >
           <template v-if="question.TableQuestionType === 1">
-            <el-option
+            <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
-              v-for="item in organList"
+              :value="item[question.DataTableColumn]" />
-              :key="item.Id"
-              :label="item[question.DataTableColumn]"
-              :value="item[question.DataTableColumn]"
-            />
           </template>
           <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-            <el-option
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-              v-for="item of $d[question.DictionaryCode]"
+              :label="item.label" />
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
           </template>
-          <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+          <template
-            <el-option
+            v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-              v-for="item of $d[question.DictionaryCode]"
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-              :key="item.id"
+              :label="item.label" />
-              :value="item.value"
-              :label="item.label"
-            />
           </template>
           <template v-else>
-            <el-option
+            <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val.trim()" />
-              v-for="val in question.TypeValue.split('|')"
-              :key="val"
-              :label="val"
-              :value="val.trim()"
-            />
           </template>
         </el-select>
+        <!-- 日期 -->
+        <el-date-picker v-if="question.ClinicalQuestionType === 'time'" v-model="questionForm[question.Id]"
+          style="width: 200px" align="right" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
         <!-- 单选 -->
-        <el-date-picker
+        <el-radio-group v-if="question.ClinicalQuestionType === 'radio'" v-model="questionForm[question.Id]"
-          v-if="question.ClinicalQuestionType === 'time'"
+          @change="((val) => { formItemChange(val, question) })">
-          v-model="questionForm[question.Id]"
-          style="width: 200px"
-          align="right"
-          type="date"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-        />
-        <!-- 单选 -->
-        <el-radio-group
-          v-if="question.ClinicalQuestionType==='radio'"
-          v-model="questionForm[question.Id]"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
           <template v-if="question.DictionaryCode">
-            <el-radio
+            <el-radio v-for="item of $d[question.DictionaryCode]" :key="item.id" :label="item.value">
-              v-for="item of $d[question.DictionaryCode]"
-              :key="item.id"
-              :label="item.value"
-            >
               {{ item.label }}
             </el-radio>
           </template>
           <template v-if="question.TypeValue">
-            <el-radio
+            <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
-              v-for="val in question.TypeValue.split('|')"
-              :key="val"
-              :label="val"
-            >
               {{ val }}
             </el-radio>
           </template>
         </el-radio-group>
         <!-- 复选框 -->
-        <el-checkbox-group
+        <el-checkbox-group v-if="question.ClinicalQuestionType === 'checkbox' && questionForm[question.Id] !== ''"
-          v-if="question.ClinicalQuestionType==='checkbox' && questionForm[question.Id] !== ''"
+          v-model="questionForm[question.Id]">
-          v-model="questionForm[question.Id]"
+          <el-checkbox v-for="val of question.TypeValue.split('|')" :key="val" :label="val" :value="val">
-        >
-          <el-checkbox
-            v-for="val of question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-            :value="val"
-          >
             {{ val }}
           </el-checkbox>
         </el-checkbox-group>
-        <el-input
+        <el-input v-if="question.ClinicalQuestionType === 'number'" :ref="question.Id"
-          v-if="question.ClinicalQuestionType === 'number'"
+          v-model="questionForm[question.Id]" type="number" style="width: 200px"
-          :ref="question.Id"
+          :disabled="question.CustomCalculateMark > 0" @input="limitInput($event, questionForm, question)">
-          v-model="questionForm[question.Id]"
-          type="number"
-          style="width: 200px"
-          :disabled="question.CustomCalculateMark > 0"
-          @input="limitInput($event, questionForm, question)"
-        >
           <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">
+        <span v-if="question.CustomCalculateMark === 11 && question.ClinicalQuestionType === 'number'"
-          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}-{{ questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId] }}
+          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] }}
         </span>
-        <span v-if="question.CustomCalculateMark === 10 && question.ClinicalQuestionType === 'number' && questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId]" style="margin-left: 10px">
+        <span
-          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}-{{ questionForm.CreateTime ? questionForm.CreateTime : parseTime(new Date(), '{y}-{m}-{d}') }}
+          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}') }}
         </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">
+        <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">
           {{ $t('trials:components:clinicalDataQS:msg:birthDay') }}
         </span>
       </el-form-item>
     </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"
-      <QuestionFormItem
+      v-if="question.Childrens && question.Childrens.length > 0 && question.ClinicalQuestionType !== 'table'"
-        :key="item.Id"
+      :span="['group', 'summary', 'table'].includes(item.ClinicalQuestionType) || item.Childrens.length > 0 ? 24 : 12">
-        :question="item"
+      <QuestionFormItem :key="item.Id" :question="item" :question-form="questionForm"
-        :question-form="questionForm"
+        :trial-clinical-id="trialClinicalId" @formItemNumberChange="formItemNumberChange"
-        :trial-clinical-id="trialClinicalId"
+        @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData" />
-        @formItemNumberChange="formItemNumberChange"
-        @setFormItemData="setFormItemData"
-        @resetFormItemData="resetFormItemData"
-      />
     </el-col>
-    <el-dialog
+    <el-dialog v-if="addOrEdit.visible" class="my_dialog" :visible.sync="addOrEdit.visible"
-      v-if="addOrEdit.visible"
+      :close-on-click-modal="false" :title="addOrEdit.title" width="400px" append-to-body>
-      class="my_dialog"
+      <el-form ref="tableQsForm" v-loading="loading" size="small" :model="QuestionsForm">
-      :visible.sync="addOrEdit.visible"
+        <QuestionTableFormItem v-for="(item) in QuestionsList" :key="item.Id" :question="item"
-      :close-on-click-modal="false"
+          :question-form="QuestionsForm" @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData" />
-      :title="addOrEdit.title"
-      width="400px"
-      append-to-body
-    >
-      <el-form
-        ref="tableQsForm"
-        v-loading="loading"
-        size="small"
-        :model="QuestionsForm"
-      >
-        <QuestionTableFormItem
-          v-for="(item) in QuestionsList"
-          :key="item.Id"
-          :question="item"
-          :question-form="QuestionsForm"
-          @setFormItemData="setFormItemData"
-          @resetFormItemData="resetFormItemData"
-        />
         <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
           <el-form-item>
             <!-- 取消 -->
-            <el-button
+            <el-button size="small" type="primary" @click="addOrEdit.visible = false">
-              size="small"
-              type="primary"
-              @click="addOrEdit.visible = false"
-            >
               {{ $t('common:button:cancel') }}
             </el-button>
             <!-- 保存 -->
@@ -282,7 +189,7 @@ export default {
   },
   data() {
     return {
-      addOrEdit: { visible: false, title: '', id: null, index: 0},
+      addOrEdit: { visible: false, title: '', id: null, index: 0 },
       fileList: [],
       accept: '.png,.jpg,.jpeg',
       imgVisible: false,
@@ -406,8 +313,6 @@ export default {
                   })
                   break
                 case 6:
-                  console.log(this.questionForm[o.QuestionId])
-                  console.log(this.questionForm)
                   this.questionForm[o.QuestionId].forEach((q, qi) => {
                     if (qi === 0) {
                       num = parseFloat(q[o.TableQuestionId])
@@ -450,11 +355,16 @@ export default {
                   }
                   break
                 case 11:
-                  if (parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId])) > 0) {
+                  if (parseFloat(this.getCurrentAgeByBirthDate(this.questionForm[o.TableQuestionId])) > 0) {
-                    num = parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId]))
+                    num = parseFloat(this.getCurrentAgeByBirthDate(this.questionForm[o.TableQuestionId]))
                   } else {
                     num = 0
                   }
+                  // if (parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId])) > 0) {
+                  //   num = parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId]))
+                  // } else {
+                  //   num = 0
+                  // }
                   break
               }
             } else {
@@ -501,12 +411,10 @@ export default {
       try {
         if (isTable) {
           this.calculationList.forEach((v, i) => {
-            console.log(v, i)
             var find = v.CalculateQuestionList.filter(o => {
               return o.QuestionId === questionId
             })
             // find的自动计算值number
-            console.log('find', find)
             if (find) {
               var num = this.logic(v)
               if (num !== false) {
@@ -520,7 +428,6 @@ export default {
               return o.TableQuestionId === questionId
             })
             // find的自动计算值number
-            console.log('find', find)
             // find的自动计算值number
             if (find) {
               var num = this.logic(v)
@@ -591,40 +498,47 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.my_dialog{
+.my_dialog {
-  .criterion-form-item{
+  .criterion-form-item {
-    >>>.el-form-item__content{
+    ::v-deep .el-form-item__content {
       width: auto;
     }
   }
 }
-.el-col-12 .el-col-12{
+
+.el-col-12 .el-col-12 {
   width: 100%;
 }
-.criterion-form-item{
+
-  .el-form-item{
+.criterion-form-item {
+  .el-form-item {
     display: flex;
     flex-direction: row;
     align-items: flex-start;
   }
-  .el-input{
+
-    width:100%;
+  .el-input {
+    width: 100%;
   }
-  .mb{
+
+  .mb {
     margin-bottom: 0px;
   }
-  .disabled{
+
-    >>>.el-upload--picture-card {
+  .disabled {
+    ::v-deep .el-upload--picture-card {
       display: none;
     }
   }
-  .uploadWrapper{
+
+  .uploadWrapper {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
   }
 }
-.clearfix:after{
+
+.clearfix:after {
   content: '';
   display: table;
   clear: both;

src/components/clinicalDataQuestions/components/QuestionTableFormItem.vue

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

src/components/clinicalDataQuestions/components/QuestionsForm.vue

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

src/components/clinicalDataQuestions/index.vue

@@ -1,42 +1,28 @@
 <template>
   <div v-loading="loading">
-    <QuestionsForm
+    <QuestionsForm v-if="clinicalUploadType === 2" :data="data" :trial-clinical-id="trialClinicalId"
-      v-if="clinicalUploadType === 2"
+      :is-viewer="isViewer" :visit-id="visitId" :subject-id="subjectId" :open-type="openType"
-      :data="data"
+      :system-clinical-id="systemClinicalId" :trial-id="trialId" :reading-id="readingId"
-      :trial-clinical-id="trialClinicalId"
+      :clinical-form-id="clinicalFormId" :clinical-data-level="clinicalDataLevel" @close="close"></QuestionsForm>
-      :is-viewer="isViewer"
+    <uploadClinicalData v-else :subject-visit-id="subjectVisitId" :data="data" :enum-type="0" :allow-add-or-edit="true"
-      :visit-id="visitId"
+      @getList="() => { }">
-      :subject-id="subjectId"
-      :open-type="openType"
-      :system-clinical-id="systemClinicalId"
-      :trial-id="trialId"
-      :reading-id="readingId"
-      :clinical-form-id="clinicalFormId"
-      :clinical-data-level="clinicalDataLevel"
-      @close="close"
-    ></QuestionsForm>
-    <uploadClinicalData v-else :subject-visit-id="subjectVisitId" :data="data" :enum-type="0" :allow-add-or-edit="true" @getList="() => {}">
     </uploadClinicalData>
-    <div class="base-dialog-footer" v-if="!isViewer && openType !== 'look' && [0, 1].includes(clinicalDataLevel)" style="text-align:right;margin-top:10px;">
+    <div class="base-dialog-footer" v-if="!isViewer && openType !== 'look' && [0, 1].includes(clinicalDataLevel)"
+      style="text-align:right;margin-top:10px;">
       <!-- 保存 -->
       <el-button size="small" type="primary" @click="submitClinicalForm">
         {{ $t('common:button:submit') }}
       </el-button>
     </div>
     <!-- 临床数据签名框 -->
-    <el-dialog
+    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px" append-to-body
-      v-if="signVisible"
+      custom-class="base-dialog-wrapper">
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
       <div slot="title">
         <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
+        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${currentUser})` }}</span>
       </div>
-      <SignForm ref="signForm" :sign-code-enum="signCode" :subject-visit-id="subjectVisitId" @closeDialog="closeSignDialog" />
+      <SignForm ref="signForm" :sign-code-enum="signCode" :subject-visit-id="subjectVisitId"
+        @closeDialog="closeSignDialog" />
     </el-dialog>
   </div>
 </template>
@@ -49,7 +35,7 @@ import uploadClinicalData from './components/uploadClinicalData'
 import const_ from '@/const/sign-code'
 
 export default {
-name: "index",
+  name: "index",
   components: { QuestionsForm, uploadClinicalData, SignForm },
   methods: {
     submitClinicalForm() {
@@ -83,7 +69,7 @@ name: "index",
           this.close()
         }).catch((res) => {
           this.$refs['signForm'].btnLoading = false
-      })
+        })
     },
   },
   data() {
@@ -148,7 +134,7 @@ name: "index",
     },
     data: {
       type: Object,
-      default: () => {}
+      default: () => { }
     },
     trialClinicalId: {
       type: String,
@@ -166,6 +152,4 @@ name: "index",
 }
 </script>
 
-<style scoped>
+<style scoped></style>
-
-</style>

src/components/downloadDicomAndNonedicom/index.vue

@@ -0,0 +1,445 @@
+<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`
+        name = `${list[0].SubjectCode}_${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>

src/components/feedBack/fun.js

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

src/components/feedBack/index.js

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

src/components/feedBack/index.vue

@@ -0,0 +1,416 @@
+<template>
+  <!--FEEDBACK-->
+  <div v-if="visible" @click.stop="() => false" class="feedBack-box">
+    <div class="feedBack-box-modal"></div>
+    <el-dialog
+      :visible.sync="visible"
+      v-dialogDrag
+      width="800px"
+      :close-on-click-modal="false"
+      @close="cancel"
+      :modal="false"
+    >
+      <div slot="title">
+        {{ title }}
+      </div>
+      <!-- 项目详情 -->
+      <div class="trialsBox" v-if="visitTaskId || SubjectVisitId">
+        <el-form
+          label-position="right"
+          :model="form"
+          :inline="true"
+          class="trialsForm"
+          v-if="type === 'detail'"
+        >
+          <el-form-item :label="$t('feedBack:trials:code')" style="width: 40%">
+            <span>{{ form.TrialCode }}</span>
+          </el-form-item>
+          <el-form-item :label="$t('feedBack:trials:name')" style="width: 40%">
+            <span>{{ form.ExperimentName }}</span>
+          </el-form-item>
+          <el-form-item
+            :label="$t('feedBack:trials:siteCode')"
+            style="width: 40%"
+          >
+            <span>{{ form.TrialSiteCode }}</span>
+          </el-form-item>
+          <el-form-item :label="$t('feedBack:trials:visit')" style="width: 40%">
+            <span>{{ form.SubjectCode }} - {{ form.SubjectVisitName }}</span>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-form
+        ref="feedBackForm"
+        label-position="right"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+      >
+        <!-- 影像异常tip -->
+        <p class="tip" v-if="type === 'imgfail'">
+          <i
+            class="el-icon-warning-outline"
+            style="color: #f56c6c; font-size: 24px"
+          ></i>
+          <span>{{ $t('feedBack:imgfail:tip') }}</span>
+        </p>
+        <!-- 问题反馈 -->
+        <el-form-item
+          :label="$t('feedBack:form:feedBack')"
+          prop="QuestionType"
+          v-if="type === 'feedback' && trialId"
+        >
+          <el-select
+            v-model="form.QuestionType"
+            style="width: 100%"
+            popper-class="feedBack-select-box"
+          >
+            <el-option
+              v-for="item in QuestionTypeOptions"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- 问题反馈 -->
+        <el-form-item
+          :label="$t('feedBack:form:feedBack')"
+          prop="QuestionType"
+          v-if="type === 'detail'"
+        >
+          <span>{{
+            QuestionTypeOptions.filter(
+              (item) => item.value === form.QuestionType
+            )[0].label
+          }}</span>
+        </el-form-item>
+        <!-- 问题描述 -->
+        <el-form-item
+          :label="$t('feedBack:form:description')"
+          prop="QuestionDescription"
+        >
+          <el-input
+            v-model="form.QuestionDescription"
+            type="textarea"
+            :rows="4"
+            :maxlength="500"
+            :disabled="type === 'detail'"
+          />
+        </el-form-item>
+        <!-- 截图 -->
+        <el-form-item :label="$t('feedBack:form:screenshot')" prop="screenshot">
+          <uploadImage
+            :path.sync="form.ScreenshotList"
+            :isUpload.sync="loading"
+            :trialId="trialId"
+            :disabled="type === 'detail'"
+            ref="uploadImage"
+          />
+        </el-form-item>
+        <!-- 反馈时间 -->
+        <el-form-item
+          :label="$t('feedBack:form:time')"
+          prop="screenshot"
+          v-if="type === 'detail'"
+        >
+          <span>{{ form.CreateTime }}</span>
+        </el-form-item>
+        <!-- 状态 -->
+        <el-form-item
+          :label="$t('feedBack:form:status')"
+          prop="screenshot"
+          v-if="type === 'detail' && level > 7"
+        >
+          <el-switch
+            v-model="form.State"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            :active-value="1"
+            :inactive-value="0"
+            :active-text="$fd('FeedBackStatus', 1)"
+            :inactive-text="$fd('FeedBackStatus', 0)"
+            :disabled="level < 8 || !isStateChange"
+            @change="changeState"
+          >
+          </el-switch>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" v-if="type !== 'detail' || isImgfail">
+        <!-- 取消 -->
+        <el-button size="small" @click.stop="cancel">
+          {{ $t('feedBack:button:cancel') }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button
+          type="primary"
+          size="small"
+          @click.stop="save"
+          :loading="loading"
+        >
+          {{ $t('feedBack:button:save') }}
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import uploadImage from './uploadImage.vue'
+import {
+  addOrUpdateUserFeedBack,
+  getUserFeedBackInfo,
+  batchUpdateFeedBackState,
+} from '@/api/trials.js'
+export default {
+  name: 'FB',
+  components: { uploadImage },
+  data() {
+    return {
+      title: null,
+      visible: false,
+      loading: false,
+      options: [],
+      type: null, // detail 表格详情  feedback 填写反馈  imgfail 影像异常
+      trialId: null, // 项目id
+      Id: null, // 反馈数据id
+      visitTaskId: null, // 任务id
+      isImgfail: false, // 是否是影像异常
+      isStateChange: true, // 是否可以切换状态
+      form: {
+        Id: null,
+        SubjectId: null,
+        SubjectVisitId: null,
+        QuestionType: 0,
+        QuestionDescription: null,
+        State: 0,
+        TrialSiteId: null,
+        TrialId: null,
+        VisitTaskId: null,
+        SubjectVisitId: null,
+        ScreenshotList: [],
+        ScreenshotListStr: null,
+      },
+      rules: {
+        QuestionType: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+        ],
+        QuestionDescription: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (value.length < 5) {
+                callback(
+                  new Error(this.$t('feedBack:ruleMessage:lengthLimitMin5'))
+                )
+              }
+              callback()
+            },
+            trigger: 'blur',
+          },
+        ],
+      },
+      isUpload: false,
+    }
+  },
+  computed: {
+    level() {
+      if (this.hasPermi(['role:dev', 'role:admin'])) {
+        return 9
+      }
+      if (this.hasPermi(['role:pm', '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>

src/components/feedBack/uploadImage.vue

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

src/components/feedBackTable/fun.js

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

src/components/feedBackTable/index.js

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

src/components/feedBackTable/index.vue

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

src/components/toggleRole/index.vue

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

src/components/uploadDicomAndNonedicom/index.vue

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

src/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -0,0 +1,740 @@
+<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(3)}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(3)}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(3)}MB`
+                : '0MB'
+            }}</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.size && scope.row.size > 0 ? ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
+              1
+              : ((scope.row.uploadFileSize * 100) / 1).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 > 0 ? file.fileSize : 1
+            }
+          }
+        )
+        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>

src/components/uploadDicomAndNonedicom/study-view.vue

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

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

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

src/components/uploadImage/index.vue

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

src/components/videos/index.vue

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

src/const/check/index.js

@@ -1,6 +1,5 @@
 import { SubjectCheckConfig } from './module/Subject'
 
-console.log(SubjectCheckConfig.moduleType)
 export const checkConfig = {
   ModuleType: {
     ...SubjectCheckConfig.ModuleType

src/const/sign-code.vue

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