src/api/reading.js

@@ -240,11 +240,3 @@ export function resetReadingTask(param) {
     data: param
   })
 }
-
-export function clearSkipReadingCache(param) {
-  return request({
-    url: `/ReadingImageTask/clearSkipReadingCache`,
-    method: 'post',
-    data: param
-  })
-}

src/views/system/user/components/UserInfo.vue

@@ -1,21 +1,42 @@
 <template>
-  <el-form ref="userForm" size="small" :model="user" :rules="userFormRules" label-width="150px" style="width: 800px">
+  <el-form
+    ref="userForm"
+    size="small"
+    :model="user"
+    :rules="userFormRules"
+    label-width="150px"
+    style="width: 800px"
+  >
     <el-card class="Basic" shadow="never" size="small">
       <div slot="header" class="clearfix">
         <span>{{ $t("system:userlist:title:Information") }}</span>
       </div>
-      <el-form-item v-if="user.UserCode" :label="$t('system:userlist:table:S/N')" prop="UserCode">
+      <el-form-item
+        v-if="user.UserCode"
+        :label="$t('system:userlist:table:S/N')"
+        prop="UserCode"
+      >
         <el-input v-model="user.UserCode" disabled />
       </el-form-item>
 
-      <el-form-item :label="$t('system:userlist:table:UserName')" class="my_new_pwd" prop="UserName">
+      <el-form-item
+        :label="$t('system:userlist:table:UserName')"
+        class="my_new_pwd"
+        prop="UserName"
+      >
         <el-input v-model="user.UserName" clearable />
       </el-form-item>
 
-      <el-form-item :label="$t('system:userlist:table:LastName')" prop="LastName">
+      <el-form-item
+        :label="$t('system:userlist:table:LastName')"
+        prop="LastName"
+      >
         <el-input v-model="user.LastName" clearable />
       </el-form-item>
-      <el-form-item :label="$t('system:userlist:table:FirstName')" prop="FirstName">
+      <el-form-item
+        :label="$t('system:userlist:table:FirstName')"
+        prop="FirstName"
+      >
         <el-input v-model="user.FirstName" clearable />
       </el-form-item>
       <!-- <el-form-item
@@ -34,23 +55,42 @@
       <el-form-item :label="$t('system:userlist:table:Phone')" prop="Phone">
         <el-input v-model="user.Phone" clearable />
       </el-form-item>
-      <el-form-item v-if="type == 1" :label="$t('system:userlist:table:Disable')">
+      <el-form-item
-        <el-switch v-model="user.Status" :active-value="1" :inactive-value="0" />
+        v-if="type == 1"
+        :label="$t('system:userlist:table:Disable')"
+      >
+        <el-switch
+          v-model="user.Status"
+          :active-value="1"
+          :inactive-value="0"
+        />
       </el-form-item>
       <!-- <el-form-item label="IsTestUser:">
         <el-switch v-model="user.IsTestUser" />
       </el-form-item> -->
-      <el-form-item :label="$t('system:userlist:table:UserType')" prop="UserTypeId">
+      <el-form-item
-        <el-select ref="userType" v-model="user.UserTypeId" size="small" placeholder="" style="width: 100%"
+        :label="$t('system:userlist:table:UserType')"
-          :disabled="user.CanEditUserType === false" clearable @change="userTypeChange">
+        prop="UserTypeId"
+      >
+        <el-select
+          ref="userType"
+          v-model="user.UserTypeId"
+          size="small"
+          placeholder=""
+          style="width: 100%"
+          :disabled="user.CanEditUserType === false"
+          clearable
+          @change="userTypeChange"
+        >
           <template v-for="(userType, key) of userTypeOptions">
-            <el-option :key="key" :label="userType.UserType" :value="userType.Id" />
+            <el-option
+              :key="key"
+              :label="userType.UserType"
+              :value="userType.Id"
+            />
           </template>
         </el-select>
       </el-form-item>
-      <el-form-item label="">
-        <span>{{ $t('system:userlist:tip:defaultPassword') }}</span>
-      </el-form-item>
       <!-- <el-form-item
         :label="$t('trials:researchForm:form:checkCode')"
         prop="checkCode"
