Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

src/router/index.js

@@ -50,11 +50,11 @@ export const constantRoutes = [
     component: () => import('@/views/login/index'),
     hidden: true
   },
-  {
+  // {
-    path: '/test',
+  //   path: '/test',
-    component: () => import('@/views/test/index'),
+  //   component: () => import('@/views/test/index'),
-    hidden: true
+  //   hidden: true
-  },
+  // },
   {
     path: '/resetpassword',
     component: () => import('@/views/forgetpassword/index'),

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

@@ -3,7 +3,7 @@
     ref="organForm"
     v-loading="loading"
     :model="form"
-    label-width="130px"
+    label-width="170px"
     size="small"
     :rules="rules"
   >

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

@@ -42,7 +42,6 @@
       v-adaptive="{bottomOffset:45}"
       :data="list"
       stripe
-      size="small"
       height="100"
     >
       <el-table-column type="index" width="60" />

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

@@ -53,27 +53,29 @@
       v-adaptive="{bottomOffset:45}"
       :data="list"
       stripe
-      size="small"
       height="100"
     >
-      <el-table-column type="index" width="60" />
+      <el-table-column type="index" width="40" />
       <!-- 临床数据名称 -->
       <el-table-column
         prop="ClinicalDataSetName"
         :label="$t('trials:processCfg:title:clinicalDataName')"
         show-overflow-tooltip
+        min-width="160"
       />
       <!-- 临床数据名称（EN） -->
       <el-table-column
         prop="ClinicalDataSetEnName"
         :label="$t('dictionary:clinicalData:label:clinicalDataNameEn')"
         show-overflow-tooltip
+        min-width="190"
       />
       <!-- 上传人 -->
       <el-table-column
         prop="UploadRole"
         :label="$t('trials:processCfg:title:uploader')"
         show-overflow-tooltip
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ $fd('ClinicalDataUploadRole',scope.row.UploadRole) }}
@@ -84,6 +86,7 @@
         prop="ClinicalDataLevel"
         :label="$t('trials:processCfg:title:dataLevel')"
         show-overflow-tooltip
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ $fd('ClinicalLevel',scope.row.ClinicalDataLevel) }}
@@ -94,6 +97,7 @@
         prop="ClinicalUploadType"
         :label="$t('trials:processCfg:title:transferType')"
         show-overflow-tooltip
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ $fd('ClinicalUploadType',scope.row.ClinicalUploadType) }}
@@ -104,6 +108,7 @@
         prop="CriterionEnumList"
         :label="$t('trials:processCfg:label:criterion')"
         show-overflow-tooltip
+        min-width="200"
       >
         <template slot-scope="scope">
           {{ scope.row.CriterionEnumList.map(v => $fd('CriterionType', v)).toString() }}
@@ -114,6 +119,7 @@
         prop="FileName"
         :label="$t('trials:processCfg:title:module')"
         show-overflow-tooltip
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ scope.row.FileName }}
@@ -124,6 +130,7 @@
         prop="EnFileName"
         :label="$t('trials:processCfg:title:enModule')"
         show-overflow-tooltip
+        min-width="140"
       >
         <template slot-scope="scope">
           {{ scope.row.EnFileName }}
@@ -134,6 +141,7 @@
         prop="IsEnable"
         :label="$t('dictionary:clinicalData:label:status')"
         show-overflow-tooltip
+        min-width="120"
       >
         <template slot-scope="scope">
           <!-- <el-tag v-if="scope.row.IsEnable">启用</el-tag>
@@ -147,9 +155,10 @@
         prop="CreateTime"
         :label="$t('dictionary:clinicalData:label:CreateTime')"
         show-overflow-tooltip
+        min-width="140"
       />
 
-      <el-table-column :label="$t('common:action:action')" width="340" fixed="right">
+      <el-table-column :label="$t('common:action:action')" min-width="350" fixed="right">
         <template slot-scope="scope">
           <!-- 问题配置 -->
           <el-button

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

@@ -6,7 +6,7 @@
     size="small"
     :rules="rules"
     :disabled="type === 'look'"
-    label-width="140px"
+    label-width="220px"
   >
     <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
       <div style="height: 150px;">

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

@@ -62,32 +62,35 @@
             prop="GroupName"
             :label="$t('trials:readingUnit:qsList:title:groupName')"
             show-overflow-tooltip
