Merge branch 'main' into uat_us

.env.usa

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

.env.usa_prod

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

.env.usa_test

@@ -0,0 +1,44 @@
+# just a flag
+ENV = 'usa'
+NODE_ENV = 'usa'
+# base public path
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-08-12/'
+
+# 是否开启登陆限制 true:是 false:否
+VUE_APP_LOGIN_FOR_PERMISSION = true
+
+# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否
+VUE_APP_LOCK_FOR_PERMISSION_MFA = true
+
+# 是否开启长时间无操作锁定弹框 true:是 false:否
+VUE_APP_LOCK_FOR_PERMISSION = true
+
+# 无操作锁定弹框判断时间 单位:秒
+VUE_APP_LOCK_FOR_TIME = 900
+
+# 是否开启长时间无操作登出 true:是 false:否
+VUE_APP_LOGOUT_FOR_PERMISSION = true
+
+# 无操作锁定弹框判断时间 单位:秒
+VUE_APP_LOGOUT_FOR_TIME = 1800
+
+# 是否开启密码正则验证 true:是 false:否
+VUE_APP_PASSWORD_FOR_PERMISSION = true
+
+# 是否开启密码正则验证 true:是 false:否
+VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
+
+# 是否开启文档签署验证 true:是 false:否
+VUE_APP_WORD_FOR_PERMISSION = true
+
+# 公司名称
+VUE_APP_COMPANY_NAME = "Elevate Imaging"
+
+# dicom文件地址
+VUE_APP_DICOM_PATH = 'https://zyypacs-uat.oss-cn-shanghai.aliyuncs.com'
+
+VUE_APP_OSS_CONFIG_REGION = 'oss-cn-shanghai'
+
+VUE_APP_OSS_CONFIG_BUCKET = 'zyypacs-uat'
+
+VUE_APP_OSS_PATH = '/usa/dist'

.eslintrc.js

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

babel.config.js

@@ -1,12 +1,10 @@
 module.exports = {
   presets: [
-    // '@vue/cli-plugin-babel/preset',
-    // ["@babel/preset-env", { "modules": false }]
+    '@vue/cli-plugin-babel/preset',
     '@babel/preset-env'
   ],
   plugins: [
-    '@vue/babel-plugin-transform-vue-jsx'
-    // '@babel/plugin-proposal-optional-chaining',
-    // '@babel/plugin-proposal-nullish-coalescing-operator'
+    '@babel/plugin-proposal-optional-chaining',
+    '@babel/plugin-proposal-nullish-coalescing-operator'
   ]
 }

package.json

@@ -6,6 +6,7 @@
     "build": "vue-cli-service build",
     "build:prod": "vue-cli-service  build --mode prod",
     "build:uat": "vue-cli-service  build --mode uat",
+    "build:usa_test": "vue-cli-service  build --mode usa_test",
     "build:usa": "vue-cli-service  build --mode usa",
     "build:usa_prod": "vue-cli-service  build --mode usa_prod",
     "pre": "vue-cli-service build --mode pre",
@@ -14,20 +15,23 @@
     "i18n:en": "node i18nGenerate.js lang=en keyCol=5 valCol=7"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.701.0",
-    "@cornerstonejs/adapters": "^2.19.7",
+    "@aws-sdk/client-s3": "^3.370.0",
     "@cornerstonejs/calculate-suv": "^1.1.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",
+    "@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",
     "@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",
+    "axios": "0.18.1",
+    "babel-eslint": "7.2.3",
+    "copy-webpack-plugin": "^4.5.2",
     "core-js": "^3.8.3",
     "cornerstone-core": "^2.6.1",
     "cornerstone-math": "^0.1.10",
@@ -38,68 +42,67 @@
     "dicom-parser": "^1.8.9",
     "dicomedit": "^0.1.0",
     "echarts": "^4.8.0",
-    "element-ui": "^2.15.14",
-    "exceljs": "^4.4.0",
+    "element-ui": "^2.15.8",
+    "exceljs": "^4.1.0",
     "file-saver": "^2.0.5",
     "hammerjs": "^2.0.8",
     "html2canvas": "^1.4.1",
-    "js-md5": "^0.8.3",
+    "js-md5": "^0.7.3",
     "jsencrypt": "^3.3.2",
-    "jszip": "^3.10.1",
-    "minio": "^7.1.3",
-    "moment": "^2.30.1",
-    "moment-timezone": "^0.5.46",
-    "node-xlsx": "^0.24.0",
-    "normalize.css": "^8.0.1",
-    "nprogress": "^0.2.0",
-    "path-to-regexp": "^0.1.10",
-    "pdfobject": "^2.3.0",
-    "qrcodejs2": "^0.0.2",
-    "screenfull": "^6.0.2",
-    "sortablejs": "^1.15.5",
+    "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",
     "streamsaver": "^2.0.6",
-    "svg-sprite-loader": "^4.1.3",
-    "svgo": "^1.2.2",
-    "v-viewer": "^1.7.4",
+    "v-viewer": "^1.6.4",
     "vcrontab": "^0.3.5",
-    "vue": "^2.6.14",
-    "vue-clipboard2": "^0.3.3",
-    "vue-contextmenujs": "^1.4.11",
+    "vue": "^2.6.11",
+    "vue-clipboard2": "^0.3.1",
+    "vue-contextmenujs": "^1.3.13",
     "vue-count-to": "^1.0.13",
-    "vue-demi": "^0.14.10",
-    "vue-i18n": "^8.28.2",
+    "vue-demi": "^0.14.6",
+    "vue-i18n": "^8.7.0",
+    "vue-pdf": "^4.3.0",
     "vue-puzzle-vcode": "^1.1.10",
-    "vue-router": "^3.0.6",
-    "vue-seamless-scroll": "^1.1.23",
+    "vue-router": "3.0.6",
+    "vue-seamless-scroll": "^1.1.21",
     "vuedraggable": "^2.24.3",
-    "vuex": "^3.1.0",
-    "webpack-aliyun-oss": "^0.3.13"
+    "vuex": "3.1.0",
+    "webpack-aliyun-oss": "^0.4.9"
   },
   "devDependencies": {
-    "@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"
+    "@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"
   },
   "eslintConfig": {
     "root": true,
@@ -107,19 +110,19 @@
       "node": true
     },
     "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended"
+      "plugin:vue/essential"
     ],
     "parserOptions": {
-      "parser": "@babel/eslint-parser",
-      "requireConfigFile": false
+      "parser": "babel-eslint"
     },
     "rules": {}
   },
+  "engines": {
+    "node": ">=8.9",
+    "npm": ">= 3.0.0"
+  },
   "browserslist": [
     "> 1%",
-    "last 2 versions",
-    "not dead",
-    "not op_mini all"
+    "last 2 versions"
   ]
 }

src/App.vue

