1

# Conflicts:
#	src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
#	src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

.eslintrc.js

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

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

@@ -10516,7 +10516,7 @@ class BaseViewer {
 
     const pageNumber = this._currentPageNumber,
           state = this.#scrollModePageState,
-          viewer = this.viewer;
+          viewmr = this.viewer;
     viewer.textContent = "";
     state.pages.length = 0;
 

README-zh.md

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

babel.config.js

@@ -1,10 +1,12 @@
 module.exports = {
   presets: [
-    '@vue/cli-plugin-babel/preset',
+    // '@vue/cli-plugin-babel/preset',
+    // ["@babel/preset-env", { "modules": false }]
     '@babel/preset-env'
   ],
   plugins: [
-    '@babel/plugin-proposal-optional-chaining',
-    '@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"
   ]
 }

public/index.html

@@ -30,7 +30,6 @@
     </script>
     <% } else { %>
     <script>
-      console.log(2)
       window.zzSessionStorage = {
         setItem: (item, value) => {
           return sessionStorage.setItem(item, value)

src/App.vue

@@ -23,12 +23,38 @@
     >
       i18n
     </div>
-    <el-drawer title="国际化" :visible.sync="drawer" direction="rtl" size="80%">
-      <div style="width: 320px">
-        <el-form label-width="100px" @submit.native.prevent size="small">
-          <el-form-item label="关键字">
+    <el-drawer
+      :title="$t('il8n:title')"
+      :visible.sync="drawer"
+      direction="rtl"
+      size="80%"
+    >
+      <div style="width: 800px">
+        <el-form
+          label-width="100px"
+          @submit.native.prevent
+          size="small"
+          :inline="true"
+          class="demo-form-inline"
+        >
+          <el-form-item :label="$t('il8n:search:keyword')">
             <el-input v-model="key" @input="keyChange" />
           </el-form-item>
+          <el-form-item :label="$t('il8n:search:state')">
+            <el-select
+              v-model="State"
+              clearable
+              filterable
+              @change="handleStateChange"
+            >
+              <el-option
+                v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
         </el-form>
       </div>
       <el-table
@@ -36,12 +62,14 @@
         v-adaptive="{ bottomOffset: 50 }"
         height="100"
         style="width: 100%"
+        @sort-change="handleSortByColumn"
       >
         <el-table-column
           prop="Code"
-          label="标签"
+          :label="$t('il8n:table:label')"
           width="300"
           show-overflow-tooltip
+          sortable="custom"
         >
         </el-table-column>
         <!--        <el-table-column-->
@@ -53,7 +81,11 @@
         <!--            {{scope.row.Description}}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column prop="Value" label="英文">
+        <el-table-column
+          prop="Value"
+          :label="$t('il8n:table:en')"
+          sortable="custom"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.Value"
@@ -66,7 +98,11 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="ValueCN" label="中文">
+        <el-table-column
+          prop="ValueCN"
+          :label="$t('il8n:table:cn')"
+          sortable="custom"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.ValueCN"
@@ -79,12 +115,41 @@
             ></el-input>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="ValueCN"
+          :label="$t('il8n:table:state')"
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.State"
+              clearable
+              filterable
+              size="mini"
+            >
+              <el-option
+                v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="Version"
+          :label="$t('il8n:table:Version')"
+          sortable="custom"
+        >
+        </el-table-column>
       </el-table>
       <div style="text-align: right; padding-top: 10px; padding-right: 10px">
-        <el-button size="mini" @click="drawer = false">取消 </el-button>
-        <el-button size="mini" type="primary" @click="handleSave"
-          >保存</el-button
-        >
+        <el-button size="mini" @click="drawer = false"
+          >{{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="mini" type="primary" @click="handleSave">{{
+          $t('common:button:save')
+        }}</el-button>
       </div>
     </el-drawer>
     <feedBack v-if="$route.matched.length > 0" />
@@ -110,10 +175,13 @@ export default {
       show: false,
       key: null,
       arr: [],
+      il8nExternal: false,
+      State: null,
     }
   },
   mounted() {
     this.show = process.env.VUE_APP_OSS_PATH === '/test/dist'
+    Vue.prototype.$openI18n = this.openI18n
   },
   // watch: {
   //   '$route.query': {
@@ -145,6 +213,23 @@ export default {
   //   },
   // },
   methods: {
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.tableData.sort((a, b) =>
+          a[column.prop].localeCompare(b[column.prop])
+        )
+      } else {
+        this.tableData.sort((a, b) =>
+          b[column.prop].localeCompare(a[column.prop])
+        )
+      }
+    },
+    handleStateChange() {
+      this.tableData.forEach((item) => {
+        item.State = this.State
+      })
+    },
     changeValue(target, attr, e) {
       this.$set(target, attr, e)
     },
@@ -154,9 +239,12 @@ export default {
           [],
           this.arr.filter(
             (v) =>
-              ~v.Code.indexOf(this.key) ||
-              ~v.Value.indexOf(this.key) ||
-              ~v.ValueCN.indexOf(this.key)
+              (v.Code &&
+                ~v.Code.toLowerCase().indexOf(this.key.toLowerCase())) ||
+              (v.Value &&
+                ~v.Value.toLowerCase().indexOf(this.key.toLowerCase())) ||
+              (v.ValueCN &&
+                ~v.ValueCN.toLowerCase().indexOf(this.key.toLowerCase()))
           )
         )
       } else {
@@ -164,39 +252,75 @@ 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('国际化修改成功')
-          }
-        )
-      })
+      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() {
+    openI18n(ARRAY) {
       this.tableData = []
+      this.il8nExternal = false
+      this.State = null
       this.key = null
       this.drawer = true
       let arr = []
-      let tableData = this.$tl.map((v) => {
-        let a = { ...v }
-        // if (!a.Description) {
-        //   a.Description = this.$route.path
-        // }
-        return a
-      })
+      let tableData = []
+      if (ARRAY && Array.isArray(ARRAY)) {
+        this.il8nExternal = true
+        let data = ARRAY.map((v) => {
+          let a = { ...v }
+
+          return a
+        })
+        tableData = data.map((item) => {
+          return {
+            Code: item.Code,
+            Description: item.Description,
+            FrontType: item.FrontType,
+            Module: item.Module,
+            Value: item.Value,
+            ValueCN: item.ValueCN,
+            State: item.State,
+            Version: item.Version,
+            InternationalizationType: item.InternationalizationType,
+          }
+        })
+        this.tableData = Object.assign([], tableData)
+        this.arr = Object.assign([], tableData)
+        return false
+      } else {
+        tableData = this.$tl.map((v) => {
+          let a = { ...v }
+          // if (!a.Description) {
+          //   a.Description = this.$route.path
+          // }
+          return a
+        })
+      }
       tableData = tableData.filter((v) => {
         // return  ~this.$path.indexOf(v.Description + '_' + v.Code)
         return ~this.$path.indexOf(v.Code)
@@ -213,6 +337,9 @@ export default {
             Description: null,
             Value: null,
             ValueCN: null,
+            State: 0,
+            Version: this.$version.Version,
+            InternationalizationType: 0,
           })
         }
       })

src/api/admin.js

@@ -44,11 +44,19 @@ export function updateUser(param) {
     data: param
   })
 }
-
-export function getUser(userId) {
+export function updateUserBasicInfo(param) {
   return request({
-    url: `/user/getUser/${userId}`,
-    method: 'get'
+    url: `/user/updateUserBasicInfo`,
+    method: 'put',
+    data: param
+  })
+}
+
+export function getUser(params) {
+  return request({
+    url: `/user/getUser`,
+    method: 'get',
+    params
   })
 }
 
@@ -317,3 +325,28 @@ export function useUserIDGetDoctorID(data) {
     data
   })
 }
+
+// 管理端修改用户角色
+export function updateUserRoleInfo(data) {
+  return request({
+    url: `/User/updateUserRoleInfo`,
+    method: 'put',
+    data
+  })
+}
+// 管理端新增用户发送邮件
+export function addNewUserSendEmail(data) {
+  return request({
+    url: `/User/addNewUserSendEmail`,
+    method: 'post',
+    data
+  })
+}
+// 用户追溯
+export function getUserJoinedTrialList(data) {
+  return request({
+    url: `/TrialMaintenance/getUserJoinedTrialList`,
+    method: 'post',
+    data
+  })
+}

src/api/dictionary.js

@@ -1069,4 +1069,255 @@ export function batchAddEnrollOrPdEmailConfig(params) {
     method: 'post',
     params
   })
