Merge branch 'main' into uat_us

.env.development

@@ -5,8 +5,7 @@ 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,9 +5,6 @@ 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,8 +3,6 @@ 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,9 +2,6 @@
 ENV = 'prop'
 NODE_ENV = 'prop'
 
-# base public path
-VUE_APP_BASE_PATH = '/'
-
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
 

.env.uat

@@ -4,9 +4,6 @@ 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 = '/'
 

.env.usa

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

.env.usa_prod

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

.env.usa_test

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

.eslintrc.js

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

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

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

babel.config.js

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

package.json

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

src/App.vue

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

src/api/admin.js

@@ -342,11 +342,3 @@ export function addNewUserSendEmail(data) {
     data
   })
 }
-// 用户追溯
-export function getUserJoinedTrialList(data) {
-  return request({
-    url: `/TrialMaintenance/getUserJoinedTrialList`,
-    method: 'post',
-    data
-  })
-}

src/api/dictionary.js

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

src/api/trials.js

@@ -1035,27 +1035,7 @@ 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`,
@@ -1100,19 +1080,6 @@ 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({
@@ -1398,9 +1365,9 @@ export function getForwardList(param) {
   })
 }
 
-export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading = false) {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '') {
   return request({
-    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
+    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}`,
     method: 'get'
   })
 }
@@ -1619,13 +1586,6 @@ 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}`,
@@ -1640,13 +1600,6 @@ export function getTrialDocAndSystemDocType(trialId) {
   })
 }
 
-export function getSysDocSignUserList() {
-  return request({
-    url: `/TrialDocument/getSysDocSignUserList`,
-    method: 'get'
-  })
-}
-
 export function updateSubjectStatus(param) {
   return request({
     url: `/Subject/updateSubjectStatus`,
@@ -3342,13 +3295,6 @@ 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({
@@ -3987,6 +3933,8 @@ export function updateTrialUserRole(data) {
   })
 }
 
+
+
 // 获取报表配置
 export function getTrialQuestionExportResult(data) {
   return request({
@@ -4010,117 +3958,4 @@ export function trialUserSendJoinEmail(data) {
     method: 'post',
     data
   })
-}
-
-// 获取非Dicom标记
-export function getNoneDicomMarkListOutDto(data) {
-  return request({
-    url: `/ReadingImageTask/getNoneDicomMarkListOutDto`,
-    method: 'post',
-    data
-  })
-}
-// 添加非Dicom标记
-export function addNoneDicomMark(data) {
-  return request({
-    url: `/ReadingImageTask/addNoneDicomMark`,
-    method: 'post',
-    data
-  })
-}
-// 删除非Dicom标记
-export function deleteTrialFileType(id) {
-  return request({
-    url: `/ReadingImageTask/deleteTrialFileType/${id}`,
-    method: 'post'
-  })
-}
-
-// 工作台-获取稽查文档
-export function getAuditDocumentData(data) {
-  return request({
-    url: `/AuditDocument/getAuditDocumentData`,
-    method: 'post',
-    data
-  })
-}
-// 工作台-新增稽查文档
-export function addAuditDocument(data) {
-  return request({
-    url: `/AuditDocument/addAuditDocument`,
-    method: 'post',
-    data
-  })
-}
-// 工作台-获取当前目录层级
-export function getBreadcrumbData(data) {
-  return request({
-    url: `/AuditDocument/getBreadcrumbData`,
-    method: 'post',
-    data
-  })
-}
-// 工作台-修改稽查文档
-export function updateAuditDocument(data) {
-  return request({
-    url: `/AuditDocument/updateAuditDocument`,
-    method: 'post',
-    data
-  })
-}
-// 工作台-删除稽查文档
-export function deleteAuditDocument(data) {
-  return request({
-    url: `/AuditDocument/deleteAuditDocument`,
-    method: 'post',
-    data
-  })
-}
-// 工作台-稽查文档获取历史版本
-export function getHistoricalVersion(data) {
-  return request({
-    url: `/AuditDocument/getHistoricalVersion`,
-    method: 'post',
-    data
-  })
-}
-// 工作台-稽查文档设置当前版本
-export function setCurrentVersion(data) {
-  return request({
-    url: `/AuditDocument/setCurrentVersion`,
-    method: 'post',
-    data
-  })
-}
-// 工作台-稽查文档移动
-export function movieFileOrFolder(data) {
-  return request({
-    url: `/AuditDocument/movieFileOrFolder`,
-    method: 'post',
-    data
-  })
-}
-// 工作台-稽查文档复制
-export function copyFileOrFolder(data) {
-  return request({
-    url: `/AuditDocument/copyFileOrFolder`,
-    method: 'post',
-    data
-  })
-}
-// 工作台-稽查文档授权
-export function setIsAuthorization(data) {
-  return request({
-    url: `/AuditDocument/setIsAuthorization`,
-    method: 'post',
-    data
-  })
-}
-// 工作台-稽查文档新增文件夹
-export function addFolder(data) {
-  return request({
-    url: `/AuditDocument/addFolder`,
-    method: 'post',
-    data
-  })
 }

src/api/trials/reading.js

@@ -346,9 +346,9 @@ export function getReReadingOrBackInfluenceTaskList(taskId, isReReading, applyId
   })
 }
 
-export function PMSetTaskBack(trialId, taskId, pmBackReason) {
+export function PMSetTaskBack(trialId, taskId) {
   return request({
-    url: `/VisitTask/PMSetTaskBack/${trialId}/${taskId}/${pmBackReason}`,
+    url: `/VisitTask/PMSetTaskBack/${trialId}/${taskId}`,
     method: 'put'
   })
 }

src/api/trials/setting.js

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

src/api/trials/visit.js

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

src/api/user.js

@@ -209,11 +209,3 @@ export function loginSelectUserRole(params) {
     params,
   })
 }
-// 忽略异地登录
-export function setIsIgnoreUncommonly(data) {
-  return request({
-    url: `/User/setIsIgnoreUncommonly`,
-    method: 'post',
-    data,
-  })
-}

src/components/BaseContainer/index.vue

@@ -4,7 +4,6 @@
       <el-col :span="24">
         <div class="box">
           <div class="box-body">
-            <slot name="title-container" />
             <div class="search">
               <slot name="search-container" />
             </div>
@@ -25,42 +24,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;
+      .mr5{
+        margin-right:5px;
+      }
+      .el-form-item{
+        margin-bottom: 10px;
+      }
     }
-    .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;
     }
   }
-  .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 :inline="true" :label-width="labelWidth">
+    <el-form :size="size" :inline="true" :label-width="labelWidth">
       <el-form-item
         v-for="item in searchForm"
         :key="item.prop"
@@ -146,18 +146,17 @@
         <!-- 具名slot -->
         <slot v-if="item.type === 'Custom'" :name="item.slot" />
       </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-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>
     </el-form>
   </div>
 </template>
@@ -175,11 +174,11 @@ export default {
     },
     labelWidth: {
       type: String,
-      default: '',
+      default: "",
     },
     size: {
       type: String,
-      default: 'mini',
+      default: "mini",
     },
     searchForm: {
       type: Array,
@@ -197,10 +196,10 @@ export default {
   methods: {
     handleClick(emitKey) {
       // emit事件
-      this.$emit(`${emitKey}`)
+      this.$emit(`${emitKey}`);
     },
   },
-}
+};
 </script>
 <style lang="scss">
 .base-search-form {

src/components/BaseTable/index.vue

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

src/components/Dicom/DicomCanvas.vue

@@ -90,7 +90,7 @@
       custom-class="base-dialog-wrapper"
       append-to-body
     >
-      <dicom-tags :image-id="stack.imageIds[stack.currentImageIdIndex]" @close="dcmTag.visible = false" />
+      <DicomTags :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,16 +415,15 @@ 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.getOrientationMarker(e.detail.element)
-      // this.stack.instanceId = instanceId
+      if (this.imageId !== instanceId) {
+        this.getOrientationMarker(e.detail.element)
+        this.imageId = instanceId
+      }
+      this.stack.instanceId = instanceId
       var viewport = e.detail.viewport
       this.dicomInfo.wwwc = `${Math.round(
         viewport.voi.windowWidth

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>-->
-    <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>
+    <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,23 +36,12 @@ export default {
     fileType: {
       type: String,
       required: true
-    },
-    title: {
-      type: String,
-      default: ''
-    },
+    }
   },
   data() {
     return {
       currentUser: zzSessionStorage.getItem('userName'),
-      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}`]
+      COMPANY:process.env.VUE_APP_COMPANY_NAME
     }
   },
   mounted() {
@@ -73,16 +62,14 @@ 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

@@ -1,23 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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

@@ -1,46 +0,0 @@
-<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/TrialsTab/index.vue

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

src/components/clinicalDataQuestions/components/QuestionFormItem.vue

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

src/components/clinicalDataQuestions/components/QuestionTableFormItem.vue

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

src/components/toggleRole/index.vue

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

src/components/uploadDicomAndNonedicom/dicomFile.vue

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

src/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -8,29 +8,65 @@
       </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(3)}MB`
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
                       : ''
                   }}</span>
                 </template>
