数值题型特性优化（数值类型下拉框暂时只有非dicom报告页已修改）

# Conflicts:
#	src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
#	src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
#	src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.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 = '/'
 

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

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

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

package.json

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

src/App.vue

@@ -29,7 +29,7 @@
       direction="rtl"
       size="80%"
     >
-      <div style="width: 620px">
+      <div style="width: 800px">
         <el-form
           label-width="100px"
           @submit.native.prevent
@@ -40,7 +40,7 @@
           <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')" v-if="il8nExternal">
+          <el-form-item :label="$t('il8n:search:state')">
             <el-select
               v-model="State"
               clearable
@@ -62,12 +62,14 @@
         v-adaptive="{ bottomOffset: 50 }"
         height="100"
         style="width: 100%"
+        @sort-change="handleSortByColumn"
       >
         <el-table-column
           prop="Code"
           :label="$t('il8n:table:label')"
           width="300"
           show-overflow-tooltip
+          sortable="custom"
         >
         </el-table-column>
         <!--        <el-table-column-->
@@ -79,7 +81,11 @@
         <!--            {{scope.row.Description}}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column prop="Value" :label="$t('il8n:table:en')">
+        <el-table-column
+          prop="Value"
+          :label="$t('il8n:table:en')"
+          sortable="custom"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.Value"
@@ -92,7 +98,11 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="ValueCN" :label="$t('il8n:table:cn')">
+        <el-table-column
+          prop="ValueCN"
+          :label="$t('il8n:table:cn')"
+          sortable="custom"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.ValueCN"
@@ -108,7 +118,7 @@
         <el-table-column
           prop="ValueCN"
           :label="$t('il8n:table:state')"
-          v-if="il8nExternal"
+          sortable="custom"
         >
           <template slot-scope="scope">
             <el-select
@@ -126,12 +136,20 @@
             </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" type="primary" @click="handleSave"
-          >保存</el-button
-        >
+        <el-button size="mini" @click="drawer = false"
+          >{{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="mini" type="primary" @click="handleSave">{{
+          $t('common:button:save')
+        }}</el-button>
       </div>
     </el-drawer>
     <feedBack v-if="$route.matched.length > 0" />
@@ -195,6 +213,18 @@ export default {
   //   },
   // },
   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
@@ -209,9 +239,12 @@ export default {
           [],
           this.arr.filter(
             (v) =>
-              ~v.Code.toLowerCase().indexOf(this.key.toLowerCase()) ||
-              ~v.Value.toLowerCase().indexOf(this.key.toLowerCase()) ||
-              ~v.ValueCN.toLowerCase().indexOf(this.key.toLowerCase())
+              (v.Code &&
+                ~v.Code.toLowerCase().indexOf(this.key.toLowerCase())) ||
+              (v.Value &&
+                ~v.Value.toLowerCase().indexOf(this.key.toLowerCase())) ||
+              (v.ValueCN &&
+                ~v.ValueCN.toLowerCase().indexOf(this.key.toLowerCase()))
           )
         )
       } else {
@@ -219,33 +252,39 @@ export default {
       }
     },
     handleSave() {
-      this.$confirm('确定修改当前页面国际化内容？').then(() => {
-        batchAddOrUpdateFrontInternationalization(this.tableData).then(
-          async (res) => {
-            var zhMessages = {},
-              enMessages = {}
-            var Internationalization = await getFrontInternationalizationList()
-            Vue.prototype.$tl = Internationalization.Result
-            this.tableData.forEach((v) => {
-              // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
-              // enMessages[v.Description + '_' + v.Code] = v.Value
-              zhMessages[v.Code] = v.ValueCN
-              enMessages[v.Code] = v.Value
-            })
-            i18n.mergeLocaleMessage('zh', zhMessages)
-            i18n.mergeLocaleMessage('en', enMessages)
-            this.drawer = false
-            this.$message.success('国际化修改成功')
-            if (this.il8nExternal) {
-              this.$EventBus.$emit('il8nUpdate')
+      this.$confirm(this.$t("i18n:confirm:updatei18n"))
+        .then(() => {
+          batchAddOrUpdateFrontInternationalization(this.tableData).then(
+            async (res) => {
+              var zhMessages = {},
+                enMessages = {}
+              var Internationalization =
+                await getFrontInternationalizationList()
+              Vue.prototype.$tl = Internationalization.Result
+              this.tableData.forEach((v) => {
+                // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
+                // enMessages[v.Description + '_' + v.Code] = v.Value
+                zhMessages[v.Code] = v.ValueCN
+                enMessages[v.Code] = v.Value
+              })
+              i18n.mergeLocaleMessage('zh', zhMessages)
+              i18n.mergeLocaleMessage('en', enMessages)
+              this.drawer = false
+              this.$message.success(this.$t("i18n:message:updatei18nSuccessfully"))
+              if (this.il8nExternal) {
+                this.$EventBus.$emit('il8nUpdate')
+              }
             }
-          }
-        )
-      })
+          )
+        })
+        .catch((err) => {
+          console.log(err)
+        })
     },
     openI18n(ARRAY) {
       this.tableData = []
       this.il8nExternal = false
+      this.State = null
       this.key = null
       this.drawer = true
       let arr = []
@@ -266,6 +305,8 @@ export default {
             Value: item.Value,
             ValueCN: item.ValueCN,
             State: item.State,
+            Version: item.Version,
+            InternationalizationType: item.InternationalizationType,
           }
         })
         this.tableData = Object.assign([], tableData)
@@ -296,6 +337,9 @@ export default {
             Description: null,
             Value: null,
             ValueCN: null,
+            State: 0,
+            Version: this.$version.Version,
+            InternationalizationType: 0,
           })
         }
       })

src/api/admin.js

@@ -342,3 +342,11 @@ export function addNewUserSendEmail(data) {
     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}`,
-    method: 'get'
+    url: `/Dictionary/getChildList`,
+    method: 'post',
+    data
   })
 }
 
@@ -1069,4 +1106,294 @@ export function batchAddEnrollOrPdEmailConfig(params) {
     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}`,
-    method: 'get'
+    url: `/FrontAuditConfig/getModuleTypeDescriptionList`,
+    method: 'get',
+    params
+  })
+}
+
+export function getModuleTypeList(data) {
+  return request({
+    url: `/FrontAuditConfig/getModuleTypeList`,
+    method: 'post',
+    data
   })
 }
 

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',
@@ -178,6 +185,15 @@ export function pMTrainingRecordList_Export(data) {
     data
   })
 }
+// 导出系统培训记录
+export function getSysDocumentConfirmList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getSysDocumentConfirmList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
 // 导出影像指控
 export function qCVisitList_Export(data) {
   return requestDownload({

src/api/trials.js

@@ -1035,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`,
@@ -1080,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({
@@ -1365,9 +1398,9 @@ export function getForwardList(param) {
   })
 }
 
-export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '') {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading = false) {
   return request({
-    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}`,
+    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
     method: 'get'
   })
 }
@@ -1586,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}`,
@@ -1600,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`,
@@ -3295,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({
@@ -3933,8 +3987,6 @@ export function updateTrialUserRole(data) {
   })
 }
 
-
-
 // 获取报表配置
 export function getTrialQuestionExportResult(data) {
   return request({
@@ -3958,4 +4010,191 @@ export function trialUserSendJoinEmail(data) {
     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

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

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"
@@ -146,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">
-        <slot v-if="item.slot" :name="item.slot" />
-        <el-button
-          v-else
-          :type="item.type"
-          :size="item.size || size"
-          :icon="item.icon || ''"
-          @click="handleClick(item.emitKey)"
-          >{{ item.label }}</el-button
-        >
-      </el-form-item>
+      <div style="display: inline-block;width: fit-content;">
+        <el-form-item v-for="item in searchHandle" :key="item.label">
+          <slot v-if="item.slot" :name="item.slot" />
+          <el-button
+            v-else
+            :type="item.type"
+            :icon="item.icon || ''"
+            @click="handleClick(item.emitKey)"
+            >{{ item.label }}</el-button
+          >
+        </el-form-item>
+      </div>
     </el-form>
   </div>
 </template>
@@ -174,11 +175,11 @@ export default {
     },
     labelWidth: {
       type: String,
-      default: "",
+      default: '',
     },
     size: {
       type: String,
-      default: "mini",
+      default: 'mini',
     },
     searchForm: {
       type: Array,
@@ -196,10 +197,10 @@ export default {
   methods: {
     handleClick(emitKey) {
       // emit事件
-      this.$emit(`${emitKey}`);
+      this.$emit(`${emitKey}`)
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .base-search-form {

src/components/BaseTable/index.vue

@@ -62,7 +62,6 @@
                   </a> -->
                   <span v-for="(operate, i) in column.operates" :key="i">
                     <el-button
-                      :size="operate.size || 'mini'"
                       :type="operate.type || 'primary'"
                       v-if="
                         (operate.show && scope.row[operate.show]) ||

src/components/Dicom/DicomCanvas.vue

@@ -1,15 +1,7 @@
 <template>
-  <div
-    id="canvas"
-    ref="canvas"
-    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 id="canvas" ref="canvas" 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 :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @mousedown="sliderMousedown($event)" />
+    <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 :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,9 @@
     <!-- <div v-show="stack.firstImageLoading" class="load-indicator">
       Loading Series #{{ stack.seriesNumber }}...
     </div>-->
-    <el-dialog
-      v-if="dcmTag.visible"
-      :visible.sync="dcmTag.visible"
-      :close-on-click-modal="false"
-      :title="dcmTag.title"
-      width="1000px"
-      custom-class="base-dialog-wrapper"
-      append-to-body
-    >
-      <DicomTags :image-id="stack.imageIds[stack.currentImageIdIndex]" @close="dcmTag.visible = false" />
+    <el-dialog 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>
@@ -217,10 +208,10 @@ export default {
         this.stack.description = dicomSeries.description
         this.toolState.viewportInvert = false
         this.toolState.dicomInfoVisible = false
-        var imageId = this.stack.imageIds[this.stack.currentImageIdIndex]
-        var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-        instanceId = instanceId.split('.')[0]
-        this.stack.instanceId = instanceId
+        // var imageId = this.stack.imageIds[this.stack.currentImageIdIndex]
+        // var instanceId = imageId.split('/')[imageId.split('/').length - 1]
+        // instanceId = instanceId.split('.')[0]
+        // this.stack.instanceId = instanceId
         this.toolState.clipPlaying = false
         const element = this.$refs.canvas
         cornerstone.enable(element)
@@ -263,9 +254,9 @@ export default {
             )
             if (!toolAlreadyAddedToElement) {
               if (toolName === 'RectangleRoi') {
-                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true, showStatsText: true}})
+                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true, showStatsText: true } })
               } else if (toolName === 'EllipticalRoi') {
-                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true}})
+                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true } })
               } else {
                 cornerstoneTools.addToolForElement(element, apiTool)
               }
@@ -328,7 +319,7 @@ export default {
       // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip'])
       cornerstoneTools.addToolState(this.canvas, 'stack', this.stack)
       // cornerstoneTools.stackPrefetch.enable(this.canvas)
-      cornerstone.updateImage(element, true) 
+      cornerstone.updateImage(element, true)
       // cornerstoneTools.stackPrefetch.setConfiguration({ maxImagesToPrefetch: Infinity,
       // preserveExistingPool: true })
       // cornerstoneTools.stackPrefetch.enable(this.canvas)
@@ -346,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]
-      instanceId = instanceId.split('.')[0]
-      this.stack.instanceId = instanceId
+      // var instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
+      // instanceId = instanceId.split('.')[0]
+      // this.stack.instanceId = instanceId
       this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
       this.resetWwwc()
     },
@@ -368,9 +359,8 @@ export default {
         data.string('x00080030')
       )
       this.dicomInfo.series = data.string('x00200011')
-      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${
-        this.stack.imageIds.length
-      }`
+      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${this.stack.imageIds.length
+        }`
       this.dicomInfo.size = `${data.uint16('x00280011')}x${data.uint16(
         'x00280010'
       )}`
@@ -388,6 +378,7 @@ export default {
       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
@@ -415,15 +406,16 @@ export default {
     },
 
     onImageRendered(e) {
-      var imageId = e.detail.image.imageId
-      var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-      instanceId = instanceId.split('.')[0]
+      // var imageId = e.detail.image.imageId
+      // var instanceId = imageId.split('/')[imageId.split('/').length - 1]
+      // instanceId = instanceId.split('.')[0]
 
-      if (this.imageId !== instanceId) {
-        this.getOrientationMarker(e.detail.element)
-        this.imageId = instanceId
-      }
-      this.stack.instanceId = instanceId
+      // if (this.imageId !== instanceId) {
+      //   this.getOrientationMarker(e.detail.element)
+      //   this.imageId = instanceId
+      // }
+      this.getOrientationMarker(e.detail.element)
+      // this.stack.instanceId = instanceId
       var viewport = e.detail.viewport
       this.dicomInfo.wwwc = `${Math.round(
         viewport.voi.windowWidth
@@ -677,7 +669,7 @@ export default {
       cornerstoneTools.getToolState(
         this.canvas,
         'playClip'
-      ).data[0].loop = false
+      ).data[0].loop = true
     },
     setFps(fps) {
       this.dicomInfo.fps = fps
@@ -1135,6 +1127,7 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
+
 .info-image {
   position: absolute;
   left: 10px;
@@ -1154,6 +1147,7 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
+
 .info-instance {
   position: absolute;
   right: 15px;
@@ -1186,6 +1180,7 @@ export default {
   margin: 10px;
   cursor: default;
 }
+
 .menu__item:hover {
   color: #ff0000;
 }
@@ -1205,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/PreviewFile/index.vue

@@ -1,28 +1,30 @@
 <template>
   <div class="preview-wrapper">
-    <iframe
-      v-if="fileType.indexOf('jpg') !== -1 || fileType.indexOf('png') !== -1"
-      frameborder="0"
-      :src="filePath"
-      width="100%"
-      height="100%"
-    />
+    <iframe v-if="fileType.indexOf('jpg') !== -1 || fileType.indexOf('png') !== -1" 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}&COMPANY=${COMPANY}`" 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,12 +38,22 @@ export default {
     fileType: {
       type: String,
       required: true
-    }
+    },
+    title: {
+      type: String,
+      default: ''
+    },
   },
   data() {
     return {
       currentUser: zzSessionStorage.getItem('userName'),
-      COMPANY:process.env.VUE_APP_COMPANY_NAME
+      COMPANY: process.env.VUE_APP_COMPANY_NAME,
+      onlyOffice_url: process.env.VUE_APP_ONLYOFFICE_URL
+    }
+  },
+  computed: {
+    documentType() {
+      return DOCUMENTTYPE[`.${this.fileType}`]
     }
   },
   mounted() {
@@ -62,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/TrialsTab/index.vue

@@ -149,6 +149,7 @@ export default {
       return isShow
     },
     goBack() {
+      zzSessionStorage.removeItem('lastWorkbench')
       this.$router.push({ path: '/trials/trials-list' })
     },
     selectTrials(v) {

src/components/clinicalDataQuestions/components/QuestionFormItem.vue

@@ -1,21 +1,16 @@
 <template>
   <div class="criterion-form-item">
-    <div
-      v-if="!!question.QuestionName && question.ClinicalQuestionType==='group'"
-      style="font-weight: bold;font-size: 16px;margin: 5px 0px;margin-bottom: 10px"
-    >
-      {{ language==='en'?question.QuestionEnName:question.QuestionName }}
+    <div v-if="!!question.QuestionName && question.ClinicalQuestionType === 'group'"
+      style="font-weight: bold;font-size: 16px;margin: 5px 0px;margin-bottom: 10px">
+      {{ language === 'en' ? question.QuestionEnName : question.QuestionName }}
+    </div>
+    <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'"
-      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==='table' && ((question.ClinicalQuestionShowEnum===1 && question.ParentTriggerValue === questionForm[question.ParentId].toString()) || question.ClinicalQuestionShowEnum===0)"
-      style="font-weight: bold;font-size: 14px;margin: 5px 0px;"
-    >
+      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,23 @@
           {{ $t('trials:readingUnit:qsList:title:add') }}
         </el-button>
       </div>
-      <el-table
-        :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
-          :label="$t('common:action:action')"
-          min-width="100"
-          show-overflow-tooltip
-        >
+      <el-table :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>
+          <template slot-scope="scope">
+            {{ scope.row[item.Id] && Array.isArray(scope.row[item.Id]) ?
+              scope.row[item.Id].join(" | ")
+              : scope.row[item.Id] }}
+          </template>
+        </el-table-column>
+        <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 +45,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"
-        :label="`${question.QuestionName}`"
-        :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',
-            message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']}
-        ]"
-        :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
-      >
+        v-if="(question.ClinicalQuestionShowEnum === 1 && question.ParentTriggerValue === questionForm[question.ParentId].toString()) || question.ClinicalQuestionShowEnum === 0"
+        :label="`${question.QuestionName}`" :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',
+            message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+          }
+        ]" :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' ? 'uploadWrapper' : '']">
         <!-- 输入框 -->
-        <el-input
-          v-if="question.ClinicalQuestionType==='input'"
-          v-model="questionForm[question.Id]"
+        <el-input 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
-          v-if="question.ClinicalQuestionType==='textarea'"
-          v-model="questionForm[question.Id]"
-          type="textarea"
-          :max-length="question.MaxAnswerLength ? question.MaxAnswerLength : 200"
-          :autosize="{ minRows: 2, maxRows: 4}"
-        />
+        <el-input v-if="question.ClinicalQuestionType === 'textarea'" v-model="questionForm[question.Id]"
+          type="textarea" :max-length="question.MaxAnswerLength ? question.MaxAnswerLength : 200"
+          :autosize="{ minRows: 2, maxRows: 4 }" />
         <!-- 下拉框 -->
