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

src/components/TrialsTab/index.vue

@@ -2,19 +2,21 @@
 <template>
   <div class="trialsTab">
     <el-tabs v-model="trialsTab" @tab-click="clickTab">
-      <el-tab-pane v-for="item of trialsRouter.children.find(v => { return v.name == 'TrialsPanel' }).children"
-        :key="`tab${item.path}`"
-        :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'"
-        :label="$t(item.LanguageMark)" :name="item.path">
-        <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab"
-          style="background-color: #f5f7fa;">
-          <template v-for="item1 of item.children">
-            <el-tab-pane v-if="TrialConfig && isShow(item1.path)" :key="`tab1${item1.path}`"
-              :disabled="TotalNeedSignTrialDocCount !== 0 && item1.path !== '/trials/trials-panel/attachments/self-attachment' || (TrialStatusStr === 'Initializing' && (item1.path === '/trials/trials-panel/setting/personnel-manage' || item1.path === '/trials/trials-panel/setting/qc-question' || item1.path === '/trials/trials-panel/setting/reading-unit' || item1.path === '/trials/trials-panel/setting/medical-audit' || item1.path === '/trials/trials-panel/setting/email-manage'))"
-              :label="$t(item1.LanguageMark)" :name="item1.path" />
-          </template>
-        </el-tabs>
-      </el-tab-pane>
+      <template v-for="item of trialsRouter.children.find(v => { return v.name == 'TrialsPanel' }).children">
+        <el-tab-pane :key="`tab${item.path}`"
+          :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'"
+          :label="$t(item.LanguageMark)" :name="item.path" v-if="isShowNode(item)">
+          <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab"
+            style="background-color: #f5f7fa;">
+            <template v-for="item1 of item.children">
+              <el-tab-pane v-if="TrialConfig && isShow(item1.path)" :key="`tab1${item1.path}`"
+                :disabled="TotalNeedSignTrialDocCount !== 0 && item1.path !== '/trials/trials-panel/attachments/self-attachment' || (TrialStatusStr === 'Initializing' && (item1.path === '/trials/trials-panel/setting/personnel-manage' || item1.path === '/trials/trials-panel/setting/qc-question' || item1.path === '/trials/trials-panel/setting/reading-unit' || item1.path === '/trials/trials-panel/setting/medical-audit' || item1.path === '/trials/trials-panel/setting/email-manage'))"
+                :label="$t(item1.LanguageMark)" :name="item1.path" />
+            </template>
+          </el-tabs>
+        </el-tab-pane>
+      </template>
+
     </el-tabs>
     <div style="position: absolute;top: 0;right: 0;display: flex;justify-content: space-between;align-items: center">
       <trials-select />
@@ -117,6 +119,12 @@ export default {
     }
   },
   methods: {
+    isShowNode(item) {
+      if (item.path === '/trials/trials-panel/trial-summary' && item.children.length === 1 && item.children[0].path === '/trials/trials-panel/trial-summary/report-forms' && !this.$store.state.trials.config.IsExternalViewTrialChart && this.hasPermi(['role:cmm', 'role:cpm', 'role:ea', 'role:mc', 'role:smm', 'role:spm'])) {
+        return false
+      }
+      return true
+    },
     isShow: function (path) {
       var isShow = true
       let chartList = [

src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue

@@ -36,8 +36,8 @@
           hasPermi(['trials:trials-panel:subject:readingPeriod:edit']) &&
           clinicalType === '1' &&
           type !== 'consistencyAnalysis'
-        " type="primary" icon="el-icon-download" size="small" :disabled="clinicalDatas.length <= 0"
-          @click="downLoadTemplate">
+        " type="primary" icon="el-icon-download" size="small"
+          :disabled="clinicalDatas.filter(item => item.Path).length <= 0" @click="downLoadTemplate">
           {{ $t('trials:readingPeriod:cd:title:downLoadTemplate') }}
         </el-button>
         <el-button v-if="
@@ -132,8 +132,8 @@
               <!-- 编辑 -->
               <el-button v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']" v-if="clinicalType === '1'"
                 circle :title="$t('trials:readingPeriod:cd:title:cdCheck')" icon="el-icon-s-claim" :disabled="(scope.row.IsCRCUpload ||
-                    scope.row.IsSign ||
-                    scope.row.UploadRole === 0) &&
+                  scope.row.IsSign ||
+                  scope.row.UploadRole === 0) &&
                   scope.row.ReadingClinicalDataState !== 2
                   " @click="handleVerification(scope.row, 'confirm')" />
               <!-- 删除 -->
@@ -274,9 +274,9 @@
               <!-- 编辑 -->
               <el-button v-hasPermi="['trials:trials-panel:subject:readingPeriod:edit']" circle
                 :title="$t('trials:readingPeriod:cd:title:cdCheck')" icon="el-icon-s-claim" :disabled="(scope.row.IsCRCUpload ||
-                    scope.row.IsSign ||
-                    scope.row.UploadRole === 0 ||
-                    type === 'consistencyAnalysis') &&
+                  scope.row.IsSign ||
+                  scope.row.UploadRole === 0 ||
+                  type === 'consistencyAnalysis') &&
                   scope.row.ReadingClinicalDataState !== 2
                   " @click="handleVerification(scope.row, 'confirm')" />
               <!-- 删除 -->

