elink-star
/
esua-epdc-admin
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【pc端 - 优化bug】-【优化分页】-（魏凯）-2020/07/23

master
weikai 5 years ago
parent
532f83a1c8
commit
5f6eeac97b
11 changed files with 104 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/views/modules/job/schedule-log.vue
  2. 32
      src/views/modules/job/schedule.vue
  3. 20
      src/views/modules/message/mail-log.vue
  4. 8
      src/views/modules/message/mail-template.vue
  5. 12
      src/views/modules/message/sms.vue
  6. 14
      src/views/modules/message/smslog.vue
  7. 21
      src/views/modules/message/smstemplate.vue
  8. 15
      src/views/modules/sys/log-login.vue
  9. 23
      src/views/modules/sys/log-operation.vue
  10. 20
      src/views/modules/sys/totalconfig-list.vue
  11. 20
      src/views/modules/sys/user.vue

12
src/views/modules/job/schedule-log.vue
View File

@ -1,11 +1,11 @@
<template>
<el-dialog :visible.sync="visible" :title="$t('schedule.log')" :close-on-click-modal="false" :close-on-press-escape="false" width="75%">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item :label="$t('schedule.jobId')">
<el-input v-model="dataForm.jobId" :placeholder="$t('schedule.jobId')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item>
</el-form>
<el-table
@ -15,9 +15,9 @@
@sort-change="dataListSortChangeHandle"
height="460"
style="width: 100%;">
<el-table-column prop="jobId" :label="$t('schedule.jobId')" header-align="center" align="center" width="80"></el-table-column>
<el-table-column prop="beanName" :label="$t('schedule.beanName')" header-align="center" align="center"></el-table-column>
<el-table-column prop="params" :label="$t('schedule.params')" header-align="center" align="center"></el-table-column>
<el-table-column prop="jobId" :label="$t('schedule.jobId')" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="beanName" :label="$t('schedule.beanName')" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="params" :label="$t('schedule.params')" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="status" :label="$t('schedule.status')" header-align="center" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.status === 1" size="small">{{ $t('schedule.statusLog1') }}</el-tag>

32
src/views/modules/job/schedule.vue
View File