+            min-width="120"
           />
           <!-- 分组(EN) -->
           <el-table-column
             prop="GroupEnName"
             :label="$t('dictionary:template:criterionConfig:title:groupNameEn')"
             show-overflow-tooltip
-            width="140"
+            min-width="140"
           />
           <!-- 名称 -->
           <el-table-column
             prop="QuestionName"
             :label="$t('trials:readingUnit:qsList:title:qsName')"
             show-overflow-tooltip
+            min-width="140"
           />
           <!-- 名称(EN) -->
           <el-table-column
             prop="QuestionEnName"
             :label="$t('dictionary:template:criterionConfig:title:qsNameEn')"
             show-overflow-tooltip
-            width="140"
+            min-width="160"
           />
           <!-- 题型 -->
           <el-table-column
             prop="Type"
             :label="$t('trials:readingUnit:qsList:title:type')"
             show-overflow-tooltip
+            min-width="180"
           >
             <template slot-scope="scope">
               {{ $fd('Criterion_Question_Type',scope.row.Type) }}
@@ -98,6 +101,7 @@
             prop="ShowQuestion"
             :label="$t('trials:readingUnit:qsList:title:isShow')"
             show-overflow-tooltip
+            min-width="100"
           >
             <template slot-scope="scope">
               {{ $fd('ShowQuestion',scope.row.ShowQuestion) }}
@@ -108,6 +112,7 @@
             prop="IsRequired"
             :label="$t('trials:readingUnit:qsList:title:isRequired')"
             show-overflow-tooltip
+            min-width="100"
           >
             <template slot-scope="scope">
               {{ $fd('QuestionRequired',scope.row.IsRequired) }}
@@ -117,7 +122,7 @@
           <el-table-column
             prop="IsJudgeQuestion"
             :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')"
-            width="120"
+            min-width="200"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
@@ -128,7 +133,7 @@
           <el-table-column
             prop="IsShowInDicom"
             :label="$t('trials:readingUnit:qsList:title:isShowInDicom')"
-            width="150"
+            min-width="200"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
@@ -147,7 +152,7 @@
           <el-table-column
             prop="GlobalReadingShowType"
             :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')"
-            width="160"
+            min-width="240"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
@@ -169,7 +174,7 @@
           <el-table-column
             prop="QuestionType"
             :label="$t('dictionary:template:criterionConfig:table:questionType')"
-            width="140"
+            min-width="160"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
@@ -258,11 +263,11 @@
       :visible.sync="addOrEdit.visible"
       :close-on-click-modal="false"
       :title="`${addOrEdit.title}`"
-      width="650px"
+      width="800px"
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <CriterionQuestionForm
+      <criterion-question-form
         ref="addOrEdit"
         :data="rowData"
         :type="type"

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

@@ -84,7 +84,6 @@
       v-adaptive="{bottomOffset:45}"
       :data="list"
       stripe
-      size="small"
       height="100"
       @sort-change="handleSortByColumn"
       ref="criterionsTbl"
@@ -96,6 +95,7 @@
         :label="$t('trials:auditRecord:table:criterion')"
         show-overflow-tooltip
         sortable="custom"
+        width="180"
       />
       <!-- 标准类型 -->
       <el-table-column
@@ -103,6 +103,7 @@
         :label="$t('dictionary:template:criterionConfig:table:criterionType')"
         show-overflow-tooltip
         sortable="custom"
+        width="180"
       >
         <template slot-scope="scope">
           {{ $fd('CriterionType',scope.row.CriterionType) }}
@@ -114,6 +115,7 @@
         :label="$t('dictionary:template:criterionConfig:table:criterionGroup')"
         show-overflow-tooltip
         sortable="custom"
+        width="160"
       >
         <template slot-scope="scope">
           {{ $fd('CriterionGroup',scope.row.CriterionGroup) }}
@@ -124,6 +126,7 @@
         prop="IsCompleteConfig"
         :label="$t('dictionary:template:criterionConfig:table:isCompleteConfig')"
         sortable="custom"
+        width="220"
       >
         <template slot-scope="scope">
 
@@ -219,9 +222,9 @@
       :close-on-click-modal="false"
       append-to-body
       custom-class="base-dialog-wrapper"
