From dd4cd96c69061da3ff80cbfb87237b16cda8abc3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 26 九月 2025 18:48:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/interfaceLog.vue | 157 ++++++++++++++++++++++++++-------------------------
1 files changed, 80 insertions(+), 77 deletions(-)
diff --git a/admin/src/views/business/interfaceLog.vue b/admin/src/views/business/interfaceLog.vue
index 4fd6355..d31cd1f 100644
--- a/admin/src/views/business/interfaceLog.vue
+++ b/admin/src/views/business/interfaceLog.vue
@@ -1,18 +1,18 @@
<template>
- <TableLayout :permissions="['business:interfacelog:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鎺ュ彛鍚嶇О" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ帴鍙ｅ悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="绫诲瀷" prop="type">
- <el-select v-model="searchForm.type" @change="search" placeholder="璇烽�夋嫨">
- <el-option label="璋冪敤" value="0"></el-option>
- <el-option label="鎺ㄩ�佹帴鍙�" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璧锋鏃堕棿" prop="startDate">
- <el-date-picker
+ <TableLayout :permissions="['business:interfacelog:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="鎺ュ彛鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ帴鍙ｅ悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="绫诲瀷" prop="type">
+ <el-select v-model="searchForm.type" @change="search" placeholder="璇烽�夋嫨">
+ <el-option label="璋冪敤" value="0"></el-option>
+ <el-option label="鎺ㄩ�佹帴鍙�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璧锋鏃堕棿" prop="startDate">
+ <!-- <el-date-picker
@change="seleTime"
v-model="time"
type="datetimerange"
@@ -21,61 +21,59 @@
range-separator="鑷�"
start-placeholder="寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
- <el-radio-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- >
- <el-table-column prop="name" label="鎺ュ彛鍚嶇О" min-width="180px"></el-table-column>
- <el-table-column prop="url" label="鍦板潃淇℃伅" min-width="180px"></el-table-column>
- <el-table-column label="绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.type == 0">璋冪敤</span>
- <span v-if="row.type == 1">鎺ㄩ�佹帴鏀�</span>
- </template>
- </el-table-column>
- <el-table-column label="骞冲彴" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.plat == 0">娴峰悍瀹夐槻骞冲彴</span>
- <span v-if="row.plat == 1">ERP绯荤粺</span>
- </template>
- </el-table-column>
- <el-table-column prop="request" label="璇锋眰鍙傛暟" min-width="100px">
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('璇锋眰鍙傛暟', {content: row.request})">鏌ョ湅</el-button>
- </template>
- </el-table-column>
- <el-table-column prop="repose" label="鍝嶅簲鍙傛暟" min-width="100px">
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('鍝嶅簲鍙傛暟', {content: row.repose})">鏌ョ湅</el-button>
- </template>
- </el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- <!-- 鏂板缓/淇敼 -->
- <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange"/>
- </TableLayout>
+ </el-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.startDate" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endDate" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
+ </el-form-item>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
+ </el-radio-group>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table-column prop="name" label="鎺ュ彛鍚嶇О" min-width="180px"></el-table-column>
+ <el-table-column prop="url" label="鍦板潃淇℃伅" min-width="180px"></el-table-column>
+ <el-table-column label="绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.type == 0">璋冪敤</span>
+ <span v-if="row.type == 1">鎺ㄩ�佹帴鏀�</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="骞冲彴" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.plat == 0">娴峰悍瀹夐槻骞冲彴</span>
+ <span v-if="row.plat == 1">ERP绯荤粺</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="request" label="璇锋眰鍙傛暟" min-width="100px">
+ <template slot-scope="{row}">
+ <el-button type="text"
+ @click="$refs.operaInterfaceLogWindow.open('璇锋眰鍙傛暟', { content: row.request })">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ <el-table-column prop="repose" label="鍝嶅簲鍙傛暟" min-width="100px">
+ <template slot-scope="{row}">
+ <el-button type="text"
+ @click="$refs.operaInterfaceLogWindow.open('鍝嶅簲鍙傛暟', { content: row.repose })">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange" />
+ </TableLayout>
</template>
<script>
@@ -88,7 +86,7 @@
name: 'InterfaceLog',
extends: BaseTable,
components: { TableLayout, Pagination, OperaInterfaceLogWindow },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -101,7 +99,7 @@
time: []
}
},
- created () {
+ created() {
this.config({
module: '涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍',
api: '/business/interfaceLog',
@@ -111,32 +109,37 @@
this.changeRadio('0')
},
methods: {
- changeRadio (e) {
+ changeRadio(e) {
if (e === '0') {
this.searchForm.startDate = timeForMat(0)[0]
this.searchForm.endDate = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startDate = timeForMat(6)[0]
this.searchForm.endDate = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.startDate = timeForMat(29)[0]
this.searchForm.endDate = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.startDate && this.searchForm.endDate && new Date(this.searchForm.startDate).getTime() > new Date(this.searchForm.endDate).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startDate = ''
+ return
}
this.search()
},
- seleTime (e) {
+ seleTime(e) {
this.searchForm.startDate = e[0]
this.searchForm.endDate = e[1]
this.searchForm.radio = null
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
this.searchForm.startDate = ''
this.searchForm.endDate = ''
+ this.searchForm.radio = ''
this.time = []
this.search()
}
--
Gitblit v1.9.3