@ -1,30 +1,30 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-job__schedule">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item :label="$t('schedule.beanName')">
<el-input v-model="dataForm.beanName" :placeholder="$t('schedule.beanName')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:schedule:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
<el-button v-if="$hasPermission('sys:schedule:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:schedule:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:schedule:pause')" type="danger" @click="pauseHandle()">{{ $t('schedule.pauseBatch') }}</el-button>
<el-button v-if="$hasPermission('sys:schedule:pause')" type="warning" @click="pauseHandle()">{{ $t('schedule.pauseBatch') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:schedule:resume')" type="danger" @click="resumeHandle()">{{ $t('schedule.resumeBatch') }}</el-button>
<el-button v-if="$hasPermission('sys:schedule:resume')" type="success" @click="resumeHandle()">{{ $t('schedule.resumeBatch') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:schedule:run')" type="danger" @click="runHandle()">{{ $t('schedule.runBatch') }}</el-button>
<el-button v-if="$hasPermission('sys:schedule:run')" type="primary" @click="runHandle()">{{ $t('schedule.runBatch') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:schedule:log')" type="success" @click="logHandle()">{{ $t('schedule.log') }}</el-button>
<el-button v-if="$hasPermission('sys:schedule:log')" class="list" @click="logHandle()">{{ $t('schedule.log') }}</el-button>
</el-form-item>
</el-form>
<el-table
@ -35,17 +35,17 @@
@sort-change="dataListSortChangeHandle"
style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="beanName" :label="$t('schedule.beanName')" header-align="center" align="center"></el-table-column>
<el-table-column prop="params" :label="$t('schedule.params')" header-align="center" align="center"></el-table-column>
<el-table-column prop="cronExpression" :label="$t('schedule.cronExpression')" header-align="center" align="center"></el-table-column>
<el-table-column prop="remark" :label="$t('schedule.remark')" header-align="center" align="center"></el-table-column>
<el-table-column prop="beanName" :label="$t('schedule.beanName')" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="params" :label="$t('schedule.params')" header-align="center" align="center" min-width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="cronExpression" :label="$t('schedule.cronExpression')" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="remark" :label="$t('schedule.remark')" header-align="center" align="center"min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="status" :label="$t('schedule.status')" sortable="custom" header-align="center" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.status === 1" size="small">{{ $t('schedule.status1') }}</el-tag>
<el-tag v-else size="small" type="danger">{{ $t('schedule.status0') }}</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="200">
<template slot-scope="scope">
<el-button v-if="$hasPermission('sys:schedule:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button v-if="$hasPermission('sys:schedule:pause')" type="text" size="small" @click="pauseHandle(scope.row.id)">{{ $t('schedule.pause') }}</el-button>
@ -194,3 +194,9 @@ export default {
}
}
</script>
<style scoped>
.list{
background: #c483ee;
color: #fff;
}
</style>

20
src/views/modules/message/mail-log.vue
View File

@ -1,21 +1,21 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-message__mail-log">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item :label="$t('mail.templateId')">
<el-input v-model="dataForm.templateId" :placeholder="$t('mail.templateId')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-form-item :label="$t('mail.mailTo')">
<el-input v-model="dataForm.mailTo" :placeholder="$t('mail.mailTo')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-form-item :label="$t('mail.status')">
<el-select v-model="dataForm.status" :placeholder="$t('mail.status')" clearable>
<el-option :label="$t('mail.status1')" :value="1"></el-option>
<el-option :label="$t('mail.status0')" :value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@ -29,11 +29,11 @@
@sort-change="dataListSortChangeHandle"
style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="templateId" :label="$t('mail.templateId')" sortable="custom" header-align="center" align="center"></el-table-column>
<el-table-column prop="mailFrom" :label="$t('mail.mailFrom')" header-align="center" align="center"></el-table-column>
<el-table-column prop="mailTo" :label="$t('mail.mailTo')" header-align="center" align="center"></el-table-column>
<el-table-column prop="mailCc" :label="$t('mail.mailCc')" header-align="center" align="center"></el-table-column>
<el-table-column prop="subject" :label="$t('mail.subject')" header-align="center" align="center"></el-table-column>
<el-table-column prop="templateId" :label="$t('mail.templateId')" sortable="custom" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="mailFrom" :label="$t('mail.mailFrom')" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="mailTo" :label="$t('mail.mailTo')" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="mailCc" :label="$t('mail.mailCc')" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="subject" :label="$t('mail.subject')" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="status" :label="$t('mail.status')" sortable="custom" header-align="center" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.status === 1" size="small">{{ $t('mail.status1') }}</el-tag>

8
src/views/modules/message/mail-template.vue
View File

@ -1,15 +1,15 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-message__mail-template">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item label="模板名称：">
<el-input v-model="dataForm.name" :placeholder="$t('mail.name')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
<el-button type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="configHandle()">{{ $t('mail.config') }}</el-button>

12
src/views/modules/message/sms.vue
View File

@ -1,24 +1,24 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-message__sms">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch ()">
<el-form-item label="手机号:">
<el-input v-model="dataForm.mobile" :placeholder="$t('sms.mobile')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-form-item label="状态 :">
<el-select v-model="dataForm.status" :placeholder="$t('sms.status')" clearable>
<el-option :label="$t('sms.status1')" :value="1"></el-option>
<el-option :label="$t('sms.status0')" :value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button type="primary" @click="getDataListSearch ()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="configHandle()">{{ $t('sms.config') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="sendHandle()">{{ $t('sms.send') }}</el-button>
<el-button type="success" @click="sendHandle()">{{ $t('sms.send') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@ -32,7 +32,7 @@
@sort-change="dataListSortChangeHandle"
style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="platform" :label="$t('sms.platform')" sortable="custom" header-align="center" align="center">
<el-table-column prop="platform" :label="$t('sms.platform')" sortable="custom" header-align="center" width="120" align="center">
<template slot-scope="scope">
{{ scope.row.platform === 1 ? $t('sms.platform1') : scope.row.platform === 2 ? $t('sms.platform2') : '' }}
</template>

14
src/views/modules/message/smslog.vue
View File

@ -1,7 +1,7 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-message__smslog}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item label="手机号" prop="mobile">
<el-input v-model="dataForm.mobile" placeholder="手机号" clearable></el-input>
</el-form-item>
@ -24,11 +24,11 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<!-- <el-button v-if="$hasPermission('message:smslog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
<el-button v-if=false type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
<el-button v-if=false type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if=false type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@ -37,15 +37,15 @@
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column v-if=false type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="platform" label="平台类型" header-align="center" align="center" :formatter="showPlatform"></el-table-column>
<el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
<el-table-column prop="mobile" label="手机号" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="status" label="发送状态" header-align="center" align="center" :formatter="showStatus"></el-table-column>
<el-table-column prop="templateTypeName" label="模板类型" header-align="center" align="center"></el-table-column>
<el-table-column prop="templateTypeName" label="模板类型" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="params1" label="参数1" header-align="center" align="center"></el-table-column>
<el-table-column prop="params2" label="参数2" header-align="center" align="center"></el-table-column>
<el-table-column prop="params3" label="参数3" header-align="center" align="center"></el-table-column>
<el-table-column prop="params4" label="参数4" header-align="center" align="center"></el-table-column>
<el-table-column prop="createdTime" label="发送时间" header-align="center" align="center"></el-table-column>
<el-table-column v-if=false prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="createdTime" label="发送时间" header-align="center" align="center" width="180"></el-table-column>
<el-table-column v-if=false prop="updatedTime" label="更新时间" header-align="center" align="center" width="180"></el-table-column>
<el-table-column v-if=false :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button type="text" size="small" @click="smslogDetailHandle(scope.row.id)">查看</el-button>

21
src/views/modules/message/smstemplate.vue
View File

@ -1,18 +1,15 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-message__smstemplate}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<!-- <el-form-item>
<el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
</el-form-item> -->
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item label="模板类型名称" prop="templateTypeName">
<el-input v-model="dataForm.templateTypeName" placeholder="模板类型名称" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="addOrUpdateHandle()">{{ $t('smstemplate.add') }}</el-button>
<el-button type="success" @click="addOrUpdateHandle()">{{ $t('smstemplate.add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@ -20,14 +17,14 @@
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="templateType" label="模板类型" header-align="center" align="center"></el-table-column>
<el-table-column prop="templateTypeName" label="模板类型名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="templateType" label="模板类型" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="templateTypeName" label="模板类型名称" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="enableFlag" label="启用标识" header-align="center" align="center" :formatter="showEnableFlag"></el-table-column>
<el-table-column prop="signName" label="短信签名" header-align="center" align="center"></el-table-column>
<el-table-column prop="template" label="短信模板" header-align="center" align="center"></el-table-column>
<el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
<el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="template" label="短信模板" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="remark" label="备注" header-align="center" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center" width="180"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<!-- <el-button type="text" size="small" @click="smstemplateDetailHandle(scope.row.id)">查看</el-button> -->

15
src/views/modules/sys/log-login.vue
View File

@ -1,11 +1,11 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__log-login">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item :label="$t('logLogin.creatorName')">
<el-input v-model="dataForm.creatorName" :placeholder="$t('logLogin.creatorName')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-form-item :label="$t('logLogin.status')">
<el-select v-model="dataForm.status" :placeholder="$t('logLogin.status')" clearable>
<el-option :label="$t('logLogin.status0')" :value="0"></el-option>
<el-option :label="$t('logLogin.status1')" :value="1"></el-option>
@ -13,13 +13,18 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
<el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
<el-table-column label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"></el-table-column>
<el-table-column prop="creatorName" :label="$t('logLogin.creatorName')" header-align="center" align="center"></el-table-column>
<el-table-column prop="operation" :label="$t('logLogin.operation')" header-align="center" align="center">
<template slot-scope="scope">

23
src/views/modules/sys/log-operation.vue
View File

@ -1,31 +1,36 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__log-operation">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item :label="$t('logOperation.module')">
<el-input v-model="dataForm.module" :placeholder="$t('logOperation.module')" clearable></el-input>
</el-form-item>
<el-form-item>
<el-form-item :label="$t('logOperation.status')">
<el-select v-model="dataForm.status" :placeholder="$t('logOperation.status')" clearable>
<el-option :label="$t('logOperation.status0')" :value="0"></el-option>
<el-option :label="$t('logOperation.status1')" :value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
<el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
<el-table-column label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"></el-table-column>
<el-table-column prop="creatorName" :label="$t('logOperation.creatorName')" header-align="center" align="center"></el-table-column>
<el-table-column prop="operation" :label="$t('logOperation.operation')" header-align="center" align="center"></el-table-column>
<el-table-column prop="operation" :label="$t('logOperation.operation')" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="module" :label="$t('logOperation.module')" header-align="center" align="center"></el-table-column>
<el-table-column prop="requestUri" :label="$t('logOperation.requestUri')" header-align="center" align="center"></el-table-column>
<el-table-column prop="requestUri" :label="$t('logOperation.requestUri')" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="requestMethod" :label="$t('logOperation.requestMethod')" header-align="center" align="center"></el-table-column>
<el-table-column prop="requestParams" :label="$t('logOperation.requestParams')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="requestTime" :label="$t('logOperation.requestTime')" sortable="custom" header-align="center" align="center">
<el-table-column prop="requestTime" :label="$t('logOperation.requestTime')" sortable="custom" header-align="center" align="center" width="130">
<template slot-scope="scope">
{{ `${scope.row.requestTime}ms` }}
</template>
@ -36,7 +41,7 @@
<el-tag v-else size="small" type="success">{{ $t('logOperation.status1') }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="ip" :label="$t('logOperation.ip')" header-align="center" align="center"></el-table-column>
<el-table-column prop="ip" :label="$t('logOperation.ip')" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="userAgent" :label="$t('logOperation.userAgent')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="createDate" :label="$t('logOperation.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
</el-table>

20
src/views/modules/sys/totalconfig-list.vue
View File

@ -1,7 +1,7 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-news__totalconfig}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="selectData()">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<div>
<el-form-item label="统计名称" prop="totalName">
<el-input v-model="dataForm.totalName" placeholder="统计名称" clearable></el-input>
@ -25,10 +25,10 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="selectData()">{{ $t('query') }}</el-button>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('workRecord:totalconfig:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
<el-button v-if="$hasPermission('workRecord:totalconfig:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
</div>
</el-form>
@ -38,14 +38,14 @@
{{scope.$index+1}}
</template>
</el-table-column>
<el-table-column prop="totalName" label="统计名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="totalType" label="统计类型" header-align="center" align="center"></el-table-column>
<el-table-column prop="totalName" label="统计名称" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="totalType" label="统计类型" header-align="center" align="center" width="150"></el-table-column>
<el-table-column prop="totalStyle" label="统计方式" :formatter="totalStyleFormatter" header-align="center" align="center"></el-table-column>
<el-table-column prop="spec" label="规格" header-align="center" align="center"></el-table-column>
<el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
<el-table-column prop="autoFlag" label="是否自动计算" :formatter="autoFlagFormatter" header-align="center" align="center"></el-table-column>
<el-table-column prop="mustFlag" label="是否必须输入" :formatter="mustFlagFormatter" header-align="center" align="center"></el-table-column>
<el-table-column prop="autoFlag" label="是否自动计算" :formatter="autoFlagFormatter" header-align="center" align="center" width="150"></el-table-column>
<el-table-column prop="mustFlag" label="是否必须输入" :formatter="mustFlagFormatter" header-align="center" align="center" width="150"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button v-if="$hasPermission('workRecord:totalconfig:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@ -108,10 +108,6 @@ export default {
return '是'
}
},
selectData(){
this.page = 1
this.getDataList()
},
totalStyleFormatter: function (row, column) {
if (row.totalStyle === 0) {
return '其他'

20
src/views/modules/sys/user.vue
View File

@ -1,7 +1,7 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__user">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item label="用户名">
<el-input v-model="dataForm.username" :placeholder="$t('user.username')" clearable></el-input>
</el-form-item>
@ -15,16 +15,16 @@
<el-input v-model="dataForm.mobile" placeholder="手机号" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:user:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
<el-button v-if="$hasPermission('sys:user:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:user:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:user:export')" type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
<el-button v-if="$hasPermission('sys:user:export')" type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
</el-form>
<el-table
@ -35,12 +35,12 @@
@sort-change="dataListSortChangeHandle"
style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center" align="center"></el-table-column>
<el-table-column prop="realName" :label="$t('user.realName')" header-align="center" align="center"></el-table-column>
<el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center"></el-table-column>
<el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center"></el-table-column>
<el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center" align="center"></el-table-column>
<el-table-column prop="status" :label="$t('user.status')" sortable="custom" header-align="center" align="center">
<el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center" align="center" min-width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="realName" :label="$t('user.realName')" header-align="center" align="center" min-width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center" min-width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center" min-width=200 show-overflow-tooltip></el-table-column>
<el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="status" :label="$t('user.status')" sortable="custom" header-align="center" align="center"width="100">
<template slot-scope="scope">
<el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('user.status0') }}</el-tag>
<el-tag v-else size="small" type="success">{{ $t('user.status1') }}</el-tag>

Write Preview
Loading…
Cancel
Save