@@ -63,12 +103,21 @@
       </el-form-item> -->
     </el-card>
 
-    <el-card class="Affiliation" shadow="never" style="margin-top: 10px" size="small">
+    <el-card
+      class="Affiliation"
+      shadow="never"
+      style="margin-top: 10px"
+      size="small"
+    >
       <div slot="header" class="clearfix">
         <span>{{ $t("system:userlist:title:Affiliation") }}</span>
       </div>
       <el-form-item prop="IsZhiZhun">
-        <el-radio-group v-model="user.IsZhiZhun" @change="OrgnizationTypeChanged" :disabled="IsZhiZhunDisabled">
+        <el-radio-group
+          v-model="user.IsZhiZhun"
+          @change="OrgnizationTypeChanged"
+          :disabled="IsZhiZhunDisabled"
+        >
           <el-radio :label="true">{{
             $t("system:userlist:title:Internal")
           }}</el-radio>
@@ -78,19 +127,35 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item :label="$t('system:userlist:table:OrganizationName')">
-        <el-input v-model="user.OrganizationName" :disabled="user.IsZhiZhun === true" clearable />
+        <el-input
+          v-model="user.OrganizationName"
+          :disabled="user.IsZhiZhun === true"
+          clearable
+        />
       </el-form-item>
 
-      <el-form-item :label="$t('system:userlist:table:Department')" prop="DepartmentName">
+      <el-form-item
+        :label="$t('system:userlist:table:Department')"
+        prop="DepartmentName"
+      >
         <el-input v-model="user.DepartmentName" clearable />
       </el-form-item>
-      <el-form-item :label="$t('system:userlist:table:Position')" prop="PositionName">
+      <el-form-item
+        :label="$t('system:userlist:table:Position')"
+        prop="PositionName"
+      >
         <el-input v-model="user.PositionName" clearable />
       </el-form-item>
     </el-card>
     <el-form-item>
-      <el-button type="primary" size="small" :disabled="isDisabled" style="margin: 10px 15px" @click="handleSave">{{
+      <el-button
-        $t("passwordReset:button:submit") }}</el-button>
+        type="primary"
+        size="small"
+        :disabled="isDisabled"
+        style="margin: 10px 15px"
+        @click="handleSave"
+        >{{ $t("passwordReset:button:submit") }}</el-button
+      >
     </el-form-item>
   </el-form>
 </template>
@@ -119,11 +184,11 @@ export default {
         callback(
           lang === "zh"
             ? new Error(
-              "1）新建账号，用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；"
+                "1）新建账号，用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；"
-            )
+              )
             : new Error(
-              "For a new account, the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed."
+                "For a new account, the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed."
-            )
+              )
         );
       } else {
         callback();
@@ -350,3 +415,4 @@ export default {
   margin-bottom: 40px;
 }
 </style>
+

src/views/trials/trials-panel/reading/reading-task/components/TaskList.vue

@@ -164,7 +164,7 @@ import {
   getIRUnReadSubjectTaskList,
   verifyReadingRestTime,
 } from "@/api/trials";
-import { claimOrCancelSubject, clearSkipReadingCache } from "@/api/reading";
+import { claimOrCancelSubject } from "@/api/reading";
 import BaseContainer from "@/components/BaseContainer";
 import Pagination from "@/components/Pagination";
 import { getToken } from "@/utils/auth";
@@ -272,12 +272,11 @@ export default {
       this.searchData = searchDataDefault();
       this.getList();
     },
-    async handleReadImage(row) {
+    handleReadImage(row) {
       if (this.openWindow) {
         this.openWindow.close();
       }
       this.loading = true;
-      await clearSkipReadingCache()
       verifyReadingRestTime()
         .then((_) => {
           this.loading = false;
@@ -303,12 +302,11 @@ export default {
           this.loading = false;
         });
     },
-    async handleOutOfOrderReading() {
+    handleOutOfOrderReading() {
       if (this.openWindow) {
         this.openWindow.close();
       }
       this.loading = true;
-      await clearSkipReadingCache()
       verifyReadingRestTime()
         .then((_) => {
           this.loading = false;