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

src/api/trials/reading.js

@@ -474,3 +474,9 @@ export function updateTrialReviewerState(params) {
   })
 }
 
+export function resetReadingRestTime() {
+  return request({
+    url: `/ReadingImageTask/resetReadingRestTime`,
+    method: 'post'
+  })
+}

src/main.js

@@ -4,6 +4,7 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 
 import ElementUI, { MessageBox } from 'element-ui'
 import { getBasicDataAllSelect, getFrontInternationalizationList } from '@/api/dictionary/dictionary'
+import { resetReadingRestTime } from '@/api/trials/reading'
 // import 'element-ui/lib/theme-chalk/index.css'
 import './assets/css/theme-blue/index.css' // 浅绿色主题
 import './assets/css/iconfont/index.css' // 阿里巴巴图标库
@@ -374,6 +375,8 @@ async function VueInit () {
             var my_username = zzSessionStorage.getItem('my_username')
             var my_password = zzSessionStorage.getItem('my_password')
             if (md5(_vm.unlock.my_password) === my_password && my_username === _vm.unlock.my_username) {
+              resetReadingRestTime().then(() => {
+              })
               _vm.$message.success(lang === 'zh' ? '解锁成功，请继续操作' : 'Unlocked successfully. Please continue operation.')
               _vm.unlock = {
                 my_username: null,

src/views/trials/trials-panel/visit/qc-check/index.vue

@@ -274,7 +274,14 @@
           width="180"
           sortable="custom"
         />
-
+        <!-- 上传人 -->
+        <el-table-column
+          prop="SubmitUserRealName"
+          :label="$t('trials:studyList:table:uploader')"
+          show-overflow-tooltip
+          width="140"
+          sortable="custom"
+        />
         <!-- 审核状态 -->
         <el-table-column
           prop="AuditState"