国际化修改

.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']
   }
-};
+}

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,68 @@
     "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",
+    "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-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 +107,19 @@
       "node": true
     },
     "extends": [
-      "plugin:vue/essential"
+      "plugin:vue/essential",
+      "eslint:recommended"
     ],
     "parserOptions": {
-      "parser": "babel-eslint"
+      "parser": "@babel/eslint-parser",
+      "requireConfigFile": false
     },
     "rules": {}
   },
-  "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
-  },
   "browserslist": [
     "> 1%",
-    "last 2 versions"
+    "last 2 versions",
+    "not dead",
+    "not op_mini all"
   ]
 }

src/App.vue

@@ -219,29 +219,34 @@ 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('确定修改当前页面国际化内容？')
+        .then(() => {
+          batchAddOrUpdateFrontInternationalization(this.tableData).then(
+            async (res) => {
+              var zhMessages = {},
+                enMessages = {}
+              var Internationalization =
+                await getFrontInternationalizationList()
+              Vue.prototype.$tl = Internationalization.Result
+              this.tableData.forEach((v) => {
+                // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
+                // enMessages[v.Description + '_' + v.Code] = v.Value
+                zhMessages[v.Code] = v.ValueCN
+                enMessages[v.Code] = v.Value
+              })
+              i18n.mergeLocaleMessage('zh', zhMessages)
+              i18n.mergeLocaleMessage('en', enMessages)
+              this.drawer = false
+              this.$message.success('国际化修改成功')
+              if (this.il8nExternal) {
+                this.$EventBus.$emit('il8nUpdate')
+              }
             }
-          }
-        )
-      })
+          )
+        })
+        .catch((err) => {
+          console.log(err)
+        })
     },
     openI18n(ARRAY) {
       this.tableData = []
@@ -268,6 +273,7 @@ export default {
             ValueCN: item.ValueCN,
             State: item.State,
             Version: item.Version,
+            InternationalizationType: item.InternationalizationType,
           }
         })
         this.tableData = Object.assign([], tableData)
@@ -300,6 +306,7 @@ export default {
             ValueCN: null,
             State: 0,
             Version: this.$version.Version,
+            InternationalizationType: 0,
           })
         }
       })

src/api/trials.js

@@ -1081,6 +1081,13 @@ export function setSeriesStatus(trialId, subjectVisitId, studyId, seriesId, stat
   })
 }
 
