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

src/views/system/user/list/index.vue

@@ -26,7 +26,7 @@
       <!-- 选择自定义slot -->
       <template slot="tip-slot" slot-scope="{ scope }">
         <i
-          v-if="diffTime(scope.row.LastLoginTime) >= 6"
+          v-if="diffTime(scope.row.LastLoginTime) >= 90"
           class="el-icon-warning"
           style="color: #f56c6c"
           :title="$t('system:userlist:tip:overTime')"
@@ -363,7 +363,7 @@ export default {
   },
   methods: {
     diffTime(time) {
-      return moment(new Date()).diff(time, 'months')
+      return moment(new Date()).diff(time, 'days')
     },
     // 获取用户信息
     getList() {

src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue

@@ -165,6 +165,22 @@ export default {
               this.loading = false
             })
           break
+        case 17:
+          searchData.ReadingExportType = 17
+          getCommonJudgeRatioList_Export(searchData)
+            .then((res) => {})
+            .catch(() => {
+              this.loading = false
+            })
+          break
+        case 18:
+          searchData.ReadingExportType = 18
+          getCommonJudgeRatioList_Export(searchData)
+            .then((res) => {})
+            .catch(() => {
+              this.loading = false
+            })
+          break
       }
     },
     getTrialCriterionList() {