Просмотр исходного кода

fix: 修复日志管理查询条件

qindao 1 год назад
Родитель
Сommit
f447640c45

+ 1 - 1
src/views/message/components/PushObject.vue

@@ -220,7 +220,7 @@
      return customList.map((item) => ({
         id: item.userId,
         staffNo: item.userNumber,
-        nickname: item.userNickname,
+        realname: item.userNickname,
       }));
   };
   defineExpose({

+ 1 - 1
src/views/message/reportmessage/components/DesignatedPersonSelection.vue

@@ -2,7 +2,7 @@
   <div>
     <el-select v-model="prop.form.designatedUserList" value-key="id" multiple placeholder="请选择人员"
       @click="dialogVisible = !disableType.contentDisable" :disabled="disableType.contentDisable">
-      <el-option v-for="user in selectedUser" :key="user.id" :label="user.staffNo + '-' + user.nickname"
+      <el-option v-for="user in selectedUser" :key="user.id" :label="user.staffNo + '-' + user.realname"
         :value="user" />
     </el-select>
     <el-dialog v-model="dialogVisible" title="添加人员" align-center :close-on-click-modal="false" style="height: 583px"

+ 2 - 2
src/views/system/log/components/LoginLog.vue

@@ -7,7 +7,7 @@
     <el-card class="mb-3 proCard">
       <el-space >
         <el-form ref="searchFormRef" :inline="true" :model="requestParams.queryParam" class="form-inline" >
-          <el-form-item prop="userName">
+          <el-form-item prop="queryType">
            <el-select v-model="requestParams.queryParam.queryType" placeholder="选择类型" class="type-select" >
               <el-option
                 v-for="item in queryTypeSelect"
@@ -21,7 +21,7 @@
           </el-form-item>
           <el-form-item label="终端类型" prop="device">
             <el-select v-model="requestParams.queryParam.device" placeholder="请选择终端类型" clearable>
-              <el-option :label="item.label" :value="item.label" v-for="item in deviceList" :key="item.value" />
+              <el-option :label="item.label" :value="item.value" v-for="item in deviceList" :key="item.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="登录时间" prop="date">

+ 2 - 2
src/views/system/log/components/OperationLog.vue

@@ -21,7 +21,7 @@
           </el-form-item>
           <el-form-item label="应用侧" prop="platform">
             <el-select v-model="requestParams.queryParam.platform" placeholder="请选择应用侧" clearable>
-              <el-option :label="item.label" :value="item.label" v-for="item in platformList" :key="item.value" />
+              <el-option :label="item.label" :value="item.value" v-for="item in platformList" :key="item.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="所属模块" prop="module">
@@ -30,7 +30,7 @@
            </el-form-item>
           <el-form-item label="操作类型" prop="operatorType">
             <el-select v-model="requestParams.queryParam.operatorType" placeholder="请选择操作类型" clearable>
-              <el-option :label="item.label" :value="item.label" v-for="item in operationList" :key="item.value" />
+              <el-option :label="item.label" :value="item.value" v-for="item in operationList" :key="item.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="登录时间" prop="date">

+ 1 - 0
src/views/system/log/hooks/useLoginLogQuery.ts

@@ -59,6 +59,7 @@ export default function useLoginLogRequest () {
   const resetRequestParams = () => {
     requestParams.queryParam.startTime = ''
     requestParams.queryParam.endTime = ''
+    requestParams.queryParam.queryTypeContent = ''
     Object.assign(requestParams, defaultLoginLogRequest)
   }