-      width="500px"
+      width="600px"
     >
-      <AddCriterion
+      <add-criterion
         :data="rowData"
         @close="addDialog.visible = false"
         @getList="getList"

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

@@ -1,6 +1,6 @@
 <template>
   <div style="position: relative">
-    <el-form  size="small" :inline="true"  label-width="130px" style="position: relative;">
+    <el-form  size="small" :inline="true" style="position: relative;">
       <!-- 阅片规则 -->
       <el-divider content-position="left">{{ $t('dictionary:template:globalConfig:readingRules') }}</el-divider>
       <!-- 是否必须全局阅片 -->
@@ -18,7 +18,7 @@
         {{ $t('dictionary:template:globalConfig:config') }}
       </el-button>
     </el-form>
-    <el-form  size="small" :inline="true"  label-width="110px" style="position: relative">
+    <el-form  size="small" :inline="true"  style="position: relative">
       <!-- 名称 -->
       <el-divider content-position="left">{{ $t('dictionary:template:globalConfig:name') }}</el-divider>
       <!-- 配置 -->
@@ -44,7 +44,7 @@
         <el-table-column
           prop=""
           :label="$t('dictionary:template:globalConfig:order')"
-          width="50"
+          width="80"
         >
           <template slot-scope="scope">
             {{scope.$index + 1}}

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form  size="small" :inline="true"  label-width="110px" style="position: relative;">
+    <el-form  size="small" :inline="true" style="position: relative;">
       <!-- 阅片规则 -->
       <el-divider content-position="left">{{ $t('dictionary:template:globalConfig:readingRules') }}</el-divider>
       <!-- 是否肿瘤学阅片 -->
@@ -18,7 +18,7 @@
         {{ $t('dictionary:template:globalConfig:config') }}
       </el-button>
     </el-form>
-    <el-form  size="small" :inline="true"  label-width="110px" style="position: relative">
+    <el-form  size="small" :inline="true" style="position: relative">
       <!-- 阅片问题 -->
       <el-divider content-position="left">{{ $t('dictionary:template:oncologyConfig:reviewQs') }}</el-divider>
       <!-- 配置 -->
@@ -45,7 +45,7 @@
       <el-table-column
         prop=""
         :label="$t('dictionary:template:globalConfig:order')"
-        width="50"
+        width="80"
       >
         <template slot-scope="scope">
           {{scope.$index + 1}}