@@ -40,7 +40,7 @@
           <el-form-item :label="$t('il8n:search:keyword')">
             <el-input v-model="key" @input="keyChange" />
           </el-form-item>
-          <el-form-item :label="$t('il8n:search:state')">
+          <el-form-item :label="$t('il8n:search:state')" v-if="il8nExternal">
             <el-select
               v-model="State"
               clearable
@@ -105,7 +105,11 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="ValueCN" :label="$t('il8n:table:state')">
+        <el-table-column
+          prop="ValueCN"
+          :label="$t('il8n:table:state')"
+          v-if="il8nExternal"
+        >
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.State"
@@ -122,16 +126,12 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="Version" :label="$t('il8n:table:Version')">
-        </el-table-column>
       </el-table>
       <div style="text-align: right; padding-top: 10px; padding-right: 10px">
-        <el-button size="mini" @click="drawer = false"
-          >{{ $t('common:button:cancel') }}
-        </el-button>
-        <el-button size="mini" type="primary" @click="handleSave">{{
-          $t('common:button:save')
-        }}</el-button>
+        <el-button size="mini" @click="drawer = false">取消 </el-button>
+        <el-button size="mini" type="primary" @click="handleSave"
+          >保存</el-button
+        >
       </div>
     </el-drawer>
     <feedBack v-if="$route.matched.length > 0" />
@@ -209,9 +209,9 @@ export default {
           [],
           this.arr.filter(
             (v) =>
-              ~v.Code.toLowerCase().indexOf(this.key.toLowerCase()) ||
-              ~v.Value.toLowerCase().indexOf(this.key.toLowerCase()) ||
-              ~v.ValueCN.toLowerCase().indexOf(this.key.toLowerCase())
+              ~v.Code.indexOf(this.key) ||
+              ~v.Value.indexOf(this.key) ||
+              ~v.ValueCN.indexOf(this.key)
           )
         )
       } else {
@@ -219,39 +219,33 @@ export default {
       }
     },
     handleSave() {
-      this.$confirm('确定修改当前页面国际化内容？')
-        .then(() => {
-          batchAddOrUpdateFrontInternationalization(this.tableData).then(
-            async (res) => {
-              var zhMessages = {},
-                enMessages = {}
-              var Internationalization =
-                await getFrontInternationalizationList()
-              Vue.prototype.$tl = Internationalization.Result
-              this.tableData.forEach((v) => {
-                // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
-                // enMessages[v.Description + '_' + v.Code] = v.Value
-                zhMessages[v.Code] = v.ValueCN
-                enMessages[v.Code] = v.Value
-              })
-              i18n.mergeLocaleMessage('zh', zhMessages)
-              i18n.mergeLocaleMessage('en', enMessages)
-              this.drawer = false
-              this.$message.success('国际化修改成功')
-              if (this.il8nExternal) {
-                this.$EventBus.$emit('il8nUpdate')
-              }
+      this.$confirm('确定修改当前页面国际化内容？').then(() => {
+        batchAddOrUpdateFrontInternationalization(this.tableData).then(
+          async (res) => {
+            var zhMessages = {},
+              enMessages = {}
+            var Internationalization = await getFrontInternationalizationList()
+            Vue.prototype.$tl = Internationalization.Result
+            this.tableData.forEach((v) => {
+              // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
+              // enMessages[v.Description + '_' + v.Code] = v.Value
+              zhMessages[v.Code] = v.ValueCN
+              enMessages[v.Code] = v.Value
+            })
+            i18n.mergeLocaleMessage('zh', zhMessages)
+            i18n.mergeLocaleMessage('en', enMessages)
+            this.drawer = false
+            this.$message.success('国际化修改成功')
+            if (this.il8nExternal) {
+              this.$EventBus.$emit('il8nUpdate')
             }
-          )
-        })
-        .catch((err) => {
-          console.log(err)
-        })
+          }
+        )
+      })
     },
     openI18n(ARRAY) {
       this.tableData = []
       this.il8nExternal = false
-      this.State = null
       this.key = null
       this.drawer = true
       let arr = []
@@ -272,8 +266,6 @@ export default {
             Value: item.Value,
             ValueCN: item.ValueCN,
             State: item.State,
-            Version: item.Version,
-            InternationalizationType: item.InternationalizationType,
           }
         })
         this.tableData = Object.assign([], tableData)
@@ -304,9 +296,6 @@ export default {
             Description: null,
             Value: null,
             ValueCN: null,
-            State: 0,
-            Version: this.$version.Version,
-            InternationalizationType: 0,
           })
         }
       })

src/api/trials.js

@@ -1081,13 +1081,6 @@ export function setSeriesStatus(trialId, subjectVisitId, studyId, seriesId, stat
   })
 }
 