-        <el-select
-          v-if="question.ClinicalQuestionType==='select'"
-          v-model="questionForm[question.Id]"
-          clearable
+        <el-select 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
-              v-for="item in organList"
-              :key="item.Id"
-              :label="item[question.DataTableColumn]"
-              :value="item[question.DataTableColumn]"
-            />
+            <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
+              :value="item[question.DataTableColumn]" />
           </template>
           <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-            <el-option
-              v-for="item of $d[question.DictionaryCode]"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
+              :label="item.label" />
           </template>
-          <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-            <el-option
-              v-for="item of $d[question.DictionaryCode]"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+          <template
+            v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
+              :label="item.label" />
           </template>
           <template v-else>
-            <el-option
-              v-for="val in question.TypeValue.split('|')"
-              :key="val"
-              :label="val"
-              :value="val.trim()"
-            />
+            <el-option 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
-          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-radio-group
-          v-if="question.ClinicalQuestionType==='radio'"
-          v-model="questionForm[question.Id]"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
+        <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
-              v-for="item of $d[question.DictionaryCode]"
-              :key="item.id"
-              :label="item.value"
-            >
+            <el-radio 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
-              v-for="val in question.TypeValue.split('|')"
-              :key="val"
-              :label="val"
-            >
+            <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
               {{ val }}
             </el-radio>
           </template>
         </el-radio-group>
         <!-- 复选框 -->
-        <el-checkbox-group
-          v-if="question.ClinicalQuestionType==='checkbox' && 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-group v-if="question.ClinicalQuestionType === 'checkbox' && questionForm[question.Id] !== ''"
+          v-model="questionForm[question.Id]">
+          <el-checkbox v-for="val of question.TypeValue.split('|')" :key="val" :label="val" :value="val">
             {{ val }}
           </el-checkbox>
         </el-checkbox-group>
-        <el-input
-          v-if="question.ClinicalQuestionType === 'number'"
-          :ref="question.Id"
-          v-model="questionForm[question.Id]"
-          type="number"
-          style="width: 200px"
-          :disabled="question.CustomCalculateMark > 0"
-          @input="limitInput($event, questionForm, question)"
-        >
+        <el-input v-if="question.ClinicalQuestionType === 'number'" :ref="question.Id"
+          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">
-          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId] }}
+        <span v-if="question.CustomCalculateMark === 11 && question.ClinicalQuestionType === 'number'"
+          v-show="questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] <= questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId]"
+          style="margin-left: 10px">
+          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{
+            questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId] }}
         </span>
-        <span v-if="question.CustomCalculateMark === 10 && question.ClinicalQuestionType === 'number' && questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId]" style="margin-left: 10px">
-          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm.CreateTime ? questionForm.CreateTime : parseTime(new Date(), '{y}-{m}-{d}') }}
+        <span
+          v-if="question.CustomCalculateMark === 10 && question.ClinicalQuestionType === 'number' && questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId]"
+          style="margin-left: 10px">
+          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm.CreateTime ?
+            questionForm.CreateTime : parseTime(new Date(), '{y}-{m}-{d}') }}
         </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">
-      <QuestionFormItem
-        :key="item.Id"
-        :question="item"
-        :question-form="questionForm"
-        :trial-clinical-id="trialClinicalId"
-        @formItemNumberChange="formItemNumberChange"
-        @setFormItemData="setFormItemData"
-        @resetFormItemData="resetFormItemData"
-      />
+    <el-col v-for="(item) in question.Childrens" :key="item.Id"
+      v-if="question.Childrens && question.Childrens.length > 0 && question.ClinicalQuestionType !== 'table'"
+      :span="['group', 'summary', 'table'].includes(item.ClinicalQuestionType) || item.Childrens.length > 0 ? 24 : 12">
+      <QuestionFormItem :key="item.Id" :question="item" :question-form="questionForm"
+        :trial-clinical-id="trialClinicalId" @formItemNumberChange="formItemNumberChange"
+        @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData" />
     </el-col>
-    <el-dialog
-      v-if="addOrEdit.visible"
-      class="my_dialog"
-      :visible.sync="addOrEdit.visible"
-      :close-on-click-modal="false"
-      :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"
-        />
+    <el-dialog v-if="addOrEdit.visible" class="my_dialog" :visible.sync="addOrEdit.visible"
+      :close-on-click-modal="false" :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
-              size="small"
-              type="primary"
-              @click="addOrEdit.visible = false"
-            >
+            <el-button size="small" type="primary" @click="addOrEdit.visible = false">
               {{ $t('common:button:cancel') }}
             </el-button>
             <!-- 保存 -->
@@ -282,7 +195,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 +319,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 +361,16 @@ export default {
                   }
                   break
                 case 11:
-                  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]))
+                  if (parseFloat(this.getCurrentAgeByBirthDate(this.questionForm[o.TableQuestionId])) > 0) {
+                    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 {
@@ -494,19 +410,19 @@ export default {
       } catch (e) {
         console.log(e)
       }
-      console.log(num)
+      if (rules.DigitPlaces) {
+        num = num.toFixed(rules.DigitPlaces)
+      }
       return num
     },
     formItemNumberChange(questionId, isTable) {
       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 +436,6 @@ export default {
               return o.TableQuestionId === questionId
             })
             // find的自动计算值number
-            console.log('find', find)
             // find的自动计算值number
             if (find) {
               var num = this.logic(v)
@@ -591,40 +506,50 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.my_dialog{
-  .criterion-form-item{
-    >>>.el-form-item__content{
+::v-deep .el-form-item__label{
+  color: #606266 !important;
+}
+.my_dialog {
+  .criterion-form-item {
+    ::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

@@ -1,125 +1,65 @@
 <template>
   <div class="criterion-form-item">
 
-    <el-form-item
-      :label="`${question.QuestionName}`"
-      :prop="question.Id"
-      :rules="[
-        { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))),
-          message: $t('common:ruleMessage:specify'), trigger: ['blur'],
-          type: question.ClinicalTableQuestionType === 'checkbox' ? 'array' : ''},
-      ]"
-      :class="[question.ClinicalTableQuestionType==='group'?'mb':question.ClinicalTableQuestionType==='upload'?'uploadWrapper':'']"
-    >
-      <el-input
-        v-if="question.ClinicalTableQuestionType==='input'"
-        v-model="questionForm[question.Id]"
-        :max-length="200"
-        :disabled="question.TableQuestionType === 2"
-      />
+    <el-form-item :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
+      {
+        required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))),
+        message: $t('common:ruleMessage:specify'), trigger: ['blur'],
+        type: question.ClinicalTableQuestionType === 'checkbox' ? 'array' : ''
+      },
+    ]"
+      :class="[question.ClinicalTableQuestionType === 'group' ? 'mb' : question.ClinicalTableQuestionType === 'upload' ? 'uploadWrapper' : '']">
+      <el-input v-if="question.ClinicalTableQuestionType === 'input'" v-model="questionForm[question.Id]"
+        :max-length="200" :disabled="question.TableQuestionType === 2" />
       <!-- 多行文本输入框 -->
-      <el-input
-        v-if="question.ClinicalTableQuestionType==='textarea'"
-        v-model="questionForm[question.Id]"
-        :max-length="200"
-        type="textarea"
-        :autosize="{ minRows: 2, maxRows: 4}"
-      />
+      <el-input v-if="question.ClinicalTableQuestionType === 'textarea'" v-model="questionForm[question.Id]"
+        :max-length="200" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" />
       <!-- 下拉框 -->
-      <el-select
-        v-if="question.ClinicalTableQuestionType==='select'"
-        v-model="questionForm[question.Id]"
-        clearable
-        :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode"
-      >
+      <el-select v-if="question.ClinicalTableQuestionType === 'select'" v-model="questionForm[question.Id]" clearable
+        :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode">
         <template v-if="question.TableQuestionType === 1">
-          <el-option
-            v-for="item in organList"
-            :key="item.Id"
-            :label="item[question.DataTableColumn]"
-            :value="item[question.DataTableColumn]"
-          />
+          <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
+            :value="item[question.DataTableColumn]" />
         </template>
         <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-          <el-option
-            v-for="item of $d[question.DictionaryCode]"
-            :key="item.id"
-            :value="item.value"
-            :label="item.label"
-          />
+          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
+            :label="item.label" />
         </template>
-        <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-          <el-option
-            v-for="item of $d[question.DictionaryCode]"
-            :key="item.id"
-            :value="item.value"
-            :label="item.label"
-          />
+        <template
+          v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
+            :label="item.label" />
         </template>
         <template v-else>
-          <el-option
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-            :value="val"
-          />
+          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
         </template>
 
       </el-select>
       <!-- 单选 -->
-      <el-date-picker
-        v-if="question.ClinicalTableQuestionType === 'time'"
-        v-model="questionForm[question.Id]"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        style="width: 200px"
-        align="right"
-        type="date"
-      />
+      <el-date-picker v-if="question.ClinicalTableQuestionType === 'time'" v-model="questionForm[question.Id]"
+        format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px" align="right" type="date" />
       <!-- 单选 -->
-      <el-radio-group
-        v-if="question.ClinicalTableQuestionType==='radio'"
-        v-model="questionForm[question.Id]"
-        @change="((val)=>{formItemChange(val, question)})"
-      >
+      <el-radio-group v-if="question.ClinicalTableQuestionType === 'radio'" v-model="questionForm[question.Id]"
+        @change="((val) => { formItemChange(val, question) })">
         <template v-if="question.DictionaryCode">
-          <el-radio
-            v-for="item of $d[question.DictionaryCode]"
-            :key="item.id"
-            :label="item.value"
-          >
+          <el-radio 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
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-          >
+          <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
             {{ val }}
           </el-radio>
         </template>
       </el-radio-group>
       <!-- 复选框 -->
-      <el-checkbox-group
-        v-if="question.ClinicalTableQuestionType==='checkbox'"
-        v-model="questionForm[question.Id]"
-      >
-        <el-checkbox
-          v-for="val in question.TypeValue.split('|')"
-          :key="val"
-          :label="val"
-        >
+      <el-checkbox-group v-if="question.ClinicalTableQuestionType === 'checkbox'" v-model="questionForm[question.Id]">
+        <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
           {{ val }}
         </el-checkbox>
       </el-checkbox-group>
-      <el-input
-        v-if="question.ClinicalTableQuestionType === 'number'"
-        v-model="questionForm[question.Id]"
-        type="number"
-        style="width: 200px"
-      >
+      <el-input v-if="question.ClinicalTableQuestionType === 'number'" v-model="questionForm[question.Id]" type="number"
+        @input="limitInput($event, questionForm, question)" style="width: 200px">
         <template v-if="question.Unit" slot="append">{{ question.Unit }}</template>
       </el-input>
     </el-form-item>
