阅片表单数值问题可输入NE

# Conflicts:
#	src/utils/metaDataProvider.js

.env.development

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

.env.prod

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

.env.production

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

.env.prop

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

.env.uat

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

.eslintrc.js

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

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

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

README-zh.md

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

babel.config.js

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

package.json

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

public/index.html

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

src/App.vue

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

src/api/admin.js

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

src/api/dictionary.js

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

src/api/export.js

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

src/api/reading.js

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

src/api/reviewers.js

@@ -304,9 +304,9 @@ export function addOrUpdateDoctorBasicInfoAndEmployment(param) {
   })
 }
 // 新增或编辑概述
-export function updateGneralSituation(param) {
+export function addOrUpdateGneralSituation(param) {
   return request({
-    url: `/Doctor/updateGneralSituation`,
+    url: `/Doctor/addOrUpdateGneralSituation`,
     method: 'post',
     data: param
   })
@@ -342,4 +342,28 @@ export function getIsVacation(param) {
     method: 'post',
     data: param
   })
+}
+// 获取概述
+export function getSummarizeInfo(param) {
+  return request({
+    url: `/Doctor/getSummarizeInfo`,
+    method: 'post',
+    data: param
+  })
+}
+// 删除概述
+export function deleteSummarizeInfo(param) {
+  return request({
+    url: `/Doctor/deleteSummarizeInfo`,
+    method: 'post',
+    data: param
+  })
+}
+// pm通过邮箱新建或查询简历
+export function useEmialGetDoctorInfo(param) {
+  return request({
+    url: `/TrialSiteSurvey/useEmialGetDoctorInfo`,
+    method: 'post',
+    data: param
+  })
 }

src/api/trials.js

@@ -286,10 +286,11 @@ export function trialSiteUserSummaryListExport(param) {
   })
 }
 
-export function getVisitStageList(trialId) {
+export function getVisitStageList(data) {
   return request({
-    url: `/visitPlan/getVisitStageList/${trialId}`,
-    method: 'get'
+    url: `/visitPlan/getVisitStageList`,
+    method: 'post',
+    data
   })
 }
 
@@ -1034,7 +1035,27 @@ export function getQCVisitList(param) {
     data: param
   })
 }