+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({
     url: `/QCList/getVisitQCStudyAndSeriesList/${subjectVisitId}`,

src/components/clinicalDataQuestions/components/QuestionFormItem.vue

@@ -193,7 +193,7 @@
     </el-col>
     <!-- eslint-disable vue/no-use-v-if-with-v-for -->
     <!-- eslint-disable vue/valid-v-for -->
-    <el-col v-for="(item) in question.Childrens" v-if="question.Childrens && question.Childrens.length>0 && question.ClinicalQuestionType !== 'table'" :span="['group', 'summary', 'table'].includes(item.ClinicalQuestionType) || item.Childrens.length > 0 ? 24 : 12">
+    <el-col v-for="(item) in question.Childrens" :key="item.Id" v-if="question.Childrens && question.Childrens.length>0 && question.ClinicalQuestionType !== 'table'" :span="['group', 'summary', 'table'].includes(item.ClinicalQuestionType) || item.Childrens.length > 0 ? 24 : 12">
       <QuestionFormItem
         :key="item.Id"
         :question="item"
@@ -593,7 +593,7 @@ export default {
 <style lang="scss" scoped>
 .my_dialog{
   .criterion-form-item{
-    >>>.el-form-item__content{
+    ::v-deep .el-form-item__content{
       width: auto;
     }
   }
@@ -614,7 +614,7 @@ export default {
     margin-bottom: 0px;
   }
   .disabled{
-    >>>.el-upload--picture-card {
+    ::v-deep .el-upload--picture-card {
       display: none;
     }
   }

src/components/clinicalDataQuestions/components/QuestionTableFormItem.vue

@@ -222,7 +222,7 @@ export default {
 <style lang="scss" scoped>
 .my_dialog{
   .criterion-form-item{
-    >>>.el-form-item__content{
+    ::v-deep .el-form-item__content{
       width: auto;
     }
   }
@@ -233,7 +233,7 @@ export default {
     flex-direction: row;
     align-items: flex-start;
   }
-  >>>.el-form-item__content{
+  ::v-deep .el-form-item__content{
     width: 500px;
   }
   .el-input{
@@ -243,7 +243,7 @@ export default {
     margin-bottom: 0px;
   }
   .disabled{
-    >>>.el-upload--picture-card {
+    ::v-deep .el-upload--picture-card {
       display: none;
     }
   }

src/components/toggleRole/index.vue

@@ -112,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/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

@@ -174,7 +174,7 @@ var _vm
 async function VueInit() {
   var params
   var res
-  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct')) {
+  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct') || ~window.location.href.indexOf('/fusion')) {
     params = $q('TrialReadingCriterionId')
     res = await getBasicDataAllSelect(params)
   } else if (~window.location.href.indexOf('/ecrfPreview')) {

src/router/index.js

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

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

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

@@ -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/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/checkConfig/index.vue

@@ -3,7 +3,7 @@
     <el-form :inline="true">
       <el-form-item label="模块">
         <el-select v-model="queryParams.ModuleTypeId" placeholder="模块" clearable size="small">
-          <el-option v-for="item of dict.type.ModuleType" :value="item.value" :label="item.raw.ValueCN" />
+          <el-option v-for="item of dict.type.ModuleType" :key="`ModuleTypeId${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -169,28 +169,28 @@
             <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
               <el-form-item label="功能模块" prop="menuType">
                 <el-select v-model="form.ModuleTypeId" placeholder="模块" clearable size="small" @change="changeModule">
-                  <el-option v-for="item of dict.type.ModuleType" :value="item.value" :label="item.raw.ValueCN" />
+                  <el-option v-for="item of dict.type.ModuleType" :key="`ModuleType${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
               <el-form-item label="操作类型" prop="menuType">
                 <el-select v-model="form.OptTypeId" placeholder="操作类型" clearable size="small" @change="changeDescription">
-                  <el-option v-for="item of dict.type.OptType" :value="item.value" :label="item.raw.ValueCN" />
+                  <el-option v-for="item of dict.type.OptType" :key="`OptTypeId${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
               <el-form-item label="对象类型" prop="menuType">
                 <el-select v-model="form.ObjectTypeId" placeholder="对象类型" clearable size="small" @change="changeDescription">
-                  <el-option v-for="item of dict.type.ObjectType" v-if="ChildGroup === item.raw.ChildGroup" :value="item.value" :label="item.raw.ValueCN" />
+                  <el-option v-for="item of dict.type.ObjectType" :key="`ObjectType${item.value}`" v-if="ChildGroup === item.raw.ChildGroup" :value="item.value" :label="item.raw.ValueCN" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
               <el-form-item label="数据类型" prop="menuType">
                 <el-select v-model="form.ChildrenTypeId" placeholder="操作子类" clearable size="small" @change="changeDescription">
-                  <el-option v-for="item of dict.type.ChildrenType" :value="item.value" :label="item.raw.ValueCN" />
+                  <el-option v-for="item of dict.type.ChildrenType" :key="`ChildrenType${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -295,7 +295,7 @@
                       </el-button>
                     </el-col>
                   </el-row>
-                  <el-row v-show="form.DataType === 'Router'" v-if="form.UrlConfig && form.UrlConfig.IsHaveParameters" v-for="(item,index) of form.UrlConfig ? form.UrlConfig.ParameterList : []">
+                  <el-row v-show="form.DataType === 'Router'" v-if="form.UrlConfig && form.UrlConfig.IsHaveParameters" v-for="(item,index) of form.UrlConfig ? form.UrlConfig.ParameterList : []" :key="`Router${index}`">
                     <el-col :span="10">
                       <el-form-item>
                       <span slot="label">
@@ -671,11 +671,11 @@
       <div style="padding: 0 40px;display: flex;flex-direction: column">
         <div style="text-align: right;height: 50px;">
           <el-select v-model="copeParams.FromItemId" collapse-tags filterable placeholder="完全拷贝对象" clearable size="small">
-            <el-option v-for="item of list" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
+            <el-option v-for="item of list" :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
           </el-select>
           <el-button type="primary" size="mini" style="margin-right: 10px" @click="handleOverCope(selectRow)">完全拷贝</el-button>
           <el-select v-model="copeParams.DataSourceGuids" multiple collapse-tags filterable placeholder="拷贝对象" clearable size="small">
-            <el-option v-for="item of list" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
+            <el-option v-for="item of list" :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
           </el-select>
           <el-button type="primary" size="mini" @click="handleCope(selectRow)">拷贝</el-button>
           <el-button type="primary" size="mini" @click="handleAdd(selectRow)">新建</el-button>

src/views/dictionary/checkConfig/oldIndex.vue

@@ -1,411 +0,0 @@
-<template>
-  <div class="app-container my_menu">
-    <el-form :inline="true">
-      <el-form-item label="操作名">
-        <el-input
-          v-model="queryParams.menuName"
-          placeholder="请输入操作名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="模块">
-        <el-select v-model="queryParams.visible" placeholder="模块" clearable size="small" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-      </el-form-item>
-    </el-form>
-    <div>
-      <el-button
-        type="info"
-        plain
-        icon="el-icon-sort"
-        size="mini"
-        @click="toggleExpandAll"
-      >展开/折叠</el-button>
-    </div>
-    <el-table
-      v-if="refreshTable"
-      v-loading="loading"
-      :data="menuList"
-      :default-expand-all="isExpandAll"
-      row-key="Id"
-      :tree-props="{children: 'Children', hasChildren: 'hasChildren'}"
-    >
-      <el-table-column prop="ModuleTypeValueCN" label="模块" align="left" min-width="230px" />
-      <el-table-column prop="OptTypeValueCN" label="操作类型" min-width="120px" />
-      <el-table-column prop="ChildrenTypeValueCN" label="操作子类" min-width="120px" show-overflow-tooltip />
-      <el-table-column prop="Description" label="操作名称" :show-overflow-tooltip="true" min-width="200px" />
-      <el-table-column prop="Code" label="字段名" min-width="120px" :show-overflow-tooltip="true" />
-      <el-table-column prop="Value" label="字段英文" min-width="120px" :show-overflow-tooltip="true" />
-      <el-table-column prop="ValueCN" label="字段中文" min-width="120px" :show-overflow-tooltip="true" />
-      <el-table-column label="启用" align="center" prop="CreateTime" min-width="80">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.IsEnable" size="success">启用</el-tag>
-          <el-tag v-else size="danger">禁用</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="是否使用父数据" align="center" prop="CreateTime" min-width="130">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.IsShowParent" size="success">父数据</el-tag>
-          <el-tag v-else size="danger">子数据</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" min-width="180" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.ConfigType === 'M'"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-          >新增</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="680px" append-to-body>
-      <el-form ref="form" :model="form" label-width="100px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="选择操作">
-              <treeselect
-                v-model="form.ParentId"
-                :options="menuOptions"
-                :normalizer="normalizer"
-                :show-count="true"
-                placeholder="选择上级操作"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="form.ConfigType === 'M'">
-            <el-form-item label="模块" prop="menuType">
-              <el-select v-model="form.ModuleTypeId" placeholder="模块" clearable size="small" @change="changeDescription">
-                <el-option v-for="item of dict.type.ModuleType" :value="item.value" :label="item.raw.ValueCN"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="form.ConfigType === 'M'">
-            <el-form-item label="操作类型" prop="menuType">
-              <el-select v-model="form.OptTypeId" placeholder="操作类型" clearable size="small" @change="changeDescription">
-                <el-option v-for="item of dict.type.OptType" :value="item.value" :label="item.raw.ValueCN"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="form.ConfigType === 'M'">
-            <el-form-item label="操作子类" prop="menuType">
-              <el-select v-model="form.ChildrenTypeId" placeholder="操作子类" clearable size="small"  @change="changeDescription">
-                <el-option v-for="item of dict.type.ChildrenType" :value="item.value" :label="item.raw.ValueCN"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="form.ConfigType == 'M'">
-            <el-form-item label="名称" prop="Description">
-              <el-input v-model="form.Description" placeholder="请输入名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="显示排序" prop="ShowOrder">
-              <el-input-number v-model="form.Sort" controls-position="right" :min="0" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item>
-              <span slot="label">
-                是否启用
-              </span>
-              <el-switch
-                v-model="form.IsEnable"
-                :active-value="true"
-                :inactive-value="false"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="form.ConfigType === 'C'">
-            <el-form-item>
-              <span slot="label">
-                继承父数据
-              </span>
-              <el-switch
-                v-model="form.IsShowParent"
-                :active-value="true"
-                :inactive-value="false"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-show="form.ConfigType === 'C'">
-            <el-form-item label="字段key">
-              <el-input v-model="form.Code" placeholder="请输入字段key" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="form.ConfigType === 'C'">
-            <el-form-item label="字段英文">
-              <el-input v-model="form.Value" placeholder="请输入字段英文" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="form.ConfigType === 'C'">
-            <el-form-item label="字段中文">
-              <el-input v-model="form.ValueCN" placeholder="请输入字段中文" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-show="form.ConfigType === 'C'">
-            <el-form-item label="枚举类型">
-              <el-radio-group v-model="form.EnumType">
-                <el-radio :label="null">无</el-radio>
-                <el-radio label="E">枚举</el-radio>
-                <el-radio label="D">字典</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-show="form.ConfigType === 'C' && form.EnumType === 'E'">
-            <el-form-item label="枚举">
-              <el-input v-model="form.EnumList" placeholder="请输入枚举" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-show="form.ConfigType === 'C' && form.EnumType === 'D'">
-            <el-form-item label="字典code">
-              <el-input v-model="form.dictionaryKey" placeholder="请输入字典code" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import { getFrontAuditConfigList, addOrUpdateFrontAuditConfig, deleteFrontAuditConfig } from '@/api/dictionary/checkConfig'
-  import Treeselect from '@riophae/vue-treeselect'
-  import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-  import IconSelect from '@/components/IconSelect'
-
-  export default {
-    name: 'checkConfig',
-    dicts: [ 'OptType', 'ModuleType', 'ChildrenType' ],
-    components: { Treeselect, IconSelect },
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 菜单表格树数据
-        menuList: [],
-        // 菜单树选项
-        menuOptions: [],
-        // 弹出层标题
-        title: '',
-        // 是否显示弹出层
-        open: false,
-        // 菜单状态数据字典
-        visibleOptions: [],
-        // 查询参数
-        queryParams: {
-          menuName: undefined,
-          visible: undefined,
-        },
-        // 是否展开，默认全部折叠
-        isExpandAll: false,
-        // 重新渲染表格状态
-        refreshTable: true,
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-          MenuName: [
-            { required: true, message: '菜单名称不能为空', trigger: 'blur' }
-          ],
-          ShowOrder: [
-            { required: true, message: '菜单顺序不能为空', trigger: 'blur' }
-          ]
-        }
-      }
-    },
-    created() {
-      this.getList()
-      // this.getDicts("sys_show_hide").then(response => {
-      //   this.visibleOptions = response.data;
-      // });
-    },
-    methods: {
-      toggleExpandAll() {
-        this.refreshTable = false
-        this.isExpandAll = !this.isExpandAll
-        this.$nextTick(() => {
-          this.refreshTable = true
-        })
-      },
-      normalizer(node) {
-        if (node.Children && !node.Children.length) {
-          delete node.Children
-        }
-        return {
-          id: node.Id,
-          label: node.Description,
-          children: node.Children
-        }
-      },
-      toTree(arr, ParentId) {
-        function loop(ParentId) {
-          const res = []
-          for (let i = 0; i < arr.length; i++) {
-            const item = arr[i]
-            item.hasChildren = false
-            if (item.ParentId !== ParentId) {
-              continue
-            }
-            item.Children = loop(item.Id)
-            res.push(item)
-          }
-          return res
-        }
-        return loop(ParentId)
-      },
-      // 选择图标
-      selected(name) {
-        this.form.MenuIcon = name
-      },
-      /** 查询菜单列表 */
-      getList() {
-        this.loading = true
-        getFrontAuditConfigList(this.queryParams).then(res => {
-          this.menuList = this.toTree(res.Result, '00000000-0000-0000-0000-000000000000')
-          const menu = { Id: '00000000-0000-0000-0000-000000000000', Description: '操作', Children: [] }
-          menu.Children = this.menuList
-          this.menuOptions = Object.assign([], [menu])
-          this.loading = false
-        }).catch(function() {})
-      },
-      /** 查询菜单下拉树结构 */
-      getTreeselect() {
-        this.loading = true
-        getFrontAuditConfigList({}).then(res => {
-          const menu = { Id: '00000000-0000-0000-0000-000000000000', Description: '操作', Children: [] }
-          menu.Children = this.toTree(res.Result, '00000000-0000-0000-0000-000000000000')
-          this.menuOptions = Object.assign([], [menu])
-          this.loading = false
-        }).catch(function() {})
-      },
-      // 菜单显示状态字典翻译
-      visibleFormat(row, column) {
-        if (row.MenuType === 'F') {
-          return ''
-        }
-        return this.selectDictLabel(this.visibleOptions, row.visible)
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false
-        this.reset()
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          Id: null,
-          ParentId: null,
-          ConfigType: 'M',
-          Description: null,
-          IsEnable: true,
-          ModuleTypeId: null,
-          OptTypeId: null,
-          ChildrenTypeId: null,
-          IsShowParent: false,
-          Sort: 0,
-          Code: null,
-          Value: null,
-          ValueCN: null,
-          EnumType: null
-        }
-        this.resetForm('form')
-      },
-      findName (id, dict, type) {
-        if (id) {
-          return this.dict.type[dict].find(v => {
-            return v.value === id
-          }).raw[type]
-        }
-        return ''
-      },
-      changeDescription () {
-        this.form.Description = this.findName(this.form.OptTypeId, 'OptType', 'ValueCN') + this.findName(this.form.ModuleTypeId, 'ModuleType', 'ValueCN') + this.findName(this.form.ChildrenTypeId, 'ChildrenType', 'ValueCN')
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.getList()
-      },
-      /** 新增按钮操作 */
-      handleAdd(row) {
-        this.reset()
-        this.getTreeselect()
-        if (row != null) {
-          this.form.ParentId = row.Id
-          this.form.ModuleTypeId = row.ModuleTypeId
-          this.form.OptTypeId = row.OptTypeId
-          this.form.ChildrenTypeId = row.ChildrenTypeId
-          if (row.ModuleTypeId && row.OptTypeId && row.ChildrenTypeId) {
-            this.form.ConfigType = 'C'
-          }
-          this.form.Description = row.OptTypeValueCN + row.ModuleTypeValueCN + row.ChildrenTypeValueCN
-        }
-        this.open = true
-        this.title = '添加'
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset()
-        this.getTreeselect()
-        this.form = Object.assign({}, row)
-        this.open = true
-        this.title = '修改'
-      },
-      /** 提交按钮 */
-      submitForm: function() {
-        this.$refs['form'].validate(valid => {
-          if (valid) {
-            addOrUpdateFrontAuditConfig(this.form).then(response => {
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
-              this.open = false
-              this.getList()
-            })
-          }
-        })
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        this.$confirm('是否确认删除名称为"' + row.Description + '"的数据项?', '警告', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(function() {
-          return deleteFrontAuditConfig(row.Id)
-        }).then(() => {
-          this.getList()
-          this.$message.success('删除成功')
-        }).catch(function() {})
-      }
-    }
-  }
-</script>
-<style lang="scss">
-  .vue-treeselect div{
-    line-height: 40px;
-  }
-</style>

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

@@ -73,13 +73,13 @@
           <el-button
             circle
             icon="el-icon-edit-outline"
-            title="编辑"
+            :title="$t('common:button:edit')"
             @click="handleEdit(scope.row)"
           />
           <el-button
             circle
             icon="el-icon-delete"
-            title="删除"
+            :title="$t('common:button:delete')"
             @click="handleDelete(scope.row)"
           />
         </template>

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

@@ -113,13 +113,13 @@
           <el-button
             circle
             icon="el-icon-edit-outline"
-            title="编辑"
+            :title="$t('common:button:edit')"
             @click="handleEdit(scope.row)"
-          />
+          /> 
           <el-button
             circle
             icon="el-icon-delete"
-            title="删除"
+            :title="$t('common:button:delete')"
             @click="handleDelete(scope.row)"
           />
         </template>

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

@@ -32,9 +32,9 @@
         <el-input v-model="form.AliasName" />
       </el-form-item>
 
-      <el-form-item label="组织机构代码: ">
+      <!-- <el-form-item label="组织机构代码: ">
         <el-input v-model="form.UniqueCode" />
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item label="Country: " prop="Country">
         <el-input v-model="form.Country" />

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

@@ -74,13 +74,13 @@
         show-overflow-tooltip
         sortable="custom"
       />
-      <el-table-column
+      <!-- <el-table-column
         prop="UniqueCode"
         label="组织机构代码"
         min-width="130"
         show-overflow-tooltip
         sortable="custom"
-      />
+      /> -->
       <el-table-column
         prop="Country"
         label="Country"
@@ -149,13 +149,13 @@
           <el-button
             circle
             icon="el-icon-edit-outline"
-            title="编辑"
+            :title="$t('common:button:edit')"
             @click="handleEdit(scope.row)"
           />
           <el-button
             circle
             icon="el-icon-delete"
-            title="删除"
+            :title="$t('common:button:delete')"
             @click="handleDelete(scope.row)"
           />
         </template>

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

@@ -73,13 +73,13 @@
           <el-button
             circle
             icon="el-icon-edit-outline"
-            title="编辑"
+            :title="$t('common:button:edit')"
             @click="handleEdit(scope.row)"
           />
           <el-button
             circle
             icon="el-icon-delete"
-            title="删除"
+            :title="$t('common:button:delete')"
             @click="handleDelete(scope.row)"
           />
         </template>

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

@@ -33,7 +33,7 @@ export default {
         let browserType = this.getExplore();
         let type = browserType.split(": ")[0];
         let No = browserType.split(": ")[1].split(".")[0];
-        console.log(type, No);
+        // console.log(type, No);
         if (type !== "Chrome" && type !== "Edge") {
           this.tip = this.$t("browser:tip:changeBorwser");
           return (this.visible = true);

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

@@ -8,13 +8,14 @@
     :rules="rules"
   >
     <div class="base-dialog-body">
-      <el-form-item label="标准名称" prop="CriterionName">
+      <!-- 标准名称 -->
+      <el-form-item :label="$t('trials:auditRecord:table:criterion')" prop="CriterionName">
         <el-input
           v-model="form.CriterionName"
         />
       </el-form-item>
-
-      <el-form-item label="标准类型" prop="CriterionType">
+      <!-- 标准类型 -->
+      <el-form-item :label="$t('dictionary:template:criterionConfig:table:criterionType')" prop="CriterionType">
         <el-select v-model="form.CriterionType">
           <el-option
             v-for="item of $d.CriterionType"
@@ -24,7 +25,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="标准分组" prop="CriterionGroup">
+      <!-- 标准分组 -->
+      <el-form-item :label="$t('dictionary:template:criterionConfig:table:criterionGroup')" prop="CriterionGroup">
         <el-select v-model="form.CriterionGroup">
           <el-option
             v-for="item of $d.CriterionGroup"
@@ -34,23 +36,26 @@
           />
         </el-select>
       </el-form-item>
-
-      <el-form-item v-if="form.Id !== ''" label="是否配置完成">
+      <!-- 是否配置完成 -->
+      <el-form-item v-if="form.Id !== ''" :label="$t('dictionary:template:criterionConfig:table:isCompleteConfig')">
         <el-switch v-model="form.IsCompleteConfig" />
       </el-form-item>
-      <el-form-item label="描述">
+      <!-- 描述 -->
+      <el-form-item :label="$t('dictionary:template:criterionConfig:table:description')">
         <el-input
           v-model="form.Description"
         />
       </el-form-item>
-
-      <el-form-item label="显示序号: " prop="ShowOrder">
+      <!-- 显示序号 -->
+      <el-form-item :label="$t('dictionary:template:criterionConfig:table:showOrder')" prop="ShowOrder">
         <el-input-number v-model="form.ShowOrder" :min="0"  style="width:100%;" />
       </el-form-item>
-      <el-form-item v-if="form.Id !== ''" label="是否启用">
+      <!-- 是否启用 -->
+      <el-form-item v-if="form.Id !== ''" :label="$t('dictionary:template:criterionConfig:table:isEnable')">
         <el-switch v-model="form.IsEnable" />
       </el-form-item>
-      <el-form-item v-if="form.Id !== ''" label="eICRF仅展示阅片Tab">
+      <!-- eICRF仅展示阅片Tab -->
+      <el-form-item v-if="form.Id !== ''" :label="$t('dictionary:template:criterionConfig:table:isECRFShowInDicomReading')">
         <el-switch v-model="form.IseCRFShowInDicomReading" />
       </el-form-item>
     </div>

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

@@ -340,7 +340,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .upload-container{
-  /deep/ .el-upload {
+  ::v-deep .el-upload {
     width: 100%;
     text-align: left;
   }

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

@@ -90,7 +90,7 @@
         prop="IsRequired"
       >
         <el-radio-group v-model="form.IsRequired">
-          <el-radio v-for="item of $d.QuestionRequired" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.QuestionRequired" :key="`IsRequired${item.value}`" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="序号" prop="ShowOrder">

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

@@ -265,7 +265,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ .el-form-item__content{
+::v-deep .el-form-item__content{
   width: calc(100% - 110px);
 }
 </style>

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

@@ -231,7 +231,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ .el-form-item__content{
+::v-deep .el-form-item__content{
   width: calc(100% - 110px);
 }
 </style>

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

@@ -25,7 +25,7 @@
         :prop="question.Id"
         :rules="[
           { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && question.RelevanceValueList.includes(questionForm[question.RelevanceId]))) && question.Type!=='group' && question.Type!=='summary',
-            message: '请注明', trigger: ['blur', 'change']},
+            message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
         ]"
         :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
       >
@@ -396,7 +396,7 @@ export default {
     flex-direction: row;
     align-items: flex-start;
   }
-  /deep/ .el-form-item__content{
+  ::v-deep .el-form-item__content{
     width: 500px;
   }
   .el-input{
@@ -406,7 +406,7 @@ export default {
   margin-bottom: 0px;
 }
 .disabled{
-  /deep/ .el-upload--picture-card {
+  ::v-deep .el-upload--picture-card {
     display: none;
   }
 }

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

@@ -11,7 +11,7 @@
     <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
       <div style="height: 150px;">
         <!-- 类型 -->
-        <el-form-item label="类型" prop="Type">
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
           <el-select
             v-model="form.Type"
             clearable
@@ -33,22 +33,23 @@
         <!-- 分组名称 -->
         <el-form-item
           v-if="form.Type === 'group'"
-          label="分组名称"
+          :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
           prop="GroupName"
         >
           <el-input v-model="form.GroupName" />
         </el-form-item>
-        
+        <!-- 分组名称（EN） -->
         <el-form-item
           v-if="form.Type === 'group'"
-          label="分组名称（EN）"
+          :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
           prop="GroupEnName"
         >
           <el-input v-model="form.GroupEnName" />
         </el-form-item>
+        <!-- 问题名称 -->
         <el-form-item
           v-if="form.Type !== 'group'"
-          label="问题名称"
+          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
           prop="QuestionName"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
@@ -57,10 +58,10 @@
         >
           <el-input v-model="form.QuestionName" />
         </el-form-item>
-
+        <!-- 问题名称（EN） -->
         <el-form-item
           v-if="form.Type !== 'group'"
-          label="问题名称（EN）"
+          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
           prop="QuestionEnName"
           :rules="[
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
@@ -70,10 +71,12 @@
         </el-form-item>
       </div>
       <div style="flex: 1;overflow-y:auto;">
-        <el-divider content-position="left">公有属性</el-divider>
+        <!-- 公有属性 -->
+        <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+        <!-- 问题分组 -->
         <el-form-item 
           v-if="form.Type !== 'group'" 
-          label="问题分组"
+          :label="$t('trials:readingUnit:qsList:title:qsGroupName')"
           :rules="[
             { required: form.ShowQuestion === 1 ? false : true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
           ]"
@@ -91,9 +94,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 是否显示 -->
         <el-form-item
           v-if="form.Type !== 'group'"
-          label="是否显示"
+          :label="$t('trials:readingUnit:qsList:title:isShow')"
           prop="ShowQuestion"
         >
           <el-radio-group
@@ -117,7 +121,7 @@
         <!-- 显示时依赖父问题 -->
         <el-form-item
           v-if="form.Type !== 'group' && form.ShowQuestion === 1"
-          label="显示依赖父问题"
+          :label="$t('trials:readingUnit:qsList:title:parentId')"
           prop="ParentId"
         >
           <el-select
@@ -140,7 +144,7 @@
         <!-- 显示时依赖父问题触发值 -->
         <el-form-item
           v-if="form.ParentId && form.ShowQuestion === 1"
-          label="显示触发值"
+          :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')" 
           prop="ParentTriggerValueList"
         >
           <el-select v-model="form.ParentTriggerValueList" clearable multiple>
@@ -152,10 +156,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 是否必填 -->
         <el-form-item
           v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'"
-          label="是否必填"
-          prop="IsRequired"
+          :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired"
         >
           <el-radio-group
             v-model="form.IsRequired"
@@ -176,10 +180,10 @@
           </el-radio-group>
         </el-form-item>
 
-        <!-- 父问题 -->
+        <!-- 必填依赖父问题 -->
         <el-form-item
           v-if="form.Type !== 'group' && form.IsRequired === 1"
-          label="必填依赖父问题"
+          :label="$t('trials:readingUnit:qsList:title:relevanceId')"
           prop="RelevanceId"
         >
           <el-select
@@ -199,10 +203,10 @@
             />
           </el-select>
         </el-form-item>
-        <!-- 必填依赖的父问题触发值 -->
+        <!-- 必填触发值 -->
         <el-form-item
           v-if="form.RelevanceId && form.IsRequired === 1"
-          label="必填触发值"
+          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
           prop="RelevanceValueList"
         >
           <el-select v-model="form.RelevanceValueList" clearable multiple>
@@ -214,6 +218,7 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 是否裁判问题 -->
         <el-form-item
           v-if="
             form.Type === 'select' ||
@@ -221,7 +226,7 @@
             form.Type === 'calculation' ||
             form.Type === 'number'
           "
-          label="是否裁判问题"
+          :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')"
           prop="IsJudgeQuestion"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -263,8 +268,9 @@
             </el-radio>
           </el-radio-group>
         </el-form-item> -->
+        <!-- 导出结果 -->
         <el-form-item 
-          label="导出结果"
+          :label="$t('trials:readingUnit:qsList:title:ExportResult')"
            v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
         >
           <el-select v-model="form.ExportResult" multiple>
@@ -277,9 +283,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        
+        <!-- 限制编辑 -->
         <el-form-item 
-          label="限制编辑" 
+          :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'upload' || form.Type === 'number' || form.Type === 'screenshot'"
           prop="LimitEdit"
           :rules="[
@@ -295,8 +301,9 @@
             >
           </el-radio-group>
         </el-form-item>
+        <!-- 全局阅片是否显示 -->
         <el-form-item 
-          label="全局阅片是否显示"
+          :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')"
           prop="GlobalReadingShowType"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -311,8 +318,9 @@
             >
           </el-radio-group>
         </el-form-item>
+        <!-- 问题标识 -->
         <el-form-item
-          label="问题标识"
+          :label="$t('dictionary:template:criterionConfig:table:questionType')"
           v-if="form.Type !== 'group' && form.Type !== 'summary'"
           prop="QuestionType"
         >
@@ -325,8 +333,9 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 是否在阅片页面显示 -->
         <el-form-item 
-          label="是否在阅片页面显示"
+          :label="$t('trials:readingUnit:qsList:title:isShowInDicom')"
           prop="IsShowInDicom"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -341,14 +350,16 @@
             >
           </el-radio-group>
         </el-form-item>
+        <!-- 注释 -->
         <el-form-item
-          label="注释"
+          :label="$t('trials:readingUnit:qsList:title:Remark')"
           prop="Remark"
         >
           <el-input v-model="form.Remark" />
         </el-form-item>
+        <!-- 序号 -->
         <el-form-item 
-          label="序号" 
+          :label="$t('trials:readingUnit:qsList:title:order')" 
           prop="ShowOrder"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -361,7 +372,8 @@
           />
         </el-form-item>
         <!-- 适用于Lugano 2014标准 -->
-        <el-form-item label="问题分类" v-if="form.Type !== 'group' && criterionType === 2">
+        <!-- 问题分类 -->
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')" v-if="form.Type !== 'group' && criterionType === 2">
           <el-select v-model="form.QuestionClassify" clearable>
             <el-option
               v-for="item of $d.QuestionClassify"
@@ -372,7 +384,8 @@
           </el-select>
         </el-form-item>
         <!-- 适用于iRECST标准 -->
-        <el-form-item label="转化显示类型" prop="ConvertShowType" v-if="criterionType === 3">
+        <!-- 转化显示类型 -->
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:convertType')" prop="ConvertShowType" v-if="criterionType === 3">
           <el-radio-group v-model="form.ConvertShowType">
             <el-radio
               v-for="item of $d.ConvertShowType"
@@ -383,16 +396,18 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-divider content-position="left">私有属性</el-divider>
+        <!-- 私有属性 -->
+        <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
+        <!-- 选项类型 -->
         <el-form-item
           v-if="
             form.Type === 'select' ||
             form.Type === 'radio' ||
             form.Type === 'calculation'
           "
-          label="选项类型"
+          :label="$t('trials:readingUnit:label:QuestionGenre')"
           prop="QuestionGenre"
-          :rules="[{ required: form.Type !== 'calculation', message: '请选择' }]"
+          :rules="[{ required: form.Type !== 'calculation', message: this.$t('common:ruleMessage:select') }]"
         >
           <el-radio-group
             v-model="form.QuestionGenre"
@@ -402,7 +417,7 @@
               }
             "
           >
-            <el-radio :label="-1"> 无 </el-radio>
+            <el-radio :label="-1"> {{ this.$t('common:title:none') }} </el-radio>
             <el-radio
               v-for="item of $d.TableQuestionType"
               v-show="item.value === 0 || item.value === 3"
@@ -413,23 +428,23 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-
+        <!-- 选项 -->
         <el-form-item
           v-if="form.QuestionGenre === 0 || form.Type === 'class'"
-          label="选项"
+          :label="$t('trials:qcCfg:table:typeValue')"
           prop="TypeValue"
         >
           <el-input
             v-model="form.TypeValue"
-            placeholder="选项请用‘|’分割多个选项"
+            :placeholder="$t('trials:qcCfg:message:typeValue')"
             @change="typeValueChange"
           />
         </el-form-item>
         
-        
+        <!-- 关联字典 -->
         <el-form-item
           v-if="form.QuestionGenre === 3"
-          label="关联字典"
+          :label="$t('trials:readingUnit:label:DictionaryCode')"
           prop="DictionaryCode"
         >
           <el-select
@@ -449,8 +464,8 @@
             />
           </el-select>
         </el-form-item>
-        
-        <el-form-item v-if="form.QuestionGenre === 3" label="默认值">
+        <!-- 默认值 -->
+        <el-form-item v-if="form.QuestionGenre === 3" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
           <el-select v-model="form.DefaultValue" clearable>
             <el-option
               v-for="item of highlightAnswers"
@@ -460,7 +475,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="form.QuestionGenre === 0" label="默认值">
+        <!-- 默认值 -->
+        <el-form-item v-if="form.QuestionGenre === 0" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
           <el-select v-model="form.DefaultValue" clearable>
             <el-option
               v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
@@ -470,9 +486,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 高亮标记值 -->
         <el-form-item
           v-if="form.Type === 'select' || form.Type === 'radio'"
-          label="高亮标记值"
+          :label="$t('trials:readingUnit:qsList:title:highlightAnswers')"
           prop="HighlightAnswerList"
         >
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
@@ -494,8 +511,9 @@
             </template>
           </el-select>
         </el-form-item>
+        <!-- 分组标识 -->
         <el-form-item
-          label="分组标识"
+          :label="$t('dictionary:template:criterionConfig:table:groupClassify')"
           v-if="form.Type === 'group'"
           prop="GroupClassify"
         >
@@ -508,9 +526,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 最大长度 -->
         <el-form-item 
           v-if="form.Type === 'input' || form.Type === 'textarea'"
-          label="最大长度"
+          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
           prop="MaxAnswerLength"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
@@ -518,9 +537,10 @@
         >
           <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
         </el-form-item>
+        <!-- 最大行数 -->
         <el-form-item 
           v-if="form.Type === 'table' || form.Type === 'basicTable'" 
-          label="最大行数"
+          :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')"
           prop="MaxQuestionCount"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
@@ -533,16 +553,16 @@
             :max="10"
           />
         </el-form-item>
-        <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" label="自增序号前缀">
+        <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" :label="$t('trials:readingUnit:qsList:title:orderMark')">
           <el-input v-model="form.OrderMark" />
         </el-form-item>
         
         <!-- 数值类型 -->
         <el-form-item
           v-if="form.Type === 'number' || form.Type === 'calculation'"
-          label="数值类型"
+          :label="$t('trials:readingUnit:qsList:title:valueType')"
           prop="ValueType"
-          :rules="[{ required: true, message: '请选择' }]"
+          :rules="[{ required: true, message: this.$t('common:ruleMessage:select') }]"
         >
           <el-radio-group v-model="form.ValueType">
             <el-radio
@@ -555,10 +575,10 @@
           </el-radio-group>
         </el-form-item>
 
-        <!-- 数值单位 -->
+        <!-- 单位 -->
         <el-form-item
           v-if="form.Type === 'number' || form.Type === 'calculation'"
-          label="单位"
+          :label="$t('trials:readingUnit:qsList:title:unit')"
           prop="Unit"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -574,9 +594,10 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
+        <!-- 表格类型标识 -->
         <el-form-item
           v-if="form.Type === 'table'"
-          label="表格类型标识"
+          :label="$t('dictionary:template:criterionConfig:table:tableType')"
           prop="LesionType"
         >
           <el-select v-model="form.LesionType" clearable>
@@ -588,9 +609,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 表格类型标识 -->
         <el-form-item
           v-if="form.Type === 'basicTable'"
-          label="表格类型标识"
+          :label="$t('dictionary:template:criterionConfig:table:tableType')"
           prop="LesionType"
         >
           <el-select v-model="form.LesionType" clearable>
@@ -602,9 +624,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 关联字典 -->
         <el-form-item
           v-if="form.Type === 'table' || form.Type === 'basicTable'"
-          label="关联字典"
+          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')"
         >
           <el-select
             v-model="form.DictionaryCode"
@@ -623,9 +646,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 最大上传个数 -->
         <el-form-item 
           v-if="form.Type === 'upload'" 
-          label="最大上传个数"
+          :label="$t('trials:readingUnit:qsList:title:imageCount')"
         >
           <el-input-number
             v-model="form.ImageCount"
@@ -637,7 +661,7 @@
         <!-- 文件类型 -->
         <el-form-item 
           v-if="form.Type === 'upload'" 
-          label="文件类型"
+          :label="$t('trials:readingUnit:qsList:title:FileType')"
           prop="FileType"
           :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
         >
@@ -660,10 +684,10 @@
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        <!-- 分类 -->
+        <!-- 分类数据来源 -->
         <el-form-item
           v-if="form.Type === 'class'"
-          label="分类数据来源"
+          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')"
           prop="ClassifyQuestionId"
         >
           <el-select v-model="form.ClassifyQuestionId" clearable>
@@ -671,9 +695,10 @@
                       :value="item.Id"/>
           </el-select>
         </el-form-item>
+        <!-- 分类算法 -->
         <el-form-item
           v-if="form.Type === 'class'"
-          label="分类算法"
+          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')"
           prop="ClassifyAlgorithms"
         >
           <div>
@@ -785,7 +810,7 @@ export default {
       } else {
         var arr = value.split('|')
         if (new Set(arr).size !== arr.length) {
-          callback(new Error('选项不允许存在相同值'))
+          callback(new Error(this.$t('trials:readingUnit:qsList:message:msg0')))
         } else {
           callback()
         }
@@ -840,34 +865,34 @@ export default {
         ClassifyAlgorithms: null,
       },
       rules: {
-        Type: [{ required: true, message: '请选择', trigger: 'blur' }],
-        LesionType: [{ required: true, message: '请选择', trigger: 'blur' }],
+        Type: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        LesionType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         // QuestionName: [
         //   { required: true, message: '请注明', trigger: 'blur' },
         //   { max: 300, message: '最大长度为 300' },
         // ],
-        QuestionGenre: [{ required: true, message: '请选择', trigger: 'blur' }],
+        QuestionGenre: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         TypeValue: [
-          { required: true, message: '请注明', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           { validator: validateTypeVal, trigger: 'blur' },
-          { max: 500, message: '最大长度为 500' },
+          { max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500` },
         ],
         DictionaryCode: [
-          { required: true, message: '请选择', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
         ],
-        ShowQuestion: [{ required: true, message: '请选择', trigger: 'blur' }],
-        IsRequired: [{ required: true, message: '请选择', trigger: 'blur' }],
-        ParentId: [{ required: true, message: '请选择', trigger: 'blur' }],
+        ShowQuestion: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        IsRequired: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        ParentId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         ParentTriggerValueList: [
-          { required: true, message: '请选择', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
         ],
-        RelevanceId: [{ required: true, message: '请选择', trigger: 'blur' }],
+        RelevanceId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         RelevanceValueList: [
-          { required: true, message: '请选择', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
         ],
         GroupName: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 50, message: '最大长度为 50' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` },
         ],
         // ExportIdentification: [
         //   { required: true, message: '请选择', trigger: 'blur' },

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

@@ -1,13 +1,15 @@
 <template>
   <el-tabs v-model="activeName" @tab-click="handleClick">
-    <el-tab-pane label="器官" name="organs">
+    <!-- 器官 -->
+    <el-tab-pane :label="$t('dictionary:template:basicData:organs')" name="organs">
 
       <OrgansTbl
         :criterion-id="criterionId"
         :is-complete-config="isCompleteConfig"
       />
     </el-tab-pane>
-    <el-tab-pane label="疗效评估" name="efficacyAssessment">
+    <!-- 疗效评估 -->
+    <el-tab-pane :label="$t('dictionary:template:basicData:efficacyAssessment')" name="efficacyAssessment">
       <EfficacyAssessment
         v-if="tabs.includes('efficacyAssessment')"
         :criterion-id="criterionId"
@@ -15,7 +17,8 @@
         :is-complete-config="isCompleteConfig"
       />
     </el-tab-pane>
-    <el-tab-pane label="标准字典" name="criterionDictionary">
+    <!-- 标准字典 -->
+    <el-tab-pane :label="$t('dictionary:template:basicData:criterionDictionary')" name="criterionDictionary">
       <CriterionDictionary
         v-if="tabs.includes('criterionDictionary')"
         :criterion-id="criterionId"

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

@@ -1,10 +1,12 @@
 <template>
   <div class="criterion-config">
     <el-tabs v-model="activeName">
-      <el-tab-pane :label="'访视阅片'" name="0">
+      <!-- 访视阅片 -->
+      <el-tab-pane :label="$t('dictionary:template:criterionConfig:tab:visitReview')" name="0">
         <div class="search-form" style="display:flex;justify-content: space-between;">
           <el-form :inline="true" size="mini" class="base-search-form">
-            <el-form-item label="名称">
+            <!-- 问题名称 -->
+            <el-form-item :label="$t('trials:readingUnit:qsList:title:qsNameEn')">
               <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
             </el-form-item>
             <el-form-item>
@@ -27,7 +29,7 @@
               type="primary"
               @click="handlePreview"
             >
-              预览
+              {{ $t('common:button:preview') }}
             </el-button>
             <el-button
               v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
@@ -35,7 +37,7 @@
               type="primary"
               @click="handleAdd"
             >
-              添加
+              {{ $t('common:button:add') }}
             </el-button>
           </div>
 
@@ -49,61 +51,70 @@
           stripe
           @sort-change="handleSortByColumn"
         >
+          <!-- 显示序号 -->
           <el-table-column
             prop="ShowOrder"
             label=""
             width="50"
           />
+          <!-- 分组 -->
           <el-table-column
             prop="GroupName"
-            label="分组"
+            :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
             show-overflow-tooltip
           />
+          <!-- 分组(EN) -->
           <el-table-column
             prop="GroupEnName"
-            label="分组(EN)"
+            :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
             show-overflow-tooltip
           />
+          <!-- 名称 -->
           <el-table-column
             prop="QuestionName"
-            label="名称"
+            :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
             show-overflow-tooltip
           />
+          <!-- 名称(EN) -->
           <el-table-column
             prop="QuestionEnName"
-            label="名称(EN)"
+            :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
             show-overflow-tooltip
           />
+          <!-- 题型 -->
           <el-table-column
             prop="Type"
-            label="题型"
+            :label="$t('trials:readingUnit:qsList:title:type')"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
               {{ $fd('Criterion_Question_Type',scope.row.Type) }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="IsRequired"
-            label="是否必填"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              {{ $fd('QuestionRequired',scope.row.IsRequired) }}
-            </template>
-          </el-table-column>
+          <!-- 是否显示 -->
           <el-table-column
             prop="ShowQuestion"
-            label="是否显示"
+            :label="$t('trials:readingUnit:qsList:title:isShow')"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
               {{ $fd('ShowQuestion',scope.row.ShowQuestion) }}
             </template>
           </el-table-column>
+           <!-- 是否必填 -->
+          <el-table-column
+            prop="IsRequired"
+            :label="$t('trials:readingUnit:qsList:title:isRequired')"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ $fd('QuestionRequired',scope.row.IsRequired) }}
+            </template>
+          </el-table-column>
+          <!-- 是否裁判问题 -->
           <el-table-column
             prop="IsJudgeQuestion"
-            label="是否裁判问题"
+            :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')"
             width="120"
             show-overflow-tooltip
           >
@@ -111,9 +122,10 @@
               {{ $fd('YesOrNo', scope.row.IsJudgeQuestion) }}
             </template>
           </el-table-column>
+          <!-- 是否在阅片页面显示 -->
           <el-table-column
             prop="IsShowInDicom"
-            label="是否在阅片页面显示"
+            :label="$t('trials:readingUnit:qsList:title:isShowInDicom')"
             width="150"
             show-overflow-tooltip
           >
@@ -129,9 +141,10 @@
             show-overflow-tooltip
           >
           </el-table-column> -->
+          <!-- 是否在全局阅片显示 -->
           <el-table-column
             prop="GlobalReadingShowType"
-            label="是否在全局阅片显示"
+            :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')"
             width="160"
             show-overflow-tooltip
           >
@@ -153,7 +166,7 @@
           <!-- 问题标识 -->
           <el-table-column
             prop="QuestionType"
-            label="问题标识"
+            :label="$t('dictionary:template:criterionConfig:table:questionType')"
             width="140"
             show-overflow-tooltip
           >
@@ -185,7 +198,7 @@
           </el-table-column>
           <el-table-column
             prop=""
-            label="操作"
+            :label="$t('common:action:action')"
             width="250"
             show-overflow-tooltip
             fixed="right"
@@ -197,7 +210,7 @@
                 size="mini"
                 @click="handleEdit(scope.row)"
               >
-                编辑
+                {{ $t('trials:readingUnit:qsList:title:edit') }}
               </el-button>
               <el-button
                 v-else
@@ -205,7 +218,7 @@
                 size="mini"
                 @click="handleLook(scope.row)"
               >
-                查看
+                {{ $t('trials:readingUnit:qsList:title:view') }}
               </el-button>
               <el-button
                 type="primary"
@@ -213,7 +226,7 @@
                 :disabled="!(scope.row.Type === 'table' || scope.row.Type === 'basicTable')"
                 @click="handleConfig(scope.row)"
               >
-                表格问题
+                {{ $t('trials:readingUnit:qsList:title:tableQs') }}
               </el-button>
               <el-button
                 v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
@@ -222,17 +235,19 @@
                 :disabled="scope.row.IsEnable"
                 @click="handleDelete(scope.row)"
               >
-                删除
+                {{ $t('trials:readingUnit:qsList:title:delete') }}
               </el-button>
             </template>
           </el-table-column>
         </el-table>
         <pagination style="text-align: right;margin-top: 10px;" class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
       </el-tab-pane>
-      <el-tab-pane label="全局阅片" name="Global">
+      <!-- 全局阅片 -->
+      <el-tab-pane :label="$t('dictionary:template:criterionConfig:tab:globalReview')" name="Global">
         <EvaluationOfGlobalConfig v-if="activeName === 'Global'" :data="data" :criterion-id="criterionId" />
       </el-tab-pane>
-      <el-tab-pane label="肿瘤学阅片" name="Oncology">
+      <!-- 肿瘤学阅片 -->
+      <el-tab-pane :label="$t('dictionary:template:criterionConfig:tab:oncologyReview')" name="Oncology">
         <EvaluationOfOncologyConfig v-if="activeName === 'Oncology'" :data="data" :criterion-id="criterionId" />
       </el-tab-pane>
     </el-tabs>
@@ -361,19 +376,19 @@ export default {
     handleAdd() {
       this.rowData = { ReadingQuestionCriterionSystemId: this.criterionId, Id: ''}
       this.type = 'add'
-      this.addOrEdit.title = '添加'
+      this.addOrEdit.title = this.$t('common:button:new')
       this.addOrEdit.visible = true
-    },
+    }, 
     handleLook(row) {
       this.rowData = { ...row }
       this.type = 'look'
-      this.addOrEdit.title = '查看'
+      this.addOrEdit.title = this.$t('common:button:view')
       this.addOrEdit.visible = true
     },
     handleEdit(row) {
       this.rowData = { ...row }
       this.type = 'edit'
-      this.addOrEdit.title = '编辑'
+      this.addOrEdit.title = this.$t('common:button:edit')
       this.addOrEdit.visible = true
     },
     handleDelete(row) {
@@ -388,7 +403,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.getList()
-                this.$message.success('删除成功！')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })

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

@@ -8,8 +8,9 @@
         >
           <el-input v-model="searchData.CriterionName" clearable style="width:120px;" />
         </el-form-item>
+        <!-- 标准类型  -->
         <el-form-item
-          label="标准类型"
+          :label="$t('dictionary:template:criterionConfig:table:criterionType')"
         >
           <el-select v-model="searchData.CriterionType" clearable style="width:120px;">
             <el-option
@@ -20,8 +21,9 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 标准分组 -->
         <el-form-item
-          label="标准分组"
+          :label="$t('dictionary:template:criterionConfig:table:criterionGroup')"
         >
           <el-select v-model="searchData.CriterionGroup" clearable style="width:120px;">
             <el-option
@@ -32,8 +34,9 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 是否配置完成 -->
         <el-form-item
-          label="是否配置完成"
+          :label="$t('dictionary:template:criterionConfig:table:isCompleteConfig')"
         >
           <el-select v-model="searchData.IsCompleteConfig" clearable style="width:120px;">
             <el-option
@@ -44,8 +47,9 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 是否启用 -->
         <el-form-item
-          label="是否启用"
+          :label="$t('dictionary:template:criterionConfig:table:isEnable')"
         >
           <el-select v-model="searchData.IsEnable" clearable style="width:120px;">
             <el-option
@@ -70,7 +74,8 @@
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">添加</el-button>
+        <!-- 添加 -->
+        <el-button type="primary" size="mini" @click="handleAdd">{{$t('common:button:new')}}</el-button>
       </span>
     </div>
 
@@ -85,16 +90,17 @@
       ref="criterionsTbl"
     >
       <el-table-column type="index" width="60" />
-
+      <!-- 标准名称 -->
       <el-table-column
         prop="CriterionName"
-        label="标准名称"
+        :label="$t('trials:auditRecord:table:criterion')"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- 标准类型 -->
       <el-table-column
         prop="CriterionType"
-        label="标准类型"
+        :label="$t('dictionary:template:criterionConfig:table:criterionType')"
         show-overflow-tooltip
         sortable="custom"
       >
@@ -102,9 +108,10 @@
           {{ $fd('CriterionType',scope.row.CriterionType) }}
         </template>
       </el-table-column>
+      <!-- 标准分组 -->
       <el-table-column
         prop="CriterionGroup"
-        label="标准分组"
+        :label="$t('dictionary:template:criterionConfig:table:criterionGroup')"
         show-overflow-tooltip
         sortable="custom"
       >
@@ -112,10 +119,10 @@
           {{ $fd('CriterionGroup',scope.row.CriterionGroup) }}
         </template>
       </el-table-column>
-
+      <!-- 是否配置完成 -->
       <el-table-column
         prop="IsCompleteConfig"
-        label="是否配置完成"
+        :label="$t('dictionary:template:criterionConfig:table:isCompleteConfig')"
         sortable="custom"
       >
         <template slot-scope="scope">
@@ -128,29 +135,33 @@
           {{ $fd('YesOrNo', scope.row.IsCompleteConfig) }}
         </template>
       </el-table-column>
+      <!-- 描述 -->
       <el-table-column
         prop="Description"
-        label="描述"
+        :label="$t('dictionary:template:criterionConfig:table:description')"
         show-overflow-tooltip
       />
+      <!-- 是否启用 -->
       <el-table-column
         prop="IsEnable"
-        label="是否启用"
+        :label="$t('dictionary:template:criterionConfig:table:isEnable')"
         sortable="custom"
       >
         <template slot-scope="scope">
           {{ $fd('YesOrNo', scope.row.IsEnable) }}
         </template>
       </el-table-column>
+      <!-- 显示序号 -->
       <el-table-column
         prop="ShowOrder"
-        label="显示序号"
+        :label="$t('dictionary:template:criterionConfig:table:showOrder')"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- eICRF仅展示阅片Tab -->
       <el-table-column
         prop="IseCRFShowInDicomReading"
-        label="eICRF仅展示阅片Tab"
+        :label="$t('dictionary:template:criterionConfig:table:isECRFShowInDicomReading')"
         show-overflow-tooltip
         sortable="custom"
         width="210"
@@ -159,36 +170,40 @@
           {{ $fd('YesOrNo', scope.row.IseCRFShowInDicomReading) }}
         </template>
       </el-table-column>
-      <el-table-column label="Action" min-width="200px">
+      <el-table-column :label="$t('common:action:action')" min-width="200px">
         <template slot-scope="scope">
+          <!-- 编辑 -->
           <el-button
             type="primary"
             size="mini"
             @click="handleEdit(scope.row)"
           >
-            编辑
+            {{ $t('common:button:edit') }}
           </el-button>
+          <!-- eCRF -->
           <el-button
             type="primary"
             size="mini"
             @click="handleConfig(scope.row)"
           >
-            eCRF
+            {{ $t('dictionary:template:criterionConfig:button:eCRF') }}
           </el-button>
+          <!-- 基础数据 -->
           <el-button
             type="primary"
             size="mini"
             @click="handleBaseDataConfig(scope.row)"
           >
-            基础数据
+            {{ $t('dictionary:template:criterionConfig:button:basicData') }}
           </el-button>
+          <!-- 删除 -->
           <el-button
             type="danger"
             size="mini"
             :disabled="scope.row.IsCompleteConfig"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
 
         </template>
@@ -227,7 +242,7 @@
 
     <el-dialog
       v-if="configBaseDataVisible"
-      :title="'基础数据配置' + `(${rowData.CriterionName})`"
+      :title="`${this.$t('trials:readingUnit:readingCriterion:title:baseDataCfg')} (${rowData.CriterionName})`"
       :visible.sync="configBaseDataVisible"
       :close-on-click-modal="false"
       :fullscreen="true"
@@ -292,17 +307,17 @@ export default {
       }).catch(() => { this.loading = false })
     },
     handleAdd() {
-      this.addDialog.title = '添加'
+      this.addDialog.title = this.$t('common:button:new')
       this.addDialog.visible = true
       this.rowData = {}
     },
     handleEdit(row) {
-      this.addDialog.title = '编辑'
+      this.addDialog.title = this.$t('common:button:edit')
       this.addDialog.visible = true
       this.rowData = { ...row }
     },
     handleDelete(row) {
-      this.$confirm('是否确认删除', {
+      this.$confirm(this.$t('trials:readingUnit:baseDataCfg:message:deleteConfirm'), {
         distinguishCancelAndClose: true,
         type: 'warning'
       }).then(() => {
@@ -310,7 +325,7 @@ export default {
         deleteReadingQuestionCriterionSystem(row.Id).then(res => {
           this.loading = false
           if (res.IsSuccess) {
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
             this.getList()
           }
         }).catch(() => { this.loading = false })
@@ -319,10 +334,10 @@ export default {
     changeStatus(callback, row) {
       var message = ''
       if (callback) {
-        message = '是否确认更改？'
+        message = this.$t('trials:readingUnit:baseDataCfg:message:updateConfirm')
         row.IsCompleteConfig = false
       } else {
-        message = '是否确认更改？'
+        message = this.$t('trials:readingUnit:baseDataCfg:message:updateConfirm')
         row.IsCompleteConfig = true
       }
       this.$confirm(message, {

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

@@ -84,6 +84,7 @@
         <el-table-column
           :prop="item.ColumnKey"
           v-for="item of headList"
+          :key="item.ColumnName"
           :label="item.ColumnName"
           show-overflow-tooltip
           sortable="custom"

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

@@ -1,10 +1,13 @@
 <template>
   <div style="position: relative">
     <el-form  size="small" :inline="true"  label-width="130px" style="position: relative;">
-      <el-divider content-position="left">阅片规则</el-divider>
-      <el-form-item label="是否必须全局阅片">
+      <!-- 阅片规则 -->
+      <el-divider content-position="left">{{ $t('dictionary:template:globalConfig:readingRules') }}</el-divider>
+      <!-- 是否必须全局阅片 -->
+      <el-form-item :label="$t('dictionary:template:globalConfig:isMustGlobalReading')">
         {{ $fd('YesOrNo', IsMustGlobalReading) }}
       </el-form-item>
+      <!-- 配置 -->
       <el-button
         size="mini"
         type="primary"
@@ -12,11 +15,13 @@
         v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
         @click="handleAdd(1)"
       >
-        配置
+        {{ $t('dictionary:template:globalConfig:config') }}
       </el-button>
     </el-form>
     <el-form  size="small" :inline="true"  label-width="110px" style="position: relative">
-      <el-divider content-position="left">名称</el-divider>
+      <!-- 名称 -->
+      <el-divider content-position="left">{{ $t('dictionary:template:globalConfig:name') }}</el-divider>
+      <!-- 配置 -->
       <el-button
         size="mini"
         type="primary"
@@ -24,9 +29,10 @@
         v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
         @click="handleAdd(2)"
       >
-        配置
+        {{ $t('dictionary:template:globalConfig:config') }}
       </el-button>
-      <el-form-item label="评估更新类型" style="width: 100%">
+      <!-- 评估更新类型 -->
+      <el-form-item :label="$t('dictionary:template:globalConfig:updateType')" style="width: 100%">
       </el-form-item>
       <el-table
         v-loading="loading"
@@ -34,30 +40,34 @@
         :data="list"
         stripe
       >
+        <!-- 序号 -->
         <el-table-column
           prop=""
-          label="序号"
+          :label="$t('dictionary:template:globalConfig:order')"
           width="50"
         >
           <template slot-scope="scope">
             {{scope.$index + 1}}
           </template>
         </el-table-column>
+        <!-- 中文值 -->
         <el-table-column
           prop="ValueCN"
-          label="中文值"
+          :label="$t('dictionary:template:globalConfig:valueCN')"
           show-overflow-tooltip
         >
         </el-table-column>
+        <!-- 英文值 -->
         <el-table-column
           prop="Value"
-          label="英文值"
+          :label="$t('dictionary:template:globalConfig:value')"
           show-overflow-tooltip
         >
         </el-table-column>
+        <!-- 是否基线评估 -->
         <el-table-column
           prop="IsBaseLineUse"
-          label="是否基线评估"
+          :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -70,9 +80,10 @@
             <el-tag v-else type="danger">{{ $fd('YesOrNo', scope.row.IsBaseLineUse) }}</el-tag>
           </template>
         </el-table-column>
+        <!-- 是否随访评估 -->
         <el-table-column
           prop="IsFollowVisitUse"
-          label="是否随访评估"
+          :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -93,12 +104,14 @@
     >
       <template slot="dialog-body">
         <el-form  size="small" :inline="true"  label-width="130px">
-          <el-form-item label="是否必须全局阅片" v-if="config.configType === 1">
+          <!-- 是否必须全局阅片 -->
+          <el-form-item :label="$t('dictionary:template:globalConfig:isMustGlobalReading')" v-if="config.configType === 1">
             <el-radio-group v-model="form.IsMustGlobalReading">
               <el-radio v-for="item of $d.YesOrNo" :key="'form.IsMustGlobalReading' + item.value" :label="item.value">{{ item.label }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="config.configType === 2" label="评估更新类型" style="width: 100%">
+          <!-- 评估更新类型 -->
+          <el-form-item v-if="config.configType === 2" :label="$t('dictionary:template:globalConfig:updateType')" style="width: 100%">
           </el-form-item>
           <el-table
             v-if="config.configType === 2"
@@ -112,21 +125,24 @@
               type="selection"
               width="55">
             </el-table-column>
+            <!-- 中文值 -->
             <el-table-column
               prop="ValueCN"
-              label="中文值"
+              :label="$t('dictionary:template:globalConfig:valueCN')"
               show-overflow-tooltip
             >
             </el-table-column>
+            <!-- 英文值 -->
             <el-table-column
               prop="Value"
-              label="英文值"
+              :label="$t('dictionary:template:globalConfig:value')"
               show-overflow-tooltip
             >
             </el-table-column>
+            <!-- 是否基线评估 -->
             <el-table-column
               prop="IsBaseLineUse"
-              label="是否基线评估"
+              :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -138,9 +154,10 @@
                 <span>{{$fd('YesOrNo', scope.row.IsBaseLineUse)}}</span>
               </template>
             </el-table-column>
+            <!-- 是否随访评估 -->
             <el-table-column
               prop="IsFollowVisitUse"
-              label="是否随访评估"
+              :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -156,8 +173,12 @@
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button :disabled="loading" size="small" type="primary" @click="config.visible = false">取消</el-button>
-        <el-button size="small" type="primary" :loading="loading" @click="handleSave">保存</el-button>
+        <el-button :disabled="loading" size="small" type="primary" @click="config.visible = false">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="small" type="primary" :loading="loading" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
       </template>
     </base-model>
   </div>
@@ -186,8 +207,8 @@ export default {
       rowData: {},
       activeName: '0',
       addOrEdit: { visible: false, title: '' },
-      preview: { visible: false, title: 'eCRF预览' },
-      config: { visible: false, title: '评估更新类型', appendToBody: true, width: '600px', configType: 0 },
+      // preview: { visible: false, title: 'eCRF预览' },
+      config: { visible: false, title: this.$t('dictionary:template:globalConfig:updateType'), appendToBody: true, width: '600px', configType: 0 },
       selectedList: [],
       IsMustGlobalReading: false,
       form: {
@@ -269,10 +290,10 @@ export default {
       this.config.configType = n
       this.form.IsMustGlobalReading = this.IsMustGlobalReading
       if (n === 1) {
-        this.config.title = '是否必须全局阅片'
+        this.config.title = this.$t('dictionary:template:globalConfig:isMustGlobalReading')
         this.config.visible = true
       } else {
-        this.config.title = '评估更新类型'
+        this.config.title = this.$t('dictionary:template:globalConfig:updateType')
         this.config.visible = true
         this.$nextTick(() => {
           var a = this.$d.GlobalAssessType.filter(v => {
@@ -322,8 +343,4 @@ export default {
 }
 </script>
 
-<style scoped>
-/deep/ .el-form-item__content{
-  width: calc(100% - 130px);
-}
-</style>
+

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

@@ -1,10 +1,13 @@
 <template>
   <div>
     <el-form  size="small" :inline="true"  label-width="110px" style="position: relative;">
-      <el-divider content-position="left">阅片规则</el-divider>
-      <el-form-item label="是否肿瘤学阅片" style="width: 100%">
+      <!-- 阅片规则 -->
+      <el-divider content-position="left">{{ $t('dictionary:template:globalConfig:readingRules') }}</el-divider>
+      <!-- 是否肿瘤学阅片 -->
+      <el-form-item :label="$t('dictionary:template:oncologyConfig:isOncologyReading')" style="width: 100%">
         {{ $fd('YesOrNo', IsOncologyReading)}}
       </el-form-item>
+      <!-- 配置 -->
       <el-button
         size="mini"
         type="primary"
@@ -12,11 +15,13 @@
         v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
         @click="handleAdd(1)"
       >
-        配置
+        {{ $t('dictionary:template:globalConfig:config') }}
       </el-button>
     </el-form>
     <el-form  size="small" :inline="true"  label-width="110px" style="position: relative">
-      <el-divider content-position="left">阅片问题</el-divider>
+      <!-- 阅片问题 -->
+      <el-divider content-position="left">{{ $t('dictionary:template:oncologyConfig:reviewQs') }}</el-divider>
+      <!-- 配置 -->
       <el-button
         size="mini"
         type="primary"
@@ -24,9 +29,10 @@
         v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
         @click="handleAdd(2)"
       >
-        配置
+        {{ $t('dictionary:template:globalConfig:config') }}
       </el-button>
-      <el-form-item label="肿瘤学阅片结果" style="width: 100%">
+      <!-- 肿瘤学阅片结果 -->
+      <el-form-item :label="$t('dictionary:template:oncologyConfig:reviewResult')" style="width: 100%">
       </el-form-item>
     </el-form>
     <el-table
@@ -35,24 +41,27 @@
       :data="list"
       stripe
     >
+      <!-- 序号 -->
       <el-table-column
         prop=""
-        label="序号"
+        :label="$t('dictionary:template:globalConfig:order')"
         width="50"
       >
         <template slot-scope="scope">
           {{scope.$index + 1}}
         </template>
       </el-table-column>
+      <!-- 中文值 -->
       <el-table-column
         prop="ValueCN"
-        label="中文值"
+        :label="$t('dictionary:template:globalConfig:valueCN')"
         show-overflow-tooltip
       >
       </el-table-column>
+      <!-- 英文值 -->
       <el-table-column
         prop="Value"
-        label="英文值"
+        :label="$t('dictionary:template:globalConfig:value')"
         show-overflow-tooltip
       >
       </el-table-column>
@@ -60,12 +69,14 @@
     <base-model :config="config">
       <template slot="dialog-body">
         <el-form  size="small" :inline="true"  label-width="110px">
-          <el-form-item label="是否肿瘤学阅片" v-if="config.configType === 1">
+          <!-- 是否肿瘤学阅片 -->
+          <el-form-item :label="$t('dictionary:template:oncologyConfig:isOncologyReading')" v-if="config.configType === 1">
             <el-radio-group v-model="form.IsOncologyReading">
               <el-radio v-for="item of $d.YesOrNo" :key="'form.IsOncologyReading' + item.value" :label="item.value">{{ item.label }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="肿瘤学阅片结果" style="width: 100%" v-if="config.configType === 2">
+          <!-- 肿瘤学阅片结果 -->
+          <el-form-item :label="$t('dictionary:template:oncologyConfig:reviewResult')" style="width: 100%" v-if="config.configType === 2">
           </el-form-item>
           <el-table
             v-if="config.configType === 2"
@@ -80,15 +91,17 @@
               type="selection"
               width="55">
             </el-table-column>
+            <!-- 中文值 -->
             <el-table-column
               prop="ValueCN"
-              label="中文值"
+              :label="$t('dictionary:template:globalConfig:valueCN')"
               show-overflow-tooltip
             >
             </el-table-column>
+            <!-- 英文值 -->
             <el-table-column
               prop="Value"
-              label="英文值"
+              :label="$t('dictionary:template:globalConfig:value')"
               show-overflow-tooltip
             >
             </el-table-column>
@@ -96,8 +109,12 @@
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button :disabled="loading" size="small" type="primary" @click="config.visible = false">取消</el-button>
-        <el-button size="small" type="primary" :loading="loading" @click="handleSave">保存</el-button>
+        <el-button :disabled="loading" size="small" type="primary" @click="config.visible = false">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="small" type="primary" :loading="loading" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
       </template>
     </base-model>
   </div>
@@ -129,8 +146,7 @@ export default {
       rowData: {},
       activeName: '0',
       addOrEdit: { visible: false, title: '' },
-      preview: { visible: false, title: 'eCRF预览' },
-      config: { visible: false, title: '肿瘤学阅片结果', appendToBody: true, width: '600px', configType: 0 },
+      config: { visible: false, title: this.$t('dictionary:template:oncologyConfig:reviewResult'), appendToBody: true, width: '600px', configType: 0 },
       selectedList: [],
       OncologyAssessType: [],
       IsOncologyReading: true
@@ -177,10 +193,10 @@ export default {
     handleAdd(n) {
       this.config.configType = n
       if (n === 1) {
-        this.config.title = '是否肿瘤学阅片'
+        this.config.title = this.$t('dictionary:template:oncologyConfig:isOncologyReading')
         this.config.visible = true
       } else {
-        this.config.title = '肿瘤学阅片结果'
+        this.config.title = this.$t('dictionary:template:oncologyConfig:reviewResult')
         this.config.visible = true
         this.$nextTick(() => {
           var a = this.OncologyAssessType.filter(v => {
@@ -221,9 +237,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-/deep/ .el-form-item__content{
-  width: calc(100% - 110px);
-}
-</style>

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

@@ -8,7 +8,8 @@
     :rules="rules"
   >
     <div class="base-dialog-body">
-      <el-form-item label="病灶类型" prop="LesionType">
+      <!-- 病灶类型 -->
+      <el-form-item :label="$t('dictionary:template:basicData:lesionType')" prop="LesionType">
         <el-select v-model="form.LesionType">
           <el-option
             v-for="item of CriterionDictionaryList.LesionType"
@@ -18,7 +19,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="器官类型" prop="OrganType">
+      <!-- 器官类型 -->
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:organType')" prop="OrganType">
         <el-select v-model="form.OrganType">
           <el-option
             v-for="item of CriterionDictionaryOrganTypeList.OrganType"

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

@@ -43,28 +43,30 @@
         height="100"
       >
         <el-table-column type="index" width="90" />
+        <!-- 病灶类型 -->
         <el-table-column
           prop="LesionType"
-          label="病灶类型"
+          :label="$t('dictionary:template:basicData:lesionType')"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
             {{ $fd('LesionType',scope.row.LesionType) }}
           </template>
         </el-table-column>
+        <!-- 器官类型 -->
         <el-table-column
           prop="OrganType"
-          label="器官类型"
+          :label="$t('trials:readingUnit:baseDataCfg:title:organType')"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
             {{ $fd('OrganType',scope.row.OrganType) }}
           </template>
         </el-table-column>
-
+        <!-- 创建时间 -->
         <el-table-column
           prop="CreateTime"
-          label="创建时间"
+          :label="$t('dictionary:template:basicData:createTime')"
           show-overflow-tooltip
         />
         <el-table-column
@@ -76,13 +78,13 @@
           <template slot-scope="scope">
             <el-button
               circle
-              title="编辑"
+              :title="$t('common:button:edit')"
               icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             />
             <el-button
               circle
-              title="删除"
+              :title="$t('common:button:delete')"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
             />
@@ -163,18 +165,18 @@ export default {
     // 新增
     handleAdd() {
       this.rowData = { CriterionId: this.criterionId }
-      this.editDialog.title = '新增'
+      this.editDialog.title = this.$t('common:button:new')
       this.editDialog.visible = true
     },
     // 编辑
     handleEdit(row) {
       this.rowData = { ...row }
-      this.editDialog.title = '编辑'
+      this.editDialog.title = this.$t('common:button:edit')
       this.editDialog.visible = true
     },
     // 删除
     handleDelete(row) {
-      this.$confirm('是否确认删除', {
+      this.$confirm(this.$t('trials:readingUnit:baseDataCfg:message:deleteConfirm'), {
         type: 'warning',
         distinguishCancelAndClose: true
       })
@@ -185,7 +187,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.getList()
-                this.$message.success('删除成功！')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })

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

@@ -3,13 +3,13 @@
     ref="organForm"
     v-loading="loading"
     :model="form"
-    label-width="100px"
+    label-width="120px"
     size="small"
     :rules="rules"
   >
     <div class="base-dialog-body">
       <!-- 类型 -->
-      <el-form-item label="器官类型" prop="OrganType">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:organType')" prop="OrganType">
         <el-select
           v-model="form.OrganType"
         >
@@ -21,35 +21,37 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="分类" prop="Classification">
+      <!-- 分类 -->
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:classification')" prop="Classification">
         <el-input v-model="form.Classification" />
       </el-form-item>
-      <el-form-item label="分类（英文）">
+      <!-- 分类（英文） -->
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:classificationEn')">
         <el-input v-model="form.ClassificationEN" />
       </el-form-item>
       <!-- 部位 -->
-      <el-form-item label="部位" prop="Part">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:bodyPart')" prop="Part">
         <el-input v-model="form.Part" />
       </el-form-item>
-      <el-form-item label="部位（英文）">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:bodyPartEn')">
         <el-input v-model="form.PartEN" />
       </el-form-item>
-      <!-- TULOC -->
-      <el-form-item label="器官" prop="TULOC">
+      <!-- 器官 -->
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:organ')" prop="TULOC">
         <el-input v-model="form.TULOC" />
       </el-form-item>
-      <el-form-item label="器官（英文）" prop="TULOCEN">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:TULOCEN')" prop="TULOCEN">
         <el-input v-model="form.TULOCEN" />
       </el-form-item>
-      <!-- TULAT -->
-      <el-form-item label="位置">
+      <!-- 位置 -->
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:TULAT')">
         <el-input v-model="form.TULAT" />
       </el-form-item>
-      <el-form-item label="位置（英文）">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:TULATEn')">
         <el-input v-model="form.TULATEN" />
       </el-form-item>
       <!-- 是否淋巴结 -->
-      <el-form-item label="是否淋巴结" prop="IsLymphNodes">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:isLymphNodes')" prop="IsLymphNodes">
         <el-radio-group v-model="form.IsLymphNodes">
           <el-radio
             v-for="item of $d.ReadingYesOrNo"
@@ -60,7 +62,7 @@
       </el-form-item>
 
       <!-- 是否可以编辑 -->
-      <el-form-item label="是否可以编辑" prop="IsCanEditPosition">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:isCanEditPosition')" prop="IsCanEditPosition">
         <el-radio-group v-model="form.IsCanEditPosition">
           <el-radio
             v-for="item of $d.YesOrNo"
@@ -69,11 +71,11 @@
           >{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="序号" prop="ShowOrder">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:showOrder')" prop="ShowOrder">
         <el-input v-model="form.ShowOrder" type="number" />
       </el-form-item>
       <!-- 描述 -->
-      <el-form-item label="描述" prop="Remark">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:remark')" prop="Remark">
         <el-input
           v-model="form.Remark"
           type="textarea"

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

@@ -3,18 +3,22 @@
     <!-- 搜索框 -->
     <template slot="search-container">
       <el-form :inline="true" size="mini">
-        <el-form-item label="器官类型">
+        <!-- 器官类型 -->
+        <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:organType')"> 
           <el-select v-model="searchData.OrganType" clearable style="width:130px;">
             <el-option v-for="item of CriterionDictionaryOrganTypeList && CriterionDictionaryOrganTypeList.OrganType" :key="item.Id" :value="parseInt(item.Code)" :label="item.ValueCN" />
           </el-select>
         </el-form-item>
-        <el-form-item label="部位">
+        <!-- 部位 -->
+        <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:bodyPart')">
           <el-input v-model="searchData.Part" clearable style="width:130px;" />
         </el-form-item>
-        <el-form-item label="器官">
+        <!-- 器官 -->
+        <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:organ')">
           <el-input v-model="searchData.TULOC" clearable style="width:130px;" />
         </el-form-item>
-        <el-form-item label="是否淋巴结">
+        <!-- 是否淋巴结 -->
+        <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:isLymphNodes')">
           <el-select v-model="searchData.IsLymphNodes" clearable style="width:130px;">
             <el-option v-for="item of $d.ReadingYesOrNo" :key="item.id" :value="item.value" :label="item.label" />
           </el-select>
@@ -54,7 +58,7 @@
           size="mini"
           @click="lesionType.visible = true"
         >
-          病灶关联配置
+          {{ this.$t('dictionary:template:basicData:config') }}
         </el-button>
         <!--        <el-button-->
         <!--          v-if="!isCompleteConfig"-->
@@ -91,7 +95,7 @@
         <!-- 类型 -->
         <el-table-column
           prop="OrganType"
-          label="器官类型"
+          :label="$t('trials:readingUnit:baseDataCfg:title:organType')"
           min-width="120"
           show-overflow-tooltip
           sortable="custom"
@@ -103,13 +107,13 @@
         </el-table-column>
         <el-table-column
           prop="Classification"
-          label="分类"
+          :label="$t('trials:readingUnit:baseDataCfg:title:classification')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="ClassificationEN"
-          label="分类（英文）"
+          :label="$t('trials:readingUnit:baseDataCfg:title:classificationEn')"
           min-width="140"
           show-overflow-tooltip
           sortable="custom"
@@ -117,46 +121,49 @@
         <!-- 部位 -->
         <el-table-column
           prop="Part"
-          label="部位"
+          :label="$t('trials:readingUnit:baseDataCfg:title:bodyPart')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="PartEN"
-          label="部位（英文）"
+          :label="$t('trials:readingUnit:baseDataCfg:title:bodyPartEn')"
           min-width="140"
           show-overflow-tooltip
           sortable="custom"
         />
+        <!-- 器官 -->
         <el-table-column
           prop="TULOC"
-          label="器官"
+          :label="$t('trials:readingUnit:baseDataCfg:title:organ')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="TULOCEN"
-          label="器官（英文）"
+          :label="$t('trials:readingUnit:baseDataCfg:title:TULOCEN')"
           min-width="140"
           show-overflow-tooltip
           sortable="custom"
         />
+        <!-- 位置 -->
         <el-table-column
           prop="TULAT"
-          label="位置"
+          :label="$t('trials:readingUnit:baseDataCfg:title:TULAT')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="TULATEN"
-          label="位置（英文）"
+          :label="$t('trials:readingUnit:baseDataCfg:title:TULATEn')"
           min-width="140"
           show-overflow-tooltip
           sortable="custom"
         />
+        <!-- 是否淋巴结 -->
         <el-table-column
           prop="IsLymphNodes"
-          label="是否淋巴结"
+          :label="$t('trials:readingUnit:baseDataCfg:title:isLymphNodes')"
           min-width="160"
           show-overflow-tooltip
           sortable="custom"
@@ -168,9 +175,10 @@
             <el-tag v-else type="primary">{{ $fd('ReadingYesOrNo', scope.row.IsLymphNodes) }}</el-tag>
           </template>
         </el-table-column>
+        <!-- 是否可以编辑 -->
         <el-table-column
           prop="IsCanEditPosition"
-          label="是否可以编辑"
+          :label="$t('trials:readingUnit:baseDataCfg:title:isCanEditPosition')"
           min-width="160"
           show-overflow-tooltip
           sortable="custom"
@@ -182,15 +190,17 @@
             <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsCanEditPosition) }}</el-tag>
           </template>
         </el-table-column>
+        <!-- 序号 -->
         <el-table-column
           prop="ShowOrder"
-          label="序号"
+          :label="$t('trials:readingUnit:baseDataCfg:title:showOrder')"
           show-overflow-tooltip
           min-width="80"
         />
+        <!-- 备注 -->
         <el-table-column
           prop="Remark"
-          label="备注"
+          :label="$t('trials:readingUnit:baseDataCfg:title:remark')"
           show-overflow-tooltip
         />
 
@@ -203,13 +213,13 @@
           <template slot-scope="scope">
             <el-button
               circle
-              title="编辑"
+              :title="$t('common:button:edit')"
               icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             />
             <el-button
               circle
-              title="删除"
+              :title="$t('common:button:delete')"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
             />
@@ -227,7 +237,7 @@
       :visible.sync="editDialog.visible"
       :close-on-click-modal="false"
       :title="editDialog.title"
-      width="500px"
+      width="600px"
       custom-class="base-dialog-wrapper"
       append-to-body
     >
@@ -273,9 +283,9 @@
         size="small"
       >
         <div class="base-dialog-body">
-          <!-- 类型 -->
+          <!-- 标准 -->
           <el-form-item
-            label="标准"
+            :label="$t('trials:auditRecord:table:criterion')"
             prop="CriterionId"
             :rules="[
               { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
@@ -345,9 +355,8 @@ export default {
       total: 0,
       rowData: {},
       editDialog: { title: '', visible: false },
-      lesionType: { title: '病灶器官关联关系', visible: false },
-      // lesionTypes: [],
-      criterion: { title: '默认数据配置', visible: false },
+      lesionType: { title: this.$t('dictionary:template:basicData:title1'), visible: false },//病灶器官关联关系
+      criterion: { title: this.$t('dictionary:template:basicData:title2'), visible: false },//默认数据配置
       formLoading: false,
       form: { CriterionId: '' },
       criterions: [],
@@ -382,7 +391,7 @@ export default {
         TrialReadingCriterionId: this.criterionId
       }).then(res => {
         this.loading = false
-        this.$message.success('同步成功')
+        this.$message.success(this.$t('dictionary:template:basicData:message1'))
       }).catch(() => {
         this.loading = false
       })
@@ -411,18 +420,18 @@ export default {
     // 新增
     handleAdd() {
       this.rowData = { SystemCriterionId: this.criterionId }
-      this.editDialog.title = '新增'
+      this.editDialog.title = this.$t('common:button:new')
       this.editDialog.visible = true
     },
     // 编辑
     handleEdit(row) {
       this.rowData = { ...row }
-      this.editDialog.title = '编辑'
+      this.editDialog.title = this.$t('common:button:edit')
       this.editDialog.visible = true
     },
     // 删除
     handleDelete(row) {
-      this.$confirm('是否确认删除', {
+      this.$confirm(this.$t('trials:readingUnit:baseDataCfg:message:deleteConfirm'), {
         type: 'warning',
         distinguishCancelAndClose: true
       })
@@ -433,7 +442,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.getList()
-                this.$message.success('删除成功！')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })

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

@@ -190,7 +190,7 @@ export default {
   margin-bottom: 0px;
 }
 .disabled{
-  /deep/ .el-upload--picture-card {
+  ::v-deep .el-upload--picture-card {
     display: none;
   }
 }

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

@@ -9,7 +9,8 @@
         label-width="130px"
         size="small"
       >
-        <el-form-item label="问题名称" prop="QuestionName">
+        <!-- 问题名称 -->
+        <el-form-item :label="$t('trials:qcCfg:table:questionName')" prop="QuestionName">
           <el-input v-model="form.QuestionName" />
         </el-form-item>
         <el-form-item
@@ -27,24 +28,28 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="类型">
+        <!-- 类型 -->
+        <el-form-item :label="$t('trials:qcCfg:table:type')">
           <el-select v-model="form.Type" @change="((val)=>{typeChange(val, form)})">
-            <el-option value="select" label="下拉框" />
-            <el-option value="input" label="单行文本框" />
-            <el-option value="textarea" label="多行文本框" />
-            <el-option value="radio" label="单选框" />
+            <el-option
+              v-for="item of $d.QcType"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
+            />
           </el-select>
         </el-form-item>
+        <!-- 选项 -->
         <el-form-item
           v-if="form.Type === 'select' || form.Type === 'radio'"
-          label="选项: "
+          :label="$t('trials:qcCfg:table:typeValue')"
           prop="TypeValue"
         >
-          <el-input v-model="form.TypeValue" placeholder="选项请用‘|’分割多个选项" />
+          <el-input v-model="form.TypeValue" :placeholder="$t('trials:qcCfg:message:typeValue')" />
         </el-form-item>
         <!-- 父问题 -->
         <el-form-item
-          label="父问题"
+          :label="$t('trials:qcCfg:table:parentQs')"
         >
           <el-select
             v-model="form.ParentId"
@@ -62,7 +67,7 @@
         <!-- 父问题触发值 -->
         <el-form-item
           v-if="form.ParentId"
-          label="父问题触发值"
+          :label="$t('trials:qcCfg:table:parentTriggerValue')"
           prop="ParentTriggerValue"
         >
           <el-select
@@ -76,27 +81,47 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="是否必填">
-          <el-radio-group v-model="form.IsRequired">
-            <el-radio :label="true">是</el-radio>
-            <el-radio :label="false">否</el-radio>
+        <!-- 是否必填 -->
+        <el-form-item :label="$t('trials:qcCfg:table:isRequired')">
+          <el-radio-group
+            v-model="form.IsRequired"
+          >
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :key="`IsRequired${item.value}`"
+              :label="item.value"
+            >
+              {{ item.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="启用状态">
-          <el-radio-group v-model="form.IsEnable">
-            <el-radio :label="true">启用</el-radio>
-            <el-radio :label="false">停用</el-radio>
+        <!-- 启用状态 -->
+        <el-form-item :label="$t('trials:qcCfg:table:isEnable')">
+          <el-radio-group
+            v-model="form.IsEnable"
+          >
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :key="item.value"
+              :label="item.value"
+            >
+              {{ item.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item label="序号" prop="ShowOrder">
+        <el-form-item :label="$t('trials:qcCfg:table:order')" prop="ShowOrder">
           <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0" />
         </el-form-item>
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+        {{ $t('common:button:save') }}
+      </el-button>
     </template>
   </base-model>
 </template>
@@ -128,7 +153,8 @@ export default {
       } else {
         var arr = value.split('|')
         if (new Set(arr).size !== arr.length) {
-          callback(new Error('选项不允许存在相同值'))
+          // '选项不允许存在相同值'
+          callback(new Error(this.$t('trials:qcCfg:message:msg1')))
         } else {
           callback()
         }
@@ -138,13 +164,13 @@ export default {
       btnLoading: false,
       form: formDataDefault(),
       rules: {
-        QuestionName: [{ required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 300, message: 'The maximum length is 300' }],
-        TypeValue: [{ required: true, message: 'Please specify', trigger: 'blur' },
+        QuestionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 300, message: `${this.$t('common:ruleMessage:maxLength')} 300` }],
+        TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           { validator: validateTypeVal, trigger: 'blur' },
-          { max: 200, message: 'The maximum length is 200' }],
-        ParentTriggerValue: [{ required: true, message: 'Please select', trigger: 'blur' }],
-        LanguageType: [{ required: true, message: 'Please select', trigger: 'blur' }]
+          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
+        ParentTriggerValue: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        LanguageType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }]
       },
       model_cfg: { visible: false, showClose: true, width: '600px', title: '' },
       parentOptions: [],
@@ -185,7 +211,7 @@ export default {
           this.btnLoading = true
           addOrUpdateQCQuestionConfigure(this.form).then(res => {
             this.btnLoading = false
-            this.$message.success('Saved successfully!')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
             // this.$refs['qcQuestionForm'].resetFields()
             this.model_cfg.visible = false
             this.$emit('getList')

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

@@ -3,7 +3,8 @@
     <!-- 搜索框 -->
     <div class="search">
       <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="问题名称:">
+        <!-- 问题名称 -->
+        <el-form-item :label="$t('trials:qcCfg:table:questionName')">
           <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
         </el-form-item>
         <!-- 语言类型 -->
@@ -22,7 +23,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="类型:">
+        <el-form-item :label="$t('trials:qcCfg:table:type')">
           <el-input v-model="searchData.Type" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
@@ -45,9 +46,9 @@
           type="primary"
           @click="preview.visible = true"
         >
-          Preview
+          {{$t('common:button:preview')}}
         </el-button>
-        <el-button type="primary" size="mini" @click="handleAdd">New</el-button>
+        <el-button type="primary" size="mini" @click="handleAdd">{{$t('common:button:new')}}</el-button>
       </span>
     </div>
 
@@ -59,14 +60,16 @@
       size="small"
       height="100"
     >
+      <!-- 序号 -->
       <el-table-column
         prop="ShowOrder"
-        label="序号"
+        :label="$t('trials:qcCfg:table:order')"
         min-width="70"
       />
+      <!-- 问题名称 -->
       <el-table-column
         prop="QuestionName"
-        label="问题名称"
+        :label="$t('trials:qcCfg:table:questionName')"
         show-overflow-tooltip
       />
       <!-- 审核问题 -->
@@ -79,68 +82,73 @@
           {{ $fd('LanguageType', scope.row.LanguageType) }}
         </template>
       </el-table-column>
+      <!-- 类型 -->
       <el-table-column
         prop="Type"
-        label="类型"
+        :label="$t('trials:qcCfg:table:type')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          {{ scope.row.Type=== 'radio'?'单选框':scope.row.Type=== 'select'?'下拉框':scope.row.Type=== 'input'?'文本框':scope.row.Type=== 'textarea'?'多行文本框':'' }}
+          {{ $fd('QcType', scope.row.Type) }}
         </template>
       </el-table-column>
+      <!-- 选项 -->
       <el-table-column
         prop="TypeValue"
-        label="选项"
+        :label="$t('trials:qcCfg:table:typeValue')"
         show-overflow-tooltip
         min-width="110"
       />
+      <!-- 父问题 -->
       <el-table-column
         prop="ParentShowOrder"
-        label="父问题"
+        :label="$t('trials:qcCfg:table:parentQs')"
         show-overflow-tooltip
         min-width="110"
       />
+      <!-- 父问题触发值 -->
       <el-table-column
         prop="ParentTriggerValue"
-        label="父问题触发值"
+        :label="$t('trials:qcCfg:table:parentTriggerValue')"
         show-overflow-tooltip
         min-width="110"
       />
-
+      <!-- 是否必填 -->
       <el-table-column
         prop="IsRequired"
-        label="是否必填"
+        :label="$t('trials:qcCfg:table:isRequired')"
         min-width="90"
       >
         <template slot-scope="scope">
-          {{ scope.row.IsRequired?'是':'否' }}
+          {{ $fd('YesOrNo', scope.row.IsRequired) }}
         </template>
       </el-table-column>
+      <!-- 启用状态 -->
       <el-table-column
         prop="IsEnable"
-        label="启用状态"
+        :label="$t('trials:qcCfg:table:isEnable')"
         min-width="120"
       >
         <template slot-scope="scope">
-          {{ scope.row.IsEnable?'启用':'停用' }}
+          {{ $fd('YesOrNo', scope.row.IsEnable) }}
         </template>
       </el-table-column>
 
-      <el-table-column label="Action" width="200" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
             type="primary"
             size="mini"
             @click="handleEdit(scope.row)"
           >
-            Edit
+            {{ $t('common:button:edit') }}
           </el-button>
           <el-button
             type="danger"
             size="mini"
             @click="handleDelete(scope.row)"
           >
-            Delete
+            {{ $t('common:button:delete') }}
           </el-button>
 
         </template>

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

@@ -10,7 +10,8 @@
   >
     <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
       <div style="height: 150px;">
-        <el-form-item label="类型" prop="Type">
+        <!-- 类型 -->
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
           <el-select
             v-model="form.Type"
             @change="((val)=>{qsTypeChange(val, form)})"
@@ -24,9 +25,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 问题名称 -->
         <el-form-item
           v-if="form.Type !== 'group'"
-          label="问题名称"
+          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
           prop="QuestionName"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
@@ -37,9 +39,10 @@
             v-model="form.QuestionName"
           />
         </el-form-item>
+        <!-- 问题名称（EN） -->
         <el-form-item
           v-if="form.Type !== 'group'"
-          label="问题名称（EN）"
+          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
           prop="QuestionEnName"
           :rules="[
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
@@ -51,8 +54,10 @@
         </el-form-item>
       </div>
       <div style="flex: 1;overflow-y:auto;">
-        <el-divider content-position="left">公有属性</el-divider>
-        <el-form-item v-if="form.Type !== 'group'" label="是否显示" prop="ShowQuestion">
+        <!-- 公有属性 -->
+        <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+        <!-- 是否显示 -->
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:isShow')" prop="ShowQuestion">
           <el-radio-group
             v-model="form.ShowQuestion"
             @change="((val)=>{isShowQuestionChange(val, form)})"
@@ -70,7 +75,7 @@
         <!-- 显示时依赖父问题 -->
         <el-form-item
           v-if="form.Type !== 'group' && form.ShowQuestion===1"
-          label="显示依赖父问题"
+          :label="$t('trials:readingUnit:qsList:title:parentId')"
           prop="ParentId"
         >
           <el-select
@@ -87,7 +92,7 @@
           </el-select>
         </el-form-item>
         <!-- 显示时依赖父问题触发值 -->
-        <el-form-item v-if="form.ParentId && form.ShowQuestion===1" label="显示触发值" prop="ParentTriggerValueList">
+        <el-form-item v-if="form.ParentId && form.ShowQuestion===1" :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')"  prop="ParentTriggerValueList">
           <el-select v-model="form.ParentTriggerValueList" clearable multiple>
             <el-option
               v-for="item of parentTriggerValOptions"
@@ -97,7 +102,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'" label="是否必填" prop="IsRequired">
+        <!-- 是否必填 -->
+        <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'" :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
           <el-radio-group
             v-model="form.IsRequired"
             :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
@@ -112,10 +118,10 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <!-- 父问题 -->
+        <!-- 必填依赖父问题 -->
         <el-form-item
           v-if="form.Type !== 'group' && form.IsRequired === 1"
-          label="必填依赖父问题"
+          :label="$t('trials:readingUnit:qsList:title:relevanceId')"
           prop="RelevanceId"
         >
           <el-select
@@ -131,10 +137,10 @@
             />
           </el-select>
         </el-form-item>
-        <!-- 必填依赖的父问题触发值 -->
+        <!-- 必填触发值 -->
         <el-form-item
           v-if="form.RelevanceId && form.IsRequired === 1"
-          label="必填触发值"
+          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
           prop="RelevanceValueList"
         >
           <el-select v-model="form.RelevanceValueList" clearable multiple>
@@ -182,8 +188,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <!-- 限制编辑 -->
         <el-form-item 
-          label="限制编辑" 
+          :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
           v-if="form.Type !== 'summary'"
           prop="LimitEdit"
           :rules="[
@@ -194,9 +201,10 @@
             <el-radio v-for="item of $d.LimitEdit" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <!-- 问题标识 -->
         <el-form-item
           v-if="form.Type !== 'group' && form.Type !== 'summary'"
-          label="问题标识"
+          :label="$t('dictionary:template:criterionConfig:table:questionMark')"
           prop="QuestionMark"
         >
           <el-select
@@ -211,14 +219,16 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 注释 -->
         <el-form-item
-          label="注释"
+          :label="$t('trials:readingUnit:qsList:title:Remark')"
           prop="Remark"
         >
           <el-input v-model="form.Remark" />
         </el-form-item>
+        <!-- 序号 -->
         <el-form-item 
-          label="序号" 
+          :label="$t('trials:readingUnit:qsList:title:order')" 
           prop="ShowOrder"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -230,7 +240,8 @@
             :min="0"
           />
         </el-form-item>
-        <el-form-item label="重复出现最大次数" v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
+        <!-- 重复出现最大次数 -->
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:maxRowCount')" v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
           <el-input-number
             v-model="form.MaxRowCount"
             controls-position="right"
@@ -238,7 +249,8 @@
             :max="10"
           />
         </el-form-item>
-        <el-form-item label="问题分类" v-if="criterionType === 2">
+        <!-- 问题分类 -->
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')" v-if="criterionType === 2">
           <el-select v-model="form.QuestionClassify" clearable>
             <el-option
               v-for="item of $d.QuestionClassify"
@@ -248,15 +260,15 @@
             />
           </el-select>
         </el-form-item>
-        
-        <el-divider content-position="left">私有属性</el-divider>
+        <!-- 私有属性 -->
+        <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
         <!-- 选项类型 -->
         <el-form-item
           v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
-          label="选项类型"
+          :label="$t('trials:readingUnit:label:QuestionGenre')"
           prop="TableQuestionType"
           :rules="[
-            { required: form.Type !== 'input', message: '请选择'}
+            { required: form.Type !== 'input', message: this.$t('common:ruleMessage:select')}
           ]"
         >
           <el-radio-group
@@ -273,21 +285,22 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-
+        <!-- 选项 -->
         <el-form-item
           v-if="form.TableQuestionType === 0  || form.Type === 'class'"
-          label="选项"
+          :label="$t('trials:qcCfg:table:typeValue')"
           prop="TypeValue"
         >
           <el-input
             v-model="form.TypeValue"
-            placeholder="选项请用‘|’分割多个选项"
+            :placeholder="$t('trials:qcCfg:message:typeValue')"
             @change="typeValueChange"
           />
         </el-form-item>
+        <!-- 关联问题 -->
         <el-form-item
           v-if="form.TableQuestionType === 2"
-          label="关联问题"
+          :label="$t('dictionary:template:criterionConfig:table:dependParentId')"
           prop="DependParentId"
         >
           <el-select
@@ -301,9 +314,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 关联字段 -->
         <el-form-item
           v-if="form.TableQuestionType === 1 || !!form.DependParentId"
-          label="关联字段"
+          :label="$t('dictionary:template:criterionConfig:table:dataTableColumn')"
           prop="DataTableColumn"
         >
           <el-select v-model="form.DataTableColumn">
@@ -315,9 +329,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 关联字典 -->
         <el-form-item
           v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2"
-          label="关联字典"
+          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')"
           prop="DictionaryCode"
           :rules="[{ required: form.TableQuestionType === 3, message: '请选择', trigger: 'blur' }]"
         >
@@ -330,7 +345,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="form.TableQuestionType === 3" label="默认值">
+        <!-- 默认值 -->
+        <el-form-item v-if="form.TableQuestionType === 3" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
           <el-select v-model="form.DefaultValue" clearable>
             <!-- <el-option
               v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
@@ -346,7 +362,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="form.TableQuestionType === 0" label="默认值">
+        <!-- 默认值 -->
+        <el-form-item v-if="form.TableQuestionType === 0" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
           <el-select v-model="form.DefaultValue" clearable>
             <el-option
               v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
@@ -356,7 +373,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
+        <!-- 高亮标记值 -->
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
               <el-option
@@ -382,9 +400,10 @@
             </template>
           </el-select>
         </el-form-item>
+        <!-- 最大长度 -->
         <el-form-item 
           v-if="form.Type === 'input' || form.Type === 'textarea'"
-          label="最大长度"
+          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
           prop="MaxAnswerLength"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
@@ -408,10 +427,10 @@
         <!-- 数值类型 -->
         <el-form-item
           v-if="form.Type === 'number' || form.Type === 'calculation'"
-          label="数值类型"
+          :label="$t('trials:readingUnit:qsList:title:valueType')"
           prop="ValueType"
           :rules="[
-            { required: true, message: '请选择'}
+            { required: true, message: this.$t('common:ruleMessage:select') }
           ]"
         >
           <el-radio-group
@@ -427,10 +446,10 @@
           </el-radio-group>
         </el-form-item>
 
-        <!-- 数值单位 -->
+        <!-- 单位 -->
         <el-form-item
           v-if="form.Type === 'number' || form.Type === 'calculation'"
-          label="单位"
+          :label="$t('trials:readingUnit:qsList:title:unit')"
           prop="Unit"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -448,9 +467,10 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
+        <!-- 最大上传个数 -->
         <el-form-item 
           v-if="form.Type === 'upload'" 
-          label="最大上传个数"
+          :label="$t('trials:readingUnit:qsList:title:imageCount')"
           prop="ImageCount"
         >
           <el-input-number
@@ -463,7 +483,7 @@
         <!-- 文件类型 -->
         <el-form-item 
           v-if="form.Type === 'upload'" 
-          label="文件类型"
+          :label="$t('trials:readingUnit:qsList:title:FileType')"
           prop="FileType"
           :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
         >
@@ -487,9 +507,10 @@
           </el-checkbox-group>
         </el-form-item>
         <!-- 分类 -->
+        <!-- 分类数据来源 -->
         <el-form-item
           v-if="form.Type === 'class'"
-          label="分类数据来源"
+          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')"
           prop="ClassifyTableQuestionId"
         >
           <el-select v-model="form.ClassifyTableQuestionId" clearable>
@@ -497,9 +518,10 @@
                       :value="item.Id"/>
           </el-select>
         </el-form-item>
+        <!-- 分类算法 -->
         <el-form-item
           v-if="form.Type === 'class'"
-          label="分类算法"
+          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')"
           prop="ClassifyAlgorithms"
         >
           <div>
@@ -598,7 +620,7 @@ export default {
       } else {
         var arr = value.split('|')
         if (new Set(arr).size !== arr.length) {
-          callback(new Error('选项不允许存在相同值'))
+          callback(new Error(this.$t('trials:readingUnit:qsList:message:msg0')))
         } else {
           callback()
         }
@@ -649,26 +671,26 @@ export default {
       },
       rules: {
         Type: [
-          { required: true, message: '请选择', trigger: 'blur' }
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
         ],
         // QuestionName: [{ required: true, message: '请注明', trigger: 'blur' },
         //   { max: 300, message: '最大长度为 300' }],
 
-        TypeValue: [{ required: true, message: '请注明', trigger: 'blur' },
+        TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           { validator: validateTypeVal, trigger: 'blur' },
-          { max: 200, message: '最大长度为 200' }],
-        ShowQuestion: [{ required: true, message: '请选择', trigger: 'blur' }],
-        IsRequired: [{ required: true, message: '请选择', trigger: 'blur' }],
-        ParentId: [{ required: true, message: '请选择', trigger: 'blur' }],
+          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
+        ShowQuestion: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        IsRequired: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        ParentId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         ParentTriggerValueList: [
-          { required: true, message: '请选择', trigger: 'blur' }
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
         ],
-        RelevanceId: [{ required: true, message: '请选择', trigger: 'blur' }],
-        RelevanceValueList: [{ required: true, message: '请选择', trigger: 'blur' }],
-        DataTableName: [{ required: true, message: '请选择', trigger: 'blur' }],
-        DataTableColumn: [{ required: true, message: '请选择', trigger: 'blur' }],
+        RelevanceId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        RelevanceValueList: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        DataTableName: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
+        DataTableColumn: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         // DictionaryCode: [{ required: true, message: '请选择', trigger: 'blur' }],
-        DependParentId: [{ required: true, message: '请选择', trigger: 'blur' }],
+        DependParentId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         // ExportIdentification: [
         //   { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
         // ],

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

@@ -10,7 +10,7 @@
         type="primary"
         @click="handleAdd"
       >
-        新增
+        {{$t('common:button:new')}}
       </el-button>
 
     </div>
@@ -20,24 +20,28 @@
       size="small"
       height="500"
     >
+      <!-- 序号 -->
       <el-table-column
         prop="ShowOrder"
-        label="序号"
+        :label="$t('trials:qcCfg:table:order')"
         min-width="70"
       />
+      <!-- 问题名称 -->
       <el-table-column
         prop="QuestionName"
-        label="问题名称"
+        :label="$t('trials:readingUnit:qsList:title:qsName')"
         show-overflow-tooltip
       />
+      <!-- 问题名称(EN) -->
       <el-table-column
         prop="QuestionEnName"
-        label="问题名称(EN)"
+        :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
         show-overflow-tooltip
       />
+      <!-- 类型 -->
       <el-table-column
         prop="Type"
-        label="类型"
+        :label="$t('trials:readingUnit:qsList:title:type')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -61,9 +65,10 @@
         min-width="110"
       />
        -->
+      <!-- 是否显示 -->
       <el-table-column
         prop="ShowQuestion"
-        label="是否显示"
+        :label="$t('trials:readingUnit:qsList:title:isShow')"
         min-width="90"
         show-overflow-tooltip
       >
@@ -71,9 +76,10 @@
           {{ $fd('ShowQuestion',scope.row.ShowQuestion) }}
         </template>
       </el-table-column>
+      <!-- 是否必填 -->
       <el-table-column
         prop="IsRequired"
-        label="是否必填"
+        :label="$t('trials:readingUnit:qsList:title:isRequired')"
         min-width="90"
         show-overflow-tooltip
       >
@@ -125,7 +131,7 @@
       <!-- 问题标识 -->
       <el-table-column
         prop="QuestionMark"
-        label="问题标识"
+        :label="$t('dictionary:template:criterionConfig:table:questionMark')"
         width="140"
         show-overflow-tooltip
       >
@@ -178,9 +184,10 @@
         </template>
       </el-table-column>
        -->
+      <!-- 最大行数 -->
       <el-table-column
         prop="MaxRowCount"
-        label="最大行数"
+        :label="$t('trials:readingUnit:qsList:title:MaxRowCount')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -190,7 +197,7 @@
 
       <el-table-column
         prop=""
-        label="操作"
+        :label="$t('common:action:action')"
         width="150"
         show-overflow-tooltip
       >
@@ -201,7 +208,7 @@
             size="mini"
             @click="handleLook(scope.row)"
           >
-            查看
+            {{ $t('trials:readingPeriod:button:view') }}
           </el-button>
           <el-button
             v-if="!isCompleteConfig"
@@ -209,7 +216,7 @@
             size="mini"
             @click="handleEdit(scope.row)"
           >
-            编辑
+            {{ $t('common:button:edit') }}
           </el-button>
           <el-button
             v-if="!isCompleteConfig"
@@ -217,7 +224,7 @@
             size="mini"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -295,7 +302,7 @@ export default {
     handleLook(row) {
       this.type = 'look'
       this.rowData = { ...row }
-      this.addOrEdit.title = '编辑'
+      this.addOrEdit.title = this.$t('common:button:edit')
       this.addOrEdit.visible = true
     },
     getList() {
@@ -308,13 +315,13 @@ export default {
     handleAdd() {
       this.type = 'add'
       this.rowData = {}
-      this.addOrEdit.title = '添加'
+      this.addOrEdit.title = this.$t('common:button:new')
       this.addOrEdit.visible = true
     },
     handleEdit(row) {
       this.type = 'edit'
       this.rowData = { ...row }
-      this.addOrEdit.title = '编辑'
+      this.addOrEdit.title = this.$t('common:button:edit')
       this.addOrEdit.visible = true
     },
     handleDelete(row) {
@@ -329,7 +336,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.getList()
-                this.$message.success('删除成功！')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })

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

@@ -79,7 +79,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/template/index.vue

@@ -1,31 +1,40 @@
 <template>
   <div class="question-wrapper">
     <el-tabs v-model="activeTab" @tab-click="clickTab">
-      <el-tab-pane label="QC问题配置" name="qc">
+      <!-- QC问题配置 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:qcConfig')" name="qc">
         <qc-questions v-if="activeTab == 'qc'" />
       </el-tab-pane>
-      <el-tab-pane label="阅片标准配置" name="criterions">
+      <!-- 阅片标准配置 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:criterionsConfig')" name="criterions">
         <criterions-tmp v-if="activeTab == 'criterions'" />
       </el-tab-pane>
-      <el-tab-pane label="临床数据配置" name="clinicalData">
+      <!-- 临床数据配置 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:clinicalDataConfig')" name="clinicalData">
         <clinical-data v-if="activeTab == 'clinicalData'" />
       </el-tab-pane>
-      <el-tab-pane label="医学审核问题配置" name="medicalAudit">
+      <!-- 医学审核问题配置 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:medicalConfig')" name="medicalAudit">
         <medical-audit v-if="activeTab == 'medicalAudit'" />
       </el-tab-pane>
-      <el-tab-pane label="DICOM字段匿名化配置" name="anonymization">
+      <!-- DICOM字段匿名化配置 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:dicomTagConfig')" name="anonymization">
         <Anonymization v-if="activeTab == 'anonymization'" />
       </el-tab-pane>
-      <el-tab-pane label="DICOM字段新增配置" name="increasefields">
+      <!-- DICOM字段新增配置 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:dicomTagAddConfig')" name="increasefields">
         <IncreaseFields v-if="activeTab == 'increasefields'" />
       </el-tab-pane>
-      <el-tab-pane label="邮件管理" name="email">
+      <!-- 邮件管理 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:emailConfig')" name="email">
         <Email v-if="activeTab == 'email'" />
       </el-tab-pane>
-      <el-tab-pane label="签名管理" name="sign">
+      <!-- 签名管理 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:signConfig')" name="sign">
         <Sign v-if="activeTab == 'sign'" />
       </el-tab-pane>
-      <el-tab-pane label="浏览器推荐" name="browser">
+      <!-- 浏览器推荐 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:browserConfig')" name="browser">
         <Browser v-if="activeTab == 'browser'" />
       </el-tab-pane>
     </el-tabs>

src/views/forgetpassword/index.vue

@@ -419,7 +419,7 @@ export default {
 }
 </style>
 <style scoped>
-/*/deep/ .is-error{*/
+/*::v-deep .is-error{*/
 /*  margin-bottom: 40px;*/
 /*}*/
 .is-error.my_new_pwd {

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

@@ -220,7 +220,7 @@ export default {
     border-radius: 10px;
     background: #d0d0d0;
   }
-  /deep/ .el-card__body {
+  ::v-deep .el-card__body {
     padding: 0px;
   }
 }
@@ -234,7 +234,7 @@ export default {
   width: 220px;
   height: 100%;
 
-  /deep/ .el-card__body {
+  ::v-deep .el-card__body {
     height: 100%;
     width: 100%;
     display: flex;
@@ -254,13 +254,13 @@ export default {
     overflow-y: auto;
   }
 
-  // /deep/ .el-tabs{
+  // ::v-deep .el-tabs{
   //   height: 100%;
   // }
-  // /deep/ .el-tabs__header{
+  // ::v-deep .el-tabs__header{
   //   height: 40px;
   // }
-  // /deep/ .el-tabs__content{
+  // ::v-deep .el-tabs__content{
   //   flex: 1;
   //   overflow-y: auto;
   //   padding: 0;
@@ -299,7 +299,7 @@ export default {
   flex: 1;
   height: 100%;
   margin-left: 10px;
-  /deep/ .el-card__body {
+  ::v-deep .el-card__body {
     height: 100%;
     width: 100%;
   }

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

@@ -271,7 +271,7 @@ export default {
     padding: 5px 20px;
     margin-top: 5px;
     background: #fff;
-    /deep/.el-form-item {
+    ::v-deep.el-form-item {
       padding-bottom: 20px;
       
     }
@@ -285,10 +285,10 @@ export default {
     }
   }
   .form-label-width{
-    /deep/.el-form-item__label{
+    ::v-deep.el-form-item__label{
       width: 140px;
     }
-    /deep/.el-form-item__content{
+    ::v-deep.el-form-item__content{
       margin-left: 140px;
     }
   }
@@ -297,7 +297,7 @@ export default {
     text-align: center;
   }
 
-  /deep/.el-form-item {
+  ::v-deep.el-form-item {
     margin-bottom: 0px;
     padding-top: 5px;
     border-bottom: 1px solid #f5f7fa;

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

@@ -156,7 +156,7 @@ export default {
 <style lang="scss" scoped>
 .equipment_form_content{
   padding: 0 10px;
-  /deep/.el-form-item {
+  ::v-deep.el-form-item {
     margin-bottom: 0px;
     padding: 5px 0 20px 0;
     border-bottom: 1px solid #f5f7fa;

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

@@ -292,7 +292,7 @@ export default {
 <style lang="scss" scoped>
 .participants_form_content{
   padding: 0 10px;
-  /deep/.el-form-item {
+  ::v-deep.el-form-item {
      margin-bottom: 0px;
     padding: 5px 0 20px 0;
     border-bottom: 1px solid #f5f7fa;

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

@@ -306,7 +306,7 @@ export default {
 <style lang="scss" scoped>
 .participants_form_content{
   padding: 0 10px;
-  /deep/.el-form-item {
+  ::v-deep.el-form-item {
     margin-bottom: 0px;
     padding: 5px 0 20px 0;
     border-bottom: 1px solid #f5f7fa;

src/views/research-mobile/login.vue

@@ -375,7 +375,7 @@ export default {
     padding: 5px 20px;
     margin-top: 5px;
     background: #fff;
-    /deep/.el-form-item {
+    ::v-deep.el-form-item {
       padding-bottom: 20px;
     }
   }
@@ -392,7 +392,7 @@ export default {
     text-align: center;
   }
 
-  /deep/.el-form-item {
+  ::v-deep.el-form-item {
     margin-bottom: 0px;
     padding-top: 5px;
     border-bottom: 1px solid #f5f7fa;

src/views/research/components/ResearchForm.vue

@@ -95,7 +95,7 @@
       </el-form>
     </el-dialog>
 
-    <el-dialog
+    <!-- <el-dialog
       :visible.sync="historyVisible"
       :custom-class="isFullscreen?'full-dialog-container':'dialog-container'"
       :close-on-click-modal="false"
@@ -119,7 +119,7 @@
           :site-id="siteId"
         />
       </div>
-    </el-dialog>
+    </el-dialog> -->
 
   </div>
 </template>
@@ -129,10 +129,10 @@ import BaseInfo from './BaseInfo'
 import HistoricalParticipant from './HistoricalParticipant'
 import ParticipantList from './ParticipantList'
 import EquipmentList from './EquipmentList'
-import HistoricalRecord from './HistoricalRecord'
+// import HistoricalRecord from './HistoricalRecord'
 export default {
   name: 'QuestionForm',
-  components: { BaseInfo, HistoricalParticipant, ParticipantList, EquipmentList, HistoricalRecord },
+  components: { BaseInfo, HistoricalParticipant, ParticipantList, EquipmentList },
   props: {
     trialSiteSurveyId: {
       type: String,
@@ -312,10 +312,10 @@ export default {
     handleBack() {
       this.$router.push({ path: `/researchLogin?trialId=${this.trialId}&lang=${this.$i18n.locale}` })
     },
-    handleHistory() {
-      this.isFullscreen = false
-      this.historyVisible = true
-    }
+    // handleHistory() {
+    //   this.isFullscreen = false
+    //   this.historyVisible = true
+    // }
   }
 }
 </script>
@@ -338,19 +338,19 @@ export default {
     padding-bottom: 20px;
     overflow-y: auto;
   }
-  >>>.el-card__body{
+  ::v-deep .el-card__body{
     padding: 10px;
   }
   // >>>.el-dialog__body{
   //   padding: 10px 20px 20px 20px;
   // }
 
-  >>>.full-dialog-container{
+  ::v-deep .full-dialog-container{
    .el-dialog__body{
       height: calc(100% - 80px);
     }
   }
-  >>>.dialog-container{
+  ::v-deep .dialog-container{
     // margin-top: 50px !important;
     width:75%;
     height:80%;

src/views/research/form.vue

@@ -387,19 +387,19 @@ export default {
     padding-bottom: 20px;
     overflow-y: auto;
   }
-  /deep/.el-card__body{
+  ::v-deep.el-card__body{
     padding: 10px;
   }
   // >>>.el-dialog__body{
   //   padding: 10px 20px 20px 20px;
   // }
 
-  /deep/.full-dialog-container{
+  ::v-deep.full-dialog-container{
    .el-dialog__body{
       height: calc(100% - 80px);
     }
   }
-  /deep/.dialog-container{
+  ::v-deep.dialog-container{
     // margin-top: 50px !important;
     width:75%;
     height:80%;

src/views/resumeInfo/index.vue

@@ -206,7 +206,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/reviewers/ReviewersResearchForm.vue

@@ -124,7 +124,7 @@ export default {
 .el-tabs{
   height: 100%;
   .el-tabs__content{
-    height: calc(100%-50px);
+    height: calc(100% - 50px);
     overflow-y: auto;
   }
 }

src/views/reviewers/components/BasicInfo.vue

@@ -140,7 +140,9 @@
               >
                 <el-input
                   v-model="basicInfo.EMail"
-                  :disabled="$route.query.ReviewStatus === '1'"
+                  :disabled="
+                    $route.query.ReviewStatus === '1' || basicInfo.IsHaveAccount
+                  "
                   size="small"
                   :maxlength="400"
                 />

src/views/reviewers/edit.vue

@@ -163,7 +163,7 @@ export default {
 .el-tabs {
   height: 100%;
   .el-tabs__content {
-    height: calc(100%-50px);
+    height: calc(100% - 50px);
     overflow-y: auto;
   }
 }

src/views/reviewers/new.vue

@@ -187,7 +187,7 @@ export default {
 .el-tabs {
   height: 100%;
   .el-tabs__content {
-    height: calc(100%-50px);
+    height: calc(100% - 50px);
     overflow-y: auto;
   }
 }

src/views/system/log/index.vue

@@ -8,7 +8,10 @@
         <el-form-item :label="$t('system:log:table:versionUS')" prop="Version">
           <el-input v-model="searchData.Version_US" size="small" clearable />
         </el-form-item>
-        <el-form-item label="更新功能" prop="UpdateContent">
+        <el-form-item
+          :label="$t('system:log:table:UpdateContent')"
+          prop="UpdateContent"
+        >
           <el-input v-model="searchData.UpdateContent" size="small" clearable />
         </el-form-item>
         <el-form-item>
@@ -18,7 +21,7 @@
             size="mini"
             @click="getList"
           >
-            查询
+            {{ $t('common:button:search') }}
           </el-button>
           <el-button
             type="primary"
@@ -26,7 +29,7 @@
             size="mini"
             @click="handleAdd"
           >
-            新增
+            {{ $t('common:button:new') }}
           </el-button>
         </el-form-item>
       </el-form>

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

@@ -69,6 +69,7 @@ export default {
         'LastName',
         'EMail',
         'Phone',
+        'Status',
         'OrganizationName',
         'PositionName',
         'DepartmentName',
@@ -92,6 +93,9 @@ export default {
             value: obj[key],
             prop: key,
           }
+          if (key === 'Status') {
+            o.value = this.$fd('IsUserEnable', obj[key])
+          }
           curData.push(o)
         }
       })

src/views/system/user/list/index.vue

@@ -526,7 +526,7 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-/deep/ .box-body .search .base-search-form .el-form-item {
+::v-deep .box-body .search .base-search-form .el-form-item {
   margin-bottom: 15px;
 }
 </style>

src/views/test/GridLayout.vue

@@ -0,0 +1,105 @@
+<template>
+  <div class="grid-container" :style="gridStyle">
+    <div
+      v-for="(cell, index) in cells"
+      :key="index"
+      class="grid-cell"
+      :style="cellStyle"
+      @dblclick="toggleFullScreen(index)"
+    >
+      <div v-if="fullScreenIndex === index" class="full-screen">
+        <div class="content">
+          <canvas class="canvas" :ref="`canvas-${fullScreenIndex}`"></canvas>
+          <!-- 这里可以放置单元格的内容 -->
+          <!-- Cell {{ index + 1 }} -->
+          <!-- <button @click="toggleFullScreen(null)">Exit Full Screen</button> -->
+        </div>
+      </div>
+      <div v-else class="content">
+        <!-- Cell {{ index + 1 }} -->
+        <canvas class="canvas" :ref="`canvas-${index}`"></canvas>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    rows: {
+      type: Number,
+      default: 1,
+    },
+    cols: {
+      type: Number,
+      default: 1,
+    },
+  },
+  data() {
+    return {
+      fullScreenIndex: null,
+    };
+  },
+  computed: {
+    gridStyle() {
+      return {
+        display: 'grid',
+        gridTemplateRows: `repeat(${this.rows}, 1fr)`,
+        gridTemplateColumns: `repeat(${this.cols}, 1fr)`,
+        height: '100vh',
+        width: '100vw',
+      };
+    },
+    cellStyle() {
+      return {
+        border: '1px solid #ccc',
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+      };
+    },
+    cells() {
+      return Array(this.rows * this.cols).fill(0);
+    },
+  },
+  methods: {
+    toggleFullScreen(index) {
+      this.fullScreenIndex = this.fullScreenIndex === index ? null : index;
+    },
+  },
+};
+</script>
+
+<style scoped>
+.grid-container {
+  display: grid;
+  height: 100vh;
+  width: 100vw;
+}
+
+.grid-cell {
+  border: 1px solid #ccc;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.full-screen {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  background: white;
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.content {
+  /* text-align: center; */
+  width: 100%;
+  height: 100%;
+}
+</style>

src/views/test/index.vue

@@ -0,0 +1,25 @@
+<template>
+  <div>
+    <!-- <label>行数: </label>
+    <input v-model.number="rows" type="number" min="1" max="3" />
+    <label>列数: </label>
+    <input v-model.number="cols" type="number" min="1" max="3" /> -->
+    <GridLayout :rows="rows" :cols="cols" />
+  </div>
+</template>
+
+<script>
+import GridLayout from './GridLayout.vue';
+
+export default {
+  components: {
+    GridLayout,
+  },
+  data() {
+    return {
+      rows: 2,
+      cols: 2,
+    };
+  },
+};
+</script>

src/views/trials/components/newSignForm.vue

@@ -158,7 +158,7 @@ export default {
     // border: 1px solid #e0e0e0;
     max-height: 650px;
     overflow-y: auto;
-    // /deep/ .el-form-item__label{
+    // ::v-deep .el-form-item__label{
     //   color: #fff;
     // }
   }

src/views/trials/trials-layout/components/noticeMarquee.vue

@@ -73,10 +73,10 @@ export default {
   width: 100%;
   display: flex;
   align-items: center;
-  /deep/ .el-dialog__header{
+  ::v-deep .el-dialog__header{
     padding: 10px;
   }
-  /deep/ .el-dialog__body{
+  ::v-deep .el-dialog__body{
     padding: 10px 20px;
     line-height: 25px;
   }

src/views/trials/trials-layout/components/trialsMain.vue

@@ -44,7 +44,7 @@ export default {
   overflow: hidden;
   display: flex;
   flex-direction: column;
-  /deep/.el-card__body {
+  ::v-deep.el-card__body {
     padding: 0px;
   }
   .trials-tab{

src/views/trials/trials-layout/index.vue

@@ -29,7 +29,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "~@/styles/mixin.scss";
-@import "~@/styles/variables.scss";
+@import "~@/styles/variables.module.scss";
 
 .trials-wrapper {
   @include clearfix;
@@ -39,10 +39,10 @@ export default {
   .trials-container {
     padding: 10px;
     height: 100%;
-    /deep/ .el-tag {
+    ::v-deep .el-tag {
       background-color: transparent;
     }
-    /deep/ .el-tag--danger {
+    ::v-deep .el-tag--danger {
       color: #f56c6c;
     }
   }

src/views/trials/trials-panel/attachments/reReading-tracking/index.vue

@@ -787,22 +787,22 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-/deep/ .hidden-row{
+::v-deep .hidden-row{
   display: none;
 }
-/deep/ .el-dialog__body {
+::v-deep .el-dialog__body {
   padding: 15px 20px;
 }
 
-/deep/ .el-tag--danger.el-tag--dark {
+::v-deep .el-tag--danger.el-tag--dark {
   // background-color: #f56c6c!important;
   border-color: none!important;
   // color: #fff!important;
 }
-/deep/ #TaskAllocationRuleList thead .el-checkbox__inner{
+::v-deep #TaskAllocationRuleList thead .el-checkbox__inner{
   display: none;
 }
-/deep/ .el-descriptions-item__label.has-colon:after{
+::v-deep .el-descriptions-item__label.has-colon:after{
   display: none;
 }
 </style>

src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue

@@ -60,7 +60,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/trials/trials-panel/enrolled-reviewers/stats/components/AddWorkload.vue

@@ -11,7 +11,7 @@
       <!-- Expedited -->
       <el-form-item :label="$t('trials:stats:form:expedited')">
         <el-select v-model="trialExpeditedState" disabled>
-          <el-option v-for="item of $d.TrialExpeditedState" :label="item.label" :value="item.value" />
+          <el-option v-for="item of $d.TrialExpeditedState" :key="`trialExpeditedState${item.label}`" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <!-- 展示所有 -->

src/views/trials/trials-panel/reading/ad-review/index.vue

@@ -936,14 +936,14 @@ export default {
     margin: 10px 0;
   }
   .disabled {
-    /deep/ .el-upload--picture-card {
+    ::v-deep .el-upload--picture-card {
       display: none;
     }
   }
-  /deep/ .el-upload-list__item {
+  ::v-deep .el-upload-list__item {
     transition: none !important;
   }
-  /deep/ .el-upload-list__item-thumbnail {
+  ::v-deep .el-upload-list__item-thumbnail {
     /* 图片在方框内显示长边 */
     object-fit: scale-down !important;
   }

src/views/trials/trials-panel/reading/consistency-analysis/index.vue

@@ -1642,22 +1642,22 @@ export default {
   color: #f56c6c;
   font-size: 10px;
 }
-/deep/ .hidden-row {
+::v-deep .hidden-row {
   display: none;
 }
-/deep/ .el-dialog__body {
+::v-deep .el-dialog__body {
   padding: 15px 20px;
 }
 
-/deep/ .el-tag--danger.el-tag--dark {
+::v-deep .el-tag--danger.el-tag--dark {
   // background-color: #f56c6c!important;
   border-color: none !important;
   // color: #fff!important;
 }
-/deep/ #TaskAllocationRuleList thead .el-checkbox__inner {
+::v-deep #TaskAllocationRuleList thead .el-checkbox__inner {
   display: none;
 }
-/deep/ .el-descriptions-item__label.has-colon:after {
+::v-deep .el-descriptions-item__label.has-colon:after {
   display: none;
 }
 </style>

src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue

@@ -1780,7 +1780,18 @@ export default {
             if (seriesIdx > -1) {
               var series = studyList[studyIdx].SeriesList[seriesIdx]
               const frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
-              const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
+              // const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
+              let n = series.instanceInfoList.findIndex(k=>k.Id === instanceId)
+              let filterStr = ''
+              if (n > -1 && series.isExistMutiFrames) {
+                if (series.instanceInfoList[n].NumberOfFrames > 0) {
+                  filterStr = `frame=${frame}&instanceId=${instanceId}`
+                } else {
+                  filterStr = `instanceId=${instanceId}`
+                }
+              } else {
+                filterStr = `instanceId=${instanceId}`
+              }
               var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
               if (instanceIdx > -1) {
                 series.imageIdIndex = instanceIdx
@@ -2782,12 +2793,12 @@ export default {
 
   }
   .personal_config {
-    /deep/ .el-tabs__content{
+    ::v-deep .el-tabs__content{
       height: 450px;
       overflow-y: auto;
     }
   }
-/deep/ .manuals-dialog-container{
+::v-deep .manuals-dialog-container{
   margin-top: 50px !important;
   width:75%;
   height:80%;
@@ -2799,7 +2810,7 @@ export default {
     position: relative;
   }
 }
-/deep/ .manuals-full-dialog-container{
+::v-deep .manuals-full-dialog-container{
   .el-dialog__body{
     padding: 10px;
     height: calc(100% - 50px) !important;
@@ -2816,23 +2827,23 @@ export default {
   background-color: #000000;
 }
 .series-table{
-  /deep/.el-table{
+  ::v-deep.el-table{
     background-color:  #1e1e1e !important;
     color: #dfdfdf;
   }
-  /deep/.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+  ::v-deep.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
     border-bottom: 1px solid #dfdfdf;
   }
   .el-table--border::after, .el-table--group::after, .el-table::before{
     background-color: #1e1e1e;
   }
-  /deep/.el-table__header-wrapper{
+  ::v-deep.el-table__header-wrapper{
       th{
         background-color:  #1e1e1e !important;
         color: #dfdfdf;
       }
     }
-    /deep/.el-table__body-wrapper{
+    ::v-deep.el-table__body-wrapper{
       tr{
         background-color:  #1e1e1e !important;
         color: #dfdfdf;
@@ -2841,7 +2852,7 @@ export default {
         background-color:  #1e1e1e !important;
       }
     }
-    /deep/.el-table__empty-block{
+    ::v-deep.el-table__empty-block{
       background-color:  #1e1e1e !important;
     }
   }

src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue

@@ -319,23 +319,23 @@ export default {
 </script>
 <style lang="scss" scoped>
 .series-table{
-  /deep/.el-table{
+  ::v-deep.el-table{
     background-color:  #1e1e1e !important;
     color: #dfdfdf;
   }
-  /deep/.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+  ::v-deep.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
     border-bottom: 1px solid #dfdfdf;
   }
   .el-table--border::after, .el-table--group::after, .el-table::before{
     background-color: #1e1e1e;
   }
-  /deep/.el-table__header-wrapper{
+  ::v-deep.el-table__header-wrapper{
     th{
       background-color:  #1e1e1e !important;
       color: #dfdfdf;
     }
   }
-  /deep/.el-table__body-wrapper{
+  ::v-deep.el-table__body-wrapper{
     tr{
       background-color:  #1e1e1e !important;
       color: #dfdfdf;
@@ -344,7 +344,7 @@ export default {
       background-color:  #1e1e1e !important;
     }
   }
-  /deep/.el-table__empty-block{
+  ::v-deep.el-table__empty-block{
     background-color:  #1e1e1e !important;
   }
 }

src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue

@@ -346,6 +346,7 @@ import {
   // CONSTANTS,
   setVolumesForViewports,
   volumeLoader,
+  resetInitialization,
   getRenderingEngine,
   eventTarget,
   // eslint-disable-next-line no-unused-vars
@@ -385,7 +386,7 @@ import { mat4, vec3 } from 'gl-matrix'
 import html2canvas from 'html2canvas'
 // import vtkColorTransferFunction from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction'
 // import vtkMath from '@kitware/vtk.js/Common/Core/Math'
-import CircleROITool from './tools/CircleROITool'
+// import CircleROITool from './tools/CircleROITool'
 // import ScaleOverlayTool from './tools/ScaleOverlayTool'
 const { registerColormap, getColormapNames, getColormap } = csUtils.colormap
 const {
@@ -394,15 +395,17 @@ const {
   WindowLevelTool,
   PanTool,
   ZoomTool,
-  StackScrollMouseWheelTool,
+  // StackScrollMouseWheelTool,
+  StackScrollTool,
   synchronizers,
   MIPJumpToClickTool,
-  VolumeRotateMouseWheelTool,
+  // VolumeRotateMouseWheelTool,
+  VolumeRotateTool,
   OrientationMarkerTool,
   // SynchronizerManager,
   // LengthTool,
   EllipticalROITool,
-  // CircleROITool,
+  CircleROITool,
   CrosshairsTool,
   TrackballRotateTool,
   ProbeTool,
@@ -634,9 +637,12 @@ export default {
       this.screenshotWindow.close()
     }
     cornerstoneTools.destroy()
-    eventTarget.reset()
-    cache.purgeCache()
+    // eventTarget.reset()
+    // cache.purgeCache()
+    // renderingEngine.destroy()
+    resetInitialization()
     renderingEngine.destroy()
+    cache.purgeCache()
     imageLoader.unregisterAllImageLoaders()
     ToolGroupManager.destroyToolGroup('volume')
     FusionEvent.$off('getAnnotations')
@@ -953,8 +959,15 @@ export default {
         measureData.frame = 0
         measureData.data = annotation
         measureData.type = metadata.toolName
-        measureData.suvMax = data.cachedStats[`volumeId:${ptVolumeId}`] && data.cachedStats[`volumeId:${ptVolumeId}`].max ? data.cachedStats[`volumeId:${ptVolumeId}`].max.toFixed(this.digitPlaces) : null
-        measureData.modalityUnit = data.cachedStats[`volumeId:${ptVolumeId}`].modalityUnit
+        let obj = null
+        for (let key in data.cachedStats) {
+          if (key.includes(`volumeId:${ptVolumeId}`)) {
+            obj = data.cachedStats[key]
+            break;
+          }
+        }
+        measureData.suvMax = obj && obj.max ? obj.max.toFixed(this.digitPlaces) : null
+        measureData.modalityUnit = obj.modalityUnit
         if (data.remark === 'Liver' || data.remark === 'Mediastinum') {
           this.$refs['questions'].setMeasuredData(measureData)
           this.isNonTargetMeasurement = false
@@ -1046,9 +1059,9 @@ export default {
     setUpToolGroups() {
       cornerstoneTools.addTool(WindowLevelTool)
       cornerstoneTools.addTool(ZoomTool)
-      cornerstoneTools.addTool(StackScrollMouseWheelTool)
+      cornerstoneTools.addTool(StackScrollTool)
       cornerstoneTools.addTool(MIPJumpToClickTool)
-      cornerstoneTools.addTool(VolumeRotateMouseWheelTool)
+      cornerstoneTools.addTool(VolumeRotateTool)
       cornerstoneTools.addTool(EllipticalROITool)
       cornerstoneTools.addTool(CircleROITool)
       cornerstoneTools.addTool(CrosshairsTool)
@@ -1070,7 +1083,7 @@ export default {
       toolGroups.forEach((toolGroup) => {
         toolGroup.addTool(PanTool.toolName)
         toolGroup.addTool(ZoomTool.toolName)
-        toolGroup.addTool(StackScrollMouseWheelTool.toolName)
+        toolGroup.addTool(StackScrollTool.toolName)
         toolGroup.addTool(EllipticalROITool.toolName)
         toolGroup.addTool(CircleROITool.toolName, {
           getTextLines: this.getTextLines
@@ -1083,7 +1096,7 @@ export default {
 
       fusionToolGroup.addTool(PanTool.toolName)
       fusionToolGroup.addTool(ZoomTool.toolName)
-      fusionToolGroup.addTool(StackScrollMouseWheelTool.toolName)
+      fusionToolGroup.addTool(StackScrollTool.toolName)
       fusionToolGroup.addTool(EllipticalROITool.toolName, {
         volumeId: ptVolumeId
       })
@@ -1124,7 +1137,10 @@ export default {
           ]
         })
 
-        toolGroup.setToolActive(StackScrollMouseWheelTool.toolName)
+        // toolGroup.setToolActive(StackScrollTool.toolName)
+        toolGroup.setToolActive(StackScrollTool.toolName, {
+          bindings: [{ mouseButton: MouseBindings.Wheel }],
+        });
         // toolGroup.setToolPassive(EllipticalROITool.toolName)
         if (this.readingTaskState === 2) {
           toolGroup.setToolEnabled(CircleROITool.toolName)
@@ -1189,7 +1205,10 @@ export default {
         mipToolGroup = ToolGroupManager.getToolGroup(mipToolGroupUID)
       }
 
-      mipToolGroup.addTool('VolumeRotateMouseWheel')
+      mipToolGroup.addTool(VolumeRotateTool.toolName)
+      mipToolGroup.setToolActive(VolumeRotateTool.toolName, {
+        bindings: [{ mouseButton: MouseBindings.Wheel }],
+      });
       mipToolGroup.addTool('MIPJumpToClickTool', {
         //
         toolGroupId: ptToolGroupId
@@ -1206,7 +1225,7 @@ export default {
       })
       // As the Stack Scroll mouse wheel is a tool using the `mouseWheelCallback`
       // hook instead of mouse buttons, it does not need to assign any mouse button.
-      mipToolGroup.setToolActive('VolumeRotateMouseWheel')
+      // mipToolGroup.setToolActive('VolumeRotateMouseWheel')
       // mipToolGroup.addTool(OrientationMarkerTool.toolName)
       // mipToolGroup.setToolActive(OrientationMarkerTool.toolName)
       mipToolGroup.addViewport(viewportIds.PETMIP.CORONAL, renderingEngineId)
@@ -1480,9 +1499,10 @@ export default {
       // Set the volumes to load
       this.ptVolume.load()
       this.ctVolume.load()
-      const windowCenter = this.ctVolume.cornerstoneImageMetaData.windowCenter[0]
-      const windowWidth = this.ctVolume.cornerstoneImageMetaData.windowWidth[0]
-      setCtMappingRange(windowWidth, windowCenter)
+      console.log(this.ctVolume.cornerstoneImageMetaData)
+      // const windowCenter = this.ctVolume.cornerstoneImageMetaData.windowCenter[0]
+      // const windowWidth = this.ctVolume.cornerstoneImageMetaData.windowWidth[0]
+      // setCtMappingRange(windowWidth, windowCenter)
       // Set volumes on the viewports
       await setVolumesForViewports(
         renderingEngine,
@@ -2191,7 +2211,7 @@ export default {
       }
     },
     async receiveMsg(event) {
-      console.log(event.data.type)
+      // console.log(event.data.type)
       if (event.data.type === 'readingPageUpdate') {
         // this.$refs['questions'].initList()
         this.$refs['tableQuestions'].initList(true)
@@ -2250,7 +2270,7 @@ export default {
     height: 100%;
     background-color: #000;
     padding: 5px 2px;
-    /deep/.el-dialog {
+    ::v-deep.el-dialog {
       background: #1e1e1e;
       border: 1px solid #ddd;
       color: #ddd;
@@ -2490,7 +2510,7 @@ export default {
 
   }
   .colorBar{
-   /deep/ .el-input--mini .el-input__inner{
+   ::v-deep .el-input--mini .el-input__inner{
       height: 25px;
       line-height: 25px;
       border: none;

src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue

@@ -507,7 +507,7 @@ export default {
   margin-bottom: 0px;
 }
 .disabled{
-  /deep/ .el-upload--picture-card {
+  ::v-deep .el-upload--picture-card {
     display: none;
   }
 }
@@ -516,13 +516,13 @@ export default {
   flex-direction: column;
   align-items: flex-start;
 }
-/deep/ .el-input.is-disabled .el-input__inner{
+::v-deep .el-input.is-disabled .el-input__inner{
     background-color: #646464a1;
   }
-  /deep/ .el-input-group__append, .el-input-group__prepend{
+  ::v-deep .el-input-group__append, .el-input-group__prepend{
     padding: 0 5px;
   }
-  /deep/ .el-select.is-disabled .el-input__inner{
+  ::v-deep .el-select.is-disabled .el-input__inner{
     background-color: #646464a1;
   }
 </style>

src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue

@@ -761,30 +761,30 @@ export default {
 <style lang="scss" scoped>
   .ecrf-wrapper{
 
-    /deep/ .el-form-item__label{
+    ::v-deep .el-form-item__label{
       color: #c3c3c3;
       text-align: left;
     }
-    /deep/ .el-input__inner{
+    ::v-deep .el-input__inner{
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
-    /deep/ .el-textarea__inner{
+    ::v-deep .el-textarea__inner{
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
-    /deep/ .el-form-item{
+    ::v-deep .el-form-item{
       display: flex;
       flex-direction: row;
       justify-content: flex-start;
       flex-wrap: wrap;
     }
-    /deep/ .el-form-item__content{
+    ::v-deep .el-form-item__content{
       flex: 1;
     }
-    /deep/ .el-button--mini, .el-button--mini.is-round {
+    ::v-deep .el-button--mini, .el-button--mini.is-round {
     padding: 7px 10px;
   }
     .el-form-item__content

src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue

@@ -1055,34 +1055,34 @@ export default {
 </script>
 <style lang="scss" scoped>
 .measurement-form{
-  /deep/ .el-form-item__label{
+  ::v-deep .el-form-item__label{
     color: #c3c3c3;
     // text-align: left;
   }
-  /deep/ .el-input .el-input__inner{
+  ::v-deep .el-input .el-input__inner{
     background-color: transparent;
     color: #ddd;
     border: 1px solid #5e5e5e;
   }
-  /deep/ .el-form-item{
+  ::v-deep .el-form-item{
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
     flex-wrap: wrap;
   }
-  /deep/ .el-form-item__content{
+  ::v-deep .el-form-item__content{
     flex: 1;
   }
-  /deep/ .el-input.is-disabled .el-input__inner{
+  ::v-deep .el-input.is-disabled .el-input__inner{
     background-color: #646464a1;
   }
-  /deep/ .el-input-group__append, .el-input-group__prepend{
+  ::v-deep .el-input-group__append, .el-input-group__prepend{
     padding: 0 10px;
   }
-  /deep/ .el-select.is-disabled .el-input__inner{
+  ::v-deep .el-select.is-disabled .el-input__inner{
     background-color: #646464a1;
   }
-  /deep/ .el-button--mini, .el-button--mini.is-round {
+  ::v-deep .el-button--mini, .el-button--mini.is-round {
     padding: 7px 10px;
   }
   .el-form-item__content
@@ -1090,7 +1090,7 @@ export default {
     width: 100%;
   }
   .input-width1{
-    width: calc(100% -60px)!important;
+    width: calc(100% - 60px)!important;
   }
   .input-width2{
     width: 100% !important;

src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue

@@ -855,12 +855,12 @@ export default {
   .el-collapse{
     border-bottom:none;
     border-top:none;
-    /deep/ .el-collapse-item{
+    ::v-deep .el-collapse-item{
       background-color: #000!important;
       color: #ddd;
 
     }
-    /deep/ .el-collapse-item__header{
+    ::v-deep .el-collapse-item__header{
       background-color: #000!important;
       color: #ddd;
       border-bottom-color:#5a5a5a;
@@ -868,11 +868,11 @@ export default {
       height: 35px;
       line-height: 35px;
     }
-    /deep/ .el-collapse-item__wrap{
+    ::v-deep .el-collapse-item__wrap{
       background-color: #000!important;
       color: #ddd;
     }
-    /deep/ .el-collapse-item__content{
+    ::v-deep .el-collapse-item__content{
       width:260px;
       position: absolute;
       top: 0px;

src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue

@@ -200,7 +200,7 @@ export default {
   mounted() {
     const digitPlaces = parseInt(this.$route.query.digitPlaces)
     this.digitPlaces = digitPlaces === -1 ? 2 : digitPlaces
-    // console.log(toolsUtilities)
+    console.log(toolsUtilities)
     this.subjectCode = this.$route.query.subjectCode
     var element = document.getElementById(`viewport${this.index}`)
 
@@ -346,7 +346,7 @@ export default {
         index[2] = Math.floor(index[2])
         this.mousePosition.index = index
 
-        this.mousePosition.value = this.getValue(this.volume, worldPoint)
+        // this.mousePosition.value = this.getValue(this.volume, worldPoint)
       }
     },
     getValue(volume, worldPos) {
@@ -364,7 +364,7 @@ export default {
 
       const yMultiple = dimensions[0]
       const zMultiple = dimensions[0] * dimensions[1]
-
+      // const scalarIndex = index[2] * zMultiple + index[1] * yMultiple + index[0];
       const value = scalarData[index[2] * zMultiple + index[1] * yMultiple + index[0]]
 
       return value
@@ -492,7 +492,7 @@ export default {
       this.rotate(angle)
       this.rotateBarLeft = x
     },
-    scroll(index) {
+    async scroll(index) {
       renderingEngine = getRenderingEngine(this.renderingEngineId)
       viewport = renderingEngine.getViewport(this.viewportId)
       const actorEntries = viewport.getActors()
@@ -500,11 +500,14 @@ export default {
       if (!actorEntries) {
         return
       }
-      const delta = index - this.seriesInfo.imageIdIndex
-      toolsUtilities.scroll(viewport, {
-        delta,
-        volumeId: actorEntries.uid
-      })
+      // const delta = index - this.seriesInfo.imageIdIndex
+      await utilities.jumpToSlice(viewport.element, {
+        imageIndex: index,
+      });
+      // toolsUtilities.scroll(viewport, {
+      //   delta,
+      //   volumeId: actorEntries.uid
+      // })
       renderingEngine.render()
     },
     rotateBarMouseup(e) {

src/views/trials/trials-panel/reading/dicoms/components/Fusion/demo/Assessment.vue

@@ -0,0 +1,106 @@
+<template>
+  <div v-loading="loading" class="ecrf-wrapper">
+     <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
+        评估说明
+      </h4>
+    <el-form
+      ref="questions"
+      size="small"
+      :model="questionForm"
+    >
+      <el-form-item
+        label="访视点备注" 
+        prop="note"
+        :rules="[
+          { required: true,
+            message:$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+        ]"
+      >
+        <el-input
+          v-model="questionForm.note"
+          :disabled="readingTaskState >= 2"
+          type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          maxlength="500"
+        />
+      </el-form-item>
+      <el-form-item v-if="readingTaskState < 2">
+        <div style="text-align:right">
+          <el-button size="mini" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+        </div>
+      </el-form-item>
+    </el-form>
+  </div>
+
+</template>
+
+<script>
+
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'ECRF',
+  data() {
+    return {
+      loading: false,
+      questionForm: {
+        note: ''
+      },
+      readingTaskState: 1,
+      isBaseLineTask: false,
+      visitTaskId: ''
+    }
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+    this.visitTaskId = this.$route.query.visitTaskId
+  },
+  beforeDestroy() {
+  },
+  methods: {
+    handleSave() {
+      this.$refs['questions'].validate((valid) => {
+        if (!valid) return
+        
+      })
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .ecrf-wrapper{
+
+    ::v-deep .el-form-item__label{
+      color: #c3c3c3;
+      text-align: left;
+    }
+    ::v-deep .el-input__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    ::v-deep .el-textarea__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    ::v-deep .el-form-item{
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+    }
+    ::v-deep .el-form-item__content{
+      flex: 1;
+    }
+    ::v-deep .el-button--mini, .el-button--mini.is-round {
+    padding: 7px 10px;
+  }
+    .el-form-item__content
+    .el-select{
+      width: 100%;
+    }
+  }
+
+  </style>
+

src/views/trials/trials-panel/reading/dicoms/components/Fusion/demo/Questions.vue

@@ -0,0 +1,148 @@
+<template>
+  <div v-loading="loading" class="ecrf-wrapper">
+     <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
+        影像质量
+      </h4>
+    <el-form
+      ref="questions"
+      size="small"
+      :model="questionForm"
+    >
+      <el-form-item 
+        label="影像质量"
+        prop="imageQuality"
+        :rules="[
+          { required: true,
+            message:$t('common:ruleMessage:select'), trigger: ['blur', 'change']},
+        ]"
+      >
+        <el-radio-group v-model="questionForm.imageQuality">
+          <el-radio
+            v-for="item of $d.ImageQualityEvaluation"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item 
+        v-if="questionForm.imageQuality === 2"
+        label="影像质量问题" 
+        prop="imageQualityIssues"
+        :rules="[
+          { required: true,
+            message:$t('common:ruleMessage:select'), trigger: ['blur', 'change']},
+        ]"
+      >
+        <el-select
+          v-model="questionForm.imageQualityIssues"
+          :disabled="readingTaskState >= 2"
+          clearable
+        >
+          <el-option
+            v-for="item of $d.ImageQualityIssues"
+            :key="item.id"
+            :value="item.value"
+            :label="item.label"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="questionForm.imageQualityIssues === 5"
+        label="影像质量备注" 
+        prop="note"
+        :rules="[
+          { required: true,
+            message:$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+        ]"
+      >
+        <el-input
+          v-model="questionForm.note"
+          :disabled="readingTaskState >= 2"
+          type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          maxlength="500"
+        />
+      </el-form-item>
+      <el-form-item v-if="readingTaskState < 2">
+        <div style="text-align:right">
+          <el-button size="mini" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+        </div>
+      </el-form-item>
+    </el-form>
+  </div>
+
+</template>
+
+<script>
+
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'ECRF',
+  data() {
+    return {
+      loading: false,
+      questionForm: {
+        imageQuality: null,
+        imageQualityIssues: null,
+        note: ''
+      },
+      readingTaskState: 1,
+      isBaseLineTask: false,
+      visitTaskId: ''
+    }
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+  },
+  beforeDestroy() {
+  },
+  methods: {
+    handleSave() {
+      this.$refs['questions'].validate((valid) => {
+        if (!valid) return
+        
+      })
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .ecrf-wrapper{
+
+    ::v-deep .el-form-item__label{
+      color: #c3c3c3;
+      text-align: left;
+    }
+    ::v-deep .el-input__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    ::v-deep .el-textarea__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    ::v-deep .el-form-item{
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+    }
+    ::v-deep .el-form-item__content{
+      flex: 1;
+    }
+    ::v-deep .el-button--mini, .el-button--mini.is-round {
+    padding: 7px 10px;
+  }
+    .el-form-item__content
+    .el-select{
+      width: 100%;
+    }
+  }
+
+  </style>
+

src/views/trials/trials-panel/reading/dicoms/components/Fusion/demo/TableQuestions.vue

@@ -0,0 +1,354 @@
+<template>
+  <div class="measurement-wrapper">
+
+    <div class="container">
+      <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
+        核医学评估
+      </h4>
+      <div class="lesion_list">
+        <div class="flex-row" style="margin:3px 0;">
+          <div class="title">盆腔淋巴结</div>
+        </div>
+        <el-table
+          :data="questions"
+          style="width: 100%"
+          row-key="rowIndex"    
+          :expand-row-keys="expands"
+          @expand-change="expandSelect"
+          size="mini"
+        >
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <el-form :ref="props.row.rowIndex" size="small" :model="props.row" label-width="80px" style="padding-right: 10px">
+                <el-form-item label="部位">
+                  <el-input
+                    v-model="props.row.part"
+                    disabled
+                  />
+                </el-form-item>
+                <el-form-item 
+                  label="转移灶"
+                  prop="distraction"
+                  :rules="[
+                    { required: true,
+                      message:$t('common:ruleMessage:select'), trigger: ['blur', 'change']},
+                  ]"
+                >
+                  <el-select v-model="props.row.distraction" style="width:100%;">
+                    <el-option label="阴性" :value="1"></el-option>
+                    <el-option label="阳性" :value="2"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="SUVmax">
+                  <el-input
+                    v-model="props.row.suvMax"
+                    disabled
+                  />
+                </el-form-item>
+                <el-form-item >
+                  <div style="text-align:right">
+                    <el-button v-if="props.row.annotation" size="mini" @click="clearAnnotation(props.row)">{{ $t('trials:reading:button:removeMark') }}</el-button>
+                    <el-button size="mini" @click="handleSave(props.row)">{{ $t('common:button:save') }}</el-button>
+                  </div>
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="部位"
+            prop="part">
+          </el-table-column>
+          <el-table-column
+            label="转移灶"
+            prop="distraction">
+            <template slot-scope="scope">
+              {{scope.row.distraction === 1 ? '阴性' : scope.row.distraction === 2 ? '阳性' : ''}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="SUVmax"
+            prop="suvMax">
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex'
+import FusionEvent from './../FusionEvent'
+export default {
+  name: 'TableQuestionList',
+  components: {
+  },
+  data() {
+    return {
+      height: window.innerHeight - 140,
+      questions: [
+        { 
+          rowIndex: '001',
+          part: '髂内',
+          distraction: '',
+          suvMax: null,
+          saveTypeEnum: 1,
+          annotation: null
+        },
+        {
+          rowIndex: '002',
+          part: '髂外',
+          distraction: '',
+          suvMax: null,
+          saveTypeEnum: 1,
+          annotation: null
+        },
+        {
+          rowIndex: '003',
+          part: '髂总',
+          distraction: '',
+          suvMax: null,
+          saveTypeEnum: 1,
+          annotation: null
+        },
+        {
+          rowIndex: '004',
+          part: '闭孔',
+          distraction: '',
+          suvMax: null,
+          saveTypeEnum: 1,
+          annotation: null
+        }
+      ],
+      visitTaskId: '',
+      isCurrentTask: false,
+      loading: false,
+      readingTaskState: 1,
+      isBaseLineTask: false,
+      taskBlindName: '',
+      expands:[]
+    }
+  },
+  mounted() {
+  },
+  beforeDestroy() {
+  },
+  methods: {
+    expandSelect(row, expandedRows) {
+      this.expands = []
+      if (expandedRows.length > 0) {
+        row ? this.expands.push(row.rowIndex) : ''
+      }
+      if (this.expands.length > 0 && row.annotation) {
+        FusionEvent.$emit('imageLocation', { annotation: row.annotation })
+      }
+    },
+    async clearAnnotation(row) {
+       // 是否确认清除标记？
+      const confirm = await this.$confirm(
+        this.$t('trials:reading:warnning:msg47'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      let i = this.questions.findIndex(i=>i.rowIndex === row.rowIndex)
+      FusionEvent.$emit('removeAnnotation', { annotation: this.questions[i].annotation })
+      this.questions[i].annotation = null
+      this.questions[i].suvMax = null
+    },
+    async handleSave(row) {
+      let loading = null
+      try {
+        let valid = await this.$refs[row.rowIndex].validate()
+        if (!valid) return
+        loading = this.$loading({ fullscreen: true })
+        setTimeout(() => {
+          // 模拟保存成功
+          loading.close()
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+
+          // 可以在这里添加更多的逻辑，比如更新页面上的某些元素
+        }, 2000); 
+      } catch(e) {
+        if (loading) {
+          loading.close()
+        }
+      }
+    },
+    setActiveCollapse(annotationUID) {
+      for (let i = 0; i < this.questions.length; i++) {
+        let obj = this.questions[i]
+        if (obj.annotation && obj.annotation.data && obj.annotation.data.annotationUID === annotationUID) {
+          this.expands = [this.questions[i].rowIndex]
+          break
+        }
+      }
+    },
+    isCanActiveTool(toolName) {
+      if (this.expands.length > 0) {
+        let isExist = this.isExistMeasureData(this.expands[0])
+        return { isCanActiveTool: isExist, reason: '' }
+      } else {
+        return { isCanActiveTool: false, reason: '' }
+      }
+    },
+    isExistMeasureData(rowIndex) {
+      let i = this.questions.findIndex(i=>i.rowIndex === rowIndex)
+      if (this.questions[i].annotation) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // modifyMeasuredData(measureObj) {
+    //   if (measureObj.questionInfo) {
+    //     this.activeItem.activeCollapseId = measureObj.questionInfo.QuestionId
+    //     this.activeItem.activeRowIndex = String(measureObj.questionInfo.RowIndex)
+    //     this.activeName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+    //     const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
+    //     if (this.$refs[refName]) {
+    //       this.$refs[refName][0].setMeasureData(measureObj.measureData)
+    //     }
+    //   }
+    // },
+    // 设置测量数据
+    setMeasuredData(measureData) {
+      if (measureData.data && measureData.data.data && measureData.data.data.remark ) {
+        // 编辑
+        // 展开并更新标记信息
+        let remark = measureData.data.data.remark
+        let i = this.questions.findIndex(i=>i.part === remark)
+        this.questions[i].suvMax = measureData.suvMax
+        this.questions[i].annotation = measureData
+        this.expands = [this.questions[i].rowIndex]
+      } else {
+        if (this.expands.length > 0) {
+        let i = this.questions.findIndex(i=>i.rowIndex === this.expands[0])
+        if (measureData.data && measureData.data.data) {
+          measureData.data.data.remark = this.questions[i].part
+        }
+        
+        this.questions[i].annotation = measureData
+      }
+      }
+      
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+.measurement-wrapper{
+
+  // .container{
+  //   padding: 10px;
+  // }
+  .title{
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+
+  }
+  .add-icon{
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+    border: 1px solid #938b8b;
+    margin-bottom: 2px;
+    cursor: pointer;
+  }
+  .add-icon:hover{
+    background-color: #607d8b;
+  }
+
+  .flex-row{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    background-color: #424242;
+
+  }
+  .lesion_list{
+    position: relative;
+    ::v-deep .el-table, .el-table__expanded-cell {
+      background-color: #000;
+      color: #fff;
+      border-color:#444444;
+      .el-form-item__label {
+        color: #fff;
+      }
+      .el-input__inner {
+        background-color: rgba(0, 0, 0, .1);
+        border-color: #606266;
+        color: #fff;
+      }
+      .el-input.is-disabled .el-input__inner {
+        background-color: #303133;
+        border-color: #444444;
+        color: #c0c4cc;
+        cursor: not-allowed;
+      }
+    }
+    
+
+    ::v-deep .el-table th, .el-table tr {
+      background-color: #000;
+      color: #fff;
+      border-color:#444444;
+    }
+    ::v-deep .el-table__body tr > td{
+      background-color:#000 !important;
+      color: #fff;
+      border-color:#444444;
+    }
+    // ::v-deep .el-table__body tr:hover > td{
+    //   background-color:#858282 !important;
+    //   color: #fff;
+    //   border-color:#444444;
+    // }
+    ::v-deep .el-table--border th.gutter:last-of-type{
+      border: none;
+    }
+    ::v-deep .el-card__header{
+      border: none;
+      padding: 10px;
+    }
+  }
+  .el-collapse{
+    border-bottom:none;
+    border-top:none;
+    ::v-deep .el-collapse-item{
+      background-color: #000!important;
+      color: #ddd;
+
+    }
+    ::v-deep .el-collapse-item__header{
+      background-color: #000!important;
+      color: #ddd;
+      border-bottom-color:#5a5a5a;
+      padding-left: 5px;
+      height: 35px;
+      line-height: 35px;
+    }
+    ::v-deep .el-collapse-item__wrap{
+      background-color: #000!important;
+      color: #ddd;
+    }
+    ::v-deep .el-collapse-item__content{
+      width:260px;
+      position: absolute;
+      top: 0px;
+      right: 0px;
+      // border: 1px solid #ffeb3b;
+      border: 1px solid #fff;
+      z-index: 1;
+      color: #ddd;
+      padding: 5px;
+      background-color:#1e1e1e;
+    }
+
+  }
+}
+</style>

src/views/trials/trials-panel/reading/dicoms/components/Fusion/demo/Viewport.vue

@@ -0,0 +1,690 @@
+<template>
+  <div
+    class="viewport_container"
+    :class="['item',activeIndex === index?'item_active':'']"
+    @mouseup="sliderMouseup"
+  >
+    <div :id="`viewport${index}`" ref="viewportCanvas" style="height: 100%;width:100%" />
+    <!-- 序列信息 -->
+    <div
+      v-if="seriesInfo.taskBlindName"
+      class="seriesInfo_wrapper"
+      :style="{color:index%2 == 1 ? '#ddd' : '#666'}"
+    >
+      <h2 v-if="isReadingShowSubjectInfo" class="taskInfo_container">
+        {{ subjectCode }} {{ seriesInfo.taskBlindName }}
+      </h2>
+      <div v-if="index === 1 || index === 2">
+        Series: #{{ seriesInfo.seriesNumber }}
+      </div>
+      <div v-if="index !== 4">Image: #{{ `${seriesInfo.imageIdIndex + 1} / ${seriesInfo.imageMaxLength}` }}</div>
+      <div v-if="index === 1 || index === 2">{{ seriesInfo.modality }}</div>
+    </div>
+    <!-- 描述信息 -->
+    <div
+      v-if="seriesInfo.description && (index === 1 || index === 2)"
+      class="descInfo_wrapper"
+      :style="{color:index%2 == 1 ? '#ddd' : '#666'}"
+    >
+      <div>{{ seriesInfo.description }}</div>
+    </div>
+
+    <!-- 图像信息  -->
+    <div
+      v-if="seriesInfo.description && (index === 1 || index === 2 || index === 3)"
+      class="imageInfo_wrapper_l"
+      :style="{color:index%2 == 1 ? '#ddd' : '#666'}"
+    >
+      <div v-show="mousePosition.index.length > 0">
+        Pos: {{ mousePosition.index[0] }}, {{ mousePosition.index[1] }}, {{ mousePosition.index[2] }}
+      </div>
+      <div v-if="(seriesInfo.modality === 'CT' || seriesInfo.modality === 'DR' || seriesInfo.modality === 'CR') && mousePosition.value">
+        HU: {{ mousePosition.value }}
+      </div>
+      <div v-else-if="(seriesInfo.modality === 'PT' && mousePosition.value)">
+        SUVbw(g/ml): {{ digitPlaces === -1 ?mousePosition.value.toFixed(3) :mousePosition.value.toFixed(digitPlaces) }}
+      </div>
+      <div v-else-if="mousePosition.value">
+        Density: {{ mousePosition.value }}
+      </div>
+      <div v-if="index === 1 || index === 2">
+        W*H: {{ imageInfo.size }}
+      </div>
+
+      <!-- <div v-if="index === 1 || index === 2">Zoom: {{ imageInfo.zoom }}</div> -->
+    </div>
+    <div
+      v-if="seriesInfo.description && (index === 1 || index === 2 || index === 3)"
+      class="imageInfo_wrapper_r"
+      :style="{color:index%2 == 1 ? '#ddd' : '#666'}"
+    >
+      <div v-show="imageInfo.location && index !== 3 ">Location: {{ `${imageInfo.location} mm` }}</div>
+      <div v-show="seriesInfo.sliceThickness && index !== 3">Slice Thickness: {{ `${Number(seriesInfo.sliceThickness).toFixed(2)} mm` }}</div>
+      <div v-show="imageInfo.wwwc ">WW/WL: {{ imageInfo.wwwc }}</div>
+    </div>
+    <div v-if="index !== 4" ref="sliderBox" class="slider_box" :style="{background: index === 2?'#ddd':'#333'}" @click.stop="goViewer($event)">
+      <div :style="{top: sliderBoxHeight + '%'}" class="box" @click.stop.prevent="() => {return}" @mousedown.stop="sliderMousedown($event)" />
+    </div>
+    <div style="position: absolute;left: 50%;top: 30px;color: #f44336;transform: translateX(-50%);">
+      {{ markers.top }}
+    </div>
+    <div style="position: absolute;top: 50%;right: 15px;color: #f44336;transform: translateY(-50%);">
+      {{ markers.right }}
+    </div>
+
+    <div style="position: absolute;left: 50%;bottom: 30px;color: #f44336;transform: translateX(-50%);">
+      {{ markers.bottom }}
+    </div>
+    <div style="position: absolute;top: 50%;left: 15px;color: #f44336;transform: translateY(-50%);">
+      {{ markers.left }}
+    </div>
+    <div v-if="presetName" class="color_bar">
+      <canvas id="colorBar_Canvas" />
+    </div>
+    <div v-if="index === 4" id="rotateBar" ref="rotateBar" class="rotate_slider_box" @click.stop="clickRotate($event)">
+      <div id="rotateSlider" :style="{left: rotateBarLeft + 'px'}" class="box" @click.stop.prevent="() => {return}" @mousedown.stop="rotateBarMousedown($event)" />
+    </div>
+  </div>
+</template>
+<script>
+import {
+  getRenderingEngine,
+  metaData,
+  utilities,
+  // getOrCreateCanvas,
+  Enums } from '@cornerstonejs/core'
+
+import {
+  utilities as toolsUtilities,
+  annotation,
+  Enums as toolsEnums
+  // cursors
+} from '@cornerstonejs/tools'
+import vtkColorMaps from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction/ColorMaps'
+import { vec3, mat4 } from 'gl-matrix'
+import html2canvas from 'html2canvas'
+const { getColormap } = utilities.colormap
+const {
+  VOLUME_NEW_IMAGE
+  // VOLUME_LOADED,
+  // IMAGE_VOLUME_MODIFIED,
+  // VOLUME_VIEWPORT_NEW_VOLUME
+} = Enums.Events
+
+var renderingEngine
+var viewport
+export default {
+  name: 'Viewport',
+  props: {
+    activeIndex: {
+      type: Number,
+      default: 0
+    },
+    index: {
+      // 1:ct  2:pet  3:fusion  4:mip
+      type: Number,
+      required: true
+    },
+    isReadingShowSubjectInfo: {
+      type: Boolean,
+      default: false
+    },
+    seriesInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    renderingEngineId: {
+      type: String,
+      required: true
+    },
+    viewportId: {
+      type: String,
+      required: true
+    },
+    volume: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    measureDatas: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      subjectCode: '',
+      mousePosition: { index: [], value: null, modalityUnit: '', world: [], ctVal: null, ptVal: null },
+      digitPlaces: -1,
+      imageInfo: {
+        zoom: null,
+        size: null,
+        location: null,
+        sliceThickness: null,
+        wwwc: null
+      },
+      sliderBoxHeight: 0,
+
+      sliderInfo: {
+        oldB: null,
+        oldM: null,
+        isMove: false
+      },
+      rotateAngle: 0,
+      rotateBarLeft: 0,
+      rotateBarInfo: {
+        initX: null,
+        initLeft: null,
+        isMove: false
+      },
+      isFirstRender: true,
+      defaultWindowLevel: {},
+      presetName: '',
+      orientationMarkers: [],
+      originalMarkers: [],
+      markers: { top: '', right: '', bottom: '', left: '' }
+    }
+  },
+  watch: {
+    activeIndex: {
+      handler(v) {
+        console.log('activeIndex ', v)
+      }
+    }
+  },
+  mounted() {
+    const digitPlaces = parseInt(this.$route.query.digitPlaces)
+    this.digitPlaces = digitPlaces === -1 ? 2 : digitPlaces
+    // console.log(toolsUtilities)
+    this.subjectCode = this.$route.query.subjectCode
+    var element = document.getElementById(`viewport${this.index}`)
+
+    element.addEventListener(VOLUME_NEW_IMAGE, this.handleVolumeNewImage)
+    element.addEventListener(Enums.Events.CAMERA_MODIFIED, this.handleCameraModified)
+    element.addEventListener(Enums.Events.VOI_MODIFIED, this.handleVOIModified)
+    element.addEventListener(toolsEnums.Events.MOUSE_WHEEL, this.handletoolsMouseWheel)
+
+    element.addEventListener('CORNERSTONE_TOOLS_MOUSE_MOVE', this.handleMouseMove)
+
+    element.addEventListener('mouseleave', this.handleMouseLeave)
+
+    document.addEventListener('mouseup', () => {
+      this.sliderMouseup()
+      if (this.index === 4) {
+        this.rotateBarMouseup()
+      }
+    })
+    document.addEventListener('mousemove', (e) => {
+      this.sliderMousemove(e)
+      if (this.index === 4) {
+        this.rotateBarMousemove(e)
+      }
+    })
+  },
+  methods: {
+    handleVolumeNewImage(e) {
+      const { imageIndex } = e.detail
+      if (this.viewportId === e.detail.viewportId && this.index !== 4) {
+        this.seriesInfo.imageIdIndex = imageIndex
+      }
+      renderingEngine = getRenderingEngine(this.renderingEngineId)
+      viewport = renderingEngine.getViewport(this.viewportId)
+
+      if (viewport) {
+        var zoom = viewport.getZoom()
+
+        if (zoom) {
+          this.imageInfo.zoom = zoom.toFixed(4)
+        }
+        var imageId = viewport.getCurrentImageId()
+        if (imageId) {
+          const imagePlaneModule = metaData.get('imagePlaneModule', imageId)
+          this.imageInfo.size = `${imagePlaneModule.columns}*${imagePlaneModule.rows}`
+          this.imageInfo.location = imagePlaneModule.sliceLocation
+          this.getOrientationMarker()
+          this.sliderBoxHeight = imageIndex * 100 / (this.seriesInfo.imageMaxLength - 1)
+        }
+
+        var properties = viewport.getProperties()
+
+        if (properties && properties.voiRange) {
+          var { lower, upper } = properties.voiRange
+          const windowWidth = upper - lower
+          const windowCenter = (upper + lower) / 2
+          this.defaultWindowLevel.windowWidth = windowWidth
+          this.defaultWindowLevel.windowCenter = windowCenter
+          this.imageInfo.wwwc = `${Math.round(windowWidth)}/${Math.round(windowCenter)}`
+        }
+        if (this.presetName) {
+          this.renderColorBar(this.presetName)
+        }
+      }
+    },
+    getOrientationMarker() {
+      // eslint-disable-next-line no-unused-vars
+      const { viewUp, viewPlaneNormal } = viewport.getCamera()
+
+      const viewRight = vec3.create()
+      vec3.cross(viewRight, viewUp, viewPlaneNormal)
+
+      const columnCosines = [-viewUp[0], -viewUp[1], -viewUp[2]]
+      const rowCosines = viewRight
+      const rowString = toolsUtilities.orientation.getOrientationStringLPS(rowCosines)
+      const columnString = toolsUtilities.orientation.getOrientationStringLPS(columnCosines)
+      const oppositeRowString = toolsUtilities.orientation.invertOrientationStringLPS(rowString)
+      const oppositeColumnString = toolsUtilities.orientation.invertOrientationStringLPS(columnString)
+      this.markers.top = oppositeColumnString
+      this.markers.right = rowString
+      this.markers.bottom = columnString
+      this.markers.left = oppositeRowString
+      this.orientationMarkers = [oppositeColumnString, rowString, columnString, oppositeRowString]
+      if (this.originalMarkers.length === 0) {
+        this.originalMarkers = [...this.orientationMarkers]
+      }
+    },
+    rotateMarkers(type) {
+      var markers = [...this.orientationMarkers]
+      if (type === 4) {
+        // 左转90度
+        this.orientationMarkers = markers.slice(1, 4).concat(markers[0])
+      } else if (type === 5) {
+        // 右转90度
+        this.orientationMarkers = [markers[3]].concat(markers.slice(0, 3))
+      }
+      this.setMarkers()
+    },
+    resetMarks() {
+      this.orientationMarkers = [...this.originalMarkers]
+      this.setMarkers()
+    },
+    setMarkers() {
+      var markers = [...this.orientationMarkers]
+      for (const key in this.markers) {
+        var v = markers.shift(0)
+        this.markers[key] = v
+      }
+    },
+    handleCameraModified(e) {
+      renderingEngine = getRenderingEngine(this.renderingEngineId)
+      viewport = renderingEngine.getViewport(this.viewportId)
+      if (!viewport) return
+
+      var zoom = viewport.getZoom()
+      if (!zoom) return
+      this.imageInfo.zoom = zoom.toFixed(4)
+      // console.log(e)
+    },
+    handleVOIModified(e) {
+      renderingEngine = getRenderingEngine(this.renderingEngineId)
+      viewport = renderingEngine.getViewport(this.viewportId)
+      if (!viewport) return
+
+      var properties = viewport.getProperties()
+      if (properties && properties.voiRange) {
+        var { lower, upper } = properties.voiRange
+        const { windowWidth, windowCenter } = utilities.windowLevel.toWindowLevel(
+          lower,
+          upper
+        )
+        this.imageInfo.wwwc = `${Math.round(windowWidth)}/${Math.round(windowCenter)}`
+      }
+    },
+    handleMouseMove(e) {
+      if (this.index !== 4) {
+        const { currentPoints } = e.detail
+        const worldPoint = currentPoints.world
+        const { imageData } = this.volume
+        const index = imageData.worldToIndex(worldPoint)
+
+        index[0] = Math.floor(index[0])
+        index[1] = Math.floor(index[1])
+        index[2] = Math.floor(index[2])
+        this.mousePosition.index = index
+
+        this.mousePosition.value = this.getValue(this.volume, worldPoint)
+      }
+    },
+    getValue(volume, worldPos) {
+      const { dimensions, scalarData, imageData } = volume
+
+      const index = imageData.worldToIndex(worldPos)
+
+      index[0] = Math.floor(index[0])
+      index[1] = Math.floor(index[1])
+      index[2] = Math.floor(index[2])
+
+      if (!utilities.indexWithinDimensions(index, dimensions)) {
+        return
+      }
+
+      const yMultiple = dimensions[0]
+      const zMultiple = dimensions[0] * dimensions[1]
+
+      const value = scalarData[index[2] * zMultiple + index[1] * yMultiple + index[0]]
+
+      return value
+    },
+    handleMouseLeave(e) {
+      this.mousePosition.index = []
+      this.mousePosition.value = null
+    },
+    goViewer(e) {
+      var height = e.offsetY * 100 / this.$refs['sliderBox'].clientHeight
+      this.sliderBoxHeight = height
+      var index = Math.trunc(this.seriesInfo.imageMaxLength * this.sliderBoxHeight / 100)
+      if (this.seriesInfo.imageIdIndex !== index) {
+        this.scroll(index)
+      }
+    },
+
+    sliderMousedown(e) {
+      var boxHeight = this.$refs['sliderBox'].clientHeight
+      this.sliderInfo.oldB = parseInt(e.srcElement.style.top) * boxHeight / 100
+      this.sliderInfo.oldM = e.clientY
+      this.sliderInfo.isMove = true
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
+    },
+    sliderMousemove(e) {
+      if (!this.sliderInfo.isMove) return
+      var PX = this.sliderInfo.oldB - (this.sliderInfo.oldM - e.clientY)
+      var boxHeight = this.$refs['sliderBox'].clientHeight
+      // 滚动翻页
+      if (PX < 0) return
+      if (PX > boxHeight) return
+      const height = PX * 100 / boxHeight
+      var index = Math.trunc(this.seriesInfo.imageMaxLength * height / 100)
+      index = index > this.seriesInfo.imageMaxLength ? this.seriesInfo.imageMaxLength : index < 0 ? 0 : index
+      this.sliderBoxHeight = height
+      if (this.seriesInfo.imageIdIndex !== index) {
+        this.scroll(index)
+      }
+    },
+    handletoolsMouseWheel(e) {
+      const { viewportId, wheel } = e.detail
+      if (viewportId === 'PET_MIP_CORONAL') {
+        const container = document.getElementById('rotateBar')
+        const slider = document.getElementById('rotateSlider')
+        const containerWidth = container.offsetWidth
+        const sliderWidth = slider.offsetWidth
+        const maxX = containerWidth - sliderWidth
+        const { direction } = wheel
+
+        var x = Math.trunc(30 * ((containerWidth - sliderWidth) / 360))
+        if (direction > 0 && (this.rotateBarLeft + x) > maxX) {
+          this.rotateBarLeft = x - (containerWidth - sliderWidth - this.rotateBarLeft)
+        } else if (direction < 0 && (this.rotateBarLeft < x)) {
+          this.rotateBarLeft = containerWidth - (x - this.rotateBarLeft + sliderWidth)
+        } else {
+          this.rotateBarLeft = x * direction + this.rotateBarLeft
+        }
+      }
+    },
+    rotateBarMousemove(e) {
+      // 滚动旋转
+      if (!this.rotateBarInfo.isMove) return
+      const container = document.getElementById('rotateBar')
+      const slider = document.getElementById('rotateSlider')
+      const containerWidth = container.offsetWidth
+      const sliderWidth = slider.offsetWidth
+      let x = Math.trunc(e.clientX - this.rotateBarInfo.initX + this.rotateBarInfo.initLeft)
+      if (x < 0) x = 0
+      if (x > containerWidth - sliderWidth) x = containerWidth - sliderWidth
+      const deltaX = x - this.rotateBarLeft
+      const angle = Math.sin((deltaX * (360 / (containerWidth - sliderWidth))) * Math.PI / 180)
+      this.rotate(angle)
+      this.rotateBarLeft = x
+    },
+    rotateBarMousedown(e) {
+      console.log('rotateBarMousedown')
+      this.rotateBarInfo.initLeft = e.srcElement.offsetLeft
+      this.rotateBarInfo.initX = e.clientX
+      this.rotateBarInfo.isMove = true
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
+    },
+    rotate(angle) {
+      renderingEngine = getRenderingEngine(this.renderingEngineId)
+      viewport = renderingEngine.getViewport(this.viewportId)
+      const camera = viewport.getCamera()
+      const { viewUp, position, focalPoint } = camera
+      const [cx, cy, cz] = focalPoint
+      const [ax, ay, az] = [0, 0, 1]
+      const newPosition = [0, 0, 0]
+      const newFocalPoint = [0, 0, 0]
+      const newViewUp = [0, 0, 0]
+
+      const transform = mat4.identity(new Float32Array(16))
+      mat4.translate(transform, transform, [cx, cy, cz])
+      mat4.rotate(transform, transform, angle, [ax, ay, az])
+      mat4.translate(transform, transform, [-cx, -cy, -cz])
+      vec3.transformMat4(newPosition, position, transform)
+      vec3.transformMat4(newFocalPoint, focalPoint, transform)
+
+      mat4.identity(transform)
+      mat4.rotate(transform, transform, angle, [ax, ay, az])
+      vec3.transformMat4(newViewUp, viewUp, transform)
+
+      viewport.setCamera({
+        position: newPosition,
+        viewUp: newViewUp,
+        focalPoint: newFocalPoint
+      })
+
+      viewport.render()
+    },
+    clickRotate(e) {
+      // console.log('clickRotate')
+      const container = document.getElementById('rotateBar')
+      const containerWidth = container.offsetWidth
+      const slider = document.getElementById('rotateSlider')
+      const sliderWidth = slider.offsetWidth
+      const x = Math.trunc(e.offsetX)
+      const deltaX = x - this.rotateBarLeft
+      const angle = Math.sin((deltaX * (360 / (containerWidth - sliderWidth))) * Math.PI / 180)
+      this.rotate(angle)
+      this.rotateBarLeft = x
+    },
+    async scroll(index) {
+      renderingEngine = getRenderingEngine(this.renderingEngineId)
+      viewport = renderingEngine.getViewport(this.viewportId)
+      const actorEntries = viewport.getActors()
+
+      if (!actorEntries) {
+        return
+      }
+      // const delta = index - this.seriesInfo.imageIdIndex
+      // toolsUtilities.scroll(viewport, {
+      //   delta,
+      //   volumeId: actorEntries.uid
+      // })
+      await utilities.jumpToSlice(viewport.element, {
+        imageIndex: index,
+      });
+      renderingEngine.render()
+    },
+    rotateBarMouseup(e) {
+      this.rotateBarInfo.isMove = false
+    },
+    sliderMouseup(e) {
+      this.sliderInfo.isMove = false
+    },
+    setAnnotation(imageId, element) {
+      this.measureDatas.forEach(item => {
+        if (item.OtherMeasureData) {
+          var { metadata, annotationUID } = item.OtherMeasureData
+          var { referencedImageId } = metadata
+          console.log(annotationUID, annotation.state.getAnnotation(annotationUID))
+          if (!annotation.state.getAnnotation(annotationUID) && referencedImageId === imageId) {
+            annotation.state.addAnnotation(item.OtherMeasureData, element)
+          }
+        }
+      })
+    },
+    setPreset(presetName) {
+      this.presetName = presetName
+    },
+    renderColorBar(presetName) {
+      var colorMap = null
+      if (presetName === 'hsv') {
+        colorMap = vtkColorMaps.getPresetByName(presetName)
+      } else {
+        colorMap = getColormap(presetName)
+      }
+      const rgbPoints = colorMap.RGBPoints
+      const canvas = document.getElementById('colorBar_Canvas')
+      const ctx = canvas.getContext('2d')
+      const canvasWidth = 160
+      const canvasHeight = 5
+      const rectWidth = 160
+      const rectHeight = canvasHeight
+      canvas.width = canvasWidth
+      canvas.height = canvasHeight
+      const gradient = ctx.createLinearGradient(0, 0, rectWidth, 0)
+      for (let i = 0; i < rgbPoints.length; i += 4) {
+        let position = 0
+        if (rgbPoints[0] === -1) {
+          position = (rgbPoints[i] + 1) / 2
+        } else {
+          position = rgbPoints[i]
+        }
+        const color = `rgb(${parseInt(rgbPoints[i + 1] * 255)}, ${parseInt(rgbPoints[i + 2] * 255)}, ${parseInt(rgbPoints[i + 3] * 255)})`
+        gradient.addColorStop(position, color)
+      }
+      ctx.fillStyle = gradient
+      ctx.fillRect(0, 0, rectWidth, rectHeight)
+    },
+    setWwWc() {
+      var properties = viewport.getProperties()
+      if (properties && properties.voiRange) {
+        var { lower, upper } = properties.voiRange
+        const windowWidth = upper - lower
+        const windowCenter = (upper + lower) / 2
+        this.imageInfo.wwwc = `${Math.round(windowWidth)}/${Math.round(windowCenter)}`
+      }
+    },
+    async getScreenshots() {
+      const divForDownloadViewport = document.querySelector(
+        `div[data-viewport-uid="FUSION_AXIAL"]`
+      )
+      // const divForDownloadViewport = document.querySelector(
+      //   '.viewport_container'
+      // )
+
+      var canvas = await html2canvas(divForDownloadViewport)
+      var pictureBaseStr = canvas.toDataURL('image/png', 1)
+      return pictureBaseStr
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.viewport_container{
+  width:100%;
+  height: 100%;
+  .seriesInfo_wrapper {
+    position: absolute;
+    left: 10px;
+    top: 10px;
+    text-align: left;
+    font-size: 12px;
+    z-index: 1;
+    .taskInfo_container{
+      color:#f44336;
+      padding: 5px 0px;
+      margin: 0;
+    }
+  }
+  .descInfo_wrapper{
+    position: absolute;
+    right: 20px;
+    top: 10px;
+    text-align: right;
+    font-size: 12px;
+    z-index: 1;
+  }
+  .imageInfo_wrapper_l{
+    position: absolute;
+    left: 10px;
+    bottom: 5px;
+    text-align: left;
+    font-size: 12px;
+    z-index: 1;
+  }
+  .imageInfo_wrapper_r{
+    position: absolute;
+    right: 40px;
+    bottom: 5px;
+    text-align: right;
+    font-size: 12px;
+    z-index: 1;
+  }
+  .slider_box{
+    position: absolute;
+    right: 1px;
+    height: calc(100% - 120px);
+    transform: translateY(-50%);
+    top: calc(50% - 30px);
+    width: 10px;
+    background: #333;
+    cursor: pointer;
+    .box{
+      z-index:10;
+      background: #9e9e9e;
+      height: 20px;
+      width: 100%;
+      position: absolute;
+      top: 0;
+      cursor: move
+    }
+  }
+  .color_bar{
+
+    position: absolute;
+
+    // transform:translateY(-50%);
+    transform: rotate(-90deg);
+    transform-origin: right;
+    left: -150px;
+    top: 30%;
+    // transform-origin: top left;
+    z-index: 1;
+    // background: #f44336;
+  }
+  .rotate_slider_box{
+    position: absolute;
+    width: 380px;
+    height: 10px;
+    bottom: 5px;
+    left: 50%;
+    transform: translateX(-50%);
+    background: #333;
+    cursor: pointer;
+    .box{
+      z-index:10;
+      background: #9e9e9e;
+      height: 100%;
+      width: 20px;
+      position: absolute;
+      top: 0;
+      cursor: move
+    }
+  }
+  // .my_slider_box:after{
+  //   content: '';
+  //   position: absolute;
+  //   bottom: -20px;
+  //   left: 0;
+  //   height: 20px;
+  //   width: 100%;
+  //   background: #333;
+  // }
+}
+</style>

src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/getCalibratedUnits.js

@@ -1,90 +1,234 @@
-import { Enums } from '@cornerstonejs/core'
+import { Enums, utilities } from '@cornerstonejs/core'
 
-const { CalibrationTypes } = Enums
-const PIXEL_UNITS = 'px'
+const { CalibrationTypes } = Enums;
+const PIXEL_UNITS = 'px';
+const SUPPORTED_REGION_DATA_TYPES = [
+  1, // Tissue
+  2, // Color Flow
+  3, // PW Spectral Doppler
+  4, // CW Spectral Doppler
+];
+const SUPPORTED_LENGTH_VARIANT = [
+  '3,3', // x: cm & y:cm
+  '4,7', // x: seconds & y : cm/sec
+];
+const SUPPORTED_PROBE_VARIANT = [
+  '4,3', // x: seconds & y : cm
+  '4,7', // x: seconds & y : cm/sec
+];
+const UNIT_MAPPING = {
+  0: 'px',
+  1: 'percent',
+  2: 'dB',
+  3: 'cm',
+  4: 'seconds',
+  5: 'hertz',
+  6: 'dB/seconds',
+  7: 'cm/sec',
+  8: 'cm\xb2',
+  9: 'cm\xb2/s',
+  0xc: 'degrees',
+};
 
-/**
- * Extracts the length units and the type of calibration for those units
- * into the response.  The length units will typically be either mm or px
- * while the calibration type can be any of a number of different calibraiton types.
- *
- * Volumetric images have no calibration type, so are just the raw mm.
- *
- * TODO: Handle region calibration
- *
- * @param handles - used to detect if the spacing information is different
- *   between various points (eg angled ERMF or US Region).
- *   Currently unused, but needed for correct US Region handling
- * @param image - to extract the calibration from
- *        image.calibration - calibration value to extract units form
- * @returns String containing the units and type of calibration
- */
-const getCalibratedLengthUnits = (handles, image) => {
-  const { calibration, hasPixelSpacing } = image
-  // Anachronistic - moving to using calibration consistently, but not completed yet
-  const units = hasPixelSpacing ? 'mm' : PIXEL_UNITS
-  if (!calibration || !calibration.type) {
-    return units
+const EPS = 1e-3;
+const SQUARE = '\xb2';
+const getCalibratedLengthUnitsAndScale = (image, handles) => {
+  const { calibration, hasPixelSpacing } = image;
+  let unit = hasPixelSpacing ? 'mm' : PIXEL_UNITS;
+  let areaUnit = unit + SQUARE;
+  let scale = 1;
+  let calibrationType = '';
+
+  if (
+    !calibration ||
+    (!calibration.type && !calibration.sequenceOfUltrasoundRegions)
+  ) {
+    return { unit, areaUnit, scale };
   }
+
   if (calibration.type === CalibrationTypes.UNCALIBRATED) {
-    return PIXEL_UNITS
+    return { unit: PIXEL_UNITS, areaUnit: PIXEL_UNITS + SQUARE, scale };
   }
-  // TODO - handle US regions properly
-  if (calibration.SequenceOfUltrasoundRegions) {
-    return 'US Region'
+
+  if (calibration.sequenceOfUltrasoundRegions) {
+    let imageIndex1, imageIndex2;
+    if (Array.isArray(handles) && handles.length === 2) {
+      [imageIndex1, imageIndex2] = handles;
+    } else if (typeof handles === 'function') {
+      const points = handles();
+      imageIndex1 = points[0];
+      imageIndex2 = points[1];
+    }
+
+    let regions = calibration.sequenceOfUltrasoundRegions.filter(
+      (region) =>
+        imageIndex1[0] >= region.regionLocationMinX0 &&
+        imageIndex1[0] <= region.regionLocationMaxX1 &&
+        imageIndex1[1] >= region.regionLocationMinY0 &&
+        imageIndex1[1] <= region.regionLocationMaxY1 &&
+        imageIndex2[0] >= region.regionLocationMinX0 &&
+        imageIndex2[0] <= region.regionLocationMaxX1 &&
+        imageIndex2[1] >= region.regionLocationMinY0 &&
+        imageIndex2[1] <= region.regionLocationMaxY1
+    );
+
+    // If we are not in a region at all we should show the underlying calibration
+    // which might be the mm spacing for the image
+    if (!regions?.length) {
+      return { unit, areaUnit, scale };
+    }
+
+    // if we are in a region then it is the question of whether we support it
+    // or not. If we do not support it we should show px
+
+    regions = regions.filter(
+      (region) =>
+        SUPPORTED_REGION_DATA_TYPES.includes(region.regionDataType) &&
+        SUPPORTED_LENGTH_VARIANT.includes(
+          `${region.physicalUnitsXDirection},${region.physicalUnitsYDirection}`
+        )
+    );
+
+    if (!regions.length) {
+      return {
+        unit: PIXEL_UNITS,
+        areaUnit: PIXEL_UNITS + SQUARE,
+        scale,
+      };
+    }
+
+    // Todo: expand on this logic
+    const region = regions[0];
+
+    const physicalDeltaX = Math.abs(region.physicalDeltaX);
+    const physicalDeltaY = Math.abs(region.physicalDeltaY);
+
+    // if we are in a supported region then we should check if the
+    // physicalDeltaX and physicalDeltaY are the same. If they are not
+    // then we should show px again, but if they are the same then we should
+    // show the units
+    const isSamePhysicalDelta = utilities.isEqual(
+      physicalDeltaX,
+      physicalDeltaY,
+      EPS
+    );
+
+    if (isSamePhysicalDelta) {
+      // 1 to 1 aspect ratio, we use just one of them
+      scale = 1 / physicalDeltaX;
+      calibrationType = 'US Region';
+      unit = UNIT_MAPPING[region.physicalUnitsXDirection] || 'unknown';
+      areaUnit = unit + SQUARE;
+    } else {
+      // here we are showing at the aspect ratio of the physical delta
+      // if they are not the same, then we should show px, but the correct solution
+      // is to grab each point separately and scale them individually
+      // Todo: implement this
+      return {
+        unit: PIXEL_UNITS,
+        areaUnit: PIXEL_UNITS + SQUARE,
+        scale,
+      };
+    }
+  } else if (calibration.scale) {
+    scale = calibration.scale;
   }
-  return `${units} ${calibration.type}`
-}
 
-const SQUARE = '\xb2'
-/**
- *  Extracts the area units, including the squared sign plus calibration type.
- */
-const getCalibratedAreaUnits = (handles, image) => {
-  const { calibration, hasPixelSpacing } = image
-  const units = (hasPixelSpacing ? 'mm' : PIXEL_UNITS) + SQUARE
-  if (!calibration || !calibration.type) {
-    return units
+  // everything except REGION/Uncalibrated
+  const types = [
+    CalibrationTypes.ERMF,
+    CalibrationTypes.USER,
+    CalibrationTypes.ERROR,
+    CalibrationTypes.PROJECTION,
+  ];
+
+  if (types.includes(calibration?.type)) {
+    calibrationType = calibration.type;
   }
-  if (calibration.SequenceOfUltrasoundRegions) {
-    return 'US Region'
+
+  return {
+    unit: unit + (calibrationType ? ` ${calibrationType}` : ''),
+    areaUnit: areaUnit + (calibrationType ? ` ${calibrationType}` : ''),
+    scale,
+  };
+};
+
+const getCalibratedProbeUnitsAndValue = (image, handles) => {
+  const [imageIndex] = handles;
+  const { calibration } = image;
+  let units = ['raw'];
+  let values = [null];
+  let calibrationType = '';
+
+  if (
+    !calibration ||
+    (!calibration.type && !calibration.sequenceOfUltrasoundRegions)
+  ) {
+    return { units, values };
+    // Todo: add support for other scenarios
   }
-  return `${units} ${calibration.type}`
-}
 
-/**
- * Gets the scale divisor for converting from internal spacing to
- * image spacing for calibrated images.
- */
+  if (calibration.sequenceOfUltrasoundRegions) {
+    // for Probe tool
+    const supportedRegionsMetadata =
+      calibration.sequenceOfUltrasoundRegions.filter(
+        (region) =>
+          SUPPORTED_REGION_DATA_TYPES.includes(region.regionDataType) &&
+          SUPPORTED_PROBE_VARIANT.includes(
+            `${region.physicalUnitsXDirection},${region.physicalUnitsYDirection}`
+          )
+      );
 
-const getCalibratedScale = (image) => {
-  let scale = null
-  if (image.calibration && image.calibration.scale) {
-    scale = image.calibration.scale
+    if (!supportedRegionsMetadata?.length) {
+      return { units, values };
+    }
+
+    const region = supportedRegionsMetadata.find(
+      (region) =>
+        imageIndex[0] >= region.regionLocationMinX0 &&
+        imageIndex[0] <= region.regionLocationMaxX1 &&
+        imageIndex[1] >= region.regionLocationMinY0 &&
+        imageIndex[1] <= region.regionLocationMaxY1
+    );
+
+    if (!region) {
+      return { units, values };
+    }
+
+    // Todo: I think this is a ok assumption for now that if the referencePixelX0 and referencePixelY0
+    // are not defined, then we can assume 0 for them
+    const { referencePixelX0 = 0, referencePixelY0 = 0 } = region;
+    const { physicalDeltaX, physicalDeltaY } = region;
+
+    const yValue =
+      (imageIndex[1] - region.regionLocationMinY0 - referencePixelY0) *
+      physicalDeltaY;
+
+    const xValue =
+      (imageIndex[0] - region.regionLocationMinX0 - referencePixelX0) *
+      physicalDeltaX;
+
+    calibrationType = 'US Region';
+    values = [xValue, yValue];
+    units = [
+      UNIT_MAPPING[region.physicalUnitsXDirection],
+      UNIT_MAPPING[region.physicalUnitsYDirection],
+    ];
   }
-  return scale || 1
-}
 
-/** Gets the aspect ratio of the screen display relative to the image
- * display in order to square up measurement values.
- * That is, suppose the spacing on the image is 1, 0.5 (x,y spacing)
- * This is displayed at 1, 1 spacing on screen, then the
- * aspect value will be 1/0.5 = 2
- */
+  return {
+    units,
+    values,
+    calibrationType,
+  };
+};
 
-const getCalibratedAspect = (image) => {
-  let aspect = null
-  if (image.calibration && image.calibration.aspect) {
-    aspect = image.calibration.aspect
-  }
-  return aspect || 1
-}
+const getCalibratedAspect = (image) => image.calibration?.aspect || 1;
 
-export default getCalibratedLengthUnits
+// export default getCalibratedLengthUnits
 
 export {
-  getCalibratedAreaUnits,
-  getCalibratedLengthUnits,
-  getCalibratedScale,
-  getCalibratedAspect
+  getCalibratedLengthUnitsAndScale,
+  getCalibratedAspect,
+  getCalibratedProbeUnitsAndValue,
 }

src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/getPixelValueUnits.js

@@ -0,0 +1,55 @@
+import { metaData } from '@cornerstonejs/core';
+
+
+/**
+ * Determines the appropriate pixel value units based on the image modality and options.
+ * @param modality - The modality of the image (e.g., 'CT', 'PT').
+ * @param imageId - The unique identifier for the image.
+ * @param options - Additional options for determining pixel units.
+ * @returns The appropriate pixel value units as a string.
+ */
+function getPixelValueUnits(
+  modality,
+  imageId,
+  options
+) {
+  if (modality === 'CT') {
+    return 'HU';
+  } else if (modality === 'PT') {
+    return _handlePTModality(imageId, options);
+  } else {
+    return '';
+  }
+}
+
+/**
+ * Handles the determination of pixel value units for PT (Positron Emission Tomography) modality.
+ * @param imageId - The unique identifier for the image.
+ * @param options - Additional options for determining pixel units.
+ * @returns The appropriate pixel value units for PT modality as a string.
+ */
+function _handlePTModality(
+  imageId,
+  options
+) {
+  if (!options.isPreScaled) {
+    return 'raw';
+  }
+
+  if (options.isSuvScaled) {
+    return 'SUV';
+  }
+
+  const generalSeriesModule = metaData.get('generalSeriesModule', imageId);
+
+  // It might be possible that the reference ImageId is not the one
+  // that is being displayed. So we need to get the modality from imageId again
+  if (generalSeriesModule?.modality === 'PT') {
+    const petSeriesModule = metaData.get('petSeriesModule', imageId);
+    return petSeriesModule?.units || 'unitless';
+  }
+
+  return 'unknown';
+}
+
+export { getPixelValueUnits };

src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initLibraries.js

@@ -1,14 +1,27 @@
 import initProviders from './initProviders'
-import initCornerstoneDICOMImageLoader from './initCornerstoneDICOMImageLoader'
+// import initCornerstoneDICOMImageLoader from './initCornerstoneDICOMImageLoader'
 import initVolumeLoader from './initVolumeLoader'
-import { init as csRenderInit } from '@cornerstonejs/core'
-import { init as csToolsInit } from '@cornerstonejs/tools'
+import {
+  init as csRenderInit,
+  imageLoader,
+  volumeLoader,
+  metaData,
+} from '@cornerstonejs/core';
+import * as cornerstoneTools from '@cornerstonejs/tools';
+import * as cornerstone from '@cornerstonejs/core';
+import { init as csToolsInit } from '@cornerstonejs/tools';
+import cornerstoneDICOMImageLoader from '@cornerstonejs/dicom-image-loader';
 
+window.cornerstone = cornerstone;
+window.cornerstoneTools = cornerstoneTools;
 export default async function initLibraries() {
-  initProviders()
-  initCornerstoneDICOMImageLoader()
-  initVolumeLoader()
-  await csRenderInit()
-  await csToolsInit()
+  initProviders();
+  cornerstoneDICOMImageLoader.init();
+  initVolumeLoader();
+  await csRenderInit({
+    // peerImport,
+    // ...(config?.core ? config.core : {}),
+  });
+  await csToolsInit();
 }