Merge branch 'all-v4-qindao' into 'all-v4'

feat: 当页面切换至租户管理时，隐藏选择租户下拉选项

See merge request skyeye/skyeye_frontend/skyeye-admin!297

src/layout/components/Header/SwitchTenant.vue

@@ -1,9 +1,9 @@
 <!-- 切换租户 -->
 <template>
-  <div class="switchTenantLable-wrapper" v-if="options.length > 0">
+  <div class="switchTenantLable-wrapper" v-if="options.length > 0 ">
     <div class="switchTenantLable">选择租户</div>
     <el-tree-select
-      v-model="currentTenant"
+      :model-value="currentTenant"
       :data="options"
       check-strictly
       show-all-levels
@@ -14,7 +14,8 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed, onMounted, watch } from 'vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
 import { useUserStore } from '@/store/modules/user';
 import { queryListTenant } from '@/api/tenant';
 import { useTargetTenantIdSetting } from '@/utils/useTargetTenantIdSetting';
@@ -22,6 +23,8 @@ import { replaceParams } from '@/utils/helper/treeHelper';
 import { useRoute } from 'vue-router';
 import useMiniMap from '@/views/map-config/mini-map/use-mini-map.ts'
 import router from '@/router';
+
+
 const miniMap = useMiniMap();
 const  {isInConfigEditor}  = miniMap;
 
@@ -46,18 +49,34 @@ onMounted(() => {
   });
 });
 const route = useRoute();
+/* 选择租户添加二次确认弹窗 */
 const handleChange = (targetTenantId: string) => {
-  setValue(targetTenantId);
-  currentTenant.value = Number(targetTenantId);
-  window.location.reload();
-  /**
-   * 如果处于小地图编辑状态，切换租户时候，返回布局列表
-   */
-  if (isInConfigEditor(route.name)) {
-    router.back();
-  }
-  sessionStorage.removeItem('selectCompanyId'); //切换租户的时候，下拉公司列表清空
+  ElMessageBox.confirm('是否切换租户？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    setValue(targetTenantId);
+    currentTenant.value = Number(targetTenantId);
+   
+    /**
+    * 如果处于小地图编辑状态，切换租户时候，返回布局列表
+    */
+    if (isInConfigEditor(route.name)) {
+      sessionStorage.removeItem('selectCompanyId'); //切换租户的时候，下拉公司列表清空
+      router.back();
+    } else {
+      window.location.reload();
+    }
+    
+  }).catch(() => {
+    ElMessage({
+      type: 'info',
+      message: '取消删除',
+    });
+  });
 };