-}
+}
+// 文件记录-系统文件列表
+export function getSysFileTypeList(data) {
+  return request({
+    url: `/SysFileType/getSysFileTypeList`,
+    method: 'post',
+    data
+  })
+}
+// 文件记录-新增/编辑系统文件
+export function addOrUpdateSysFileType(data) {
+  return request({
+    url: `/SysFileType/addOrUpdateSysFileType`,
+    method: 'post',
+    data
+  })
+}
+// 文件记录-删除系统文件
+export function deleteSysFileType(id) {
+  return request({
+    url: `/SysFileType/deleteSysFileType/${id}`,
+    method: 'delete'
+  })
+}
+// 项目文档-获取项目菜单
+export function getTrialFileTypeData(data) {
+  return request({
+    url: `/TrialFileType/getTrialFileTypeData`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-修改项目菜单启用
+export function setAuthorizedView(data) {
+  return request({
+    url: `/TrialFileType/setAuthorizedView`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-新增/修改项目菜单
+export function addOrUpdateTrialFileType(data) {
+  return request({
+    url: `/TrialFileType/addOrUpdateTrialFileType`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除项目菜单
+export function deleteTrialFileType(id) {
+  return request({
+    url: `/TrialFileType/deleteTrialFileType/${id}`,
+    method: 'delete',
+  })
+}
+// 项目文档-报告/文档列表
+export function getTrialFinalRecordList(data) {
+  return request({
+    url: `/TrialFinalRecord/getTrialFinalRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-报告/文档授权
+export function authorizedTrialFinalRecord(data) {
+  return request({
+    url: `/TrialFinalRecord/authorizedTrialFinalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-报告/文档新增/修改
+export function addOrUpdateTrialFinalRecord(data) {
+  return request({
+    url: `/TrialFinalRecord/addOrUpdateTrialFinalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除报告/文档
+export function deleteTrialFinalRecord(id) {
+  return request({
+    url: `/TrialFinalRecord/deleteTrialFinalRecord/${id}`,
+    method: 'delete',
+  })
+}
+// 项目文档-一般文件记录列表
+export function getTrialNormalRecordList(data) {
+  return request({
+    url: `/TrialNormalRecord/getTrialNormalRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-一般文件记录授权
+export function authorizedTTrialNormalRecord(data) {
+  return request({
+    url: `/TrialNormalRecord/authorizedTTrialNormalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-一般文件记录批量新增
+export function batchAddTrialNormalRecord(data) {
+  return request({
+    url: `/TrialNormalRecord/batchAddTrialNormalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-一般文件记录新增/修改
+export function addOrUpdateTrialNormalRecord(data) {
+  return request({
+    url: `/TrialNormalRecord/addOrUpdateTrialNormalRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除一般文件记录
+export function deleteTrialNormalRecord(id) {
+  return request({
+    url: `/TrialNormalRecord/deleteTrialNormalRecord/${id}`,
+    method: 'delete',
+  })
+}
+// 项目文档-批量删除一般文件记录
+export function deleteTrialNormalRecordList(data) {
+  return request({
+    url: `/TrialNormalRecord/deleteTrialNormalRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-培训记录列表
+export function getTrialTrianingRecordList(data) {
+  return request({
+    url: `/TrialTrianingRecord/getTrialTrianingRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-培训记录新增/修改
+export function addOrUpdateTrialTrianingRecord(data) {
+  return request({
+    url: `/TrialTrianingRecord/addOrUpdateTrialTrianingRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-培训记录批量新增/修改
+export function batchAddTrialTrianingRecord(data) {
+  return request({
+    url: `/TrialTrianingRecord/batchAddTrialTrianingRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除培训记录
+export function deleteTrialTrianingRecord(id) {
+  return request({
+    url: `/TrialTrianingRecord/deleteTrialTrianingRecord/${id}`,
+    method: 'delete',
+  })
+}
+// 项目文档-培训记录授权
+export function authorizedTrialTrianingRecord(data) {
+  return request({
+    url: `/TrialTrianingRecord/authorizedTrialTrianingRecord`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-阅片人简历
+export function getTrialDoctorList(data) {
+  return request({
+    url: `/DoctorList/getTrialDoctorList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-上传同意入项记录
+export function uploadTrialFileTypeFile(data) {
+  return request({
+    url: `/TrialFileType/uploadTrialFileTypeFile`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-获取上传同意入项记录
+export function getTrialFileTypeFile(data) {
+  return request({
+    url: `/TrialFileType/getTrialFileTypeFile`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除上传同意入项记录
+export function deleteTrialTypeFile(params) {
+  return request({
+    url: `/TrialFileType/deleteTrialTypeFile`,
+    method: 'post',
+    params
+  })
+}
+// 项目文档-获取资质材料列表
+export function getTrialAttachments(data) {
+  return request({
+    url: `/Attachment/getTrialAttachments`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-修改资质材料稽查状态
+export function setAuthorizedViewC(data) {
+  return request({
+    url: `/Attachment/setAuthorizedView`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-上传资质材料
+export function saveTrialAttachments(data) {
+  return request({
+    url: `/Attachment/saveTrialAttachments`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-资质材料(获取医生列表)
+export function getTrialDoctorListC(data) {
+  return request({
+    url: `/Attachment/getTrialDoctorList`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-修改资质材料
+export function updateTrialAttachments(data) {
+  return request({
+    url: `/Attachment/updateTrialAttachments`,
+    method: 'post',
+    data
+  })
+}
+// 项目文档-删除资质材料
+export function deleteAttachment(data) {
+  return request({
+    url: `/Attachment/deleteAttachment`,
+    method: 'post',
+    data
+  })
+}

src/api/reading.js

@@ -251,3 +251,37 @@ export function uploadOCTLipidAngleTemplate(param) {
     data: param
   })
 }
+
+export function saveTableQuestionMark(param, type) {
+  return request({
+    url: `/saveTableQuestionMark/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function deleteTableQuestionMark(param, type) {
+  return request({
+    url: `/deleteTableQuestionMark/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function submitTaskRowInfo(param, type) {
+  return request({
+    url: `/SubmitTaskRowInfo/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function deleteSingleTableQuestionMark(param, type) {
+  return request({
+    url: `/DeleteSingleTableQuestionMark/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+

src/api/trials.js

@@ -1080,6 +1080,19 @@ export function setSeriesStatus(trialId, subjectVisitId, studyId, seriesId, stat
     method: 'put'
   })
 }
+export function setNodicomStudyState(params) {
+  return request({
+    url: `/QCOperation/setNodicomStudyState`,
+    method: 'put',
+    params
+  })
+}
+export function setInstanceStatus(trialId, subjectVisitId, seriesId, instanceId, state) {
+  return request({
+    url: `/QCOperation/setInstanceState/${trialId}/${subjectVisitId}/${seriesId}/${instanceId}/${state}`,
+    method: 'put'
+  })
+}
 
 export function getVisitQCStudyAndSeriesList(subjectVisitId) {
   return request({
@@ -1365,9 +1378,9 @@ export function getForwardList(param) {
   })
 }
 
-export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '') {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading = false) {
   return request({
-    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}`,
+    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
     method: 'get'
   })
 }
@@ -3914,4 +3927,71 @@ export function getVisitClinicalDataName(data) {
     method: 'post',
     data
   })
-}
+}
+//  修改外部人员权限配置
+export function configTrialSPMInfo(data) {
+  return request({
+    url: `/TrialConfig/configTrialSPMInfo`,
+    method: 'post',
+    data
+  })
+}
+
+//  项目添加角色修改权限
+export function updateTrialUserRole(data) {
+  return request({
+    url: `/TrialMaintenance/updateTrialUserRole`,
+    method: 'put',
+    data
+  })
+}
+
+// 获取报表配置
+export function getTrialQuestionExportResult(data) {
+  return request({
+    url: `/ReadingQuestion/getTrialQuestionExportResult`,
+    method: 'post',
+    data
+  })
+}
+// 修改报表配置
+export function setTrialQuestionExportResult(data) {
+  return request({
+    url: `/ReadingQuestion/SetTrialQuestionExportResult`,
+    method: 'post',
+    data
+  })
+}
+// 项目加入人员发送邮件
+export function trialUserSendJoinEmail(data) {
+  return request({
+    url: `/TrialMaintenance/trialUserSendJoinEmail`,
+    method: 'post',
+    data
+  })
+}
+
+// 获取非Dicom标记
+export function getNoneDicomMarkListOutDto(data) {
+  return request({
+    url: `/ReadingImageTask/getNoneDicomMarkListOutDto`,
+    method: 'post',
+    data
+  })
+}
+// 添加非Dicom标记
+export function addNoneDicomMark(data) {
+  return request({
+    url: `/ReadingImageTask/addNoneDicomMark`,
+    method: 'post',
+    data
+  })
+}
+// 删除非Dicom标记
+export function deleteTrialFileType(id) {
+  return request({
+    url: `/ReadingImageTask/deleteTrialFileType/${id}`,
+    method: 'post'
+  })
+}
+

src/api/trials/setting.js

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

src/api/user.js

@@ -179,11 +179,11 @@ export function verifyMFACode(params) {
 }
 
 // 发送MFA邮件
-export function sendMFAEmail(params) {
+export function sendMFAEmail(data) {
   return request({
     url: `/User/sendMFAEmail`,
     method: 'post',
-    params
+    data
   })
 }
 // 获取公钥
@@ -193,3 +193,19 @@ export function getPublicKey() {
     method: 'get',
   })
 }
+// 登陆获取角色
+export function getUserLoginRoleList(data) {
+  return request({
+    url: `/User/getUserLoginRoleList`,
+    method: 'post',
+    data,
+  })
+}
+// 登陆角色id获取token
+export function loginSelectUserRole(params) {
+  return request({
+    url: `/User/loginSelectUserRole`,
+    method: 'get',
+    params,
+  })
+}

src/components/BaseContainer/index.vue

@@ -4,6 +4,7 @@
       <el-col :span="24">
         <div class="box">
           <div class="box-body">
+            <slot name="title-container" />
             <div class="search">
               <slot name="search-container" />
             </div>
@@ -24,42 +25,42 @@ export default {
   props: {
     noTitle: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   computed: {
     contentClass() {
       return this.noTitle ? 'content-notitle' : 'content'
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss">
-  .box-body{
-     padding:  0px;
-     background-color: #fff;
-     .el-card__body {
-      padding: 0px;
-    }
-    .search{
-      display: flex;
-      padding: 5px;
+.box-body {
+  padding: 0px;
+  background-color: #fff;
+  .el-card__body {
+    padding: 0px;
+  }
+  .search {
+    display: flex;
+    padding: 5px;
 
-      .mr5{
-        margin-right:5px;
-      }
-      .el-form-item{
-        margin-bottom: 10px;
-      }
+    .mr5 {
+      margin-right: 5px;
     }
-    .page{
-      text-align: right;
-      padding-top: 3px;
-    }
-    .el-button.is-circle {
-      padding: 9px;
-      font-weight: bold;
-      font-size: 14px;
+    .el-form-item {
+      margin-bottom: 10px;
     }
   }
+  .page {
+    text-align: right;
+    padding-top: 3px;
+  }
+  .el-button.is-circle {
+    padding: 9px;
+    font-weight: bold;
+    font-size: 14px;
+  }
+}
 </style>

src/components/BaseForm/search-form.vue

@@ -1,7 +1,7 @@
 <!-- 搜索表单 -->
 <template>
   <div class="base-search-form">
-    <el-form :size="size" :inline="true" :label-width="labelWidth">
+    <el-form :inline="true" :label-width="labelWidth">
       <el-form-item
         v-for="item in searchForm"
         :key="item.prop"
@@ -13,6 +13,7 @@
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
+          clearable
           :style="{ width: item.width }"
           :readonly="item.readonly"
         />
@@ -22,6 +23,7 @@
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
+          clearable
           :style="{ width: item.width }"
           @change="item.change && item.change(that, searchData[item.prop])"
         >
@@ -37,6 +39,7 @@
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
+          clearable
           :style="{ width: item.width }"
           @change="item.change && item.change(that, searchData[item.prop])"
         >
@@ -96,6 +99,7 @@
           value-format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           :picker-options="item.pickerOption"
+          clearable
         />
         <!-- 时间 -->
         <el-time-select
@@ -104,6 +108,7 @@
           :placeholder="item.placeholder"
           type=""
           :style="{ width: item.width }"
+          clearable
         />
         <!-- 日期时间 -->
         <el-date-picker
@@ -114,12 +119,14 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           :disabled="item.disable && item.disable(searchData[item.prop])"
           :style="{ width: item.width }"
+          clearable
         />
         <!-- 日期时间段 -->
         <el-date-picker
           v-if="item.type === 'Daterange'"
           v-model="searchData[item.prop]"
           type="datetimerange"
+          :default-time="['00:00:00', '23:59:59']"
           :range-separator="$t('baseForm:daterange:rangeSeparator')"
           :start-placeholder="$t('baseForm:daterange:startPlaceholder')"
           :end-placeholder="$t('baseForm:daterange:startendPlaceholder')"
@@ -139,17 +146,18 @@
         <!-- 具名slot -->
         <slot v-if="item.type === 'Custom'" :name="item.slot" />
       </el-form-item>
-      <el-form-item v-for="item in searchHandle" :key="item.label">
-        <slot v-if="item.slot" :name="item.slot" />
-        <el-button
-          v-else
-          :type="item.type"
-          :size="item.size || size"
-          :icon="item.icon || ''"
-          @click="handleClick(item.emitKey)"
-          >{{ item.label }}</el-button
-        >
-      </el-form-item>
+      <div style="display: inline-block;width: fit-content;">
+        <el-form-item v-for="item in searchHandle" :key="item.label">
+          <slot v-if="item.slot" :name="item.slot" />
+          <el-button
+            v-else
+            :type="item.type"
+            :icon="item.icon || ''"
+            @click="handleClick(item.emitKey)"
+            >{{ item.label }}</el-button
+          >
+        </el-form-item>
+      </div>
     </el-form>
   </div>
 </template>
@@ -167,11 +175,11 @@ export default {
     },
     labelWidth: {
       type: String,
-      default: "",
+      default: '',
     },
     size: {
       type: String,
-      default: "mini",
+      default: 'mini',
     },
     searchForm: {
       type: Array,
@@ -189,10 +197,10 @@ export default {
   methods: {
     handleClick(emitKey) {
       // emit事件
-      this.$emit(`${emitKey}`);
+      this.$emit(`${emitKey}`)
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .base-search-form {

src/components/BaseTable/index.vue

@@ -48,6 +48,7 @@
             :show-overflow-tooltip="column.showOverflowTooltip || false"
             :sortable="column.sortable || false"
             :prop="column.prop"
+            :fixed="column.fixed"
           >
             <template slot-scope="scope">
               <!-- 仅仅显示文字 -->
@@ -61,8 +62,11 @@
                   </a> -->
                   <span v-for="(operate, i) in column.operates" :key="i">
                     <el-button
-                      :size="operate.size || 'mini'"
                       :type="operate.type || 'primary'"
+                      v-if="
+                        (operate.show && scope.row[operate.show]) ||
+                        !operate.show
+                      "
                       style="margin-right: 5px"
                       @click="handleClick(operate, scope.row)"
                       >{{ operate.name }}</el-button

src/components/Dicom/DicomCanvas.vue

@@ -90,7 +90,7 @@
       custom-class="base-dialog-wrapper"
       append-to-body
     >
-      <DicomTags :image-id="stack.imageIds[stack.currentImageIdIndex]" @close="dcmTag.visible = false" />
+      <dicom-tags :image-id="stack.imageIds[stack.currentImageIdIndex]" @close="dcmTag.visible = false" />
     </el-dialog>
   </div>
 </template>
@@ -217,10 +217,10 @@ export default {
         this.stack.description = dicomSeries.description
         this.toolState.viewportInvert = false
         this.toolState.dicomInfoVisible = false
-        var imageId = this.stack.imageIds[this.stack.currentImageIdIndex]
-        var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-        instanceId = instanceId.split('.')[0]
-        this.stack.instanceId = instanceId
+        // var imageId = this.stack.imageIds[this.stack.currentImageIdIndex]
+        // var instanceId = imageId.split('/')[imageId.split('/').length - 1]
+        // instanceId = instanceId.split('.')[0]
+        // this.stack.instanceId = instanceId
         this.toolState.clipPlaying = false
         const element = this.$refs.canvas
         cornerstone.enable(element)
@@ -346,9 +346,9 @@ export default {
       //   return
       // }
       // this.stack.instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
-      var instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
-      instanceId = instanceId.split('.')[0]
-      this.stack.instanceId = instanceId
+      // var instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
+      // instanceId = instanceId.split('.')[0]
+      // this.stack.instanceId = instanceId
       this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
       this.resetWwwc()
     },
@@ -415,15 +415,16 @@ export default {
     },
 
     onImageRendered(e) {
-      var imageId = e.detail.image.imageId
-      var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-      instanceId = instanceId.split('.')[0]
+      // var imageId = e.detail.image.imageId
+      // var instanceId = imageId.split('/')[imageId.split('/').length - 1]
+      // instanceId = instanceId.split('.')[0]
 
-      if (this.imageId !== instanceId) {
-        this.getOrientationMarker(e.detail.element)
-        this.imageId = instanceId
-      }
-      this.stack.instanceId = instanceId
+      // if (this.imageId !== instanceId) {
+      //   this.getOrientationMarker(e.detail.element)
+      //   this.imageId = instanceId
+      // }
+      this.getOrientationMarker(e.detail.element)
+      // this.stack.instanceId = instanceId
       var viewport = e.detail.viewport
       this.dicomInfo.wwwc = `${Math.round(
         viewport.voi.windowWidth

src/components/MFA/index.vue

@@ -21,7 +21,7 @@
       label-width="100px"
     >
       <!-- 邮箱 -->
-      <p class="tip">
+      <p class="tip_mfa">
         <i class="el-icon-warning" style="color: #409eff"></i>
         <span>{{ tip }}</span>
       </p>
@@ -83,7 +83,7 @@ export default {
       second: 60,
       form: {
         Code: null,
-        UserId: null,
+        IdentityUserId: null,
         EMail: null,
         username: null,
       },
@@ -115,7 +115,7 @@ export default {
   methods: {
     open(data) {
       let { UserId, status, username, EMail } = data;
-      this.form.UserId = UserId;
+      this.form.IdentityUserId = UserId;
       this.status = status ? status : "login";
       this.form.username = username;
       this.form.EMail = EMail;
@@ -134,10 +134,10 @@ export default {
         let res = await verifyMFACode(this.form);
         this.loading = false;
         if (res.IsSuccess) {
-          if (this.status === "login") {
-            this.$message.success(this.$t("mfa:message:verifySuccess"));
-          }
-          this.$emit("success", this.form.UserId);
+          // if (this.status === "login") {
+          //   this.$message.success(this.$t("mfa:message:verifySuccess"));
+          // }
+          this.$emit("success", this.form.IdentityUserId);
           this.cancel();
         }
       } catch (err) {
@@ -154,7 +154,7 @@ export default {
           this.timer = null;
         }
         let data = {
-          UserId: this.form.UserId,
+          IdentityUserId: this.form.IdentityUserId,
         };
         if (this.status === "lock") {
           data.MfaType = 1;
@@ -189,7 +189,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.tip {
+.tip_mfa {
   width: 86%;
   margin: auto;
   margin-bottom: 20px;

src/components/TrialsTab/index.vue

@@ -3,7 +3,7 @@
   <div class="trialsTab">
     <el-tabs v-model="trialsTab" @tab-click="clickTab">
       <el-tab-pane v-for="item of trialsRouter.children.find(v => {return v.name == 'TrialsPanel'}).children" :key="`tab${item.path}`" :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'" :label="$t(item.LanguageMark)" :name="item.path">
-        <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab">
+        <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab" style="background-color: #f5f7fa;">
           <template v-for="item1 of item.children">
             <el-tab-pane
               v-if="TrialConfig && isShow(item1.path)"
@@ -22,11 +22,14 @@
         <i class="iconfont" style="font-size: 30px;color:#ccc">&#xe680;</i>
       </div>
       <!-- 返回项目列表 -->
-      <div class="my_icon_box" :title="$t('trials:trials:title:backTrialList')" @click="goBack">
+      <el-button type="primary" size="small" @click="goBack">
         <i class="iconfont">&#xe670;</i>
-        <!-- 返回 -->
         <span>{{ $t('trials:trials:title:back') }}</span>
-      </div>
+      </el-button>
+      <!-- <div class="my_icon_box" :title="$t('trials:trials:title:backTrialList')" @click="goBack">
+        <i class="iconfont">&#xe670;</i>
+        <span>{{ $t('trials:trials:title:back') }}</span>
+      </div> -->
     </div>
   </div>
 </template>
@@ -146,6 +149,7 @@ export default {
       return isShow
     },
     goBack() {
+      zzSessionStorage.removeItem('lastWorkbench')
       this.$router.push({ path: '/trials/trials-list' })
     },
     selectTrials(v) {
@@ -221,6 +225,9 @@ export default {
     .el-tabs__header{
       margin-bottom: 3px;
     }
+    .el-tabs__item.is-active{
+      font-weight: bold;
+    }
     position: relative;
     .el-input--medium .el-input__inner{
       height: 44px;line-height: 44px;width: 280px;

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

@@ -0,0 +1,126 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    v-dialogDrag
+    width="540px"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    append-to-body
+    :title="$t('toggleRole:tip:title')"
+    center
+    top="30vh"
+    :show-close="false"
+    :before-close="cancel"
+  >
+    <template v-if="hasRole">
+      <el-radio-group v-model="form.userRoleId" class="roles">
+        <el-radio
+          v-for="item in roles"
+          :key="item.Id"
+          :label="item.Id"
+          :disabled="item.IsUserRoleDisabled"
+          style="margin-bottom: 10px"
+        >
+          {{ item.UserTypeShortName }}
+        </el-radio>
+      </el-radio-group>
+    </template>
+
+    <div v-else style="text-align: center">
+      {{ $t('toggleRole:tip:noRole') }}
+    </div>
+    <div slot="footer">
+      <!-- 取消 -->
+      <el-button size="small" @click="cancel()">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <!-- 保存 -->
+      <el-button
+        type="primary"
+        size="small"
+        @click="save"
+        :disabled="saveDisabled"
+        :loading="loading"
+        v-if="hasRole"
+      >
+        {{ $t('common:button:confirm') }}
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+export default {
+  name: 'toggleRole',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      form: {
+        userRoleId: null,
+      },
+    }
+  },
+  created() {
+    this.form.userRoleId = zzSessionStorage.getItem('userId')
+  },
+  computed: {
+    roles() {
+      return this.$store.state.user.roles
+    },
+    hasRole() {
+      return this.roles && this.roles.length > 0
+    },
+    saveDisabled() {
+      return this.form.userRoleId === zzSessionStorage.getItem('userId')
+    },
+  },
+  methods: {
+    cancel() {
+      this.$emit('update:visible', false)
+      this.$emit('cancel')
+    },
+    async save() {
+      try {
+        if (!this.form.userRoleId)
+          return this.$message.warning(this.$t('toggleRole:ruleMessage:select'))
+          zzSessionStorage.removeItem('lastWorkbench')
+        this.$emit('save', this.form.userRoleId)
+      } catch (err) {
+        console.log(err)
+      }
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.roles {
+  max-width: 365px;
+  width: fit-content;
+  display: flex;
+  align-content: center;
+  // justify-content: center;
+  flex-wrap: wrap;
+  margin: auto;
+}
+
+::v-deep .el-radio__original {
+  display: none !important; /* 隐藏原生 radio 输入，但仍然允许交互 */
+}
+
+::v-deep.el-radio:focus:not(.is-focus):not(:active):not(.is-disabled)
+  .el-radio__inner {
+  box-shadow: none !important;
+}
+.el-radio {
+  width: 60px;
+}
+</style>

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -1308,7 +1308,7 @@ export default {
                                     o.imageColumns,
                                     o.imageRows
                                   )
-                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                                   let OSSclient = scope.OSSclient
                                   let seriesRes = await OSSclient.put(
                                     thumbnailPath,
@@ -1421,7 +1421,7 @@ export default {
                     v.instanceList[0].imageColumns,
                     v.instanceList[0].imageRows
                   )
-                  let thumbnailPath = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                   let OSSclient = scope.OSSclient
                   try {
                     let seriesRes = await OSSclient.put(thumbnailPath, blob)
@@ -1499,8 +1499,8 @@ export default {
       return new Promise((resolve) => {
         cornerstone.loadImage(imageId).then(async (image) => {
           let canvas = document.createElement('canvas')
-          canvas.width = width
-          canvas.height = height
+          canvas.width = (width * 60) / height
+          canvas.height = 60
           if (image) {
             cornerstone.renderToCanvas(canvas, image)
             // 将 Canvas 图像对象转换为 PNG 格式

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

@@ -567,7 +567,7 @@ export default {
       for (let i = 0; i < arr.length; i++) {
         let dicom = arr[i];
         if (dicom.StudyInstanceUid !== StudyInstanceUid) continue;
-        let thumbnailPath = `/${dicom.params.TrialId}/TaskImage/${dicom.params.SubjectId}/${dicom.params.VisitTaskId}/${dicom.StudyInstanceUid}/${dicom.SeriesInstanceUid}.png`;
+        let thumbnailPath = `/${dicom.params.TrialId}/TaskImage/${dicom.params.SubjectId}/${dicom.params.VisitTaskId}/${dicom.StudyInstanceUid}/${dicom.SeriesInstanceUid}.jpg`;
         if (!studyObj[dicom.StudyId]) {
           studyObj[dicom.StudyId] = {
             StudyId: dicom.StudyId,

src/const/check/index.js

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

src/directive/dialogDrag.js

@@ -10,7 +10,7 @@ const dialogDrag = Vue.directive('dialogDrag', {
     dragDom.style.cssText += ';top:0px;'
 
     // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
-    const sty = (function() {
+    const sty = (function () {
       if (window.document.currentStyle) {
         return (dom, attr) => dom.currentStyle[attr]
       } else {
@@ -47,8 +47,10 @@ const dialogDrag = Vue.directive('dialogDrag', {
         styL = +styL.replace(/\px/g, '')
         styT = +styT.replace(/\px/g, '')
       }
+      const oldMousemove = document.onmousemove
 
-      document.onmousemove = function(e) {
+      document.onmousemove = function (e) {
+        oldMousemove(e)
         // 通过事件委托，计算移动的距离
         let left = e.clientX - disX
         const top = e.clientY - disY
@@ -70,8 +72,8 @@ const dialogDrag = Vue.directive('dialogDrag', {
         dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`
       }
 
-      document.onmouseup = function(e) {
-        document.onmousemove = null
+      document.onmouseup = function (e) {
+        document.onmousemove = oldMousemove
         document.onmouseup = null
       }
     }

src/layout/components/Navbar.vue

@@ -14,13 +14,13 @@
 
     <div class="right-menu">
       <div class="navbar-flex-wrapper">
-        <template v-if="device!=='mobile'">
+        <template v-if="device !== 'mobile'">
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
         </template>
         <!-- <div class="avatar-container">
         <img src="@/assets/avatar.png" class="user-avatar">
       </div> -->
-        <div style="margin-left:20px;">
+        <div style="margin-left: 20px">
           <el-dropdown class="dropdown-container" trigger="click">
             <span class="el-dropdown-link">
               {{ `${name} (${userTypeShortName})` }}
@@ -30,10 +30,20 @@
             </span>
             <el-dropdown-menu slot="dropdown" class="user-dropdown">
               <el-dropdown-item v-if="!isReviewer">
-                <span style="display:block;" @click="editInfo">{{$t('system:navbar:button:Profile')}}</span>
+                <span style="display: block" @click="editInfo">{{
+                  $t('system:navbar:button:Profile')
+                }}</span>
+              </el-dropdown-item>
+              <!-- 切换角色 -->
+              <el-dropdown-item divided v-if="hasRole">
+                <span style="display: block" @click="openToggleRole">{{
+                  $t('system:navbar:button:toggleRole')
+                }}</span>
               </el-dropdown-item>
               <el-dropdown-item divided>
-                <span style="display:block;" @click="logout">{{$t('system:navbar:button:Log Out')}}</span>
+                <span style="display: block" @click="logout">{{
+                  $t('system:navbar:button:Log Out')
+                }}</span>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -41,38 +51,119 @@
         <TopLang></TopLang>
       </div>
     </div>
+    <toggleRole
+      v-if="toggleRoleVisible"
+      :visible.sync="toggleRoleVisible"
+      :loading="toggleRoleLoading"
+      @save="loginByRole"
+    />
   </div>
 </template>
 
 <script>
-import {mapGetters, mapMutations} from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import TopLang from './topLang'
-
-
+import toggleRole from '@/components/toggleRole'
+import { resetRouter } from '@/router'
 export default {
   components: {
     Breadcrumb,
     Hamburger,
     Screenfull,
-    TopLang
+    TopLang,
+    toggleRole,
   },
   data() {
     return {
       isReviewer: false,
-      userTypeShortName: zzSessionStorage.getItem('userTypeShortName')
+      toggleRoleVisible: false,
+      toggleRoleLoading: false,
     }
   },
   computed: {
-    ...mapGetters(['sidebar', 'name', 'device'])
+    ...mapGetters(['sidebar', 'name', 'device', 'userTypeShortName']),
+    roles() {
+      return this.$store.state.user.roles
+    },
+    hasRole() {
+      return this.roles && this.roles.length > 1
+    },
   },
   created() {
-    this.isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer'))
+    // this.isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer'))
   },
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    openToggleRole() {
+      this.$store.dispatch('user/getUserInfo').then((res) => {
+        this.toggleRoleVisible = true
+      })
+    },
+    loginByRole(userRoleId) {
+      if (this.$store.state.user.userId === userRoleId) {
+        this.toggleRoleVisible = false
+        this.toggleRoleLoading = false
+        return false
+      }
+      this.toggleRoleLoading = true
+      this.$store
+        .dispatch('user/loginByRole', { userRoleId })
+        .then((res) => {
+          if (res) {
+            this.$store
+              .dispatch('permission/generateRoutes')
+              .then(async (res) => {
+                if (res && res.length > 0) {
+                  resetRouter()
+                  await this.$store.dispatch('global/getNoticeList')
+                  this.$router.addRoutes(res)
+                  this.toggleRoleLoading = false
+                  if (this.loginType === 'DevOps') {
+                    this.$router.replace({ path: res[0].path })
+                    return
+                  }
+                  if (this.hasPermi(['role:radmin'])) {
+                    this.$router.replace({ path: res[0].path })
+                    return
+                  }
+                  if (
+                    this.hasPermi([
+                      'role:air',
+                      'role:rpm',
+                      'role:rcrc',
+                      'role:rir',
+                    ])
+                  ) {
+                    history.replaceState(null, null, '/trials/trials-list')
+                    history.go(0)
+                  } else {
+                    history.replaceState(null, null, '/trials/trials-workbench')
+                    history.go(0)
+                  }
+                  this.toggleRoleVisible = false
+                  this.toggleRoleLoading = false
+                  this.$EventBus.$emit('reload')
+                } else {
+                  // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
+                  this.toggleRoleLoading = false
+                  this.$message.warning(this.$t('login:message:login2'))
+                }
+              })
+              .catch((err) => {
+                console.log(err)
+                this.toggleRoleLoading = false
+              })
+          } else {
+            this.toggleRoleLoading = false
+          }
+        })
+        .catch(() => {
+          this.toggleRoleLoading = false
+        })
+    },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
@@ -84,23 +175,23 @@ export default {
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      // //this.$i18n.locale = 'zh'
+      // //this.setLanguage('zh')
       this.$updateDictionary()
     },
     editInfo() {
       this.$router.push({ name: 'BaiscInfo' })
     },
-  }
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-.navbar-flex-wrapper{
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-  }
+.navbar-flex-wrapper {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
 .navbar {
   height: 50px;
   overflow: hidden;

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')) {
@@ -293,6 +293,7 @@ async function VueInit() {
     }()
     _vm.$forceUpdate()
   }
+  Vue.prototype.$EventBus = new Vue()
   Vue.prototype.$path = []
   var t = function (key) {
     if (!~Vue.prototype.$path.indexOf(key)) {
@@ -402,8 +403,12 @@ async function VueInit() {
     }
     _vm.$store.dispatch('user/logout').then(res => {
       // window.location.href = `/login`
-      if (_vm.$msgbox) {
-        _vm.$msgbox.close();
+      try {
+        if (_vm.$msgbox && _vm.$msgbox.close) {
+          _vm.$msgbox.close();
+        }
+      } catch (err) {
+        console.log(err)
       }
       _vm.$FB.close();
       _vm.$FBT.close();
@@ -456,8 +461,8 @@ async function VueInit() {
             var my_username = zzSessionStorage.getItem('my_username')
             var my_password = zzSessionStorage.getItem('my_password')
             let my_userid = zzSessionStorage.getItem('userId')
-            let my_EMail = zzSessionStorage.getItem('my_EMail')
-            if (md5(_vm.unlock.my_password) === my_password && my_username === _vm.unlock.my_username) {
+            let my_EMail = zzSessionStorage.getItem('my_EMail') || ''
+            if (md5(_vm.unlock.my_password) === my_password && (my_username === _vm.unlock.my_username || my_EMail.toUpperCase() === vm.unlock.my_username.toUpperCase())) {
               resetReadingRestTime().then(() => {
               })
               const closeLock = (_vm) => {

src/permission.js

@@ -1,20 +1,21 @@
 import router from './router'
+import { resetRouter } from '@/router'
 import store from './store'
 // import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
+import { getToken, removeToken } from '@/utils/auth'
 import Vue from 'vue'
 import { OSSclient } from './utils/oss'
-import WHITELIST from "./utils/whiteList"
+import WHITELIST from './utils/whiteList'
 import { getTrialExtralConfig } from '@/api/trials'
 // import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false })
 
 const whiteList = WHITELIST
-store.state.trials.whiteList = whiteList;
-router.beforeEach(async (to, from, next) => {
+store.state.trials.whiteList = whiteList
+router.beforeEach(async(to, from, next) => {
   NProgress.start()
   // 设置页面标题
   // document.title = getPageTitle(to.meta.title) store.state.trials.whiteList.indexOf(to.path) === -1
@@ -26,14 +27,13 @@ router.beforeEach(async (to, from, next) => {
     to.query.trialId !==
     store.state.trials.config.trialId
   ) {
-    console.log(to.query.path)
-    let res = await getTrialExtralConfig({
-      TrialId: to.query.trialId,
+    const res = await getTrialExtralConfig({
+      TrialId: to.query.trialId
     })
     if (res.IsSuccess) {
       store.dispatch('trials/setConfig', {
         trialId: to.query.trialId,
-        ...res.Result,
+        ...res.Result
       })
     }
   }
@@ -45,13 +45,13 @@ router.beforeEach(async (to, from, next) => {
     to.query.trialId !==
     store.state.trials.config.trialId
   ) {
-    let res = await getTrialExtralConfig({
-      TrialId: to.query.trialId,
+    const res = await getTrialExtralConfig({
+      TrialId: to.query.trialId
     })
     if (res.IsSuccess) {
       store.dispatch('trials/setConfig', {
         trialId: to.query.trialId,
-        ...res.Result,
+        ...res.Result
       })
     }
   }
@@ -70,6 +70,16 @@ router.beforeEach(async (to, from, next) => {
       }
       next()
       NProgress.done()
+    } else if (from.path === '/researchForm') {
+      removeToken()
+      const lang = to.query.lang || zzSessionStorage.getItem('lang')
+      next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`)
+      NProgress.done()
+    } else if (from.path === '/researchDetail_m') {
+      removeToken()
+      const lang = to.query.lang || zzSessionStorage.getItem('lang')
+      next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
+      NProgress.done()
     } else {
       await OSSclient()
       const hasGetUserInfo = store.getters.userId
@@ -79,10 +89,13 @@ router.beforeEach(async (to, from, next) => {
         try {
           // 获取用户信息
           await store.dispatch('user/getInfo')
+          await store.dispatch('user/getUserInfo')
           const accessRoutes = await store.dispatch('permission/generateRoutes')
+          resetRouter()
           router.addRoutes(accessRoutes)
           next({ ...to, replace: true })
         } catch (error) {
+          console.log(error)
           // 删除token并进入登录页面以重新登录
           await store.dispatch('user/resetToken')
           next(`/login?redirect=${to.path}`)
@@ -94,9 +107,10 @@ router.beforeEach(async (to, from, next) => {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
       if (to.path === '/researchLogin') {
+        const lang = to.query.lang || zzSessionStorage.getItem('lang')
         const flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
         if (flag) {
-          next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${to.query.lang}`)
+          next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
         } else {
           next()
         }
@@ -109,10 +123,12 @@ router.beforeEach(async (to, from, next) => {
       }
     } else {
       if (to.path === '/researchForm') {
-        next(`/researchLogin?`)
+        const lang = to.query.lang || zzSessionStorage.getItem('lang')
+        next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`)
         NProgress.done()
       } else if (to.path === '/researchDetail_m') {
-        next(`/researchLogin_m?`)
+        const lang = to.query.lang || zzSessionStorage.getItem('lang')
+        next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
         NProgress.done()
       } else if (to.path === '/ReviewersResearchForm') {
         next(`/ReviewersResearch?`)

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/settings.js

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

src/store/getters.js

@@ -3,10 +3,12 @@ const getters = {
   device: state => state.app.device,
   token: state => state.user.token,
   name: state => state.user.name,
+  userTypeShortName: state => state.user.userTypeShortName,
   permissions: state => state.user.permissions,
   tree: state => state.user.tree,
   userName: state => state.user.userName,
   userId: state => state.user.userId,
+  identityUserId: state => state.user.identityUserId,
   routes: state => state.permission.routes,
   asyncRoutes: state => state.permission.addRoutes,
   visitedViews: state => state.tagsView.visitedViews,
@@ -45,6 +47,9 @@ const getters = {
   language: state => state.lang.language,
   TotalNeedSignSystemDocCount: state => state.user.TotalNeedSignSystemDocCount,
   TotalNeedSignTrialDocCount: state => state.user.TotalNeedSignTrialDocCount,
-  TrialStatusStr: state => state.user.TrialStatusStr
+  IsFirstSysDocNeedSign: state => state.user.IsFirstSysDocNeedSign,
+  TrialStatusStr: state => state.user.TrialStatusStr,
+  lastViewportTaskId: state => state.noneDicomReview.lastViewportTaskId,
+  currentTaskState: state => state.noneDicomReview.currentTaskState
 }
 export default getters

src/store/index.js

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

src/store/modules/noneDicomReview.js

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

src/store/modules/reading.js

@@ -70,6 +70,12 @@ function getQuestions(questions) {
               answerObj.angle = angle
               answerObj.saveTypeEnum = isNaN(parseFloat(angle)) ? 1 : 2
             }
+          } else if (criterionType === 21) {
+            // MRI-PDFF
+            let isMeasurable = getQuestionAnswer(item.TableQuestions.Questions, 1105, answerObj)
+            answerObj.isMeasurable = isMeasurable
+            answerObj.mean = getQuestionAnswer(item.TableQuestions.Questions, 1104, answerObj)
+            answerObj.saveTypeEnum = parseInt(isMeasurable) === 1 && isNaN(parseFloat(answerObj.mean)) ? 1 : 2
           } else {
             answerObj.lesionPart = getQuestionAnswer(item.TableQuestions.Questions, 8, answerObj)
             answerObj.loctation = getQuestionAnswer(item.TableQuestions.Questions, 6, answerObj)
@@ -507,6 +513,7 @@ const actions = {
     })
   },
   getMeasuredData({ state }, visitTaskId) {
+    console.log('getMeasuredData')
     return new Promise(resolve => {
       var index = state.visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId)
       if (state.visitTaskList[index].measureDataInit) {
@@ -523,6 +530,13 @@ const actions = {
               el.OtherMeasureData = JSON.parse(el.OtherMeasureData)
               el.OtherMeasureData.data.remark = el.OrderMarkName
             }
+            // if (el.TableQuestionMarkList.length > 0) {
+            //   let list = el.TableQuestionMarkList.map(i=>{
+            //     i.MeasureData = i.MeasureData ? JSON.parse(i.MeasureData) : ''
+            //     return i
+            //   })
+            //   el.TableQuestionMarkList = list
+            // }
             arr.push(el)
           })
           state.visitTaskList[index].MeasureData = arr
@@ -606,6 +620,13 @@ const actions = {
             el.MeasureData = JSON.parse(el.MeasureData)
             el.MeasureData.data.remark = el.OrderMarkName
           }
+          // if (el.TableQuestionMarkList.length > 0) {
+          //   let list = el.TableQuestionMarkList.map(i=>{
+          //     i.MeasureData = i.MeasureData ? JSON.parse(i.MeasureData) : ''
+          //     return i
+          //   })
+          //   el.TableQuestionMarkList = list
+          // }
           arr.push(el)
         })
         state.visitTaskList[index].MeasureData = arr
@@ -623,27 +644,40 @@ const actions = {
       resolve(noneDicomMeasureData)
     })
   },
-  addMeasuredData({ state }, obj) {
+  addMeasuredData({ state }, obj) { 
     return new Promise(resolve => {
+      const criterionType = parseInt(localStorage.getItem('CriterionType'))
       var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
       var measureData = state.visitTaskList[index].MeasureData
       // var idx = measureData.findIndex(item => item.MeasureData.uuid === obj.data.MeasureData.data.uuid)
-      var idx = measureData.findIndex(item => item.QuestionId === obj.data.QuestionId && item.RowIndex === obj.data.RowIndex)
-      if (idx > -1) {
-        for (const k in state.visitTaskList[index].MeasureData[idx]) {
-          if (k !== 'Id' && obj.data[k]) {
-            state.visitTaskList[index].MeasureData[idx][k] = obj.data[k]
+      
+      if (criterionType === 21) {
+        let i = measureData.findIndex(i=>i.TableQuestionId === obj.data.TableQuestionId)
+        if (i > -1) {
+          for (const k in state.visitTaskList[index].MeasureData[i]) {
+            if (k !== 'Id' && obj.data[k]) {
+              state.visitTaskList[index].MeasureData[i][k] = obj.data[k]
+            }
           }
+        } else {
+          state.visitTaskList[index].MeasureData.push(obj.data)
         }
-
-        // state.visitTaskList[index].MeasureData[idx].MeasureData = obj.data.MeasureData
-        console.log('更新标记成功', idx)
       } else {
-        state.visitTaskList[index].MeasureData.push(obj.data)
-        console.log('新增标记成功')
+        var idx = measureData.findIndex(item => item.QuestionId === obj.data.QuestionId && item.RowIndex === obj.data.RowIndex)
+        if (idx > -1) {
+          for (const k in state.visitTaskList[index].MeasureData[idx]) {
+            if (k !== 'Id' && obj.data[k]) {
+              state.visitTaskList[index].MeasureData[idx][k] = obj.data[k]
+            }
+          }
+          console.log('更新标记成功', idx)
+        } else {
+          state.visitTaskList[index].MeasureData.push(obj.data)
+          console.log('新增标记成功')
+        }
       }
+      
       // sessionStorage.setItem('visitTaskList', state.visitTaskList.length > 0 ? JSON.stringify(state.visitTaskList) : '')
-      console.log(state.visitTaskList)
       resolve()
     })
   },
@@ -738,32 +772,45 @@ const actions = {
     return new Promise(resolve => {
       var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
       var measureData = state.visitTaskList[index].MeasureData
-
-      // var uuid = obj.measureData.data.uuid
-      // var idx = measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)
-      var idx = measureData.findIndex(item => item.QuestionId === obj.questionId && item.RowIndex === obj.rowIndex)
-      if (idx > -1) {
-        if (measureData[idx].FristAddTaskId) {
-          measureData[idx].MeasureData = ''
-          console.log('清除标记成功', idx)
-        } else {
-          measureData.splice(idx, 1)
-          console.log('移除标记成功', idx)
-        }
-        state.visitTaskList[index].MeasureData = measureData
-      } else if (obj.orderMarkName) {
+      const criterionType = parseInt(localStorage.getItem('CriterionType'))
+      if (criterionType === 21) {
         const i = measureData.findIndex(item => item.QuestionId === obj.questionId && item.OrderMarkName === obj.orderMarkName)
-        if (i > -1) {
-          if (measureData[i].FristAddTaskId) {
-            measureData[i].MeasureData = ''
-            console.log('清除标记成功', i)
-          } else {
-            measureData.splice(i, 1)
-            console.log('移除标记成功', i)
+          if (i > -1) {
+            if (measureData[i].FristAddTaskId) {
+              measureData[i].MeasureData = ''
+              console.log('清除标记成功', i)
+            } else {
+              measureData.splice(i, 1)
+              console.log('移除标记成功', i)
+            }
           }
-        }
         state.visitTaskList[index].MeasureData = measureData
+      } else {
+        var idx = measureData.findIndex(item => item.QuestionId === obj.questionId && item.RowIndex === obj.rowIndex)
+        if (idx > -1) {
+          if (measureData[idx].FristAddTaskId) {
+            measureData[idx].MeasureData = ''
+            console.log('清除标记成功', idx)
+          } else {
+            measureData.splice(idx, 1)
+            console.log('移除标记成功', idx)
+          }
+          state.visitTaskList[index].MeasureData = measureData
+        } else if (obj.orderMarkName) {
+          const i = measureData.findIndex(item => item.QuestionId === obj.questionId && item.OrderMarkName === obj.orderMarkName)
+          if (i > -1) {
+            if (measureData[i].FristAddTaskId) {
+              measureData[i].MeasureData = ''
+              console.log('清除标记成功', i)
+            } else {
+              measureData.splice(i, 1)
+              console.log('移除标记成功', i)
+            }
+          }
+          state.visitTaskList[index].MeasureData = measureData
+        }
       }
+      
       // if (idx > -1) {
       //   measureData.splice(idx, 1)
 
@@ -840,6 +887,12 @@ const actions = {
                       const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
                       imageIds.push(imageId)
                     })
+                  } else if (study.IsCriticalSequence && instance.KeyFramesList.length === 0) {
+                    // 兼容保存标记数据未存NumberOfFrames的情况，按序列展示
+                    for (let i = 0; i < instance.NumberOfFrames; i++) {
+                      const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
+                      imageIds.push(imageId)
+                    }
                   } else {
                     for (let i = 0; i < instance.NumberOfFrames; i++) {
                       const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
@@ -1034,7 +1087,7 @@ const actions = {
     }
   },
   setImageloadedInfo({ state }, obj) {
-    console.log('setImageloadedInfo', obj)
+    // console.log('setImageloadedInfo', obj)
     // if(obj.instance === '20dd8fc9-51b0-ec63-942b-cb3006c72650')
     // var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
     // // const prefetchInstanceCount = state.visitTaskList[index].StudyList[obj.studyIndex].SeriesList[obj.seriesIndex].prefetchInstanceCount

src/store/modules/user.js

@@ -1,5 +1,6 @@
 import { getToken, setToken, removeToken, setName, removeName } from '@/utils/auth'
-import { login, loginOut, getUserMenuTree, getUserPermissions } from '@/api/user'
+import { login, loginOut, getUserMenuTree, getUserPermissions, getUserLoginRoleList, loginSelectUserRole } from '@/api/user'
+import { getUser } from '@/api/admin'
 
 import { resetRouter } from '@/router'
 import md5 from 'js-md5'
@@ -7,22 +8,29 @@ const getDefaultState = () => {
   return {
     token: getToken(),
     name: '',
+    userTypeShortName: "",
     userName: '',
     userId: '',
+    identityUserId: '',
     avatar: '',
     permissions: [],
     tree: [],
     /* eslint-disable */
     TotalNeedSignSystemDocCount: eval(process.env.VUE_APP_WORD_FOR_PERMISSION) ? null : 0,
     TotalNeedSignTrialDocCount: eval(process.env.VUE_APP_WORD_FOR_PERMISSION) ? null : 0,
+    IsFirstSysDocNeedSign: false,
     TrialStatusStr: null,
-    isTestUser: false
+    isTestUser: false,
+    roles: []
   }
 }
 
 const state = getDefaultState()
 
 const mutations = {
+  SET_ROLES: (state, roles) => {
+    state.roles = roles
+  },
   RESET_STATE: (state) => {
     Object.assign(state, getDefaultState())
   },
@@ -34,6 +42,9 @@ const mutations = {
   SET_NAME: (state, name) => {
     state.name = name
   },
+  SET_USERTYPESHORTNAME: (state, userTypeShortName) => {
+    state.userTypeShortName = userTypeShortName
+  },
   SET_USERNAME: (state, name) => {
     state.userName = name
   },
@@ -49,9 +60,16 @@ const mutations = {
   SET_USERID: (state, id) => {
     state.userId = id
   },
+  SET_IDENTITYUSERID: (state, id) => {
+    state.identityUserId = id
+  },
   SET_ISTESTUSER: (state, isTestUser) => {
     state.isTestUser = eval(isTestUser)
   },
+  SET_IS_FIRST_SYSTEM_DOC_SIGN: (state, IsFirstSysDocNeedSign) => {
+    zzSessionStorage.setItem('IsFirstSysDocNeedSign', IsFirstSysDocNeedSign)
+    state.IsFirstSysDocNeedSign = IsFirstSysDocNeedSign
+  },
   SET_NEED_SIGN_SYSTEM_DOC_COUNT: (state, TotalNeedSignSystemDocCount) => {
     /* eslint-disable */
     if (eval(process.env.VUE_APP_WORD_FOR_PERMISSION) && !state.isTestUser) {
@@ -78,6 +96,9 @@ const mutations = {
 }
 
 const actions = {
+  setRoles({ commit }, roles) {
+    commit('SET_ROLES', roles)
+  },
   changeUserName({ commit }, userName) {
     commit('SET_USERNAME', userName)
   },
@@ -91,7 +112,7 @@ const actions = {
       if (UserId) {
         data.UserId = UserId;
       }
-      login(data).then(async response => {
+      getUserLoginRoleList(data).then(async response => {
         if (response.IsSuccess) {
           zzSessionStorage.removeItem('lastWorkbench')
           zzSessionStorage.setItem('my_username', username.trim())
@@ -99,6 +120,7 @@ const actions = {
           zzSessionStorage.setItem('my_EMail', response.Result.BasicInfo.EMail)
           localStorage.setItem('CompanyInfo', JSON.stringify(response.Result.CompanyInfo))
           const data = response.Result
+          commit('SET_ROLES', data.BasicInfo.AccountList)
           if (data.BasicInfo.IsFirstAdd || data.BasicInfo.LoginState === 1) {
             try {
               zzSessionStorage.setItem('userId', data.BasicInfo.Id)
@@ -114,25 +136,24 @@ const actions = {
               zzSessionStorage.setItem('IsReviewer', data.BasicInfo.IsReviewer)
               zzSessionStorage.setItem('userName', data.BasicInfo.UserName)
               commit('SET_TOKEN', data.JWTStr)
-              commit('SET_NAME', data.BasicInfo.RealName)
-              zzSessionStorage.setItem('realName', data.BasicInfo.RealName)
+              // commit('SET_NAME', data.BasicInfo.UserName)
               zzSessionStorage.setItem('isTestUser', data.BasicInfo.IsTestUser)
               commit('SET_ISTESTUSER', data.BasicInfo.IsTestUser)
               commit('SET_USERNAME', data.BasicInfo.UserName)
-              commit('SET_USERID', data.BasicInfo.Id)
               setToken(data.JWTStr)
-              setName(data.BasicInfo.RealName)
-              const userString = decodeURIComponent(escape(window.atob(data.JWTStr.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
-              const user = JSON.parse(userString)
-              zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
-              zzSessionStorage.setItem('userId', user.id)
-              zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
-              var permissions = await getUserPermissions()
-              var menuTree = await getUserMenuTree()
-              commit('SET_TREE', menuTree.Result)
-              commit('SET_PERMISSIONS', permissions.Result)
-              zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
-              zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
+              // setName(data.BasicInfo.RealName)
+              // const userString = decodeURIComponent(escape(window.atob(data.JWTStr.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
+              // const user = JSON.parse(userString)
+              // zzSessionStorage.setItem('userId', user.identityUserId)
+              // commit('SET_IDENTITYUSERID', user.identityUserId)
+              // zzSessionStorage.setItem('identityUserId', user.identityUserId)
+              // zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
+              // var permissions = await getUserPermissions()
+              // var menuTree = await getUserMenuTree()
+              // commit('SET_TREE', menuTree.Result)
+              // commit('SET_PERMISSIONS', permissions.Result)
+              // zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
+              // zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
             } catch (e) {
               console.log(e)
             }
@@ -146,6 +167,51 @@ const actions = {
       })
     })
   },
+  loginByRole({ commit }, userInfo) {
+    const { userRoleId } = userInfo
+    let params = {
+      userRoleId
+    }
+    return new Promise((resolve, reject) => {
+
+      loginSelectUserRole(params).then(async response => {
+        if (response.IsSuccess) {
+          const data = response.Result
+
+          try {
+            commit('SET_TOKEN', data)
+            setToken(data)
+            commit('SET_USERID', userRoleId)
+            zzSessionStorage.setItem('userId', userRoleId)
+            const userString = decodeURIComponent(escape(window.atob(data.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
+            const user = JSON.parse(userString)
+            zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
+            commit('SET_USERTYPESHORTNAME', user.userTypeShortName)
+            commit('SET_NAME', user.fullName)
+            setName(user.fullName)
+            commit('SET_IDENTITYUSERID', user.identityUserId)
+            zzSessionStorage.setItem('identityUserId', user.identityUserId)
+            zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
+            var permissions = await getUserPermissions()
+            var menuTree = await getUserMenuTree()
+            commit('SET_TREE', menuTree.Result)
+            commit('SET_PERMISSIONS', permissions.Result)
+            zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
+            zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
+            zzSessionStorage.removeItem('lastWorkbench')
+          } catch (e) {
+            console.log(e)
+          }
+          resolve(response.Result)
+
+        } else {
+          reject(response.ErrorMessage)
+        }
+      }).catch(() => {
+        reject()
+      })
+    })
+  },
   setTree({ commit }, tree) {
     commit('SET_TREE', tree)
   },
@@ -155,6 +221,9 @@ const actions = {
   setTotalNeedSignSystemDocCount({ commit }, TotalNeedSignSystemDocCount) {
     commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', TotalNeedSignSystemDocCount)
   },
+  setIsFirstSysDocNeedSign({ commit }, IsFirstSysDocNeedSign) {
+    commit('SET_IS_FIRST_SYSTEM_DOC_SIGN', IsFirstSysDocNeedSign)
+  },
   setTotalNeedSignTrialDocCount({ commit }, TotalNeedSignTrialDocCount) {
     commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', TotalNeedSignTrialDocCount)
   },
@@ -170,32 +239,69 @@ const actions = {
     commit('SET_PERMISSIONS', JSON.parse(zzSessionStorage.getItem('permissions')))
     commit('SET_ISTESTUSER', zzSessionStorage.getItem('isTestUser'))
     const user = JSON.parse(userString)
-    commit('SET_NAME', zzSessionStorage.getItem('realName'))
-    commit('SET_USERID', user.id)
+    commit('SET_NAME', zzSessionStorage.getItem('Name'))
+    commit('SET_USERTYPESHORTNAME', user.userTypeShortName)
+    commit('SET_IDENTITYUSERID', user.identityUserId)
+    commit('SET_USERID', user.userRoleId)
     commit('SET_USERNAME', zzSessionStorage.getItem('userName'))
     commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')))
     commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignTrialDocCount')))
-    console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))
-    console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
+    commit('SET_IS_FIRST_SYSTEM_DOC_SIGN', zzSessionStorage.getItem('IsFirstSysDocNeedSign'))
+    // console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))
+    // console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
     zzSessionStorage.setItem('userName', user.name)
-    zzSessionStorage.setItem('userId', user.id)
+    zzSessionStorage.setItem('userId', user.userRoleId)
+    zzSessionStorage.setItem('identityUserId', user.identityUserId)
     zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
     zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
     return user
   },
   updateInfo({ commit, state }) {
-    commit('SET_NAME', zzSessionStorage.getItem('realName'))
+    commit('SET_NAME', zzSessionStorage.getItem('Name'))
+  },
+  // 获取用户信息
+  getUserInfo({ commit, state }) {
+    return new Promise((resolve, reject) => {
+      getUser().then(res => {
+        if (res.Result) {
+          commit('SET_ROLES', res.Result.AccountList)
+        }
+        resolve(res.Result)
+      }).catch(err => {
+        reject(err)
+      })
+    })
   },
   // user logout
   async logout({ commit, state }) {
     try {
       removeToken() // must remove  token  first
       await loginOut({
-        Userd: zzSessionStorage.getItem('userId')
+        UserRoleId: zzSessionStorage.getItem('userId'),
+        IdentityUserId: zzSessionStorage.getItem('identityUserId'),
       })
       resetRouter()
       removeName()
+      let lang = zzSessionStorage.getItem('lang')
       zzSessionStorage.clear()
+      zzSessionStorage.setItem('lang', lang)
+      commit('RESET_STATE')
+    } catch (e) {
+      console.log(e)
+    }
+  },
+  async resetData({ commit, state }) {
+    try {
+      removeToken() // must remove  token  first
+      // await loginOut({
+      //   UserRoleId: zzSessionStorage.getItem('userId'),
+      //   IdentityUserId: zzSessionStorage.getItem('identityUserId'),
+      // })
+      resetRouter()
+      removeName()
+      let lang = zzSessionStorage.getItem('lang')
+      zzSessionStorage.clear()
+      zzSessionStorage.setItem('lang', lang)
       commit('RESET_STATE')
     } catch (e) {
       console.log(e)

src/styles/element-ui.scss

@@ -47,3 +47,6 @@
 .el-range-separator {
   box-sizing: content-box;
 }
+.el-select-dropdown__wrap{
+  max-height: 350px;
+}

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/utils/dialog.js

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

src/utils/get-page-title.js

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

src/utils/index.js

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

src/utils/oss.js

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

src/utils/parseDicom.js

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

src/utils/request-download.js

@@ -89,9 +89,9 @@ service.interceptors.response.use(
           })
           store.dispatch('user/logout').then(() => {
             router.push(`/login`)
-            this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
-            this.$updateDictionary()
+            //this.$i18n.locale = 'zh'
+            //this.setLanguage('zh')
+            // this.$updateDictionary()
           })
         }
       } else {

src/utils/request.js

@@ -1,11 +1,11 @@
 import axios from 'axios'
-import _vm from '@/main'
 import { Message, MessageBox, Alert } from 'element-ui'
 import store from '@/store'
 import router from '@/router'
 import WHITELIST from "./whiteList"
 import moment from 'moment-timezone';
 import { encryptConfig } from "@/utils/encrypt"
+const ROUTER = require('@/router');
 axios.defaults.withCredentials = false
 const service = axios.create({
   baseURL: '/api',
@@ -91,13 +91,20 @@ service.interceptors.response.use(
       const status = error.response.status
       if (error.response.data && (error.response.data.Code === -1 || error.response.data.Code === -2)) {
         store.dispatch('user/logout').then(() => {
-          if (_vm.$msgbox) {
-            _vm.$msgbox.close();
+          let _vm = ROUTER.default.app
+          try {
+            if (_vm.$msgbox && _vm.$msgbox.close) {
+              _vm.$msgbox.close();
+            }
+          } catch (err) {
+            console.log(err)
           }
           router.push(`/login`)
-          this.$i18n.locale = 'zh'
-          this.setLanguage('zh')
-          this.$updateDictionary()
+          // if (!this.$i18n.locale) {
+          //   //this.$i18n.locale = 'zh'
+          //   //this.setLanguage('zh')
+          // }
+          // this.$updateDictionary()
         })
       }
       switch (status) {
@@ -127,9 +134,9 @@ service.interceptors.response.use(
           }
           store.dispatch('user/logout').then(() => {
             router.push(`/login`)
-            this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
-            this.$updateDictionary()
+            // //this.$i18n.locale = 'zh'
+            // //this.setLanguage('zh')
+            // this.$updateDictionary()
           })
         } else {
           setTimer({
@@ -143,6 +150,7 @@ service.interceptors.response.use(
           setTimer([message, store.state.lang.language === 'en' ? 'Warning' : '警告', {
             type: 'warning',
             showCancelButton: false,
+            confirmButtonText: store.state.lang.language === 'en' ? 'ok' : "确定",
             callback: action => { }
           }], 'confirm')
         }
@@ -153,6 +161,7 @@ service.interceptors.response.use(
         [store.state.lang.language === 'en' ? 'Please check your network，and try again later！' : '请检查网络，稍后重试！', store.state.lang.language === 'en' ? 'Warning' : '警告', {
           type: 'warning',
           showCancelButton: false,
+          confirmButtonText: store.state.lang.language === 'en' ? 'ok' : "确定",
           callback: action => { }
         }], "confirm"
       )
@@ -171,6 +180,8 @@ const setTimer = (obj, type) => {
       Message(obj)
     }
     if (type === 'confirm') {
+      obj[2].closeOnClickModal = false
+      obj[2].closeOnPressEscape = false
       MessageBox.confirm(...obj)
     }
     clearTimeout(timer);

src/utils/stream.js

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

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

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

src/views/admin/user/components/UserInfo.vue

@@ -5,7 +5,7 @@
     :model="user"
     :rules="userFormRules"
     label-width="150px"
-    style="width:800px;"
+    style="width: 800px"
   >
     <el-card class="Basic" shadow="never" size="small">
       <div slot="header" class="clearfix">
@@ -25,7 +25,7 @@
       <el-form-item label="Given Name: " prop="FirstName">
         <el-input v-model="user.FirstName" />
       </el-form-item>
-      <el-form-item label="Gender: " prop="Sex" style="margin-right:40px;">
+      <el-form-item label="Gender: " prop="Sex" style="margin-right: 40px">
         <el-radio-group v-model="user.Sex">
           <el-radio :label="1">Male</el-radio>
           <el-radio :label="0">Female</el-radio>
@@ -37,13 +37,24 @@
       <el-form-item label="Phone: " prop="Phone">
         <el-input v-model="user.Phone" />
       </el-form-item>
-      <el-form-item v-if="type==1" label="Disable:">
-        <el-switch v-model="user.Status" :active-value="0" :inactive-value="1" />
+      <el-form-item v-if="type == 1" label="Disable:">
+        <el-switch
+          v-model="user.Status"
+          :active-value="0"
+          :inactive-value="1"
+        />
       </el-form-item>
       <el-form-item label="User Type: " prop="UserTypeId">
-        <el-select ref="userType" v-model="user.UserTypeId" size="small" placeholder="Please select" style="width:100%;" :disabled="user.CanEditUserType === false">
+        <el-select
+          ref="userType"
+          v-model="user.UserTypeId"
+          size="small"
+          placeholder="Please select"
+          style="width: 100%"
+          :disabled="user.CanEditUserType === false"
+        >
           <el-option
-            v-for="(userType,key) of userTypeOptions"
+            v-for="(userType, key) of userTypeOptions"
             :key="key"
             :label="userType.UserType"
             :value="userType.Id"
@@ -52,17 +63,28 @@
       </el-form-item>
     </el-card>
 
-    <el-card class="Affiliation" shadow="never" style="margin-top:10px;" size="small">
+    <el-card
+      class="Affiliation"
+      shadow="never"
+      style="margin-top: 10px"
+      size="small"
+    >
       <div slot="header" class="clearfix">
         <span>Affiliation</span>
       </div>
       <el-form-item prop="IsZhiZhun">
-        <el-radio-group v-model="user.IsZhiZhun" @change="OrgnizationTypeChanged">
+        <el-radio-group
+          v-model="user.IsZhiZhun"
+          @change="OrgnizationTypeChanged"
+        >
           <el-radio :label="true">Internal</el-radio>
           <el-radio :label="false">External</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-show="user.IsZhiZhun === false" label="Organization Name: ">
+      <el-form-item
+        v-show="user.IsZhiZhun === false"
+        label="Organization Name: "
+      >
         <el-input v-model="user.OrganizationName" />
       </el-form-item>
 
@@ -78,19 +100,24 @@
         type="primary"
         size="small"
         :disabled="isDisabled"
-        style="margin:10px 15px"
+        style="margin: 10px 15px"
         @click="handleSave"
-      >Save</el-button>
+        >Save</el-button
+      >
     </el-form-item>
-
   </el-form>
 </template>
 <script>
-import { getUser, addUser, updateUser, getUserTypeListByUserType } from '@/api/admin.js'
+import {
+  getUser,
+  addUser,
+  updateUser,
+  getUserTypeListByUserType,
+} from '@/api/admin.js'
 export default {
   name: 'UserInfo',
   props: {
-    userId: { type: String, default: '' }
+    userId: { type: String, default: '' },
   },
   data() {
     return {
@@ -105,60 +132,69 @@ export default {
         IsZhiZhun: '',
         OrganizationName: '',
         DepartmentName: '',
-        PositionName: ''
+        PositionName: '',
       },
       userFormRules: {
         UserName: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         UserTypeId: [
-          { required: true, message: 'Please Select', trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: 'Please Select',
+            trigger: ['blur', 'change'],
+          },
         ],
         IsZhiZhun: [
-          { required: true, message: 'Please Select', trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: 'Please Select',
+            trigger: ['blur', 'change'],
+          },
         ],
         OrganizationName: [
-          { required: true, message: 'Please specify', trigger: 'blur' }
+          { required: true, message: 'Please specify', trigger: 'blur' },
         ],
         LastName: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         FirstName: [
           { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
         Phone: [
-          { max: 20, min: 7, message: 'The length is 7 to 20', trigger: ['blur'] }
+          {
+            max: 20,
+            min: 7,
+            message: 'The length is 7 to 20',
+            trigger: ['blur'],
+          },
         ],
         EMail: [
           {
             required: true,
             message: 'Please input the email address',
-            trigger: 'blur'
+            trigger: 'blur',
           },
           {
             type: 'email',
             message: 'Please input the correct email address',
-            trigger: ['blur']
+            trigger: ['blur'],
           },
-          { max: 50, message: 'The maximum length is 50' }
-        ],
-        Sex: [
-          { required: true, message: 'Please specify', trigger: 'blur' }
+          { max: 50, message: 'The maximum length is 50' },
         ],
+        Sex: [{ required: true, message: 'Please specify', trigger: 'blur' }],
         Status: [
-          { required: true, message: 'Please specify', trigger: 'blur' }
+          { required: true, message: 'Please specify', trigger: 'blur' },
         ],
-        DepartmentName: [
-          { max: 50, message: 'The maximum length is 50' }],
-        PositionName: [{ max: 50, message: 'The maximum length is 50' }
-        ]
+        DepartmentName: [{ max: 50, message: 'The maximum length is 50' }],
+        PositionName: [{ max: 50, message: 'The maximum length is 50' }],
       },
       userTypeOptions: [],
       isDisabled: false,
-      type: 0 // 1为编辑，0为新增
+      type: 0, // 1为编辑，0为新增
     }
   },
   created() {
@@ -172,46 +208,58 @@ export default {
   },
   methods: {
     handleSave() {
-      this.$refs.userForm.validate(valid => {
+      this.$refs.userForm.validate((valid) => {
         if (valid) {
           this.isDisabled = true
-          const selectedUserType = this.userTypeOptions.filter(item => item.Id === this.user.UserTypeId)
+          const selectedUserType = this.userTypeOptions.filter(
+            (item) => item.Id === this.user.UserTypeId
+          )
           if (selectedUserType.length > 0) {
             this.user.UserTypeEnum = selectedUserType[0].UserTypeEnum
           }
           if (this.user.Id) {
-            updateUser(this.user).then(res => {
-              this.isDisabled = false
-              this.$message.success('Updated successfully')
-            }).catch(() => { this.isDisabled = false })
+            updateUser(this.user)
+              .then((res) => {
+                this.isDisabled = false
+                this.$message.success('Updated successfully')
+              })
+              .catch(() => {
+                this.isDisabled = false
+              })
           } else {
-            addUser(this.user).then(res => {
-              this.isDisabled = false
-              this.user.Id = res.Result.Id
-              this.user.UserCode = res.Result.UserCode
-              this.$emit('getUserId', res.Result.Id)
-              this.$message.success('Added successfully')
-              this.$router.push({ path: '/system/user/list' })
-            }).catch(() => { this.isDisabled = false })
+            addUser(this.user)
+              .then((res) => {
+                this.isDisabled = false
+                this.user.Id = res.Result.Id
+                this.user.UserCode = res.Result.UserCode
+                this.$emit('getUserId', res.Result.Id)
+                this.$message.success('Added successfully')
+                this.$router.push({ path: '/system/user/list' })
+              })
+              .catch(() => {
+                this.isDisabled = false
+              })
           }
         }
       })
     },
     getUserTypeList() {
-      getUserTypeListByUserType(0).then(res => {
+      getUserTypeListByUserType(0).then((res) => {
         if (res.IsSuccess) {
           this.userTypeOptions = res.Result
         }
       })
     },
     getUserInfo() {
-      getUser(this.userId).then(res => {
+      getUser({
+        IdentityUserId: this.userId,
+      }).then((res) => {
         this.user = res.Result
       })
     },
     OrgnizationTypeChanged(val) {
       this.user.OrganizationName = ''
-    }
-  }
+    },
+  },
 }
 </script>

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/dashboard/bigdata.vue

@@ -131,8 +131,8 @@ export default {
         .then(() => {
           this.$store.dispatch('user/logout').then(res => {
             this.$router.push(`/login`)
-            this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
+            //this.$i18n.locale = 'zh'
+            //this.setLanguage('zh')
             this.$updateDictionary()
           })
         })

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3,13 +3,16 @@
     ref="sysAttachmentFrom"
     v-loading="loading"
     :model="form"
-    label-width="170px"
+    label-width="190px"
     size="small"
     :rules="rules"
     class="upload-temporary-file"
   >
     <div class="base-dialog-body">
-      <el-form-item label="文件类型: " prop="FileTypeId">
+      <el-form-item
+        :label="$t('dictionary:signature:form:FileTypeId')"
+        prop="FileTypeId"
+      >
         <el-select
           v-model="form.FileTypeId"
           style="width: 100%"
@@ -25,7 +28,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="文件: ">
+      <el-form-item :label="$t('dictionary:signature:form:File')">
         <div class="upload-container">
           <el-upload
             class="upload-demo"
@@ -46,16 +49,16 @@
               type="primary"
               :disabled="form.FileTypeId === ''"
               :loading="btnLoading"
-              >Select</el-button
+              >{{ $t('common:button:check') }}</el-button
             >
             <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
-              (must be in pdf format)
+              ({{ $t('trials:signature:label:mustBepdf') }})
             </span>
           </el-upload>
         </div>
       </el-form-item>
       <el-form-item
-        label="需要签署的用户类型: "
+        :label="$t('dictionary:signature:form:NeedConfirmedUserTypeIdList')"
         prop="NeedConfirmedUserTypeIdList"
       >
         <el-select
@@ -71,7 +74,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否仅内部签署: " prop="DocUserSignType">
+      <el-form-item
+        :label="$t('dictionary:signature:form:DocUserSignType')"
+        prop="DocUserSignType"
+      >
         <el-switch
           v-model="form.DocUserSignType"
           :active-value="1"
@@ -80,7 +86,7 @@
         </el-switch>
       </el-form-item>
       <el-form-item
-        label="查看最短时间（分钟）: "
+        :label="$t('dictionary:signature:form:SignViewMinimumMinutes')"
         prop="SignViewMinimumMinutes"
       >
         <el-input-number
@@ -105,7 +111,7 @@
           :disabled="form.FileTypeId === '' || form.Name === ''"
           :loading="saveBtnLoading"
           @click="handleSave"
-          >Save</el-button
+          >{{ $t('common:button:save') }}</el-button
         >
       </el-form-item>
     </div>
@@ -138,13 +144,25 @@ export default {
       },
       rules: {
         FileTypeId: [
-          { required: true, message: 'Please select', trigger: ['blur'] },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur'],
+          },
         ],
         SignViewMinimumMinutes: [
-          { required: true, message: 'Please specify', trigger: ['change'] },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['change'],
+          },
         ],
         NeedConfirmedUserTypeIdList: [
-          { required: true, message: 'Please select', trigger: ['blur'] },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur'],
+          },
         ],
       },
       fileList: [],
@@ -211,7 +229,7 @@ export default {
         this.fileList = []
         return true
       } else {
-        this.$alert('must be in pdf format')
+        this.$alert(this.$t('trials:signature:label:mustBepdf'))
 
         return false
       }
@@ -236,7 +254,7 @@ export default {
       this.$refs.sysAttachmentFrom.validate((valid) => {
         if (!valid) return
         if (!this.form.Name) {
-          this.$alert('Please select file.')
+          this.$alert(this.$t('trials:signature:message:selectFile'))
           return
         }
         this.saveBtnLoading = true
@@ -245,7 +263,7 @@ export default {
             this.saveBtnLoading = false
             this.$emit('closeDialog')
             this.$emit('getList')
-            this.$message.success('Uploaded successfully')
+            this.$message.success(this.$t('common:message:updatedSuccessfully'))
           })
           .catch(() => {
             this.saveBtnLoading = false
@@ -263,7 +281,7 @@ export default {
       }
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`Upload is currently limited to 1 file`)
+      this.$message.warning(this.$t('upload:rule:maxFile1'))
     },
     checkFileSuffix(fileName) {
       var typeArr = ['pdf']

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

@@ -2,7 +2,7 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true" size="small">
-        <el-form-item label="文件类型:">
+        <el-form-item :label="$t('dictionary:signature:search:FileTypeId')">
           <el-select v-model="searchData.FileTypeId" style="width: 150px">
             <el-option
               v-for="item of dict.type.Sys_Document"
@@ -12,7 +12,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="文件名称">
+        <el-form-item :label="$t('dictionary:signature:search:Name')">
           <el-input v-model="searchData.Name" style="width: 130px" clearable />
         </el-form-item>
 
@@ -33,8 +33,7 @@
       </el-form>
       <el-button
         type="primary"
-        icon="el-icon-plus"
-        style="margin-left: auto"
+        style="margin-left: auto; margin-bottom: 10px"
         size="small"
         @click="handleAdd"
       >
@@ -53,26 +52,27 @@
         <el-table-column type="index" width="40" />
         <el-table-column
           prop="FileType"
-          label="文件类型"
+          :label="$t('dictionary:signature:table:FileType')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="Name"
-          label="文件名称"
+          :label="$t('dictionary:signature:table:Name')"
           show-overflow-tooltip
           sortable="custom"
         />
 
         <el-table-column
           prop="SignViewMinimumMinutes"
-          label="查看最短时间(分钟)"
+          :label="$t('dictionary:signature:table:SignViewMinimumMinutes')"
           show-overflow-tooltip
           sortable="custom"
+          min-width="110"
         />
         <el-table-column
           prop="NeedConfirmedUserTypes"
-          label="需要签署的用户类型"
+          :label="$t('dictionary:signature:table:NeedConfirmedUserTypes')"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -85,48 +85,54 @@
         </el-table-column>
         <el-table-column
           prop="IsDeleted"
-          label="是否废除"
+          :label="$t('dictionary:signature:table:IsDeleted')"
           show-overflow-tooltip
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ scope.row.IsDeleted ? 'Yes' : 'No' }}
+            <el-tag v-if="scope.row.IsDeleted" type="danger">{{
+              $fd('TrainingStatus', scope.row.IsDeleted)
+            }}</el-tag>
+            <el-tag v-else type="primary">{{
+              $fd('TrainingStatus', scope.row.IsDeleted)
+            }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column
           prop="DocUserSignType"
-          label="是否仅内部签署"
+          :label="$t('dictionary:signature:table:DocUserSignType')"
           show-overflow-tooltip
           sortable="custom"
+          min-width="90"
         >
           <template slot-scope="scope">
             {{ $fd('ReadingYesOrNo', Number(scope.row.DocUserSignType)) }}
           </template>
         </el-table-column>
         <el-table-column
-          prop="UpdateTime"
-          label="更新时间"
+          prop="CreateTime"
+          :label="$t('dictionary:signature:table:CreateTime')"
           show-overflow-tooltip
           sortable="custom"
         />
 
-        <el-table-column label="Action">
+        <el-table-column :label="$t('common:action:action')" min-width="120">
           <template slot-scope="scope">
             <el-button type="text" @click="handlePreview(scope.row)">
-              预览
+              {{ $t('common:button:preview') }}
             </el-button>
             <el-button type="text" @click="handleEdit(scope.row)">
-              编辑
+              {{ $t('common:button:edit') }}
             </el-button>
             <el-button
               :disabled="scope.row.IsDeleted"
               type="text"
               @click="handleRepeal(scope.row)"
             >
-              废除
+              {{ $t('common:button:revoke') }}
             </el-button>
             <el-button type="text" @click="handleDelete(scope.row)">
-              删除
+              {{ $t('common:button:delete') }}
             </el-button>
           </template>
         </el-table-column>
@@ -240,7 +246,7 @@ export default {
     },
     // 新增
     handleAdd() {
-      this.title = 'Add'
+      this.title = this.$t('common:button:new')
       this.currentRow = {}
       this.editVisible = true
     },
@@ -255,13 +261,13 @@ export default {
     },
     // 编辑
     handleEdit(row) {
-      this.title = 'Edit'
+      this.title = this.$t('common:action:edit')
       this.currentRow = { ...row }
       this.editVisible = true
     },
     // 废除
     handleRepeal(row) {
-      this.$confirm('是否确认废除此文件?', {
+      this.$confirm(this.$t('dictionary:signature:confirm:delFile'), {
         type: 'warning',
         distinguishCancelAndClose: true,
       })
@@ -298,7 +304,9 @@ export default {
                 this.list.findIndex((item) => item.Id === row.Id),
                 1
               )
-              this.$message.success('删除成功！')
+              this.$message.success(
+                this.$t('common:message:deletedSuccessfully')
+              )
             }
           })
           .catch(() => {

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

@@ -9,10 +9,10 @@
     class="upload-temporary-file"
   >
     <div class="base-dialog-body">
-      <el-form-item label="Code" prop="Code">
+      <el-form-item :label="$t('dictionary:attachment:label:code')" prop="Code">
         <el-input v-model="form.Code" />
       </el-form-item>
-      <el-form-item label="业务场景: " prop="BusinessScenarioEnum">
+      <el-form-item :label="$t('dictionary:attachment:label:businessScenario')" prop="BusinessScenarioEnum">
         <el-select
           v-model="form.BusinessScenarioEnum"
           style="width: 100%"
@@ -28,7 +28,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="文件: ">
+      <el-form-item :label="$t('dictionary:attachment:label:file')">
         <div class="upload-container">
           <el-upload
             class="upload-demo"
@@ -57,7 +57,7 @@
           </el-upload>
         </div>
       </el-form-item>
-      <el-form-item label="文件名" prop="Name">
+      <el-form-item :label="$t('dictionary:attachment:label:name')" prop="Name">
         <el-input v-model="form.Name" />
       </el-form-item>
       <el-form-item
@@ -66,7 +66,7 @@
       >
         <el-input v-model="form.NameCN" />
       </el-form-item>
-      <el-form-item v-if="form.Id !== ''" label="是否废除: ">
+      <el-form-item v-if="form.Id !== ''" :label="$t('dictionary:attachment:label:isDeleted')">
         <el-radio-group v-model="form.IsDeleted">
           <el-radio
             v-for="item of $d.YesOrNo"
@@ -76,12 +76,11 @@
           >
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="描述">
+      <el-form-item :label="$t('dictionary:attachment:label:description')">
         <el-input
           v-model="form.Description"
           type="textarea"
           :autosize="{ minRows: 2, maxRows: 4 }"
-          placeholder="请输入内容"
         />
       </el-form-item>
     </div>
@@ -93,7 +92,7 @@
           :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum"
           :loading="saveBtnLoading"
           @click="handleSave"
-          >Save</el-button
+          >{{ $t('common:button:save') }}</el-button
         >
       </el-form-item>
     </div>
@@ -132,16 +131,16 @@ export default {
       },
       rules: {
         Code: [
-          { required: true, message: 'Please specify', trigger: ['blur'] },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
         ],
         Name: [
-          { required: true, message: 'Please specify', trigger: ['blur'] },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
         ],
         NameCN: [
-          { required: true, message: 'Please specify', trigger: ['blur'] },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
         ],
         BusinessScenarioEnum: [
-          { required: true, message: 'Please select', trigger: ['blur'] },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
         ],
       },
       fileList: [],
@@ -193,7 +192,7 @@ export default {
         this.fileList = []
         return true
       } else {
-        this.$alert('必须是word/excel格式')
+        this.$alert(this.$t('dictionary:attachment:export:alert:formatFile'))
 
         return false
       }
@@ -220,7 +219,7 @@ export default {
       this.$refs.sysTemplateFrom.validate((valid) => {
         if (!valid) return
         if (!this.form.Name) {
-          this.$alert('Please select file.')
+          this.$alert(this.$t('dictionary:attachment:message:msg1'))
           return
         }
         this.saveBtnLoading = true
@@ -229,7 +228,7 @@ export default {
             this.saveBtnLoading = false
             this.$emit('closeDialog')
             this.$emit('getList')
-            this.$message.success('Uploaded successfully')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
           })
           .catch(() => {
             this.saveBtnLoading = false
@@ -248,7 +247,7 @@ export default {
       }
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`Upload is currently limited to 1 file`)
+      this.$message.warning(this.$t('upload:rule:maxFile1'))
     },
     checkFileSuffix(fileName) {
       var typeArr = ['xls', 'xlsx', 'doc', 'docx']

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

@@ -2,7 +2,8 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true" size="small">
-        <el-form-item label="业务场景">
+        <!-- 业务场景 -->
+        <el-form-item :label="$t('dictionary:attachment:label:businessScenario')">
           <el-select
             v-model="searchData.BusinessScenarioEnum"
             style="width: 150px"
@@ -15,7 +16,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="文件名称">
+        <!-- 文件名称 -->
+        <el-form-item :label="$t('dictionary:attachment:label:name')">
           <el-input v-model="searchData.Name" style="width: 130px" clearable />
         </el-form-item>
 
@@ -35,7 +37,6 @@
         </el-form-item>
         <el-button
           type="primary"
-          icon="el-icon-plus"
           style="float: right"
           size="small"
           @click="handleAdd"
@@ -56,14 +57,14 @@
         <el-table-column type="index" width="40" />
         <el-table-column
           prop="Code"
-          label="Code"
+          :label="$t('dictionary:attachment:label:code')"
           show-overflow-tooltip
           sortable="custom"
         />
-
+        <!-- 业务场景 -->
         <el-table-column
           prop="BusinessScenarioEnum"
-          label="业务场景"
+          :label="$t('dictionary:attachment:label:businessScenario')"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -76,10 +77,10 @@
             }}
           </template>
         </el-table-column>
-
+        <!-- 文件名称 -->
         <el-table-column
           prop="Name"
-          label="文件名称"
+          :label="$t('dictionary:attachment:label:name')"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -89,14 +90,16 @@
           show-overflow-tooltip
           sortable="custom"
         />
+        <!-- 描述 -->
         <el-table-column
           prop="Description"
-          label="描述"
+          :label="$t('dictionary:attachment:label:description')"
           show-overflow-tooltip
         />
+        <!-- 是否废除 -->
         <el-table-column
           prop="IsDeleted"
-          label="是否废除"
+          :label="$t('dictionary:attachment:label:isDeleted')"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -109,26 +112,27 @@
             }}</el-tag>
           </template>
         </el-table-column>
+        <!-- 上传时间 -->
         <el-table-column
           prop="UpdateTime"
-          label="更新时间"
+          :label="$t('dictionary:attachment:label:updateTime')"
           show-overflow-tooltip
           sortable="custom"
         />
 
-        <el-table-column label="Action">
+        <el-table-column :label="$t('common:action:action')" width="300">
           <template slot-scope="scope">
             <el-button type="text" @click="PreviewFile(scope.row)">
               {{ $t('common:button:preview') }}
             </el-button>
             <el-button type="text" @click="handleDownload(scope.row)">
-              下载
+              {{ $t('common:button:download') }}
             </el-button>
             <el-button type="text" @click="handleEdit(scope.row)">
-              编辑
+              {{ $t('common:button:edit') }}
             </el-button>
             <el-button type="text" @click="handleDelete(scope.row)">
-              删除
+              {{ $t('common:button:delete') }}
             </el-button>
           </template>
         </el-table-column>
@@ -197,12 +201,13 @@ export default {
   },
   methods: {
     handleDelete(row) {
-      this.$confirm('确定删除该模版？').then(() => {
+      // 确定删除该模版？
+      this.$confirm(this.$t('dictionary:attachment:message:msg1')).then(() => {
         deleteCommonDocument(row.Id).then(() => {
-          this.$message.success('删除成功')
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
           this.getList()
         })
-      })
+      }).catch(()=>{})
     },
     PreviewFile(row) {
       let basePath = window.location.origin
@@ -229,7 +234,7 @@ export default {
     },
     // 新增
     handleAdd() {
-      this.editDialog.title = 'Add'
+      this.editDialog.title = this.$t('common:button:new')
       this.currentRow = { FileTypeEnum: FileTypeEnum }
       this.editDialog.visible = true
     },
@@ -246,7 +251,7 @@ export default {
     },
     // 编辑
     handleEdit(row) {
-      this.editDialog.title = 'Edit'
+      this.editDialog.title = this.$t('common:button:edit')
       this.currentRow = { ...row }
       this.editDialog.visible = true
     },

src/views/dictionary/checkConfig/index.vue

@@ -2,13 +2,13 @@
   <div class="app-container my_menu" >
     <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-select v-model="queryParams.ModuleTypeId" placeholder="模块" clearable >
+          <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>
-        <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-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
       </el-form-item>
     </el-form>
     <div>
@@ -66,42 +66,30 @@
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN "
-            size="mini"
             type="text"
-            icon="el-icon-top"
             @click="handleUpMove(scope.row)"
           >上移</el-button>
           <el-button
-            size="mini"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >修改</el-button>
           <el-button
             v-if="!(scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN)"
-            size="mini"
             type="text"
-            icon="el-icon-plus"
             @click="handleAdd(scope.row)"
           >新增</el-button>
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN "
-            size="mini"
             type="text"
-            icon="el-icon-plus"
             @click="handleChildren(scope.row)"
           >Children</el-button>
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN "
-            size="mini"
             type="text"
-            icon="el-icon-plus"
             @click="handleCopy(scope.row)"
           >复制到</el-button>
           <el-button
-            size="mini"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >删除</el-button>
         </template>
@@ -169,28 +157,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 +283,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 +659,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

@@ -1,30 +1,29 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" size="small" class="base-search-form">
-        <el-form-item label="CRO Name:">
+      <el-form :inline="true" class="base-search-form">
+        <!-- CRO Name -->
+        <el-form-item :label="$t('institutions:cros:label:croName')">
           <el-input v-model="searchData.CROName" style="width: 100px" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch"
-            >Search</el-button
-          >
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
           <el-button
             type="primary"
             icon="el-icon-refresh-left"
             @click="handleReset"
-            >Reset</el-button
           >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left: auto">
         <el-button
-          size="small"
           type="primary"
-          style="margin-left: auto"
-          icon="el-icon-plus"
           @click="handleAddCro"
-          >New</el-button
+          >{{ $t('common:button:new') }}</el-button
         >
       </span>
     </div>
@@ -37,30 +36,34 @@
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
+      <!-- CRO Code -->
       <el-table-column
         prop="CROCode"
-        label="CRO Code"
+        :label="$t('institutions:cros:label:croCode')"
         min-width="150"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- CRO Name -->
       <el-table-column
         prop="CROName"
-        label="CRO Name"
+        :label="$t('institutions:cros:label:croName')"
         min-width="150"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- CRO NameCN -->
       <el-table-column
         prop="CRONameCN"
-        label="CRO NameCN"
+        :label="$t('institutions:cros:label:croNameCN')"
         min-width="150"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Level -->
       <el-table-column
         prop="IsTrialLevel"
-        label="Level"
+        :label="$t('institutions:cros:label:level')"
         show-overflow-tooltip
         sortable="custom"
       >
@@ -68,20 +71,20 @@
           <span>{{ $fd("IsTrialLevel", String(scope.row.IsTrialLevel)) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="Action" min-width="200">
+      <el-table-column :label="$t('common:action:action')" min-width="200">
         <template slot-scope="scope">
           <el-button
-            circle
-            icon="el-icon-edit-outline"
-            title="编辑"
+            type="text"
             @click="handleEdit(scope.row)"
-          />
+          >
+            {{ $t('common:button:edit') }}
+          </el-button>   
           <el-button
-            circle
-            icon="el-icon-delete"
-            title="删除"
+            type="text"
             @click="handleDelete(scope.row)"
-          />
+          >
+            {{ $t('common:button:delete') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -160,13 +163,13 @@ export default {
     // 新增CRO
     handleAddCro() {
       this.rowData = {};
-      this.title = "Add";
+      this.title =this.$t('common:button:new');
       this.editVisible = true;
     },
     // 编辑CRO
     handleEdit(row) {
       this.rowData = row;
-      this.title = "Edit";
+      this.title = this.$t('common:action:edit');
       this.editVisible = true;
     },
     // 删除CRO

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

@@ -5,19 +5,23 @@
     :rules="rules"
     class="demo-ruleForm"
     size="small"
-    label-width="120px"
+    label-width="140px"
   >
     <div class="base-dialog-body">
-      <el-form-item label="CRO Name: " prop="CROName">
+      <!-- CRO Name -->
+      <el-form-item :label="$t('institutions:cros:label:croName')" prop="CROName">
         <el-input v-model="form.CROName" />
       </el-form-item>
-      <el-form-item label="CRO NameCN: " prop="CRONameCN">
+      <!-- CRO NameCN -->
+      <el-form-item :label="$t('institutions:cros:label:croNameCN')" prop="CRONameCN">
         <el-input v-model="form.CRONameCN" />
       </el-form-item>
-      <el-form-item label="CRO Code: " prop="CROCode">
+      <!-- CRO Code -->
+      <el-form-item :label="$t('institutions:cros:label:croCode')" prop="CROCode">
         <el-input v-model="form.CROCode" />
       </el-form-item>
-      <el-form-item label="Level: ">
+      <!-- Level -->
+      <el-form-item :label="$t('institutions:cros:label:level')">
         <el-switch
           :disabled="!IsTrialLevel"
           v-model="form.IsTrialLevel"
@@ -30,10 +34,10 @@
     <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
         <el-button :disabled="btnLoading" type="primary" @click="handleCancel"
-          >Cancel</el-button
+          >{{ $t('common:button:cancel') }}</el-button
         >
         <el-button type="primary" :loading="btnLoading" @click="handleSave"
-          >Save</el-button
+          >{{ $t('common:button:save') }}</el-button
         >
       </el-form-item>
     </div>
@@ -67,16 +71,16 @@ export default {
       },
       rules: {
         CROName: [
-          { required: true, message: "Please specify", trigger: "blur" },
-          { max: 500, message: "The maximum length is 500" },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: "blur" },
+          { max: 500, message: this.$t('common:ruleMessage:maxLength') + ' 500' },
         ],
         CRONameCN: [
-          { required: true, message: "Please specify", trigger: "blur" },
-          { max: 500, message: "The maximum length is 500" },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: "blur" },
+          { max: 500, message: this.$t('common:ruleMessage:maxLength') + ' 500' },
         ],
         CROCode: [
-          { required: true, message: "Please specify", trigger: "blur" },
-          { max: 50, message: "The maximum length is 50" },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: "blur" },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
         ],
       },
     };
@@ -95,7 +99,7 @@ export default {
           .then((res) => {
             this.btnLoading = false;
             if (res.IsSuccess) {
-              this.$message.success("Saved successfully");
+              this.$message.success(this.$t('common:message:savedSuccessfully'));
               this.$refs["CROForm"].resetFields();
               this.$emit("getList");
               this.$emit("close");

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

@@ -8,47 +8,87 @@
     label-width="170px"
   >
     <div class="base-dialog-body">
-      <el-form-item label="Site: ">
-        <el-select v-model="form.SiteId" style="width: 100%" clearable filterable @change="siteChange">
-          <el-option v-for="item of siteList" :value="item.Id" :key="item.Id" :label="item.SiteName">
+      <!-- Site -->
+      <el-form-item :label="$t('institutions:hospitals:label:site')">
+        <el-select
+          v-model="form.SiteId"
+          style="width: 100%"
+          clearable
+          filterable
+          @change="siteChange"
+        >
+          <el-option
+            v-for="item of siteList"
+            :value="item.Id"
+            :key="item.Id"
+            :label="item.SiteName"
+          >
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="Hospital CN: " prop="HospitalNameCN">
+      <!-- Hospital CN -->
+      <el-form-item :label="$t('institutions:hospitals:label:hospitalCN')" prop="HospitalNameCN">
         <el-input v-model="form.HospitalNameCN" />
       </el-form-item>
-      <el-form-item label="Hospital EN: " prop="HospitalName">
+      <!-- Hospital EN -->
+      <el-form-item :label="$t('institutions:hospitals:label:hospital')" prop="HospitalName">
         <el-input v-model="form.HospitalName" />
       </el-form-item>
-      <el-form-item label="Affiliated University CN: " prop="UniversityAffiliatedCN">
+      <!-- Affiliated University CN -->
+      <el-form-item
+        :label="$t('institutions:hospitals:label:universityAffiliatedCN')"
+        prop="UniversityAffiliatedCN"
+      >
         <el-input v-model="form.UniversityAffiliatedCN" />
       </el-form-item>
-      <el-form-item label="Affiliated University EN: " prop="UniversityAffiliated">
+      <!-- Affiliated University EN -->
+      <el-form-item
+        :label="$t('institutions:hospitals:label:universityAffiliated')"
+        prop="UniversityAffiliated"
+      >
         <el-input v-model="form.UniversityAffiliated" />
       </el-form-item>
-      <el-form-item label="Country CN: " prop="CountryCN">
+      <!-- Country CN -->
+      <el-form-item :label="$t('institutions:hospitals:label:countryCN')" prop="CountryCN">
         <el-input v-model="form.CountryCN" />
       </el-form-item>
-      <el-form-item label="Country EN: " prop="Country">
+      <!-- Country EN -->
+      <el-form-item :label="$t('institutions:hospitals:label:country')" prop="Country">
         <el-input v-model="form.Country" />
       </el-form-item>
-      <el-form-item label="Province CN: " prop="ProvinceCN">
+      <!-- Province CN -->
+      <el-form-item :label="$t('institutions:hospitals:label:provinceCN')" prop="ProvinceCN">
         <el-input v-model="form.ProvinceCN" />
       </el-form-item>
-      <el-form-item label="Province EN: " prop="Province">
+      <!-- Province EN -->
+      <el-form-item :label="$t('institutions:hospitals:label:province')" prop="Province">
         <el-input v-model="form.Province" />
       </el-form-item>
-      <el-form-item label="City CN: " prop="CityCN">
+      <!-- City CN -->
+      <el-form-item :label="$t('institutions:hospitals:label:cityCN')" prop="CityCN">
         <el-input v-model="form.CityCN" />
       </el-form-item>
-      <el-form-item label="City EN: " prop="City">
+      <!-- City EN -->
+      <el-form-item :label="$t('institutions:hospitals:label:city')" prop="City">
         <el-input v-model="form.City" />
       </el-form-item>
     </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
-        <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancel">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="handleCancel"
+          >{{ $t('common:button:cancel') }}</el-button
+        >
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="handleSave"
+          >{{ $t('common:button:save') }}</el-button
+        >
       </el-form-item>
     </div>
   </el-form>
@@ -63,14 +103,14 @@ export default {
       type: Object,
       default() {
         return {}
-      }
+      },
     },
     model: {
       type: Object,
       default() {
         return {}
-      }
-    }
+      },
+    },
   },
   data() {
     return {
@@ -87,23 +127,36 @@ export default {
         Province: '',
         ProvinceCN: '',
         City: '',
-        CityCN: ''
+        CityCN: '',
       },
       siteList: [],
       rules: {
-        HospitalNameCN: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
-        UniversityAffiliated: [{ max: 100, message: 'The maximum length is 100' }],
-        UniversityAffiliatedCN: [{ max: 100, message: 'The maximum length is 100' }],
-        Country: [{ required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }],
-        CountryCN: [{ max: 50, message: 'The maximum length is 50' }],
-        Province: [{ required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }],
-        ProvinceCN: [{ max: 50, message: 'The maximum length is 50' }],
-        City: [{ required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }],
-        CityCN: [{ max: 50, message: 'The maximum length is 50' }]
-      }
+        HospitalNameCN: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
+        ],
+        UniversityAffiliated: [
+          { max: 100, message: this.$t('common:ruleMessage:maxLength') + ' 100' },
+        ],
+        UniversityAffiliatedCN: [
+          { max: 100, message: this.$t('common:ruleMessage:maxLength') + ' 100' },
+        ],
+        Country: [{ max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }],
+        CountryCN: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
+        ],
+        Province: [{ max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }],
+        ProvinceCN: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
+        ],
+        City: [{ max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }],
+        CityCN: [
+          { required: true, message: 'Please specify', trigger: 'blur' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
+        ],
+      },
     }
   },
   mounted() {
@@ -114,7 +167,7 @@ export default {
   },
   methods: {
     siteChange(v) {
-      this.siteList.forEach(o => {
+      this.siteList.forEach((o) => {
         if (o.Id === v) {
           this.form.CityCN = o.City
           this.form.HospitalNameCN = o.SiteNameCN
@@ -125,34 +178,37 @@ export default {
       })
     },
     getAllSiteList() {
-      getAllSiteList().then(res => {
-        this.siteList = res.Result
-        console.log(this.siteList)
-      }).catch(() => {
-        reject()
-      })
+      getAllSiteList()
+        .then((res) => {
+          this.siteList = res.Result
+          console.log(this.siteList)
+        })
+        .catch(() => {
+          reject()
+        })
     },
     handleSave() {
-      this.$refs.hospitalForm.validate(valid => {
+      this.$refs.hospitalForm.validate((valid) => {
         if (!valid) return
         this.btnLoading = true
-        addOrUpdateHospital(this.form).then(res => {
-          this.btnLoading = false
-          if (res.IsSuccess) {
-            this.$message.success('Saved successfully')
-            this.$refs['hospitalForm'].resetFields()
-            this.$emit('getList')
-            this.$emit('close')
-          }
-        }).catch(() => {
-          this.btnLoading = false
-        })
+        addOrUpdateHospital(this.form)
+          .then((res) => {
+            this.btnLoading = false
+            if (res.IsSuccess) {
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              this.$refs['hospitalForm'].resetFields()
+              this.$emit('getList')
+              this.$emit('close')
+            }
+          })
+          .catch(() => {
+            this.btnLoading = false
+          })
       })
     },
     handleCancel() {
       this.$emit('close')
-    }
-  }
-
+    },
+  },
 }
 </script>

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

@@ -1,29 +1,37 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" size="small" class="base-search-form">
-        <el-form-item label="Hospital:">
+      <el-form :inline="true" class="base-search-form">
+        <!-- Hospital -->
+        <el-form-item :label="$t('institutions:hospitals:label:hospital')">
           <el-input v-model="searchData.HospitalName" style="width:100px;" />
         </el-form-item>
-        <el-form-item label="Province:">
+        <!-- Province -->
+        <el-form-item :label="$t('institutions:hospitals:label:province')">
           <el-input v-model="searchData.Province" style="width:100px;" />
         </el-form-item>
-        <el-form-item label="City:">
+        <!-- City -->
+        <el-form-item :label="$t('institutions:hospitals:label:city')">
           <el-input v-model="searchData.City" style="width:100px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">Search</el-button>
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">Reset</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto;">
         <el-button
-          size="small"
           type="primary"
-          style="margin-left:auto;"
-          icon="el-icon-plus"
           @click="handleAddHospital"
-        >New</el-button>
+        >{{ $t('common:button:new') }}</el-button>
       </span>
     </div>
     <!-- hospital列表 -->
@@ -36,92 +44,102 @@
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
+      <!-- Hospital -->
       <el-table-column
         prop="HospitalName"
-        label="Hospital"
+        :label="$t('institutions:hospitals:label:hospital')"
         min-width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Hospital CN -->
       <el-table-column
         prop="HospitalNameCN"
         label="Hospital CN"
+        :label="$t('institutions:hospitals:label:hospitalCN')"
         min-width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- University Affiliated -->
       <el-table-column
         prop="UniversityAffiliated"
-        label="University Affiliated"
+        :label="$t('institutions:hospitals:label:universityAffiliated')"
         min-width="170"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- University Affiliated CN -->
       <el-table-column
         prop="UniversityAffiliatedCN"
-        label="University Affiliated CN"
+        :label="$t('institutions:hospitals:label:universityAffiliatedCN')"
         min-width="170"
         show-overflow-tooltip
         sortable="custom"
       />
-
+      <!-- Country -->
       <el-table-column
         prop="Country"
-        label="Country"
+        :label="$t('institutions:hospitals:label:country')"
         width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Country CN -->
       <el-table-column
         prop="CountryCN"
-        label="Country CN"
+        :label="$t('institutions:hospitals:label:countryCN')"
         width="140"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Province -->
       <el-table-column
         prop="Province"
-        label="Province"
+        :label="$t('institutions:hospitals:label:province')"
         width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Province CN -->
       <el-table-column
         prop="ProvinceCN"
-        label="Province CN"
+        :label="$t('institutions:hospitals:label:provinceCN')"
         width="140"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- City -->
       <el-table-column
         prop="City"
-        label="City"
+        :label="$t('institutions:hospitals:label:city')"
         width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- City CN -->
       <el-table-column
         prop="CityCN"
-        label="City CN"
-        width="120"
+        :label="$t('institutions:hospitals:label:cityCN')"
+        width="130"
         show-overflow-tooltip
         sortable="custom"
       />
 
-      <el-table-column label="Action" width="150">
+      <el-table-column :label="$t('common:action:action')" width="150">
         <template slot-scope="scope">
           <el-button
-            circle
-            icon="el-icon-edit-outline"
-            title="编辑"
+            type="text"
             @click="handleEdit(scope.row)"
-          />
+          >
+            {{ $t('common:button:edit') }}
+          </el-button>   
           <el-button
-            circle
-            icon="el-icon-delete"
-            title="删除"
+            type="text"
             @click="handleDelete(scope.row)"
-          />
+          >
+            {{ $t('common:button:delete') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -190,13 +208,13 @@ export default {
     // 新增医院信息
     handleAddHospital() {
       this.rowData = {}
-      this.editDialog.title = 'Add'
+      this.editDialog.title = this.$t('common:button:new')
       this.editDialog.visible = true
     },
     // 修改医院信息
     handleEdit(row) {
       this.rowData = row
-      this.editDialog.title = 'Edit'
+      this.editDialog.title = this.$t('common:action:edit')
       this.editDialog.visible = true
     },
     // 删除医院信息

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

@@ -9,49 +9,50 @@
     label-width="150px"
   >
     <div class="base-dialog-body">
-      <el-form-item label="Site Code: " v-if="form.Id" prop="SiteCode">
+      <!-- Site Code -->
+      <el-form-item :label="$t('institutions:sites:label:siteCode')" v-if="form.Id" prop="SiteCode">
         <el-input v-model="form.SiteCode" disabled />
       </el-form-item>
 
       <!-- 中心名称 -->
       <el-form-item
-        :label="$t('trials:customSite:form:siteName')"
+        :label="$t('institutions:sites:label:siteName')"
         prop="SiteName"
       >
         <el-input v-model="form.SiteName" />
       </el-form-item>
       <!-- 中心名称（CN） -->
       <el-form-item
-        :label="$t('trials:customSite:form:siteName') + '（CN）'"
+        :label="$t('institutions:sites:label:siteNameCN')"
         prop="SiteNameCN"
       >
         <el-input v-model="form.SiteNameCN" />
       </el-form-item>
-
-      <el-form-item label="Alias Name: ">
+      <!-- Alias Name -->
+      <el-form-item :label="$t('institutions:sites:label:aliasName')">
         <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 label="Country: " prop="Country">
+      </el-form-item> -->
+      <!-- Country -->
+      <el-form-item :label="$t('institutions:sites:label:country')" prop="Country">
         <el-input v-model="form.Country" />
       </el-form-item>
-
-      <el-form-item label="City: " prop="City">
+      <!-- City -->
+      <el-form-item :label="$t('institutions:sites:label:city')" prop="City">
         <el-input v-model="form.City" />
       </el-form-item>
-      <el-form-item label="Address: " prop="Address">
+      <!-- Address -->
+      <el-form-item :label="$t('institutions:sites:label:address')" prop="Address">
         <el-input v-model="form.Address" />
       </el-form-item>
-
-      <el-form-item label="Affiliated Hospital: ">
+      <!-- Affiliated Hospital -->
+      <el-form-item :label="$t('institutions:sites:label:affiliatedHospital')">
         <el-select
           v-model="form.HospitalId"
           clearable
-          placeholder="Please select"
           style="width: 100%"
         >
           <el-option
@@ -62,20 +63,20 @@
           />
         </el-select>
       </el-form-item>
-
-      <el-form-item label="Director Name: " prop="DirectorName">
+      <!-- Director Name -->
+      <el-form-item :label="$t('institutions:sites:label:directorName')" prop="DirectorName">
         <el-input v-model="form.DirectorName" />
       </el-form-item>
-
-      <el-form-item label="Director Phone: " prop="DirectorPhone">
+      <!-- Director Phone -->
+      <el-form-item :label="$t('institutions:sites:label:directorPhone')" prop="DirectorPhone">
         <el-input v-model="form.DirectorPhone" />
       </el-form-item>
-
-      <el-form-item label="Contact Name: " prop="ContactName">
+      <!-- Contact Name -->
+      <el-form-item :label="$t('institutions:sites:label:contactName')" prop="ContactName">
         <el-input v-model="form.ContactName" />
       </el-form-item>
-
-      <el-form-item label="Contact Phone: " prop="ContactPhone">
+      <!-- Contact Phone -->
+      <el-form-item :label="$t('institutions:sites:label:contactPhone')" prop="ContactPhone">
         <el-input v-model="form.ContactPhone" />
       </el-form-item>
     </div>
@@ -86,14 +87,14 @@
           size="small"
           type="primary"
           @click="handleCancel"
-          >Cancel</el-button
+          >{{ $t('common:button:cancel') }}</el-button
         >
         <el-button
           size="small"
           type="primary"
           :loading="btnLoading"
           @click="handleSave"
-          >Save</el-button
+          >{{ $t('common:button:save') }}</el-button
         >
       </el-form-item>
     </div>
@@ -133,35 +134,35 @@ export default {
       },
       rules: {
         SiteName: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           // { max: 50, message: 'The maximum length is 50' }
         ],
         SiteNameCN: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           // { max: 50, message: 'The maximum length is 50' }
         ],
         SiteCode: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
         ],
         Country: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
         ],
         City: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
         ],
         // HospitalId: [
         //   { required: true, message: 'Please specify', trigger: 'blur' }
         // ],
         Address: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
         ],
-        DirectorName: [{ max: 50, message: 'The maximum length is 50' }],
-        DirectorPhone: [{ max: 50, message: 'The maximum length is 50' }],
-        ContactName: [{ max: 50, message: 'The maximum length is 50' }],
-        ContactPhone: [{ max: 50, message: 'The maximum length is 50' }],
+        DirectorName: [{ max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }],
+        DirectorPhone: [{ max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }],
+        ContactName: [{ max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }],
+        ContactPhone: [{ max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }],
       },
       loading: false,
       show: false,
@@ -180,7 +181,7 @@ export default {
           .then((res) => {
             this.btnLoading = false
             if (res.IsSuccess) {
-              this.$message.success('Saved successfully')
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
               this.$refs['siteForm'].resetFields()
               this.$emit('getList')
               this.$emit('close')

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

@@ -1,46 +1,49 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" size="small" class="base-search-form">
-        <el-form-item label="Site Name:">
+      <el-form :inline="true" class="base-search-form">
+        <!-- Site Name -->
+        <el-form-item :label="$t('institutions:sites:label:siteName')">
           <el-input v-model="searchData.SiteName" style="width: 120px" />
         </el-form-item>
-        <el-form-item label="Alias Name:">
+        <!-- Alias Name -->
+        <el-form-item :label="$t('institutions:sites:label:aliasName')">
           <el-input v-model="searchData.AliasName" style="width: 120px" />
         </el-form-item>
-        <el-form-item label="Country:">
+        <!-- Country -->
+        <el-form-item :label="$t('institutions:sites:label:country')">
           <el-input v-model="searchData.Country" style="width: 120px" />
         </el-form-item>
-        <el-form-item label="City:">
+        <!-- City -->
+        <el-form-item :label="$t('institutions:sites:label:city')">
           <el-input v-model="searchData.City" style="width: 120px" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch"
-            >Search</el-button
-          >
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
           <el-button
             type="primary"
             icon="el-icon-refresh-left"
             @click="handleReset"
-            >Reset</el-button
           >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <div style="margin-left: auto">
         <el-button
           type="primary"
-          size="small"
           icon="el-icon-plus"
           @click="handleAddSystemSite"
           >{{ $t("trial:dictionary:institutions:site:addSystemSite") }}
         </el-button>
         <el-button
           type="primary"
-          size="small"
           style="margin-left: 10px"
-          icon="el-icon-plus"
           @click="handleAddSite"
-          >New
+        >
+          {{ $t('common:button:new') }}
         </el-button>
       </div>
     </div>
@@ -53,111 +56,131 @@
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
+      <!-- Site Code -->
       <el-table-column
         prop="SiteCode"
-        label="Site Code"
+        :label="$t('institutions:sites:label:siteCode')"
         min-width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Site Name -->
       <el-table-column
         prop="SiteName"
-        label="Site Name"
+        :label="$t('institutions:sites:label:siteName')"
         min-width="150"
         show-overflow-tooltip
         sortable="custom"
       />
+      <el-table-column
+        prop="SiteNameCN"
+        :label="$t('institutions:sites:label:siteNameCN')"
+        min-width="150"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      
+      <!-- Alias Name -->
       <el-table-column
         prop="AliasName"
-        label="Alias Name"
+        :label="$t('institutions:sites:label:aliasName')"
         min-width="150"
         show-overflow-tooltip
         sortable="custom"
       />
-      <el-table-column
+      <!-- <el-table-column
         prop="UniqueCode"
         label="组织机构代码"
         min-width="130"
         show-overflow-tooltip
         sortable="custom"
-      />
+      /> -->
+      <!-- Country -->
       <el-table-column
         prop="Country"
-        label="Country"
+        :label="$t('institutions:sites:label:country')"
         min-width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- City -->
       <el-table-column
         prop="City"
-        label="City"
+        :label="$t('institutions:sites:label:city')"
         min-width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Address -->
       <el-table-column
         prop="Address"
-        label="Address"
+        :label="$t('institutions:sites:label:address')"
         min-width="120"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Affiliated Hospital -->
       <el-table-column
         prop="HospitalName"
-        label="Affiliated Hospital"
+        :label="$t('institutions:sites:label:affiliatedHospital')"
         min-width="180"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Director Name -->
       <el-table-column
         prop="DirectorName"
-        label="Director Name"
+        :label="$t('institutions:sites:label:directorName')"
         min-width="160"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Director Phone -->
       <el-table-column
         prop="DirectorPhone"
-        label="Director Phone"
+        :label="$t('institutions:sites:label:directorPhone')"
         min-width="150"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Contact Name -->
       <el-table-column
         prop="ContactName"
-        label="Contact Name"
+        :label="$t('institutions:sites:label:contactName')"
         min-width="150"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Contact Phone -->
       <el-table-column
         prop="ContactPhone"
-        label="Contact Phone"
+        :label="$t('institutions:sites:label:contactPhone')"
         min-width="160"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- CreateTime -->
       <el-table-column
         prop="CreateTime"
-        label="CreateTime"
+        :label="$t('institutions:sites:label:createTime')"
         min-width="160"
         show-overflow-tooltip
         sortable="custom"
       />
-      <el-table-column label="Action" fixed="right" width="150">
+      <el-table-column :label="$t('common:action:action')" fixed="right" width="150">
         <template slot-scope="scope">
           <el-button
-            circle
-            icon="el-icon-edit-outline"
-            title="编辑"
+            type="text"
             @click="handleEdit(scope.row)"
-          />
+          >
+            {{ $t('common:button:edit') }}
+          </el-button>   
           <el-button
-            circle
-            icon="el-icon-delete"
-            title="删除"
+            type="text"
             @click="handleDelete(scope.row)"
-          />
+          >
+            {{ $t('common:button:delete') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -357,7 +380,7 @@ export default {
   data() {
     return {
       editVisible: false,
-      title: "Add",
+      title: this.$t('common:button:new'),
       searchData: searchDataDefault(),
       list: [],
       total: 0,
@@ -439,13 +462,13 @@ export default {
     // 新增Site信息
     handleAddSite() {
       this.rowData = {};
-      this.title = "Add";
+      this.title = this.$t('common:button:new');
       this.editVisible = true;
     },
     // 编辑Site信息
     handleEdit(row) {
       this.rowData = row;
-      this.title = "Edit";
+      this.title = this.$t('common:action:edit');
       this.editVisible = true;
     },
     // 删除Site

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

@@ -8,16 +8,20 @@
     label-width="150px"
   >
     <div class="base-dialog-body">
-      <el-form-item label="Sponsor Name: " prop="SponsorName">
+      <!-- Sponsor Name -->
+      <el-form-item :label="$t('institutions:sponsors:label:sponsorName')" prop="SponsorName">
         <el-input v-model="form.SponsorName" />
       </el-form-item>
-      <el-form-item label="Sponsor NameCN: " prop="SponsorName">
+      <!-- Sponsor NameCN -->
+      <el-form-item :label="$t('institutions:sponsors:label:sponsorNameCN')" prop="SponsorName">
         <el-input v-model="form.SponsorNameCN" />
       </el-form-item>
-      <el-form-item label="Sponsor Code: " prop="SponsorCode">
+      <!-- Sponsor Code -->
+      <el-form-item :label="$t('institutions:sponsors:label:sponsorCode')" prop="SponsorCode">
         <el-input v-model="form.SponsorCode" />
       </el-form-item>
-      <el-form-item label="Level: ">
+      <!-- Level -->
+      <el-form-item :label="$t('institutions:sponsors:label:level')">
         <el-switch
           :disabled="!IsTrialLevel"
           v-model="form.IsTrialLevel"
@@ -34,15 +38,17 @@
           size="small"
           type="primary"
           @click="handleCancel"
-          >Cancel</el-button
         >
+          {{ $t('common:button:cancel') }}
+        </el-button>
         <el-button
           size="small"
           type="primary"
           :loading="btnLoading"
           @click="handleSave"
-          >Save</el-button
         >
+          {{ $t('common:button:save') }}
+        </el-button>
       </el-form-item>
     </div>
   </el-form>
@@ -75,16 +81,16 @@ export default {
       },
       rules: {
         SponsorName: [
-          { required: true, message: "Please specify", trigger: "blur" },
-          { max: 500, message: "The maximum length is 500" },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: "blur" },
+          { max: 500, message: this.$t('common:ruleMessage:maxLength') + ' 500' },
         ],
         SponsorNameCN: [
-          { required: true, message: "Please specify", trigger: "blur" },
-          { max: 500, message: "The maximum length is 500" },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: "blur" },
+          { max: 500, message: this.$t('common:ruleMessage:maxLength') + ' 500' },
         ],
         SponsorCode: [
-          { required: true, message: "Please specify", trigger: "blur" },
-          { max: 50, message: "The maximum length is 50" },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: "blur" },
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' },
         ],
       },
     };
@@ -103,7 +109,7 @@ export default {
           .then((res) => {
             this.btnLoading = false;
             if (res.IsSuccess) {
-              this.$message.success("Saved successfully");
+              this.$message.success(this.$t('common:message:savedSuccessfully'));
               this.$refs["sponsorForm"].resetFields();
               this.$emit("getList");
               this.$emit("close");

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

@@ -1,30 +1,30 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" size="small" class="base-search-form">
-        <el-form-item label="Sponsor Name:">
+      <el-form :inline="true" class="base-search-form">
+        <!-- Sponsor Name -->
+        <el-form-item :label="$t('institutions:sponsors:label:sponsorName')">
           <el-input v-model="searchData.SponsorName" style="width: 100px" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch"
-            >Search</el-button
-          >
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
           <el-button
             type="primary"
             icon="el-icon-refresh-left"
             @click="handleReset"
-            >Reset</el-button
           >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left: auto">
         <el-button
-          size="small"
           type="primary"
           style="margin-left: auto"
-          icon="el-icon-plus"
           @click="handleAddSponsor"
-          >New</el-button
+          >{{ $t('common:button:new') }}</el-button
         >
       </span>
     </div>
@@ -37,30 +37,34 @@
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
+      <!-- Sponsor Code -->
       <el-table-column
         prop="SponsorCode"
-        label="Sponsor Code"
+        :label="$t('institutions:sponsors:label:sponsorCode')"
         min-width="100"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Sponsor Name -->
       <el-table-column
         prop="SponsorName"
-        label="Sponsor Name"
+        :label="$t('institutions:sponsors:label:sponsorName')"
         min-width="100"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Sponsor NameCN -->
       <el-table-column
         prop="SponsorNameCN"
-        label="Sponsor NameCN"
+        :label="$t('institutions:sponsors:label:sponsorNameCN')"
         min-width="100"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- Level -->
       <el-table-column
         prop="IsTrialLevel"
-        label="Level"
+        :label="$t('institutions:sponsors:label:level')"
         show-overflow-tooltip
         sortable="custom"
       >
@@ -68,20 +72,20 @@
           <span>{{ $fd("IsTrialLevel", String(scope.row.IsTrialLevel)) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="Action" min-width="150">
+      <el-table-column :label="$t('common:action:action')" min-width="150">
         <template slot-scope="scope">
           <el-button
-            circle
-            icon="el-icon-edit-outline"
-            title="编辑"
+            type="text"
             @click="handleEdit(scope.row)"
-          />
+          >
+            {{ $t('common:button:edit') }}
+          </el-button>   
           <el-button
-            circle
-            icon="el-icon-delete"
-            title="删除"
+            type="text"
             @click="handleDelete(scope.row)"
-          />
+          >
+            {{ $t('common:button:delete') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -160,13 +164,13 @@ export default {
     // 新增Sponsor
     handleAddSponsor() {
       this.rowData = {};
-      this.title = "Add";
+      this.title = this.$t('common:button:new');
       this.editVisible = true;
     },
     // 编辑Sponsor
     handleEdit(row) {
       this.rowData = row;
-      this.title = "Edit";
+      this.title = this.$t('common:action:edit');
       this.editVisible = true;
     },
     // 删除Sponsor

src/views/dictionary/institutions/index.vue

@@ -1,16 +1,20 @@
 <template>
   <div class="institution-wrapper">
     <el-tabs v-model="activeTab" @tab-click="clickTab">
-      <el-tab-pane label="Hospitals" name="Hospitals">
+      <!-- Hospitals -->
+      <el-tab-pane :label="$t('institutions:tab:hospitals')" name="Hospitals">
         <Hospitals v-if="activeTab === 'Hospitals'" />
       </el-tab-pane>
-      <el-tab-pane label="Sites" name="Sites">
+      <!-- Sites -->
+      <el-tab-pane :label="$t('institutions:tab:sites')" name="Sites">
         <Sites v-if="activeTab === 'Sites'" />
       </el-tab-pane>
-      <el-tab-pane label="CROs" name="CROs">
+      <!-- CROs -->
+      <el-tab-pane :label="$t('institutions:tab:CROs')" name="CROs">
         <CROs v-if="activeTab === 'CROs'" />
       </el-tab-pane>
-      <el-tab-pane label="Sponsors" name="Sponsors">
+      <!-- Sponsors -->
+      <el-tab-pane :label="$t('institutions:tab:sponsors')" name="Sponsors">
         <Sponsors v-if="activeTab === 'Sponsors'" />
       </el-tab-pane>
     </el-tabs>

src/views/dictionary/newdictionary/bool/index.vue

@@ -2,7 +2,7 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
+      <el-form :inline="true" class="base-search-form">
         <el-form-item label="字典表名称:">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
@@ -12,12 +12,24 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button 
+            type="primary" 
+            icon="el-icon-search" 
+            @click="handleSearch"
+          >
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">新建</el-button>
+        <el-button type="primary" @click="handleAdd">新建</el-button>
       </span>
     </div>
     <el-table
@@ -68,25 +80,22 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="300" fixed="right">
+      <el-table-column label="操作" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             编辑
           </el-button>
           <el-button
-            type="success"
-            size="mini"
+            type="text"
             @click="handleChild(scope.row)"
           >
             子项
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             删除

src/views/dictionary/newdictionary/components/DictionaryChild.vue

@@ -63,18 +63,16 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="300" fixed="right">
+      <el-table-column label="操作" width="150" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             编辑
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             删除

src/views/dictionary/newdictionary/enum/index.vue

@@ -2,7 +2,7 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
+      <el-form :inline="true" class="base-search-form">
         <el-form-item label="字典表名称:">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
@@ -12,12 +12,24 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button 
+            type="primary" 
+            icon="el-icon-search" 
+            @click="handleSearch"
+          >
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">新建</el-button>
+        <el-button type="primary" @click="handleAdd">新建</el-button>
       </span>
     </div>
     <el-table
@@ -68,25 +80,22 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="300" fixed="right">
+      <el-table-column label="操作" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             编辑
           </el-button>
           <el-button
-            type="success"
-            size="mini"
+            type="text"
             @click="handleChild(scope.row)"
           >
             子项
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             删除

src/views/dictionary/newdictionary/list/components/BatchAddForm.vue

@@ -183,16 +183,13 @@
               <el-button
                 size="small"
                 type="primary"
-                icon="el-icon-plus"
                 @click="handleAdd"
               >{{ $t('common:button:new') }}</el-button>
             </template>
             <template slot-scope="scope">
               <!-- 删除 -->
               <el-button
-                size="mini"
                 type="text"
-                icon="el-icon-delete"
                 @click="handleDelete(scope.$index)"
               >{{ $t('common:button:delete') }}</el-button>
             </template>

src/views/dictionary/newdictionary/list/components/DictionaryChild.vue

@@ -65,15 +65,13 @@
       <el-table-column label="操作" width="300" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             编辑
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             删除

src/views/dictionary/newdictionary/list/index.vue

@@ -2,7 +2,7 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
+      <el-form :inline="true" class="base-search-form">
         <el-form-item label="字典表名称:">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
@@ -15,13 +15,25 @@
           <el-input v-model="searchData.KeyInfo" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button 
+            type="primary" 
+            icon="el-icon-search" 
+            @click="handleSearch"
+          >
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">新建</el-button>
-        <el-button type="primary" size="mini" @click="handleBatchAdd">批量新建</el-button>
+        <el-button type="primary" @click="handleAdd">新建</el-button>
+        <el-button type="primary" @click="handleBatchAdd">批量新建</el-button>
       </span>
     </div>
     <el-table
@@ -86,22 +98,19 @@
       <el-table-column label="操作" width="300" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             编辑
           </el-button>
           <el-button
-            type="success"
-            size="mini"
+            type="text"
             @click="handleChild(scope.row)"
           >
             子项
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             删除

src/views/dictionary/newdictionary/select/index.vue

@@ -2,7 +2,7 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
+      <el-form :inline="true" class="base-search-form">
         <el-form-item label="字典表名称:">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
@@ -12,13 +12,25 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button 
+            type="primary" 
+            icon="el-icon-search" 
+            @click="handleSearch"
+          >
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleSetting">配置字典分组</el-button>
-        <el-button type="primary" size="mini" @click="handleAdd">新建</el-button>
+        <el-button type="primary" @click="handleSetting">配置字典分组</el-button>
+        <el-button type="primary" @click="handleAdd">新建</el-button>
       </span>
     </div>
     <el-table
@@ -72,22 +84,19 @@
       <el-table-column label="操作" width="300" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
             编辑
           </el-button>
           <el-button
-            type="success"
-            size="mini"
+            type="text"
             @click="handleChild(scope.row)"
           >
             子项
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
             删除

src/views/dictionary/newdictionary/setting/index.vue

@@ -2,7 +2,7 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
+      <el-form :inline="true" class="base-search-form">
         <el-form-item label="Code:">
           <el-input v-model="searchData.Code" clearable style="width:120px;" />
         </el-form-item>
@@ -10,12 +10,24 @@
           <el-input v-model="searchData.KeyName" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button 
+            type="primary" 
+            icon="el-icon-search" 
+            @click="handleSearch"
+          >
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">New</el-button>
+        <el-button type="primary" @click="handleAdd">New</el-button>
       </span>
     </div>
     <el-table
@@ -50,18 +62,16 @@
       <el-table-column label="Action" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
-            Edit
+            编辑
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
-            Delete
+            删除
           </el-button>
         </template>
       </el-table-column>

src/views/dictionary/sign/index.vue

@@ -3,15 +3,25 @@
     <!-- 搜索框 -->
     <div class="search">
       <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="编号:">
+        <!-- 编号 -->
+        <el-form-item :label="$t('dictionary:sign:label:code')">
           <el-input v-model="searchData.Code" style="width:100px;" />
         </el-form-item>
-        <el-form-item label="模板:">
+        <!-- 模板 -->
+        <el-form-item :label="$t('dictionary:sign:label:name')">
           <el-input v-model="searchData.Name" style="width:100px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto;">
@@ -20,7 +30,7 @@
           size="mini"
           @click="handleAdd"
         >
-          New
+          {{ $t('common:button:new') }}
         </el-button>
       </span>
 
@@ -37,58 +47,65 @@
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
-
+      <!-- 编号 -->
       <el-table-column
         prop="Code"
-        label="Code"
+        :label="$t('dictionary:sign:label:code')"
         sortable="custom"
         show-overflow-tooltip
       />
+      <!-- 模板 -->
       <el-table-column
         prop="Name"
-        label="模板"
+        :label="$t('dictionary:sign:label:name')"
         show-overflow-tooltip
         sortable="custom"
       />
+      <!-- 签名内容(EN) -->
       <el-table-column
         prop="Value"
-        label="签名内容(EN)"
+        :label="$t('dictionary:sign:label:value')"
         show-overflow-tooltip
       />
+      <!-- 签名内容(CN) -->
       <el-table-column
         prop="ValueCN"
-        label="签名内容(CN)"
+        :label="$t('dictionary:sign:label:valueCN')"
         show-overflow-tooltip
       />
+      <!-- 更新时间 -->
       <el-table-column
         prop="UpdateTime"
-        label="更新时间"
+        :label="$t('dictionary:sign:label:updateTime')"
         show-overflow-tooltip
         sortable="custom"
       />
-
+      <!-- 创建时间 -->
       <el-table-column
         prop="CreateTime"
-        label="创建时间"
+        :label="$t('dictionary:sign:label:createTime')"
         show-overflow-tooltip
         sortable="custom"
       />
-      <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="text"
             @click="handleEdit(scope.row)"
           >
-            Edit
+            {{ $t('common:button:edit') }}
           </el-button>
+          <!-- 场景配置 -->
           <el-button
             type="text"
             @click="handleConfig(scope.row)"
           >
-            场景配置
+            {{ $t('dictionary:sign:button:config') }}
           </el-button>
 
-          <el-button type="text" @click="handleDelete(scope.row)">Delete</el-button>
+          <el-button type="text" @click="handleDelete(scope.row)">
+            {{ $t('common:button:delete') }}
+          </el-button>
 
         </template>
       </el-table-column>
@@ -113,7 +130,7 @@
     <el-dialog
       v-if="configVisible"
       :visible.sync="configVisible"
-      title="场景配置"
+      :title="$t('dictionary:sign:button:config')"
       :fullscreen="true"
       append-to-body
       custom-class="base-dialog-wrapper"
@@ -167,13 +184,13 @@ export default {
     // 新增
     handleAdd() {
       this.rowData = {}
-      this.title = 'Add'
+      this.title = this.$t('common:button:new')
       this.editVisible = true
     },
     // 编辑
     handleEdit(row) {
       this.rowData = { ...row }
-      this.title = 'Edit'
+      this.title = this.$t('common:button:edit')
       this.editVisible = true
     },
     // 删除

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

@@ -2,7 +2,7 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
+      <el-form :inline="true" class="base-search-form">
         <el-form-item :label="$t('dictionary:browser:search:title')">
           <el-input v-model="searchData.Title" style="width: 100px" />
         </el-form-item>
@@ -10,16 +10,20 @@
           <el-input v-model="searchData.Version" style="width: 100px" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">{{
-            $t("dictionary:browser:button:reset")
-          }}</el-button>
-          <el-button type="primary" @click="handleSearch">{{
-            $t("dictionary:browser:button:search")
-          }}</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left: auto">
-        <el-button type="primary" size="mini" @click="handleAdd">
+        <el-button type="primary" @click="handleAdd">
           {{ $t("dictionary:browser:button:add") }}
         </el-button>
       </span>

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

@@ -3,18 +3,19 @@
     ref="organForm"
     v-loading="loading"
     :model="form"
-    label-width="130px"
+    label-width="170px"
     size="small"
     :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,23 +25,37 @@
           />
         </el-select>
       </el-form-item>
-
-      <el-form-item v-if="form.Id !== ''" label="是否配置完成">
+      <!-- 标准分组 -->
+      <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"
+            :key="item.id"
+            :value="item.value"
+            :label="item.label"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 是否配置完成 -->
+      <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="eCRF是否显示在影像阅片页面">
+      <!-- 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>
@@ -72,6 +87,7 @@ export default {
         Id: '',
         CriterionName: '',
         CriterionType: null,
+        CriterionGroup: null,
         IsEnable: true,
         IsCompleteConfig: false,
         ShowOrder: null,
@@ -80,7 +96,8 @@ export default {
       },
       rules: {
         CriterionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] }],
-        CriterionType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }]
+        CriterionType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
+        CriterionGroup: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }]
       },
 
       loading: false,

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

@@ -8,32 +8,36 @@
         label-width="160px"
         size="small"
       >
-        <el-form-item label="Group: " prop="Group">
+        <el-form-item :label="$t('template:anonymization:label:group')" prop="Group">
           <el-input v-model="form.Group" />
         </el-form-item>
-        <el-form-item label="Element: " prop="Group">
+        <el-form-item :label="$t('template:anonymization:label:element')" prop="Group">
           <el-input v-model="form.Element" />
         </el-form-item>
-        <el-form-item label="tag Description: " prop="Group">
+        <!-- tag Description -->
+        <el-form-item :label="$t('template:anonymization:label:tagDescription')" prop="Group">
           <el-input v-model="form.TagDescription" />
         </el-form-item>
-        <el-form-item label="Tag DescriptionCN: " prop="Group">
+        <!-- Tag DescriptionCN -->
+        <el-form-item :label="$t('template:anonymization:label:tagDescriptionCN')" prop="Group">
           <el-input v-model="form.TagDescriptionCN" />
         </el-form-item>
-        <el-form-item label="Value Representation: " prop="Group">
+        <!-- Value Representation -->
+        <el-form-item :label="$t('template:anonymization:label:valueRepresentation')" prop="Group">
           <el-input v-model="form.ValueRepresentation" />
         </el-form-item>
-        <el-form-item label="Is Fixed: ">
+        <!-- Is Fixed -->
+        <el-form-item :label="$t('template:anonymization:label:isFixed')">
           <el-switch
             v-model="form.IsFixed"
             :active-value="true"
             :inactive-value="false"
           />
         </el-form-item>
-        <el-form-item label="Replace Value: ">
+        <el-form-item :label="$t('template:anonymization:label:valueReplace')">
           <el-input v-model="form.ReplaceValue" />
         </el-form-item>
-        <el-form-item label="Is Enable: ">
+        <el-form-item :label="$t('template:anonymization:label:isEnable')">
           <el-switch
             v-model="form.IsEnable"
             :active-value="true"
@@ -43,8 +47,8 @@
       </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>
@@ -82,7 +86,7 @@ export default {
         IsAdd: false
       },
       rules: {
-        Group: [{ required: true, message: 'Please specify', trigger: 'blur' }]
+        Group: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
       },
       model_cfg: { visible: false, showClose: true, width: '600px', title: '' }
     }
@@ -108,7 +112,7 @@ export default {
           this.btnLoading = true
           addOrUpdateSystemAnonymization(this.form).then(res => {
             this.btnLoading = false
-            this.$message.success('Saved successfully!')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
             this.model_cfg.visible = false
             this.$emit('getList')
           }).catch(() => {

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

@@ -2,26 +2,38 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="Group:">
+      <el-form :inline="true" class="base-search-form">
+        <!-- Group -->
+        <el-form-item :label="$t('template:anonymization:label:group')">
           <el-input v-model="searchData.Group" clearable style="width:120px;" />
         </el-form-item>
-        <el-form-item label="Element:">
+        <!-- Element -->
+        <el-form-item :label="$t('template:anonymization:label:element')">
           <el-input v-model="searchData.Element" clearable style="width:120px;" />
         </el-form-item>
-        <el-form-item label="Tag Description:">
+        <!-- Tag Description -->
+        <el-form-item :label="$t('template:anonymization:label:tagDescription')">
           <el-input v-model="searchData.TagDescription" clearable style="width:120px;" />
         </el-form-item>
-        <el-form-item label="Tag DescriptionCN:">
+        <!-- Tag DescriptionCN -->
+        <el-form-item :label="$t('template:anonymization:label:tagDescriptionCN')">
           <el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">New</el-button>
+        <el-button type="primary" @click="handleAdd">{{ $t('common:button:new') }}</el-button>
       </span>
     </div>
 
@@ -30,37 +42,42 @@
       v-adaptive="{bottomOffset:45}"
       :data="list"
       stripe
-      size="small"
       height="100"
     >
       <el-table-column type="index" width="60" />
+      <!-- Group -->
       <el-table-column
         prop="Group"
-        label="Group"
+        :label="$t('template:anonymization:label:group')"
         show-overflow-tooltip
       />
+      <!-- Element -->
       <el-table-column
         prop="Element"
-        label="Element"
+        :label="$t('template:anonymization:label:element')"
         show-overflow-tooltip
         min-width="110"
       />
+      <!-- Tag Description -->
       <el-table-column
         prop="TagDescription"
-        label="Tag Description"
+        :label="$t('template:anonymization:label:tagDescription')"
         min-width="110"
       />
+      <!-- Tag DescriptionCN -->
       <el-table-column
         prop="TagDescriptionCN"
-        label="Tag DescriptionCN"
+        :label="$t('template:anonymization:label:tagDescriptionCN')"
         min-width="110"
       />
+      <!-- Value Representation -->
       <el-table-column
         prop="ValueRepresentation"
-        label="Value Representation"
+        :label="$t('template:anonymization:label:valueRepresentation')"
         min-width="110"
       />
-      <el-table-column label="Is Fixed" width="100">
+      <!-- Is Fixed -->
+      <el-table-column :label="$t('template:anonymization:label:isFixed')" width="100">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.IsFixed"
@@ -70,12 +87,14 @@
           />
         </template>
       </el-table-column>
+      <!-- Value Replace -->
       <el-table-column
         prop="ReplaceValue"
-        label="Value Replace"
+        :label="$t('template:anonymization:label:valueReplace')"
         min-width="110"
       />
-      <el-table-column label="Is Enable" width="100" fixed="right">
+      <!-- Is Enable -->
+      <el-table-column :label="$t('template:anonymization:label:isEnable')" width="100" fixed="right">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.IsEnable"
@@ -85,21 +104,19 @@
           />
         </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"
+            type="text"
             @click="handleEdit(scope.row)"
           >
-            Edit
+            {{ $t('common:button:edit') }}
           </el-button>
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
-            Delete
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -145,7 +162,7 @@ export default {
     switchChange(event, item) {
       this.loading = true
       addOrUpdateSystemAnonymization(item).then(res => {
-        this.$message.success('Saved successfully!')
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
         this.loading = false
       }).catch(() => {
         this.loading = false
@@ -153,12 +170,12 @@ export default {
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['AddDICOMConfig'].openDialog('New Anonymization', {})
+        this.$refs['AddDICOMConfig'].openDialog(this.$t('common:button:new'), {})
       })
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['AddDICOMConfig'].openDialog('Edit Anonymization', row)
+        this.$refs['AddDICOMConfig'].openDialog(this.$t('common:action:edit'), row)
       })
     },
     handleDelete(row) {

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

@@ -2,11 +2,13 @@
   <box-content>
     <!-- 搜索框 -->
     <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="临床数据名称">
+      <el-form :inline="true" class="base-search-form">
+        <!-- 临床数据名称 -->
+        <el-form-item :label="$t('trials:processCfg:title:clinicalDataCfg')">
           <el-input v-model="searchData.ClinicalDataSetName" />
         </el-form-item>
-        <el-form-item label="数据级别">
+        <!-- 数据级别 -->
+        <el-form-item :label="$t('trials:processCfg:title:dataLevel')">
           <el-select v-model="searchData.ClinicalDataLevel" clearable style="width:120px;">
             <el-option
               v-for="(item,index) of $d.ClinicalLevel"
@@ -16,7 +18,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="传输方式">
+        <!-- 传输方式 -->
+        <el-form-item :label="$t('trials:processCfg:title:transferType')">
           <el-select v-model="searchData.ClinicalUploadType" clearable style="width:120px;">
             <el-option
               v-for="(item,index) of $d.ClinicalUploadType"
@@ -27,12 +30,21 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">重置</el-button>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">新增</el-button>
+        <!-- 新增 -->
+        <el-button type="primary" @click="handleAdd">{{ $t('common:button:new') }}</el-button>
       </span>
     </div>
 
@@ -41,113 +53,152 @@
       v-adaptive="{bottomOffset:45}"
       :data="list"
       stripe
-      size="small"
       height="100"
     >
-      <el-table-column type="index" width="60" />
+      <el-table-column type="index" width="40" />
+      <!-- 临床数据名称 -->
       <el-table-column
         prop="ClinicalDataSetName"
-        label="临床数据名称"
+        :label="$t('trials:processCfg:title:clinicalDataName')"
         show-overflow-tooltip
+        min-width="160"
       />
+      <!-- 临床数据名称（EN） -->
       <el-table-column
         prop="ClinicalDataSetEnName"
-        label="临床数据名称（EN）"
+        :label="$t('dictionary:clinicalData:label:clinicalDataNameEn')"
         show-overflow-tooltip
+        min-width="190"
       />
+      <!-- 上传人 -->
       <el-table-column
         prop="UploadRole"
-        :label="$t('trials:uploadMonitor:table:uploader')"
+        :label="$t('trials:processCfg:title:uploader')"
         show-overflow-tooltip
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ $fd('ClinicalDataUploadRole',scope.row.UploadRole) }}
         </template>
       </el-table-column>
+      <!-- 数据级别 -->
       <el-table-column
         prop="ClinicalDataLevel"
-        label="数据级别"
+        :label="$t('trials:processCfg:title:dataLevel')"
         show-overflow-tooltip
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ $fd('ClinicalLevel',scope.row.ClinicalDataLevel) }}
         </template>
       </el-table-column>
-
+      <!-- 传输方式 -->
       <el-table-column
         prop="ClinicalUploadType"
-        label="传输方式"
+        :label="$t('trials:processCfg:title:transferType')"
         show-overflow-tooltip
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ $fd('ClinicalUploadType',scope.row.ClinicalUploadType) }}
         </template>
       </el-table-column>
+      <!-- 匹配的阅片标准 -->
       <el-table-column
         prop="CriterionEnumList"
-        :label="$t('trials:auditRecord:table:criterion')"
+        :label="$t('trials:processCfg:label:criterion')"
         show-overflow-tooltip
+        min-width="200"
       >
         <template slot-scope="scope">
           {{ scope.row.CriterionEnumList.map(v => $fd('CriterionType', v)).toString() }}
         </template>
       </el-table-column>
+      <!-- 模板名称 -->
       <el-table-column
         prop="FileName"
-        label="模板名称"
+        :label="$t('trials:processCfg:title:module')"
         show-overflow-tooltip
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ scope.row.FileName }}
         </template>
       </el-table-column>
+      <!-- 模板英文名称 -->
       <el-table-column
-        prop="IsEnable"
-        label="状态"
+        prop="EnFileName"
+        :label="$t('trials:processCfg:title:enModule')"
         show-overflow-tooltip
+        min-width="140"
       >
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.IsEnable">启用</el-tag>
-          <el-tag v-else type="danger">禁用</el-tag>
+          {{ scope.row.EnFileName }}
         </template>
       </el-table-column>
+      <!-- 状态 -->
+      <el-table-column
+        prop="IsEnable"
+        :label="$t('dictionary:clinicalData:label:status')"
+        show-overflow-tooltip
+        min-width="120"
+      >
+        <template slot-scope="scope">
+          <!-- <el-tag v-if="scope.row.IsEnable">启用</el-tag>
+          <el-tag v-else type="danger">禁用</el-tag> -->
+          <el-tag v-if="!scope.row.IsEnable" type="danger">{{ $fd('IsEnable', scope.row.IsEnable) }}</el-tag>
+          <el-tag v-else>{{ $fd('IsEnable', scope.row.IsEnable) }}</el-tag>
+        </template>
+      </el-table-column>
+      <!-- 创建时间 -->
       <el-table-column
         prop="CreateTime"
-        label="创建时间"
+        :label="$t('dictionary:clinicalData:label:CreateTime')"
         show-overflow-tooltip
+        min-width="140"
       />
 
-      <el-table-column label="操作" width="340" fixed="right">
+      <el-table-column :label="$t('common:action:action')" min-width="250" fixed="right">
         <template slot-scope="scope">
+          <!-- 问题配置 -->
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             :disabled="scope.row.ClinicalUploadType !== 2"
             @click="handleConfigQuestion(scope.row)"
           >
-            问题配置
+            {{ $t('dictionary:clinicalData:button:qsConfig') }}
           </el-button>
+          <!-- 下载 -->
           <el-button
-            type="primary"
-            size="mini"
+            v-if="$i18n.locale === 'zh'"
+            type="text"
             :disabled="!scope.row.FileName"
-            @click="handleDownloadTpl(scope.row)"
+            @click="handleDownloadTpl(scope.row.Path)"
           >
-            下载
+            {{ $t('common:button:download') }}
           </el-button>
+          <!-- 下载 -->
+           <el-button
+            v-else
+            type="text"
+            :disabled="!scope.row.EnFileName"
+            @click="handleDownloadTpl(scope.row.EnPath)"
+          >
+            {{ $t('common:button:download') }}
+          </el-button>
+          <!-- 编辑 -->
           <el-button
-            type="primary"
-            size="mini"
+            type="text"
             @click="handleEdit(scope.row)"
           >
-            编辑
+            {{ $t('common:action:edit') }}
           </el-button>
+          <!-- 删除 -->
           <el-button
-            type="danger"
-            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -157,11 +208,11 @@
       :visible.sync="addOrEditCD.visible"
       :close-on-click-modal="false"
       :title="addOrEditCD.title"
-      width="500px"
+      width="600px"
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <ClinicalDataForm ref="addOrEditCD" :data="currentRow" @close="addOrEditCD.visible = false" @getList="getList" />
+      <clinical-data-form ref="addOrEditCD" :data="currentRow" @close="addOrEditCD.visible = false" @getList="getList" />
     </el-dialog>
     <el-dialog
       v-if="QuestionConfigVisible.visible"
@@ -172,7 +223,7 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <ClinicalQuestionConfig ref="QuestionConfigVisible" :data="currentRow" @close="QuestionConfigVisible.visible = false" @getList="getList" />
+      <clinical-question-config ref="QuestionConfigVisible" :data="currentRow" @close="QuestionConfigVisible.visible = false" @getList="getList" />
     </el-dialog>
   </box-content>
 </template>
@@ -210,7 +261,8 @@ export default {
     handleConfigQuestion(row) {
       this.currentRow = { ...row }
       this.QuestionConfigVisible.visible = true
-      this.QuestionConfigVisible.title = '问题配置'
+      // 问题配置
+      this.QuestionConfigVisible.title = this.$t('dictionary:clinicalData:button:qsConfig')
     },
     // 获取列表信息
     getList() {
@@ -223,13 +275,13 @@ export default {
     // 新增
     handleAdd() {
       this.currentRow = {}
-      this.addOrEditCD.title = '新增'
+      this.addOrEditCD.title = this.$t('common:button:new')
       this.addOrEditCD.visible = true
     },
     // 编辑
     handleEdit(row) {
       this.currentRow = { ...row }
-      this.addOrEditCD.title = '编辑'
+      this.addOrEditCD.title = this.$t('common:action:edit')
       this.addOrEditCD.visible = true
     },
     // 删除
@@ -245,13 +297,13 @@ 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 })
         })
     },
-    handleDownloadTpl(row) {
-      window.open(this.OSSclientConfig.basePath + row.Path, '_blank')
+    handleDownloadTpl(path) {
+      window.open(this.OSSclientConfig.basePath + path, '_blank')
     },
     // 排序
     handleSortByColumn(column) {

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

@@ -5,12 +5,13 @@
     :model="form"
     size="small"
     :rules="rules"
-    label-width="110px"
+    label-width="200px"
   >
     <div class="base-dialog-body">
-      <el-form-item label="临床数据名称" prop="ClinicalDataSetEnum">
+      <!-- 临床数据名称 -->
+      <el-form-item :label="$t('trials:processCfg:title:clinicalDataName')" prop="ClinicalDataSetEnum">
         <!-- <el-input v-model="form.ClinicalDataSetName" /> -->
-        <el-select v-model="form.ClinicalDataSetEnum" placeholder="请选择" style="width:100%;">
+        <el-select v-model="form.ClinicalDataSetEnum" style="width:100%;">
           <el-option
             v-for="(item,index) of $d.ClinicalDataType"
             :key="index"
@@ -19,11 +20,10 @@
           />
         </el-select>
       </el-form-item>
-
-      <el-form-item :label="$t('trials:studyList:table:uploader')" prop="UploadRole">
+      <!-- 上传人 -->
+      <el-form-item :label="$t('trials:processCfg:title:uploader')" prop="UploadRole">
         <el-select
           v-model="form.UploadRole"
-          placeholder="请选择"
           style="width:100%;"
           @change="handleUploadRoleChange"
         >
@@ -35,11 +35,10 @@
           />
         </el-select>
       </el-form-item>
-
-      <el-form-item label="数据级别" prop="ClinicalDataLevel">
+      <!-- 数据级别 -->
+      <el-form-item :label="$t('trials:processCfg:title:dataLevel')" prop="ClinicalDataLevel">
         <el-select
           v-model="form.ClinicalDataLevel"
-          placeholder="请选择"
           style="width:100%;"
         >
           <el-option
@@ -51,11 +50,10 @@
           />
         </el-select>
       </el-form-item>
-
-      <el-form-item label="传输方式" prop="ClinicalUploadType">
+      <!-- 传输方式 -->
+      <el-form-item :label="$t('trials:processCfg:title:transferType')" prop="ClinicalUploadType">
         <el-select
           v-model="form.ClinicalUploadType"
-          placeholder="请选择"
           style="width:100%;"
         >
           <el-option
@@ -67,13 +65,13 @@
           />
         </el-select>
       </el-form-item>
+      <!-- 阅片标准 -->
       <el-form-item
-        :label="$t('trials:auditRecord:table:criterion')"
+        :label="$t('trials:processCfg:label:criterion')"
         prop="CriterionEnumList"
       >
         <el-select
           v-model="form.CriterionEnumList"
-          placeholder="请选择"
           multiple
           style="width:100%;"
         >
@@ -85,7 +83,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="form.ClinicalUploadType === 1" label="模板: ">
+      <!-- 模板 -->
+      <el-form-item v-if="form.ClinicalUploadType === 1" :label="$t('trials:processCfg:title:module')">
         <div class="upload-container">
           <el-upload
             class="upload-demo"
@@ -101,19 +100,51 @@
             :on-exceed="handleExceed"
             :disabled="form.Type === ''"
           >
-            <el-button size="small" type="primary">选择</el-button>
+            <el-button size="small" type="primary">
+              {{ $t('trials:processCfg:button:select') }}
+            </el-button>
             <span
               slot="tip"
               style="margin-left:10px;"
               class="el-upload__tip"
             >
-              (必须是doc/docx格式)
+              {{ $t('system:tip:file:docx') }}
             </span>
           </el-upload>
         </div>
       </el-form-item>
-
-      <el-form-item v-if="form.Id !== ''" label="是否启用">
+      <!-- 英文模板 -->
+      <el-form-item v-if="form.ClinicalUploadType === 1" :label="$t('trials:processCfg:title:enModule')">
+        <div class="upload-container">
+          <el-upload
+            class="upload-demo"
+            action
+            accept=".doc,.docx"
+            :before-upload="beforeUploadEnFile"
+            :http-request="handleUploadEnFile"
+            :on-preview="handlePreview"
+            :on-remove="handleRemoveEnFile"
+            :show-file-list="true"
+            :file-list="enFileList"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :disabled="form.Type === ''"
+          >
+            <el-button size="small" type="primary">
+              {{ $t('trials:processCfg:button:select') }}
+            </el-button>
+            <span
+              slot="tip"
+              style="margin-left:10px;"
+              class="el-upload__tip"
+            >
+              {{ $t('system:tip:file:docx') }}
+            </span>
+          </el-upload>
+        </div>
+      </el-form-item>
+      <!-- 是否启用 -->
+      <el-form-item v-if="form.Id !== ''" :label="$t('dictionary:clinicalData:label:IsEnable')">
         <el-switch v-model="form.IsEnable" />
       </el-form-item>
     </div>
@@ -160,6 +191,8 @@ export default {
         UploadRole: null,
         FileName: '',
         Path: '',
+        EnFileName: '',
+        EnPath: '',
         IsEnable: true,
         CriterionEnumList: []
       },
@@ -173,6 +206,7 @@ export default {
       loading: false,
       btnLoading: false,
       fileList: [],
+      enFileList: [],
       systemCriterionSelectList: []
     }
   },
@@ -195,6 +229,14 @@ export default {
             }
           ]
         }
+        if (this.data.EnPath) {
+          this.enFileList = [
+            {
+              name: this.data.EnFileName,
+              path: this.data.EnPath
+            }
+          ]
+        }
       }
     },
     save() {
@@ -231,7 +273,7 @@ export default {
         this.fileList = []
         return true
       } else {
-        this.$alert('(必须是doc/docx格式)')
+        this.$alert(this.$t('system:tip:file:docx'))
 
         return false
       }
@@ -247,7 +289,33 @@ export default {
       }
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`只允许上传一个文件`)
+      this.$message.warning(this.$t('trials:processCfg:title:onlyOneFile'))
+    },
+    beforeUploadEnFile(file) {
+      // 检测文件类型是否符合要求
+      if (this.checkFileSuffix(file.name)) {
+        this.enFileList = []
+        return true
+      } else {
+        this.$alert(this.$t('system:tip:file:docx'))
+
+        return false
+      }
+    },
+    async handleUploadEnFile(param) {
+      this.loading = true
+      var fileBlob = await this.fileToBlob(param.file)
+      const res = await this.OSSclient.put(`/System/ClinicalDataTemplate/${param.file.name}`, fileBlob)
+      this.form.EnFileName = res.name
+      this.form.EnPath = this.$getObjectName(res.url)
+      let file = { name: res.name, path: this.$getObjectName(res.url), url:this.$getObjectName(res.url) }
+      this.enFileList.push(file)
+      this.loading = false
+    },
+    handleRemoveEnFile() {
+      this.enFileList = []
+      this.form.EnPath = ''
+      this.form.EnFileName = ''
     },
     checkFileSuffix(fileName) {
       var typeArr = ['doc', 'docx']
@@ -275,7 +343,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/ClinicalQuestionConfig.vue

@@ -2,39 +2,49 @@
   <div class="criterion-config">
     <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:qName')">
           <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">重置</el-button>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
-
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <div>
+        <!-- 预览 -->
         <el-button
           :disabled="list.length === 0"
           size="mini"
           type="primary"
           @click="preview.visible = true"
         >
-          预览
+          {{ $t('common:button:preview') }}
         </el-button>
-
+        <!-- 添加 -->
         <el-button
           v-if="Object.keys(data).length > 0 && !data.IsBeUsed"
           size="mini"
           type="primary"
           @click="handleAdd"
         >
-          添加
+          {{ $t('common:button:add') }}
         </el-button>
+        <!-- 应用 -->
         <el-button
           size="mini"
           type="primary"
           @click="handleApply"
         >
-          应用
+          {{ $t('dictionary:clinicalDataQs:button:apply') }}
         </el-button>
       </div>
     </div>
@@ -52,81 +62,92 @@
         label=""
         width="50"
       />
+      <!-- 名称 -->
       <el-table-column
         prop="QuestionName"
-        label="名称"
+        :label="$t('trials:readingUnit:qsList:title:qName')"
         show-overflow-tooltip
       />
+      <!-- 名称(EN) -->
       <el-table-column
         prop="QuestionEnName"
-        label="名称(EN)"
+        :label="$t('trials:readingUnit:qsList:title:qNameEn')"
         show-overflow-tooltip
       />
+      <!-- 题型 -->
       <el-table-column
         prop="Type"
-        label="题型"
+        :label="$t('trials:readingUnit:qsList:title:type')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
           {{ $fd('ClinicalQuestionType',scope.row.ClinicalQuestionType) }}
         </template>
       </el-table-column>
+      <!-- 选项 -->
       <el-table-column
         prop="TypeValue"
-        label="选项"
+        :label="$t('trials:readingUnit:qsList:title:type')"
         show-overflow-tooltip
       >
       </el-table-column>
+      <!-- 是否显示 -->
       <el-table-column
         prop="ClinicalQuestionShowEnum"
-        label="是否显示"
+        :label="$t('trials:readingUnit:qsList:title:isShow')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
           {{ $fd('ShowQuestion',scope.row.ClinicalQuestionShowEnum) }}
         </template>
       </el-table-column>
+      <!-- 是否必填 -->
       <el-table-column
         prop="IsRequired"
-        label="是否必填"
+        :label="$t('trials:qcCfg:table:isRequired')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
           {{ $fd('YesOrNo',scope.row.IsRequired) }}
         </template>
       </el-table-column>
+      <!-- 操作 -->
       <el-table-column
         prop=""
-        label="操作"
+        :label="$t('common:action:action')"
         width="250"
         show-overflow-tooltip
         fixed="right"
       >
         <template slot-scope="scope">
+          <!-- 编辑 -->
           <el-button
             v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
             type="primary"
             size="mini"
             @click="handleEdit(scope.row)"
           >
-            编辑
+            {{ $t('trials:readingUnit:qsList:title:edit') }}
           </el-button>
+          <!-- 查看 -->
           <el-button
             v-else
             type="primary"
             size="mini"
             @click="handleLook(scope.row)"
           >
-            查看
+            {{ $t('trials:enrolledReviews:button:view') }}
           </el-button>
+          <!-- 表格问题 -->
           <el-button
             type="primary"
             size="mini"
             :disabled="scope.row.ClinicalQuestionType !== 'table'"
             @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)"
             type="danger"
@@ -134,7 +155,7 @@
             :disabled="scope.row.IsEnable"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -149,7 +170,7 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <ClinicalQuestionForm
+      <clinical-question-form
         ref="addOrEdit"
         :list="this.list"
         :clinical-id="clinicalId"
@@ -254,7 +275,8 @@ export default {
       applySystemClinical({
         SystemClinicalId: this.clinicalId
       }).then(res => {
-        this.$message.success('应用成功')
+        // 应用成功！
+        this.$message.success(this.$t('dictionary:clinicalDataQs:message:msg1'))
         this.$emit('close')
       })
     },
@@ -271,19 +293,19 @@ export default {
     handleAdd() {
       this.rowData = { SystemClinicalId: this.data.Id, Id: '' }
       this.type = 'add'
-      this.addOrEdit.title = '添加'
+      this.addOrEdit.title = this.$t('common:button:add')
       this.addOrEdit.visible = true
     },
     handleLook(row) {
       this.rowData = { ...row }
       this.type = 'look'
-      this.addOrEdit.title = '查看'
+      this.addOrEdit.title = this.$t('trials:enrolledReviews:button:view')
       this.addOrEdit.visible = true
     },
     handleEdit(row) {
       this.rowData = { ...row }
       this.type = 'edit'
-      this.addOrEdit.title = '编辑'
+      this.addOrEdit.title = this.$t('trials:readingUnit:qsList:title:edit')
       this.addOrEdit.visible = true
     },
     handleDelete(row) {
@@ -298,14 +320,14 @@ 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 })
         })
     },
     handleConfig(row) {
       this.rowData = { ...row }
-      this.config.title = `表格问题`
+      this.config.title = this.$t('trials:readingUnit:qsList:title:tableQs')
       this.config.visible = true
     },
     // 查询