@@ -187,6 +127,14 @@ export default {
     }
   },
   methods: {
+    limitInput(value, form, row) {
+      if (value.indexOf('.') > -1) {
+        if (value.split('.')[1].length >= row.DigitPlaces) {
+          this.$set(form, row.Id, parseFloat(value).toFixed(row.DigitPlaces))
+        }
+      }
+      this.$forceUpdate()
+    },
     save() {
     },
     openAddTableCol(row) {
@@ -220,34 +168,40 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.my_dialog{
-  .criterion-form-item{
-    >>>.el-form-item__content{
+.my_dialog {
+  .criterion-form-item {
+    ::v-deep .el-form-item__content {
       width: auto;
     }
   }
 }
-.criterion-form-item{
-  .el-form-item{
+
+.criterion-form-item {
+  .el-form-item {
     display: flex;
     flex-direction: row;
     align-items: flex-start;
   }
-  >>>.el-form-item__content{
+
+  ::v-deep .el-form-item__content {
     width: 500px;
   }
-  .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;

src/components/clinicalDataQuestions/components/QuestionsForm.vue

@@ -1,52 +1,30 @@
 <template>
   <div v-loading="loading" style="min-height: 500px;">
-    <el-form
-      v-if="isRender"
-      data-viewport-uid="lc"
-      ref="questions"
-      size="small"
-      :model="questionForm"
-      :disabled="openType === 'look'"
-    >
+    <el-form v-if="isRender" data-viewport-uid="lc" ref="questions" size="small" :model="questionForm"
+      :disabled="openType === 'look'">
       <template>
-        <QuestionFormItem
-          class="father"
-          v-for="question of questions"
-          :key="question.Id"
-          :question="question"
-          :question-form="questionForm"
-          :trial-clinical-id="trialClinicalId"
-          @resetFormItemData="resetFormItemData"
-          @setFormItemData="setFormItemData"
-        />
+        <QuestionFormItem class="father" v-for="question of questions" :key="question.Id" :question="question"
+          :question-form="questionForm" :trial-clinical-id="trialClinicalId" @resetFormItemData="resetFormItemData"
+          @setFormItemData="setFormItemData" />
       </template>
     </el-form>
-    <div class="base-dialog-footer" v-if="!isViewer && openType !== 'look' && [2, 3].includes(clinicalDataLevel)" style="text-align:right;margin-top:10px;">
-        <!-- 取消 -->
-        <el-button
-          size="small"
-          type="primary"
-          @click="close"
-          v-show="$route.path !== '/trials/trials-panel/visit/crc-upload'&&$route.path!=='/trials/trials-panel/visit/crc-question'"
-        >
-          {{ $t('common:button:cancel') }}
-        </el-button>
-        <!-- 保存 -->
-        <el-button size="small" type="primary" @click="submitClinicalForm">
-          {{ $t('common:button:save') }}
-        </el-button>
+    <div class="base-dialog-footer" v-if="!isViewer && openType !== 'look' && [2, 3].includes(clinicalDataLevel)"
+      style="text-align:right;margin-top:10px;">
+      <!-- 取消 -->
+      <el-button size="small" type="primary" @click="close"
+        v-show="$route.path !== '/trials/trials-panel/visit/crc-upload' && $route.path !== '/trials/trials-panel/visit/crc-question'">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <!-- 保存 -->
+      <el-button size="small" type="primary" @click="submitClinicalForm">
+        {{ $t('common:button:save') }}
+      </el-button>
     </div>
-    <el-dialog
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
+    <el-dialog v-if="signVisible" :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" @closeDialog="closeSignDialog" />
     </el-dialog>
@@ -106,7 +84,7 @@ export default {
     },
     data: {
       type: Object,
-      default: () => {}
+      default: () => { }
     },
     trialClinicalId: {
       type: String,
@@ -166,7 +144,7 @@ export default {
         let item = this.questionForm[v]
         if (item instanceof Array) {
           let TableQuestionAnswers = item.map(o => {
-            if  (o instanceof Object) {
+            if (o instanceof Object) {
               return Object.keys(o).map(x => {
                 return {
                   TableQuestionId: x,
@@ -251,7 +229,7 @@ export default {
             if (item instanceof Array) {
               let isCheckBox = false
               let TableQuestionAnswers = item.map(o => {
-                if  (o instanceof Object) {
+                if (o instanceof Object) {
                   return Object.keys(o).map(x => {
                     return {
                       TableQuestionId: x,
@@ -387,12 +365,12 @@ export default {
         }
         if (i.ClinicalQuestionType === 'table') {
           this.$set(this.questionForm, i.Id, i.TableAnswer)
-        }  else if (i.ClinicalQuestionType === 'checkbox') {
+        } else if (i.ClinicalQuestionType === 'checkbox') {
           this.$set(this.questionForm, i.Id, i.Answer ? i.Answer.split(',') : [])
           console.log(i.Answer ? i.Answer.split(',') : [])
           console.log(this.questionForm)
-        }  else if (i.ClinicalQuestionType === 'number') {
-          this.$set(this.questionForm, i.Id, i.Answer)
+        } else if (i.ClinicalQuestionType === 'number') {
+          this.$set(this.questionForm, i.Id, i.Answer || i.DefaultValue)
         } else if (i.Childrens && i.Childrens.length > 0) {
           this.setChild(i.Childrens)
         }
@@ -405,7 +383,7 @@ export default {
         this.questionForm[v] = 0
       } else if (qs.ClinicalQuestionType === 'checkbox') {
         this.questionForm[v] = []
-      } else{
+      } else {
         this.questionForm[v] = ''
       }
     },
@@ -426,23 +404,26 @@ export default {
 </script>
 <style lang="scss" scoped>
 ::-webkit-scrollbar {
-    width: 7px;
-    height: 7px;
-  }
-  ::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    background: #d0d0d0;
-  }
-.tabContent{
-  height:300px;
+  width: 7px;
+  height: 7px;
+}
+
+::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background: #d0d0d0;
+}
+
+.tabContent {
+  height: 300px;
   overflow-y: auto;
 
 }
-.father:after{
+
+.father:after {
   content: "";
   display: block;
   height: 0;
-  clear:both;
+  clear: both;
   visibility: hidden;
 }
 </style>

src/components/clinicalDataQuestions/index.vue

@@ -1,42 +1,28 @@
 <template>
   <div v-loading="loading">
-    <QuestionsForm
-      v-if="clinicalUploadType === 2"
-      :data="data"
-      :trial-clinical-id="trialClinicalId"
-      :is-viewer="isViewer"
-      :visit-id="visitId"
-      :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="() => {}">
+    <QuestionsForm v-if="clinicalUploadType === 2" :data="data" :trial-clinical-id="trialClinicalId"
+      :is-viewer="isViewer" :visit-id="visitId" :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
-      v-if="signVisible"
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
+    <el-dialog v-if="signVisible" :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>
+<style scoped></style>

src/components/downloadDicomAndNonedicom/index.vue

@@ -1,39 +1,19 @@
 <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"
-  >
+  <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')"
-        >
+        <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')"
-        >
+        <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')"
-        >
+        <el-button type="primary" size="mini" v-if="hasDicom || hasNonedicom"
+          @click.stop="getIRReadingDownloadStudyInfo('all')">
           {{ $t('download:button:downloadAll') }}
         </el-button>
       </div>
@@ -43,16 +23,9 @@
       <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 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"
@@ -60,50 +33,28 @@
       /> -->
       <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: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: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"
-      >
+      <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
-      >
+      <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)"
-          >
+          <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
@@ -113,37 +64,19 @@
           <span v-else>0</span>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('common:action:action')"
-        fixed="right"
-        width="150"
-      >
+      <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-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)"
-          />
+          <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"
-    />
+    <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :modelList="modelList" :bodyPart="bodyPart"
+      :IsDicom="IsDicom" :visitTaskId="modelTaskId" />
   </el-dialog>
 </template>
 <script>
@@ -358,7 +291,8 @@ export default {
         name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
       }
       if (this.IsReadingTaskViewInOrder === 0) {
-        name = `${list[0].TaskBlindName}.zip`
+        // name = `${list[0].TaskBlindName}.zip`
+        name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
       }
       list.forEach((data) => {
         if (data.StudyList && data.StudyList.length > 0) {
@@ -370,11 +304,9 @@ export default {
                   series.InstancePathList.forEach((instance) => {
                     let fileName = instance.Path.split('/').pop()
                     let obj = {
-                      name: `${data.SubjectCode}/${
-                        data.TaskBlindName
-                      }/${this.$fd('IsDicom', true)}/${
-                        study.StudyCode
-                      }/${fileName}`,
+                      name: `${data.SubjectCode}/${data.TaskBlindName
+                        }/${this.$fd('IsDicom', true)}/${study.StudyCode
+                        }/${fileName}`,
                       url: this.OSSclientConfig.basePath + instance.Path,
                     }
                     if (this.IsReadingTaskViewInOrder === 0) {
@@ -500,10 +432,12 @@ export default {
   justify-content: space-between;
   margin: 10px 0;
 }
+
 .tip {
   display: flex;
   align-items: flex-start;
   margin-top: 5px;
+
   i {
     margin: 3px 5px 0 0;
   }

src/components/toggleRole/index.vue

@@ -92,6 +92,7 @@ export default {
       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)
@@ -111,11 +112,11 @@ export default {
   margin: auto;
 }
 
-/deep/ .el-radio__original {
+::v-deep .el-radio__original {
   display: none !important; /* 隐藏原生 radio 输入，但仍然允许交互 */
 }
 
-/deep/.el-radio:focus:not(.is-focus):not(:active):not(.is-disabled)
+::v-deep.el-radio:focus:not(.is-focus):not(:active):not(.is-disabled)
   .el-radio__inner {
   box-shadow: none !important;
 }

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -4,123 +4,63 @@
       <span>{{ $t('upload:dicom:title') }}</span>
       <div class="tip">
         <i class="el-icon-warning-outline"></i>
-        <div
-          v-html="$t(`upload:dicom:tip:message${isReadingTaskViewInOrder}`)"
-        ></div>
+        <div v-html="$t(`upload:dicom:tip:message${isReadingTaskViewInOrder}`)"></div>
       </div>
     </div>
     <!--检查列表-->
     <el-table :data="list" style="width: 100%" height="300" :loading="loading">
       <!--受试者-->
-      <el-table-column
-        prop="SubjectCode"
-        :label="$t('upload:dicom:table:subjectCode')"
-      />
+      <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" />
       <!--任务名称-->
-      <el-table-column
-        prop="TaskBlindName"
-        :label="$t('upload:dicom:table:taskBlindName')"
-      />
+      <el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" />
       <!--原始检查数-->
-      <el-table-column
-        prop="OrginalStudyList"
-        :label="$t('upload:dicom:table:orginalStudyListNum')"
-      >
+      <el-table-column prop="OrginalStudyList" :label="$t('upload:dicom:table:orginalStudyListNum')">
         <template slot-scope="scope">
-          <el-button
-            v-if="
-              scope.row.OrginalStudyList &&
-              scope.row.OrginalStudyList.length >= 1
-            "
-            type="text"
-            @click="handleOpenDialog(scope.row, 'OrginalStudyList')"
-          >
+          <el-button v-if="
+            scope.row.OrginalStudyList &&
+            scope.row.OrginalStudyList.length >= 1
+          " type="text" @click="handleOpenDialog(scope.row, 'OrginalStudyList')">
             <span>{{ scope.row.OrginalStudyList.length }}</span>
           </el-button>
           <span v-else>0</span>
         </template>
       </el-table-column>
       <!--后处理检查数-->
-      <el-table-column
-        prop="UploadStudyList"
-        :label="$t('upload:dicom:table:uploadStudyListNum')"
-      >
+      <el-table-column prop="UploadStudyList" :label="$t('upload:dicom:table:uploadStudyListNum')">
         <template slot-scope="scope">
-          <el-button
-            v-if="
-              scope.row.UploadStudyList && scope.row.UploadStudyList.length >= 1
-            "
-            type="text"
-            @click="handleOpenDialog(scope.row, 'UploadStudyList', true)"
-          >
+          <el-button v-if="
+            scope.row.UploadStudyList && scope.row.UploadStudyList.length >= 1
+          " type="text" @click="handleOpenDialog(scope.row, 'UploadStudyList', true)">
             <span>{{ scope.row.UploadStudyList.length }}</span>
           </el-button>
           <span v-else>0</span>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('common:action:action')"
-        fixed="right"
-        width="180"
-      >
+      <el-table-column :label="$t('common:action:action')" fixed="right" width="180">
         <template slot-scope="scope">
           <div class="btnBox">
             <!--上传--->
-            <form
-              id="inputForm"
-              :ref="`uploadForm_${scope.row.Id}`"
-              enctype="multipart/form-data"
-            >
+            <form id="inputForm" :ref="`uploadForm_${scope.row.Id}`" enctype="multipart/form-data">
               <div class="form-group" style="margin-right: 10px">
-                <div
-                  :id="`directoryInputWrapper_${scope.row.Id}`"
-                  class="btn btn-link file-input"
-                >
-                  <el-button
-                    circle
-                    icon="el-icon-upload2"
-                    :disabled="btnLoading"
-                    :loading="btnLoading"
-                    :title="$t('upload:dicom:button:upload')"
-                  />
-                  <input
-                    :title="$t('upload:dicom:button:upload')"
-                    type="file"
-                    :name="`file_${scope.row.VisitTaskId}`"
-                    :ref="`pathClear_${scope.row.VisitTaskId}`"
-                    :disabled="btnLoading"
-                    webkitdirectory
-                    multiple
-                    @change="
+                <div :id="`directoryInputWrapper_${scope.row.Id}`" class="btn btn-link file-input">
+                  <el-button circle icon="el-icon-upload2" :disabled="btnLoading" :loading="btnLoading"
+                    :title="$t('upload:dicom:button:upload')" />
+                  <input :title="$t('upload:dicom:button:upload')" type="file" :name="`file_${scope.row.VisitTaskId}`"
+                    :ref="`pathClear_${scope.row.VisitTaskId}`" :disabled="btnLoading" webkitdirectory multiple @change="
                       ($event) => beginScanFiles($event, scope.row.VisitTaskId)
-                    "
-                  />
+                    " />
                 </div>
               </div>
             </form>
             <!--预览--->
-            <el-button
-              circle
-              icon="el-icon-view"
-              :disabled="
-                !scope.row.UploadStudyList ||
-                scope.row.UploadStudyList.length <= 0
-              "
-              @click.stop="handleViewReadingImages(scope.row)"
-              :title="$t('upload:dicom:button:preview')"
-            />
+            <el-button circle icon="el-icon-view" :disabled="!scope.row.UploadStudyList ||
+              scope.row.UploadStudyList.length <= 0
+              " @click.stop="handleViewReadingImages(scope.row)" :title="$t('upload:dicom:button:preview')" />
             <!--删除--->
-            <el-button
-              circle
-              :disabled="
-                !scope.row.UploadStudyList ||
-                scope.row.UploadStudyList.length <= 0 ||
-                scope.row.ReadingTaskState === 2
-              "
-              icon="el-icon-delete"
-              :title="$t('upload:dicom:button:delete')"
-              @click.stop="remove(scope.row)"
-            />
+            <el-button circle :disabled="!scope.row.UploadStudyList ||
+              scope.row.UploadStudyList.length <= 0 ||
+              scope.row.ReadingTaskState === 2
+              " icon="el-icon-delete" :title="$t('upload:dicom:button:delete')" @click.stop="remove(scope.row)" />
           </div>
         </template>
       </el-table-column>
@@ -134,38 +74,19 @@
         <form id="inputForm" ref="uploadForm" enctype="multipart/form-data">
           <div class="form-group">
             <div id="directoryInputWrapper" class="btn btn-link file-input">
-              <el-button
-                type="primary"
-                :disabled="btnLoading"
-                :loading="btnLoading"
-                size="mini"
-              >
+              <el-button type="primary" :disabled="btnLoading" :loading="btnLoading" size="mini">
                 {{ $t('upload:dicom:button:batchUpload') }}
               </el-button>
-              <input
-                type="file"
-                name="file"
-                ref="pathClear"
-                :disabled="btnLoading"
-                webkitdirectory
-                multiple
-                title=""
-                @change="beginScanFiles($event)"
-              />
+              <input type="file" name="file" ref="pathClear" :disabled="btnLoading" webkitdirectory multiple title=""
+                @change="beginScanFiles($event)" />
             </div>
           </div>
         </form>
       </div>
     </div>
     <!--上传列表-->
-    <el-table
-      ref="dicomFilesTable"
-      v-adaptive="{ bottomOffset: 80 }"
-      height="100"
-      :data="uploadQueues"
-      class="dicomFiles-table"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 80 }" height="100" :data="uploadQueues"
+      class="dicomFiles-table" @selection-change="handleSelectionChange">
       <el-table-column type="index" width="40" />
       <el-table-column min-width="200" show-overflow-tooltip>
         <template slot="header">
@@ -182,28 +103,21 @@
           <div style="line-height: 15px">
             <div>
               <div>
-                <span v-if="scope.row.dicomInfo.accNumber"
-                  ><span style="font-weight: 500">Acc:</span>
-                  {{ scope.row.dicomInfo.accNumber }}</span
-                >
+                <span v-if="scope.row.dicomInfo.accNumber"><span style="font-weight: 500">Acc:</span>
+                  {{ scope.row.dicomInfo.accNumber }}</span>
                 <span v-else style="color: #f44336">N/A</span>
               </div>
               <div style="display: inline-block; margin-right: 2px">
                 <span v-if="scope.row.dicomInfo.modality.length > 0">
-                  {{ scope.row.dicomInfo.modality.join('、') }},</span
-                >
+                  {{ scope.row.dicomInfo.modality.join('、') }},</span>
                 <span v-else style="color: #f44336">N/A,</span>
               </div>
               <div style="display: inline-block; margin-right: 2px">
-                <span v-if="scope.row.seriesList.length"
-                  >{{ scope.row.seriesList.length }} Series,</span
-                >
+                <span v-if="scope.row.seriesList.length">{{ scope.row.seriesList.length }} Series,</span>
                 <span v-else style="color: #f44336">N/A,</span>
               </div>
               <div style="display: inline-block">
-                <span v-if="scope.row.fileList.length"
-                  >{{ scope.row.fileList.length }} Instances</span
-                >
+                <span v-if="scope.row.fileList.length">{{ scope.row.fileList.length }} Instances</span>
                 <span v-else style="color: #f44336">N/A</span>
               </div>
             </div>
@@ -217,8 +131,7 @@
               </div>
               <div style="display: inline-block">
                 <span v-if="scope.row.dicomInfo.description">
-                  {{ scope.row.dicomInfo.description }}</span
-                >
+                  {{ scope.row.dicomInfo.description }}</span>
                 <span v-else style="color: #f44336">N/A</span>
               </div>
             </div>
@@ -242,16 +155,12 @@
         <template slot-scope="scope">
           <div style="line-height: 15px">
             <div>
-              <span v-if="scope.row.dicomInfo.patientId"
-                ><span style="font-weight: 500">PID: </span
-                >{{ scope.row.dicomInfo.patientId }}</span
-              >
+              <span v-if="scope.row.dicomInfo.patientId"><span style="font-weight: 500">PID: </span>{{
+                scope.row.dicomInfo.patientId }}</span>
               <span v-else style="color: #f44336">N/A</span>
             </div>
             <div>
-              <span
-                :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']"
-              >
+              <span :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']">
                 {{
                   scope.row.dicomInfo.patientName
                     ? scope.row.dicomInfo.patientName
@@ -260,9 +169,7 @@
               </span>
             </div>
             <div>
-              <span
-                :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']"
-              >
+              <span :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']">
                 {{
                   scope.row.dicomInfo.patientSex
                     ? scope.row.dicomInfo.patientSex
@@ -270,9 +177,7 @@
                 }},
               </span>
 
-              <span
-                :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']"
-              >
+              <span :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']">
                 {{
                   scope.row.dicomInfo.patientAge
                     ? scope.row.dicomInfo.patientAge
@@ -280,11 +185,9 @@
                 }},
               </span>
 
-              <span
-                :class="[
-                  scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
-                ]"
-              >
+              <span :class="[
+                scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
+              ]">
                 {{
                   scope.row.dicomInfo.patientBirthDate
                     ? scope.row.dicomInfo.patientBirthDate
@@ -295,114 +198,74 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('trials:uploadDicomList:table:failedFileCount')"
-        min-width="150"
-        show-overflow-tooltip
-      >
+      <el-table-column :label="$t('trials:uploadDicomList:table:failedFileCount')" min-width="150"
+        show-overflow-tooltip>
         <template slot-scope="scope">
-          <el-progress
-            color="#409eff"
-            :percentage="
-              (
-                (scope.row.dicomInfo.uploadFileSize * 100) /
-                scope.row.dicomInfo.fileSize
-              ).toFixed(2) * 1
-            "
-          />
+          <el-progress color="#409eff" :percentage="(
+            (scope.row.dicomInfo.uploadFileSize * 100) /
+            (scope.row.dicomInfo.fileSize ? scope.row.dicomInfo.fileSize : 1)
+          ).toFixed(2) * 1
+            " />
           <span>
             {{ $t('trials:uploadDicomList:table:uploadNow')
             }}{{ scope.row.dicomInfo.failedFileCount }}/{{
               scope.row.dicomInfo.fileCount
             }}
             ({{
-              (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2)
+              (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(3)
             }}MB/{{
-              (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2)
+              (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(3)
             }}MB)
           </span>
         </template>
       </el-table-column>
 
-      <el-table-column
-        :label="$t('trials:uploadDicomList:table:status')"
-        min-width="140"
-        show-overflow-tooltip
-      >
+      <el-table-column :label="$t('trials:uploadDicomList:table:status')" min-width="140" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span
-            v-if="
-              !scope.row.dicomInfo.failedFileCount &&
-              !scope.row.dicomInfo.isInit
-            "
-          >
-            {{ $t('trials:uploadDicomList:table:status1') }}</span
-          >
-          <span
-            style="color: #409eff"
-            v-else-if="
-              !scope.row.dicomInfo.failedFileCount &&
-              scope.row.dicomInfo.isInit &&
-              btnLoading
-            "
-            >{{ $t('trials:uploadDicomList:table:status2') }}</span
-          >
-          <span
-            style="color: #409eff"
-            v-else-if="
-              scope.row.dicomInfo.failedFileCount <
-                scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
-            "
-            >{{ $t('trials:uploadDicomList:table:status2') }}</span
-          >
-          <span
-            style="color: #2cc368"
-            v-else-if="
-              scope.row.dicomInfo.failedFileCount ===
-              scope.row.dicomInfo.fileCount
-            "
-            >{{ $t('trials:uploadDicomList:table:status3') }}</span
-          >
-          <span
-            style="color: #f66"
-            v-else-if="
-              scope.row.uploadState.record &&
-              scope.row.uploadState.record.fileCount === 0
-            "
-            >{{ $t('trials:uploadDicomList:table:status5') }}</span
-          >
+          <span v-if="
+            !scope.row.dicomInfo.failedFileCount &&
+            !scope.row.dicomInfo.isInit
+          ">
+            {{ $t('trials:uploadDicomList:table:status1') }}</span>
+          <span style="color: #409eff" v-else-if="
+            !scope.row.dicomInfo.failedFileCount &&
+            scope.row.dicomInfo.isInit &&
+            btnLoading
+          ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
+          <span style="color: #409eff" v-else-if="
+            scope.row.dicomInfo.failedFileCount <
+            scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
+          ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
+          <span style="color: #2cc368" v-else-if="
+            scope.row.dicomInfo.failedFileCount ===
+            scope.row.dicomInfo.fileCount
+          ">{{ $t('trials:uploadDicomList:table:status3') }}</span>
+          <span style="color: #f66" v-else-if="
+            scope.row.uploadState.record &&
+            scope.row.uploadState.record.fileCount === 0
+          ">{{ $t('trials:uploadDicomList:table:status5') }}</span>
           <span style="color: #f66" v-else>{{
             $t('trials:uploadDicomList:table:Failed')
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('trials:uploadDicomList:table:record')"
-        min-width="140"
-        show-overflow-tooltip
-      >
+      <el-table-column :label="$t('trials:uploadDicomList:table:record')" min-width="140" show-overflow-tooltip>
         <template slot-scope="scope">
           <el-tooltip placement="top" v-if="scope.row.uploadState.record">
             <div slot="content">
               <div style="max-height: 500px; overflow-y: auto">
                 {{ $t('trials:uploadDicomList:table:Existed') }}:
                 <div v-if="scope.row.uploadState.record.Existed.length">
-                  <div
-                    v-for="item of scope.row.uploadState.record.Existed"
-                    :key="item"
-                    style="font-size: 12px; color: #baa72a"
-                  >
+                  <div v-for="item of scope.row.uploadState.record.Existed" :key="item"
+                    style="font-size: 12px; color: #baa72a">
                     {{ item }}
                   </div>
                 </div>
                 <div v-else>&nbsp;</div>
                 {{ $t('trials:uploadDicomList:table:Uploaded') }}:
                 <div v-if="scope.row.uploadState.record.Uploaded.length">
-                  <div
-                    v-for="item of scope.row.uploadState.record.Uploaded"
-                    :key="item"
-                    style="font-size: 12px; color: #24b837"
-                  >
+                  <div v-for="item of scope.row.uploadState.record.Uploaded" :key="item"
+                    style="font-size: 12px; color: #24b837">
                     {{ item }}
                   </div>
                 </div>
@@ -410,11 +273,8 @@
                 <br />
                 {{ $t('trials:uploadDicomList:table:Failed') }}:
                 <div v-if="scope.row.uploadState.record.Failed.length">
-                  <div
-                    v-for="item of scope.row.uploadState.record.Failed"
-                    :key="item"
-                    style="font-size: 12px; color: #f66"
-                  >
+                  <div v-for="item of scope.row.uploadState.record.Failed" :key="item"
+                    style="font-size: 12px; color: #f66">
                     {{ item }}
                   </div>
                 </div>
@@ -438,16 +298,8 @@
         </template>
       </el-table-column>
     </el-table>
-    <study-view
-      v-if="model_cfg.visible"
-      :model_cfg="model_cfg"
-      :IsDicom="true"
-      :bodyPart="bodyPart"
-      :modelList="modelList"
-      :isUpload="openIsUpload"
-      :TrialModality="TrialModality"
-      @getList="getList"
-    />
+    <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :IsDicom="true" :bodyPart="bodyPart"
+      :modelList="modelList" :isUpload="openIsUpload" :TrialModality="TrialModality" @getList="getList" />
   </div>
 </template>
 <script>
@@ -795,7 +647,7 @@ export default {
         })
         var validFilesCount = 0
         for (var i = 0; i < checkFiles.length; ++i) {
-          ;(function (index) {
+          ; (function (index) {
             p = p.then(function () {
               if (
                 checkFiles[index].name.toUpperCase().indexOf('DICOMDIR') === -1
@@ -834,6 +686,7 @@ export default {
             var studyUid = data.string('x0020000d')
             if (!studyUid) return resolve()
             var pixelDataElement = data.elements.x7fe00010
+            if (!pixelDataElement && modality !== 'SR') return resolve()
             var studyIndex = 0
             while (
               studyIndex < scope.uploadQueues.length &&
@@ -936,19 +789,19 @@ export default {
             ) {
               ++instanceIndex
             }
-            if (instanceIndex >= fileList.length) {
-              fileList.push({
-                instanceUid: instanceUid,
-                file: file,
-              })
-            }
-            scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
-            scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
-              (prev, next) => {
-                return prev + next.file.size
-              },
-              0
-            )
+            // if (instanceIndex >= fileList.length) {
+            //   fileList.push({
+            //     instanceUid: instanceUid,
+            //     file: file,
+            //   })
+            // }
+            // scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
+            // scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
+            //   (prev, next) => {
+            //     return prev + next.file.size
+            //   },
+            //   0
+            // )
 
             var seriesUid = data.string('x0020000e')
             var seriesList = scope.uploadQueues[studyIndex].seriesList
@@ -1046,6 +899,19 @@ export default {
               }
               instanceList.push(instanceItem)
             }
+            if (instanceIndex >= fileList.length) {
+              fileList.push({
+                instanceUid: instanceUid,
+                file: file,
+              })
+            }
+            scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
+            scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
+              (prev, next) => {
+                return prev + next.file.size
+              },
+              0
+            )
             resolve()
           } catch (error) {
             console.log(error)
@@ -1266,16 +1132,14 @@ export default {
                             dicomInfo.failedFileCount++
                             Record.FileCount++
                           } else {
-                            let path = `/${params.trialId}/Image/${
-                              params.subjectId
-                            }/${params.subjectVisitId}/${
-                              dicomInfo.visitTaskId
-                            }/${scope.getGuid(
-                              dicomInfo.studyUid +
+                            let path = `/${params.trialId}/Image/${params.subjectId
+                              }/${params.subjectVisitId}/${dicomInfo.visitTaskId
+                              }/${scope.getGuid(
+                                dicomInfo.studyUid +
                                 v.seriesUid +
                                 o.instanceUid +
                                 params.trialId
-                            )}`
+                              )}`
                             if (scope.isClose) return
                             let res = await dcmUpload(
                               {
@@ -1308,7 +1172,7 @@ export default {
                                     o.imageColumns,
                                     o.imageRows
                                   )
-                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                                   let OSSclient = scope.OSSclient
                                   let seriesRes = await OSSclient.put(
                                     thumbnailPath,
@@ -1421,7 +1285,7 @@ export default {
                     v.instanceList[0].imageColumns,
                     v.instanceList[0].imageRows
                   )
-                  let thumbnailPath = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                   let OSSclient = scope.OSSclient
                   try {
                     let seriesRes = await OSSclient.put(thumbnailPath, blob)
@@ -1499,8 +1363,8 @@ export default {
       return new Promise((resolve) => {
         cornerstone.loadImage(imageId).then(async (image) => {
           let canvas = document.createElement('canvas')
-          canvas.width = width
-          canvas.height = height
+          canvas.width = (width * 60) / height
+          canvas.height = 60
           if (image) {
             cornerstone.renderToCanvas(canvas, image)
             // 将 Canvas 图像对象转换为 PNG 格式
@@ -1546,16 +1410,19 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
+
 .btnBox,
 .form-group {
   display: flex;
   align-items: center;
 }
+
 #inputForm .file-input {
   position: relative;
   overflow: hidden;
   display: inline-block;
 }
+
 #inputForm .file-input input[type='file'] {
   position: absolute;
   top: 0;
@@ -1565,10 +1432,12 @@ export default {
   opacity: 0;
   cursor: pointer;
 }
+
 .tip {
   display: flex;
   align-items: flex-start;
   margin-top: 5px;
+
   i {
     margin: 3px 5px 0 0;
   }

src/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -8,93 +8,41 @@
       </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 :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="SubjectCode" :label="$t('upload:nonedicom:table:subject')" />
       <!--任务名称-->
-      <el-table-column
-        prop="TaskBlindName"
-        :label="$t('upload:nonedicom:table:taskName')"
-        sortable="custom"
-      />
+      <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 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="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable="custom" />
       <!--原文件数-->
-      <el-table-column
-        prop="FileCount"
-        :label="$t('upload:nonedicom:table:fileCount')"
-      >
+      <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-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"
-              >
+              <el-table-column prop="FileName" :label="$t('trials:audit:table:nonDicomsFileName')" width="200" />
+              <el-table-column prop="FileSize" :label="$t('trials:audit:table:nonDicomsFileSize')" width="100">
                 <template slot-scope="scope">
                   <span>{{
-                    scope.row.FileSize && scope.row.FileSize > 0
-                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
-                      : ''
+                    $FormatSize(scope.row.FileSize)
                   }}</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 :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>
@@ -109,64 +57,29 @@
         </template>
       </el-table-column>
       <!--后处理文件数-->
-      <el-table-column
-        prop="UploadedFileCount"
-        :label="$t('upload:nonedicom:table:uploadFileCount')"
-      >
+      <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-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"
-              >
+              <el-table-column prop="FileName" :label="$t('trials:audit:table:nonDicomsFileName')" width="200" />
+              <el-table-column prop="FileSize" :label="$t('trials:audit:table:nonDicomsFileSize')" width="100">
                 <template slot-scope="scope">
                   <span>{{
-                    scope.row.FileSize && scope.row.FileSize > 0
-                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
-                      : ''
+                    $FormatSize(scope.row.FileSize)
                   }}</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 :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>
@@ -180,75 +93,34 @@
           <span v-else>{{ scope.row.UploadedFileCount }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('common:action:action')"
-        fixed="right"
-        width="180"
-      >
+      <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 :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 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)"
-          />
+          <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"
-        />
+    <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"
-    >
+    <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">{{
@@ -256,33 +128,15 @@
         }}</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"
-            />
+            <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"
-            />
+            <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>
@@ -293,82 +147,46 @@
         </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 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="name" :label="$t('trials:uploadNonDicoms:table:fileName')" min-width="100" />
         <!-- 文件大小 -->
-        <el-table-column
-          prop="size"
-          :label="$t('trials:uploadNonDicoms:table:fileSize')"
-        >
+        <el-table-column prop="size" :label="$t('trials:uploadNonDicoms:table:fileSize')">
           <template slot-scope="scope">
             <span>{{
               scope.row.size && scope.row.size > 0
-                ? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
-                : ''
+                ? `${(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="type" :label="$t('trials:uploadNonDicoms:table:fileType')" />
         <!-- 上传状态 -->
-        <el-table-column
-          prop="status"
-          :label="$t('trials:uploadNonDicoms:table:uploadStatus')"
-          min-width="100"
-        >
+        <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 :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
-        >
+        <el-table-column :label="$t('trials:uploadNonDicoms:table:failedFileCount')" min-width="150"
+          show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-progress
-              color="#409eff"
-              :percentage="
-                ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
-                1
-              "
-            />
+            <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)"
-            />
+            <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>
@@ -376,13 +194,8 @@
         <span style="margin-right: 10px">{{
           $store.state.trials.uploadTip
         }}</span>
-        <el-button
-          size="small"
-          type="primary"
-          :disabled="selectArr.length == 0"
-          :loading="btnLoading"
-          @click="beginUpload"
-        >
+        <el-button size="small" type="primary" :disabled="selectArr.length == 0" :loading="btnLoading"
+          @click="beginUpload">
           {{ $t('trials:uploadNonDicoms:action:upload') }}
         </el-button>
       </div>
@@ -588,7 +401,7 @@ export default {
             )
           }
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     resetUploadForm() {
       this.$nextTick(() => {
@@ -714,11 +527,10 @@ export default {
       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()}`
+      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)
@@ -772,7 +584,7 @@ export default {
           (percentage, checkpoint, lastPer) => {
             item.uploadFileSize += checkpoint.size * (percentage - lastPer)
             if (item.uploadFileSize > file.fileSize) {
-              item.uploadFileSize = file.fileSize
+              item.uploadFileSize = file.fileSize > 0 ? file.fileSize : 1
             }
           }
         )
@@ -869,6 +681,7 @@ export default {
 .top {
   margin: 10px 0;
 }
+
 .upload {
   display: inline-block;
   height: 30px;
@@ -883,6 +696,7 @@ export default {
   background: #428bca;
   border-color: #428bca;
   color: #fff;
+
   .select-file {
     height: 30px;
     width: 90px;
@@ -893,6 +707,7 @@ export default {
     opacity: 0;
     font-size: 0;
   }
+
   .btn-select {
     //给显示在页面上的按钮写样式
     width: 90px;
@@ -908,10 +723,12 @@ export default {
     pointer-events: none; //pointer-events:none用来控制该标签的点击穿透事件
   }
 }
+
 .tip {
   display: flex;
   align-items: flex-start;
   margin-top: 5px;
+
   i {
     margin: 3px 5px 0 0;
   }

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

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

src/icons/svg/elliptical.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1751350116150" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="20392" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M870.4 819.2a51.2 51.2 0 1 1 0 102.4 51.2 51.2 0 0 1 0-102.4zM512 179.2a332.8 332.8 0 1 1 0 665.6 332.8 332.8 0 0 1 0-665.6z m0 51.2a281.6 281.6 0 1 0 0 563.2 281.6 281.6 0 0 0 0-563.2zM153.6 102.4a51.2 51.2 0 1 1 0 102.4 51.2 51.2 0 0 1 0-102.4z" fill="#ADAEB8" p-id="20393"></path></svg>

src/icons/svg/lengthscale.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1751349783728" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9505" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M838.4 279.466667zM802.133333 814.933333H279.466667c-38.4 0-70.4-32-70.4-70.4V219.733333c0-38.4 32-70.4 70.4-70.4h123.733333c38.4 0 70.4 32 70.4 70.4v339.2h347.733333c2.133333 0-2.133333 0 0 0 25.6-2.133333 51.2 21.333333 51.2 46.933334v136.533333c0 40.533333-32 72.533333-70.4 72.533333z m25.6-179.2c2.133333-29.866667-34.133333-27.733333-34.133333-27.733333H445.866667c-2.133333 0-2.133333-2.133333-4.266667-2.133333h-2.133333c-8.533333-4.266667-12.8-10.666667-12.8-21.333334v-362.666666c0-14.933333-12.8-27.733333-27.733334-27.733334h-117.333333c-14.933333 0-27.733333 12.8-27.733333 27.733334v64h115.2c12.8 0 23.466667 10.666667 23.466666 23.466666 0 12.8-10.666667 23.466667-23.466666 23.466667h-115.2v78.933333h78.933333c12.8 0 23.466667 10.666667 23.466667 23.466667 0 12.8-10.666667 23.466667-23.466667 23.466667h-78.933333v78.933333h115.2c12.8 0 23.466667 10.666667 23.466666 23.466667 0 12.8-10.666667 23.466667-23.466666 23.466666h-115.2v149.333334c0 14.933333 12.8 27.733333 27.733333 27.733333H426.666667v-85.333333c0-12.8 10.666667-25.6 23.466666-25.6 12.8 0 23.466667 10.666667 23.466667 25.6v85.333333h96v-68.266667c0-12.8 10.666667-25.6 23.466667-25.6 12.8 0 23.466667 10.666667 23.466666 25.6V768h78.933334v-85.333333c0-12.8 10.666667-25.6 23.466666-25.6 12.8 0 23.466667 10.666667 23.466667 25.6v85.333333h51.2c14.933333 0 27.733333-12.8 27.733333-27.733333l6.4-104.533334z" p-id="9506"></path></svg>

src/layout/components/Sidebar/index.vue

@@ -22,7 +22,7 @@
 import { mapGetters } from 'vuex'
 import Logo from './Logo'
 import SidebarItem from './SidebarItem'
-import variables from '@/styles/variables.scss'
+import variables from '@/styles/variables.module.scss'
 
 export default {
   components: { SidebarItem, Logo },

src/layout/components/TagsView/ScrollPane.vue

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

src/layout/index.vue

@@ -57,7 +57,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "~@/styles/mixin.scss";
-@import "~@/styles/variables.scss";
+@import "~@/styles/variables.module.scss";
 
 .app-wrapper {
   @include clearfix;

src/main.js

@@ -26,6 +26,9 @@ Vue.use(VueClipboard)
 import permission from './utils/permission'
 Vue.use(permission)
 
+import { formatSize } from "./utils"
+Vue.prototype.$FormatSize = formatSize
+
 import Viewer from 'v-viewer'
 import './assets/css/viewer.css'
 Viewer.setDefaults({
@@ -54,6 +57,10 @@ import upload from '@/components/element-ui/upload'
 Vue.use(upload)
 import Preview from '@/components/Preview/index'
 Vue.use(Preview)
+import Onlyoffice from '@/components/Preview_onlyoffice/index'
+Vue.use(Onlyoffice)
+import Video from '@/components/Preview_video/index'
+Vue.use(Video)
 import MFA from '@/components/MFA/index'
 Vue.use(MFA)
 import FB from '@/components/feedBack/index'
@@ -174,7 +181,7 @@ var _vm
 async function VueInit() {
   var params
   var res
-  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct')) {
+  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct') || ~window.location.href.indexOf('/fusion')) {
     params = $q('TrialReadingCriterionId')
     res = await getBasicDataAllSelect(params)
   } else if (~window.location.href.indexOf('/ecrfPreview')) {
@@ -308,6 +315,11 @@ async function VueInit() {
         text = text.replace(test, item.TrialName)
       })
     }
+    let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo'))
+    if (CompanyInfo && CompanyInfo.SystemShortName) {
+      let test = new RegExp('IRC', 'ig')
+      text = text.replace(test, CompanyInfo.SystemShortName)
+    }
     // return i18n.t(key)
     return text;
   }
@@ -461,8 +473,8 @@ async function VueInit() {
             var my_username = zzSessionStorage.getItem('my_username')
             var my_password = zzSessionStorage.getItem('my_password')
             let my_userid = zzSessionStorage.getItem('userId')
-            let my_EMail = zzSessionStorage.getItem('my_EMail')
-            if (md5(_vm.unlock.my_password) === my_password && my_username === _vm.unlock.my_username) {
+            let my_EMail = zzSessionStorage.getItem('my_EMail') || ''
+            if (md5(_vm.unlock.my_password) === my_password && (my_username === _vm.unlock.my_username || my_EMail.toUpperCase() === vm.unlock.my_username.toUpperCase())) {
               resetReadingRestTime().then(() => {
               })
               const closeLock = (_vm) => {

src/permission.js

@@ -7,15 +7,15 @@ import 'nprogress/nprogress.css'
 import { getToken, removeToken } from '@/utils/auth'
 import Vue from 'vue'
 import { OSSclient } from './utils/oss'
-import WHITELIST from "./utils/whiteList"
+import WHITELIST from './utils/whiteList'
 import { getTrialExtralConfig } from '@/api/trials'
 // import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false })
 
 const whiteList = WHITELIST
-store.state.trials.whiteList = whiteList;
-router.beforeEach(async (to, from, next) => {
+store.state.trials.whiteList = whiteList
+router.beforeEach(async(to, from, next) => {
   NProgress.start()
   // 设置页面标题
   // document.title = getPageTitle(to.meta.title) store.state.trials.whiteList.indexOf(to.path) === -1
@@ -27,13 +27,13 @@ router.beforeEach(async (to, from, next) => {
     to.query.trialId !==
     store.state.trials.config.trialId
   ) {
-    let res = await getTrialExtralConfig({
-      TrialId: to.query.trialId,
+    const res = await getTrialExtralConfig({
+      TrialId: to.query.trialId
     })
     if (res.IsSuccess) {
       store.dispatch('trials/setConfig', {
         trialId: to.query.trialId,
-        ...res.Result,
+        ...res.Result
       })
     }
   }
@@ -45,13 +45,13 @@ router.beforeEach(async (to, from, next) => {
     to.query.trialId !==
     store.state.trials.config.trialId
   ) {
-    let res = await getTrialExtralConfig({
-      TrialId: to.query.trialId,
+    const res = await getTrialExtralConfig({
+      TrialId: to.query.trialId
     })
     if (res.IsSuccess) {
       store.dispatch('trials/setConfig', {
         trialId: to.query.trialId,
-        ...res.Result,
+        ...res.Result
       })
     }
   }
@@ -72,12 +72,12 @@ router.beforeEach(async (to, from, next) => {
       NProgress.done()
     } else if (from.path === '/researchForm') {
       removeToken()
-      let lang = to.query.lang || zzSessionStorage.getItem('lang')
+      const lang = to.query.lang || zzSessionStorage.getItem('lang')
       next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`)
       NProgress.done()
     } else if (from.path === '/researchDetail_m') {
       removeToken()
-      let lang = to.query.lang || zzSessionStorage.getItem('lang')
+      const lang = to.query.lang || zzSessionStorage.getItem('lang')
       next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
       NProgress.done()
     } else {
@@ -107,7 +107,7 @@ router.beforeEach(async (to, from, next) => {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
       if (to.path === '/researchLogin') {
-        let lang = to.query.lang || zzSessionStorage.getItem('lang')
+        const lang = to.query.lang || zzSessionStorage.getItem('lang')
         const flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
         if (flag) {
           next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
@@ -123,11 +123,11 @@ router.beforeEach(async (to, from, next) => {
       }
     } else {
       if (to.path === '/researchForm') {
-        let lang = to.query.lang || zzSessionStorage.getItem('lang')
+        const lang = to.query.lang || zzSessionStorage.getItem('lang')
         next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`)
         NProgress.done()
       } else if (to.path === '/researchDetail_m') {
-        let lang = to.query.lang || zzSessionStorage.getItem('lang')
+        const lang = to.query.lang || zzSessionStorage.getItem('lang')
         next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
         NProgress.done()
       } else if (to.path === '/ReviewersResearchForm') {

src/router/index.js

@@ -50,12 +50,23 @@ export const constantRoutes = [
     component: () => import('@/views/login/index'),
     hidden: true
   },
+  // {
+  //   path: '/test',
+  //   component: () => import('@/views/test/index'),
+  //   hidden: true
+  // },
   {
     path: '/resetpassword',
     component: () => import('@/views/forgetpassword/index'),
     name: 'Resetpassword',
     hidden: true
   },
+  {
+    path: '/trials/trials-panel/reading/readingTracking/ReadOrder',
+    component: () => import('@/views/trials/trials-panel/reading/read-order/index'),
+    name: 'ReadOrder',
+    hidden: true
+  },
   {
     path: '/recompose',
     component: () => import('@/views/recompose/index'),
@@ -139,6 +150,12 @@ export const constantRoutes = [
     hidden: true,
     component: () => import('@/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt')
   },
+  {
+    path: '/fusion',
+    name: 'fusion',
+    hidden: true,
+    component: () => import('@/views/trials/trials-panel/reading/dicoms/components/Fusion/demo/index')
+  },
 
   {
     path: '/historyScreenshot',

src/settings.js

@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-undef
 module.exports = {
 
-  title: 'IRCIS',
+  title: 'IRC Imaging System',
 
   /**
  * @type {boolean} true | false

src/store/getters.js

@@ -48,6 +48,10 @@ const getters = {
   TotalNeedSignSystemDocCount: state => state.user.TotalNeedSignSystemDocCount,
   TotalNeedSignTrialDocCount: state => state.user.TotalNeedSignTrialDocCount,
   IsFirstSysDocNeedSign: state => state.user.IsFirstSysDocNeedSign,
-  TrialStatusStr: state => state.user.TrialStatusStr
+  TrialStatusStr: state => state.user.TrialStatusStr,
+  lastViewportTaskId: state => state.noneDicomReview.lastViewportTaskId,
+  currentTaskState: state => state.noneDicomReview.currentTaskState,
+  operateInfo: state => state.dicom3d.operateInfo,
+  deleteAnnotationIds: state => state.dicom3d.deleteAnnotationIds
 }
 export default getters

src/store/index.js

@@ -12,7 +12,8 @@ import trials from './modules/trials'
 import financials from './modules/financials'
 import reading from './modules/reading'
 import lang from './modules/lang'
-
+import noneDicomReview from './modules/noneDicomReview'
+import dicom3d from './modules/dicom3d'
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
@@ -27,7 +28,9 @@ const store = new Vuex.Store({
     trials,
     financials,
     reading,
-    lang
+    lang,
+    noneDicomReview,
+    dicom3d
   },
   getters
 })

src/store/modules/dicom3d.js

@@ -0,0 +1,28 @@
+const getDefaultState = () => {
+  return {
+    operateInfo: [],
+    deleteAnnotationIds: []
+  }
+}
+const state = getDefaultState
+
+const mutations = {
+
+}
+
+const actions = {
+  setOperateInfo({ state }, arr) {
+    state.operateInfo = arr
+  },
+  setDeleteAnnotationIds({ state }, arr) {
+    state.deleteAnnotationIds = arr
+  },
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+

src/store/modules/noneDicomReview.js

@@ -0,0 +1,28 @@
+const getDefaultState = () => {
+  return {
+    lastViewportTaskId: null,
+    currentTaskState: 0
+  }
+}
+const state = getDefaultState
+
+const mutations = {
+
+}
+
+const actions = {
+  setLastViewportTaskId({ state }, id) {
+    state.lastViewportTaskId = id
+  },
+  setCurrentTaskState({ state }, taskState) {
+    state.currentTaskState = taskState
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+

src/store/modules/reading.js

@@ -862,6 +862,7 @@ const actions = {
             const data = {}
             data.StudyId = study.StudyId
             data.StudyCode = study.StudyCode
+            data.StudyName = study.StudyName
             data.Modalities = study.Modalities
             data.SeriesCount = study.SeriesCount
             data.InstanceCount = study.InstanceCount

src/styles/index.scss

@@ -1,4 +1,4 @@
-@import "./variables.scss";
+@import "./variables.module.scss";
 @import "./mixin.scss";
 @import "./transition.scss";
 @import "./element-ui.scss";
@@ -68,6 +68,12 @@ body .el-table th.gutter {
   }
 }
 
+.text-ellipsis {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
 .el-loading-mask {
   background-color: rgba(255, 255, 255, 0.5);
 }

src/styles/sidebar.scss

@@ -71,29 +71,49 @@ $sideBarWidth: 200px;
       border: none;
       height: 100%;
       width: 100% !important;
+      background-color: $menuBg;
     }
 
     // menu hover
     .submenu-title-noDropdown,
     .el-submenu__title {
+      color: $menuText !important;
       &:hover {
         background-color: $menuHover !important;
+        color: $menuActiveText !important;
       }
     }
 
     .is-active>.el-submenu__title {
       color: $subMenuActiveText !important;
     }
-
-    & .nest-menu .el-submenu>.el-submenu__title,
-    & .el-submenu .el-menu-item {
+    .el-menu-item {
+      color: $menuText !important;
+    }
+    .el-menu-item:focus, 
+    .el-menu-item:hover {
+      background-color: $subMenuBg !important;
+      color: $menuActiveText !important;
+    }
+    .el-submenu .el-menu-item {
       min-width: $sideBarWidth !important;
       background-color: $subMenuBg !important;
-
+      
       &:hover {
         background-color: $subMenuHover !important;
+        
       }
     }
+    // &.nest-menu .el-submenu>.el-submenu__title,
+    // &.el-submenu .el-menu-item {
+    //   min-width: $sideBarWidth !important;
+    //   background-color: $subMenuBg !important;
+      
+    //   &:hover {
+    //     background-color: $subMenuHover !important;
+        
+    //   }
+    // }
   }
 
   .hideSidebar {

src/utils/get-page-title.js

@@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'
 
-const title = defaultSettings.title || 'IRCIS'
+const title = defaultSettings.title || 'IRC Imaging System'
 
 export default function getPageTitle(pageTitle) {
   if (pageTitle) {

src/utils/index.js

@@ -34,7 +34,7 @@ export function parseTime(time, cFormat) {
   const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
     const value = formatObj[key]
     // Note: getDay() returns 0 on Sunday
-    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] }
+    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
     return value.toString().padStart(2, '0')
   })
   return time_str
@@ -51,12 +51,54 @@ export function param2Obj(url) {
   }
   return JSON.parse(
     '{"' +
-      decodeURIComponent(search)
-        .replace(/"/g, '\\"')
-        .replace(/&/g, '","')
-        .replace(/=/g, '":"')
-        .replace(/\+/g, ' ') +
-      '"}'
+    decodeURIComponent(search)
+      .replace(/"/g, '\\"')
+      .replace(/&/g, '","')
+      .replace(/=/g, '":"')
+      .replace(/\+/g, ' ') +
+    '"}'
   )
 }
 
+export function deepClone(source, map = new WeakMap()) {
+  // 处理基本类型和函数（直接返回）
+  if (typeof source !== 'object' || source === null) {
+    return source;
+  }
+
+  // 处理循环引用
+  if (map.has(source)) {
+    return map.get(source);
+  }
+
+  // 创建新容器
+  const target = Array.isArray(source) ? [] : {};
+  map.set(source, target);  // 记录克隆关系
+
+  // 克隆普通键值
+  for (const key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      target[key] = deepClone(source[key], map);
+    }
+  }
+
+  // 克隆Symbol键值（ES6+）
+  const symbolKeys = Object.getOwnPropertySymbols(source);
+  for (const symKey of symbolKeys) {
+    if (source.propertyIsEnumerable(symKey)) {
+      target[symKey] = deepClone(source[symKey], map);
+    }
+  }
+
+  return target;
+}
+
+export function formatSize(size, fixed = 2) {
+  if (isNaN(parseFloat(size))) return ''
+  let kbSize = size / 1024
+  if (kbSize <= 1024) {
+    return `${kbSize.toFixed(fixed)}KB`
+  }
+  let mbSize = kbSize / 1024
+  return `${mbSize.toFixed(fixed)}MB`
+}

src/utils/metaDataProvider.js

@@ -39,6 +39,108 @@ function getNumberValues(dataSet, tag, minimumLength) {
 
   return values;
 }
+function getLutDescriptor(dataSet, tag) {
+  if (!dataSet.elements[tag] || dataSet.elements[tag].length !== 6) {
+    return;
+  }
+
+  return [
+    dataSet.uint16(tag, 0),
+    dataSet.uint16(tag, 1),
+    dataSet.uint16(tag, 2),
+  ];
+}
+
+function getLutData(lutDataSet, tag, lutDescriptor) {
+  const lut = [];
+  const lutData = lutDataSet.elements[tag];
+
+  for (let i = 0; i < lutDescriptor[0]; i++) {
+    // Output range is always unsigned
+    if (lutDescriptor[2] === 16) {
+      lut[i] = lutDataSet.uint16(tag, i);
+    } else {
+      lut[i] = lutDataSet.byteArray[i + lutData.dataOffset];
+    }
+  }
+
+  return lut;
+}
+function populateSmallestLargestPixelValues(dataSet, imagePixelModule) {
+  const pixelRepresentation = dataSet.uint16('x00280103');
+  if (pixelRepresentation === 0) {
+    imagePixelModule.smallestPixelValue = dataSet.uint16('x00280106');
+    imagePixelModule.largestPixelValue = dataSet.uint16('x00280107');
+  } else {
+    imagePixelModule.smallestPixelValue = dataSet.int16('x00280106');
+    imagePixelModule.largestPixelValue = dataSet.int16('x00280107');
+  }
+  imagePixelModule.largestPixelValue = imagePixelModule.largestPixelValue === 0 ? undefined : imagePixelModule.largestPixelValue;
+}
+function populatePaletteColorLut(dataSet, imagePixelModule) {
+  imagePixelModule.redPaletteColorLookupTableDescriptor = getLutDescriptor(
+    dataSet,
+    'x00281101'
+  );
+  imagePixelModule.greenPaletteColorLookupTableDescriptor = getLutDescriptor(
+    dataSet,
+    'x00281102'
+  );
+  imagePixelModule.bluePaletteColorLookupTableDescriptor = getLutDescriptor(
+    dataSet,
+    'x00281103'
+  );
+
+  // The first Palette Color Lookup Table Descriptor value is the number of entries in the lookup table.
+  // When the number of table entries is equal to 2ˆ16 then this value shall be 0.
+  // See http://dicom.nema.org/MEDICAL/DICOM/current/output/chtml/part03/sect_C.7.6.3.html#sect_C.7.6.3.1.5
+  if (imagePixelModule.redPaletteColorLookupTableDescriptor[0] === 0) {
+    imagePixelModule.redPaletteColorLookupTableDescriptor[0] = 65536;
+    imagePixelModule.greenPaletteColorLookupTableDescriptor[0] = 65536;
+    imagePixelModule.bluePaletteColorLookupTableDescriptor[0] = 65536;
+  }
+
+  // The third Palette Color Lookup Table Descriptor value specifies the number of bits for each entry in the Lookup Table Data.
+  // It shall take the value of 8 or 16.
+  // The LUT Data shall be stored in a format equivalent to 8 bits allocated when the number of bits for each entry is 8, and 16 bits allocated when the number of bits for each entry is 16, where in both cases the high bit is equal to bits allocated-1.
+  // The third value shall be identical for each of the Red, Green and Blue Palette Color Lookup Table Descriptors.
+  //
+  // Note: Some implementations have encoded 8 bit entries with 16 bits allocated, padding the high bits;
+  // this can be detected by comparing the number of entries specified in the LUT Descriptor with the actual value length of the LUT Data entry.
+  // The value length in bytes should equal the number of entries if bits allocated is 8, and be twice as long if bits allocated is 16.
+  const numLutEntries =
+    imagePixelModule.redPaletteColorLookupTableDescriptor[0];
+  const lutData = dataSet.elements.x00281201;
+  const lutBitsAllocated = lutData.length === numLutEntries ? 8 : 16;
+
+  // If the descriptors do not appear to have the correct values, correct them
+  if (
+    imagePixelModule.redPaletteColorLookupTableDescriptor[2] !==
+    lutBitsAllocated
+  ) {
+    imagePixelModule.redPaletteColorLookupTableDescriptor[2] = lutBitsAllocated;
+    imagePixelModule.greenPaletteColorLookupTableDescriptor[2] =
+      lutBitsAllocated;
+    imagePixelModule.bluePaletteColorLookupTableDescriptor[2] =
+      lutBitsAllocated;
+  }
+
+  imagePixelModule.redPaletteColorLookupTableData = getLutData(
+    dataSet,
+    'x00281201',
+    imagePixelModule.redPaletteColorLookupTableDescriptor
+  );
+  imagePixelModule.greenPaletteColorLookupTableData = getLutData(
+    dataSet,
+    'x00281202',
+    imagePixelModule.greenPaletteColorLookupTableDescriptor
+  );
+  imagePixelModule.bluePaletteColorLookupTableData = getLutData(
+    dataSet,
+    'x00281203',
+    imagePixelModule.bluePaletteColorLookupTableDescriptor
+  );
+}
 function metaDataProvider(type, imageId) {
   const parsedImageId = parseImageId(imageId);
   const dataSet = cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.get(parsedImageId.url);
@@ -99,5 +201,52 @@ function metaDataProvider(type, imageId) {
       columnPixelSpacing,
     };
   }
+  if (type === 'imagePixelModule') {
+    const imagePixelModule = {
+      samplesPerPixel: dataSet.uint16('x00280002'),
+      photometricInterpretation: dataSet.string('x00280004'),
+      rows: dataSet.uint16('x00280010'),
+      columns: dataSet.uint16('x00280011'),
+      bitsAllocated: dataSet.uint16('x00280100'),
+      bitsStored: dataSet.uint16('x00280101'),
+      highBit: dataSet.uint16('x00280102'),
+      pixelRepresentation: dataSet.uint16('x00280103'),
+      planarConfiguration: dataSet.uint16('x00280006'),
+      pixelAspectRatio: dataSet.string('x00280034'),
+    };
+    populateSmallestLargestPixelValues(dataSet, imagePixelModule);
+
+    if (
+      imagePixelModule.photometricInterpretation === 'PALETTE COLOR' &&
+      dataSet.elements.x00281101
+    ) {
+      populatePaletteColorLut(dataSet, imagePixelModule);
+    }
+    return imagePixelModule;
+  }
+  // if (type === 'imagePixelModule') {
+  //   return {
+  //     samplesPerPixel: dataSet.uint16('x00280002'),
+  //     photometricInterpretation: dataSet.string('x00280004'),
+  //     rows: dataSet.uint16('x00280010'),
+  //     columns: dataSet.uint16('x00280011'),
+  //     bitsAllocated: dataSet.uint16('x00280100'),
+  //     bitsStored: dataSet.uint16('x00280101'),
+  //     highBit: dataSet.uint16('x00280102'),
+  //     pixelRepresentation: dataSet.uint16('x00280103'),
+  //     planarConfiguration: dataSet.uint16('x00280006'),
+  //     pixelAspectRatio: dataSet.uint16('x00280034'),
+  //     smallestPixelValue: null,
+  //     largestPixelValue: null,
+  //     // smallestPixelValue: dataSet.uint16('x00280106'),
+  //     // largestPixelValue: dataSet.uint16('x00280107'),
+  //     redPaletteColorLookupTableDescriptor: dataSet.string('x00281101'),
+  //     greenPaletteColorLookupTableDescriptor: dataSet.string('x00281102'),
+  //     bluePaletteColorLookupTableDescriptor: dataSet.string('x00281103'),
+  //     redPaletteColorLookupTableData: dataSet.string('x00281201'),
+  //     greenPaletteColorLookupTableData: dataSet.string('x00281202'),
+  //     bluePaletteColorLookupTableData: dataSet.string('x00281203')
+  //   }
+  // }
 }
 export default metaDataProvider;

src/utils/multipartUpload/aws.js

@@ -445,7 +445,7 @@ function setTimer() {
                 totalBytes = totalBytes / 1024;
                 unit = "MB/s";
             }
-            store.state.trials.uploadTip = totalBytes.toFixed(2) + unit;
+            store.state.trials.uploadTip = totalBytes.toFixed(3) + unit;
         }
         if (timeList.length >= 5) {
             delete bytesReceivedPerSecond[timeList[0]]

src/utils/multipartUpload/oss.js

@@ -150,7 +150,7 @@ function setTimer() {
                 totalBytes = totalBytes / 1024;
                 unit = "MB/s";
             }
-            store.state.trials.uploadTip = totalBytes.toFixed(2) + unit;
+            store.state.trials.uploadTip = totalBytes.toFixed(3) + unit;
         }
         if (timeList.length >= 5) {
             delete bytesReceivedPerSecond[timeList[0]]

src/utils/onlyOffice_type.js

@@ -0,0 +1,66 @@
+let TYPES = ['word', 'cell', 'slide', 'pdf']
+
+let DOCUMENTTYPE = {
+    '.doc': TYPES[0],
+    '.docm': TYPES[0],
+    '.docx': TYPES[0],
+    '.dot': TYPES[0],
+    '.dotm': TYPES[0],
+    '.dotx': TYPES[0],
+    '.epub': TYPES[0],
+    '.fb2': TYPES[0],
+    '.fodt': TYPES[0],
+    '.htm': TYPES[0],
+    '.html': TYPES[0],
+    '.mht': TYPES[0],
+    '.mhtml': TYPES[0],
+    '.odt': TYPES[0],
+    '.ott': TYPES[0],
+    '.pages': TYPES[0],
+    '.rtf': TYPES[0],
+    '.stw': TYPES[0],
+    '.sxw': TYPES[0],
+    '.txt': TYPES[0],
+    '.wps': TYPES[0],
+    '.wpt': TYPES[0],
+    '.xml': TYPES[0],
+    '.csv': TYPES[1],
+    '.et': TYPES[1],
+    '.ett': TYPES[1],
+    '.fods': TYPES[1],
+    '.numbers': TYPES[1],
+    '.ods': TYPES[1],
+    '.ots': TYPES[1],
+    '.sxc': TYPES[1],
+    '.xls': TYPES[1],
+    '.xlsb': TYPES[1],
+    '.xlsm': TYPES[1],
+    '.xlsx': TYPES[1],
+    '.xlt': TYPES[1],
+    '.xltm': TYPES[1],
+    '.xltx': TYPES[1],
+    '.xml': TYPES[1],
+    '.dps': TYPES[2],
+    '.dpt': TYPES[2],
+    '.fodp': TYPES[2],
+    '.key': TYPES[2],
+    '.odp': TYPES[2],
+    '.otp': TYPES[2],
+    '.pot': TYPES[2],
+    '.potm': TYPES[2],
+    '.potx': TYPES[2],
+    '.pps': TYPES[2],
+    '.ppsm': TYPES[2],
+    '.ppsx': TYPES[2],
+    '.ppt': TYPES[2],
+    '.pptm': TYPES[2],
+    '.pptx': TYPES[2],
+    '.sxi': TYPES[2],
+    '.djvu': TYPES[3],
+    '.docxf': TYPES[3],
+    '.oform': TYPES[3],
+    '.oxps': TYPES[3],
+    '.pdf': TYPES[3],
+    '.xps': TYPES[3]
+}
+export default DOCUMENTTYPE

src/utils/oss.js

@@ -41,7 +41,13 @@ async function ossGenerateSTS() {
               let _vm = router.default.app
               if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
                 var objectItem = objectName.split('/')
-                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+                // objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+                objectItem[objectItem.length - 1] = `${objectItem[objectItem.length - 1].substring(
+                  0,
+                  objectItem[objectItem.length - 1].lastIndexOf('.')
+                )}__${new Date().getTime()}${objectItem[objectItem.length - 1].substring(
+                  objectItem[objectItem.length - 1].lastIndexOf('.')
+                ).toLocaleLowerCase()}`
                 objectName = objectItem.join('/')
               }
               let res = await OSSclient.put(objectName, object)
@@ -78,7 +84,13 @@ async function ossGenerateSTS() {
               let _vm = router.default.app
               if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
                 var objectItem = data.path.split('/')
-                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+                // objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+                objectItem[objectItem.length - 1] = `${objectItem[objectItem.length - 1].substring(
+                  0,
+                  objectItem[objectItem.length - 1].lastIndexOf('.')
+                )}__${new Date().getTime()}${objectItem[objectItem.length - 1].substring(
+                  objectItem[objectItem.length - 1].lastIndexOf('.')
+                ).toLocaleLowerCase()}`
                 data.path = objectItem.join('/')
               }
               let res = await customerHttp(OSSclient, data, progress);
@@ -185,7 +197,13 @@ function uploadAWS(aws, data, progress) {
       let _vm = router.default.app
       if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
         var objectItem = data.path.split('/')
-        objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+        // objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+        objectItem[objectItem.length - 1] = `${objectItem[objectItem.length - 1].substring(
+          0,
+          objectItem[objectItem.length - 1].lastIndexOf('.')
+        )}__${new Date().getTime()}${objectItem[objectItem.length - 1].substring(
+          objectItem[objectItem.length - 1].lastIndexOf('.')
+        ).toLocaleLowerCase()}`
         data.path = objectItem.join('/')
       }
       let bucketName = data.path.split("/")[1] || Vue.prototype.OSSclientConfig.bucket

src/utils/parseDicom.js

@@ -189,8 +189,8 @@ const dicomToPng = (imageId, width, height) => {
     return new Promise((resolve) => {
         cornerstone.loadImage(imageId).then(async (image) => {
             let canvas = document.createElement("canvas");
-            canvas.width = width;
-            canvas.height = height;
+            canvas.width = (width * 60) / height
+            canvas.height = 60
             if (image) {
                 cornerstone.renderToCanvas(canvas, image);
                 // 将 Canvas 图像对象转换为 PNG 格式

src/utils/request-download.js

@@ -50,7 +50,8 @@ service.interceptors.response.use(
         const a = document.createElement('a')
         // xls类型: application/vnd.ms-excel
         // xlsx类型：application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
-        const href = URL.createObjectURL(new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8' }))
+        // const href = URL.createObjectURL(new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8' }))
+        const href = URL.createObjectURL(new Blob([res], { type: response.headers['content-type'] }))
         a.download = fileName
         a.href = href
         a.click()

src/utils/request.js

@@ -9,6 +9,7 @@ const ROUTER = require('@/router');
 axios.defaults.withCredentials = false
 const service = axios.create({
   baseURL: '/api',
+  // baseURL: process.env.NODE_ENV === 'prod' ? "https://api.irc.extimaging.com" : '/api',
   timeout: 2 * 360000, // request timeout
   withCredentials: false
 })
@@ -20,6 +21,8 @@ service.interceptors.request.use(
   async config => {
     path = router && router.app && router.app._route && router.app._route.path
     config.headers['Content-Type'] = 'application/json;charset=UTF-8'
+    // config.baseURL = process.env.NODE_ENV === 'prod' ? "https://api.irc.extimaging.com" : '/api'
+    config.headers['Self-Referer'] = window.location.href
     var language = zzSessionStorage.getItem('lang')
     config.headers['Accept-Language'] = language === 'en' ? 'en-US,en;q=0.5' : 'zh-CN,zh;q=0.9'
     config.headers['TimeZoneId'] = moment.tz.guess()

src/utils/stream.js

@@ -20,7 +20,7 @@ function zipFiles(zipName, files) {
                         ctrl.close();
                     } else {
                         let { name, url } = fileInfo.value;
-                        url = decodeUtf8(url);
+                        // url = decodeUtf8(url); // 待定，可能做过特殊处理
                         return fetch(url).then(res => {
                             ctrl.enqueue({
                                 name,
@@ -58,7 +58,7 @@ async function updateFile(file, name) {
         try {
             store.dispatch('trials/setUnLock', true)
             const fileOutputStream = streamSaver.createWriteStream(name);
-            file = decodeUtf8(file);
+            // file = decodeUtf8(file);
             let res = await fetch(file);
             res.body.pipeTo(fileOutputStream).then(() => {
                 store.dispatch('trials/setUnLock', true)

src/views/admin/role/components/RoleForm.vue

@@ -17,7 +17,7 @@
         </el-form-item>
         <el-form-item label="是否内部角色: " prop="IsInternal">
           <el-radio-group v-model="form.IsInternal">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+            <el-radio v-for="item of $d.YesOrNo" :key="`IsInternal${item.value}`" :label="item.value">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
 

src/views/blindResumeInfo/index.vue

@@ -27,7 +27,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-/deep/ .el-collapse-item__header{
+::v-deep .el-collapse-item__header{
   background-color: #e9eef1;
   padding: 0 10px;
 }

src/views/blindResumeInfo/info.vue

@@ -195,7 +195,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-/deep/ .el-collapse-item__header{
+::v-deep .el-collapse-item__header{
   background-color: #e9eef1;
   padding: 0 10px;
 }

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

@@ -1,5 +1,5 @@
 <template>
-  <div ref="preview-wrapper">
+  <div ref="preview-wrapper" class="preview-wrapper">
     <div class="viewerContainer">
       <div class="viewerContentWrapper" style="padding-top:25px;">
         <div class="viewerLeftSidePanel">
@@ -38,7 +38,39 @@
                     </span>
                   </span>-->
                     <div class="viewernavitextwrapper">
-                      <div style="padding: 1px;">#{{ item.seriesNumber }}</div>
+                      <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
+                        <div style="padding: 1px;">#{{ item.seriesNumber }}</div>
+                        <div v-if="item.isExistMutiFrames && item.instanceCount > 1">
+                              <el-popover
+                                v-model="item.isShowPopper"
+                                placement="right-start"
+                                trigger="manual"
+                                popper-class="instance_frame_wrapper"
+                              >
+                                <div style="text-align: right;">
+                                  <i class="el-icon-circle-close" style="font-size: 20px;cursor: pointer;color:#ddd;" @click="item.isShowPopper = false" />
+                                </div>
+                                <div class="frame_list">
+                                  <div
+                                    v-for="(instance, idx) in item.instanceInfoList"
+                                    :key="instance.InstanceUid"
+                                    class="frame_content"
+                                    :style="{'margin-bottom':idx<item.instanceInfoList.length-1? '5px':'0px'}"
+                                    @click="showMultiFrames(item, index, instance)"
+                                  >
+                                    <div>
+                                      <div>{{ instance.InstanceNumber }}</div>
+                                      <div>
+                                        {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+                                      </div>
+                                    </div>
+                                  </div>
+                                </div>
+                                <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" @click="popperClick(seriesList, item)" />
+                              </el-popover>
+                            </div>
+                      </div>
+                      
                       <div style="padding: 1px;">{{ item.description }}</div>
                       <div
                         v-show="item.instanceCount"
@@ -147,7 +179,11 @@ export default {
         })
 
         var imageIds = []
+        let isExistMutiFrames = false
+        let instanceInfoList = []
         series.instanceList.forEach(function(instance) {
+          console.log(instance)
+          let instanceInfo = {}
           var fileId = cornerstoneWADOImageLoader.wadouri.fileManager.add(
             instance.file
           )
@@ -155,7 +191,19 @@ export default {
             for (var i = 0; i < instance.frameCount; ++i) {
               imageIds.push(`${fileId}?frame=${i}`)
             }
-          } else imageIds.push(fileId)
+            isExistMutiFrames = true
+            instanceInfo.NumberOfFrames = instance.frameCount
+            instanceInfo.InstanceNumber = instance.instanceNumber
+            instanceInfo.InstanceUid = instance.instanceUid
+            instanceInfo.FileId = fileId
+          } else {
+            imageIds.push(fileId)
+            instanceInfo.NumberOfFrames = 0
+            instanceInfo.InstanceNumber = instance.instanceNumber
+            instanceInfo.InstanceUid = instance.instanceUid
+            instanceInfo.FileId = fileId
+          }
+          instanceInfoList.push(instanceInfo)
         })
 
         scope.seriesList.push({
@@ -164,13 +212,43 @@ export default {
           modality: series.modality,
           instanceCount: series.instanceList.length,
           imageIds: imageIds,
-          previewImageId: imageIds[0]
+          previewImageId: imageIds[0],
+          isExistMutiFrames: isExistMutiFrames,
+          instanceInfoList: instanceInfoList,
+          isShowPopper: false
         })
       })
 
       this.showSeriesImage(0)
     },
-
+    popperClick(seriesList, series) {
+      for (let i = 0; i < seriesList.length; i++) {
+        if (seriesList[i].isShowPopper) {
+          seriesList[i].isShowPopper = false
+        }
+      }
+      series.isShowPopper = !series.isShowPopper
+    },
+    showMultiFrames(series, seriesIndex, instanceInfo) {
+      this.currentSeriesIndex = seriesIndex
+      const imageIds = []
+      if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
+        for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
+          imageIds.push(`${instanceInfo.FileId}?frame=${j}`)
+        }
+      } else {
+        imageIds.push(instanceInfo.FileId)
+      }
+      const seriesInfo = {
+        seriesNumber: series.seriesNumber,
+        description: series.description,
+        modality: series.modality,
+        instanceCount: series.instanceCount,
+        imageIds: imageIds,
+        previewImageId: imageIds[0],
+      }
+      this.$refs.dicomViewer.loadImageStack(seriesInfo)
+    },
     showSeriesImage(seriesIndex) {
       // if (seriesIndex === this.currentSeriesIndex) return;
       this.currentSeriesIndex = seriesIndex
@@ -183,136 +261,172 @@ export default {
 }
 </script>
 
-<style scoped>
-::-webkit-scrollbar {
-  width: 7px;
-  height: 7px;
-}
+<style lang="scss">
+  ::-webkit-scrollbar {
+    width: 7px;
+    height: 7px;
+  }
 
-::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background: #d0d0d0;
-}
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background: #d0d0d0;
+  }
 
-.viewerContainer {
-  display: block;
-  height: 100%;
-  margin-top: 20px;
-  margin-left: auto;
-  margin-right: auto;
-  background-color: #444;
-  overflow: hidden;
-}
+  .viewerContainer {
+    width: 100%;
+    display: block;
+    height: 100%;
+    margin-top: 20px;
+    margin-left: auto;
+    margin-right: auto;
+    background-color: #444;
+    overflow: hidden;
+  }
 
-.viewerBanner {
-  background: linear-gradient(0, #444, #222);
-  min-height: 28px;
-  font-size: 16px;
-  margin: 0;
-  height: 30px;
-  padding-top: 0;
-  padding-left: 5px;
-  padding-right: 5px;
-  font-weight: bold;
-}
+  .viewerBanner {
+    background: linear-gradient(0, #444, #222);
+    min-height: 28px;
+    font-size: 16px;
+    margin: 0;
+    height: 30px;
+    padding-top: 0;
+    padding-left: 5px;
+    padding-right: 5px;
+    font-weight: bold;
+  }
 
-.viewerContentWrapper {
-  display: flex;
-  flex-direction: row;
-  width: 100%;
-  padding: 5px;
-  height: 99%;
-  /* height: 95%; */
-  overflow: hidden;
-  text-overflow: clip;
-  white-space: nowrap;
-}
+  .viewerContentWrapper {
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    padding: 5px;
+    height: 99%;
+    /* height: 95%; */
+    overflow: hidden;
+    text-overflow: clip;
+    white-space: nowrap;
+  }
 
-.viewerContentWrapper > div {
-  display: inline-block;
-  white-space: normal;
-}
+  .viewerContentWrapper > div {
+    display: inline-block;
+    white-space: normal;
+  }
 
-.viewerLeftSidePanel {
-  width: 200px;
-  background-color: #323232;
-  box-sizing: border-box;
-  margin: 0;
-  padding: 0;
-  margin-right: 2px;
-  color: #d0d0d0;
-  overflow-y: auto;
-}
+  .viewerLeftSidePanel {
+    width: 200px;
+    background-color: #323232;
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+    margin-right: 2px;
+    color: #d0d0d0;
+    overflow-y: auto;
+  }
 
-.viewerContentWrapper > div > .sidePanelBody {
-  background: rgba(50, 50, 50, 1);
-  word-break: break-all;
-  display: table;
-  width: 100%;
-  border: 1px solid #3e3f3a;
-}
+  .viewerContentWrapper > div > .sidePanelBody {
+    background: rgba(50, 50, 50, 1);
+    word-break: break-all;
+    display: table;
+    width: 100%;
+    border: 1px solid #3e3f3a;
+  }
 
-.viewerContentWrapper > div > div.sidePanelBody > div {
-  width: 100%;
-  height: 100%;
-}
+  .viewerContentWrapper > div > div.sidePanelBody > div {
+    width: 100%;
+    height: 100%;
+  }
 
-.studyDesc {
-  font-weight: bold;
-  font-size: 13px;
-  text-align: center;
-  background: rgb(88 84 83);
-  color: #d0d0d0;
-  padding: 5px;
-}
+  .studyDesc {
+    font-weight: bold;
+    font-size: 13px;
+    text-align: center;
+    background: rgb(88 84 83);
+    color: #d0d0d0;
+    padding: 5px;
+  }
 
-.ps {
-  overflow: hidden !important;
-  overflow-anchor: none;
-  -ms-overflow-style: none;
-  touch-action: auto;
-  -ms-touch-action: auto;
-}
+  .ps {
+    overflow: hidden !important;
+    overflow-anchor: none;
+    -ms-overflow-style: none;
+    touch-action: auto;
+    -ms-touch-action: auto;
+  }
 
-.viewerLeftSidePanel .viewernavigatorwrapper {
-  display: flex;
-  width: 196px;
-  height: 84px;
-  padding: 1px 2px 1px 8px;
-  margin: 6px 0 6px 1px;
-  border-radius: 2px;
-  border: 1px solid #404040;
-}
+  .viewerLeftSidePanel .viewernavigatorwrapper {
+    display: flex;
+    width: 196px;
+    height: 84px;
+    padding: 1px 2px 1px 8px;
+    margin: 6px 0 6px 1px;
+    border-radius: 2px;
+    border: 1px solid #404040;
+  }
 
-.ui-draggable-handle {
-  -ms-touch-action: none;
-  touch-action: none;
-}
+  .ui-draggable-handle {
+    -ms-touch-action: none;
+    touch-action: none;
+  }
 
-.viewerLeftSidePanel .image-preview {
-  border: 2px solid #252525;
-  cursor: pointer;
-}
+  .viewerLeftSidePanel .image-preview {
+    border: 2px solid #252525;
+    cursor: pointer;
+  }
 
-.viewerLeftSidePanel .viewernavitextwrapper {
-  flex: 1;
-  padding: 3px 1px 3px 4px;
-  vertical-align: top;
-  font-size: 12px;
-}
+  .viewerLeftSidePanel .viewernavitextwrapper {
+    flex: 1;
+    padding: 3px 1px 3px 4px;
+    vertical-align: top;
+    font-size: 12px;
+  }
 
-.viewerSideActive {
-  background: #16477b;
-  background: #16477b80;
-  border: 1px solid #23527b;
-}
+  .viewerSideActive {
+    background: #16477b;
+    background: #16477b80;
+    border: 1px solid #23527b;
+  }
 
-.viewerContent {
-  flex: 1;
-  height: 100%;
-  display: block;
-  background-color: black;
-  color: #d0d0d0;
-  font-size: 13px;
-}
+  .viewerContent {
+    flex: 1;
+    height: 100%;
+    display: block;
+    background-color: black;
+    color: #d0d0d0;
+    font-size: 13px;
+  }
+  .instance_frame_wrapper{
+    min-width: 120px;
+    background-color: #2c2c2c;
+    border: 1px solid #2c2c2c;
+    padding: 5px;
+  }
+  .frame_list{
+    max-height: 500px;
+    overflow-y: auto;
+  }
+  .instance_frame_wrapper ::-webkit-scrollbar {
+    width: 7px;
+    height: 7px;
+  }
+  .instance_frame_wrapper  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background: #d0d0d0;
+  }
+  .frame_content{
+    /* height: 50px; */
+    padding: 10px;
+    display: flex;
+    justify-content: flex-start;
+    color: #ddd;
+    font-size: 12px;
+    border: 1px solid #404040;
+  }
+  .frame_content:hover {
+    /* font-weight: bold; */
+    /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */
+    cursor: pointer;
+    /* color: #428bca; */
+    border-color: #213a54 !important;
+    background-color: #213a54;
+  }
 </style>

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

@@ -52,10 +52,14 @@
                             </div>
                             <div v-if="item.isExistMutiFrames && item.instanceCount > 1">
                               <el-popover
-                                placement="right"
-                                trigger="hover"
+                                v-model="item.isShowPopper"
+                                placement="right-start"
+                                trigger="manual"
                                 popper-class="instance_frame_wrapper"
                               >
+                                <div style="text-align: right;">
+                                  <i class="el-icon-circle-close" style="font-size: 20px;cursor: pointer;color:#ddd;" @click="item.isShowPopper = false" />
+                                </div>
                                 <div class="frame_list">
                                   <div
                                     v-for="(instance, idx) in item.instanceInfoList"
@@ -66,11 +70,27 @@
                                   >
                                     <div>
                                       <div>{{ instance.InstanceNumber }}</div>
-                                      <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
+                                      <div>
+                                        {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+                                      </div>
+                                      <div v-if="showDelete">
+                                        <span>{{ $t('trials:audit:table:isDelete') }}</span>
+                                        <el-switch
+                                          v-model="instance.IsDeleted"
+                                          size="mini"
+                                          @change="changeInstanceDeleteStatus($event, item, instance)"
+                                        />
+                                        <span style="margin-left:10px;">{{ $t('trials:audit:table:isReading') }}</span>
+                                        <el-switch
+                                          v-model="instance.IsReading"
+                                          size="mini"
+                                          @change="changeInstanceReadingStatus($event, item, instance)"
+                                        />
+                                      </div>
                                     </div>
                                   </div>
                                 </div>
-                                <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
+                                <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" @click="popperClick(seriesList, item)" />
                               </el-popover>
                             </div>
                           </div>
@@ -138,13 +158,13 @@ import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getStudyInfo, getSeriesList } from '@/api/reading'
-import { getInstanceList, getPatientSeriesList, setSeriesStatus } from '@/api/trials'
+import { getInstanceList, getPatientSeriesList, setSeriesStatus, setInstanceStatus } from '@/api/trials'
 
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 import metaDataProvider from '@/utils/metaDataProvider'
-cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 })
 var config = {
   maxWebWorkers: 4,
   startWebWorkersOnDemand: true,
@@ -296,7 +316,8 @@ export default {
               tpCode: this.tpCode,
               loadStatus: false,
               imageloadedArr: [],
-              isExistMutiFrames: item.IsExistMutiFrames
+              isExistMutiFrames: item.IsExistMutiFrames,
+              isShowPopper: false
             })
           })
           this.seriesList = seriesList
@@ -355,7 +376,8 @@ export default {
               tpCode: this.tpCode,
               loadStatus: false,
               imageloadedArr: [],
-              isExistMutiFrames: item.IsExistMutiFrames
+              isExistMutiFrames: item.IsExistMutiFrames,
+              isShowPopper: false
             })
           })
           this.seriesList = seriesList
@@ -384,8 +406,8 @@ export default {
         if (!res.Result || (res.Result && res.Result.length === 0)) return
         var seriesInstanceUid = res.Result[0].SeriesInstanceUid
         var sliceThickness = res.Result[0].SliceThickness
-        var isReading = res.Result[0].IsReading
-        var isDeleted = res.Result[0].IsDeleted
+        var isReading = res.OtherInfo.IsReading
+        var isDeleted = res.OtherInfo.IsDeleted
         var seriesList = []
         var imageIds = []
         let isExistMutiFrames = false
@@ -403,7 +425,7 @@ export default {
             imageIds.push(path)
             imageId = path
           }
-          instanceInfoList.push({ Id: instance.Id, InstanceNumber: instance.InstanceNumber, NumberOfFrames: instance.NumberOfFrames, Path: instance.Path, ImageId: imageId })
+          instanceInfoList.push({ Id: instance.Id, InstanceNumber: instance.InstanceNumber, NumberOfFrames: instance.NumberOfFrames, Path: instance.Path, ImageId: imageId, IsDeleted: instance.IsDeleted, IsReading: instance.IsReading })
         })
         seriesList.push({
           trialId,
@@ -424,7 +446,8 @@ export default {
           prefetchInstanceCount: 0,
           loadStatus: false,
           imageloadedArr: [],
-          isExistMutiFrames: isExistMutiFrames
+          isExistMutiFrames: isExistMutiFrames,
+          isShowPopper: false
         })
         this.seriesList = seriesList
         if (this.seriesList.length > 0) {
@@ -573,7 +596,8 @@ export default {
           hasLabel: seriesInfo.HasLabel,
           keySeries: seriesInfo.KeySeries,
           loadStatus: false,
-          imageloadedArr: []
+          imageloadedArr: [],
+          isShowPopper: false
         })
         this.seriesList = seriesList
         if (this.seriesList.length > 0) {
@@ -671,6 +695,81 @@ export default {
         this.loading = false
       }
     },
+    async changeInstanceReadingStatus(callback, series, instance) {
+      let statusStr = ''
+      if (callback) {
+        statusStr = this.$t('trials:audit:label:setSeriesReading')
+        instance.IsReading = false
+      } else {
+        statusStr = this.$t('trials:audit:label:setSeriesNotReading')
+        instance.IsReading = true
+      }
+      var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !instance.IsReading))
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const state = instance.IsReading ? 1 : 2
+      this.loading = true
+      try {
+        const res = await setInstanceStatus(series.trialId, series.subjectVisitId, series.seriesId, instance.Id, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          instance.IsReading = !instance.IsReading
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
+    },
+    async changeInstanceDeleteStatus(callback, series, instance) {
+      let statusStr = ''
+      if (callback) {
+        statusStr = this.$t('trials:audit:label:setSeriesDeleted')
+        instance.IsDeleted = false
+      } else {
+        statusStr = this.$t('trials:audit:label:setSeriesNotDelete')
+        instance.IsDeleted = true
+      }
+      var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !instance.IsDeleted))
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+
+      const state = instance.IsDeleted ? 5 : 4
+      this.loading = true
+      try {
+        const res = await setInstanceStatus(series.trialId, series.subjectVisitId, series.seriesId, instance.Id, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          instance.IsDeleted = !instance.IsDeleted
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
+    },
+    popperClick(seriesList, series) {
+      for (let i = 0; i < seriesList.length; i++) {
+        if (seriesList[i].isShowPopper) {
+          seriesList[i].isShowPopper = false
+        }
+      }
+      series.isShowPopper = !series.isShowPopper
+    },
     loadAllImages() {
       const seriesIndex = this.seriesList.findIndex(i => i.loadStatus === false)
       if (seriesIndex === -1) return
@@ -948,8 +1047,8 @@ export default {
   background: #d0d0d0;
 }
 .frame_content{
-  height: 50px;
-  padding: 5px;
+  /* height: 50px; */
+  padding: 10px;
   display: flex;
   justify-content: flex-start;
   color: #ddd;

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

@@ -59,34 +59,56 @@
                                 <div>#{{ series.seriesNumber }}</div>
                                 <div v-if="series.isExistMutiFrames && series.instanceCount > 1">
                                   <el-popover
-                                    placement="right"
-                                    trigger="hover"
+                                    v-model="series.isShowPopper"
+                                    placement="right-start"
+                                    trigger="manual"
                                     popper-class="instance_frame_wrapper"
                                   >
-                                    <div
-                                      v-for="(instance, idx) in series.instanceInfoList"
-                                      :key="instance.Id"
-                                      class="frame_content"
-                                      :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
-                                      @click="showMultiFrames(index,series, i, instance)"
-                                    >
-                                      <!-- <div>
-                                        <img
-                                          class="image-preview"
-                                          :src="series.previewImageUrl"
-                                          crossorigin="anonymous"
-                                          alt=""
-                                          style="width: 40px;height:40px;"
-                                          fit="fill"
-                                        >
-                                      </div> -->
-                                      <div>
-                                        <div>{{ instance.InstanceNumber }}</div>
-                                        <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                                      </div>
-
+                                    <div style="text-align: right;">
+                                      <i class="el-icon-circle-close" style="font-size: 20px;cursor: pointer;color:#ddd;" @click="series.isShowPopper = false" />
                                     </div>
-                                    <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
+                                    <div class="frame_list">
+                                      <div
+                                        v-for="(instance, idx) in series.instanceInfoList"
+                                        :key="instance.Id"
+                                        class="frame_content"
+                                        :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
+                                        @click="showMultiFrames(index,series, i, instance)"
+                                      >
+                                        <!-- <div>
+                                          <img
+                                            class="image-preview"
+                                            :src="series.previewImageUrl"
+                                            crossorigin="anonymous"
+                                            alt=""
+                                            style="width: 40px;height:40px;"
+                                            fit="fill"
+                                          >
+                                        </div> -->
+                                        <div>
+                                          <div>{{ instance.InstanceNumber }}</div>
+                                          <div>
+                                            {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+                                          </div>
+                                          <div v-if="showDelete">
+                                            <span>{{ $t('trials:audit:table:isDelete') }}</span>
+                                            <el-switch
+                                              v-model="instance.IsDeleted"
+                                              size="mini"
+                                              @change="changeInstanceDeleteStatus($event, series, instance)"
+                                            />
+                                            <span style="margin-left:10px;">{{ $t('trials:audit:table:isReading') }}</span>
+                                            <el-switch
+                                              v-model="instance.IsReading"
+                                              size="mini"
+                                              @change="changeInstanceReadingStatus($event, series, instance)"
+                                            />
+                                          </div>
+                                        </div>
+
+                                      </div>
+                                    </div>
+                                    <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" @click="popperClick(studyList, series)" />
                                   </el-popover>
                                 </div>
 
@@ -143,7 +165,7 @@
                   </div>
                 </div>
               </el-tab-pane>
-              <el-tab-pane :label="$t('trials:dicom-show:relatedVisit')" name="relation-study" class="pane-relation-wrapper" v-if="!visitTaskId">
+              <el-tab-pane v-if="!visitTaskId" :label="$t('trials:dicom-show:relatedVisit')" name="relation-study" class="pane-relation-wrapper">
                 <div class="viewerSidethumbinner">
                   <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
                     <el-collapse-item v-for="(study,studyIndex) in relationStudyList" :key="`${study.StudyId}`" :name="`${study.StudyId}`">
@@ -196,8 +218,8 @@
                                 <div v-else>#{{ seriesItem.seriesNumber }}</div>
                                 <div v-if="seriesItem.isExistMutiFrames && seriesItem.instanceCount > 1">
                                   <el-popover
-                                    placement="right"
-                                    trigger="hover"
+                                    placement="right-start"
+                                    trigger="click"
                                     popper-class="instance_frame_wrapper"
                                   >
                                     <div class="frame_list">
@@ -260,13 +282,13 @@ import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getVisitStudyList, getAllRelationStudyList, getSeriesList } from '@/api/reading'
-import { setSeriesStatus } from '@/api/trials'
+import { setSeriesStatus, setInstanceStatus } from '@/api/trials'
 import { getTaskUploadedDicomStudyList } from '@/api/reading'
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 import metaDataProvider from '@/utils/metaDataProvider'
-cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 })
 // import * as cornerstoneTools from 'cornerstone-tools'
 var config = {
   maxWebWorkers: 4,
@@ -348,7 +370,7 @@ export default {
         let res = null
         if (this.page === 'upload') {
           res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId })
-        } else if (this.page === 'download'){
+        } else if (this.page === 'download') {
           res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
         } else {
           res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
@@ -399,7 +421,8 @@ export default {
                 prefetchInstanceCount: 0,
                 loadStatus: false,
                 imageloadedArr: [],
-                isExistMutiFrames: series.IsExistMutiFrames
+                isExistMutiFrames: series.IsExistMutiFrames,
+                isShowPopper: false
               })
             })
             data.SeriesList = seriesList
@@ -595,6 +618,83 @@ export default {
         this.loading = false
       }
     },
+    async changeInstanceReadingStatus(callback, series, instance) {
+      let statusStr = ''
+      if (callback) {
+        statusStr = this.$t('trials:audit:label:setSeriesReading')
+        instance.IsReading = false
+      } else {
+        statusStr = this.$t('trials:audit:label:setSeriesNotReading')
+        instance.IsReading = true
+      }
+      var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !instance.IsReading))
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const state = instance.IsReading ? 1 : 2
+      this.loading = true
+      try {
+        const res = await setInstanceStatus(series.trialId, series.subjectVisitId, series.seriesId, instance.Id, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          instance.IsReading = !instance.IsReading
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
+    },
+    async changeInstanceDeleteStatus(callback, series, instance) {
+      let statusStr = ''
+      if (callback) {
+        statusStr = this.$t('trials:audit:label:setSeriesDeleted')
+        instance.IsDeleted = false
+      } else {
+        statusStr = this.$t('trials:audit:label:setSeriesNotDelete')
+        instance.IsDeleted = true
+      }
+      var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !instance.IsDeleted))
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+
+      const state = instance.IsDeleted ? 5 : 4
+      this.loading = true
+      try {
+        const res = await setInstanceStatus(series.trialId, series.subjectVisitId, series.seriesId, instance.Id, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          instance.IsDeleted = !instance.IsDeleted
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
+    },
+    popperClick(studyList, series) {
+      for (let i = 0; i < studyList.length; i++) {
+        for (let j = 0; j < studyList[i].SeriesList.length; j++) {
+          if (studyList[i].SeriesList[j].isShowPopper) {
+            studyList[i].SeriesList[j].isShowPopper = false
+          }
+        }
+      }
+      series.isShowPopper = !series.isShowPopper
+    },
     // 切换关联检查Tab时获取关联检查信息
     async handleTabClick(tab, event) {
       if (tab.name === 'relation-study' && this.relationStudyList.length <= 0) {
@@ -671,7 +771,8 @@ export default {
                 keySeries: item.KeySeries,
                 loadStatus: false,
                 imageloadedArr: [],
-                isExistMutiFrames: item.IsExistMutiFrames
+                isExistMutiFrames: item.IsExistMutiFrames,
+                isShowPopper: false
               })
             })
             scope.relationStudyList[index].seriesCount = seriesList.length
@@ -978,9 +1079,21 @@ export default {
   border: 1px solid #2c2c2c;
   padding: 5px;
 }
+.frame_list{
+  max-height: 500px;
+  overflow-y: auto;
+}
+.instance_frame_wrapper ::-webkit-scrollbar {
+  width: 7px;
+  height: 7px;
+}
+.instance_frame_wrapper  ::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background: #d0d0d0;
+}
 .frame_content{
-  height: 50px;
-  padding: 5px;
+  /* height: 50px; */
+  padding: 10px;
   display: flex;
   justify-content: flex-start;
   color: #ddd;

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

@@ -9,10 +9,10 @@
     class="upload-temporary-file"
   >
     <div class="base-dialog-body">
-      <el-form-item label="Code" prop="Code">
+      <el-form-item :label="$t('dictionary:attachment:label:code')" prop="Code">
         <el-input v-model="form.Code" />
       </el-form-item>
-      <el-form-item label="业务场景: " prop="BusinessScenarioEnum">
+      <el-form-item :label="$t('dictionary:attachment:label:businessScenario')" prop="BusinessScenarioEnum">
         <el-select
           v-model="form.BusinessScenarioEnum"
           style="width:100%;"
@@ -28,7 +28,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="文件: ">
+      <el-form-item :label="$t('dictionary:attachment:export:form:file')">
         <div class="upload-container">
           <el-upload
             class="upload-demo"
@@ -60,7 +60,7 @@
       </el-form-item>
       <el-form-item v-if="form.Id !== ''" label="是否废除: ">
         <el-radio-group v-model="form.IsDeleted">
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :key="`IsDeleted${item.value}`" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="描述">

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

@@ -2,7 +2,8 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true" size="small">
-        <el-form-item label="业务场景">
+        <!-- 业务场景 -->
+        <el-form-item :label="$t('dictionary:attachment:label:businessScenario')">
           <el-select
             v-model="searchData.BusinessScenarioEnum"
             style="width:150px;"
@@ -16,7 +17,8 @@
 
           </el-select>
         </el-form-item>
-        <el-form-item label="文件名称">
+        <!-- 文件名称 -->
+        <el-form-item :label="$t('dictionary:attachment:label:name')">
           <el-input
             v-model="searchData.Name"
             style="width:130px;"
@@ -37,7 +39,6 @@
       </el-form>
       <el-button
         type="primary"
-        icon="el-icon-plus"
         style="margin-left:auto;"
         size="small"
         @click="handleAdd"
@@ -57,14 +58,14 @@
         <el-table-column type="index" width="40" />
         <el-table-column
           prop="Code"
-          label="Code"
+          :label="$t('dictionary:attachment:label:code')"
           show-overflow-tooltip
           sortable="custom"
         />
 
         <el-table-column
           prop="BusinessScenarioEnum"
-          label="业务场景"
+          :label="$t('dictionary:attachment:label:businessScenario')"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -76,18 +77,18 @@
 
         <el-table-column
           prop="Name"
-          label="文件名称"
+          :label="$t('dictionary:attachment:label:name')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="Description"
-          label="描述"
+          :label="$t('dictionary:attachment:label:description')"
           show-overflow-tooltip
         />
         <el-table-column
           prop="IsDeleted"
-          label="是否废除"
+          :label="$t('dictionary:attachment:label:isDeleted')"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -98,30 +99,30 @@
         </el-table-column>
         <el-table-column
           prop="UpdateTime"
-          label="上传时间"
+          :label="$t('dictionary:attachment:label:updateTime')"
           show-overflow-tooltip
           sortable="custom"
         />
 
-        <el-table-column label="Action">
+        <el-table-column label="Action" width="300">
           <template slot-scope="scope">
             <el-button
               type="text"
               @click="handleDownload(scope.row)"
             >
-              下载
+              {{ $t('common:button:download') }}
             </el-button>
             <el-button
               type="text"
               @click="handleEdit(scope.row)"
             >
-              编辑
+              {{ $t('common:action:edit') }}
             </el-button>
             <el-button
               type="text"
               @click="handleDelete(scope.row)"
             >
-              删除
+              {{ $t('common:button:delete') }}
             </el-button>
           </template>
         </el-table-column>
@@ -176,9 +177,9 @@ export default {
   },
   methods: {
     handleDelete(row) {
-      this.$confirm('确定删除该文件？').then(() => {
+      this.$confirm(this.$t('dictionary:attachment:export:confirm:delete')).then(() => {
         deleteCommonDocument(row.Id).then(() => {
-          this.$message.success('删除成功')
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
           this.getList()
         })
       })
@@ -195,7 +196,7 @@ export default {
     },
     // 新增
     handleAdd() {
-      this.editDialog.title = 'Add'
+      this.editDialog.title = this.$t('common:button:new')
       this.currentRow = { FileTypeEnum: FileTypeEnum }
       this.editDialog.visible = true
     },
@@ -208,7 +209,7 @@ export default {
     },
     // 编辑
     handleEdit(row) {
-      this.editDialog.title = 'Edit'
+      this.editDialog.title = this.$t('common:action:edit')
       this.currentRow = { ...row }
       this.editDialog.visible = true
     },

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

@@ -78,7 +78,7 @@
       <el-form-item v-if="form.Id !== ''" label="是否废除: ">
         <el-radio-group v-model="form.IsDeleted">
 
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :key="`IsDeleted${item.value}`" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="描述">

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

@@ -2,7 +2,8 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true" size="small">
-        <el-form-item label="业务场景">
+        <!-- 业务场景 -->
+        <el-form-item :label="$t('dictionary:attachment:label:businessScenario')">
           <el-select
             v-model="searchData.BusinessScenarioEnum"
             style="width:150px;"
@@ -16,7 +17,8 @@
 
           </el-select>
         </el-form-item>
-        <el-form-item label="文件名称">
+        <!-- 文件名称 -->
+        <el-form-item :label="$t('dictionary:attachment:label:name')">
           <el-input
             v-model="searchData.Name"
             style="width:130px;"
@@ -57,14 +59,14 @@
         <el-table-column type="index" width="40" />
         <el-table-column
           prop="Code"
-          label="Code"
+          :label="$t('dictionary:attachment:label:code')"
           show-overflow-tooltip
           sortable="custom"
         />
 
         <el-table-column
           prop="BusinessScenarioEnum"
-          label="业务场景"
+          :label="$t('dictionary:attachment:label:businessScenario')"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -76,7 +78,7 @@
 
         <el-table-column
           prop="Name"
-          label="文件名称"
+          :label="$t('dictionary:attachment:label:name')"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -92,12 +94,12 @@
         </el-table-column>
         <el-table-column
           prop="Description"
-          label="描述"
+          :label="$t('dictionary:attachment:label:description')"
           show-overflow-tooltip
         />
         <el-table-column
           prop="IsDeleted"
-          label="是否废除"
+          :label="$t('dictionary:attachment:label:isDeleted')"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -108,18 +110,18 @@
         </el-table-column>
         <el-table-column
           prop="UpdateTime"
-          label="上传时间"
+          :label="$t('dictionary:attachment:label:updateTime')"
           show-overflow-tooltip
           sortable="custom"
         />
 
-        <el-table-column label="Action">
+        <el-table-column :label="$t('common:action:action')">
           <template slot-scope="scope">
             <el-button
               type="text"
               @click="handleDownload(scope.row)"
             >
-              下载
+              {{ $t('common:button:download') }}
             </el-button>
             <!-- <el-button
               type="text"

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

@@ -9,7 +9,7 @@
     class="upload-temporary-file"
   >
     <div class="base-dialog-body">
-      <el-form-item label="Code" prop="Code">
+      <el-form-item :label="$t('dictionary:attachment:export:search:code')" prop="Code">
         <el-input v-model="form.Code" />
       </el-form-item>
       <el-form-item
@@ -76,8 +76,9 @@
         :label="$t('dictionary:attachment:export:form:isDeleted')"
       >
         <el-radio-group v-model="form.IsDeleted">
-          <el-radio :label="true">是</el-radio>
-          <el-radio :label="false">否</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :key="`IsDeleted${item.value}`" :label="item.value">
+            {{ item.label }}
+          </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item

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

@@ -39,7 +39,6 @@
         </el-form-item>
         <el-button
           type="primary"
-          icon="el-icon-plus"
           style="float: right"
           size="small"
           @click="handleAdd"
@@ -60,7 +59,7 @@
         <el-table-column type="index" width="40" />
         <el-table-column
           prop="Code"
-          label="Code"
+          :label="$t('dictionary:attachment:export:search:code')"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -120,7 +119,7 @@
           sortable="custom"
         />
 
-        <el-table-column :label="$t('common:action:action')">
+        <el-table-column :label="$t('common:action:action')" width="300">
           <template slot-scope="scope">
             <el-button type="text" @click="PreviewFile(scope.row)">
               {{ $t('common:button:preview') }}
@@ -235,7 +234,7 @@ export default {
     },
     // 新增
     handleAdd() {
-      this.editDialog.title = 'Add'
+      this.editDialog.title = this.$t('common:button:new')
       this.currentRow = { FileTypeEnum: FileTypeEnum }
       this.editDialog.visible = true
     },
@@ -252,7 +251,7 @@ export default {
     },
     // 编辑
     handleEdit(row) {
-      this.editDialog.title = 'Edit'
+      this.editDialog.title = this.$t('common:action:edit')
       this.currentRow = { ...row }
       this.editDialog.visible = true
     },

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

@@ -1,100 +1,45 @@
 <template>
-  <el-form
-    ref="sysAttachmentFrom"
-    v-loading="loading"
-    :model="form"
-    label-width="190px"
-    size="small"
-    :rules="rules"
-    class="upload-temporary-file"
-  >
+  <el-form ref="sysAttachmentFrom" v-loading="loading" :model="form" label-width="190px" size="small" :rules="rules"
+    class="upload-temporary-file">
     <div class="base-dialog-body">
-      <el-form-item
-        :label="$t('dictionary:signature:form:FileTypeId')"
-        prop="FileTypeId"
-      >
-        <el-select
-          v-model="form.FileTypeId"
-          style="width: 100%"
-          size="small"
-          filterable
-        >
-          <el-option
-            v-for="item of dictionaryList.Sys_Document"
-            :key="item.Id"
-            :label="item.Value"
-            :value="item.Id"
-          />
+      <el-form-item :label="$t('dictionary:signature:form:FileTypeId')" prop="FileTypeId">
+        <el-select v-model="form.FileTypeId" style="width: 100%" size="small" filterable>
+          <el-option v-for="item of dictionaryList.Sys_Document" :key="item.Id" :label="item.Value" :value="item.Id" />
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('dictionary:signature:form:File')">
         <div class="upload-container">
-          <el-upload
-            class="upload-demo"
-            action
-            accept=".pdf"
-            :before-upload="beforeUpload"
-            :http-request="handleUploadFile"
-            :on-preview="handlePreview"
-            :on-remove="handleRemoveFile"
-            :show-file-list="true"
-            :file-list="fileList"
-            :limit="1"
-            :on-exceed="handleExceed"
-            :disabled="form.Type === ''"
-          >
-            <el-button
-              size="small"
-              type="primary"
-              :disabled="form.FileTypeId === ''"
-              :loading="btnLoading"
-              >{{ $t('common:button:check') }}</el-button
-            >
+          <el-upload class="upload-demo" action accept=".pdf,.mp4" :before-upload="beforeUpload"
+            :http-request="handleUploadFile" :on-preview="handlePreview" :on-remove="handleRemoveFile"
+            :show-file-list="true" :file-list="fileList" :limit="1" :on-exceed="handleExceed"
+            :disabled="form.Type === ''">
+            <el-button size="small" type="primary" :disabled="form.FileTypeId === ''" :loading="btnLoading">{{
+              $t('common:button:check') }}</el-button>
             <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
               ({{ $t('trials:signature:label:mustBepdf') }})
             </span>
           </el-upload>
         </div>
       </el-form-item>
-      <el-form-item
-        :label="$t('dictionary:signature:form:NeedConfirmedUserTypeIdList')"
-        prop="NeedConfirmedUserTypeIdList"
-      >
-        <el-select
-          v-model="form.NeedConfirmedUserTypeIdList"
-          style="width: 100%"
-          multiple
-        >
-          <el-option
-            v-for="item of userTypeOptions"
-            :key="item.Id"
-            :label="item.UserTypeShortName"
-            :value="item.Id"
-          />
+      <el-form-item :label="$t('dictionary:signature:form:NeedConfirmedUserTypeIdList')"
+        prop="NeedConfirmedUserTypeIdList">
+        <el-select v-model="form.NeedConfirmedUserTypeIdList" style="width: 100%" multiple>
+          <el-option v-for="item of userTypeOptions" :key="item.Id" :label="item.UserTypeShortName" :value="item.Id" />
         </el-select>
       </el-form-item>
-      <el-form-item
-        :label="$t('dictionary:signature:form:DocUserSignType')"
-        prop="DocUserSignType"
-      >
-        <el-switch
-          v-model="form.DocUserSignType"
-          :active-value="1"
-          :inactive-value="0"
-        >
+      <el-form-item :label="$t('dictionary:signature:form:DocUserSignType')" prop="DocUserSignType">
+        <el-switch v-model="form.DocUserSignType" :active-value="1" :inactive-value="0">
         </el-switch>
       </el-form-item>
-      <el-form-item
-        :label="$t('dictionary:signature:form:SignViewMinimumMinutes')"
-        prop="SignViewMinimumMinutes"
-      >
-        <el-input-number
-          v-model="form.SignViewMinimumMinutes"
-          controls-position="right"
-          :min="1"
-          :max="50"
-        />
+      <el-form-item :label="$t('dictionary:signature:form:SignViewMinimumMinutes')" prop="SignViewMinimumMinutes">
+        <el-input-number v-model="form.SignViewMinimumMinutes" controls-position="right" :min="1" :max="50" />
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:signature:form:CurrentStaffTrainDays')" prop="CurrentStaffTrainDays">
+        <el-input-number v-model="form.CurrentStaffTrainDays" controls-position="right" :min="0" :max="1000" />
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:signature:form:NewStaffTrainDays')" prop="NewStaffTrainDays">
+        <el-input-number v-model="form.NewStaffTrainDays" controls-position="right" :min="0" :max="1000" />
       </el-form-item>
       <!-- <el-form-item v-if="form.Id !== ''" label="是否废除: ">
         <el-radio-group v-model="form.IsDeleted">
@@ -105,14 +50,8 @@
     </div>
     <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item style="text-align: right">
-        <el-button
-          size="small"
-          type="primary"
-          :disabled="form.FileTypeId === '' || form.Name === ''"
-          :loading="saveBtnLoading"
-          @click="handleSave"
-          >{{ $t('common:button:save') }}</el-button
-        >
+        <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || form.Name === ''"
+          :loading="saveBtnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
       </el-form-item>
     </div>
   </el-form>
@@ -138,9 +77,12 @@ export default {
         FileTypeId: '',
         Name: '',
         Path: '',
-        IsDeleted: false,
+        IsPublish: false,
+        IsDeleted: true,
         SignViewMinimumMinutes: null,
         DocUserSignType: 0,
+        CurrentStaffTrainDays: 1,
+        NewStaffTrainDays: 14,
       },
       rules: {
         FileTypeId: [
@@ -196,8 +138,11 @@ export default {
         this.form.Name = this.data.Name
         this.form.Path = this.data.Path
         this.form.IsDeleted = this.data.IsDeleted
+        this.form.IsPublish = this.data.IsPublish
         this.form.SignViewMinimumMinutes = this.data.SignViewMinimumMinutes
         this.form.DocUserSignType = this.data.DocUserSignType
+        this.form.CurrentStaffTrainDays = this.data.CurrentStaffTrainDays
+        this.form.NewStaffTrainDays = this.data.NewStaffTrainDays
       }
       this.loading = false
     },
@@ -207,7 +152,7 @@ export default {
         .then((res) => {
           this.dictionaryList = { ...res.Result }
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 获取用户类型下拉数据
     getUserType() {
@@ -284,7 +229,7 @@ export default {
       this.$message.warning(this.$t('upload:rule:maxFile1'))
     },
     checkFileSuffix(fileName) {
-      var typeArr = ['pdf']
+      var typeArr = ['pdf', 'mp4']
       var extendName = fileName
         .substring(fileName.lastIndexOf('.') + 1)
         .toLocaleLowerCase()
@@ -305,13 +250,16 @@ export default {
     width: 80px;
     height: 40px;
   }
+
   .upload-container .el-input--small {
     margin-bottom: 5px;
   }
+
   .upload-container .el-icon-circle-check {
     color: #428bca;
     font-size: 13px;
   }
+
   .account_item_clear {
     .el-tag__close {
       display: none !important;