src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue

@@ -91,7 +91,7 @@ export default {
         getTrialCriterionList() {
             this.loading = true
             getTrialCriterionList(this.$route.query.trialId, false).then(res => {
-                this.trialCriterionList = res.Result
+                this.trialCriterionList = res.Result.filter(item => [1, 18, 2, 3, 7, 10, 17].includes(Number(item.CriterionType)))
                 if (this.trialCriterionList.length > 0) {
                     this.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
                     this.getList()

src/views/trials/trials-panel/trial-summary/report-forms/index.vue

@@ -179,14 +179,10 @@ export default {
                 color: this.color,
                 tooltip: {
                     trigger: 'item',
-                    formatter: `${obj.titleText} <br/>{b} : {c}`
+                    formatter: `{b} : {c}`
                 },
                 toolbox: {
-                    feature: {
-                        dataView: { readOnly: false },
-                        restore: {},
-                        saveAsImage: {}
-                    }
+                    show: false
                 },
                 legend: {
                     data: obj.legendData,
@@ -317,6 +313,9 @@ export default {
                 title: {
                     text: obj.titleText
                 },
+                toolbox: {
+                    show: false
+                },
                 color: this.color,
                 tooltip: {
                     trigger: 'axis',
@@ -356,6 +355,7 @@ export default {
                 }
                 this.loading_bottom = true
                 let res = await getTrialEfficacyEvaluationStatList(data)
+                if (data.TrialReadingCriterionId !== this.searchData.TrialReadingCriterionId) return false
                 this.loading_bottom = false
                 if (res.IsSuccess) {
                     let OtherInfo = res.OtherInfo || {}
@@ -421,6 +421,9 @@ export default {
                 title: {
                     text: obj.titleText
                 },
+                toolbox: {
+                    show: false
+                },
                 color: this.color,
                 tooltip: {
                     trigger: 'axis',
@@ -434,7 +437,8 @@ export default {
                 },
                 yAxis: {
                     name: obj.unit,
-                    type: 'value'
+                    type: 'value',
+                    minInterval: 1
                 },
                 series: [
                     {
@@ -444,7 +448,7 @@ export default {
                         label: {
                             show: true,
                             formatter: `{c}`,
-                            position: 'inside',
+                            position: 'top',
                             textStyle: {
                                 fontSize: 14, // 设置字体大小为 14px
                                 color: '#000', // 设置字体颜色为白色
@@ -467,6 +471,9 @@ export default {
                 title: {
                     text: obj.titleText
                 },
+                toolbox: {
+                    show: false
+                },
                 color: this.color,
                 tooltip: {
                     trigger: 'item',
@@ -494,7 +501,7 @@ export default {
                     label: {
                         show: true,
                         formatter: `{c}%`,
-                        position: 'inside',
+                        position: 'top',
                         textStyle: {
                             fontSize: 14, // 设置字体大小为 14px
                             color: '#000', // 设置字体颜色为白色
@@ -521,6 +528,9 @@ export default {
                 title: {
                     text: obj.titleText
                 },
+                toolbox: {
+                    show: false
+                },
                 color: this.color,
                 tooltip: {
                     trigger: 'axis',
@@ -560,7 +570,7 @@ export default {
                     label: {
                         show: true,
                         formatter: `{c}`,
-                        position: 'inside',
+                        position: 'top',
                         textStyle: {
                             fontSize: 14, // 设置字体大小为 14px
                             color: '#000', // 设置字体颜色为白色