From 2f4ace45b8d316494fb90d5fa9015768017760e7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 27 Dec 2024 11:48:22 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=80=E5=90=8E=E4=B8=80=E6=AC=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/list/index.vue | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index cadd4563..053e5dc5 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -95,8 +95,12 @@ const searchDataDefault = () => {
     RealName: '',
     BeginCreateTime: '',
     EndCreateTime: '',
+    EndLastLoginTime: null,
+    EndLastChangePassWordTime: null,
+    BeginLastChangePassWordTime: null,
     CreateTimeArr: [],
     LastLoginTimeArr: [],
+    LastChangePassWordTimeArr: [],
     SortField: 'CreateTime',
   }
 }
@@ -202,6 +206,13 @@ export default {
           sortable: 'custom',
           showOverflowTooltip: true,
         },
+        {
+          prop: 'LastChangePassWordTime',
+          label: this.$t('system:userlist:table:LastChangePassWordTime'),
+          minWidth: 200,
+          sortable: 'custom',
+          showOverflowTooltip: true,
+        },
         {
           prop: 'CreateTime',
           label: this.$t('system:userlist:table:createTime'),
@@ -213,7 +224,7 @@ export default {
           type: 'operate',
           label: this.$t('common:action:action'),
           minWidth: 200,
-          fixed:"right",
+          fixed: 'right',
           operates: [
             {
               name: this.$t('common:button:edit'),
@@ -338,6 +349,13 @@ export default {
           width: '400px',
           placeholder: '',
         },
+        {
+          type: 'Daterange',
+          label: this.$t('system:userlist:label:LastChangePassWordTime'),
+          prop: 'LastChangePassWordTimeArr',
+          width: '400px',
+          placeholder: '',
+        },
         {
           type: 'Daterange',
           label: this.$t('system:userlist:label:CreateTime'),
@@ -442,6 +460,12 @@ export default {
         this.searchData.BeginLastLoginTime = this.searchData.LastLoginTimeArr[0]
         this.searchData.EndLastLoginTime = this.searchData.LastLoginTimeArr[1]
       }
+      if (this.searchData.LastChangePassWordTimeArr.length > 0) {
+        this.searchData.BeginLastChangePassWordTime =
+          this.searchData.LastChangePassWordTimeArr[0]
+        this.searchData.EndLastChangePassWordTime =
+          this.searchData.LastChangePassWordTimeArr[1]
+      }
       this.getList()
     },
   },

From f739563fe90b96db81982a1366e5935cc6dab2b6 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 27 Dec 2024 11:48:49 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E5=A4=96=E9=83=A8=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E6=8E=A5=E5=8F=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0UserTypeId=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-myinfo/account.vue    |   7 +-
 .../components/staffExternalForm.vue          | 328 ++++++++++++------
 2 files changed, 230 insertions(+), 105 deletions(-)

diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue
index 4e1c2282..4d543460 100644
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@@ -336,4 +336,9 @@ export default {
     },
   },
 }
-</script>
\ No newline at end of file
+</script>
+<style lang="scss" scoped>
+.el-radio-group {
+  margin-top: 12px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index b068b91c..cb616a7d 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -1,6 +1,6 @@
 <template>
   <el-container class="participant-container">
-    <el-header style="height:50px">
+    <el-header style="height: 50px">
       <div class="filter-container">
         <!-- 姓名 -->
         <span>{{ $t('trials:externalStaff:table:name') }}:</span>
@@ -12,23 +12,54 @@
         <span>{{ $t('trials:externalStaff:table:phone') }}:</span>
         <el-input v-model="listQuery.Phone" size="mini" class="mr" clearable />
         <!-- 查询 -->
-        <el-button type="primary" size="mini" icon="el-icon-search" @click="handleSearch">
+        <el-button
+          type="primary"
+          size="mini"
+          icon="el-icon-search"
+          @click="handleSearch"
+        >
           {{ $t('common:button:search') }}
         </el-button>
         <!-- 重置 -->
-        <el-button size="mini" type="primary" icon="el-icon-refresh-left" @click="handleReset">
+        <el-button
+          size="mini"
+          type="primary"
+          icon="el-icon-refresh-left"
+          @click="handleReset"
+        >
           {{ $t('common:button:reset') }}
         </el-button>
         <!-- 权限配置 -->
-        <el-button type="primary" size="mini" style="margin-left:auto" :loading="assignLoadStatus" @click="openPermission">
+        <el-button
+          type="primary"
+          size="mini"
+          style="margin-left: auto"
+          :loading="assignLoadStatus"
+          @click="openPermission"
+        >
           {{ $t('trials:staff:button:permissionConfiguration') }}
         </el-button>
         <!-- 发送邮件 -->
-        <el-button type="primary" size="mini" style="margin-left:10px" :disabled="selectArr.length === 0" :loading="assignLoadStatus" icon="el-icon-message" @click="sendEmail">
+        <el-button
+          type="primary"
+          size="mini"
+          style="margin-left: 10px"
+          :disabled="selectArr.length === 0"
+          :loading="assignLoadStatus"
+          icon="el-icon-message"
+          @click="sendEmail"
+        >
           {{ $t('trials:staff:button:sendEmail') }}
         </el-button>
         <!-- 添加 -->
-        <el-button type="primary" icon="el-icon-plus" size="mini" style="margin-left:10px" :loading="assignLoadStatus" @click="handleAdd">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          style="margin-left: 10px"
+          :loading="assignLoadStatus"
+          @click="handleAdd"
+        >
           {{ $t('trials:staff:button:addExternalStaff') }}
         </el-button>
       </div>
@@ -57,7 +88,9 @@
             sortable="custom"
             min-width="100"
           >
-            <template slot-scope="scope">{{ scope.row.LastName + ' / ' + scope.row.FirstName }}</template>
+            <template slot-scope="scope">{{
+              scope.row.LastName + ' / ' + scope.row.FirstName
+            }}</template>
           </el-table-column>
           <el-table-column
             prop="UserType"
@@ -67,7 +100,13 @@
             min-width="120"
           >
             <template slot-scope="scope">
-              {{ userTypeOptions.length > 0 ? userTypeOptions.find((v) => { return v.Id == scope.row.UserTypeId }).UserTypeShortName : '' }}
+              {{
+                userTypeOptions.length > 0
+                  ? userTypeOptions.find((v) => {
+                      return v.Id == scope.row.UserTypeId
+                    }).UserTypeShortName
+                  : ''
+              }}
             </template>
           </el-table-column>
           <el-table-column
@@ -100,9 +139,15 @@
             sortable="custom"
             min-width="120"
           >
-            <template slot-scope="scope">{{ $fd('IsJoin', scope.row.IsJoin) }}</template>
+            <template slot-scope="scope">{{
+              $fd('IsJoin', scope.row.IsJoin)
+            }}</template>
           </el-table-column>
-          <el-table-column :label="$t('common:action:action')" fixed="right" min-width="150">
+          <el-table-column
+            :label="$t('common:action:action')"
+            fixed="right"
+            min-width="150"
+          >
             <template slot-scope="scope">
               <el-button
                 circle
@@ -116,23 +161,57 @@
         </el-table>
       </div>
     </el-main>
-    <StaffExternalAdd ref="StaffExternalAdd" :user-type-options="userTypeOptions" @getList="refeshList" />
+    <StaffExternalAdd
+      ref="StaffExternalAdd"
+      :user-type-options="userTypeOptions"
+      @getList="refeshList"
+    />
     <base-model v-if="model_config.visible" :config="model_config">
       <template slot="dialog-body">
-        <el-form :model="permission" :rules="permissionRole" ref="permissionForm" label-width="140px" class="demo-ruleForm">
-          <el-form-item :label="$t('trials:externalStaff:form:IsSPMJoinReReadingApproval')" prop="IsSPMJoinReReadingApproval">
+        <el-form
+          :model="permission"
+          :rules="permissionRole"
+          ref="permissionForm"
+          label-width="140px"
+          class="demo-ruleForm"
+        >
+          <el-form-item
+            :label="$t('trials:externalStaff:form:IsSPMJoinReReadingApproval')"
+            prop="IsSPMJoinReReadingApproval"
+          >
             <el-radio-group v-model="permission.IsSPMJoinReReadingApproval">
-              <el-radio v-for="item in $d.YesOrNo" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+              <el-radio
+                v-for="item in $d.YesOrNo"
+                :key="item.id"
+                :label="item.value"
+                >{{ item.label }}</el-radio
+              >
             </el-radio-group>
           </el-form-item>
-          <el-form-item :label="$t('trials:externalStaff:form:IsSPMJoinReviewerSelect')" prop="IsSPMJoinReviewerSelect">
+          <el-form-item
+            :label="$t('trials:externalStaff:form:IsSPMJoinReviewerSelect')"
+            prop="IsSPMJoinReviewerSelect"
+          >
             <el-radio-group v-model="permission.IsSPMJoinReviewerSelect">
-              <el-radio v-for="item in $d.YesOrNo" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+              <el-radio
+                v-for="item in $d.YesOrNo"
+                :key="item.id"
+                :label="item.value"
+                >{{ item.label }}</el-radio
+              >
             </el-radio-group>
           </el-form-item>
-          <el-form-item :label="$t('trials:externalStaff:form:IsSPMJoinSiteSurvey')" prop="IsSPMJoinSiteSurvey">
+          <el-form-item
+            :label="$t('trials:externalStaff:form:IsSPMJoinSiteSurvey')"
+            prop="IsSPMJoinSiteSurvey"
+          >
             <el-radio-group v-model="permission.IsSPMJoinSiteSurvey">
-              <el-radio v-for="item in $d.YesOrNo" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+              <el-radio
+                v-for="item in $d.YesOrNo"
+                :key="item.id"
+                :label="item.value"
+                >{{ item.label }}</el-radio
+              >
             </el-radio-group>
           </el-form-item>
         </el-form>
@@ -159,7 +238,14 @@
   </el-container>
 </template>
 <script>
-import { getTrialExternalUserList, addTrialUsers, getUserTypeList, sendExternalUserJoinEmail, getTrialConfigInfo, configTrialSPMInfo } from '@/api/trials'
+import {
+  getTrialExternalUserList,
+  addTrialUsers,
+  getUserTypeList,
+  sendExternalUserJoinEmail,
+  getTrialConfigInfo,
+  configTrialSPMInfo,
+} from '@/api/trials'
 import { deleteTrialExternalUser } from '@/api/trials/setting.js'
 import StaffExternalAdd from './staffExternalAdd'
 import BaseModel from '@/components/BaseModel'
@@ -167,11 +253,11 @@ const getListQueryDefault = () => {
   return {
     Phone: '',
     Email: '',
-    Name: ''
+    Name: '',
   }
 }
 export default {
-  components: { StaffExternalAdd,BaseModel },
+  components: { StaffExternalAdd, BaseModel },
   data() {
     return {
       list: [],
@@ -181,17 +267,26 @@ export default {
       assignLoadStatus: false,
       // isAdmin: JSON.parse(zzSessionStorage.getItem('IsAdmin')),
       userTypeOptions: [],
-      stateList: ['WaitSent', 'HasSend', 'UserConfirmed', 'UserReject', 'OverTime'],
+      stateList: [
+        'WaitSent',
+        'HasSend',
+        'UserConfirmed',
+        'UserReject',
+        'OverTime',
+      ],
       trialId: '',
-      model_config:{
-         visible: false, title: this.$t('trials:staff:dialogTitle:permissionConfiguration'), width: '500px', appendToBody: true
+      model_config: {
+        visible: false,
+        title: this.$t('trials:staff:dialogTitle:permissionConfiguration'),
+        width: '500px',
+        appendToBody: true,
       },
-      permission:{
+      permission: {
         IsSPMJoinReReadingApproval: false,
         IsSPMJoinReviewerSelect: false,
         IsSPMJoinSiteSurvey: false,
       },
-      permissionRole:{}
+      permissionRole: {},
     }
   },
   mounted() {
@@ -201,42 +296,42 @@ export default {
   },
   methods: {
     // 获取权限配置
-    async getPermission(){
-      try{
-        let res =  await getTrialConfigInfo(this.trialId);
-        if(res.IsSuccess){
-          Object.keys(this.permission).forEach(key=>{
+    async getPermission() {
+      try {
+        let res = await getTrialConfigInfo(this.trialId)
+        if (res.IsSuccess) {
+          Object.keys(this.permission).forEach((key) => {
             this.permission[key] = res.Result[key]
           })
         }
-      }catch(err){
+      } catch (err) {
         console.log(err)
       }
     },
     // 打开权限配置弹窗
-    async openPermission(){
-      try{
-        await this.getPermission();
-        this.model_config.visible = true;
-      }catch(err){
-        console.log(err);
+    async openPermission() {
+      try {
+        await this.getPermission()
+        this.model_config.visible = true
+      } catch (err) {
+        console.log(err)
       }
     },
     // 保存权限配置
-    async savePermission(){
-      try{
-        let validate =await this.$refs.permissionForm.validate();
-        if(!validate) return false;
-        this.assignLoadStatus = true;
-        let data = Object.assign({ Id: this.trialId },this.permission)
-        let res = await configTrialSPMInfo(data);
-        this.assignLoadStatus = false;
-        if(res.IsSuccess){
-          this.model_config.visible = false;
-          this.$message.success(this.$t("common:message:updatedSuccessfully"))
+    async savePermission() {
+      try {
+        let validate = await this.$refs.permissionForm.validate()
+        if (!validate) return false
+        this.assignLoadStatus = true
+        let data = Object.assign({ Id: this.trialId }, this.permission)
+        let res = await configTrialSPMInfo(data)
+        this.assignLoadStatus = false
+        if (res.IsSuccess) {
+          this.model_config.visible = false
+          this.$message.success(this.$t('common:message:updatedSuccessfully'))
         }
-      }catch(err){
-        this.assignLoadStatus = false;
+      } catch (err) {
+        this.assignLoadStatus = false
         console.log(err)
       }
     },
@@ -249,83 +344,108 @@ export default {
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['StaffExternalAdd'].openDialog(this.$t('trials:externalStaff:dialogTitle:edit'), row)
+        this.$refs['StaffExternalAdd'].openDialog(
+          this.$t('trials:externalStaff:dialogTitle:edit'),
+          row
+        )
       })
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['StaffExternalAdd'].openDialog(this.$t('trials:externalStaff:dialogTitle:add'), {})
+        this.$refs['StaffExternalAdd'].openDialog(
+          this.$t('trials:externalStaff:dialogTitle:add'),
+          {}
+        )
       })
     },
     deleteTrialExternalUser(row) {
       this.$confirm(this.$t('trials:externalStaff:message:delete'), {
         type: 'warning',
-        distinguishCancelAndClose: true
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.loading = true
+        deleteTrialExternalUser(row.Id, row.IsSystemUser, row.SystemUserId)
+          .then((res) => {
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
+            this.getList()
+            this.loading = false
+          })
+          .catch(() => {
+            this.loading = false
+          })
       })
-        .then(() => {
-          this.loading = true
-          deleteTrialExternalUser(row.Id, row.IsSystemUser, row.SystemUserId)
-            .then(res => {
-              this.$message.success(this.$t('common:message:deletedSuccessfully'))
-              this.getList()
-              this.loading = false
-            }).catch(() => { this.loading = false })
-        })
     },
     sendEmail() {
       const loading = this.$loading({
         target: document.querySelector('.participant-table-list'),
         fullscreen: false,
-        lock: true
+        lock: true,
       })
       // var BaseUrl = document.domain + `/#/login`
       var BaseUrl = `${location.protocol}//${location.host}/login`
       var joinUrl = `${location.protocol}//${location.host}/email-recompose`
-      var sendEmailUserArr = this.selectArr.map((v) => { return { Id: v.Id, Email: v.Email, IsSystemUser: v.IsSystemUser, SystemUserId: v.SystemUserId } })
+      var sendEmailUserArr = this.selectArr.map((v) => {
+        return {
+          Id: v.Id,
+          Email: v.Email,
+          IsSystemUser: v.IsSystemUser,
+          SystemUserId: v.SystemUserId,
+          UserTypeId: v.UserTypeId,
+        }
+      })
       sendExternalUserJoinEmail({
         TrialId: this.trialId,
         SendUsers: sendEmailUserArr,
         BaseUrl: BaseUrl,
-        RouteUrl: joinUrl
-      }).then(() => {
-        loading.close()
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
-        this.getList()
-        this.$emit('getList')
-      }).catch(() => { loading.close() })
+        RouteUrl: joinUrl,
+      })
+        .then(() => {
+          loading.close()
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.getList()
+          this.$emit('getList')
+        })
+        .catch(() => {
+          loading.close()
+        })
     },
     getList() {
       const loading = this.$loading({
         target: document.querySelector('.participant-table-list'),
         fullscreen: false,
-        lock: true
+        lock: true,
       })
       this.listQuery.TrialId = this.trialId
-      getTrialExternalUserList(this.listQuery).then(res => {
-        loading.close()
-        this.list = res.Result
-      }).catch(() => { loading.close() })
+      getTrialExternalUserList(this.listQuery)
+        .then((res) => {
+          loading.close()
+          this.list = res.Result
+        })
+        .catch(() => {
+          loading.close()
+        })
     },
     handleAssign() {
       this.$confirm(this.$t('trials:externalStaff:message:add'), {
         type: 'warning',
-        distinguishCancelAndClose: true
+        distinguishCancelAndClose: true,
       }).then(() => {
         const loading = this.$loading({
           target: document.querySelector('.participant-table-list'),
           fullscreen: false,
-          lock: true
+          lock: true,
         })
         this.assignLoadStatus = true
         addTrialUsers(this.selectArr)
-          .then(res => {
+          .then((res) => {
             this.assignLoadStatus = false
             loading.close()
             if (res.IsSuccess) {
               this.$emit('closeDialog')
               this.$message.success(this.$t('common:message:savedSuccessfully'))
             }
-          }).catch(() => {
+          })
+          .catch(() => {
             loading.close()
             this.assignLoadStatus = false
           })
@@ -360,35 +480,35 @@ export default {
       }
     },
     getUserType() {
-      getUserTypeList(1).then(res => {
+      getUserTypeList(1).then((res) => {
         this.userTypeOptions = res.Result
       })
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-  .participant-container{
-    height: 100%;
-    .el-header{
-      .filter-container{
-        display: flex;
-        align-items: center;
-        span{
-          font-size:13px;
-          margin-right:5px;
-        }
-        .mr{
-          margin-right: 5px;
-          width: 120px;
-        }
+.participant-container {
+  height: 100%;
+  .el-header {
+    .filter-container {
+      display: flex;
+      align-items: center;
+      span {
+        font-size: 13px;
+        margin-right: 5px;
+      }
+      .mr {
+        margin-right: 5px;
+        width: 120px;
       }
     }
-    .el-main{
-      padding: 0px;
-    }
-    .el-footer{
-      padding: 0 20px;
-    }
   }
+  .el-main {
+    padding: 0px;
+  }
+  .el-footer {
+    padding: 0 20px;
+  }
+}
 </style>

From 328359dfde7c478585594a3ad37c398580997be9 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 27 Dec 2024 14:49:58 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E7=99=BB=E5=BD=95ip=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f37debd8..8944d0a3 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -308,6 +308,8 @@ export default {
       Img1,
       toggleRoleVisible: false,
       toggleRoleLoading: false,
+
+      LoginState: 0,
     }
   },
   computed: {
@@ -383,10 +385,12 @@ export default {
     loginIn(Id) {
       this.loading = true
       this.showCode = false
+      this.LoginState = 0
       if (Id) this.loginForm.UserId = Id
       this.$store
         .dispatch('user/login', this.loginForm)
         .then((res) => {
+          this.LoginState = res.BasicInfo.LoginState
           if (res.BasicInfo.IsFirstAdd) {
             // 当前用户为首次登录,请先修改密码之后再次登录
             this.$message.success(this.$t('login:message:login1'))
@@ -422,11 +426,12 @@ export default {
               },
             })
             return
-          } else if (res.BasicInfo.LoginState === 2) {
-            // 本次登录的IP或设备与上次不一致，请确认'
-            // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
-            this.$message.warning(this.$t('login:message:login4'))
           }
+          // else if (res.BasicInfo.LoginState === 2) {
+          //   // 本次登录的IP或设备与上次不一致，请确认'
+          //   // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
+          //   this.$message.warning(this.$t('login:message:login4'))
+          // }
           if (
             Array.isArray(this.$store.state.user.roles) &&
             this.$store.state.user.roles.length === 1
@@ -455,6 +460,9 @@ export default {
                 if (res && res.length > 0) {
                   this.$store.dispatch('global/getNoticeList')
                   this.$router.addRoutes(res)
+                  if (this.LoginState === 2) {
+                    this.$message.warning(this.$t('login:message:login4'))
+                  }
                   if (this.loginType === 'DevOps') {
                     this.$router.replace({ path: res[0].path })
                     return

From d790a95952c0fa3c80dc3e80cb1657a1821becdd Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 27 Dec 2024 16:21:01 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E8=A7=92=E8=89=B2=E6=97=B6=E5=8E=BB=E9=99=A4RC?=
 =?UTF-8?q?=E5=92=8CDash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/components/UserInfo.vue | 4 ++--
 src/views/system/user/components/roleList.vue | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index db0d0c04..73a63687 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -89,7 +89,7 @@
           >
             <template v-for="userType of userTypeOptions">
               <el-option
-                v-if="userType.UserTypeEnum !== 20"
+                 v-if="![4, 6, 20].includes(userType.UserTypeEnum)"
                 :key="userType.Id"
                 :label="userType.UserType"
                 :value="userType.Id"
@@ -109,7 +109,7 @@
           >
             <template v-for="userType of userTypeOptions">
               <el-option
-                v-if="userType.UserTypeEnum !== 20"
+                v-if="![4, 6, 20].includes(userType.UserTypeEnum)"
                 :key="userType.Id"
                 :label="userType.UserType"
                 :value="userType.Id"
diff --git a/src/views/system/user/components/roleList.vue b/src/views/system/user/components/roleList.vue
index 4a619881..2c337f79 100644
--- a/src/views/system/user/components/roleList.vue
+++ b/src/views/system/user/components/roleList.vue
@@ -155,7 +155,8 @@ export default {
     roleList() {
       let arr = this.list.map((item) => item.UserTypeId)
       return this.userTypeOptions.filter(
-        (item) => !arr.includes(item.Id) && item.UserTypeEnum !== 20
+        (item) =>
+          !arr.includes(item.Id) && ![4, 6, 20].includes(userType.UserTypeEnum)
       )
     },
   },

From 41ac3d562ae5cacb6b63984ae9eeb3189cb83763 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 27 Dec 2024 16:24:43 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BaseForm/search-form.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/BaseForm/search-form.vue b/src/components/BaseForm/search-form.vue
index 378bec3a..101e399b 100644
--- a/src/components/BaseForm/search-form.vue
+++ b/src/components/BaseForm/search-form.vue
@@ -120,6 +120,7 @@
           v-if="item.type === 'Daterange'"
           v-model="searchData[item.prop]"
           type="datetimerange"
+          :default-time="['00:00:00', '23:59:59']"
           :range-separator="$t('baseForm:daterange:rangeSeparator')"
           :start-placeholder="$t('baseForm:daterange:startPlaceholder')"
           :end-placeholder="$t('baseForm:daterange:startendPlaceholder')"

From 3c50254a2dfc13839aa00b74aba8ec30daf5840e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 27 Dec 2024 16:40:07 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/toggleRole/index.vue        | 13 +++++++++++--
 src/views/trials/trials-myinfo/account.vue |  8 +++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/toggleRole/index.vue b/src/components/toggleRole/index.vue
index d1e9222b..7d508b3a 100644
--- a/src/components/toggleRole/index.vue
+++ b/src/components/toggleRole/index.vue
@@ -40,6 +40,7 @@
         type="primary"
         size="small"
         @click="save"
+        :disabled="saveDisabled"
         :loading="loading"
         v-if="hasRole"
       >
@@ -78,6 +79,9 @@ export default {
     hasRole() {
       return this.roles && this.roles.length > 0
     },
+    saveDisabled() {
+      return this.form.userRoleId === zzSessionStorage.getItem('userId')
+    },
   },
   methods: {
     cancel() {
@@ -98,11 +102,13 @@ export default {
 </script>
 <style lang="scss" scoped>
 .roles {
-  width: 100%;
+  max-width: 365px;
+  width: fit-content;
   display: flex;
   align-content: center;
-  justify-content: center;
+  // justify-content: center;
   flex-wrap: wrap;
+  margin: auto;
 }
 
 /deep/ .el-radio__original {
@@ -113,4 +119,7 @@ export default {
   .el-radio__inner {
   box-shadow: none !important;
 }
+.el-radio {
+  width: 60px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue
index 4d543460..401dcaa3 100644
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@@ -127,7 +127,7 @@
           </el-radio-group>
           <!-- 修改 -->
           <el-button
-            :disabled="!userRoleId"
+            :disabled="!userRoleId || saveDisabled"
             class="saveBtn"
             :loading="toggleRoleLoading"
             type="primary"
@@ -215,6 +215,9 @@ export default {
     hasRole() {
       return this.roles && this.roles.length > 1
     },
+    saveDisabled() {
+      return this.userRoleId === zzSessionStorage.getItem('userId')
+    },
   },
   methods: {
     // 切换角色
@@ -341,4 +344,7 @@ export default {
 .el-radio-group {
   margin-top: 12px;
 }
+.el-radio {
+  width: 60px;
+}
 </style>
\ No newline at end of file

From bf407a49fd34bfd9e42b370f910ae6849b230dac Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 27 Dec 2024 17:22:23 +0800
Subject: [PATCH 07/15] 1

---
 src/views/system/user/list/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index 053e5dc5..ca6636f2 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -209,7 +209,7 @@ export default {
         {
           prop: 'LastChangePassWordTime',
           label: this.$t('system:userlist:table:LastChangePassWordTime'),
-          minWidth: 200,
+          minWidth: 250,
           sortable: 'custom',
           showOverflowTooltip: true,
         },

From 13ba919484c75c3ab15c68bb82dd355362848435 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 27 Dec 2024 18:02:18 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/ad-review/index.vue  | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/ad-review/index.vue b/src/views/trials/trials-panel/reading/ad-review/index.vue
index 7ad26027..45efb219 100644
--- a/src/views/trials/trials-panel/reading/ad-review/index.vue
+++ b/src/views/trials/trials-panel/reading/ad-review/index.vue
@@ -307,23 +307,21 @@
             </div>
           </el-upload>
         </el-form-item>
-        <el-form-item v-if="adInfo.ReadingTaskState < 2">
-          <div style="text-align: center">
-            <el-button type="primary" @click="skipTask">
-              <!-- 跳过 -->
-              {{ $t("trials:readingReport:button:skip") }}
-            </el-button>
-            <!-- 保存 -->
-            <el-button type="primary" @click="handleSave">{{
-              $t("common:button:save")
-            }}</el-button>
-            <!-- 提交 -->
-            <el-button type="primary" @click="handleSubmit">{{
-              $t("common:button:submit")
-            }}</el-button>
-          </div>
-        </el-form-item>
       </el-form>
+      <div style="text-align: center;width:100%" v-if="adInfo.ReadingTaskState < 2">
+        <el-button type="primary" @click="skipTask">
+          <!-- 跳过 -->
+          {{ $t("trials:readingReport:button:skip") }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button type="primary" @click="handleSave">{{
+          $t("common:button:save")
+        }}</el-button>
+        <!-- 提交 -->
+        <el-button type="primary" @click="handleSubmit">{{
+          $t("common:button:submit")
+        }}</el-button>
+      </div>
     </el-card>
 
     <el-card

From 4defa157ee75e190f2ce486acf273bd157a33b26 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 30 Dec 2024 09:35:10 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=B6=EF=BC=8C=E5=8C=B9=E9=85=8D=E7=AC=A6?=
 =?UTF-8?q?=E6=9C=AA=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/visit/crc-upload/index.vue   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index a0ed9df3..bf178718 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -742,7 +742,10 @@
             </el-button>
           </el-form-item>
         </el-form>
-        <div class="tip" v-if="[0].includes($store.state.trials.config.CollectImagesEnum)">
+        <div
+          class="tip"
+          v-if="[0].includes($store.state.trials.config.CollectImagesEnum)"
+        >
           <i class="el-icon-warning-outline"></i>
           <div v-html="$t('trials:uploadedDicoms:tip:message')"></div>
         </div>
@@ -1754,12 +1757,10 @@ export default {
           this.selected.TrialId = this.subjectRowData.TrialId
           this.selected.SubjectId = this.subjectRowData.SubjectId
           this.isShow = true
-          console.log(res)
         })
       }
     },
     handleView2(row) {
-      console.log(row)
       this.rowData = { ...row }
       this.openType = 'look'
       this.preview.visible = true
@@ -1914,7 +1915,6 @@ export default {
           this.list = res.Result.CurrentPageData
           this.total = res.Result.TotalCount
           this.otherInfo = res.OtherInfo
-          console.log(this.otherInfo)
         })
         .catch(() => {
           this.loading = false
@@ -2053,9 +2053,16 @@ export default {
           this.otherInfo.ClinicalInformationTransmissionEnum > 0 &&
           this.rowData.IsBaseLine
         ) {
-          const { ClinicalDataConfirmation } = const_.processSignature
-          this.signCode = ClinicalDataConfirmation
-          this.signVisible = true
+          getVisitClinicalDataName({ id: this.rowData.Id })
+            .then((res) => {
+              this.signReplaceText = res.Result.ClinicalDataName
+              const { ClinicalDataConfirmation } = const_.processSignature
+              this.signCode = ClinicalDataConfirmation
+              this.signVisible = true
+            })
+            .catch((err) => {
+              console.log(err)
+            })
         } else {
           this.submit()
         }

From ca4f2c4a8e2a87a70cd00faf1313e7ae7af7117c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 30 Dec 2024 13:15:50 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/login-log/detail.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/system/login-log/detail.vue b/src/views/system/login-log/detail.vue
index fedbb8ca..f8890f5b 100644
--- a/src/views/system/login-log/detail.vue
+++ b/src/views/system/login-log/detail.vue
@@ -49,6 +49,8 @@ export default {
           title: this.$t('system:loginLog:dialog:title'),
           width: '500px',
           top: '10vh',
+          appendToBody: true,
+          bodyStyle: `min-height: 100px; max-height: 650px;overflow-y: auto;padding: 10px;border: 1px solid #e0e0e0;`,
         }
       },
     },
@@ -86,4 +88,9 @@ export default {
     },
   },
 }
-</script>
\ No newline at end of file
+</script>
+<style lang="scss" scoped>
+::v-deep .el-form-item__label {
+  font-weight: bold;
+}
+</style>
\ No newline at end of file

From 75f3b37c05226ded9c956e17bfce5c810e9d4b7f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 30 Dec 2024 13:18:19 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E4=BB=B2=E8=A3=81=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading-unit/components/ArbitrationRules.vue       | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
index 75a91c56..8611acdd 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
@@ -72,12 +72,10 @@
                   "
                   :label="item.value"
                   v-if="
-                    (JudgyInfo.ArbitrationRule === 1 &&
-                      (item.value < 4 ||
-                        (item.value > 3 &&
-                          (QuestionList[index].Type === 'number' ||
-                            QuestionList[index].Type === 'calculation')))) ||
-                    (JudgyInfo.ArbitrationRule === 2 && item.value < 4)
+                    item.value < 4 ||
+                    (item.value > 3 &&
+                      (QuestionList[index].Type === 'number' ||
+                        QuestionList[index].Type === 'calculation'))
                   "
                 >
                   {{ item.label }}

From a78d848424a03cbf2ff7bd04988a89adfdc0e305 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 30 Dec 2024 13:30:10 +0800
Subject: [PATCH 12/15] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=87=E6=8D=A2=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 123 +++++++++++++++++++++++++++----
 1 file changed, 107 insertions(+), 16 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 49442e19..1800836a 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -14,13 +14,13 @@
 
     <div class="right-menu">
       <div class="navbar-flex-wrapper">
-        <template v-if="device!=='mobile'">
+        <template v-if="device !== 'mobile'">
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
         </template>
         <!-- <div class="avatar-container">
         <img src="@/assets/avatar.png" class="user-avatar">
       </div> -->
-        <div style="margin-left:20px;">
+        <div style="margin-left: 20px">
           <el-dropdown class="dropdown-container" trigger="click">
             <span class="el-dropdown-link">
               {{ `${name} (${userTypeShortName})` }}
@@ -30,10 +30,20 @@
             </span>
             <el-dropdown-menu slot="dropdown" class="user-dropdown">
               <el-dropdown-item v-if="!isReviewer">
-                <span style="display:block;" @click="editInfo">{{$t('system:navbar:button:Profile')}}</span>
+                <span style="display: block" @click="editInfo">{{
+                  $t('system:navbar:button:Profile')
+                }}</span>
+              </el-dropdown-item>
+              <!-- 切换角色 -->
+              <el-dropdown-item divided v-if="hasRole">
+                <span style="display: block" @click="openToggleRole">{{
+                  $t('system:navbar:button:toggleRole')
+                }}</span>
               </el-dropdown-item>
               <el-dropdown-item divided>
-                <span style="display:block;" @click="logout">{{$t('system:navbar:button:Log Out')}}</span>
+                <span style="display: block" @click="logout">{{
+                  $t('system:navbar:button:Log Out')
+                }}</span>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -41,38 +51,119 @@
         <TopLang></TopLang>
       </div>
     </div>
+    <toggleRole
+      v-if="toggleRoleVisible"
+      :visible.sync="toggleRoleVisible"
+      :loading="toggleRoleLoading"
+      @save="loginByRole"
+    />
   </div>
 </template>
 
 <script>
-import {mapGetters, mapMutations} from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import TopLang from './topLang'
-
-
+import toggleRole from '@/components/toggleRole'
+import { resetRouter } from '@/router'
 export default {
   components: {
     Breadcrumb,
     Hamburger,
     Screenfull,
-    TopLang
+    TopLang,
+    toggleRole,
   },
   data() {
     return {
       isReviewer: false,
-      userTypeShortName: zzSessionStorage.getItem('userTypeShortName')
+      toggleRoleVisible: false,
+      toggleRoleLoading: false,
     }
   },
   computed: {
-    ...mapGetters(['sidebar', 'name', 'device'])
+    ...mapGetters(['sidebar', 'name', 'device', 'userTypeShortName']),
+    roles() {
+      return this.$store.state.user.roles
+    },
+    hasRole() {
+      return this.roles && this.roles.length > 1
+    },
   },
   created() {
     // this.isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer'))
   },
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    openToggleRole() {
+      this.$store.dispatch('user/getUserInfo').then((res) => {
+        this.toggleRoleVisible = true
+      })
+    },
+    loginByRole(userRoleId) {
+      if (this.$store.state.user.userId === userRoleId) {
+        this.toggleRoleVisible = false
+        this.toggleRoleLoading = false
+        return false
+      }
+      this.toggleRoleLoading = true
+      this.$store
+        .dispatch('user/loginByRole', { userRoleId })
+        .then((res) => {
+          if (res) {
+            this.$store
+              .dispatch('permission/generateRoutes')
+              .then(async (res) => {
+                if (res && res.length > 0) {
+                  resetRouter()
+                  await this.$store.dispatch('global/getNoticeList')
+                  this.$router.addRoutes(res)
+                  this.toggleRoleLoading = false
+                  if (this.loginType === 'DevOps') {
+                    this.$router.replace({ path: res[0].path })
+                    return
+                  }
+                  if (this.hasPermi(['role:radmin'])) {
+                    this.$router.replace({ path: res[0].path })
+                    return
+                  }
+                  if (
+                    this.hasPermi([
+                      'role:air',
+                      'role:rpm',
+                      'role:rcrc',
+                      'role:rir',
+                    ])
+                  ) {
+                    history.replaceState(null, null, '/trials/trials-list')
+                    history.go(0)
+                  } else {
+                    history.replaceState(null, null, '/trials/trials-workbench')
+                    history.go(0)
+                  }
+                  this.toggleRoleVisible = false
+                  this.toggleRoleLoading = false
+                  this.$EventBus.$emit('reload')
+                } else {
+                  // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
+                  this.toggleRoleLoading = false
+                  this.$message.warning(this.$t('login:message:login2'))
+                }
+              })
+              .catch((err) => {
+                console.log(err)
+                this.toggleRoleLoading = false
+              })
+          } else {
+            this.toggleRoleLoading = false
+          }
+        })
+        .catch(() => {
+          this.toggleRoleLoading = false
+        })
+    },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
@@ -91,16 +182,16 @@ export default {
     editInfo() {
       this.$router.push({ name: 'BaiscInfo' })
     },
-  }
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-.navbar-flex-wrapper{
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-  }
+.navbar-flex-wrapper {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
 .navbar {
   height: 50px;
   overflow: hidden;

From 24e05ebc3e3cbc4bac418629a29e2bd1d94e30ed Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 30 Dec 2024 14:18:41 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/login-log/index.vue                  | 11 +++++++++--
 .../trials-panel/trial-summary/login-log/index.vue    | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/views/system/login-log/index.vue b/src/views/system/login-log/index.vue
index a2d50a95..18f37372 100644
--- a/src/views/system/login-log/index.vue
+++ b/src/views/system/login-log/index.vue
@@ -123,13 +123,13 @@
           show-overflow-tooltip
           sortable="custom"
         />
-        <el-table-column
+        <!-- <el-table-column
           :label="$t('system:loginLog:table:LoginFaildName')"
           prop="LoginFaildName"
           min-width="180"
           show-overflow-tooltip
           sortable="custom"
-        />
+        /> -->
         <el-table-column
           :label="$t('system:loginLog:table:LoginUserName')"
           prop="ActionUserName"
@@ -137,6 +137,13 @@
           show-overflow-tooltip
           sortable="custom"
         />
+        <el-table-column
+          :label="$t('system:loginLog:table:Aetionlserlype')"
+          prop="ActionUserType"
+          min-width="100"
+          show-overflow-tooltip
+          sortable="custom"
+        />
         <!-- <el-table-column
           :label="$t('system:loginLog:table:LoginUserType')"
           prop="LoginUserTypeEnum"
diff --git a/src/views/trials/trials-panel/trial-summary/login-log/index.vue b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
index f928d0da..27bc09b2 100644
--- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
@@ -135,14 +135,14 @@
           show-overflow-tooltip
           sortable="custom"
         /> -->
-        <el-table-column
+        <!-- <el-table-column
           v-if="!isMine"
           :label="$t('trials:loginLog:table:incorrectUserName')"
           prop="LoginFaildName"
           min-width="90"
           show-overflow-tooltip
           sortable="custom"
-        />
+        /> -->
         <el-table-column
           :label="$t('trials:loginLog:table:userName')"
           prop="ActionUserName"
@@ -150,6 +150,13 @@
           show-overflow-tooltip
           sortable="custom"
         />
+        <el-table-column
+          :label="$t('trials:loginLog:table:Aetionlserlype')"
+          prop="ActionUserType"
+          min-width="100"
+          show-overflow-tooltip
+          sortable="custom"
+        />
         <!-- <el-table-column
           :label="$t('trials:loginLog:table:userType')"
           prop="LoginUserTypeEnum"

From c5fb53a05f80df1bb34a72484a78d2c6a2ce288b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 30 Dec 2024 15:20:37 +0800
Subject: [PATCH 14/15] 1

---
 src/views/system/user/list/index.vue                            | 2 +-
 .../trials-panel/setting/personnel-manage/components/staff.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index ca6636f2..048c36a0 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -46,7 +46,7 @@
         }}
       </template>
       <template slot="roleSlot" slot-scope="{ scope }">
-        {{ scope.row.RoleNameList.map((role) => role.RoleName).join(',') }}
+        {{ scope.row.RoleNameList.map((role) => role.RoleName).join(', ') }}
       </template>
       <template slot="isZhiZhunSlot" slot-scope="{ scope }">
         {{
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
index 4ddfcaaf..e2e2d063 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
@@ -140,7 +140,7 @@
             <span>{{
               scope.row.TrialUserRoleList.map(
                 (item) => item.UserTypeShortName
-              ).join(',')
+              ).join(', ')
             }}</span>
           </el-button>
         </template>

From 1f6ee08a8b3c6f5e4b6d340d163ca9871105bb16 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 30 Dec 2024 15:42:29 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/components/roleList.vue | 2 +-
 src/views/system/user/list/index.vue          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/user/components/roleList.vue b/src/views/system/user/components/roleList.vue
index 2c337f79..530ecf93 100644
--- a/src/views/system/user/components/roleList.vue
+++ b/src/views/system/user/components/roleList.vue
@@ -156,7 +156,7 @@ export default {
       let arr = this.list.map((item) => item.UserTypeId)
       return this.userTypeOptions.filter(
         (item) =>
-          !arr.includes(item.Id) && ![4, 6, 20].includes(userType.UserTypeEnum)
+          !arr.includes(item.Id) && ![4, 6, 20].includes(item.UserTypeEnum)
       )
     },
   },
diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index 048c36a0..076c8b5a 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -40,7 +40,7 @@
           Array.isArray(scope.row.UserRoleList) &&
           scope.row.UserRoleList.length > 0
             ? scope.row.UserRoleList.map((item) => item.UserTypeShortName).join(
-                ','
+                ', '
               )
             : ''
         }}