-
+export function getImageBackList(param) {
+  return request({
+    url: `/QCList/getImageBackList`,
+    method: 'post',
+    data: param
+  })
+}
+export function getImageBackApplyUserList(params) {
+  return request({
+    url: `/QCList/getImageBackApplyUserList`,
+    method: 'get',
+    params
+  })
+}
+export function auditImageBack(params) {
+  return request({
+    url: `/QCOperation/auditImageBack`,
+    method: 'put',
+    params
+  })
+}
 export function getQCChallengeList(param) {
   return request({
     url: `/QCList/getQCChallengeList`,
@@ -1079,6 +1100,19 @@ export function setSeriesStatus(trialId, subjectVisitId, studyId, seriesId, stat
     method: 'put'
   })
 }
+export function setNodicomStudyState(params) {
+  return request({
+    url: `/QCOperation/setNodicomStudyState`,
+    method: 'put',
+    params
+  })
+}
+export function setInstanceStatus(trialId, subjectVisitId, seriesId, instanceId, state) {
+  return request({
+    url: `/QCOperation/setInstanceState/${trialId}/${subjectVisitId}/${seriesId}/${instanceId}/${state}`,
+    method: 'put'
+  })
+}
 
 export function getVisitQCStudyAndSeriesList(subjectVisitId) {
   return request({
@@ -1364,9 +1398,9 @@ export function getForwardList(param) {
   })
 }
 
-export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '') {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading = false) {
   return request({
-    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}`,
+    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
     method: 'get'
   })
 }
@@ -1585,6 +1619,13 @@ export function getDocumentConfirmList(param) {
     data: param
   })
 }
+export function getSysDocumentConfirmList(param) {
+  return request({
+    url: `/TrialDocument/getSysDocumentConfirmList`,
+    method: 'post',
+    data: param
+  })
+}
 export function getTrialUserSelect(trialId) {
   return request({
     url: `/TrialDocument/getTrialUserSelect/${trialId}`,
@@ -1599,6 +1640,13 @@ export function getTrialDocAndSystemDocType(trialId) {
   })
 }
 
+export function getSysDocSignUserList() {
+  return request({
+    url: `/TrialDocument/getSysDocSignUserList`,
+    method: 'get'
+  })
+}
+
 export function updateSubjectStatus(param) {
   return request({
     url: `/Subject/updateSubjectStatus`,
@@ -3294,6 +3342,13 @@ export function getReReadingApplyToBeDoneList(param) {
     data: param
   })
 }
+export function getPMImageBackToBeDoneList(param) {
+  return request({
+    url: `/PersonalWorkstation/getPMImageBackToBeDoneList`,
+    method: 'post',
+    data: param
+  })
+}
 
 export function deleteClinicalForm(param) {
   return request({
@@ -3905,4 +3960,167 @@ export function setTaskValid(data) {
     method: 'post',
     data
   })
+}
+//  一致性分析临床数据设置任务为有效
+export function getVisitClinicalDataName(data) {
+  return request({
+    url: `/ReadingClinicalData/getVisitClinicalDataName`,
+    method: 'post',
+    data
+  })
+}
+//  修改外部人员权限配置
+export function configTrialSPMInfo(data) {
+  return request({
+    url: `/TrialConfig/configTrialSPMInfo`,
+    method: 'post',
+    data
+  })
+}
+
+//  项目添加角色修改权限
+export function updateTrialUserRole(data) {
+  return request({
+    url: `/TrialMaintenance/updateTrialUserRole`,
+    method: 'put',
+    data
+  })
+}
+
+// 获取报表配置
+export function getTrialQuestionExportResult(data) {
+  return request({
+    url: `/ReadingQuestion/getTrialQuestionExportResult`,
+    method: 'post',
+    data
+  })
+}
+// 修改报表配置
+export function setTrialQuestionExportResult(data) {
+  return request({
+    url: `/ReadingQuestion/SetTrialQuestionExportResult`,
+    method: 'post',
+    data
+  })
+}
+// 项目加入人员发送邮件
+export function trialUserSendJoinEmail(data) {
+  return request({
+    url: `/TrialMaintenance/trialUserSendJoinEmail`,
+    method: 'post',
+    data
+  })
+}
+
+// 获取非Dicom标记
+export function getNoneDicomMarkListOutDto(data) {
+  return request({
+    url: `/ReadingImageTask/getNoneDicomMarkListOutDto`,
+    method: 'post',
+    data
+  })
+}
+// 添加非Dicom标记
+export function addNoneDicomMark(data) {
+  return request({
+    url: `/ReadingImageTask/addNoneDicomMark`,
+    method: 'post',
+    data
+  })
+}
+// 删除非Dicom标记
+export function deleteTrialFileType(id) {
+  return request({
+    url: `/ReadingImageTask/deleteTrialFileType/${id}`,
+    method: 'post'
+  })
+}
+
+// 工作台-获取稽查文档
+export function getAuditDocumentData(data) {
+  return request({
+    url: `/AuditDocument/getAuditDocumentData`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-新增稽查文档
+export function addAuditDocument(data) {
+  return request({
+    url: `/AuditDocument/addAuditDocument`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-获取当前目录层级
+export function getBreadcrumbData(data) {
+  return request({
+    url: `/AuditDocument/getBreadcrumbData`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-修改稽查文档
+export function updateAuditDocument(data) {
+  return request({
+    url: `/AuditDocument/updateAuditDocument`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-删除稽查文档
+export function deleteAuditDocument(data) {
+  return request({
+    url: `/AuditDocument/deleteAuditDocument`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档获取历史版本
+export function getHistoricalVersion(data) {
+  return request({
+    url: `/AuditDocument/getHistoricalVersion`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档设置当前版本
+export function setCurrentVersion(data) {
+  return request({
+    url: `/AuditDocument/setCurrentVersion`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档移动
+export function movieFileOrFolder(data) {
+  return request({
+    url: `/AuditDocument/movieFileOrFolder`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档复制
+export function copyFileOrFolder(data) {
+  return request({
+    url: `/AuditDocument/copyFileOrFolder`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档授权
+export function setIsAuthorization(data) {
+  return request({
+    url: `/AuditDocument/setIsAuthorization`,
+    method: 'post',
+    data
+  })
+}
+// 工作台-稽查文档新增文件夹
+export function addFolder(data) {
+  return request({
+    url: `/AuditDocument/addFolder`,
+    method: 'post',
+    data
+  })
 }

src/api/trials/reading.js

@@ -346,9 +346,9 @@ export function getReReadingOrBackInfluenceTaskList(taskId, isReReading, applyId
   })
 }
 
-export function PMSetTaskBack(trialId, taskId) {
+export function PMSetTaskBack(trialId, taskId, pmBackReason) {
   return request({
-    url: `/VisitTask/PMSetTaskBack/${trialId}/${taskId}`,
+    url: `/VisitTask/PMSetTaskBack/${trialId}/${taskId}/${pmBackReason}`,
     method: 'put'
   })
 }
@@ -480,3 +480,11 @@ export function resetReadingRestTime() {
     method: 'post'
   })
 }
+// 设置随机排序
+export function setRandomTaskOrder(data) {
+  return request({
+    url: `/VisitTask/setRandomTaskOrder`,
+    method: 'post',
+    data
+  })
+}

src/api/trials/setting.js

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

src/api/trials/visit.js

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

src/api/user.js

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

src/components/BaseContainer/index.vue

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

src/components/BaseForm/search-form.vue

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

src/components/BaseModel/index.vue

@@ -8,10 +8,11 @@
       :visible.sync="config.visible"
       :close-on-click-modal="false"
       :show-close="config.showClose"
+      :top="config.top"
       :width="config.width"
       :fullscreen="config.fullscreen"
     >
-      <div class="base-modal-body">
+      <div class="base-modal-body" :style="config.bodyStyle">
         <slot name="dialog-body" />
       </div>
       <div slot="footer" class="base-modal-footer">
@@ -22,24 +23,26 @@
 </template>
 <script>
 export default {
-  name: "BaseDialog",
+  name: 'BaseDialog',
   props: {
     config: {
       type: Object,
       default: () => {
         return {
           visible: false,
-          title: "",
+          title: '',
           closeOnClickModal: false,
           showClose: true,
           appendToBody: false,
-          width: "100px",
+          width: '100px',
           fullscreen: false,
-        };
+          top: '15vh',
+          bodyStyle: '',
+        }
       },
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .base-model-wrapper {

src/components/BaseTable/index.vue

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

src/components/Dicom/DicomCanvas.vue

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

src/components/Dicom/DicomTags.vue

@@ -108,7 +108,7 @@ export default {
     dumpDataSet(dataSet, output) {
       try {
         for (const propertyName in dataSet.elements) {
-          const elementObject = {}
+          const elementObject = {} 
           const element = dataSet.elements[propertyName]
           const tag = this.getTag(element.tag)
           elementObject.id = `${this.idx++}${new Date().getTime()}`
@@ -181,9 +181,10 @@ export default {
                       elementObject.value = str
                     }
                   } else {
-                    if (element.length !== 2 && element.length !== 4) {
-                      // elementObject.value = 'binary data'
-                    }
+                    elementObject.value = dataSet.string(propertyName)
+                    // if (element.length !== 2 && element.length !== 4) {
+                    //   // elementObject.value = 'binary data'
+                    // }
                   }
                 } else if (vr === 'US') {
                   let text = dataSet.uint16(propertyName)

src/components/MFA/index.vue

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

src/components/PreviewFile/index.vue

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

src/components/Preview_onlyoffice/fun.js

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

src/components/Preview_onlyoffice/index.js

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

src/components/Preview_onlyoffice/index.vue

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

src/components/TrialsSelect/index.vue

@@ -124,7 +124,7 @@ export default {
     inputChange(v) {
       this.resultFilter = this.options.filter((o) => {
         var reg = new RegExp(v, 'ig')
-        return reg.test(o.ResearchProgramNo) || reg.test(o.Indication)
+        return reg.test(o.ResearchProgramNo) || reg.test(o.Indication) || reg.test(o.ExperimentName)
       })
     },
     getTrialList() {

src/components/TrialsTab/index.vue

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

src/components/UploadFile/index.vue

@@ -99,7 +99,7 @@ export default {
         this.btnDisabled = false
         if (res.IsSuccess) {
           this.fileList[0].id = res.Result[0].Id
-          this.$message.success('Uploaded successfully')
+          this.$message.success(this.$t('trials:uploadDicomList:table:Uploaded'))
           this.$emit('getFileList', res.Result[0].Id, res.Result[0].Path)
         }
       })
@@ -113,13 +113,13 @@ export default {
       if (isValidFile) {
         this.fileList = []
       } else {
-        this.$alert('must be in pdf format')
+        this.$alert(this.$t('upload:rule:MUSTPDF'))
         return false
       }
     },
     beforeRemove(file, fileList) {
       if (file && file.status === 'success') {
-        return this.$confirm(`Sure to remove ${file.name}?`)
+        return this.$confirm(this.$t('system:reviewer:confirm:delete'))
       }
     },
     handleRemoveFile(file, fileList) {
@@ -146,7 +146,7 @@ export default {
       }
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`Upload is currently limited to 1 file`)
+      this.$message.warning(this.$t('upload:rule:maxFile1'))
     },
     fileValid(fileName, typeArr) {
       var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()

src/components/UploadFiles/index.vue

@@ -9,37 +9,51 @@
       :file-list="fileList"
       :accept="accept"
     >
-      <el-button size="small" type="primary" :disabled="isDisabled">{{ $t('common:button:upload') }}</el-button>
+      <el-button size="small" type="primary" :disabled="isDisabled">{{
+        $t('common:button:upload')
+      }}</el-button>
     </el-upload>
   </div>
 </template>
 <script>
-import { getAttachmentByType, uploadFile, saveAttachments, deleteAttachment } from '@/api/attachment'
+import {
+  getAttachmentByType,
+  uploadFile,
+  saveAttachments,
+  deleteAttachment,
+} from '@/api/attachment'
 export default {
   name: 'UploadFiles',
   props: {
     type: {
       type: String,
-      required: true
+      required: true,
     },
     doctorId: {
       type: String,
-      required: true
+      required: true,
     },
     accept: {
       type: String,
-      required: true
-    }
+      required: true,
+    },
   },
   data() {
     return {
       fileList: [],
       repeat: false,
-      isDisabled: false
+      isDisabled: false,
     }
   },
+  watch: {
+    doctorId() {
+      if (this.doctorId) {
+        this.initFileList()
+      }
+    },
+  },
   mounted() {
-    if(!this.doctorId) return
+    if (!this.doctorId) return
     this.initFileList()
   },
   methods: {
@@ -49,24 +63,28 @@ export default {
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.07)'
+        background: 'rgba(0, 0, 0, 0.07)',
       })
-      getAttachmentByType(this.doctorId, this.type).then(res => {
-        loading.close()
-        if (res.IsSuccess) {
-          if (res.Result.length > 0) {
-            this.fileList = this.formatterFileList(res.Result)
-            this.$emit('getFileList', this.fileList)
-          } else {
-            this.fileList = []
+      getAttachmentByType(this.doctorId, this.type)
+        .then((res) => {
+          loading.close()
+          if (res.IsSuccess) {
+            if (res.Result.length > 0) {
+              this.fileList = this.formatterFileList(res.Result)
+              this.$emit('getFileList', this.fileList)
+            } else {
+              this.fileList = []
+            }
           }
-        }
-      }).catch(() => { loading.close() })
+        })
+        .catch(() => {
+          loading.close()
+        })
     },
 
     formatterFileList(list) {
       var arr = []
-      list.forEach(item => {
+      list.forEach((item) => {
         const data = {
           DoctorId: item.DoctorId,
           Type: item.Type,
@@ -74,7 +92,7 @@ export default {
           FullPath: item.FullPath,
           FileName: item.FileName,
           CreateTime: item.CreateTime,
-          Id: item.Id
+          Id: item.Id,
         }
         arr.push(data)
       })
@@ -85,32 +103,42 @@ export default {
       // 检测文件后缀名
       if (this.checkFileSuffix(param.file.name)) {
         // 检测是否有重名文件
-        const isRepeat = this.fileList.some(item => item.FileName === param.file.name)
+        const isRepeat = this.fileList.some(
+          (item) => item.FileName === param.file.name
+        )
         if (isRepeat) {
-          this.$confirm('Override the existing resume?', {
-            type: 'warning',
-            distinguishCancelAndClose: true,
-            confirmButtonText: 'OK',
-            cancelButtonText: 'Cancel'
-          })
+          this.$confirm(
+            this.$t('curriculumVitae:resume:message:existingResume'),
+            {
+              type: 'warning',
+              distinguishCancelAndClose: true,
+            }
+          )
             .then(() => {
               // 重名覆盖
               this.repeat = true
               this.uploadFile(param.file)
             })
-            .catch(action => {})
+            .catch((action) => {})
         } else {
           this.uploadFile(param.file)
         }
       } else {
-        this.$alert(`Must be in ${this.accept} format`)
+        let str = this.accept.join(', ')
+        let message = this.$t(
+          'trials:readingUnit:qsList:message:imageFormat'
+        ).replace('xxx', str)
+        this.$alert(message)
       }
     },
     async uploadFile(file) {
       this.isDisabled = true
       var fileName = file.name
       file = await this.fileToBlob(file)
-      let res = await this.OSSclient.put(`/SystemData/reviewer/Agreements/${this.doctorId}/${fileName}`, file)
+      let res = await this.OSSclient.put(
+        `/SystemData/reviewer/Agreements/${this.doctorId}/${fileName}`,
+        file
+      )
       if (this.repeat) {
         const index = this.fileList.findIndex((item, index) => {
           return item.FileName === fileName
@@ -124,52 +152,60 @@ export default {
           Type: this.type,
           Path: this.$getObjectName(res.url),
           FullPath: this.$getObjectName(res.url),
-          FileName: fileName
+          FileName: fileName,
         }
         this.fileList.push(fileData)
       }
       this.saveUploadFiles()
     },
     saveUploadFiles() {
-      saveAttachments(this.fileList).then(res => {
-        this.fileList = this.formatterFileList(res.Result)
-        this.isDisabled = false
-        this.$message.success('Uploaded successfully')
-        this.$emit('getFileList', this.fileList)
-      }).catch(() => {
-        this.isDisabled = false
-      })
+      saveAttachments(this.fileList)
+        .then((res) => {
+          this.fileList = this.formatterFileList(res.Result)
+          this.isDisabled = false
+          this.$message.success(
+            this.$t('trials:uploadDicomList:table:Uploaded')
+          )
+          this.$emit('getFileList', this.fileList)
+        })
+        .catch(() => {
+          this.isDisabled = false
+        })
     },
     handleDeleteFile(file) {
-      this.$confirm('Sure to remove?', {
+      this.$confirm(this.$t('system:reviewer:confirm:delete'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-
-      }).then(() => {
-        deleteAttachment(file.Id, file.Path)
-          .then(res => {
+      })
+        .then(() => {
+          deleteAttachment(file.Id, file.Path).then((res) => {
             if (res.IsSuccess) {
-              this.fileList.splice(this.fileList.findIndex(item => item.Id === file.Id), 1)
+              this.fileList.splice(
+                this.fileList.findIndex((item) => item.Id === file.Id),
+                1
+              )
               this.$emit('getFileList', this.fileList)
               this.$message({
                 message: this.$t('common:message:deletedSuccessfully'),
-                type: 'success'
+                type: 'success',
               })
             }
           })
-      })
-        .catch(action => {})
+        })
+        .catch((action) => {})
     },
     checkFileSuffix(fileName) {
       var index = fileName.lastIndexOf('.')
       var suffix = fileName.substring(index + 1, fileName.length)
-      return this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === 1
-    }
-  }
+      return (
+        this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === 1
+      )
+    },
+  },
 }
 </script>
 <style>
-.uploadFiles-container{
+.uploadFiles-container {
   margin: 0 5px;
 }
 .uploadFiles-container .el-upload--text {

src/components/clinicalDataQuestions/components/QuestionFormItem.vue

@@ -180,10 +180,10 @@
           <template v-if="question.Unit" slot="append">{{ question.Unit }}</template>
         </el-input>
         <span v-if="question.CustomCalculateMark === 11 && question.ClinicalQuestionType === 'number'" v-show="questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] <= questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId]" style="margin-left: 10px">
-          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}-{{ questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId] }}
+          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId] }}
         </span>
         <span v-if="question.CustomCalculateMark === 10 && question.ClinicalQuestionType === 'number' && questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId]" style="margin-left: 10px">
-          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}-{{ questionForm.CreateTime ? questionForm.CreateTime : parseTime(new Date(), '{y}-{m}-{d}') }}
+          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm.CreateTime ? questionForm.CreateTime : parseTime(new Date(), '{y}-{m}-{d}') }}
         </span>
         <!-- 生日不能大于截止日期 -->
         <span v-if="question.CustomCalculateMark === 11 && question.ClinicalQuestionType === 'number'" v-show="questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] > questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId]" style="margin-left: 10px;font-size: 12px;color:#f66">
@@ -193,7 +193,7 @@
     </el-col>
     <!-- eslint-disable vue/no-use-v-if-with-v-for -->
     <!-- eslint-disable vue/valid-v-for -->
-    <el-col v-for="(item) in question.Childrens" v-if="question.Childrens && question.Childrens.length>0 && question.ClinicalQuestionType !== 'table'" :span="['group', 'summary', 'table'].includes(item.ClinicalQuestionType) || item.Childrens.length > 0 ? 24 : 12">
+    <el-col v-for="(item) in question.Childrens" :key="item.Id" v-if="question.Childrens && question.Childrens.length>0 && question.ClinicalQuestionType !== 'table'" :span="['group', 'summary', 'table'].includes(item.ClinicalQuestionType) || item.Childrens.length > 0 ? 24 : 12">
       <QuestionFormItem
         :key="item.Id"
         :question="item"
@@ -593,7 +593,7 @@ export default {
 <style lang="scss" scoped>
 .my_dialog{
   .criterion-form-item{
-    >>>.el-form-item__content{
+    ::v-deep .el-form-item__content{
       width: auto;
     }
   }
@@ -614,7 +614,7 @@ export default {
     margin-bottom: 0px;
   }
   .disabled{
-    >>>.el-upload--picture-card {
+    ::v-deep .el-upload--picture-card {
       display: none;
     }
   }

src/components/clinicalDataQuestions/components/QuestionTableFormItem.vue

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

src/components/clinicalDataQuestions/components/QuestionsForm.vue

@@ -27,7 +27,7 @@
           size="small"
           type="primary"
           @click="close"
-          v-show="$route.path !== '/trials/trials-panel/visit/crc-upload'"
+          v-show="$route.path !== '/trials/trials-panel/visit/crc-upload'&&$route.path!=='/trials/trials-panel/visit/crc-question'"
         >
           {{ $t('common:button:cancel') }}
         </el-button>

src/components/downloadDicomAndNonedicom/index.vue

@@ -1,39 +1,19 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :fullscreen="true"
-    :close-on-click-modal="false"
-    :before-close="beforeClose"
-    :append-to-body="true"
-    v-loading="btnLoading"
-    class="downloadDicomAndNonedicom"
-  >
+  <el-dialog :visible.sync="visible" :fullscreen="true" :close-on-click-modal="false" :before-close="beforeClose"
+    :append-to-body="true" v-loading="btnLoading" class="downloadDicomAndNonedicom">
     <span slot="title">{{ title }}</span>
     <div class="top">
       <span>{{ $t('download:top:title') }}</span>
       <div class="btnBox">
-        <el-button
-          type="primary"
-          size="mini"
-          v-if="hasDicom"
-          @click.stop="getIRReadingDownloadStudyInfo('dicom')"
-        >
+        <el-button type="primary" size="mini" v-if="hasDicom" @click.stop="getIRReadingDownloadStudyInfo('dicom')">
           {{ $t('download:button:downloadDicom') }}
         </el-button>
-        <el-button
-          type="primary"
-          size="mini"
-          v-if="hasNonedicom"
-          @click.stop="getIRReadingDownloadStudyInfo('noneDicom')"
-        >
+        <el-button type="primary" size="mini" v-if="hasNonedicom"
+          @click.stop="getIRReadingDownloadStudyInfo('noneDicom')">
           {{ $t('download:button:downloadNonedicom') }}
         </el-button>
-        <el-button
-          type="primary"
-          size="mini"
-          v-if="hasDicom || hasNonedicom"
-          @click.stop="getIRReadingDownloadStudyInfo('all')"
-        >
+        <el-button type="primary" size="mini" v-if="hasDicom || hasNonedicom"
+          @click.stop="getIRReadingDownloadStudyInfo('all')">
           {{ $t('download:button:downloadAll') }}
         </el-button>
       </div>
@@ -43,16 +23,9 @@
       <div v-html="$t('download:tip:message')"></div>
     </div>
     <!--上传列表@selection-change="handleSelectionChange"-->
-    <el-table
-      ref="dicomFilesTable"
-      v-adaptive="{ bottomOffset: 85 }"
-      height="100"
-      :data="list"
-      :loading="loading"
-      class="dicomFiles-table"
-      @sort-change="handleSortByColumn"
-      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }"
-    >
+    <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 85 }" height="100" :data="list" :loading="loading"
+      class="dicomFiles-table" @sort-change="handleSortByColumn"
+      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
       <!-- <el-table-column
         type="selection"
         width="55"
@@ -60,50 +33,28 @@
       /> -->
       <el-table-column type="index" width="40" />
       <!--受试者-->
-      <el-table-column
-        :label="$t('download:table:subjectCode')"
-        min-width="130"
-        prop="SubjectCode"
-        show-overflow-tooltip
-      />
+      <el-table-column :label="$t('download:table:subjectCode')" min-width="130" prop="SubjectCode"
+        show-overflow-tooltip />
       <!--任务名称-->
-      <el-table-column
-        :label="$t('download:table:taskName')"
-        min-width="130"
-        show-overflow-tooltip
-        prop="TaskBlindName"
-        sortable="custom"
-      />
+      <el-table-column :label="$t('download:table:taskName')" min-width="130" show-overflow-tooltip prop="TaskBlindName"
+        sortable="custom" />
       <!--检查类型-->
-      <el-table-column
-        :label="$t('download:table:studyType')"
-        min-width="130"
-        show-overflow-tooltip
-        prop="IsDicom"
-        sortable="custom"
-      >
+      <el-table-column :label="$t('download:table:studyType')" min-width="130" show-overflow-tooltip prop="IsDicom"
+        sortable="custom">
         <template slot-scope="scope">
           <span>{{ $fd('IsDicom', scope.row.IsDicom) }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('download:table:orginalStudyListNum')"
-        min-width="150"
-        show-overflow-tooltip
-      >
+      <el-table-column :label="$t('download:table:orginalStudyListNum')" min-width="150" show-overflow-tooltip>
         <template slot-scope="scope">
-          <el-button
-            v-if="
-              (scope.row.IsDicom &&
-                scope.row.DicomStudyList &&
-                scope.row.DicomStudyList.length >= 1) ||
-              (!scope.row.IsDicom &&
-                scope.row.NoneDicomStudyList &&
-                scope.row.NoneDicomStudyList.length >= 1)
-            "
-            type="text"
-            @click="handleOpenDialog(scope.row)"
-          >
+          <el-button v-if="
+            (scope.row.IsDicom &&
+              scope.row.DicomStudyList &&
+              scope.row.DicomStudyList.length >= 1) ||
+            (!scope.row.IsDicom &&
+              scope.row.NoneDicomStudyList &&
+              scope.row.NoneDicomStudyList.length >= 1)
+          " type="text" @click="handleOpenDialog(scope.row)">
             <span>{{
               scope.row.IsDicom
                 ? scope.row.DicomStudyList.length
@@ -113,37 +64,19 @@
           <span v-else>0</span>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('common:action:action')"
-        fixed="right"
-        width="150"
-      >
+      <el-table-column :label="$t('common:action:action')" fixed="right" width="150">
         <template slot-scope="scope">
           <!--预览--->
-          <el-button
-            circle
-            icon="el-icon-view"
-            :title="$t('download:button:preview')"
-            @click.stop="preview(scope.row)"
-          />
+          <el-button circle icon="el-icon-view" :title="$t('download:button:preview')"
+            @click.stop="preview(scope.row)" />
           <!--下载--->
-          <el-button
-            circle
-            icon="el-icon-download"
-            :title="$t('download:button:download')"
-            @click.stop="getIRReadingDownloadStudyInfo('one', scope.row)"
-          />
+          <el-button circle icon="el-icon-download" :title="$t('download:button:download')"
+            @click.stop="getIRReadingDownloadStudyInfo('one', scope.row)" />
         </template>
       </el-table-column>
     </el-table>
-    <study-view
-      v-if="model_cfg.visible"
-      :model_cfg="model_cfg"
-      :modelList="modelList"
-      :bodyPart="bodyPart"
-      :IsDicom="IsDicom"
-      :visitTaskId="modelTaskId"
-    />
+    <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :modelList="modelList" :bodyPart="bodyPart"
+      :IsDicom="IsDicom" :visitTaskId="modelTaskId" />
   </el-dialog>
 </template>
 <script>
@@ -358,7 +291,8 @@ export default {
         name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
       }
       if (this.IsReadingTaskViewInOrder === 0) {
-        name = `${list[0].TaskBlindName}.zip`
+        // name = `${list[0].TaskBlindName}.zip`
+        name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
       }
       list.forEach((data) => {
         if (data.StudyList && data.StudyList.length > 0) {
@@ -370,11 +304,9 @@ export default {
                   series.InstancePathList.forEach((instance) => {
                     let fileName = instance.Path.split('/').pop()
                     let obj = {
-                      name: `${data.SubjectCode}/${
-                        data.TaskBlindName
-                      }/${this.$fd('IsDicom', true)}/${
-                        study.StudyCode
-                      }/${fileName}`,
+                      name: `${data.SubjectCode}/${data.TaskBlindName
+                        }/${this.$fd('IsDicom', true)}/${study.StudyCode
+                        }/${fileName}`,
                       url: this.OSSclientConfig.basePath + instance.Path,
                     }
                     if (this.IsReadingTaskViewInOrder === 0) {
@@ -500,10 +432,12 @@ export default {
   justify-content: space-between;
   margin: 10px 0;
 }
+
 .tip {
   display: flex;
   align-items: flex-start;
   margin-top: 5px;
+
   i {
     margin: 3px 5px 0 0;
   }

src/components/toggleRole/index.vue

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

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -316,9 +316,9 @@
               scope.row.dicomInfo.fileCount
             }}
             ({{
-              (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2)
+              (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(3)
             }}MB/{{
-              (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2)
+              (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(3)
             }}MB)
           </span>
         </template>
@@ -936,19 +936,19 @@ export default {
             ) {
               ++instanceIndex
             }
-            if (instanceIndex >= fileList.length) {
-              fileList.push({
-                instanceUid: instanceUid,
-                file: file,
-              })
-            }
-            scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
-            scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
-              (prev, next) => {
-                return prev + next.file.size
-              },
-              0
-            )
+            // if (instanceIndex >= fileList.length) {
+            //   fileList.push({
+            //     instanceUid: instanceUid,
+            //     file: file,
+            //   })
+            // }
+            // scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
+            // scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
+            //   (prev, next) => {
+            //     return prev + next.file.size
+            //   },
+            //   0
+            // )
 
             var seriesUid = data.string('x0020000e')
             var seriesList = scope.uploadQueues[studyIndex].seriesList
@@ -1046,6 +1046,19 @@ export default {
               }
               instanceList.push(instanceItem)
             }
+            if (instanceIndex >= fileList.length) {
+              fileList.push({
+                instanceUid: instanceUid,
+                file: file,
+              })
+            }
+            scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
+            scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
+              (prev, next) => {
+                return prev + next.file.size
+              },
+              0
+            )
             resolve()
           } catch (error) {
             console.log(error)
@@ -1308,7 +1321,7 @@ export default {
                                     o.imageColumns,
                                     o.imageRows
                                   )
-                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                                   let OSSclient = scope.OSSclient
                                   let seriesRes = await OSSclient.put(
                                     thumbnailPath,
@@ -1421,7 +1434,7 @@ export default {
                     v.instanceList[0].imageColumns,
                     v.instanceList[0].imageRows
                   )
-                  let thumbnailPath = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
                   let OSSclient = scope.OSSclient
                   try {
                     let seriesRes = await OSSclient.put(thumbnailPath, blob)
@@ -1499,8 +1512,8 @@ export default {
       return new Promise((resolve) => {
         cornerstone.loadImage(imageId).then(async (image) => {
           let canvas = document.createElement('canvas')
-          canvas.width = width
-          canvas.height = height
+          canvas.width = (width * 60) / height
+          canvas.height = 60
           if (image) {
             cornerstone.renderToCanvas(canvas, image)
             // 将 Canvas 图像对象转换为 PNG 格式

src/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -8,65 +8,29 @@
       </div>
     </div>
     <!--检查列表-->
-    <el-table
-      :data="list"
-      style="width: 100%"
-      v-adaptive="{ bottomOffset: 60 }"
-      :loading="loading"
-      @sort-change="handleSortByColumn"
-      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }"
-    >
+    <el-table :data="list" style="width: 100%" v-adaptive="{ bottomOffset: 60 }" :loading="loading"
+      @sort-change="handleSortByColumn" :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
       <!--受试者-->
-      <el-table-column
-        prop="SubjectCode"
-        :label="$t('upload:nonedicom:table:subject')"
-      />
+      <el-table-column prop="SubjectCode" :label="$t('upload:nonedicom:table:subject')" />
       <!--任务名称-->
-      <el-table-column
-        prop="TaskBlindName"
-        :label="$t('upload:nonedicom:table:taskName')"
-        sortable="custom"
-      />
+      <el-table-column prop="TaskBlindName" :label="$t('upload:nonedicom:table:taskName')" sortable="custom" />
       <!--检查类型-->
-      <el-table-column
-        prop="Modality"
-        :label="$t('upload:nonedicom:table:molityType')"
-        sortable="custom"
-      >
+      <el-table-column prop="Modality" :label="$t('upload:nonedicom:table:molityType')" sortable="custom">
       </el-table-column>
       <!--检查部位-->
-      <el-table-column
-        prop="BodyPart"
-        :label="$t('upload:nonedicom:table:bodyPart')"
-        sortable="custom"
-      />
+      <el-table-column prop="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable="custom" />
       <!--原文件数-->
-      <el-table-column
-        prop="FileCount"
-        :label="$t('upload:nonedicom:table:fileCount')"
-      >
+      <el-table-column prop="FileCount" :label="$t('upload:nonedicom:table:fileCount')">
         <template slot-scope="scope">
-          <el-popover
-            v-if="scope.row.FileCount"
-            trigger="click"
-            placement="bottom"
-          >
+          <el-popover v-if="scope.row.FileCount" trigger="click" placement="bottom">
             <el-table :data="scope.row.FileList" height="300" size="small">
               <!-- 文件名称 -->
-              <el-table-column
-                prop="FileName"
-                :label="$t('trials:audit:table:nonDicomsFileName')"
-                width="200"
-              />
-              <el-table-column
-                prop="FileSize"
-                :label="$t('trials:audit:table:nonDicomsFileSize')"
-                width="100"
-              >
+              <el-table-column prop="FileName" :label="$t('trials:audit:table:nonDicomsFileName')" width="200" />
+              <el-table-column prop="FileSize" :label="$t('trials:audit:table:nonDicomsFileSize')" width="100">
                 <template slot-scope="scope">
                   <span>{{
                     scope.row.FileSize && scope.row.FileSize > 0
-                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(3)}MB`
                       : ''
                   }}</span>
                 </template>
@@ -74,27 +38,13 @@
               <el-table-column :label="$t('common:action:action')" width="120">
                 <template slot-scope="files">
                   <!-- 预览 -->
-                  <viewer
-                    :ref="files.row.Path"
-                    style="margin: 0 10px"
-                    :images="[`${OSSclientConfig.basePath}${files.row.Path}`]"
-                  >
-                    <el-button
-                      circle
-                      icon="el-icon-view"
-                      :title="$t('upload:nonedicom:button:preview')"
-                      :disabled="
-                        files.row.FileType &&
-                        files.row.FileType.indexOf('zip') >= 0
-                      "
-                      @click.native.prevent="previewFile(files.row)"
-                    />
-                    <img
-                      v-show="false"
-                      crossorigin="anonymous"
-                      :src="`${OSSclientConfig.basePath}${files.row.Path}`"
-                      alt="Image"
-                    />
+                  <viewer :ref="files.row.Path" style="margin: 0 10px"
+                    :images="[`${OSSclientConfig.basePath}${files.row.Path}`]">
+                    <el-button circle icon="el-icon-view" :title="$t('upload:nonedicom:button:preview')" :disabled="files.row.FileType &&
+                      files.row.FileType.indexOf('zip') >= 0
+                      " @click.native.prevent="previewFile(files.row)" />
+                    <img v-show="false" crossorigin="anonymous" :src="`${OSSclientConfig.basePath}${files.row.Path}`"
+                      alt="Image" />
                   </viewer>
                 </template>
               </el-table-column>
@@ -109,36 +59,17 @@
         </template>
       </el-table-column>
       <!--后处理文件数-->
-      <el-table-column
-        prop="UploadedFileCount"
-        :label="$t('upload:nonedicom:table:uploadFileCount')"
-      >
+      <el-table-column prop="UploadedFileCount" :label="$t('upload:nonedicom:table:uploadFileCount')">
         <template slot-scope="scope">
-          <el-popover
-            v-if="scope.row.UploadedFileCount"
-            trigger="click"
-            placement="bottom"
-          >
-            <el-table
-              :data="scope.row.UploadedFileList"
-              height="300"
-              size="small"
-            >
+          <el-popover v-if="scope.row.UploadedFileCount" trigger="click" placement="bottom">
+            <el-table :data="scope.row.UploadedFileList" height="300" size="small">
               <!-- 文件名称 -->
-              <el-table-column
-                prop="FileName"
-                :label="$t('trials:audit:table:nonDicomsFileName')"
-                width="200"
-              />
-              <el-table-column
-                prop="FileSize"
-                :label="$t('trials:audit:table:nonDicomsFileSize')"
-                width="100"
-              >
+              <el-table-column prop="FileName" :label="$t('trials:audit:table:nonDicomsFileName')" width="200" />
+              <el-table-column prop="FileSize" :label="$t('trials:audit:table:nonDicomsFileSize')" width="100">
                 <template slot-scope="scope">
                   <span>{{
                     scope.row.FileSize && scope.row.FileSize > 0
-                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(3)}MB`
                       : ''
                   }}</span>
                 </template>
@@ -146,27 +77,13 @@
               <el-table-column :label="$t('common:action:action')" width="120">
                 <template slot-scope="files">
                   <!-- 预览 -->
-                  <viewer
-                    :ref="files.row.Path"
-                    style="margin: 0 10px"
-                    :images="[`${OSSclientConfig.basePath}${files.row.Path}`]"
-                  >
-                    <el-button
-                      circle
-                      icon="el-icon-view"
-                      :title="$t('upload:nonedicom:button:preview')"
-                      :disabled="
-                        files.row.FileType &&
-                        files.row.FileType.indexOf('zip') >= 0
-                      "
-                      @click.native.prevent="previewFile(files.row)"
-                    />
-                    <img
-                      v-show="false"
-                      crossorigin="anonymous"
-                      :src="`${OSSclientConfig.basePath}${files.row.Path}`"
-                      alt="Image"
-                    />
+                  <viewer :ref="files.row.Path" style="margin: 0 10px"
+                    :images="[`${OSSclientConfig.basePath}${files.row.Path}`]">
+                    <el-button circle icon="el-icon-view" :title="$t('upload:nonedicom:button:preview')" :disabled="files.row.FileType &&
+                      files.row.FileType.indexOf('zip') >= 0
+                      " @click.native.prevent="previewFile(files.row)" />
+                    <img v-show="false" crossorigin="anonymous" :src="`${OSSclientConfig.basePath}${files.row.Path}`"
+                      alt="Image" />
                   </viewer>
                 </template>
               </el-table-column>
@@ -180,75 +97,34 @@
           <span v-else>{{ scope.row.UploadedFileCount }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('common:action:action')"
-        fixed="right"
-        width="180"
-      >
+      <el-table-column :label="$t('common:action:action')" fixed="right" width="180">
         <template slot-scope="scope">
           <!--预览--->
-          <el-button
-            circle
-            :disabled="scope.row.UploadedFileCount <= 0"
-            icon="el-icon-view"
-            :title="$t('upload:nonedicom:button:preview')"
-            @click.stop="handlePreviewNoneDicomFiles(scope.row)"
-          />
+          <el-button circle :disabled="scope.row.UploadedFileCount <= 0" icon="el-icon-view"
+            :title="$t('upload:nonedicom:button:preview')" @click.stop="handlePreviewNoneDicomFiles(scope.row)" />
           <!--上传--->
-          <el-button
-            circle
-            icon="el-icon-upload2"
-            :title="$t('upload:nonedicom:button:upload')"
-            @click.native.prevent="handleUpload(scope.row)"
-          />
+          <el-button circle icon="el-icon-upload2" :title="$t('upload:nonedicom:button:upload')"
+            @click.native.prevent="handleUpload(scope.row)" />
           <!--删除--->
-          <el-button
-            :disabled="
-              scope.row.UploadedFileCount <= 0 ||
-              scope.row.ReadingTaskState === 2
-            "
-            circle
-            icon="el-icon-delete"
-            :title="$t('upload:nonedicom:button:delete')"
-            @click.stop="remove(scope.row)"
-          />
+          <el-button :disabled="scope.row.UploadedFileCount <= 0 ||
+            scope.row.ReadingTaskState === 2
+            " circle icon="el-icon-delete" :title="$t('upload:nonedicom:button:delete')"
+            @click.stop="remove(scope.row)" />
         </template>
       </el-table-column>
     </el-table>
     <!-- 预览单个图像 -->
-    <el-dialog
-      v-if="imgObj.visible"
-      :visible.sync="imgObj.visible"
-      :title="$t('upload:nonedicom:dialogTitle:preview')"
-      append-to-body
-      width="565px"
-    >
-      <div
-        v-loading="imgObj.loading"
-        class="base-modal-body"
-        style="border: 2px solid #ccc; padding: 10px"
-      >
-        <el-image
-          :src="`${OSSclientConfig.basePath}${imgObj.url}`"
-          crossorigin="anonymous"
-          fit="fit"
-          style="height: 500px; width: 500px"
-          @error="imgObj.loading = false"
-          @load="imgObj.loading = false"
-        />
+    <el-dialog v-if="imgObj.visible" :visible.sync="imgObj.visible" :title="$t('upload:nonedicom:dialogTitle:preview')"
+      append-to-body width="565px">
+      <div v-loading="imgObj.loading" class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
+        <el-image :src="`${OSSclientConfig.basePath}${imgObj.url}`" crossorigin="anonymous" fit="fit"
+          style="height: 500px; width: 500px" @error="imgObj.loading = false" @load="imgObj.loading = false" />
       </div>
     </el-dialog>
     <!-- 上传非dicom文件 -->
-    <el-dialog
-      v-if="uploadVisible"
-      :visible.sync="uploadVisible"
-      :close-on-click-modal="false"
-      :title="$t('trials:uploadNonDicoms:dialogTitle:upload')"
-      width="800px"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-      @close="resetFileDiaolg"
-    >
+    <el-dialog v-if="uploadVisible" :visible.sync="uploadVisible" :close-on-click-modal="false"
+      :title="$t('trials:uploadNonDicoms:dialogTitle:upload')" width="800px" append-to-body
+      custom-class="base-dialog-wrapper" @close="resetFileDiaolg">
       <!-- 多文件上传 -->
       <form id="inputForm" ref="uploadForm">
         <el-divider content-position="left">{{
@@ -256,33 +132,15 @@
         }}</el-divider>
         <div class="form-group">
           <div class="upload" style="margin-right: 10px">
-            <input
-              multiple="multiple"
-              webkitdirectory=""
-              directory
-              accept="*/*"
-              type="file"
-              name="uploadFolder"
-              class="select-file"
-              title=""
-              @change="beginScanFiles($event)"
-              v-if="!btnLoading"
-            />
+            <input multiple="multiple" webkitdirectory="" directory accept="*/*" type="file" name="uploadFolder"
+              class="select-file" title="" @change="beginScanFiles($event)" v-if="!btnLoading" />
             <div class="btn-select">
               {{ $t('trials:uploadNonDicoms:button:selectFolder') }}
             </div>
           </div>
           <div class="upload">
-            <input
-              class="select-file"
-              multiple=""
-              :accept="faccept.join(',')"
-              type="file"
-              name="uploadFile"
-              title=""
-              @change="beginScanFiles($event)"
-              v-if="!btnLoading"
-            />
+            <input class="select-file" multiple="" :accept="faccept.join(',')" type="file" name="uploadFile" title=""
+              @change="beginScanFiles($event)" v-if="!btnLoading" />
             <div class="btn-select">
               {{ $t('trials:uploadNonDicoms:button:select') }}
             </div>
@@ -293,82 +151,46 @@
         </div>
       </form>
       <!-- 文件列表 -->
-      <el-table
-        ref="filesTable"
-        :data="fileList"
-        class="dicomFiles-table"
-        height="300"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-          :selectable="(row, index) => row.status !== 2 && !btnLoading"
-        />
+      <el-table ref="filesTable" :data="fileList" class="dicomFiles-table" height="300"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" :selectable="(row, index) => row.status !== 2 && !btnLoading" />
         <el-table-column type="index" width="50" />
         <!-- 文件名称 -->
-        <el-table-column
-          prop="name"
-          :label="$t('trials:uploadNonDicoms:table:fileName')"
-          min-width="100"
-        />
+        <el-table-column prop="name" :label="$t('trials:uploadNonDicoms:table:fileName')" min-width="100" />
         <!-- 文件大小 -->
-        <el-table-column
-          prop="size"
-          :label="$t('trials:uploadNonDicoms:table:fileSize')"
-        >
+        <el-table-column prop="size" :label="$t('trials:uploadNonDicoms:table:fileSize')">
           <template slot-scope="scope">
             <span>{{
               scope.row.size && scope.row.size > 0
-                ? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
-                : ''
+                ? `${(scope.row.size / 1024 / 1024).toFixed(3)}MB`
+                : '0MB'
             }}</span>
           </template>
         </el-table-column>
         <!-- 文件类型 -->
-        <el-table-column
-          prop="type"
-          :label="$t('trials:uploadNonDicoms:table:fileType')"
-        />
+        <el-table-column prop="type" :label="$t('trials:uploadNonDicoms:table:fileType')" />
         <!-- 上传状态 -->
-        <el-table-column
-          prop="status"
-          :label="$t('trials:uploadNonDicoms:table:uploadStatus')"
-          min-width="100"
-        >
+        <el-table-column prop="status" :label="$t('trials:uploadNonDicoms:table:uploadStatus')" min-width="100">
           <template slot-scope="scope">
-            <el-tag
-              :type="['warning', 'info', 'success', 'danger'][scope.row.status]"
-              v-if="scope.row.status || scope.row.status === 0"
-              >{{ $fd('NoneDicomUploadStatus', scope.row.status) }}
+            <el-tag :type="['warning', 'info', 'success', 'danger'][scope.row.status]"
+              v-if="scope.row.status || scope.row.status === 0">{{ $fd('NoneDicomUploadStatus', scope.row.status) }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-          :label="$t('trials:uploadNonDicoms:table:failedFileCount')"
-          min-width="150"
-          show-overflow-tooltip
-        >
+        <el-table-column :label="$t('trials:uploadNonDicoms:table:failedFileCount')" min-width="150"
+          show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-progress
-              color="#409eff"
-              :percentage="
-                ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
-                1
-              "
-            />
+            <el-progress color="#409eff" :percentage="scope.row.size && scope.row.size > 0 ? ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
+              1
+              : ((scope.row.uploadFileSize * 100) / 1).toFixed(2) *
+              1
+              " />
           </template>
         </el-table-column>
         <el-table-column :label="$t('common:action:action')">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              icon="el-icon-delete"
-              circle
-              :disabled="btnLoading"
-              :title="$t('trials:crcUpload:action:delete')"
-              @click="handleRemoveFile(scope.row)"
-            />
+            <el-button size="mini" icon="el-icon-delete" circle :disabled="btnLoading"
+              :title="$t('trials:crcUpload:action:delete')" @click="handleRemoveFile(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -376,13 +198,8 @@
         <span style="margin-right: 10px">{{
           $store.state.trials.uploadTip
         }}</span>
-        <el-button
-          size="small"
-          type="primary"
-          :disabled="selectArr.length == 0"
-          :loading="btnLoading"
-          @click="beginUpload"
-        >
+        <el-button size="small" type="primary" :disabled="selectArr.length == 0" :loading="btnLoading"
+          @click="beginUpload">
           {{ $t('trials:uploadNonDicoms:action:upload') }}
         </el-button>
       </div>
@@ -588,7 +405,7 @@ export default {
             )
           }
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     resetUploadForm() {
       this.$nextTick(() => {
@@ -714,11 +531,10 @@ export default {
       if (!this.uploadVisible) return
       let file = this.fileList.filter((item) => item.id === arr[index].id)[0]
       file.status = 1
-      let path = `/${this.$route.query.trialId}/TaskImage/${
-        this.currentRow.SubjectId
-      }/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
-        .substring(file.name.lastIndexOf('.'))
-        .toLocaleLowerCase()}`
+      let path = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId
+        }/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
+          .substring(file.name.lastIndexOf('.'))
+          .toLocaleLowerCase()}`
       file.curPath = path
       const fileData = await this.fileToBlob(file.file)
       let res = await this.fileToOss(path, fileData, file)
@@ -772,7 +588,7 @@ export default {
           (percentage, checkpoint, lastPer) => {
             item.uploadFileSize += checkpoint.size * (percentage - lastPer)
             if (item.uploadFileSize > file.fileSize) {
-              item.uploadFileSize = file.fileSize
+              item.uploadFileSize = file.fileSize > 0 ? file.fileSize : 1
             }
           }
         )
@@ -869,6 +685,7 @@ export default {
 .top {
   margin: 10px 0;
 }
+
 .upload {
   display: inline-block;
   height: 30px;
@@ -883,6 +700,7 @@ export default {
   background: #428bca;
   border-color: #428bca;
   color: #fff;
+
   .select-file {
     height: 30px;
     width: 90px;
@@ -893,6 +711,7 @@ export default {
     opacity: 0;
     font-size: 0;
   }
+
   .btn-select {
     //给显示在页面上的按钮写样式
     width: 90px;
@@ -908,10 +727,12 @@ export default {
     pointer-events: none; //pointer-events:none用来控制该标签的点击穿透事件
   }
 }
+
 .tip {
   display: flex;
   align-items: flex-start;
   margin-top: 5px;
+
   i {
     margin: 3px 5px 0 0;
   }

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

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

src/const/check/index.js

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

src/directive/dialogDrag.js

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

src/layout/components/Navbar.vue

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

src/layout/components/Sidebar/index.vue

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

src/layout/components/TagsView/ScrollPane.vue

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

src/layout/index.vue

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

src/main.js

@@ -54,6 +54,8 @@ import upload from '@/components/element-ui/upload'
 Vue.use(upload)
 import Preview from '@/components/Preview/index'
 Vue.use(Preview)
+import Onlyoffice from '@/components/Preview_onlyoffice/index'
+Vue.use(Onlyoffice)
 import MFA from '@/components/MFA/index'
 Vue.use(MFA)
 import FB from '@/components/feedBack/index'
@@ -174,7 +176,7 @@ var _vm
 async function VueInit() {
   var params
   var res
-  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct')) {
+  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct') || ~window.location.href.indexOf('/fusion')) {
     params = $q('TrialReadingCriterionId')
     res = await getBasicDataAllSelect(params)
   } else if (~window.location.href.indexOf('/ecrfPreview')) {
@@ -293,6 +295,7 @@ async function VueInit() {
     }()
     _vm.$forceUpdate()
   }
+  Vue.prototype.$EventBus = new Vue()
   Vue.prototype.$path = []
   var t = function (key) {
     if (!~Vue.prototype.$path.indexOf(key)) {
@@ -307,6 +310,11 @@ async function VueInit() {
         text = text.replace(test, item.TrialName)
       })
     }
+    let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo'))
+    if(CompanyInfo&&CompanyInfo.SystemShortName){
+      let test = new RegExp('IRC', 'ig')
+        text = text.replace(test, CompanyInfo.SystemShortName)
+    }
     // return i18n.t(key)
     return text;
   }
@@ -402,8 +410,12 @@ async function VueInit() {
     }
     _vm.$store.dispatch('user/logout').then(res => {
       // window.location.href = `/login`
-      if (_vm.$msgbox) {
-        _vm.$msgbox.close();
+      try {
+        if (_vm.$msgbox && _vm.$msgbox.close) {
+          _vm.$msgbox.close();
+        }
+      } catch (err) {
+        console.log(err)
       }
       _vm.$FB.close();
       _vm.$FBT.close();
@@ -446,18 +458,18 @@ async function VueInit() {
         beforeClose: (action, instance, done) => {
           if (action === 'confirm') {
             if (!_vm.unlock.my_username) {
-              _vm.$alert(_vm.$t("env:lock:msgBox:iupUser"))
+              _vm.$message.warning(_vm.$t("env:lock:msgBox:iupUser"))
               return
             }
             if (!_vm.unlock.my_password) {
-              _vm.$alert(_vm.$t("env:lock:msgBox:inpPassword"))
+              _vm.$message.warning(_vm.$t("env:lock:msgBox:inpPassword"))
               return
             }
             var my_username = zzSessionStorage.getItem('my_username')
             var my_password = zzSessionStorage.getItem('my_password')
             let my_userid = zzSessionStorage.getItem('userId')
-            let my_EMail = zzSessionStorage.getItem('my_EMail')
-            if (md5(_vm.unlock.my_password) === my_password && my_username === _vm.unlock.my_username) {
+            let my_EMail = zzSessionStorage.getItem('my_EMail') || ''
+            if (md5(_vm.unlock.my_password) === my_password && (my_username === _vm.unlock.my_username || my_EMail.toUpperCase() === vm.unlock.my_username.toUpperCase())) {
               resetReadingRestTime().then(() => {
               })
               const closeLock = (_vm) => {
@@ -596,3 +608,4 @@ VueInit()
 // });
 
 
+export default _vm

src/permission.js

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

src/router/index.js

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

src/settings.js

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

src/store/getters.js

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

src/store/index.js

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

src/store/modules/noneDicomReview.js

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

src/store/modules/reading.js

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

src/store/modules/user.js

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

src/styles/element-ui.scss

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

src/styles/index.scss

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

src/styles/sidebar.scss

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

src/utils/dialog.js

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

src/utils/get-page-title.js

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

src/utils/index.js

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

src/utils/metaDataProvider.js

@@ -0,0 +1,252 @@
+import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
+function parseImageId(imageId) {
+  // build a url by parsing out the url scheme and frame index from the imageId
+  const firstColonIndex = imageId.indexOf(':');
+
+  let url = imageId.substring(firstColonIndex + 1);
+  const frameIndex = url.indexOf('frame=');
+
+  let frame;
+
+  if (frameIndex !== -1) {
+    const frameStr = url.substr(frameIndex + 6);
+
+    frame = parseInt(frameStr, 10);
+    url = url.substr(0, frameIndex - 1);
+  }
+
+  return {
+    scheme: imageId.substr(0, firstColonIndex),
+    url,
+    frame,
+  };
+}
+function getNumberValues(dataSet, tag, minimumLength) {
+  const values = [];
+  const valueAsString = dataSet.string(tag);
+
+  if (!valueAsString) {
+    return;
+  }
+  const split = valueAsString.split('\\');
+
+  if (minimumLength && split.length < minimumLength) {
+    return;
+  }
+  for (let i = 0; i < split.length; i++) {
+    values.push(parseFloat(split[i]));
+  }
+
+  return values;
+}
+function getLutDescriptor(dataSet, tag) {
+  if (!dataSet.elements[tag] || dataSet.elements[tag].length !== 6) {
+    return;
+  }
+
+  return [
+    dataSet.uint16(tag, 0),
+    dataSet.uint16(tag, 1),
+    dataSet.uint16(tag, 2),
+  ];
+}
+
+function getLutData(lutDataSet, tag, lutDescriptor) {
+  const lut = [];
+  const lutData = lutDataSet.elements[tag];
+
+  for (let i = 0; i < lutDescriptor[0]; i++) {
+    // Output range is always unsigned
+    if (lutDescriptor[2] === 16) {
+      lut[i] = lutDataSet.uint16(tag, i);
+    } else {
+      lut[i] = lutDataSet.byteArray[i + lutData.dataOffset];
+    }
+  }
+
+  return lut;
+}
+function populateSmallestLargestPixelValues(dataSet, imagePixelModule) {
+  const pixelRepresentation = dataSet.uint16('x00280103');
+  if (pixelRepresentation === 0) {
+    imagePixelModule.smallestPixelValue = dataSet.uint16('x00280106');
+    imagePixelModule.largestPixelValue = dataSet.uint16('x00280107');
+  } else {
+    imagePixelModule.smallestPixelValue = dataSet.int16('x00280106');
+    imagePixelModule.largestPixelValue = dataSet.int16('x00280107');
+  }
+  imagePixelModule.largestPixelValue = imagePixelModule.largestPixelValue === 0 ? undefined : imagePixelModule.largestPixelValue;
+}
+function populatePaletteColorLut(dataSet, imagePixelModule) {
+  imagePixelModule.redPaletteColorLookupTableDescriptor = getLutDescriptor(
+    dataSet,
+    'x00281101'
+  );
+  imagePixelModule.greenPaletteColorLookupTableDescriptor = getLutDescriptor(
+    dataSet,
+    'x00281102'
+  );
+  imagePixelModule.bluePaletteColorLookupTableDescriptor = getLutDescriptor(
+    dataSet,
+    'x00281103'
+  );
+
+  // The first Palette Color Lookup Table Descriptor value is the number of entries in the lookup table.
+  // When the number of table entries is equal to 2ˆ16 then this value shall be 0.
+  // See http://dicom.nema.org/MEDICAL/DICOM/current/output/chtml/part03/sect_C.7.6.3.html#sect_C.7.6.3.1.5
+  if (imagePixelModule.redPaletteColorLookupTableDescriptor[0] === 0) {
+    imagePixelModule.redPaletteColorLookupTableDescriptor[0] = 65536;
+    imagePixelModule.greenPaletteColorLookupTableDescriptor[0] = 65536;
+    imagePixelModule.bluePaletteColorLookupTableDescriptor[0] = 65536;
+  }
+
+  // The third Palette Color Lookup Table Descriptor value specifies the number of bits for each entry in the Lookup Table Data.
+  // It shall take the value of 8 or 16.
+  // The LUT Data shall be stored in a format equivalent to 8 bits allocated when the number of bits for each entry is 8, and 16 bits allocated when the number of bits for each entry is 16, where in both cases the high bit is equal to bits allocated-1.
+  // The third value shall be identical for each of the Red, Green and Blue Palette Color Lookup Table Descriptors.
+  //
+  // Note: Some implementations have encoded 8 bit entries with 16 bits allocated, padding the high bits;
+  // this can be detected by comparing the number of entries specified in the LUT Descriptor with the actual value length of the LUT Data entry.
+  // The value length in bytes should equal the number of entries if bits allocated is 8, and be twice as long if bits allocated is 16.
+  const numLutEntries =
+    imagePixelModule.redPaletteColorLookupTableDescriptor[0];
+  const lutData = dataSet.elements.x00281201;
+  const lutBitsAllocated = lutData.length === numLutEntries ? 8 : 16;
+
+  // If the descriptors do not appear to have the correct values, correct them
+  if (
+    imagePixelModule.redPaletteColorLookupTableDescriptor[2] !==
+    lutBitsAllocated
+  ) {
+    imagePixelModule.redPaletteColorLookupTableDescriptor[2] = lutBitsAllocated;
+    imagePixelModule.greenPaletteColorLookupTableDescriptor[2] =
+      lutBitsAllocated;
+    imagePixelModule.bluePaletteColorLookupTableDescriptor[2] =
+      lutBitsAllocated;
+  }
+
+  imagePixelModule.redPaletteColorLookupTableData = getLutData(
+    dataSet,
+    'x00281201',
+    imagePixelModule.redPaletteColorLookupTableDescriptor
+  );
+  imagePixelModule.greenPaletteColorLookupTableData = getLutData(
+    dataSet,
+    'x00281202',
+    imagePixelModule.greenPaletteColorLookupTableDescriptor
+  );
+  imagePixelModule.bluePaletteColorLookupTableData = getLutData(
+    dataSet,
+    'x00281203',
+    imagePixelModule.bluePaletteColorLookupTableDescriptor
+  );
+}
+function metaDataProvider(type, imageId) {
+  const parsedImageId = parseImageId(imageId);
+  const dataSet = cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.get(parsedImageId.url);
+
+  if (!dataSet) {
+    return;
+  }
+  if (type === 'imagePlaneModule') {
+    const imageOrientationPatient = getNumberValues(dataSet, 'x00200037', 6);
+    const imagePositionPatient = getNumberValues(dataSet, 'x00200032', 3);
+    const pixelSpacing = getNumberValues(dataSet, 'x00280030', 2);
+    const imagePixelSpacing = getNumberValues(dataSet, 'x00181164', 2);
+    const estimatedRadiographicMagnificationFactor = getNumberValues(dataSet, 'x00181114', 2);
+    let columnPixelSpacing = null;
+
+    let rowPixelSpacing = null;
+
+    if (pixelSpacing) {
+      rowPixelSpacing = pixelSpacing[0];
+      columnPixelSpacing = pixelSpacing[1];
+    } else if (imagePixelSpacing && estimatedRadiographicMagnificationFactor) {
+      rowPixelSpacing = imagePixelSpacing[0] / estimatedRadiographicMagnificationFactor[0];
+      columnPixelSpacing = imagePixelSpacing[1] / estimatedRadiographicMagnificationFactor[1];
+    } else if (imagePixelSpacing && !estimatedRadiographicMagnificationFactor) {
+      rowPixelSpacing = imagePixelSpacing[0];
+      columnPixelSpacing = imagePixelSpacing[1];
+    }
+
+    let rowCosines = null;
+
+    let columnCosines = null;
+
+    if (imageOrientationPatient) {
+      rowCosines = [
+        parseFloat(imageOrientationPatient[0]),
+        parseFloat(imageOrientationPatient[1]),
+        parseFloat(imageOrientationPatient[2]),
+      ];
+      columnCosines = [
+        parseFloat(imageOrientationPatient[3]),
+        parseFloat(imageOrientationPatient[4]),
+        parseFloat(imageOrientationPatient[5]),
+      ];
+    }
+
+    return {
+      frameOfReferenceUID: dataSet.string('x00200052'),
+      rows: dataSet.uint16('x00280010'),
+      columns: dataSet.uint16('x00280011'),
+      imageOrientationPatient,
+      rowCosines,
+      columnCosines,
+      imagePositionPatient,
+      sliceThickness: dataSet.floatString('x00180050'),
+      sliceLocation: dataSet.floatString('x00201041'),
+      pixelSpacing,
+      rowPixelSpacing,
+      columnPixelSpacing,
+    };
+  }
+  if (type === 'imagePixelModule') {
+    const imagePixelModule = {
+      samplesPerPixel: dataSet.uint16('x00280002'),
+      photometricInterpretation: dataSet.string('x00280004'),
+      rows: dataSet.uint16('x00280010'),
+      columns: dataSet.uint16('x00280011'),
+      bitsAllocated: dataSet.uint16('x00280100'),
+      bitsStored: dataSet.uint16('x00280101'),
+      highBit: dataSet.uint16('x00280102'),
+      pixelRepresentation: dataSet.uint16('x00280103'),
+      planarConfiguration: dataSet.uint16('x00280006'),
+      pixelAspectRatio: dataSet.string('x00280034'),
+    };
+    populateSmallestLargestPixelValues(dataSet, imagePixelModule);
+
+    if (
+      imagePixelModule.photometricInterpretation === 'PALETTE COLOR' &&
+      dataSet.elements.x00281101
+    ) {
+      populatePaletteColorLut(dataSet, imagePixelModule);
+    }
+    return imagePixelModule;
+  }
+  // if (type === 'imagePixelModule') {
+  //   return {
+  //     samplesPerPixel: dataSet.uint16('x00280002'),
+  //     photometricInterpretation: dataSet.string('x00280004'),
+  //     rows: dataSet.uint16('x00280010'),
+  //     columns: dataSet.uint16('x00280011'),
+  //     bitsAllocated: dataSet.uint16('x00280100'),
+  //     bitsStored: dataSet.uint16('x00280101'),
+  //     highBit: dataSet.uint16('x00280102'),
+  //     pixelRepresentation: dataSet.uint16('x00280103'),
+  //     planarConfiguration: dataSet.uint16('x00280006'),
+  //     pixelAspectRatio: dataSet.uint16('x00280034'),
+  //     smallestPixelValue: null,
+  //     largestPixelValue: null,
+  //     // smallestPixelValue: dataSet.uint16('x00280106'),
+  //     // largestPixelValue: dataSet.uint16('x00280107'),
+  //     redPaletteColorLookupTableDescriptor: dataSet.string('x00281101'),
+  //     greenPaletteColorLookupTableDescriptor: dataSet.string('x00281102'),
+  //     bluePaletteColorLookupTableDescriptor: dataSet.string('x00281103'),
+  //     redPaletteColorLookupTableData: dataSet.string('x00281201'),
+  //     greenPaletteColorLookupTableData: dataSet.string('x00281202'),
+  //     bluePaletteColorLookupTableData: dataSet.string('x00281203')
+  //   }
+  // }
+}
+export default metaDataProvider;

src/utils/multipartUpload/aws.js

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

src/utils/multipartUpload/oss.js

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

src/utils/onlyOffice_type.js

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

src/utils/oss.js

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

src/utils/parseDicom.js

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

src/utils/request-download.js

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

src/utils/request.js

@@ -5,9 +5,11 @@ import router from '@/router'
 import WHITELIST from "./whiteList"
 import moment from 'moment-timezone';
 import { encryptConfig } from "@/utils/encrypt"
+const ROUTER = require('@/router');
 axios.defaults.withCredentials = false
 const service = axios.create({
   baseURL: '/api',
+  // baseURL: process.env.NODE_ENV === 'prod' ? "https://api.irc.extimaging.com" : '/api',
   timeout: 2 * 360000, // request timeout
   withCredentials: false
 })
@@ -19,6 +21,8 @@ service.interceptors.request.use(
   async config => {
     path = router && router.app && router.app._route && router.app._route.path
     config.headers['Content-Type'] = 'application/json;charset=UTF-8'
+    // config.baseURL = process.env.NODE_ENV === 'prod' ? "https://api.irc.extimaging.com" : '/api'
+    config.headers['Self-Referer'] = window.location.href
     var language = zzSessionStorage.getItem('lang')
     config.headers['Accept-Language'] = language === 'en' ? 'en-US,en;q=0.5' : 'zh-CN,zh;q=0.9'
     config.headers['TimeZoneId'] = moment.tz.guess()
@@ -90,10 +94,20 @@ service.interceptors.response.use(
       const status = error.response.status
       if (error.response.data && (error.response.data.Code === -1 || error.response.data.Code === -2)) {
         store.dispatch('user/logout').then(() => {
+          let _vm = ROUTER.default.app
+          try {
+            if (_vm.$msgbox && _vm.$msgbox.close) {
+              _vm.$msgbox.close();
+            }
+          } catch (err) {
+            console.log(err)
+          }
           router.push(`/login`)
-          this.$i18n.locale = 'zh'
-          this.setLanguage('zh')
-          this.$updateDictionary()
+          // if (!this.$i18n.locale) {
+          //   //this.$i18n.locale = 'zh'
+          //   //this.setLanguage('zh')
+          // }
+          // this.$updateDictionary()
         })
       }
       switch (status) {
@@ -123,9 +137,9 @@ service.interceptors.response.use(
           }
           store.dispatch('user/logout').then(() => {
             router.push(`/login`)
-            this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
-            this.$updateDictionary()
+            // //this.$i18n.locale = 'zh'
+            // //this.setLanguage('zh')
+            // this.$updateDictionary()
           })
         } else {
           setTimer({
@@ -139,6 +153,7 @@ service.interceptors.response.use(
           setTimer([message, store.state.lang.language === 'en' ? 'Warning' : '警告', {
             type: 'warning',
             showCancelButton: false,
+            confirmButtonText: store.state.lang.language === 'en' ? 'ok' : "确定",
             callback: action => { }
           }], 'confirm')
         }
@@ -149,6 +164,7 @@ service.interceptors.response.use(
         [store.state.lang.language === 'en' ? 'Please check your network，and try again later！' : '请检查网络，稍后重试！', store.state.lang.language === 'en' ? 'Warning' : '警告', {
           type: 'warning',
           showCancelButton: false,
+          confirmButtonText: store.state.lang.language === 'en' ? 'ok' : "确定",
           callback: action => { }
         }], "confirm"
       )
@@ -167,6 +183,8 @@ const setTimer = (obj, type) => {
       Message(obj)
     }
     if (type === 'confirm') {
+      obj[2].closeOnClickModal = false
+      obj[2].closeOnPressEscape = false
       MessageBox.confirm(...obj)
     }
     clearTimeout(timer);

src/utils/stream.js

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

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

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

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

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

src/views/blindResumeInfo/index.vue

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

src/views/blindResumeInfo/info.vue

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

src/views/dashboard/bigdata.vue

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