Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev

k94314517

2023-09-05 fa2f172812de8344fa22c4ef088ea2a67257a0d3

 platform_web/src/views/system/loginLog.vue

@@ -2,7 +2,7 @@
  <TableLayout :permissions="['system:loginLog:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="登录用户名" prop="loginUsername">
      <el-form-item label="用户名" prop="loginUsername">
        <el-input v-model="searchForm.loginUsername" placeholder="请输入登录用户名" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <!-- <el-form-item label="登录IP" prop="ip">
@@ -10,13 +10,13 @@
      </el-form-item>
      <el-form-item label="服务器IP" prop="serverIp">
        <el-input v-model="searchForm.serverIp" placeholder="请输入服务器IP" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="是否登录成功" prop="success">
      </el-form-item>-->
      <el-form-item label="状态" prop="success">
        <el-select v-model="searchForm.success" placeholder="请选择是否登录状态" clearable @change="search">
          <el-option value="true" label="登录成功"/>
          <el-option value="false" label="登录失败"/>
        </el-select>
      </el-form-item> -->
      </el-form-item>
      <el-form-item label="来源" prop="orgin">
        <el-select v-model="searchForm.orgin" placeholder="请选择登录来源" clearable @change="search">
          <el-option value="0" label="PC登陆"/>
@@ -26,7 +26,7 @@
          <el-option value="4" label="微信小程序"/>
        </el-select>
      </el-form-item>
      <!-- <el-form-item label="登录时间" prop="loginTime">
      <el-form-item label="时间" prop="loginTime">
        <el-date-picker
          v-model="searchDateRange"
          type="datetimerange"
@@ -36,10 +36,10 @@
          end-placeholder="结束时间"
          @change="handleSearchTimeChange"
        ></el-date-picker>
      </el-form-item> -->
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <!-- <el-button :loading="isWorking.export" @click="exportExcel">导出</el-button> -->
        <el-button :loading="isWorking.export" @click="exportExcel">导出</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
@@ -62,9 +62,9 @@
        <el-table-column prop="companyUserId" label="用户id" align="center" min-width="100px"></el-table-column>
        <el-table-column prop="companyName" label="企业名称" align="center" min-width="100px"></el-table-column>
        <el-table-column prop="loginUsername" label="登录用户名" align="center" min-width="100px"></el-table-column>
        <el-table-column prop="companyUserName" label="登录用户名" align="center" min-width="100px">
        <el-table-column prop="companyUserName" label="企业用户名称" align="center" min-width="100px">
          <template slot-scope="{row}">
            {{ row.companyUserName || row.loginUsername }}
            {{ row.companyUserName}}
          </template>
        </el-table-column>
        <el-table-column prop="ip" label="登录IP" align="center" min-width="120px"></el-table-column>