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

2024-03-27 14:55:05 +08:00 · 2024-03-27 14:55:05 +08:00 · 6407cd8264
parent f4842ba34d 1724e020f6
commit 6407cd8264
8 changed files with 42 additions and 15 deletions
--- a/src/utils/dcmUpload/anonymization.js
+++ b/src/utils/dcmUpload/anonymization.js
@ -54,7 +54,7 @@ export const anonymization = function (file, config) {
            }
          }
        }
-        console.log(dataset)
+        // console.log(dataset)
        let newDicomFile = dataset.write()
        const bufferArray = new Uint8Array(newDicomFile)
        const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@ -117,6 +117,7 @@
        @sort-change="handleSortChange"
        stripe
        height="100"
+        :default-sort ="{prop: 'CreateTime', order: 'descending'}"
      >
        <el-table-column type="index" width="40" fixed="left" align="left" />
        <!-- 研究方案号 -->
@ -748,7 +749,7 @@ export default {
  data() {
    const searchDataDefault = () => {
      return {
-        SortField: '',
+        SortField: 'CreateTime',
        Asc: false,
        PageIndex: 1,
        PageSize: 20,
--- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
@ -69,6 +69,7 @@
        :data="list"
        class="table"
        @sort-change="handleSortByColumn"
+        :default-sort ="{prop: 'CreateTime', order: 'descending'}"
      >
        <el-table-column
          type="index"
@ -90,6 +91,7 @@
          prop="IP"
          min-width="90"
          show-overflow-tooltip
+          sortable="custom"
        />
        <el-table-column
          :label="$t('trials:loginLog:table:incorrectUserName')"
@ -110,6 +112,7 @@
          prop="LoginUserTypeEnum"
          min-width="90"
          show-overflow-tooltip
+          sortable="custom"
        >
          <template slot-scope="scope">
            {{ $fd('UserType',scope.row.LoginUserTypeEnum) }}
@ -120,12 +123,14 @@
          prop="optUserName"
          min-width="90"
          show-overflow-tooltip
+          sortable="custom"
        />
        <el-table-column
          :label="$t('trials:loginLog:table:optUserType')"
          prop="OptUserTypeEnum"
          min-width="90"
          show-overflow-tooltip
+          sortable="custom"
        >
          <template slot-scope="scope">
            {{ $fd('UserType',scope.row.OptUserTypeEnum) }}
@ -136,6 +141,7 @@
          prop="CreateTime"
          min-width="90"
          show-overflow-tooltip
+          sortable="custom"
        />
      </el-table>
       <!-- 分页组件 -->
@ -156,8 +162,8 @@ const searchDataDefault = () => {
    LoginFaildName: '',
    BeginDate: '',
    EndDate: '',
-    Asc: true,
-    SortField: '',
+    Asc: false,
+    SortField: 'CreateTime',
    PageIndex: 1,
    PageSize: 20
  }
--- a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
@ -90,6 +90,7 @@
        stripe
        height="100"
        @sort-change="handleSortByColumn"
+        :default-sort ="{prop: 'ArchiveFinishedTime', order: 'descending'}"
      >
        <el-table-column type="index" width="40" align="left" />
        <!-- 中心编号 -->
@ -337,7 +338,7 @@ import BaseModel from '@/components/BaseModel'
 import axios from "axios";
 const searchDataDefault = () => {
  return {
-    SortField: '',
+    SortField: 'ArchiveFinishedTime',
    Asc: false,
    PageIndex: 1,
    PageSize: 20,
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@ -581,7 +581,8 @@ export default {
      trialBodyPartTypes: [],
      trialModalitys: [],
      myInterval: [],
-      studyErrorList: []
+      studyErrorList: [],
+      confirmFlag:false
    }
  },
  mounted() {
@ -669,8 +670,10 @@ export default {
              cancelButtonText: this.$t("common:button:cancel"),
              type: 'warning'
            }).then(() => {
+              this.confirmFlag = false;
              this.$emit("update:activeName",'clinical-data');
            }).catch(() => {       
+              this.confirmFlag = false;  
            });
          }else{
            if(showConfirm) return;
@ -940,7 +943,7 @@ export default {
    beginUploadQueues() {
      this.scanState = 'uploading'
      this.studyErrorList = []
-      console.log(this.uploadQueues, this.selectArr)
+      // console.log(this.uploadQueues, this.selectArr)
      this.warningArr = []
      for (let i = 0; i < this.selectArr.length; ++i) {
        const index = this.selectArr[i].studyIndex
@ -1078,6 +1081,7 @@ export default {
          })
          this.$refs.pathClear.value = ''
          this.btnLoading = false
+          // console.log(11111);
          if (this.studyErrorList.length > 0) {
            let msg = this.$t('trials:uploadDicomFiles2:message:studyErrorList')
            msg = msg.replaceAll('xxx', this.studyErrorList.join('、'))
@ -1087,6 +1091,9 @@ export default {
              this.beginUploadQueues()
            })
          }
+          if(this.confirmFlag){
+            this.getClinicalData(true);
+          }
        })
      }).catch(_ => { this.btnLoading = false })
    },
@ -1378,7 +1385,7 @@ export default {
                let flag = res.Result=== 'PET-CT' || res.Result==='CT、PT' || res.Result === 'PT、CT';
                // let flag = params.study.seriesList.some(item=>item.modality==='PT');
                if(flag){
-                  scope.getClinicalData(true);
+                  scope.confirmFlag = true;
                }
                scope.getStudyInfo()
                if (scope.$route.path !== '/trials/trials-panel/visit/crc-question') {
--- a/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
+++ b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
@ -21,6 +21,7 @@
      v-adaptive="{bottomOffset:45}"
      height="100"
      @sort-change="handleSortByColumn"
+      :default-sort ="{prop: 'ConfirmTime', order: 'descending'}"
    >
      <el-table-column type="index" width="40" />
      <!-- 项目编号 -->
@ -48,16 +49,19 @@
        :label="$t('trials:sysDocBeSigned:table:fileType')"
        prop="FileType"
        show-overflow-tooltip
+        sortable="custom"
      />
      <el-table-column
        :label="$t('trials:sysDocBeSigned:table:fileName')"
        prop="Name"
        show-overflow-tooltip
+        sortable="custom"
      />
      <el-table-column
        :label="$t('trials:sysDocBeSigned:table:ConfirmTime')"
        prop="ConfirmTime"
        show-overflow-tooltip
+        sortable="custom"
      />
      <el-table-column
        :label="$t('common:action:action')"
@ -132,8 +136,8 @@ const searchDataDefault = () => {
    IsSigned: true,
    pageIndex: 1,
    pageSize: 20,
-    asc: true,
-    sortField: ''
+    asc: false,
+    sortField: 'ConfirmTime'
  }
 }
 export default {
--- a/src/views/trials/trials-workbench/components/needSignSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
@ -21,22 +21,26 @@
      v-adaptive="{bottomOffset:45}"
      height="100"
      @sort-change="handleSortByColumn"
+      :default-sort ="{prop: 'UpdateTime', order: 'descending'}"
    >
      <el-table-column type="index" width="40" />
      <el-table-column
        :label="$t('trials:sysDocBeSigned:table:fileType')"
        prop="FileType"
        show-overflow-tooltip
+        sortable="custom"
      />
      <el-table-column
        :label="$t('trials:sysDocBeSigned:table:fileName')"
        prop="Name"
        show-overflow-tooltip
+        sortable="custom"
      />
      <el-table-column
        :label="$t('trials:sysDocBeSigned:table:uploadTime')"
        prop="UpdateTime"
        show-overflow-tooltip
+        sortable="custom"
      />
      <el-table-column
        :label="$t('common:action:action')"
@ -119,8 +123,8 @@ const searchDataDefault = () => {
  return {
    pageIndex: 1,
    pageSize: 20,
-    asc: true,
-    sortField: ''
+    asc: false,
+    sortField: 'UpdateTime'
  }
 }
 export default {
--- a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
@ -21,22 +21,26 @@
      v-adaptive="{bottomOffset:45}"
      height="100"
      @sort-change="handleSortByColumn"
+      :default-sort ="{prop: 'UpdateTime', order: 'descending'}"
    >
      <el-table-column type="index" width="40" />
      <el-table-column
        :label="$t('trials:sysDocBeSigned:table:fileType')"
        prop="FileType"
        show-overflow-tooltip
+        sortable="custom"
      />
      <el-table-column
        :label="$t('trials:sysDocBeSigned:table:fileName')"
        prop="Name"
        show-overflow-tooltip
+        sortable="custom"
      />
      <el-table-column
        :label="$t('trials:sysDocBeSigned:table:uploadTime')"
        prop="UpdateTime"
        show-overflow-tooltip
+        sortable="custom"
      />
      <el-table-column
        :label="$t('common:action:action')"
@ -119,8 +123,8 @@ const searchDataDefault = () => {
  return {
    pageIndex: 1,
    pageSize: 20,
-    asc: true,
-    sortField: ''
+    asc: false,
+    sortField: 'UpdateTime'
  }
 }
 export default {