+
 </script>
 <style scoped>
 .switchTenantLable {

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({

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"

src/views/system/log/components/DetailDialog.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-dialog title="操作日志详细" v-model="dialogTableVisible" width="800">
-    <el-form :model="form" label-width="auto">
+  <el-dialog title="操作日志详细" v-model="dialogTableVisible" width="800" >
+    <el-form :model="form" label-width="auto" class="dialog-form">
       <el-form-item label="操作模块：">
         <span>{{ form.module + '/' + OperationType[form.operatorType] }}</span>
       </el-form-item>
@@ -14,7 +14,7 @@
         <span>{{ form.method }}</span>
       </el-form-item>
       <el-form-item label="请求参数：">
-        <span style="overflow-y: scroll;">{{ form.params }}</span>
+        <span >{{ form.params }}</span>
       </el-form-item>
       <el-form-item label="返回参数：">
         <span>{{ form.result }}</span>
@@ -75,3 +75,9 @@ const loadDetailPage = async (id: number) => {
 
 defineExpose({ open });
 </script>
+<style lang="scss" scoped>
+  .dialog-form {
+    max-height: 600px;
+    overflow-y: scroll;
+  }
+</style>

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">
@@ -32,6 +32,7 @@
               range-separator="～"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
+              :disabled-date="disabledDate"
               clearable />
           </el-form-item>
           <el-form-item label="请选择组织：" label-position="left" prop="deptId">
@@ -152,6 +153,11 @@ const hanleResetForm = (formEl: FormInstance | undefined) => {
   queryLoginLogPage();
 }
 
+/* 设置今天之后的时间不可选 */
+const disabledDate = (time) => {
+  return time.getTime() > Date.now();
+}
+
 </script>
 
 <style scoped lang="scss">

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">
@@ -41,6 +41,7 @@
               range-separator="～"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
+              :disabled-date="disabledDate"
               clearable />
           </el-form-item>
           <el-form-item>
@@ -55,7 +56,7 @@
       <template #header>
         <el-button type="primary" @click="handleExport()">导出数据</el-button>
       </template>
-      <el-table height="calc(100vh - 340px)" :data="operationLogList" v-loading="loading">
+      <el-table height="calc(100vh - 500px)" :data="operationLogList" v-loading="loading">
         <el-table-column label="日志编号" width="100" prop="id" />
         <el-table-column label="账号" prop="realName" />
         <el-table-column label="姓名" prop="operatorName" />
@@ -154,6 +155,10 @@ const openDrawer = (id?: number) => {
   drawerInstance.value?.open(id);
 };
 
+/* 设置今天之后的时间不可选 */
+const disabledDate = (time) => {
+  return time.getTime() > Date.now();
+}
 
 </script>
 

src/views/system/log/components/SystemLog.vue

@@ -27,6 +27,7 @@
               range-separator="～"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
+              :disabled-date="disabledDate"
               clearable />
           </el-form-item>
           <el-form-item>
@@ -41,7 +42,7 @@
       <template #header>
         <el-button type="primary" @click="handleExport()">导出数据</el-button>
       </template>
-      <el-table height="calc(100vh - 440px)" :data="systemLogList" v-loading="loading">
+      <el-table height="calc(100vh - 450px)" :data="systemLogList" v-loading="loading">
         <el-table-column label="序号" width="100" prop="id" />
         <el-table-column label="事件类型" prop="realName" >
           <template #default="{ row }">
@@ -110,6 +111,10 @@ const handleResetForm = (formEl: FormInstance | undefined) => {
   querySystemLogPage();
 }
 
+/* 设置今天之后的时间不可选 */
+const disabledDate = (time) => {
+  return time.getTime() > Date.now();
+}
 </script>
 
 <style scoped lang="scss">

src/views/system/log/hooks/useLoginLogQuery.ts

@@ -48,7 +48,7 @@ export default function useLoginLogRequest () {
       delete params.queryParam.queryTypeContent; 
       const data = await queryLoginLogList(params);
       loginLogList.value = data.records;
-      total.value = data.totalPage;
+      total.value = data.totalRow;
     } catch (error) {
       console.log(error)
     } finally {
@@ -59,6 +59,7 @@ export default function useLoginLogRequest () {
   const resetRequestParams = () => {
     requestParams.queryParam.startTime = ''
     requestParams.queryParam.endTime = ''
+    requestParams.queryParam.queryTypeContent = ''
     Object.assign(requestParams, defaultLoginLogRequest)
   }
 

src/views/system/log/hooks/useSystemQuery.ts

@@ -36,7 +36,7 @@ export default function useSystemLogRequest () {
       delete params.queryParam.date; 
       const data = await querySystemLogList(params);
       systemLogList.value = data.records;
-      total.value = data.totalPage;
+      total.value = data.totalRow;
     } catch (error) {
       console.log(error)
     } finally {

src/views/system/log/hooks/userOperationQuery.ts

@@ -50,7 +50,7 @@ export default function useOperationLogRequest () {
       delete params.queryParam.queryTypeContent
       const data = await queryOperationLogList(params);
       operationLogList.value = data.records;
-      total.value = data.totalPage;
+      total.value = data.totalRow;
     } catch (error) {
       console.log(error)
     } finally {