解决启动时控制台插槽警告问题

This commit is contained in:
BianLzhaoMin 2025-12-12 13:15:03 +08:00
parent 844d783715
commit 4da5e3c219
4 changed files with 574 additions and 585 deletions

View File

@ -12,14 +12,7 @@
<!-- 弹窗内容区域 -->
<div class="app-content">
<!-- 商品管理 -->
<el-form
:model="queryParams"
ref="queryFormRef"
:inline="true"
inline
label-width="auto"
size="small"
>
<el-form :model="queryParams" ref="queryFormRef" :inline="true" inline label-width="auto" size="small">
<!-- 表单搜索 -->
<el-row>
<el-col :span="6">
@ -35,22 +28,9 @@
<el-col :span="5" style="float: right">
<el-form-item>
<el-button class="primary-lease" type="primary" @click="queryTableList">
查询
</el-button>
<el-button
class="primary-lease"
type="primary"
@click="resetTableList"
>
重置
</el-button>
<el-button
class="primary-lease"
type="primary"
@click="equipmentDeployment"
v-show="!isAddVisible"
>
<el-button class="primary-lease" type="primary" @click="queryTableList"> 查询 </el-button>
<el-button class="primary-lease" type="primary" @click="resetTableList"> 重置 </el-button>
<el-button class="primary-lease" type="primary" @click="equipmentDeployment" v-show="!isAddVisible">
新增装备
</el-button>
</el-form-item>
@ -59,94 +39,50 @@
</el-form>
<!-- 表格 -->
<el-table
:data="tableData"
style="width: auto"
show-overflow-tooltip
height="546"
>
<el-table :data="tableData" style="width: auto" show-overflow-tooltip height="546">
<el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
<el-table-column align="center" label="装备名称">
<template scope="{ row }">
<template slot-scope="{ row }">
{{ `${row.deviceName}` }}
</template>
</el-table-column>
<el-table-column align="center" prop="code" label="装备编号"/>
<el-table-column align="center" prop="code" label="装备编号" />
<el-table-column align="center" prop="typeName" label="装备类目">
<template scope="{ row }">
<span>
{{ row.proType }} <span v-show="row.proType">/</span>
{{ row.mainGx }}<span v-show="row.mainGx">/</span>
{{ row.childGx }}<span v-show="row.childGx">/</span>
{{ row.devCategory }}<span v-show="row.devCategory">/</span>
{{ row.devSubcategory }}<span v-show="row.devSubcategory">/</span>
{{ row.devName }}
</span>
<template slot-scope="{ row }">
<span>
{{ row.proType }} <span v-show="row.proType">/</span> {{ row.mainGx }}<span v-show="row.mainGx">/</span>
{{ row.childGx }}<span v-show="row.childGx">/</span> {{ row.devCategory
}}<span v-show="row.devCategory">/</span> {{ row.devSubcategory
}}<span v-show="row.devSubcategory">/</span>
{{ row.devName }}
</span>
</template>
</el-table-column>
<el-table-column align="center" prop="devModel" label="装备型号"/>
<el-table-column align="center" prop="devModel" label="装备型号" />
<el-table-column align="center" prop="nextCheckDate" label="下次检验日期">
<template scope="{ row }">
<span>{{
row.nextCheckDate
}}</span>
<template slot-scope="{ row }">
<span>{{ row.nextCheckDate }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="装备状态">
<template scope="{ row }">
<template slot-scope="{ row }">
<el-tag v-if="row.entryStatus == 0" size="small" type="info">待审批</el-tag>
<el-tag v-if="row.entryStatus == 1" size="small" type="warning">已审批</el-tag>
<el-tag v-if="row.entryStatus == 2" size="small" type="success">审批驳回</el-tag>
<el-tag v-if="row.entryStatus == 3" size="small" type="danger">草稿</el-tag>
</template>
</el-table-column>
<el-table-column
prop="name"
label="操作"
min-width="160px"
align="center"
v-if="!isAddVisible"
>
<template scope="{ row }">
<el-button
size="small"
type="primary"
@click="editRowInfo(row)"
>
编辑
</el-button>
<el-button
size="small"
type="danger"
@click="deleteRowInfo(row)"
>删除
</el-button>
<el-table-column prop="name" label="操作" min-width="160px" align="center" v-if="!isAddVisible">
<template slot-scope="{ row }">
<el-button size="small" type="primary" @click="editRowInfo(row)"> 编辑 </el-button>
<el-button size="small" type="danger" @click="deleteRowInfo(row)">删除 </el-button>
</template>
</el-table-column>
<el-table-column
prop="name"
label="操作"
min-width="160px"
align="center"
v-if="!isApprovalVisible"
>
<template scope="{ row }">
<el-button
size="small"
type="primary"
@click="approval(row,1)"
>
通过
</el-button>
<el-button
size="small"
type="primary"
@click="approval(row,2)"
>
驳回
</el-button>
<el-table-column prop="name" label="操作" min-width="160px" align="center" v-if="!isApprovalVisible">
<template slot-scope="{ row }">
<el-button size="small" type="primary" @click="approval(row, 1)"> 通过 </el-button>
<el-button size="small" type="primary" @click="approval(row, 2)"> 驳回 </el-button>
</template>
</el-table-column>
</el-table>
@ -156,23 +92,17 @@
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
/>
</div>
<!-- 底部按钮区域 -->
<template #footer>
<div class="dialog-footer" v-show="!isAddVisible">
<el-button @click="handleClose">取消</el-button>
<el-button type="primary" @click="handleSubmit" :disabled="tableData.length==0">确认提交</el-button>
<el-button type="primary" @click="handleSubmit" :disabled="tableData.length == 0">确认提交</el-button>
</div>
</template>
<EquipmentEntryEditDialog
:is-visible.sync="isEditVisible"
:order-id="orderId"
@getOrderId="getOrderId"
/>
<EquipmentEntryEditDialog :is-visible.sync="isEditVisible" :order-id="orderId" @getOrderId="getOrderId" />
</el-dialog>
</template>
@ -184,7 +114,7 @@ import {
equipmentDraftListApiNew,
equipmentPassAndRejectApiNew,
equipmentSubmitApiNew,
removeDeviceApi
removeDeviceApi,
} from '@/api/EquipmentEntryApply'
export default {
@ -196,21 +126,21 @@ export default {
isVisible: {
type: Boolean,
default: false,
description: '控制弹窗显示与隐藏'
description: '控制弹窗显示与隐藏',
},
isAddVisible: {
type: Boolean,
default: false
default: false,
},
orderId: {
type: String,
default: '',
description: '关联的订单ID字符串'
description: '关联的订单ID字符串',
},
isApprovalVisible: {
type: Boolean,
default: false
}
default: false,
},
},
emits: ['update:isVisible', 'submit'], //
data() {
@ -223,15 +153,15 @@ export default {
orderId: '',
deviceName: '',
pageNum: 1,
pageSize: 10
pageSize: 10,
},
//
formData: {
//
equipmentName: '',
model: '',
quantity: 1
}
quantity: 1,
},
}
},
watch: {
@ -239,15 +169,15 @@ export default {
if (val) {
this.getList()
}
}
},
},
methods: {
async approval(row, status) {
equipmentPassAndRejectApiNew({ devIds: row.maId, status: status, id: this.orderId }).then(res => {
equipmentPassAndRejectApiNew({ devIds: row.maId, status: status, id: this.orderId }).then((res) => {
if (res.code === 200) {
this.$message({
type: 'success',
message: '操作成功'
message: '操作成功',
})
this.getList()
}
@ -284,22 +214,21 @@ export default {
this.$confirm('是否确定删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
type: 'warning',
})
.then(() => {
return removeDeviceApi([row.maId])
})
.then(res => {
.then((res) => {
if (res.code === 200) {
this.$message({
type: 'success',
message: '删除成功'
message: '删除成功',
})
this.getList()
}
})
.catch(() => {
})
.catch(() => {})
},
//
resetTableList() {
@ -318,21 +247,20 @@ export default {
* 处理表单提交
*/
handleSubmit() {
equipmentSubmitApiNew({ id: this.orderId, status: 0 }).then(res => {
equipmentSubmitApiNew({ id: this.orderId, status: 0 }).then((res) => {
if (res.code === 200) {
this.$message({
type: 'success',
message: '提交成功'
message: '提交成功',
})
this.handleClose()
this.$emit('submit', {
orderId: this.orderId
orderId: this.orderId,
})
}
})
}
}
},
},
}
</script>

View File

@ -1,125 +1,118 @@
<template>
<div class="app-container">
<!-- 寻源需求 -->
<el-form
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="auto" size="small"
>
<el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="auto" size="small">
<!-- 表单搜索 -->
<el-card class="search-box" >
<el-row >
<el-col :span="20" >
<el-form-item prop="contractName" label="协议名称">
<el-input
v-model.trim="queryParams.contractName"
style="width: 100%"
clearable
placeholder="请输入协议名称"
/>
</el-form-item>
<el-form-item prop="contractCode" label="协议编号" style="margin-left: 10px">
<el-input
v-model.trim="queryParams.contractCode"
style="width: 100%"
clearable
placeholder="请输入协议编号"
/>
</el-form-item>
<el-form-item prop="createTime" label="更新时间" style="margin-left: 10px">
<el-date-picker
v-model="createTime"
type="daterange"
style="width: 240px"
range-separator="-"
value-format="YYYY-MM-DD"
start-placeholder="更新开始日期"
end-placeholder="更新结束日期"
/>
</el-form-item>
</el-col>
<el-col :span="4" style="text-align: right;">
<el-button class="primary-lease" size="mini" icon="el-icon-search" type="primary" @click="getContractListData">查询</el-button>
<el-button class="primary-lease" size="mini" icon="el-icon-refresh" @click="onReset">重置</el-button>
</el-col>
</el-row>
<el-card class="search-box">
<el-row>
<el-col :span="20">
<el-form-item prop="contractName" label="协议名称">
<el-input
v-model.trim="queryParams.contractName"
style="width: 100%"
clearable
placeholder="请输入协议名称"
/>
</el-form-item>
<el-form-item prop="contractCode" label="协议编号" style="margin-left: 10px">
<el-input
v-model.trim="queryParams.contractCode"
style="width: 100%"
clearable
placeholder="请输入协议编号"
/>
</el-form-item>
<el-form-item prop="createTime" label="更新时间" style="margin-left: 10px">
<el-date-picker
v-model="createTime"
type="daterange"
style="width: 240px"
range-separator="-"
value-format="YYYY-MM-DD"
start-placeholder="更新开始日期"
end-placeholder="更新结束日期"
/>
</el-form-item>
</el-col>
<el-col :span="4" style="text-align: right">
<el-button
class="primary-lease"
size="mini"
icon="el-icon-search"
type="primary"
@click="getContractListData"
>查询</el-button
>
<el-button class="primary-lease" size="mini" icon="el-icon-refresh" @click="onReset">重置</el-button>
</el-col>
</el-row>
</el-card>
</el-form>
<el-card class="content-box">
<el-row>
<el-col :span="24" style="text-align: right;">
<el-col :span="24" style="text-align: right">
<el-button class="primary-lease" type="primary" size="mini" @click="addContract">协议新建</el-button>
<a :href="uploadUrlTemp" download="安徽省机械化装备共享平台-协议模板">
<el-button
class="primary-lease"
type="primary"
style="margin-left: 20px"
size="mini"
>模板下载</el-button>
</a>
<a :href="uploadUrlTemp" download="安徽省机械化装备共享平台-协议模板">
<el-button class="primary-lease" type="primary" style="margin-left: 20px" size="mini">模板下载</el-button>
</a>
</el-col>
</el-row>
<div >
<!-- 表格 -->
<el-table
:data="qualityLis"
border stripe height="546"
show-overflow-tooltip
>
<el-table-column align="center" label="协议编码">
<template scope="scope">
<a style="color: blue">
{{ scope.row.contractCode }}
</a>
</template>
</el-table-column>
<el-table-column align="center" prop="contractName" label="协议名称"/>
<el-table-column align="center" prop="status" label="状态">
<template scope="scope">
<el-switch
v-model="scope.row.status"
:active-value="1"
:inactive-value="0"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column align="center" label="协议附件">
<template scope="scope">
<a
:href="scope.row.bmFileInfoList.length > 0 ? scope.row.bmFileInfoList[0].fileUrl : null"
target="_blank"
style="color: #00a288; text-decoration: underline"
>查看</a>
</template>
</el-table-column>
<el-table-column align="center" prop="createTime" label="创建时间"/>
<el-table-column align="center" prop="updateTime" label="更新时间"/>
<el-table-column align="center" label="操作" :width="220">
<template scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="onContract(scope.row)">编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="onDelete(scope.row.id)"
v-if="scope.row.status == 0"
>删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="pagination-wrapper">
<pagination
:total="total"
@pagination="getContractListData"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
/>
</div>
<div>
<!-- 表格 -->
<el-table :data="qualityLis" border stripe height="546" show-overflow-tooltip>
<el-table-column align="center" label="协议编码">
<template slot-scope="scope">
<a style="color: blue">
{{ scope.row.contractCode }}
</a>
</template>
</el-table-column>
<el-table-column align="center" prop="contractName" label="协议名称" />
<el-table-column align="center" prop="status" label="状态">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
:active-value="1"
:inactive-value="0"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column align="center" label="协议附件">
<template slot-scope="scope">
<a
:href="scope.row.bmFileInfoList.length > 0 ? scope.row.bmFileInfoList[0].fileUrl : null"
target="_blank"
style="color: #00a288; text-decoration: underline"
>查看</a
>
</template>
</el-table-column>
<el-table-column align="center" prop="createTime" label="创建时间" />
<el-table-column align="center" prop="updateTime" label="更新时间" />
<el-table-column align="center" label="操作" :width="220">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="onContract(scope.row)">编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="onDelete(scope.row.id)"
v-if="scope.row.status == 0"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
</div>
<div class="pagination-wrapper">
<pagination
:total="total"
@pagination="getContractListData"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
/>
</div>
</el-card>
<!-- 新增和修改弹框 -->
<el-dialog
@ -186,14 +179,13 @@
</template>
<script>
// API
import {
getContractListApi,
addContractApi,
editContractApi,
delContractApi,
updateStatus
updateStatus,
} from '@/api/contract-manage/index'
import FileUpload from '@/components/FileImageUpload'
@ -215,7 +207,7 @@ export default {
startTime: '',
endTime: '',
pageSize: 10,
pageNum: 1
pageNum: 1,
},
//
@ -227,18 +219,18 @@ export default {
contractName: '',
fileInfoList: [],
fileInfoTempList: [],
bmFileInfoList: []
bmFileInfoList: [],
},
//
addAndEditFormRules: {
contractName: [{ required: true, message: '请输入协议名称', trigger: 'blur' }],
fileInfoList: [{ required: true, message: '请上传协议附件', trigger: 'blur' }]
fileInfoList: [{ required: true, message: '请上传协议附件', trigger: 'blur' }],
},
//
dialogVisibleSettlein: false,
settleinTitle: ''
settleinTitle: '',
}
},
mounted() {
@ -279,7 +271,7 @@ export default {
if (res.code === 200) {
this.$message({
type: 'success',
message: '状态修改成功'
message: '状态修改成功',
})
await this.getContractListData()
}
@ -335,7 +327,7 @@ export default {
this.addAndEditForm.fileInfoTempList = []
const origin = window.location.origin
const fileListTemp = fileList.map(e => {
const fileListTemp = fileList.map((e) => {
let testUrl = ''
if (process.env.VUE_APP_API_URL === '/proxyApi') {
testUrl = e.url
@ -344,7 +336,7 @@ export default {
}
return {
fileName: e.name,
fileUrl: testUrl
fileUrl: testUrl,
}
})
@ -354,7 +346,7 @@ export default {
//
onSubmit() {
this.addAndEditForm.fileInfoList = this.addAndEditForm.fileInfoTempList
this.$refs.addAndEditFormRef.validate(async(valid) => {
this.$refs.addAndEditFormRef.validate(async (valid) => {
if (valid) {
const SEN_API = this.settleinTitle === '协议修改' ? editContractApi : addContractApi
this.addAndEditForm.bmFileInfoList = this.addAndEditForm.fileInfoList
@ -364,7 +356,7 @@ export default {
if (res.code === 200) {
this.$message({
type: 'success',
message: '提交成功'
message: '提交成功',
})
this.dialogVisibleSettlein = false
this.getContractListData()
@ -383,7 +375,7 @@ export default {
if (res.code === 200) {
this.$message({
type: 'success',
message: '删除成功'
message: '删除成功',
})
this.getContractListData()
}
@ -395,8 +387,8 @@ export default {
//
onCancel() {
this.dialogVisibleSettlein = false
}
}
},
},
}
</script>
@ -451,11 +443,11 @@ export default {
padding: 0;
::v-deep .el-card__body {
padding: 20px !important;
}
}
}
.el-form-item--small.el-form-item {
margin-bottom: 0px;
margin-bottom: 0px;
}
.content-box {
@ -498,7 +490,7 @@ export default {
padding-top: 6px;
margin-top: auto;
::v-deep .pagination-container {
::v-deep .pagination-container {
padding: 0px 20px !important;
/* margin-bottom: 30px; */
}
@ -508,25 +500,24 @@ export default {
//
&.el-table--striped .el-table__body {
tr.el-table__row--striped td {
background-color: #F6FBFA !important; //
background-color: #f6fbfa !important; //
}
}
.el-table__header {
background: #E9F0EE;
background: #e9f0ee;
th {
background: #E9F0EE !important;
background: #e9f0ee !important;
color: #606266;
font-weight: 600;
height: 50px;
}
}
&.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
background-color: #CCF1E9 !important;
&.el-table--striped .el-table__body tr.el-table__row:hover > td.el-table__cell {
background-color: #ccf1e9 !important;
}
}
}
</style>

View File

@ -1,73 +1,109 @@
<template>
<div class="app-container">
<el-form inline size="small" :model="listQuery" ref="listQuery" >
<div class="app-container">
<el-form inline size="small" :model="listQuery" ref="listQuery">
<div class="filter-container">
<el-card class="search-box " style="height: 130px" >
<el-form-item label="操作人" prop="operaUserName" label-width="60px" >
<el-input v-model="listQuery.operaUserName" placeholder="请输入操作人"
style="width: 240px" class="filter-item" :maxlength="30"
@keyup.enter.native="handleFilter"
/>
<el-card class="search-box" style="height: 130px">
<el-form-item label="操作人" prop="operaUserName" label-width="60px">
<el-input
v-model="listQuery.operaUserName"
placeholder="请输入操作人"
style="width: 240px"
class="filter-item"
:maxlength="30"
@keyup.enter.native="handleFilter"
/>
</el-form-item>
<el-form-item label="IP地址" prop="ip" label-width="60px">
<el-input v-model="listQuery.ip" placeholder="请输入IP地址"
style="width: 240px" class="filter-item ml-20" :maxlength="30"
@keyup.enter.native="handleFilter"
/>
<el-input
v-model="listQuery.ip"
placeholder="请输入IP地址"
style="width: 240px"
class="filter-item ml-20"
:maxlength="30"
@keyup.enter.native="handleFilter"
/>
</el-form-item>
<el-form-item label="日期" prop="rangeDate" label-width="60px">
<el-date-picker
v-model="rangeDate"
style="width: 240px"
class="filter-item ml-20"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
<el-date-picker
v-model="rangeDate"
style="width: 240px"
class="filter-item ml-20"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
<!-- <el-input v-model="listQuery.content" placeholder="请输入操作内容"
<!-- <el-input v-model="listQuery.content" placeholder="请输入操作内容"
style="width: 200px" class="filter-item ml-20" :maxlength="30"
@keyup.enter.native="handleFilter"
/> -->
<el-form-item label="事件结果" prop="result" label-width="80px">
<el-select v-model="listQuery.result" placeholder="请选择事件结果" style="width: 240px" class="filter-item ml-20">
<el-option v-for="item in Object.keys(outcomeList)" :key="item" :value="outcomeList[item]" :label="outcomeList[item]" />
</el-select>
<el-select
v-model="listQuery.result"
placeholder="请选择事件结果"
style="width: 240px"
class="filter-item ml-20"
>
<el-option
v-for="item in Object.keys(outcomeList)"
:key="item"
:value="outcomeList[item]"
:label="outcomeList[item]"
/>
</el-select>
</el-form-item>
<el-form-item label="操作类型" prop="operType" label-width="80px">
<el-select v-model="listQuery.operType" placeholder="请选择操作类型" style="width: 240px" class="filter-item ml-20">
<el-option v-for="item in Object.keys(operateList)" :key="item" :value="operateList[item]" :label="operateList[item]" />
</el-select>
<el-select
v-model="listQuery.operType"
placeholder="请选择操作类型"
style="width: 240px"
class="filter-item ml-20"
>
<el-option
v-for="item in Object.keys(operateList)"
:key="item"
:value="operateList[item]"
:label="operateList[item]"
/>
</el-select>
</el-form-item>
<el-form-item label="分类" prop="operaUserName" label-width="60px">
<el-select v-model="listQuery.logSort" clearable filterable style="width: 240px" class="filter-item ml-20" placeholder="请选择" >
<el-option v-for="item in timeList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
<el-select
v-model="listQuery.logSort"
clearable
filterable
style="width: 240px"
class="filter-item ml-20"
placeholder="请选择"
>
<el-option v-for="item in timeList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="排序" prop="operaUserName" label-width="60px">
<el-select v-model="listQuery.logDesc" clearable filterable style="width: 240px" class="filter-item ml-20" placeholder="请选择" >
<el-option v-for="item in sortList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
<el-select
v-model="listQuery.logDesc"
clearable
filterable
style="width: 240px"
class="filter-item ml-20"
placeholder="请选择"
>
<el-option v-for="item in sortList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item style="float:right;">
<el-button size="small" class="filter-item" type="primary" @click="handleFilter">
查询
</el-button>
<el-button size="small" class="filter-item" type="primary" @click="resetFilter">
重置
</el-button>
<el-button @click="handleBackups" size="small" class="filter-item" type="warning">
备份
</el-button>
<el-form-item style="float: right">
<el-button size="small" class="filter-item" type="primary" @click="handleFilter"> 查询 </el-button>
<el-button size="small" class="filter-item" type="primary" @click="resetFilter"> 重置 </el-button>
<el-button @click="handleBackups" size="small" class="filter-item" type="warning"> 备份 </el-button>
</el-form-item>
</el-card>
</div>
</el-form>
</el-form>
<el-card class="content-box">
<el-card class="content-box">
<el-table
:key="tableKey"
v-loading="listLoading"
@ -79,7 +115,7 @@
height="596"
>
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<template slot-scope="scope">
<span>{{ (listQuery.pageNum - 1) * listQuery.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
@ -91,7 +127,7 @@
<el-table-column label="操作详情" align="center" prop="operateDetail" />
<el-table-column label="操作结果" align="center" prop="result">
<template slot-scope="{ row }">
{{ row.result}}
{{ row.result }}
</template>
</el-table-column>
<el-table-column label="操作参数" align="center" prop="params" />
@ -101,153 +137,157 @@
</el-table>
<pagination
:total="total"
:page.sync="listQuery.pageNum"
:limit.sync="listQuery.pageSize"
@pagination="getList"
/>
</el-card>
</div>
</template>
</el-card>
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
<script>
import Pagination from '@/components/Pagination'
import _ from 'lodash/fp'
import { downloadFile } from '@/utils/download'
import _ from 'lodash/fp'
import { downloadFile } from '@/utils/download'
import { getYwLogs,downloadYwLogs } from '@/api/system/log'
import { getYwLogs, downloadYwLogs } from '@/api/system/log'
const outcomeList = {
1: '成功',
2: '失败',
}
const operateList = {
1: '新增',
2: '修改',
3: '删除',
4: '查询',
5: '导出',
6: '下载',
7: '备份',
8: '登录',
9: '登出',
}
const outcomeList = {
1:'成功',
2:'失败'
};
const operateList = {
1:'新增',
2:'修改',
3:'删除',
4:'查询',
5:'导出',
6:'下载',
7:'备份',
8:'登录',
9:'登出'
};
export default {
components: { Pagination },
data() {
return {
tableKey: 0,
list: [],
outcomeList: outcomeList,
total: 0,
listLoading: false,
tableHeight: 650,
operateList: operateList,
timeList: [
{ id: 1, name: '时间' },
{ id: 2, name: '操作人' },
{ id: 3, name: '操作模块' },
{ id: 4, name: 'ip' },
],
sortList: [
{ id: 1, name: '倒序' },
{ id: 2, name: '升序' },
],
listQuery: {
pageNum: 1,
pageSize: 10,
operaUserName: '',
ip: '',
content: '',
result: '',
operTime: '',
operType: '',
logSort: 1,
logDesc: 1,
},
rangeDate: [],
}
},
created() {
// this.getList()
// this.getOperate()
},
mounted() {
this.listQuery.operTime = this.getCurrentDate() + ' - ' + this.getCurrentDate()
this.rangeDate = [this.getCurrentDate(), this.getCurrentDate()]
this.getList()
},
methods: {
getStatus(val) {
return this.outcomeList[val]
},
//
getOperate() {
// getOperateList().then((response) => {
// this.operateList = response.data
// })
},
export default {
components: { Pagination },
data() {
return {
tableKey: 0,
list: [],
outcomeList: outcomeList,
total: 0,
listLoading: false,
tableHeight: 650,
operateList: operateList,
timeList:[{id:1,name:'时间'},{id:2,name:'操作人'},{id:3,name:'操作模块'},{id:4,name:'ip'},],
sortList:[{id:1,name:'倒序'},{id:2,name:'升序'}],
listQuery: {
pageNum: 1,
pageSize: 10,
operaUserName: '',
ip: '',
content:'',
result: '',
operTime:'',
operType: '',
logSort:1,
logDesc:1,
},
rangeDate:[],
getList() {
this.listLoading = true
if (this.rangeDate && this.rangeDate.length > 0) {
this.listQuery.operTime = this.rangeDate[0] + ' - ' + this.rangeDate[1]
}
getYwLogs(this.listQuery).then((response) => {
this.list = response.rows.map((item) => {
return item
})
this.total = response.total
})
setTimeout(() => {
this.listLoading = false
}, 500)
},
created() {
// this.getList()
// this.getOperate()
},
mounted() {
this.listQuery.operTime = this.getCurrentDate()+' - '+this.getCurrentDate();
this.rangeDate = [this.getCurrentDate(),this.getCurrentDate()]
//
handleFilter() {
this.listQuery.pageNum = 1
this.getList()
},
methods: {
getStatus(val) {
return this.outcomeList[val]
},
//
getOperate(){
// getOperateList().then((response) => {
// this.operateList = response.data
// })
},
//
resetFilter() {
this.listQuery = {
pageNum: 1,
pageSize: 10,
operaUserName: '',
ip: '',
getList() {
this.listLoading = true
if(this.rangeDate && this.rangeDate.length>0){
this.listQuery.operTime = this.rangeDate[0]+' - '+this.rangeDate[1];
}
getYwLogs(this.listQuery).then((response) => {
this.list = response.rows.map(item => {
return item
})
this.total = response.total
})
setTimeout(()=>{
this.listLoading = false
},500)
},
//
handleFilter() {
this.listQuery.pageNum = 1
this.getList()
},
//
resetFilter() {
this.listQuery={
pageNum: 1,
pageSize: 10,
operaUserName: '',
ip: '',
content:'',
result: '',
operType: '',
logSort:1,
logDesc:1,
};
this.rangeDate=[this.getCurrentDate(),this.getCurrentDate()]
this.handleFilter()
},
//
handleBackups() {
downloadYwLogs().then(res => {
downloadFile({ fileName: '业务日志.sql', fileData: res, fileType: 'text/html;charset=UTF-8'})
})
},
//
handleExport(){
// exportCarDetail().then(res => {
// downloadFile({ fileName: '.xlsx', fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
// })
},
getCurrentDate() {
let now = new Date();
let year = now.getFullYear();
let month = now.getMonth() + 1;
if(month<10){
month = '0'+month
}
let day = now.getDate();
if(day<10){
day = '0'+day
}
return year + "-" + month + "-" + day;
content: '',
result: '',
operType: '',
logSort: 1,
logDesc: 1,
}
}
}
</script>
this.rangeDate = [this.getCurrentDate(), this.getCurrentDate()]
this.handleFilter()
},
//
handleBackups() {
downloadYwLogs().then((res) => {
downloadFile({ fileName: '业务日志.sql', fileData: res, fileType: 'text/html;charset=UTF-8' })
})
},
//
handleExport() {
// exportCarDetail().then(res => {
// downloadFile({ fileName: '.xlsx', fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
// })
},
getCurrentDate() {
let now = new Date()
let year = now.getFullYear()
let month = now.getMonth() + 1
if (month < 10) {
month = '0' + month
}
let day = now.getDate()
if (day < 10) {
day = '0' + day
}
return year + '-' + month + '-' + day
},
},
}
</script>

View File

@ -1,110 +1,135 @@
<template>
<div class="app-container">
<el-form inline size="small" :model="listQuery" ref="listQuery">
<div class="filter-container">
<el-card class="search-box" style="height: 130px" >
<el-form-item label="操作人" prop="operaUserName" label-width="60px">
<el-input v-model="listQuery.operaUserName" placeholder="请输入操作人"
style="width: 240px" class="filter-item" :maxlength="30"
@keyup.enter.native="handleFilter"
/>
</el-form-item>
<el-form-item label="IP地址" prop="ip" label-width="70px">
<el-input v-model="listQuery.ip" placeholder="请输入IP地址"
style="width: 240px" class="filter-item ml-20" :maxlength="30"
@keyup.enter.native="handleFilter"
/>
</el-form-item>
<el-form-item label="日期" prop="rangeDate" label-width="60px">
<el-date-picker
v-model="rangeDate"
style="width: 240px"
class="filter-item ml-20"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
<!-- <el-input v-model="listQuery.content" placeholder="请输入操作内容"
<el-form inline size="small" :model="listQuery" ref="listQuery">
<div class="filter-container">
<el-card class="search-box" style="height: 130px">
<el-form-item label="操作人" prop="operaUserName" label-width="60px">
<el-input
v-model="listQuery.operaUserName"
placeholder="请输入操作人"
style="width: 240px"
class="filter-item"
:maxlength="30"
@keyup.enter.native="handleFilter"
/>
</el-form-item>
<el-form-item label="IP地址" prop="ip" label-width="70px">
<el-input
v-model="listQuery.ip"
placeholder="请输入IP地址"
style="width: 240px"
class="filter-item ml-20"
:maxlength="30"
@keyup.enter.native="handleFilter"
/>
</el-form-item>
<el-form-item label="日期" prop="rangeDate" label-width="60px">
<el-date-picker
v-model="rangeDate"
style="width: 240px"
class="filter-item ml-20"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
<!-- <el-input v-model="listQuery.content" placeholder="请输入操作内容"
style="width: 200px" class="filter-item ml-20" :maxlength="30"
@keyup.enter.native="handleFilter"
/>
<el-select v-model="listQuery.result" placeholder="请选择事件结果" style="width: 200px" class="filter-item ml-20">
<el-option v-for="item in Object.keys(outcomeList)" :key="item" :value="outcomeList[item]" :label="outcomeList[item]" />
</el-select>-->
<el-form-item label="操作类型" prop="operType" label-width="90px">
<el-select v-model="listQuery.operType" placeholder="请选择操作类型" style="width: 240px" class="filter-item ml-20">
<el-option v-for="item in Object.keys(operateList)" :key="item" :value="operateList[item]" :label="operateList[item]" />
</el-select>
</el-form-item>
<el-form-item label="分类" prop="logSort" label-width="60px">
<el-select v-model="listQuery.logSort" clearable filterable style="width: 240px" class="filter-item ml-20" placeholder="请选择" >
<el-option v-for="item in timeList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="排序" prop="logDesc" label-width="60px">
<el-select v-model="listQuery.logDesc" clearable filterable style="width: 240px" class="filter-item ml-20" placeholder="请选择" >
<el-option v-for="item in sortList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="操作类型" prop="operType" label-width="90px">
<el-select
v-model="listQuery.operType"
placeholder="请选择操作类型"
style="width: 240px"
class="filter-item ml-20"
>
<el-option
v-for="item in Object.keys(operateList)"
:key="item"
:value="operateList[item]"
:label="operateList[item]"
/>
</el-select>
</el-form-item>
<el-form-item label="分类" prop="logSort" label-width="60px">
<el-select
v-model="listQuery.logSort"
clearable
filterable
style="width: 240px"
class="filter-item ml-20"
placeholder="请选择"
>
<el-option v-for="item in timeList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="排序" prop="logDesc" label-width="60px">
<el-select
v-model="listQuery.logDesc"
clearable
filterable
style="width: 240px"
class="filter-item ml-20"
placeholder="请选择"
>
<el-option v-for="item in sortList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item style="float:right;">
<el-button size="small" class="filter-item" type="primary" @click="handleFilter">
查询
</el-button>
<el-button size="small" class="filter-item" type="primary" @click="resetFilter">
重置
</el-button>
<el-button @click="handleBackups" size="small" class="filter-item" type="warning">
备份
</el-button>
</el-form-item>
</el-card>
</div>
<el-form-item style="float: right">
<el-button size="small" class="filter-item" type="primary" @click="handleFilter"> 查询 </el-button>
<el-button size="small" class="filter-item" type="primary" @click="resetFilter"> 重置 </el-button>
<el-button @click="handleBackups" size="small" class="filter-item" type="warning"> 备份 </el-button>
</el-form-item>
</el-card>
</div>
</el-form>
<el-card class="content-box">
<el-table
:key="tableKey"
v-loading="listLoading"
:data="list"
border
fit
highlight-current-row
style="width: 100%"
height="546"
>
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<span>{{ (listQuery.pageNum - 1) * listQuery.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="操作人" align="center" prop="operaUserName" />
<el-table-column label="操作时间" align="center" prop="operTime" />
<el-table-column label="IP地址" align="center" prop="ip" />
<el-table-column label="操作模块" align="center" prop="model" />
<el-table-column label="操作类型" align="center" prop="operType" />
<el-table-column label="操作详情" align="center" prop="operateDetail" />
<el-table-column label="操作结果" align="center" prop="result">
<template slot-scope="{ row }">
{{ row.result }}
</template>
</el-table-column>
<el-table-column label="操作参数" align="center" prop="params" />
<el-table-column label="操作方法" align="center" prop="method" />
<el-table-column label="操作路径" align="center" prop="operUri" />
<el-table-column label="执行时间(ms)" align="center" prop="times" />
</el-table>
<el-table
:key="tableKey"
v-loading="listLoading"
:data="list"
border
fit
highlight-current-row
style="width: 100%"
height="546"
>
<el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope">
<span>{{ (listQuery.pageNum - 1) * listQuery.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="操作人" align="center" prop="operaUserName" />
<el-table-column label="操作时间" align="center" prop="operTime" />
<el-table-column label="IP地址" align="center" prop="ip" />
<el-table-column label="操作模块" align="center" prop="model" />
<el-table-column label="操作类型" align="center" prop="operType" />
<el-table-column label="操作详情" align="center" prop="operateDetail" />
<el-table-column label="操作结果" align="center" prop="result">
<template slot-scope="{ row }">
{{ row.result }}
</template>
</el-table-column>
<el-table-column label="操作参数" align="center" prop="params" />
<el-table-column label="操作方法" align="center" prop="method" />
<el-table-column label="操作路径" align="center" prop="operUri" />
<el-table-column label="执行时间(ms)" align="center" prop="times" />
</el-table>
<pagination
:total="total"
:page.sync="listQuery.pageNum"
:limit.sync="listQuery.pageSize"
@pagination="getList"
/>
<pagination
:total="total"
:page.sync="listQuery.pageNum"
:limit.sync="listQuery.pageSize"
@pagination="getList"
/>
</el-card>
</div>
</template>
@ -115,24 +140,23 @@ import Pagination from '@/components/Pagination'
import _ from 'lodash/fp'
import { downloadFile } from '@/utils/download'
import { getSysLogs,downloadSysLogs } from '@/api/system/log'
import { getSysLogs, downloadSysLogs } from '@/api/system/log'
const outcomeList = {
1:'成功',
2:'失败'
};
1: '成功',
2: '失败',
}
const operateList = {
1:'新增',
2:'修改',
3:'删除',
4:'查询',
5:'导出',
6:'下载',
7:'备份',
8:'登录',
9:'登出'
};
1: '新增',
2: '修改',
3: '删除',
4: '查询',
5: '导出',
6: '下载',
7: '备份',
8: '登录',
9: '登出',
}
export default {
components: { Pagination },
@ -145,21 +169,30 @@ export default {
listLoading: false,
tableHeight: 650,
operateList: operateList,
timeList:[{id:1,name:'时间'},{id:2,name:'操作人'},{id:3,name:'操作模块'},{id:4,name:'ip'},{id:5,name:'操作类型'},],
sortList:[{id:1,name:'倒序'},{id:2,name:'升序'}],
timeList: [
{ id: 1, name: '时间' },
{ id: 2, name: '操作人' },
{ id: 3, name: '操作模块' },
{ id: 4, name: 'ip' },
{ id: 5, name: '操作类型' },
],
sortList: [
{ id: 1, name: '倒序' },
{ id: 2, name: '升序' },
],
listQuery: {
pageNum: 1,
pageSize: 10,
operaUserName: '',
ip: '',
content:'',
content: '',
result: '',
operTime:'',
operTime: '',
operaType: '',
logSort:1,
logDesc:1,
logSort: 1,
logDesc: 1,
},
rangeDate:[],
rangeDate: [],
}
},
created() {
@ -167,8 +200,8 @@ export default {
// this.getOperate()
},
mounted() {
this.listQuery.operTime = this.getCurrentDate()+' - '+this.getCurrentDate();
this.rangeDate = [this.getCurrentDate(),this.getCurrentDate()]
this.listQuery.operTime = this.getCurrentDate() + ' - ' + this.getCurrentDate()
this.rangeDate = [this.getCurrentDate(), this.getCurrentDate()]
this.getList()
},
methods: {
@ -176,7 +209,7 @@ export default {
return this.outcomeList[val]
},
//
getOperate(){
getOperate() {
// getOperateList().then((response) => {
// this.operateList = response.data
// })
@ -184,18 +217,18 @@ export default {
getList() {
this.listLoading = true
if(this.rangeDate && this.rangeDate.length>0){
this.listQuery.operTime = this.rangeDate[0]+' - '+this.rangeDate[1];
if (this.rangeDate && this.rangeDate.length > 0) {
this.listQuery.operTime = this.rangeDate[0] + ' - ' + this.rangeDate[1]
}
getSysLogs(this.listQuery).then((response) => {
this.list = response.rows.map(item => {
this.list = response.rows.map((item) => {
return item
})
this.total = response.total
})
setTimeout(()=>{
setTimeout(() => {
this.listLoading = false
},500)
}, 500)
},
//
handleFilter() {
@ -204,49 +237,46 @@ export default {
},
//
resetFilter() {
this.listQuery={
this.listQuery = {
pageNum: 1,
pageSize: 10,
operaUserName: '',
ip: '',
content:'',
content: '',
result: '',
operateType: '',
logSort:1,
logDesc:1,
};
this.rangeDate=[this.getCurrentDate(),this.getCurrentDate()]
logSort: 1,
logDesc: 1,
}
this.rangeDate = [this.getCurrentDate(), this.getCurrentDate()]
this.handleFilter()
},
//
handleBackups() {
downloadSysLogs().then(res => {
downloadFile({ fileName: '系统日志.sql', fileData: res, fileType: 'text/html;charset=UTF-8' })
downloadSysLogs().then((res) => {
downloadFile({ fileName: '系统日志.sql', fileData: res, fileType: 'text/html;charset=UTF-8' })
})
},
//
handleExport(){
handleExport() {
// exportCarDetail().then(res => {
// downloadFile({ fileName: '.xlsx', fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
// })
},
getCurrentDate() {
let now = new Date();
let year = now.getFullYear();
let month = now.getMonth() + 1;
if(month<10){
month = '0'+month
let now = new Date()
let year = now.getFullYear()
let month = now.getMonth() + 1
if (month < 10) {
month = '0' + month
}
let day = now.getDate();
if(day<10){
day = '0'+day
let day = now.getDate()
if (day < 10) {
day = '0' + day
}
return year + "-" + month + "-" + day;
}
}
return year + '-' + month + '-' + day
},
},
}
</script>