@@ -38,13 +74,27 @@
               <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>
@@ -59,17 +109,36 @@
         </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(3)}MB`
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
                       : ''
                   }}</span>
                 </template>
@@ -77,13 +146,27 @@
               <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>
@@ -97,34 +180,75 @@
           <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">{{
@@ -132,15 +256,33 @@
         }}</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>
@@ -151,46 +293,82 @@
         </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(3)}MB`
-                : '0MB'
+                ? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
+                : ''
             }}</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.size && scope.row.size > 0 ? ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
-              1
-              : ((scope.row.uploadFileSize * 100) / 1).toFixed(2) *
-              1
-              " />
+            <el-progress
+              color="#409eff"
+              :percentage="
+                ((scope.row.uploadFileSize * 100) / scope.row.size).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>
@@ -198,8 +376,13 @@
         <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>
@@ -405,7 +588,7 @@ export default {
             )
           }
         })
-        .catch(() => { })
+        .catch(() => {})
     },
     resetUploadForm() {
       this.$nextTick(() => {
@@ -531,10 +714,11 @@ 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)
@@ -588,7 +772,7 @@ export default {
           (percentage, checkpoint, lastPer) => {
             item.uploadFileSize += checkpoint.size * (percentage - lastPer)
             if (item.uploadFileSize > file.fileSize) {
-              item.uploadFileSize = file.fileSize > 0 ? file.fileSize : 1
+              item.uploadFileSize = file.fileSize
             }
           }
         )
@@ -685,7 +869,6 @@ export default {
 .top {
   margin: 10px 0;
 }
-
 .upload {
   display: inline-block;
   height: 30px;
@@ -700,7 +883,6 @@ export default {
   background: #428bca;
   border-color: #428bca;
   color: #fff;
-
   .select-file {
     height: 30px;
     width: 90px;
@@ -711,7 +893,6 @@ export default {
     opacity: 0;
     font-size: 0;
   }
-
   .btn-select {
     //给显示在页面上的按钮写样式
     width: 90px;
@@ -727,12 +908,10 @@ 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}.jpg`;
+        let thumbnailPath = `/${dicom.params.TrialId}/TaskImage/${dicom.params.SubjectId}/${dicom.params.VisitTaskId}/${dicom.StudyInstanceUid}/${dicom.SeriesInstanceUid}.png`;
         if (!studyObj[dicom.StudyId]) {
           studyObj[dicom.StudyId] = {
             StudyId: dicom.StudyId,

src/layout/components/Sidebar/index.vue

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

src/layout/components/TagsView/ScrollPane.vue

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

src/layout/index.vue

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

src/main.js

@@ -54,8 +54,6 @@ 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'
@@ -176,7 +174,7 @@ var _vm
 async function VueInit() {
   var params
   var res
-  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct') || ~window.location.href.indexOf('/fusion')) {
+  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct')) {
     params = $q('TrialReadingCriterionId')
     res = await getBasicDataAllSelect(params)
   } else if (~window.location.href.indexOf('/ecrfPreview')) {
@@ -310,11 +308,6 @@ 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;
   }
@@ -468,8 +461,8 @@ async function VueInit() {
             var my_username = zzSessionStorage.getItem('my_username')
             var my_password = zzSessionStorage.getItem('my_password')
             let my_userid = zzSessionStorage.getItem('userId')
-            let my_EMail = zzSessionStorage.getItem('my_EMail') || ''
-            if (md5(_vm.unlock.my_password) === my_password && (my_username === _vm.unlock.my_username || my_EMail.toUpperCase() === vm.unlock.my_username.toUpperCase())) {
+            let my_EMail = zzSessionStorage.getItem('my_EMail')
+            if (md5(_vm.unlock.my_password) === my_password && my_username === _vm.unlock.my_username) {
               resetReadingRestTime().then(() => {
               })
               const closeLock = (_vm) => {

src/permission.js

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

src/router/index.js

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

src/settings.js

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

src/store/getters.js

@@ -48,8 +48,6 @@ const getters = {
   TotalNeedSignSystemDocCount: state => state.user.TotalNeedSignSystemDocCount,
   TotalNeedSignTrialDocCount: state => state.user.TotalNeedSignTrialDocCount,
   IsFirstSysDocNeedSign: state => state.user.IsFirstSysDocNeedSign,
-  TrialStatusStr: state => state.user.TrialStatusStr,
-  lastViewportTaskId: state => state.noneDicomReview.lastViewportTaskId,
-  currentTaskState: state => state.noneDicomReview.currentTaskState
+  TrialStatusStr: state => state.user.TrialStatusStr
 }
 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,8 +27,7 @@ const store = new Vuex.Store({
     trials,
     financials,
     reading,
-    lang,
-    noneDicomReview
+    lang
   },
   getters
 })

src/store/modules/noneDicomReview.js

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

src/store/modules/reading.js

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

src/styles/index.scss

@@ -1,4 +1,4 @@
-@import "./variables.module.scss";
+@import "./variables.scss";
 @import "./mixin.scss";
 @import "./transition.scss";
 @import "./element-ui.scss";
@@ -68,12 +68,6 @@ 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,49 +71,29 @@ $sideBarWidth: 200px;
       border: none;
       height: 100%;
       width: 100% !important;
-      background-color: $menuBg;
     }
 
     // menu hover
     .submenu-title-noDropdown,
     .el-submenu__title {
-      color: $menuText !important;
       &:hover {
         background-color: $menuHover !important;
-        color: $menuActiveText !important;
       }
     }
 
     .is-active>.el-submenu__title {
       color: $subMenuActiveText !important;
     }
-    .el-menu-item {
-      color: $menuText !important;
-    }
-    .el-menu-item:focus, 
-    .el-menu-item:hover {
-      background-color: $subMenuBg !important;
-      color: $menuActiveText !important;
-    }
-    .el-submenu .el-menu-item {
+
+    & .nest-menu .el-submenu>.el-submenu__title,
+    & .el-submenu .el-menu-item {
       min-width: $sideBarWidth !important;
       background-color: $subMenuBg !important;
-      
+
       &:hover {
         background-color: $subMenuHover !important;
-        
       }
     }
-    // &.nest-menu .el-submenu>.el-submenu__title,
-    // &.el-submenu .el-menu-item {
-    //   min-width: $sideBarWidth !important;
-    //   background-color: $subMenuBg !important;
-      
-    //   &:hover {
-    //     background-color: $subMenuHover !important;
-        
-    //   }
-    // }
   }
 
   .hideSidebar {

src/utils/get-page-title.js

@@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'
 
-const title = defaultSettings.title || 'IRC Imaging System'
+const title = defaultSettings.title || 'IRCIS'
 
 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,44 +51,12 @@ 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

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

src/utils/multipartUpload/aws.js

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

src/utils/onlyOffice_type.js

@@ -1,66 +0,0 @@
-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,13 +41,7 @@ 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] = `${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()}`
+                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
                 objectName = objectItem.join('/')
               }
               let res = await OSSclient.put(objectName, object)
@@ -84,13 +78,7 @@ 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] = `${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()}`
+                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
                 data.path = objectItem.join('/')
               }
               let res = await customerHttp(OSSclient, data, progress);
@@ -197,13 +185,7 @@ 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] = `${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()}`
+        objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
         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 * 60) / height
-            canvas.height = 60
+            canvas.width = width;
+            canvas.height = height;
             if (image) {
                 cornerstone.renderToCanvas(canvas, image);
                 // 将 Canvas 图像对象转换为 PNG 格式

src/utils/request.js

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

src/utils/stream.js

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

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

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

src/views/blindResumeInfo/index.vue

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

src/views/blindResumeInfo/info.vue

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,223 +0,0 @@
-<template>
-    <el-form ref="attachmentFrom" v-loading="loading" :model="form" label-width="190px" size="small" :rules="rules"
-        class="upload-temporary-file">
-        <div class="base-dialog-body">
-            <el-form-item :label="$t('dictionary:signature:form:FileName')" prop="Name">
-                <el-input v-model="form.Name" clearable></el-input>
-            </el-form-item>
-            <el-form-item :label="$t('dictionary:signature:form:OffLine')" prop="OffLine">
-                <el-switch v-model="form.OffLine" :active-value="true" :inactive-value="false"
-                    :active-text="$fd('YesOrNo', true)" :inactive-text="$fd('YesOrNo', false)">
-                </el-switch>
-            </el-form-item>
-            <el-form-item :label="$t('dictionary:signature:form:File')">
-                <div class="upload-container">
-                    <el-upload class="upload-demo" action :accept="this.accept.join(',')" :before-upload="beforeUpload"
-                        :http-request="handleUploadFile" :on-preview="handlePreview" :on-remove="handleRemoveFile"
-                        :show-file-list="true" :file-list="fileList" :limit="1" :on-exceed="handleExceed">
-                        <el-button size="small" type="primary" :loading="btnLoading">{{ $t('common:button:check')
-                        }}</el-button>
-                        <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
-                            ({{ $t('trials:signature:label:type').replace("xxx", this.accept.join(", ")) }})
-                        </span>
-                    </el-upload>
-                </div>
-            </el-form-item>
-        </div>
-        <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
-            <el-form-item style="text-align: right">
-                <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || form.Name === ''"
-                    :loading="saveBtnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
-            </el-form-item>
-        </div>
-    </el-form>
-</template>
-<script>
-import { addOrUpdateSystemDocumentAttachment } from '@/api/dictionary'
-export default {
-    props: {
-        data: {
-            type: Object,
-            default() {
-                return {}
-            },
-        },
-        SystemDocumentId: {
-            type: String,
-            default: ''
-        }
-    },
-
-    data() {
-        return {
-            form: {
-                Id: '',
-                Name: null,
-                FileFormat: null,
-                FileName: null,
-                FilePath: null,
-                FileSize: null,
-                OffLine: false,
-                SystemDocumentId: null,
-            },
-            rules: {
-                Name: [
-                    {
-                        required: true,
-                        message: this.$t('common:ruleMessage:specify'),
-                        trigger: ['change'],
-                    },
-                ],
-            },
-            fileList: [],
-            btnLoading: false,
-            saveBtnLoading: false,
-            loading: false,
-            accept: ['.jpg',
-                '.jpeg',
-                '.png',
-                '.pdf',
-                '.ppt',
-                '.pptx',
-                '.doc',
-                '.docx',
-                '.xls',
-                '.xlsx']
-        }
-    },
-    mounted() {
-        this.initForm()
-    },
-    methods: {
-        async initForm() {
-            this.loading = true
-            if (this.data && this.data.Id) {
-                Object.keys(this.form).forEach(key => {
-                    this.form[key] = this.data[key]
-                })
-                this.fileList = [
-                    {
-                        name: this.data.FileName,
-                        url: this.data.FilePath,
-                        path: this.data.FilePath,
-                    },
-                ]
-            }
-            this.loading = false
-        },
-        beforeUpload(file) {
-            // 检测文件类型是否符合要求
-            if (this.checkFileSuffix(file.name)) {
-                this.fileList = []
-                return true
-            } else {
-                this.$alert(this.$t('trials:signature:label:type').replace("xxx", this.accept.join(", ")))
-
-                return false
-            }
-        },
-        async handleUploadFile(param) {
-            this.loading = true
-            var file = await this.fileToBlob(param.file)
-            const res = await this.OSSclient.put(
-                `/System/DocumentToSign/${param.file.name}${new Date().getTime()}`,
-                file
-            )
-            this.fileList.push({
-                name: param.file.name,
-                path: this.$getObjectName(res.url),
-                url: this.$getObjectName(res.url),
-            })
-            this.form.Name = param.file.name
-            this.form.FileName = param.file.name
-            this.form.FilePath = this.$getObjectName(res.url)
-            this.form.FileSize = param.file.size
-            this.form.FileFormat = param.file.name
-                .substring(param.file.name.lastIndexOf('.'))
-                .toLocaleLowerCase().split('.')[1]
-            this.loading = false
-        },
-        handleSave() {
-            this.$refs.attachmentFrom.validate((valid) => {
-                if (!valid) return false
-                if (!this.form.FilePath)
-                    return this.$alert(this.$t('trials:signature:message:selectFile'))
-                this.saveBtnLoading = true
-                if (this.SystemDocumentId) this.form.SystemDocumentId = this.SystemDocumentId
-                addOrUpdateSystemDocumentAttachment(this.form)
-                    .then((res) => {
-                        this.saveBtnLoading = false
-                        this.$emit('closeDialog')
-                        this.$emit('getList')
-                        this.$message.success(this.$t('common:message:updatedSuccessfully'))
-                    })
-                    .catch(() => {
-                        this.saveBtnLoading = false
-                    })
-            })
-        },
-        handleRemoveFile() {
-            this.fileList = []
-            this.form.FilePath = ''
-            this.form.FileSize = ''
-            this.form.FileFormat = ''
-            this.form.FileName = ''
-        },
-        handlePreview(file) {
-            if (file.fullPath) {
-                window.open(file.fullPath, '_blank')
-            }
-        },
-        handleExceed(files, fileList) {
-            this.$message.warning(this.$t('upload:rule:maxFile1'))
-        },
-        checkFileSuffix(fileName) {
-            var typeArr = [
-                'jpg',
-                'jpeg',
-                'png',
-                'pdf',
-                'ppt',
-                'pptx',
-                'doc',
-                'docx',
-                'xls',
-                'xlsx',
-            ]
-            var extendName = fileName
-                .substring(fileName.lastIndexOf('.') + 1)
-                .toLocaleLowerCase()
-            if (typeArr.indexOf(extendName) !== -1) {
-                return true
-            } else {
-                return false
-            }
-        },
-    },
-}
-</script>
-
-<style lang="scss">
-.upload-temporary-file {
-    .upload-container .el-upload--text {
-        border: none;
-        width: 80px;
-        height: 40px;
-    }
-
-    .upload-container .el-input--small {
-        margin-bottom: 5px;
-    }
-
-    .upload-container .el-icon-circle-check {
-        color: #428bca;
-        font-size: 13px;
-    }
-
-    .account_item_clear {
-        .el-tag__close {
-            display: none !important;
-        }
-    }
-}
-</style>

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

@@ -1,258 +0,0 @@
-<template>
-    <div v-if="config.visible">
-        <base-model :config="config">
-            <template slot="dialog-body">
-                <el-form ref="form" :model="rowData" label-width="80px" style="width: 80%;display: inline-block;">
-                    <el-form-item :label="`${$t('dictionary:signature:table:Name')}: `">
-                        <span class="name text-ellipsis" :title="rowData.Name">{{ rowData.Name }}</span>
-                    </el-form-item>
-                </el-form>
-                <el-button size="mini" type="primary" style="float:right" @click.stop="edit({})" v-if="!isView">
-                    {{ $t('common:button:add') }}</el-button>
-                <el-table :data="list" style="width: 100%" max-height="300px" v-loading="loading"
-                    @sort-change="handleSortByColumn">
-                    <el-table-column type="index" width="60" />
-                    <el-table-column prop="Name" :label="$t('dictionary:signature:attachmentList:FileName')"
-                        sortable="custom" />
-                    <el-table-column prop="OffLine" :label="$t('dictionary:signature:attachmentList:OffLine')"
-                        sortable="custom" v-if="!isView">
-                        <template slot-scope="scope">
-                            <el-switch v-model="scope.row.OffLine" @change="(val) => OffLine(scope.row, val)"
-                                :active-value="true" :inactive-value="false" :active-text="$fd('YesOrNo', true)"
-                                :inactive-text="$fd('YesOrNo', false)">
-                            </el-switch>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="CreateTime" :label="$t('dictionary:signature:attachmentList:CreateTime')"
-                        sortable="custom" />
-                    <el-table-column :label="$t('common:action:action')" min-width="120px">
-                        <template slot-scope="scope">
-                            <el-button size="mini" type="text" @click.stop="preview(scope.row)">
-                                {{ $t('common:button:preview') }}
-                            </el-button>
-                            <el-button size="mini" type="text" @click.stop="edit(scope.row)" v-if="!isView">
-                                {{ $t('common:button:edit') }}
-                            </el-button>
-                            <!-- <el-button size="mini" type="text" @click.stop="OffLine(scope.row, true)"
-                                :disabled="scope.row.OffLine">
-                                {{ $t('dictionary:signature:attachmentList:OffLine') }}
-                            </el-button> -->
-                            <el-button size="mini" type="text" @click.stop="del(scope.row)" v-if="!isView">
-                                {{ $t('common:button:delete') }}
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <!-- 新增/编辑附件 -->
-                <el-dialog :visible.sync="visible" :close-on-click-modal="false" :append-to-body="true" :title="title"
-                    width="800px" custom-class="base-dialog-wrapper">
-                    <attachmentForm v-if="visible" :data="rowData" :SystemDocumentId="SystemDocumentId"
-                        @closeDialog="closeDialog" @getList="getAllList" />
-                </el-dialog>
-            </template>
-        </base-model>
-        <viewer ref="picture_perview2" style="margin: 0 10px"
-            v-if="rowData.FileFormat && ['png', 'jpg', 'jpeg'].includes(rowData.FileFormat.toLowerCase())"
-            :images="[`${OSSclientConfig.basePath}${rowData.FilePath}`]" :options="viewerOptions">
-
-            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowData.FilePath}`" alt="Image" />
-        </viewer>
-        <!-- <attachmentPreview :SystemDocumentId="SystemDocumentId" :visible.sync="perview_visible"
-            v-if="perview_visible" /> -->
-    </div>
-</template>
-<script>
-import BaseModel from '@/components/BaseModel'
-import attachmentForm from './attachmentForm'
-// import attachmentPreview from './attachmentPreview'
-import { addOrUpdateSystemDocumentAttachment, getSystemDocumentAttachmentList, deleteSystemDocumentAttachment } from '@/api/dictionary'
-const defaultSearchData = () => {
-    return {
-        PageIndex: 1,
-        PageSize: 1000,
-        Asc: false,
-        OffLine: null,
-        SortField: null
-    }
-}
-export default {
-    components: {
-        BaseModel,
-        attachmentForm,
-        //  attachmentPreview 
-    },
-    props: {
-        config: {
-            type: Object,
-            default: () => {
-                return {
-                    visible: false,
-                    title: this.$t('dictionary:signature:attachmentList:title'),
-                    width: '800px',
-                }
-            }
-        },
-        isView: {
-            type: Boolean,
-            default: false
-        },
-        rowData: {
-            type: Object,
-            default: () => {
-                return {}
-            }
-        },
-        SystemDocumentId: {
-            type: String,
-            default: ''
-        }
-    },
-    data() {
-        return {
-            searchData: defaultSearchData(),
-            visible: false,
-            title: null,
-            list: [],
-            rowData: {},
-            loading: false,
-            viewerOptions: {
-                toolbar: {
-                    zoomIn: true,
-                    zoomOut: true,
-                    reset: true,
-                    prev: false,
-                    next: false,
-                    rotateLeft: true,
-                    rotateRight: true,
-                    flipHorizontal: true,
-                    flipVertical: true,
-                }
-            },
-            // perview_visible: false
-        }
-    },
-    watch: {
-        SystemDocumentId: {
-            handler() {
-                this.getList()
-            },
-            immediate: true,
-        }
-    },
-    methods: {
-        closeDialog() {
-            this.visible = false
-        },
-        getAllList() {
-            this.getList()
-            this.$emit("getList")
-        },
-        async del(row) {
-            try {
-                let confirm = await this.$confirm(this.$t("dictionary:signature:attachmentList:message:del"))
-                if (!confirm) return false
-                this.loading = true
-                let res = await deleteSystemDocumentAttachment(row.Id)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.getAllList()
-                }
-            } catch (err) {
-                console.log(err)
-                this.loading = false
-            }
-        },
-        edit(row) {
-            this.title = this.$t('dictionary:signature:attachmentForm:title:update')
-            if (!row.Id) {
-                this.title = this.$t('dictionary:signature:attachmentForm:title:add')
-            }
-            this.rowData = Object.assign({}, row)
-            this.visible = true
-        },
-        async getList() {
-            try {
-                if (!this.SystemDocumentId) return false
-                this.loading = true
-                this.searchData.SystemDocumentId = this.SystemDocumentId
-                if (this.isView) {
-                    this.searchData.OffLine = false
-                }
-                let res = await getSystemDocumentAttachmentList(this.searchData)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.list = res.Result.CurrentPageData
-                }
-            } catch (err) {
-                this.loading = false
-                console.log(err)
-            }
-        },
-        async OffLine(row, val) {
-            try {
-                let data = Object.assign({}, row)
-                data.OffLine = val
-                this.loading = true
-                let res = await addOrUpdateSystemDocumentAttachment(data)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.$t('dictionary:signature:attachmentList:updateSuccessfully')
-                    this.getList()
-                }
-            } catch (err) {
-                this.loading = false
-                row.OffLine = !row.OffLine
-                console.log(err)
-            }
-        },
-        preview(data) {
-            // return this.perview_visible = true
-            this.rowData = Object.assign({}, data)
-            if (['.ppt',
-                '.pptx',
-                '.doc',
-                '.docx',
-                '.xls',
-                '.xlsx'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$onlyOffice({
-                    path: data.FilePath,
-                    type: data.FileFormat,
-                    title: data.Name
-                })
-            }
-            if (['.jpg',
-                '.jpeg',
-                '.png'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$nextTick(() => {
-                    this.$refs['picture_perview2'].$viewer.show()
-                })
-            }
-            if (['.pdf'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$preview({
-                    path: data.Path || data.FilePath,
-                    type: 'pdf',
-                    title: data.Name,
-                })
-            }
-        },
-        // 排序
-        handleSortByColumn(column) {
-            if (column.order === 'ascending') {
-                this.searchData.Asc = true
-            } else {
-                this.searchData.Asc = false
-            }
-            this.searchData.SortField = column.prop
-            this.searchData.PageIndex = 1
-            this.getList()
-        },
-    }
-
-}
-</script>
-<style lang="scss" scoped>
-.name {
-    display: block;
-    width: 90%;
-}
-</style>

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

@@ -1,312 +0,0 @@
-<template>
-    <el-dialog :visible.sync="visible" :title="title" :fullscreen="true" append-to-body
-        custom-class="base-dialog-wrapper" :before-close="handleClose">
-        <div v-loading="loading" class="img-container" v-if="visible">
-            <el-card class="box-card left">
-                <div class="title">
-                    {{ $t('dictionary:signature:fileList') }}
-                </div>
-                <div class="left-content">
-                    <!-- 检查层级 -->
-                    <div id="imgList" style="height: 100%; overflow: hidden">
-                        <template v-for="(item, index) in list">
-                            <div :id="`img${item.Id}`" :key="item.Id" :class="{
-                                'is-boxActive': item.Id === rowData.Id,
-                            }" class="img-box" @click="selected(item)">
-                                <div class="file-image">
-                                    <el-image v-if="
-                                        [
-                                            'jpeg',
-                                            'jpg',
-                                            'png',
-                                        ].includes(item.FileFormat)
-                                    " style="width: 100%; height: 100%"
-                                        :src="`${OSSclientConfig.basePath}${item.FilePath}?x-oss-process=image/resize,w_50,h_50/format,png`"
-                                        fit="contain" crossorigin="anonymous" />
-                                    <el-image v-else style="width: 100%; height: 100%" :src="getsrc(item.FileFormat)"
-                                        fit="contain" crossorigin="anonymous" />
-                                </div>
-                                <div v-if="item.Name.length < 15" class="img-text">
-                                    {{ `${index + 1}. ${item.Name}` }}
-                                </div>
-                                <el-tooltip v-else :content="item.Name" placement="bottom">
-                                    <div class="img-text">
-                                        {{ `${index + 1}. ${item.Name}` }}
-                                    </div>
-                                </el-tooltip>
-                            </div>
-                        </template>
-                    </div>
-                </div>
-            </el-card>
-            <!-- 预览图像 -->
-            <el-card class="box-card right">
-                <div style="width: 100%; height: 100%" v-if="[
-                    'jpeg',
-                    'jpg',
-                    'png',
-                ].includes(rowData.FileFormat)">
-                    <imageViewer :rowData="rowData" />
-                </div>
-                <div style="width: 100%; height: 100%" v-else>
-                    <PreviewFile v-if='rowData.FilePath' :file-path="rowData.FilePath" :file-type="rowData.FileFormat"
-                        :title="rowData.Name" />
-                </div>
-            </el-card>
-
-            <!-- <el-card class="box-card" style="width:300px;height:100%;padding: 10px;margin-left:10px;">
-        <CheckForm />
-      </el-card> -->
-        </div>
-    </el-dialog>
-</template>
-
-<script>
-import pdf from '@/assets/file_icon/pdf.png'
-import zip from '@/assets/file_icon/zip.png'
-import doc from '@/assets/file_icon/doc.png'
-import docx from '@/assets/file_icon/docx.png'
-import ppt from '@/assets/file_icon/ppt.png'
-import pptx from '@/assets/file_icon/pptx.png'
-import xls from '@/assets/file_icon/xls.png'
-import xlsx from '@/assets/file_icon/xlsx.png'
-import PreviewFile from '@/components/PreviewFile'
-import imageViewer from './image-viewer'
-import { getSystemDocumentAttachmentList } from '@/api/dictionary'
-const defaultSearchData = () => {
-    return {
-        PageIndex: 1,
-        PageSize: 1000,
-        Asc: false,
-        OffLine: null,
-        SortField: null
-    }
-}
-export default {
-    name: 'Notice',
-    components: {
-        PreviewFile,
-        imageViewer
-    },
-    props: {
-        SystemDocumentId: {
-            type: String,
-            default: ''
-        },
-        visible: {
-            type: Boolean,
-            default: false
-        },
-        isView: {
-            type: Boolean,
-            default: false
-        }
-    },
-    data() {
-        return {
-            pdf,
-            zip,
-            doc,
-            docx,
-            ppt,
-            pptx,
-            xls,
-            xlsx,
-            rowData: {},
-            list: [],
-            searchData: defaultSearchData(),
-            title: this.$t('dictionary:signature:fileList')
-        }
-    },
-    watch: {
-        SystemDocumentId: {
-            handler() {
-                this.getList()
-            },
-            immediate: true,
-        }
-    },
-    methods: {
-        getsrc(type) {
-            return this[type.toLowerCase()]
-        },
-        selected(row) {
-            this.rowData = row
-        },
-        handleClose() {
-            this.$emit("update:visible", false)
-        },
-        async getList() {
-            try {
-                if (!this.SystemDocumentId) return false
-                this.loading = true
-                this.searchData.SystemDocumentId = this.SystemDocumentId
-                if (this.isView) {
-                    this.searchData.OffLine = false
-                }
-                let res = await getSystemDocumentAttachmentList(this.searchData)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.list = res.Result.CurrentPageData
-                    this.rowData = this.list[0] || {}
-                }
-            } catch (err) {
-                this.loading = false
-                console.log(err)
-            }
-        },
-    },
-}
-</script>
-
-<style lang="scss" scoped>
-.img-container {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    padding: 10px;
-    display: flex;
-
-    ::-webkit-scrollbar {
-        width: 7px;
-        height: 7px;
-    }
-
-    ::-webkit-scrollbar-thumb {
-        border-radius: 10px;
-        background: #d0d0d0;
-    }
-
-    ::v-deep .el-card__body {
-        padding: 0px;
-    }
-}
-
-.study-desc {
-    padding: 10px 5px;
-    line-height: 20px;
-    background-color: #d5d5d5;
-    font-weight: 500;
-}
-
-.left {
-    width: 220px;
-    height: 100%;
-
-    ::v-deep .el-card__body {
-        height: 100%;
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-    }
-
-    .title {
-        height: 40px;
-        line-height: 40px;
-        border: 1ppx solid;
-        border: 1px solid #ebe7e7;
-        padding-left: 10px;
-        background-color: #4e4e4e;
-        color: #ffffff;
-    }
-
-    .left-content {
-        flex: 1;
-        overflow-y: auto;
-    }
-
-    // ::v-deep .el-tabs{
-    //   height: 100%;
-    // }
-    // ::v-deep .el-tabs__header{
-    //   height: 40px;
-    // }
-    // ::v-deep .el-tabs__content{
-    //   flex: 1;
-    //   overflow-y: auto;
-    //   padding: 0;
-    // }
-    .img-box {
-        // position: relative;
-        display: inline-block;
-        box-sizing: border-box;
-        border-bottom: 2px solid #f3f3f3;
-        display: flex;
-        align-items: center;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-        padding: 5px 10px;
-
-        cursor: pointer;
-        // margin-bottom: 5px;
-        padding-left: 5px;
-    }
-
-    .img-text {
-        display: inline-block;
-        width: calc(100% - 60px);
-        margin-left: 5px;
-        height: 50px;
-        line-height: 50px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        /* 用省略号表示溢出的文本 */
-        white-space: nowrap;
-    }
-
-    .img-box:nth-last-child(1) {
-        margin-bottom: 0px;
-    }
-
-    .is-boxActive {
-        // border-color: #409eff;
-        color: #409eff;
-    }
-
-    .is-boxActiv:after {
-        opacity: 0;
-    }
-}
-
-.right {
-    flex: 1;
-    height: 100%;
-    margin-left: 10px;
-
-    ::v-deep .el-card__body {
-        height: 100%;
-        width: 100%;
-    }
-}
-
-.switchBox {
-    width: 100%;
-    margin: 5px 0;
-    color: #4e4e4e;
-
-    .item {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        margin-bottom: 5px;
-    }
-}
-
-.file-image {
-    width: 50px;
-    height: 50px;
-}
-
-::v-deep .el-collapse-item__header {
-    background-color: #d5d5d5;
-}
-
-::v-deep .el-collapse-item__header {
-    min-height: 48px;
-    height: auto;
-}
-
-::v-deep .el-collapse-item__content {
-    padding-bottom: 0;
-}
-</style>

src/views/dictionary/attachment/components/SignatureTemplate/image-viewer.vue

@@ -1,381 +0,0 @@
-/* eslint-disable no-unused-vars */
-<template>
-  <div style="width: 100%; height: 100%">
-    <transition name="viewer-fade">
-      <div ref="image-viewer__wrapper" tabindex="-1" class="image-viewer__wrapper" :style="{ 'z-index': 5 }">
-        <!-- Arrow -->
-        <!-- 工具栏 -->
-        <div class="image-viewer__btn image-viewer__actions">
-          <div class="image-viewer__actions__inner">
-            <i class="el-icon-zoom-out" @click="handleActions('zoomOut')" />
-            <i class="el-icon-zoom-in" @click="handleActions('zoomIn')" />
-            <i class="el-image-viewer__actions__divider" />
-            <i class="el-icon-c-scale-to-original" @click="toggleMode" />
-            <i class="el-image-viewer__actions__divider" />
-            <i class="el-icon-refresh-left" @click="handleActions('anticlocelise')" />
-            <i class="el-icon-refresh-right" @click="handleActions('clocelise')" />
-          </div>
-        </div>
-        <!-- 图片 -->
-        <div id="image-viewer__canvas" class="image-viewer__canvas">
-          <img  crossorigin="anonymous" :src="`${OSSclientConfig.basePath}${rowData.FilePath}`
-            " :style="imgStyle" style="max-width: 100%; max-height: 100%" @load="handleImgLoad" @error="handleImgError"
-            @mousedown="handleMouseDown" />
-        </div>
-      </div>
-    </transition>
-  </div>
-</template>
-
-<script>
-import { on, off } from 'element-ui/src/utils/dom'
-import { rafThrottle, isFirefox } from 'element-ui/src/utils/util'
-
-const mousewheelEventName = isFirefox() ? 'DOMMouseScroll' : 'mousewheel'
-
-export default {
-  name: 'ImageViewer',
-  props: {
-    onSwitch: {
-      type: Function,
-      default: () => { },
-    },
-    onClose: {
-      type: Function,
-      default: () => { },
-    },
-    rowData:{
-      type: Object,
-      default: () => {
-        return {}
-       },
-    }
-  },
-
-  data() {
-    return {
-      loading: false,
-      transform: {
-        scale: 1,
-        deg: 0,
-        offsetX: 0,
-        offsetY: 0,
-        enableTransition: false,
-      },
-    }
-  },
-  computed: {
-    imgStyle() {
-      const { scale, deg, offsetX, offsetY, enableTransition } = this.transform
-      const style = {
-        transform: `scale(${scale}) rotate(${deg}deg)`,
-        transition: enableTransition ? 'transform .3s' : '',
-        'margin-left': `${offsetX}px`,
-        'margin-top': `${offsetY}px`,
-      }
-      return style
-    },
-  },
-  mounted() {
-    document.getElementById('image-viewer__canvas').onmousewheel = (event) => {
-      if (event.deltaY > 0) {
-        // 缩小
-        this.handleActions('zoomOut', {
-          zoomRate: 0.015,
-          enableTransition: false,
-        })
-      } else {
-        // 放大
-        this.handleActions('zoomIn', {
-          zoomRate: 0.015,
-          enableTransition: false,
-        })
-      }
-      return false
-    }
-    this.deviceSupportInstall()
-  },
-  methods: {
-    hide() {
-      this.deviceSupportUninstall()
-      this.onClose()
-    },
-    deviceSupportInstall() {
-      this._keyDownHandler = (e) => {
-        e.stopPropagation()
-        const keyCode = e.keyCode
-        switch (keyCode) {
-          // ESC
-          case 27:
-            this.hide()
-            break
-          // SPACE
-          case 32:
-            this.toggleMode()
-            break
-          // LEFT_ARROW
-          case 37:
-            this.prev()
-            break
-          // UP_ARROW
-          case 38:
-            this.handleActions('zoomIn')
-            break
-          // RIGHT_ARROW
-          case 39:
-            this.next()
-            break
-          // DOWN_ARROW
-          case 40:
-            this.handleActions('zoomOut')
-            break
-        }
-      }
-      this._mouseWheelHandler = rafThrottle((e) => {
-        const delta = e.wheelDelta ? e.wheelDelta : -e.detail
-        if (delta > 0) {
-          this.handleActions('zoomIn', {
-            zoomRate: 0.015,
-            enableTransition: false,
-          })
-        } else {
-          this.handleActions('zoomOut', {
-            zoomRate: 0.015,
-            enableTransition: false,
-          })
-        }
-      })
-      on(document, 'keydown', this._keyDownHandler)
-
-      on(document, mousewheelEventName, null)
-      // on(document, mousewheelEventName, this._mouseWheelHandler)
-    },
-    deviceSupportUninstall() {
-      off(document, 'keydown', this._keyDownHandler)
-      off(document, mousewheelEventName, this._mouseWheelHandler)
-      this._keyDownHandler = null
-      this._mouseWheelHandler = null
-    },
-    handleImgLoad(e) {
-      this.loading = false
-    },
-    handleImgError(e) {
-      this.loading = false
-      e.target.alt = '加载失败'
-    },
-    handleMouseDown(e) {
-      if (this.loading || e.button !== 0) return
-
-      const { offsetX, offsetY } = this.transform
-      const startX = e.pageX
-      const startY = e.pageY
-      this._dragHandler = rafThrottle((ev) => {
-        this.transform.offsetX = offsetX + ev.pageX - startX
-        this.transform.offsetY = offsetY + ev.pageY - startY
-      })
-      on(document, 'mousemove', this._dragHandler)
-      on(document, 'mouseup', (ev) => {
-        off(document, 'mousemove', this._dragHandler)
-      })
-
-      e.preventDefault()
-    },
-    reset() {
-      this.transform = {
-        scale: 1,
-        deg: 0,
-        offsetX: 0,
-        offsetY: 0,
-        enableTransition: false,
-      }
-    },
-    toggleMode() {
-      if (this.loading) return
-      this.reset()
-    },
-    handleActions(action, options = {}) {
-      if (this.loading) return
-      const { zoomRate, rotateDeg, enableTransition } = {
-        zoomRate: 0.2,
-        rotateDeg: 90,
-        enableTransition: true,
-        ...options,
-      }
-      const { transform } = this
-      switch (action) {
-        case 'zoomOut':
-          if (transform.scale > 0.2) {
-            transform.scale = parseFloat(
-              (transform.scale - zoomRate).toFixed(3)
-            )
-          }
-          break
-        case 'zoomIn':
-          if (transform.scale < 5) {
-            transform.scale = parseFloat(
-              (transform.scale + zoomRate).toFixed(3)
-            )
-          }
-          break
-        case 'clocelise':
-          transform.deg += rotateDeg
-          break
-        case 'anticlocelise':
-          transform.deg -= rotateDeg
-          break
-      }
-      transform.enableTransition = enableTransition
-    },
-  },
-}
-</script>
-<style lang="scss" scoped>
-.image-viewer__wrapper {
-  position: relative;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-}
-
-.image-viewer__btn {
-  position: absolute;
-  z-index: 1;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 50%;
-  opacity: 0.8;
-  cursor: pointer;
-  box-sizing: border-box;
-  user-select: none;
-}
-
-.image-viewer__close {
-  display: none;
-  top: 40px;
-  right: 40px;
-  width: 40px;
-  height: 40px;
-  font-size: 40px;
-}
-
-.image-viewer_desc {
-  position: absolute;
-  top: 40px;
-  left: 40px;
-  font-size: 15px;
-  padding: 5px;
-  height: 30px;
-  width: 70px;
-  line-height: 20px;
-  text-align: center;
-  color: #fff;
-  background-color: #606266;
-  border-color: #fff;
-  z-index: 1;
-  border-radius: 17px;
-  // border-radius: 2%;
-}
-
-.image-viewer__canvas {
-  position: absolute;
-  top: 50%;
-  transform: translateY(-50%);
-  width: 100%;
-  height: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.image-viewer__actions {
-  left: 50%;
-  bottom: 30px;
-  transform: translateX(-50%);
-  width: 282px;
-  height: 44px;
-  padding: 0 23px;
-  background-color: #606266;
-  border-color: #fff;
-  border-radius: 22px;
-}
-
-.image-viewer__actions__inner {
-  width: 100%;
-  height: 100%;
-  text-align: justify;
-  cursor: default;
-  font-size: 23px;
-  color: #fff;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-}
-
-.image-viewer__next,
-.image-viewer__prev {
-  top: 50%;
-  width: 44px;
-  height: 44px;
-  font-size: 24px;
-  color: #fff;
-  background-color: #606266;
-  border-color: #fff;
-}
-
-.image-viewer__prev {
-  transform: translateY(-50%);
-  left: 40px;
-}
-
-.image-viewer__next {
-  transform: translateY(-50%);
-  right: 40px;
-  text-indent: 2px;
-}
-
-.image-viewer__mask {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  opacity: 0.5;
-  // background:#000
-}
-
-.viewer-fade-enter-active {
-  animation: viewer-fade-in 0.3s;
-}
-
-.viewer-fade-leave-active {
-  animation: viewer-fade-out 0.3s;
-}
-
-@keyframes viewer-fade-in {
-  0% {
-    transform: translate3d(0, -20px, 0);
-    opacity: 0;
-  }
-
-  100% {
-    transform: translate3d(0, 0, 0);
-    opacity: 1;
-  }
-}
-
-@keyframes viewer-fade-out {
-  0% {
-    transform: translate3d(0, 0, 0);
-    opacity: 1;
-  }
-
-  100% {
-    transform: translate3d(0, -20px, 0);
-    opacity: 0;
-  }
-}
-</style>

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

@@ -1,103 +1,81 @@
 <template>
   <BaseContainer>
-    <template slot="title-container">
-      <el-row v-if="isSystem" style="width: 100%;">
-        <el-col :span="12">
-          <h3>{{ TITLE }}</h3>
-        </el-col>
-        <el-col :span="12" style="text-align:right;">
-          <h3>
-            <Pagination class="page" :total="total" :page.sync="searchData.pageIndex" :limit.sync="searchData.pageSize"
-              layout="total, sizes, prev, pager, next" :background="false" style="display: inline-block;"
-              @pagination="getList" />
-            <el-button icon="el-icon-refresh-left" size="small" circle :title="$t('common:button:reset')"
-              @click="handleReset" />
-          </h3>
-        </el-col>
-      </el-row>
-    </template>
     <template slot="search-container">
       <el-form :inline="true" size="small">
         <el-form-item :label="$t('dictionary:signature:search:FileTypeId')">
-          <el-select v-model="searchData.FileTypeId" style="width: 150px" clearable>
-            <el-option v-for="item of $d.Sys_Document" :key="item.id" :label="item.label" :value="item.id" />
+          <el-select v-model="searchData.FileTypeId" style="width: 150px">
+            <el-option
+              v-for="item of dict.type.Sys_Document"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('dictionary:signature:search:Name')">
           <el-input v-model="searchData.Name" style="width: 130px" clearable />
         </el-form-item>
-        <el-form-item :label="$t('dictionary:signature:table:NeedConfirmedUserTypes')">
-          <el-select v-model="searchData.UserTypeId" style="width: 150px" clearable>
-            <el-option v-for="item of userTypeOptions" :key="item.Id" :label="item.UserTypeShortName"
-              :value="item.Id" />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('dictionary:signature:table:IsDeleted')">
-          <el-select v-model="searchData.IsDeleted" style="width: 150px" clearable>
-            <el-option v-for="item of $d.TrainingStatus" :key="item.id" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('dictionary:signature:table:DocUserSignType')">
-          <el-select v-model="searchData.DocUserSignType" style="width: 150px" clearable>
-            <el-option v-for="item of $d.ReadingYesOrNo" :key="item.id" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('dictionary:signature:table:createTime')">
-          <el-date-picker v-model="timeList" @change="changeTimeList" value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '23:59:59']" type="datetimerange">
-          </el-date-picker>
-        </el-form-item>
+
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
             {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
             {{ $t('common:button:reset') }}
           </el-button>
-          <el-button type="primary" size="small" @click="handleAdd">
-            {{ $t('common:button:new') }}
-          </el-button>
-          <el-button type="primary" size="small" :disabled="multipleSelection.length <= 0"
-            @click="publishSystemDocument(multipleSelection)">
-            {{ $t('dictionary:signature:button:publish') }}
-          </el-button>
-          <el-button type="primary" size="small" :disabled="multipleSelection.length <= 0"
-            @click="handleRepeal(multipleSelection)">
-            {{ $t('common:button:revoke') }}
-          </el-button>
         </el-form-item>
       </el-form>
-
+      <el-button
+        type="primary"
+        icon="el-icon-plus"
+        style="margin-left: auto; margin-bottom: 10px"
+        size="small"
+        @click="handleAdd"
+      >
+        {{ $t('common:button:new') }}
+      </el-button>
     </template>
     <template slot="main-container">
-      <el-table v-adaptive="{ bottomOffset: 60 }" v-loading="loading" :data="list" stripe height="100"
-        @sort-change="handleSortByColumn" @selection-change="handleSelectionChange">
-        <!-- <el-table-column type="index" width="40" /> -->
-        <el-table-column type="selection" width="55" :selectable="handleSelectable">
-        </el-table-column>
-        <el-table-column prop="FileType" :label="$t('dictionary:signature:table:FileType')" show-overflow-tooltip
-          sortable="custom" min-width="120px" />
-        <el-table-column prop="Name" :label="$t('dictionary:signature:table:Name')" show-overflow-tooltip
-          sortable="custom" min-width="120px" />
-        <el-table-column prop="AttachmentCount" :label="$t('dictionary:signature:table:AttachmentCount')"
-          show-overflow-tooltip sortable="custom" min-width="150px">
-          <template slot-scope="scope">
-            <el-button type="text" @click.stop="openAttachment(scope.row, true)">
-              {{ scope.row.AttachmentCount }}
-              <i class="el-icon-upload2" />
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column prop="SignViewMinimumMinutes" :label="$t('dictionary:signature:table:SignViewMinimumMinutes')"
-          show-overflow-tooltip sortable="custom" min-width="200px" />
-        <el-table-column prop="CurrentStaffTrainDays" :label="$t('dictionary:signature:table:CurrentStaffTrainDays')"
-          show-overflow-tooltip sortable="custom" min-width="200px" />
-        <el-table-column prop="NewStaffTrainDays" :label="$t('dictionary:signature:table:NewStaffTrainDays')"
-          show-overflow-tooltip sortable="custom" min-width="200px" />
-        <el-table-column prop="NeedConfirmedUserTypes" :label="$t('dictionary:signature:table:NeedConfirmedUserTypes')"
-          show-overflow-tooltip>
+      <el-table
+        v-adaptive="{ bottomOffset: 60 }"
+        v-loading="loading"
+        :data="list"
+        stripe
+        height="100"
+        @sort-change="handleSortByColumn"
+      >
+        <el-table-column type="index" width="40" />
+        <el-table-column
+          prop="FileType"
+          :label="$t('dictionary:signature:table:FileType')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <el-table-column
+          prop="Name"
+          :label="$t('dictionary:signature:table:Name')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+
+        <el-table-column
+          prop="SignViewMinimumMinutes"
+          :label="$t('dictionary:signature:table:SignViewMinimumMinutes')"
+          show-overflow-tooltip
+          sortable="custom"
+          min-width="110"
+        />
+        <el-table-column
+          prop="NeedConfirmedUserTypes"
+          :label="$t('dictionary:signature:table:NeedConfirmedUserTypes')"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             {{
               scope.row.NeedConfirmedUserTypes
@@ -106,8 +84,12 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column prop="IsDeleted" :label="$t('dictionary:signature:table:IsDeleted')" show-overflow-tooltip
-          sortable="custom" min-width="120px">
+        <el-table-column
+          prop="IsDeleted"
+          :label="$t('dictionary:signature:table:IsDeleted')"
+          show-overflow-tooltip
+          sortable="custom"
+        >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsDeleted" type="danger">{{
               $fd('TrainingStatus', scope.row.IsDeleted)
@@ -117,89 +99,103 @@
             }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="IsPublish" :label="$t('dictionary:signature:table:IsPublish')" show-overflow-tooltip
-          sortable="custom" min-width="120px">
-          <template slot-scope="scope">
-            <el-tag :type="scope.row.IsPublish ? 'primary' : 'danger'">{{
-              $fd('AttachmentPublishStatus', scope.row.IsPublish)
-            }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="DocUserSignType" :label="$t('dictionary:signature:table:DocUserSignType')"
-          show-overflow-tooltip sortable="custom" min-width="150px">
+        <el-table-column
+          prop="DocUserSignType"
+          :label="$t('dictionary:signature:table:DocUserSignType')"
+          show-overflow-tooltip
+          sortable="custom"
+          min-width="90"
+        >
           <template slot-scope="scope">
             {{ $fd('ReadingYesOrNo', Number(scope.row.DocUserSignType)) }}
           </template>
         </el-table-column>
-        <el-table-column prop="CreateTime" :label="$t('dictionary:signature:table:CreateTime')" show-overflow-tooltip
-          sortable="custom" min-width="180px" />
+        <el-table-column
+          prop="CreateTime"
+          :label="$t('dictionary:signature:table:CreateTime')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
 
-        <el-table-column :label="$t('common:action:action')" min-width="240px" fixed="right">
+        <el-table-column :label="$t('common:action:action')" min-width="100">
           <template slot-scope="scope">
-            <el-button circle icon="el-icon-view" @click="handlePreview(scope.row)"
-              :title="$t('common:button:preview')">
+            <el-button type="text" @click="handlePreview(scope.row)">
+              {{ $t('common:button:preview') }}
             </el-button>
-            <el-button circle icon="el-icon-edit-outline" :title="$t('common:button:edit')"
-              @click="handleEdit(scope.row)">
+            <el-button type="text" @click="handleEdit(scope.row)">
+              {{ $t('common:button:edit') }}
             </el-button>
-            <el-button :disabled="scope.row.IsPublish" circle icon="el-icon-position"
-              :title="$t('dictionary:signature:button:publish')" @click="publishSystemDocument([scope.row])">
+            <el-button
+              :disabled="scope.row.IsDeleted"
+              type="text"
+              @click="handleRepeal(scope.row)"
+            >
+              {{ $t('common:button:revoke') }}
             </el-button>
-            <el-button :disabled="scope.row.IsDeleted" circle icon="el-icon-close" :title="$t('common:button:revoke')"
-              @click="handleRepeal([scope.row])">
-            </el-button>
-            <el-button circle icon="el-icon-delete" :title="$t('common:button:delete')"
-              @click="handleDelete(scope.row)">
+            <el-button type="text" @click="handleDelete(scope.row)">
+              {{ $t('common:button:delete') }}
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-        @pagination="getList" v-if="!isSystem" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
 
       <!-- 新增/编辑 -->
-      <el-dialog v-if="editVisible" :visible.sync="editVisible" :close-on-click-modal="false" :title="title"
-        width="600px" custom-class="base-dialog-wrapper">
-        <TemplateForm :data="currentRow" @closeDialog="closeDialog" @getList="getList" />
+      <el-dialog
+        v-if="editVisible"
+        :visible.sync="editVisible"
+        :close-on-click-modal="false"
+        :title="title"
+        width="600px"
+        custom-class="base-dialog-wrapper"
+      >
+        <TemplateForm
+          :data="currentRow"
+          @closeDialog="closeDialog"
+          @getList="getList"
+        />
       </el-dialog>
-      <!--附件列表-->
-      <attachmentList v-if="config.visible" :config="config" :rowData="currentRow" :SystemDocumentId="SystemDocumentId"
-        @getList="getList" />
+
       <!-- 预览文件 -->
-      <attachmentPreview :SystemDocumentId="SystemDocumentId" :visible.sync="perview_visible" :isView="true"
-        v-if="perview_visible" />
-      <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('common:button:preview')"
-        :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
-        <span style="position: fixed; left: 16px; top: 45px;cursor: pointer;font-size: 18px;color:#409EFF"
-          @click.stop="openAttachment(currentRow)" v-if="currentRow.AttachmentCount">{{
-            $t('trials:signRecords:table:AttachmentCount') }} ({{
-            currentRow.AttachmentCount }})</span>
-        <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-          <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
+      <el-dialog
+        v-if="previewVisible"
+        :visible.sync="previewVisible"
+        :title="$t('common:button:preview')"
+        :fullscreen="true"
+        append-to-body
+        custom-class="base-dialog-wrapper"
+      >
+        <div
+          class="base-modal-body"
+          style="border: 2px solid #ccc; padding: 10px"
+        >
+          <PreviewFile
+            v-if="previewVisible"
+            :file-path="currentPath"
+            :file-type="currentType"
+          />
         </div>
       </el-dialog>
     </template>
   </BaseContainer>
 </template>
 <script>
-import { getSystemDocumentList, deleteSystemDocument, publishSystemDocument, outLineSystemDocument, getSystemDocumentAttachmentList } from '@/api/dictionary'
-import { userAbandonDoc, getTrialUserTypeList } from '@/api/trials'
+import { getSystemDocumentList, deleteSystemDocument } from '@/api/dictionary'
+import { userAbandonDoc } from '@/api/trials'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
 import TemplateForm from './TemplateForm'
-
-import attachmentList from './attachmentList'
 import PreviewFile from '@/components/PreviewFile/index'
-import attachmentPreview from './attachmentPreview'
 const searchDataDefault = () => {
   return {
     FileTypeId: '',
-    BeginCreateTime: null,
-    EndCreateTime: null,
-    IsDeleted: null,
-    DocUserSignType: null,
-    UserTypeId: null,
     Name: '',
     PageIndex: 1,
     PageSize: 20,
@@ -207,18 +203,8 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'SignatureTemplate',
-  components: { BaseContainer, Pagination, TemplateForm, PreviewFile, attachmentList, attachmentPreview },
+  components: { BaseContainer, Pagination, TemplateForm, PreviewFile },
   dicts: ['Sys_Document'],
-  props: {
-    isSystem: {
-      type: Boolean,
-      default: false
-    },
-    TITLE: {
-      type: String,
-      default: ''
-    }
-  },
   data() {
     return {
       searchData: searchDataDefault(),
@@ -231,82 +217,12 @@ export default {
       previewVisible: false,
       title: '',
       loading: false,
-      userTypeOptions: [],
-      timeList: [],
-      attachment_Visible: false,
-      SystemDocumentId: null,
-      config: {
-        visible: false,
-        title: this.$t('dictionary:signature:attachmentList:title'),
-        width: '800px',
-      },
-      multipleSelection: [],
-      perview_visible: false
     }
   },
   mounted() {
     this.getList()
-    this.getUserType()
   },
   methods: {
-    handleSelectable(row) {
-      return !row.IsDeleted || !row.IsPublish
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    // 发布
-    async publishSystemDocument(list) {
-      try {
-        let confirm = await this.$confirm(this.$t('dictionary:signature:confirm:publishFile'), {
-          type: 'warning',
-          distinguishCancelAndClose: true,
-        })
-        if (!confirm) return false
-        let arr = list.filter(item => !item.IsPublish)
-        if (arr.length <= 0) return this.getList()
-        let data = {
-          ids: arr.map(item => item.Id)
-        }
-        this.loading = true
-        let res = await publishSystemDocument(data)
-        this.loading = false
-        if (res.IsSuccess) {
-          this.getList()
-        }
-      } catch (err) {
-        this.loading = false
-        console.log(err)
-      }
-    },
-    openAttachment(row, isList = false) {
-      this.SystemDocumentId = row.Id
-      this.currentRow = { ...row }
-      if (!isList) {
-        this.perview_visible = true
-      } else {
-        this.config.visible = true
-      }
-    },
-    changeTimeList() {
-      if (this.timeList) {
-        this.searchData.BeginCreateTime = this.timeList[0]
-        this.searchData.EndCreateTime = this.timeList[1]
-      } else {
-        this.searchData.BeginCreateTime = null
-        this.searchData.EndCreateTime = null
-      }
-    },
-    // 获取用户类型下拉数据
-    getUserType() {
-      getTrialUserTypeList()
-        .then((res) => {
-          this.userTypeOptions = res.Result
-        })
-        .catch(() => {
-          this.loading = false
-        })
-    },
     // 获取系统文件数据
     getList() {
       this.loading = true
@@ -331,33 +247,22 @@ export default {
     },
     // 新增
     handleAdd() {
-      this.title = this.$t('common:button:new')
+      this.title = 'Add'
       this.currentRow = {}
       this.editVisible = true
     },
     // 预览
-    async handlePreview(row) {
+    handlePreview(row) {
       const { Name, FullFilePath } = row
       this.currentPath = FullFilePath
       this.currentType = row.Name
         ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase()
         : ''
-      let searchData = {
-        OffLine: false,
-        PageIndex: 1,
-        PageSize: 1000,
-        Asc: false,
-        SortField: null,
-        SystemDocumentId: row.Id
-      }
-      this.currentRow = Object.assign({}, row)
-      let res = await getSystemDocumentAttachmentList(searchData)
-      this.currentRow.AttachmentCount = res.Result.CurrentPageData.length
       this.previewVisible = true
     },
     // 编辑
     handleEdit(row) {
-      this.title = this.$t('common:action:edit')
+      this.title = 'Edit'
       this.currentRow = { ...row }
       this.editVisible = true
     },
@@ -368,13 +273,8 @@ export default {
         distinguishCancelAndClose: true,
       })
         .then(() => {
-          let arr = row.filter(item => !item.IsDeleted)
-          if (arr.length <= 0) return this.getList()
-          let data = {
-            Ids: arr.map(item => item.Id)
-          }
           this.loading = true
-          outLineSystemDocument(data)
+          userAbandonDoc(row.Id, true)
             .then((res) => {
               this.loading = false
               if (res.IsSuccess) {
@@ -388,7 +288,7 @@ export default {
               this.loading = false
             })
         })
-        .catch(() => { })
+        .catch(() => {})
     },
     // 删除
     handleDelete(row) {
@@ -418,7 +318,6 @@ export default {
     // 关闭弹窗
     closeDialog() {
       this.editVisible = false
-      this.attachment_Visible = false
     },
     // 重置
     handleReset() {

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

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

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

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