@@ -126,7 +126,7 @@ import { getSystemOncologyInfo, setSystemOncologyInfo, getCriterionDictionary }
 export default {
   props: {
     data: {
-      type: String,
+      type: Object,
       default() { return {} }
     },
     criterionId: {

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

@@ -42,7 +42,6 @@
       v-adaptive="{bottomOffset:45}"
       :data="list"
       stripe
-      size="small"
       height="100"
     >
       <el-table-column type="index" width="60" />

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

@@ -65,7 +65,6 @@
       v-adaptive="{bottomOffset:50}"
       :data="list"
       stripe
-      size="small"
       height="100"
     >
       <!-- 序号 -->
@@ -79,12 +78,14 @@
         prop="QuestionName"
         :label="$t('trials:MIMqcCfg:table:questionName')"
         show-overflow-tooltip
+        min-width="140"
       />
       <!-- 审核问题 -->
       <el-table-column
         prop="LanguageType"
         :label="$t('common:title:languageType')"
         show-overflow-tooltip
+        min-width="160"
       >
         <template slot-scope="scope">
           {{ $fd('LanguageType', scope.row.LanguageType) }}
@@ -95,6 +96,7 @@
         prop="Type"
         :label="$t('trials:qcCfg:table:type')"
         show-overflow-tooltip
+        min-width="140"
       >
         <template slot-scope="scope">
           {{ $fd('QcType', scope.row.Type) }}
@@ -105,12 +107,14 @@
         prop="TypeValue"
         :label="$t('trials:qcCfg:table:typeValue')"
         show-overflow-tooltip
+        min-width="140"
       />
       <!-- 任务类型 -->
       <el-table-column
         prop="ReadingCategory"
         :label="$t('trials:medicalFeedbackCfg:title:taskType')"
         show-overflow-tooltip
+        min-width="140"
       >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">
@@ -130,7 +134,7 @@
       <el-table-column
         prop="ReadingCategory"
         :label="$t('trials:auditRecord:table:criterion')"
-        width="240"
+        min-width="160"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -142,7 +146,7 @@
       <el-table-column
         prop="IsGeneral"
         :label="$t('dictionary:medicalAudit:label:IsGeneral')"
-        width="80"
+        min-width="120"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -156,17 +160,20 @@
         prop="ParentShowOrder"
         :label="$t('trials:qcCfg:table:parentQs')"
         show-overflow-tooltip
+        min-width="140"
       />
       <!-- 父问题触发值 -->
       <el-table-column
         prop="ParentTriggerValue"
         :label="$t('trials:qcCfg:table:parentTriggerValue')"
         show-overflow-tooltip
+        min-width="160"
       />
       <!-- 是否必填 -->
       <el-table-column
         prop="IsRequired"
         :label="$t('trials:qcCfg:table:isRequired')"
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ $fd('YesOrNo', scope.row.IsRequired) }}
@@ -176,6 +183,7 @@
       <el-table-column
         prop="IsEnable"
         :label="$t('trials:qcCfg:table:isEnable')"
+        min-width="120"
       >
         <template slot-scope="scope">
           {{ $fd('YesOrNo', scope.row.IsEnable) }}

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

@@ -96,7 +96,7 @@
         <el-table-column
           prop="OrganType"
           :label="$t('trials:readingUnit:baseDataCfg:title:organType')"
-          min-width="120"
+          min-width="140"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -110,11 +110,12 @@
           :label="$t('trials:readingUnit:baseDataCfg:title:classification')"
           show-overflow-tooltip
           sortable="custom"
+          min-width="140"
         />
         <el-table-column
           prop="ClassificationEN"
           :label="$t('trials:readingUnit:baseDataCfg:title:classificationEn')"
-          min-width="140"
+          min-width="160"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -124,6 +125,7 @@
           :label="$t('trials:readingUnit:baseDataCfg:title:bodyPart')"
           show-overflow-tooltip
           sortable="custom"
+          min-width="120"
         />
         <el-table-column
           prop="PartEN"
@@ -138,6 +140,7 @@
           :label="$t('trials:readingUnit:baseDataCfg:title:organ')"
           show-overflow-tooltip
           sortable="custom"
+          min-width="120"
         />
         <el-table-column
           prop="TULOCEN"
@@ -152,6 +155,7 @@
           :label="$t('trials:readingUnit:baseDataCfg:title:TULAT')"
           show-overflow-tooltip
           sortable="custom"
+          min-width="120"
         />
         <el-table-column
           prop="TULATEN"

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

@@ -57,7 +57,6 @@
       v-adaptive="{bottomOffset:45}"
       :data="list"
       stripe
-      size="small"
       height="100"
     >
       <!-- 序号 -->

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

@@ -167,6 +167,7 @@
           prop="IsConfirmRecord"
           show-overflow-tooltip
           sortable="custom"
+          width="200"
         >
           <template slot-scope="scope">
             <el-tag :type="!scope.row.IsEnable ? 'info' : ''">

src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue

@@ -101,7 +101,7 @@
           @mouseup="sliderMouseup($event, index)"
           @mousemove="sliderMousemove($event, index)"
         >
-          <div v-show="v.fileType === 'image/jpeg'" :ref="`canvas-${index}`" class="content">
+          <div v-show="imageType.includes(v.fileType)" :ref="`canvas-${index}`" class="content">
             <div class="left-top-text">
               <div
                 v-if="v.taskInfo.IsExistsClinicalData"
@@ -263,7 +263,8 @@ export default {
       taskInfo: null,
       activeTool: '',
       readingTaskState: 2,
-      renderHistoryAnnotationTaskIds: []
+      renderHistoryAnnotationTaskIds: [],
+      imageType: ['image/jpeg', 'image/jpg', 'image/bmp', 'image/png']
     }
   },
   computed: {
@@ -493,7 +494,7 @@ export default {
       if (!obj || Object.keys(obj).length === 0) return
       const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
       if (i === -1) return
-      if (obj.studyId === this.viewportInfos[i].studyId && this.viewportInfos[i].fileType === 'image/jpeg' && obj.fileInfo.FileType === 'image/jpeg') {
+      if (obj.studyId === this.viewportInfos[i].studyId && this.imageType.includes(this.viewportInfos[i].fileType) && this.imageType.includes(obj.fileInfo.FileType)) {
         const fileIndex = this.viewportInfos[i].fileList.findIndex(i => i.Path === obj.fileInfo.Path)
         this.sliceIndex(fileIndex)
       } else {
@@ -525,8 +526,8 @@ export default {
       this.viewportInfos[i].currentFileName = obj.fileInfo.FileName
       this.viewportInfos[i].studyId = obj.studyId
       this.viewportInfos[i].fileType = obj.fileInfo.FileType
-      if (obj.fileInfo.FileType === 'image/jpeg') {
+      if (this.imageType.includes(obj.fileInfo.FileType)) {
-        const arr = obj.fileList.filter(i => i.FileType === obj.fileInfo.FileType)
+        const arr = obj.fileList.filter(i => this.imageType.includes(i.FileType))
         this.viewportInfos[i].fileList = arr
         const fileIndex = this.viewportInfos[i].fileList.findIndex(i => i.Path === obj.fileInfo.Path)
         this.viewportInfos[i].currentImageIdIndex = fileIndex
@@ -648,7 +649,7 @@ export default {
     // 切换全屏
     toggleFullScreen(e, index) {
       const i = this.viewportInfos.findIndex(i => i.index === index)
-      if (i === -1 && this.viewportInfos[i].fileType !== 'image/jpeg') return
+      if (i === -1 && this.imageType.includes(this.viewportInfos[i].fileType)) return
       this.fullScreenIndex = this.fullScreenIndex === index ? null : index
       this.activeCanvasIndex = index
     },
@@ -847,12 +848,12 @@ export default {
     },
     sliderMouseup(e, index) {
       const i = this.viewportInfos.findIndex(i => i.index === index)
-      if (i === -1 && this.viewportInfos[i].fileType !== 'image/jpeg') return
+      if (i === -1 && this.imageType.includes(this.viewportInfos[i].fileType)) return
       this.viewportInfos[i].isMove = false
     },
     sliderMousemove(e, index) {
       const i = this.viewportInfos.findIndex(i => i.index === index)
-      if (i === -1 && this.viewportInfos[i].fileType !== 'image/jpeg') return
+      if (i === -1 && this.imageType.includes(this.viewportInfos[i].fileType)) return
       if (!this.viewportInfos[i].isMove) return
       const delta = this.viewportInfos[i].oldB - (this.viewportInfos[i].oldM - e.clientY)
       const boxHeight = this.$refs[`sliderBox-${index}`][0].clientHeight

vue.config.js

@@ -12,12 +12,12 @@ const defaultSettings = require('./src/settings.js')
 const moment = require('moment')
 var distDate = moment(new Date()).format('YYYY-MM-DD')
 const name = process.env.NODE_ENV === 'usa' ? 'LILI' : defaultSettings.title || 'IRCIS' // page title
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
+// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
 // eslint-disable-next-line no-undef
 module.exports = defineConfig({
   // lintOnSave: false,
   transpileDependencies: false,
-  publicPath: process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? process.env.VUE_APP_BASE_PATH : `${process.env.VUE_FILE_PATH}${process.env.VUE_APP_OSS_PATH}${distDate}/`,
+  publicPath: process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'production' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? process.env.VUE_APP_BASE_PATH : `${process.env.VUE_FILE_PATH}${process.env.VUE_APP_OSS_PATH}${distDate}/`,
   // publicPath: '/',
   outputDir: 'dist',
   assetsDir: 'static',
@@ -97,7 +97,7 @@ module.exports = defineConfig({
         ]
       }),
       // new BundleAnalyzerPlugin(),
-      process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? function () { }
+      process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'production' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? function() { }
         : new WebpackAliyunOss({
           from: ['./dist/**'],
           dist: process.env.VUE_APP_OSS_PATH + distDate,
@@ -184,7 +184,7 @@ module.exports = defineConfig({
       // 生成文件的最大体积
       maxAssetSize: 3000000000,
       // 只给出js的性能提示
-      assetFilter: function (assetFileName) {
+      assetFilter: function(assetFileName) {
         return assetFileName.endsWith('.js')
       }
     }