-export function setInstanceStatus(trialId, subjectVisitId, seriesId, instanceId, state) {
-  return request({
-    url: `/QCOperation/setInstanceState/${trialId}/${subjectVisitId}/${seriesId}/${instanceId}/${state}`,
-    method: 'put'
-  })
-}
-
 export function getVisitQCStudyAndSeriesList(subjectVisitId) {
   return request({
     url: `/QCList/getVisitQCStudyAndSeriesList/${subjectVisitId}`,

src/components/TrialsTab/index.vue

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

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" :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">
+    <el-col v-for="(item) in question.Childrens" v-if="question.Childrens && question.Childrens.length>0 && question.ClinicalQuestionType !== 'table'" :span="['group', 'summary', 'table'].includes(item.ClinicalQuestionType) || item.Childrens.length > 0 ? 24 : 12">
       <QuestionFormItem
         :key="item.Id"
         :question="item"
@@ -593,7 +593,7 @@ export default {
 <style lang="scss" scoped>
 .my_dialog{
   .criterion-form-item{
-    ::v-deep .el-form-item__content{
+    >>>.el-form-item__content{
       width: auto;
     }
   }
@@ -614,7 +614,7 @@ export default {
     margin-bottom: 0px;
   }
   .disabled{
-    ::v-deep .el-upload--picture-card {
+    >>>.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{
-    ::v-deep .el-form-item__content{
+    >>>.el-form-item__content{
       width: auto;
     }
   }
@@ -233,7 +233,7 @@ export default {
     flex-direction: row;
     align-items: flex-start;
   }
-  ::v-deep .el-form-item__content{
+  >>>.el-form-item__content{
     width: 500px;
   }
   .el-input{
@@ -243,7 +243,7 @@ export default {
     margin-bottom: 0px;
   }
   .disabled{
-    ::v-deep .el-upload--picture-card {
+    >>>.el-upload--picture-card {
       display: none;
     }
   }

src/components/toggleRole/index.vue

@@ -92,7 +92,6 @@ export default {
       try {
         if (!this.form.userRoleId)
           return this.$message.warning(this.$t('toggleRole:ruleMessage:select'))
-          zzSessionStorage.removeItem('lastWorkbench')
         this.$emit('save', this.form.userRoleId)
       } catch (err) {
         console.log(err)
@@ -112,11 +111,11 @@ export default {
   margin: auto;
 }
 
-::v-deep .el-radio__original {
+/deep/ .el-radio__original {
   display: none !important; /* 隐藏原生 radio 输入，但仍然允许交互 */
 }
 
-::v-deep.el-radio:focus:not(.is-focus):not(:active):not(.is-disabled)
+/deep/.el-radio:focus:not(.is-focus):not(:active):not(.is-disabled)
   .el-radio__inner {
   box-shadow: none !important;
 }

src/layout/components/Sidebar/index.vue

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

src/layout/components/TagsView/ScrollPane.vue

@@ -73,7 +73,7 @@ export default {
   position: relative;
   overflow: hidden;
   width: 100%;
-  ::v-deep {
+  /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.module.scss";
+@import "~@/styles/variables.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') || ~window.location.href.indexOf('/fusion')) {
+  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct')) {
     params = $q('TrialReadingCriterionId')
     res = await getBasicDataAllSelect(params)
   } else if (~window.location.href.indexOf('/ecrfPreview')) {

src/router/index.js

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

src/styles/index.scss

@@ -1,4 +1,4 @@
-@import "./variables.module.scss";
+@import "./variables.scss";
 @import "./mixin.scss";
 @import "./transition.scss";
 @import "./element-ui.scss";

src/styles/sidebar.scss

@@ -71,49 +71,29 @@ $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;
     }
-    .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 {
+
+    & .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;
-        
       }
     }
-    // &.nest-menu .el-submenu>.el-submenu__title,
-    // &.el-submenu .el-menu-item {
-    //   min-width: $sideBarWidth !important;
-    //   background-color: $subMenuBg !important;
-      
-    //   &:hover {
-    //     background-color: $subMenuHover !important;
-        
-    //   }
-    // }
   }
 
   .hideSidebar {

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

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

src/views/blindResumeInfo/index.vue

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

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

@@ -52,14 +52,10 @@
                             </div>
                             <div v-if="item.isExistMutiFrames && item.instanceCount > 1">
                               <el-popover
-                                v-model="item.isShowPopper"
-                                placement="right-start"
-                                trigger="manual"
+                                placement="right"
+                                trigger="hover"
                                 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"
@@ -70,27 +66,11 @@
                                   >
                                     <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, 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>{{ `${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)" />
+                                <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
                               </el-popover>
                             </div>
                           </div>
@@ -158,13 +138,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, setInstanceStatus } from '@/api/trials'
+import { getInstanceList, getPatientSeriesList, setSeriesStatus } 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,
@@ -316,8 +296,7 @@ export default {
               tpCode: this.tpCode,
               loadStatus: false,
               imageloadedArr: [],
-              isExistMutiFrames: item.IsExistMutiFrames,
-              isShowPopper: false
+              isExistMutiFrames: item.IsExistMutiFrames
             })
           })
           this.seriesList = seriesList
@@ -376,8 +355,7 @@ export default {
               tpCode: this.tpCode,
               loadStatus: false,
               imageloadedArr: [],
-              isExistMutiFrames: item.IsExistMutiFrames,
-              isShowPopper: false
+              isExistMutiFrames: item.IsExistMutiFrames
             })
           })
           this.seriesList = seriesList
@@ -406,8 +384,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.OtherInfo.IsReading
-        var isDeleted = res.OtherInfo.IsDeleted
+        var isReading = res.Result[0].IsReading
+        var isDeleted = res.Result[0].IsDeleted
         var seriesList = []
         var imageIds = []
         let isExistMutiFrames = false
@@ -425,7 +403,7 @@ export default {
             imageIds.push(path)
             imageId = path
           }
-          instanceInfoList.push({ Id: instance.Id, InstanceNumber: instance.InstanceNumber, NumberOfFrames: instance.NumberOfFrames, Path: instance.Path, ImageId: imageId, IsDeleted: instance.IsDeleted, IsReading: instance.IsReading })
+          instanceInfoList.push({ Id: instance.Id, InstanceNumber: instance.InstanceNumber, NumberOfFrames: instance.NumberOfFrames, Path: instance.Path, ImageId: imageId })
         })
         seriesList.push({
           trialId,
@@ -446,8 +424,7 @@ export default {
           prefetchInstanceCount: 0,
           loadStatus: false,
           imageloadedArr: [],
-          isExistMutiFrames: isExistMutiFrames,
-          isShowPopper: false
+          isExistMutiFrames: isExistMutiFrames
         })
         this.seriesList = seriesList
         if (this.seriesList.length > 0) {
@@ -596,8 +573,7 @@ export default {
           hasLabel: seriesInfo.HasLabel,
           keySeries: seriesInfo.KeySeries,
           loadStatus: false,
-          imageloadedArr: [],
-          isShowPopper: false
+          imageloadedArr: []
         })
         this.seriesList = seriesList
         if (this.seriesList.length > 0) {
@@ -695,81 +671,6 @@ 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
@@ -1047,8 +948,8 @@ export default {
   background: #d0d0d0;
 }
 .frame_content{
-  /* height: 50px; */
-  padding: 10px;
+  height: 50px;
+  padding: 5px;
   display: flex;
   justify-content: flex-start;
   color: #ddd;

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

@@ -59,56 +59,34 @@
                                 <div>#{{ series.seriesNumber }}</div>
                                 <div v-if="series.isExistMutiFrames && series.instanceCount > 1">
                                   <el-popover
-                                    v-model="series.isShowPopper"
-                                    placement="right-start"
-                                    trigger="manual"
+                                    placement="right"
+                                    trigger="hover"
                                     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="series.isShowPopper = false" />
-                                    </div>
-                                    <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
+                                      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>
-                                    <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" @click="popperClick(studyList, series)" />
+                                    <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
                                   </el-popover>
                                 </div>
 
@@ -165,7 +143,7 @@
                   </div>
                 </div>
               </el-tab-pane>
-              <el-tab-pane v-if="!visitTaskId" :label="$t('trials:dicom-show:relatedVisit')" name="relation-study" class="pane-relation-wrapper">
+              <el-tab-pane :label="$t('trials:dicom-show:relatedVisit')" name="relation-study" class="pane-relation-wrapper" v-if="!visitTaskId">
                 <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}`">
@@ -218,8 +196,8 @@
                                 <div v-else>#{{ seriesItem.seriesNumber }}</div>
                                 <div v-if="seriesItem.isExistMutiFrames && seriesItem.instanceCount > 1">
                                   <el-popover
-                                    placement="right-start"
-                                    trigger="click"
+                                    placement="right"
+                                    trigger="hover"
                                     popper-class="instance_frame_wrapper"
                                   >
                                     <div class="frame_list">
@@ -282,13 +260,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, setInstanceStatus } from '@/api/trials'
+import { setSeriesStatus } 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,
@@ -370,7 +348,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)
@@ -421,8 +399,7 @@ export default {
                 prefetchInstanceCount: 0,
                 loadStatus: false,
                 imageloadedArr: [],
-                isExistMutiFrames: series.IsExistMutiFrames,
-                isShowPopper: false
+                isExistMutiFrames: series.IsExistMutiFrames
               })
             })
             data.SeriesList = seriesList
@@ -618,83 +595,6 @@ 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) {
@@ -771,8 +671,7 @@ export default {
                 keySeries: item.KeySeries,
                 loadStatus: false,
                 imageloadedArr: [],
-                isExistMutiFrames: item.IsExistMutiFrames,
-                isShowPopper: false
+                isExistMutiFrames: item.IsExistMutiFrames
               })
             })
             scope.relationStudyList[index].seriesCount = seriesList.length
@@ -1079,21 +978,9 @@ 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: 10px;
+  height: 50px;
+  padding: 5px;
   display: flex;
   justify-content: flex-start;
   color: #ddd;

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

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

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

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

src/views/dictionary/checkConfig/index.vue

@@ -3,7 +3,7 @@
     <el-form :inline="true">
       <el-form-item label="模块">
         <el-select v-model="queryParams.ModuleTypeId" placeholder="模块" clearable size="small">
-          <el-option v-for="item of dict.type.ModuleType" :key="`ModuleTypeId${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
+          <el-option v-for="item of dict.type.ModuleType" :value="item.value" :label="item.raw.ValueCN" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -169,28 +169,28 @@
             <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
               <el-form-item label="功能模块" prop="menuType">
                 <el-select v-model="form.ModuleTypeId" placeholder="模块" clearable size="small" @change="changeModule">
-                  <el-option v-for="item of dict.type.ModuleType" :key="`ModuleType${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
+                  <el-option v-for="item of dict.type.ModuleType" :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" :key="`OptTypeId${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
+                  <el-option v-for="item of dict.type.OptType" :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" :key="`ObjectType${item.value}`" v-if="ChildGroup === item.raw.ChildGroup" :value="item.value" :label="item.raw.ValueCN" />
+                  <el-option v-for="item of dict.type.ObjectType" 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" :key="`ChildrenType${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
+                  <el-option v-for="item of dict.type.ChildrenType" :value="item.value" :label="item.raw.ValueCN" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -295,7 +295,7 @@
                       </el-button>
                     </el-col>
                   </el-row>
-                  <el-row v-show="form.DataType === 'Router'" v-if="form.UrlConfig && form.UrlConfig.IsHaveParameters" v-for="(item,index) of form.UrlConfig ? form.UrlConfig.ParameterList : []" :key="`Router${index}`">
+                  <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-col :span="10">
                       <el-form-item>
                       <span slot="label">
@@ -671,11 +671,11 @@
       <div style="padding: 0 40px;display: flex;flex-direction: column">
         <div style="text-align: right;height: 50px;">
           <el-select v-model="copeParams.FromItemId" collapse-tags filterable placeholder="完全拷贝对象" clearable size="small">
-            <el-option v-for="item of list" :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-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-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" :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-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-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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -10,16 +10,12 @@
           <el-input v-model="searchData.Version" style="width: 100px" />
         </el-form-item>
         <el-form-item>
-          <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-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-form-item>
       </el-form>
       <span style="margin-left: auto">

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

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

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

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

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

@@ -16,16 +16,8 @@
           <el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <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-button type="primary" @click="handleReset">Reset</el-button>
+          <el-button type="primary" @click="handleSearch">Search</el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">

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

@@ -27,16 +27,8 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <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-button type="primary" @click="handleReset">重置</el-button>
+          <el-button type="primary" @click="handleSearch">查询</el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
@@ -109,15 +101,6 @@
           {{ scope.row.FileName }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="EnFileName"
-        label="模板英文名称"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          {{ scope.row.EnFileName }}
-        </template>
-      </el-table-column>
       <el-table-column
         prop="IsEnable"
         label="状态"
@@ -145,20 +128,10 @@
             问题配置
           </el-button>
           <el-button
-            v-if="$i18n.locale === 'zh'"
             type="primary"
             size="mini"
             :disabled="!scope.row.FileName"
-            @click="handleDownloadTpl(scope.row.Path)"
-          >
-            下载
-          </el-button>
-           <el-button
-            v-else
-            type="primary"
-            size="mini"
-            :disabled="!scope.row.EnFileName"
-            @click="handleDownloadTpl(scope.row.EnPath)"
+            @click="handleDownloadTpl(scope.row)"
           >
             下载
           </el-button>
@@ -277,8 +250,8 @@ export default {
             }).catch(() => { this.loading = false })
         })
     },
-    handleDownloadTpl(path) {
-      window.open(this.OSSclientConfig.basePath + path, '_blank')
+    handleDownloadTpl(row) {
+      window.open(this.OSSclientConfig.basePath + row.Path, '_blank')
     },
     // 排序
     handleSortByColumn(column) {

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

@@ -113,34 +113,6 @@
         </div>
       </el-form-item>
 
-      <el-form-item v-if="form.ClinicalUploadType === 1" label="英文模板: ">
-        <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">选择</el-button>
-            <span
-              slot="tip"
-              style="margin-left:10px;"
-              class="el-upload__tip"
-            >
-              (必须是doc/docx格式)
-            </span>
-          </el-upload>
-        </div>
-      </el-form-item>
-
       <el-form-item v-if="form.Id !== ''" label="是否启用">
         <el-switch v-model="form.IsEnable" />
       </el-form-item>
@@ -188,8 +160,6 @@ export default {
         UploadRole: null,
         FileName: '',
         Path: '',
-        EnFileName: '',
-        EnPath: '',
         IsEnable: true,
         CriterionEnumList: []
       },
@@ -203,7 +173,6 @@ export default {
       loading: false,
       btnLoading: false,
       fileList: [],
-      enFileList: [],
       systemCriterionSelectList: []
     }
   },
@@ -226,14 +195,6 @@ export default {
             }
           ]
         }
-        if (this.data.EnPath) {
-          this.enFileList = [
-            {
-              name: this.data.EnFileName,
-              path: this.data.EnPath
-            }
-          ]
-        }
       }
     },
     save() {
@@ -288,32 +249,6 @@ export default {
     handleExceed(files, fileList) {
       this.$message.warning(`只允许上传一个文件`)
     },
-    beforeUploadEnFile(file) {
-      // 检测文件类型是否符合要求
-      if (this.checkFileSuffix(file.name)) {
-        this.enFileList = []
-        return true
-      } else {
-        this.$alert('(必须是doc/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']
       var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
@@ -340,7 +275,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .upload-container{
-  ::v-deep .el-upload {
+  /deep/ .el-upload {
     width: 100%;
     text-align: left;
   }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -16,16 +16,8 @@
           <el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <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-button type="primary" @click="handleReset">Reset</el-button>
+          <el-button type="primary" @click="handleSearch">Search</el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">

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

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

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

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

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

@@ -38,16 +38,8 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <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-button type="primary" @click="handleReset">重置</el-button>
+          <el-button type="primary" @click="handleSearch">查询</el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -123,16 +123,8 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <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-button type="primary" @click="handleSearch">查询</el-button>
+          <el-button type="primary" @click="handleReset">重置</el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left: auto">
@@ -450,11 +442,11 @@
           flex-wrap: wrap;
         "
       >
-        <div style="min-width: 50%">
+        <div>
           <h3>邮件内容模版（CN）</h3>
           <div v-html="previewHTML"></div>
         </div>
-        <div style="min-width: 50%">
+        <div>
           <h3>邮件内容模版（EN）</h3>
           <div v-html="previewHTMLEN"></div>
         </div>

src/views/dictionary/template/index.vue

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

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

@@ -3,23 +3,15 @@
     <!-- 搜索框 -->
     <div class="search">
       <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="Code:">
+        <el-form-item label="编号:">
           <el-input v-model="searchData.Code" style="width:100px;" />
         </el-form-item>
         <el-form-item label="模板:">
           <el-input v-model="searchData.Name" style="width:100px;" />
         </el-form-item>
         <el-form-item>
-          <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-button type="primary" @click="handleReset">Reset</el-button>
+          <el-button type="primary" @click="handleSearch">Search</el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto;">

src/views/forgetpassword/index.vue

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

src/views/login/index.vue

@@ -6,14 +6,7 @@
     <div class="login-body">
       <div class="login-l">
         <div class="login-logo">
-          <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
-          <img
-            v-else-if="NODE_ENV === 'usa'"
-            src="@/assets/zzlogo-usa.png"
-            alt=""
-            class="usa-logo"
-          />
-          <img v-else src="@/assets/zzlogo4.png" alt="" />
+          <img src="@/assets/zzlogo-usa.png" alt="" class="usa-logo" />
         </div>
         <div
           :class="{

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

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

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

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

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

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

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

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

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

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

src/views/research-mobile/login.vue

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

src/views/research/components/ResearchForm.vue

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

src/views/research/form.vue

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

src/views/resumeInfo/index.vue

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

src/views/reviewers/ReviewersResearchForm.vue

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

src/views/reviewers/components/Agreements.vue

@@ -437,7 +437,7 @@ export default {
     },
     handlePreview3(row) {
       return this.$preview({
-        path: row.Path || row.FilePath,
+        path: row.FilePath,
         type: 'pdf',
         title: row.FileName,
       })
@@ -447,7 +447,7 @@ export default {
     },
     handlePreview2(row, r2) {
       return this.$preview({
-        path: row.Path || row.fullPath,
+        path: row.fullPath,
         type: 'pdf',
         title: row.FileName,
       })
@@ -537,7 +537,7 @@ export default {
     handlePreview(row) {
       console.log(row)
       return this.$preview({
-        path: row.Path || row.FullPath,
+        path: row.FullPath,
         type: 'pdf',
         title: row.FileName,
       })

src/views/reviewers/components/BasicInfo.vue

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

src/views/reviewers/curriculumVitae/components/file/agreement.vue

@@ -333,7 +333,7 @@ export default {
     },
     preview(row) {
       this.$preview({
-        path: row.Path || row.FullPath,
+        path: row.FullPath,
         type: 'pdf',
         title: row.FileName,
       })

src/views/reviewers/curriculumVitae/components/file/certificate.vue

@@ -292,7 +292,7 @@ export default {
     },
     preview(row) {
       this.$preview({
-        path: row.Path || row.FullPath,
+        path: row.FullPath,
         type: 'pdf',
         title: row.FileName,
       })

src/views/reviewers/curriculumVitae/components/info/info.vue

@@ -171,11 +171,7 @@
                 :label="$t('curriculumVitae:info:form:email')"
                 prop="EMail"
               >
-                <el-input
-                  v-model="form.EMail"
-                  clearable
-                  :disabled="DATA.IsHaveAccount"
-                ></el-input>
+                <el-input v-model="form.EMail" clearable disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">

src/views/reviewers/curriculumVitae/preview.vue

@@ -1015,7 +1015,7 @@ export default {
       }
     },
     preview(row) {
-      let path = row.Path || row.FullPath || row.FilePath
+      let path = row.FullPath || row.FilePath
       this.$preview({
         path: path,
         type: 'pdf',

src/views/reviewers/edit.vue

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

src/views/reviewers/new.vue

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

src/views/system/i18n/components/BatchAddForm.vue

@@ -8,10 +8,7 @@
         size="small"
         :rules="rules"
       >
-        <el-form-item
-          :label="$t('system:l18n:search:InternationalizationType')"
-          prop="InternationalizationType"
-        >
+        <el-form-item label="国际化类型" prop="InternationalizationType">
           <el-radio-group v-model="form.InternationalizationType">
             <el-radio
               v-for="item of $d.InternationalizationType"
@@ -21,7 +18,7 @@
             >
           </el-radio-group>
         </el-form-item>
-        <el-form-item :label="$t('system:l18n:search:State')" prop="State">
+        <el-form-item label="状态" prop="State">
           <el-radio-group v-model="form.State">
             <el-radio
               v-for="item of $d.InternationalizationKeyState"
@@ -31,10 +28,7 @@
             >
           </el-radio-group>
         </el-form-item>
-        <el-form-item
-          :label="$t('system:l18n:search:PublishVersion')"
-          prop="PublishLogId"
-        >
+        <el-form-item label="迭代" prop="PublishLogId">
           <el-select v-model="form.PublishLogId" clearable filterable>
             <el-option
               v-for="item in PublishVersionList"
@@ -45,7 +39,7 @@
           </el-select>
         </el-form-item>
         <el-table :data="form.AddList" style="width: 100%" height="300">
-          <el-table-column prop="" :label="$t('system:l18n:search:Module')">
+          <el-table-column prop="" label="功能模块/服务名">
             <template slot-scope="scope">
               <el-form-item
                 label=""
@@ -67,7 +61,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="" :label="$t('system:l18n:search:Code')">
+          <el-table-column prop="" label="标识">
             <template slot-scope="scope">
               <el-form-item
                 label=""
@@ -93,7 +87,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="" :label="$t('system:l18n:search:ValueCN')">
+          <el-table-column prop="" label="中文值">
             <template slot-scope="scope">
               <el-form-item
                 label=""
@@ -119,7 +113,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="" :label="$t('system:l18n:search:Value')">
+          <el-table-column prop="" label="英文值">
             <template slot-scope="scope">
               <el-form-item
                 label=""
@@ -145,10 +139,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column
-            prop=""
-            :label="$t('system:l18n:search:Description')"
-          >
+          <el-table-column prop="" label="说明">
             <template slot-scope="scope">
               <el-form-item
                 label=""
@@ -178,7 +169,7 @@
                 type="primary"
                 icon="el-icon-plus"
                 @click="handleAdd"
-                >{{ $t('common:button:new') }}</el-button
+                >{{ $t("common:button:new") }}</el-button
               >
             </template>
             <template slot-scope="scope">
@@ -188,7 +179,7 @@
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.$index)"
-                >{{ $t('common:button:delete') }}</el-button
+                >{{ $t("common:button:delete") }}</el-button
               >
             </template>
           </el-table-column>
@@ -196,28 +187,28 @@
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button size="small" type="primary" @click="handleCancle">{{
-        $t('common:button:cancel')
-      }}</el-button>
-      <el-button size="small" type="primary" @click="handleSave">{{
-        $t('common:button:save')
-      }}</el-button>
+      <el-button size="small" type="primary" @click="handleCancle"
+        >取消</el-button
+      >
+      <el-button size="small" type="primary" @click="handleSave"
+        >保存</el-button
+      >
     </template>
   </base-model>
 </template>
 <script>
-import { batchAddInternationalization } from '@/api/admin'
-import BaseModel from '@/components/BaseModel'
+import { batchAddInternationalization } from "@/api/admin";
+import BaseModel from "@/components/BaseModel";
 const formDataDefault = () => {
   return {
     State: 0,
     InternationalizationType: 1,
     PublishLogId: null,
     AddList: [],
-  }
-}
+  };
+};
 export default {
-  name: 'BatcnAddForm',
+  name: "BatcnAddForm",
   components: { BaseModel },
   data() {
     return {
@@ -226,65 +217,59 @@ export default {
       model_cfg: {
         visible: false,
         showClose: true,
-        width: '800px',
-        title: '',
+        width: "800px",
+        title: "",
         appendToBody: true,
       },
       rules: {
-        PublishLogId: [
-          {
-            required: true,
-            message: this.$t('system:l18n:rule:selectPublishLogId'),
-            trigger: 'blur',
-          },
-        ],
+        PublishLogId: [{ required: true, message: "请选择", trigger: "blur" }],
       },
       PublishVersionList: [],
-    }
+    };
   },
   mounted() {},
   methods: {
     openDialog(title, data, options = []) {
-      this.PublishVersionList = options
-      this.model_cfg.visible = true
-      this.model_cfg.title = title
-      this.form = formDataDefault()
+      this.PublishVersionList = options;
+      this.model_cfg.visible = true;
+      this.model_cfg.title = title;
+      this.form = formDataDefault();
     },
     handleSave() {
       this.$refs.batcnAddForm.validate((valid) => {
-        if (!valid) return
-        this.loading = true
+        if (!valid) return;
+        this.loading = true;
         batchAddInternationalization(this.form)
           .then((res) => {
-            this.loading = false
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.model_cfg.visible = false
-            this.$emit('getList')
+            this.loading = false;
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.model_cfg.visible = false;
+            this.$emit("getList");
           })
           .catch(() => {
-            this.loading = false
-          })
-      })
+            this.loading = false;
+          });
+      });
     },
     handleCancle() {
-      this.model_cfg.visible = false
+      this.model_cfg.visible = false;
     },
     handleAdd() {
       this.form.AddList.push({
-        Description: '',
-        Code: '',
-        ValueCN: '',
-        Value: '',
-      })
+        Description: "",
+        Code: "",
+        ValueCN: "",
+        Value: "",
+      });
     },
     handleDelete(index) {
-      this.$confirm(this.$t('system:l18n:confirm:delete'), {
-        type: 'warning',
+      this.$confirm("是否确认删除？", {
+        type: "warning",
         distinguishCancelAndClose: true,
       }).then(() => {
-        this.form.AddList.splice(index, 1)
-      })
+        this.form.AddList.splice(index, 1);
+      });
     },
   },
-}
+};
 </script>

src/views/system/i18n/components/I18nForm.vue

@@ -10,7 +10,7 @@
         size="small"
       >
         <el-form-item
-          :label="$t('system:l18n:search:InternationalizationType')"
+          label="国际化类型"
           prop="InternationalizationType"
           v-if="status !== 'batch'"
         >
@@ -24,7 +24,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item
-          :label="$t('system:l18n:search:Module')"
+          label="功能模块/服务名"
           prop="Module"
           v-if="status !== 'batch'"
         >
@@ -35,11 +35,7 @@
             :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
-        <el-form-item
-          :label="$t('system:l18n:search:Code')"
-          prop="Code"
-          v-if="status !== 'batch'"
-        >
+        <el-form-item label="标识" prop="Code" v-if="status !== 'batch'">
           <el-input
             v-model="form.Code"
             type="textarea"
@@ -47,11 +43,7 @@
             :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
-        <el-form-item
-          :label="$t('system:l18n:search:ValueCN')"
-          prop="ValueCN"
-          v-if="status !== 'batch'"
-        >
+        <el-form-item label="中文值" prop="ValueCN" v-if="status !== 'batch'">
           <el-input
             v-model="form.ValueCN"
             type="textarea"
@@ -59,11 +51,7 @@
             :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
-        <el-form-item
-          :label="$t('system:l18n:search:Value')"
-          prop="Value"
-          v-if="status !== 'batch'"
-        >
+        <el-form-item label="英文值" prop="Value" v-if="status !== 'batch'">
           <el-input
             v-model="form.Value"
             type="textarea"
@@ -71,7 +59,7 @@
             :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
-        <el-form-item :label="$t('system:l18n:search:State')" prop="State">
+        <el-form-item label="状态" prop="State">
           <el-radio-group v-model="form.State">
             <el-radio
               v-for="item of $d.InternationalizationKeyState"
@@ -81,11 +69,7 @@
             >
           </el-radio-group>
         </el-form-item>
-        <el-form-item
-          :label="$t('system:l18n:search:Description')"
-          prop="Description"
-          v-if="status !== 'batch'"
-        >
+        <el-form-item label="说明" prop="Description" v-if="status !== 'batch'">
           <el-input
             v-model="form.Description"
             type="textarea"
@@ -93,10 +77,7 @@
             :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
-        <el-form-item
-          :label="$t('system:l18n:search:PublishVersion')"
-          prop="PublishLogId"
-        >
+        <el-form-item label="迭代" prop="PublishLogId">
           <el-select v-model="form.PublishLogId" clearable filterable>
             <el-option
               v-for="item in PublishVersionList"
@@ -109,18 +90,18 @@
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button size="small" type="primary" @click="handleCancle">{{
-        $t('common:button:cancel')
-      }}</el-button>
-      <el-button size="small" type="primary" @click="handleSave">{{
-        $t('common:button:save')
-      }}</el-button>
+      <el-button size="small" type="primary" @click="handleCancle"
+        >取消</el-button
+      >
+      <el-button size="small" type="primary" @click="handleSave"
+        >保存</el-button
+      >
     </template>
   </base-model>
 </template>
 <script>
-import { addOrUpdateInternationalization } from '@/api/admin'
-import BaseModel from '@/components/BaseModel'
+import { addOrUpdateInternationalization } from "@/api/admin";
+import BaseModel from "@/components/BaseModel";
 const formDataDefault = () => {
   return {
     Id: null,
@@ -132,138 +113,110 @@ const formDataDefault = () => {
     ValueCN: null,
     InternationalizationType: 1,
     PublishLogId: null,
-  }
-}
+  };
+};
 export default {
-  name: 'I18nForm',
+  name: "I18nForm",
   components: { BaseModel },
   data() {
     return {
-      status: 'add', // add update batch
+      status: "add", // add update batch
       loading: false,
       form: formDataDefault(),
       rules: {
-        State: [
-          {
-            required: true,
-            message: this.$t('system:l18n:rule:selectState'),
-            trigger: 'blur',
-          },
-        ],
+        State: [{ required: true, message: "请选择", trigger: "blur" }],
         Module: [
           {
             max: 200,
-            message: `${this.$t('common:ruleMessage:maxLength')} 200`,
-            trigger: 'blur',
+            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
+            trigger: "blur",
           },
         ],
         Description: [
           {
             max: 200,
-            message: `${this.$t('common:ruleMessage:maxLength')} 200`,
-            trigger: 'blur',
+            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
+            trigger: "blur",
           },
         ],
         Code: [
-          {
-            required: true,
-            message: this.$t('system:l18n:rule:inputCode'),
-            trigger: 'blur',
-          },
+          { required: true, message: "请注明", trigger: "blur" },
           {
             max: 200,
-            message: `${this.$t('common:ruleMessage:maxLength')} 200`,
+            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
           },
         ],
         Value: [
-          {
-            required: true,
-            message: this.$t('system:l18n:rule:inputValue'),
-            trigger: 'blur',
-          },
+          { required: true, message: "请注明", trigger: "blur" },
           {
             max: 1000,
-            message: `${this.$t('common:ruleMessage:maxLength')} 1000`,
+            message: `${this.$t("common:ruleMessage:maxLength")} 1000`,
           },
         ],
         ValueCN: [
-          {
-            required: true,
-            message: this.$t('system:l18n:rule:inputValueCN'),
-            trigger: 'blur',
-          },
+          { required: true, message: "请注明", trigger: "blur" },
           {
             max: 1000,
-            message: `${this.$t('common:ruleMessage:maxLength')} 1000`,
+            message: `${this.$t("common:ruleMessage:maxLength")} 1000`,
           },
         ],
         InternationalizationType: [
-          {
-            required: true,
-            message: this.$t('system:l18n:rule:selectInternationalizationType'),
-            trigger: 'blur',
-          },
-        ],
-        PublishLogId: [
-          {
-            required: true,
-            message: this.$t('system:l18n:rule:selectPublishLogId'),
-            trigger: 'blur',
-          },
+          { required: true, message: "请选择", trigger: "blur" },
         ],
+        PublishLogId: [{ required: true, message: "请选择", trigger: "blur" }],
       },
       model_cfg: {
         visible: false,
         showClose: true,
-        width: '600px',
-        title: '',
+        width: "600px",
+        title: "",
         appendToBody: true,
       },
       PublishVersionList: [],
-    }
+    };
   },
   mounted() {},
   methods: {
     openDialog(title, data, options = [], status) {
-      this.PublishVersionList = options
+      this.PublishVersionList = options;
       this.loading = false
-      this.status = status
-      this.model_cfg.visible = true
-      this.model_cfg.title = title
+      this.status = status;
+      this.model_cfg.visible = true;
+      this.model_cfg.title = title;
       if (Object.keys(data).length > 0) {
         for (const k in this.form) {
           if (data.hasOwnProperty(k)) {
-            this.form[k] = data[k]
+            this.form[k] = data[k];
           }
         }
       } else {
-        this.form = formDataDefault()
+        this.form = formDataDefault();
       }
     },
     handleSave() {
       this.$refs.i18nForm.validate((valid) => {
-        if (!valid) return
-        this.loading = true
-        if (this.status === 'batch') {
-          return this.$emit('batch', this.form)
+        if (!valid) return;
+        this.loading = true;
+        if (this.status === "batch") {
+          return this.$emit("batch", this.form);
         }
         addOrUpdateInternationalization(this.form)
           .then((res) => {
-            this.loading = false
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.model_cfg.visible = false
-            this.$emit('getList')
+            this.loading = false;
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.model_cfg.visible = false;
+            this.$emit("getList");
           })
           .catch(() => {
-            this.loading = false
-          })
-      })
+            this.loading = false;
+          });
+      });
     },
     handleCancle() {
-      this.model_cfg.visible = false
+      this.model_cfg.visible = false;
     },
   },
-}
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-select {

src/views/system/i18n/index.vue

@@ -2,9 +2,7 @@
   <div class="log">
     <div ref="leftContainer" class="left">
       <el-form :inline="true">
-        <el-form-item
-          :label="$t('system:l18n:search:InternationalizationType')"
-        >
+        <el-form-item label="国际化类型">
           <el-select
             v-model="searchData.InternationalizationType"
             clearable
@@ -19,7 +17,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('system:l18n:search:Module')">
+        <el-form-item label="功能模块/服务名">
           <el-input
             v-model="searchData.Module"
             size="small"
@@ -27,7 +25,7 @@
             style="width: 130px"
           />
         </el-form-item>
-        <el-form-item :label="$t('system:l18n:search:Code')">
+        <el-form-item label="标识">
           <el-input
             v-model="searchData.Code"
             size="small"
@@ -35,7 +33,7 @@
             style="width: 130px"
           />
         </el-form-item>
-        <el-form-item :label="$t('system:l18n:search:ValueCN')">
+        <el-form-item label="中文值">
           <el-input
             v-model="searchData.ValueCN"
             size="small"
@@ -43,7 +41,7 @@
             style="width: 130px"
           />
         </el-form-item>
-        <el-form-item :label="$t('system:l18n:search:Value')">
+        <el-form-item label="英文值">
           <el-input
             v-model="searchData.Value"
             size="small"
@@ -51,7 +49,7 @@
             clearable
           />
         </el-form-item>
-        <el-form-item :label="$t('system:l18n:search:State')">
+        <el-form-item label="状态">
           <el-select
             v-model="searchData.State"
             clearable
@@ -66,7 +64,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('system:l18n:search:Description')">
+        <el-form-item label="说明">
           <el-input
             v-model="searchData.Description"
             size="small"
@@ -74,7 +72,7 @@
             style="width: 130px"
           />
         </el-form-item>
-        <el-form-item :label="$t('system:l18n:search:PublishVersion')">
+        <el-form-item label="迭代">
           <el-select
             v-model="searchData.PublishLogId"
             clearable
@@ -120,7 +118,7 @@
             size="mini"
             @click="getList"
           >
-            {{ $t('common:button:search') }}
+            查询
           </el-button>
           <!-- 重置 -->
           <el-button
@@ -137,7 +135,7 @@
             size="mini"
             @click="handleAdd"
           >
-            {{ $t('common:button:new') }}
+            新增
           </el-button>
           <el-button
             type="primary"
@@ -145,7 +143,7 @@
             size="mini"
             @click="handleBatchAdd"
           >
-            {{ $t('system:l18n:button:batchAdd') }}
+            批量新增
           </el-button>
           <el-button
             type="primary"
@@ -154,7 +152,7 @@
             :disabled="selectTableList.length <= 0"
             @click="handleBatchUpdate"
           >
-            {{ $t('system:l18n:button:batchUpdate') }}
+            批量更新
           </el-button>
           <el-button
             type="primary"
@@ -163,7 +161,7 @@
             :disabled="selectTableList.length <= 0"
             @click="handleBatchUpdateToChange"
           >
-            {{ $t('system:l18n:button:batchEdit') }}
+            批量编辑
           </el-button>
           <el-button
             size="mini"
@@ -186,7 +184,7 @@
         ><el-table-column type="selection" width="50" />
         <el-table-column type="index" width="50" />
         <el-table-column
-          :label="$t('system:l18n:search:InternationalizationType')"
+          label="国际化类型"
           prop="InternationalizationType"
           width="120"
           show-overflow-tooltip
@@ -226,35 +224,35 @@
           </template>
         </el-table-column>
         <el-table-column
-          :label="$t('system:l18n:search:Module')"
+          label="功能模块/服务名"
           prop="Module"
           min-width="140"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
-          :label="$t('system:l18n:search:Code')"
+          label="标识"
           prop="Code"
           min-width="150"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
-          :label="$t('system:l18n:search:ValueCN')"
+          label="中文值"
           prop="ValueCN"
           min-width="150"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
-          :label="$t('system:l18n:search:Value')"
+          label="英文值"
           prop="Value"
           min-width="150"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
-          :label="$t('system:l18n:search:State')"
+          label="状态"
           prop="State"
           width="100"
           show-overflow-tooltip
@@ -273,35 +271,35 @@
           </template>
         </el-table-column>
         <el-table-column
-          :label="$t('system:l18n:search:Description')"
+          label="说明"
           prop="Description"
           min-width="100"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
-          :label="$t('system:l18n:search:PublishVersion')"
+          label="迭代"
           prop="Version"
           min-width="100"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
-          :label="$t('system:l18n:form:uploadTime')"
+          label="更新时间"
           prop="UpdateTime"
           width="150"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
-          :label="$t('system:l18n:form:createTime')"
+          label="创建时间"
           prop="CreateTime"
           width="150"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
-          :label="$t('common:action:action')"
+          label="操作"
           fixed="right"
           prop=""
           min-width="120"
@@ -314,7 +312,7 @@
               icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             >
-              {{ $t('common:button:edit') }}
+              编辑
             </el-button>
             <el-button
               :disabled="scope.row.State === 1"
@@ -323,7 +321,7 @@
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
             >
-              {{ $t('common:button:delete') }}
+              删除
             </el-button>
           </template>
         </el-table-column>
@@ -423,7 +421,7 @@ export default {
     handleBatchUpdate() {
       this.$nextTick(() => {
         this.$refs['i18nForm'].openDialog(
-          this.$t('system:l18n:button:batchUpdate'),
+          '批量更新',
           {},
           this.PublishVersionList,
           'batch'
@@ -457,7 +455,7 @@ export default {
     handleAdd() {
       this.$nextTick(() => {
         this.$refs['i18nForm'].openDialog(
-          this.$t("system:l18n:button:add"),
+          '新增',
           {},
           this.PublishVersionList,
           'add'
@@ -467,7 +465,7 @@ export default {
     handleBatchAdd() {
       this.$nextTick(() => {
         this.$refs['batcnAddForm'].openDialog(
-          this.$t("system:l18n:button:batchAdd"),
+          '批量新增',
           {},
           this.PublishVersionList
         )
@@ -476,7 +474,7 @@ export default {
     handleEdit(row) {
       this.$nextTick(() => {
         this.$refs['i18nForm'].openDialog(
-          this.$t("system:l18n:button:edit"),
+          '编辑',
           row,
           this.PublishVersionList,
           'update'
@@ -492,7 +490,7 @@ export default {
     },
     // 删除
     handleDelete(row) {
-      this.$confirm(this.$t("system:l18n:confirm:delete"), {
+      this.$confirm('是否确认删除？', {
         type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {

src/views/system/log/index.vue

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

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

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

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

@@ -392,17 +392,15 @@ export default {
         },
       ],
       searchHandle: [
-        {
-          label: this.$t('common:button:search'),
-          type: 'primary',
-          emitKey: 'search',
-          icon: 'el-icon-search'
-        },
         {
           label: this.$t('common:button:reset'),
           type: 'primary',
           emitKey: 'reset',
-          icon: 'el-icon-refresh-left'
+        },
+        {
+          label: this.$t('common:button:search'),
+          type: 'primary',
+          emitKey: 'search',
         },
         {
           label: this.$t('common:button:new'),
@@ -526,7 +524,7 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-::v-deep .box-body .search .base-search-form .el-form-item {
+/deep/ .box-body .search .base-search-form .el-form-item {
   margin-bottom: 15px;
 }
 </style>

src/views/test/GridLayout.vue

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

src/views/test/index.vue

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

src/views/trials/components/newSignForm.vue

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

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

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

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

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

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

@@ -1,14 +1,7 @@
 <template>
   <div class="trials-navbar" style="position: relative">
     <div class="leftMenu">
-      <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
-      <img
-        v-else-if="NODE_ENV === 'usa'"
-        src="@/assets/title-logo.png"
-        alt=""
-        class="title-logo"
-      />
-      <img v-else src="@/assets/zzlogo4.png" alt="" />
+      <img src="@/assets/title-logo.png" alt="" class="title-logo" />
       <span style="white-space: nowrap" v-if="NODE_ENV !== 'usa'">
         <!-- 中心影像系统（EICS） -->
         {{ $t('trials:trials:title:eics') }}