From d70c5b859cf369e4cad13467cb41b6e272720ebd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 01 三月 2024 16:00:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/.env | 3
admin/src/components/common/Menu.vue | 7 +
admin/src/views/business/freezePersonnel.vue | 2
admin/src/views/login.vue | 3
admin/src/api/business/interfaceLog.js | 18 ++++
admin/src/components/business/OperaInterfaceLogWindow.vue | 49 ++++++++++++
admin/src/views/business/retention.vue | 6
admin/vue.config.js | 2
admin/src/views/business/interfaceLog.vue | 134 +++++++++++++++++++++++++++++++++
h5/pages/userinfo/userinfo.vue | 2
10 files changed, 218 insertions(+), 8 deletions(-)
diff --git a/admin/.env b/admin/.env
index 61f9376..9b30518 100644
--- a/admin/.env
+++ b/admin/.env
@@ -8,3 +8,6 @@
# 鎺ュ彛鍓嶇紑
VUE_APP_API_PREFIX = '/admin_interface'
+
+# 椤圭洰鍚嶇О
+VUE_APP_TITLE = '鍗庢櫉鍥尯'
diff --git a/admin/src/api/business/interfaceLog.js b/admin/src/api/business/interfaceLog.js
new file mode 100644
index 0000000..7d6ff29
--- /dev/null
+++ b/admin/src/api/business/interfaceLog.js
@@ -0,0 +1,18 @@
+import request from '../../utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+ return request.post('/business/interfaceLog/page', data, {
+ trim: true
+ })
+}
+
+// 鍒涘缓
+export function create (data) {
+ return request.post('/business/interfaceLog/create', data)
+}
+
+// 淇敼
+export function updateById (data) {
+ return request.post('/business/interfaceLog/updateById', data)
+}
diff --git a/admin/src/components/business/OperaInterfaceLogWindow.vue b/admin/src/components/business/OperaInterfaceLogWindow.vue
new file mode 100644
index 0000000..986f828
--- /dev/null
+++ b/admin/src/components/business/OperaInterfaceLogWindow.vue
@@ -0,0 +1,49 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ :withFooter="false"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <div class="box">
+ {{form.content}}
+ </div>
+ </GlobalWindow>
+</template>
+
+<script>
+ import BaseOpera from '@/components/base/BaseOpera'
+ import GlobalWindow from '@/components/common/GlobalWindow'
+ export default {
+ name: 'OperaInterfaceLogWindow',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ content: ''
+ },
+ // 楠岃瘉瑙勫垯
+ rules: {
+ }
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/interfaceLog',
+ 'field.id': 'id'
+ })
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .box {
+ width: 100%;
+ font-size: 15px;
+ color: #222222;
+ word-wrap: break-word;
+ }
+</style>
diff --git a/admin/src/components/common/Menu.vue b/admin/src/components/common/Menu.vue
index 6d68ecb..96422f6 100644
--- a/admin/src/components/common/Menu.vue
+++ b/admin/src/components/common/Menu.vue
@@ -2,7 +2,7 @@
<div class="menu" :class="{collapse: menuData.collapse}">
<div class="logo">
<div><img src="@/assets/logo.png"></div>
- <h1 :class="{hidden: menuData.collapse}">鍗庢櫉鍥尯</h1>
+ <h1 :class="{hidden: menuData.collapse}">{{title}}</h1>
</div>
<scrollbar>
<!-- :default-openeds="defaultOpeneds"-->
@@ -28,6 +28,11 @@
import Scrollbar from './Scrollbar'
export default {
name: 'Menu',
+ data() {
+ return {
+ title: process.env.VUE_APP_TITLE
+ }
+ },
components: { Scrollbar, MenuItems },
computed: {
...mapState(['menuData']),
diff --git a/admin/src/views/business/freezePersonnel.vue b/admin/src/views/business/freezePersonnel.vue
index 160a642..b5435b6 100644
--- a/admin/src/views/business/freezePersonnel.vue
+++ b/admin/src/views/business/freezePersonnel.vue
@@ -3,7 +3,7 @@
<!-- 鎼滅储琛ㄥ崟 -->
<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-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ鍚�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="宸ュ彿" prop="code">
<el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ伐鍙�" @keypress.enter.native="search"></el-input>
diff --git a/admin/src/views/business/interfaceLog.vue b/admin/src/views/business/interfaceLog.vue
new file mode 100644
index 0000000..d9cfe3f
--- /dev/null
+++ b/admin/src/views/business/interfaceLog.vue
@@ -0,0 +1,134 @@
+<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" 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="success">
+ <el-select v-model="searchForm.success" 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"
+ format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ <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 style="color: green;" v-if="row.success == 0">鎴愬姛</span>
+ <span style="color: red;" v-if="row.success == 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>
+ import BaseTable from '@/components/base/BaseTable'
+ import TableLayout from '@/layouts/TableLayout'
+ import Pagination from '@/components/common/Pagination'
+ import OperaInterfaceLogWindow from '@/components/business/OperaInterfaceLogWindow'
+ export default {
+ name: 'InterfaceLog',
+ extends: BaseTable,
+ components: { TableLayout, Pagination, OperaInterfaceLogWindow },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ name: '',
+ type: '',
+ endDate: '',
+ startDate: '',
+ success: ''
+ },
+ time: []
+ }
+ },
+ created () {
+ this.config({
+ module: '涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍',
+ api: '/business/interfaceLog',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.search()
+ },
+ methods: {
+ seleTime (e) {
+ this.searchForm.startDate = e[0]
+ this.searchForm.endDate = e[1]
+ this.search()
+ },
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.startDate = ''
+ this.searchForm.endDate = ''
+ this.time = []
+ this.search()
+ }
+ }
+ }
+</script>
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index d2ab034..aee3934 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -70,9 +70,9 @@
<el-table-column label="浜鸿劯鐓х墖" min-width="100px">
<template slot-scope="{row}">
<el-image v-if="row.faceImgFull!=null"
- style="width: 80px; height: 80px"
- :src="row.faceImgFull"
- :preview-src-list="[row.faceImgFull]">
+ style="width: 80px; height: 80px"
+ :src="row.faceImgFull"
+ :preview-src-list="[row.faceImgFull]">
</el-image>
</template>
</el-table-column>
diff --git a/admin/src/views/login.vue b/admin/src/views/login.vue
index 5d27534..fb5c195 100644
--- a/admin/src/views/login.vue
+++ b/admin/src/views/login.vue
@@ -1,7 +1,7 @@
<template>
<div class="wrap">
<div class="introduce">
- <h2>璞嗙背璺宠烦</h2>
+ <h2>{{title}}</h2>
<h3></h3>
</div>
<div class="login">
@@ -29,6 +29,7 @@
data () {
return {
loading: false,
+ title: process.env.VUE_APP_TITLE,
username: '',
password: '',
// 楠岃瘉鐮�
diff --git a/admin/vue.config.js b/admin/vue.config.js
index 9a30f30..149382e 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -17,7 +17,7 @@
// http://192.168.0.129:10028 浠诲悍
// https://dmtest.ahapp.net/admin_api 娴嬭瘯鏈�
// http://10.10.99.63/admin_interface/ 鏈�鏂版祴璇曟湇
- target: 'http://218.23.218.228:8018/admin_interface',
+ target: 'http://192.168.0.186:10028',
changeOrigin: true,
pathRewrite: {
[`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
diff --git a/h5/pages/userinfo/userinfo.vue b/h5/pages/userinfo/userinfo.vue
index d328ee9..cc59728 100644
--- a/h5/pages/userinfo/userinfo.vue
+++ b/h5/pages/userinfo/userinfo.vue
@@ -34,7 +34,7 @@
</view>
<view class="cell">
<view class="title1">
- <text class="title1_a">浜鸿劯鐓х墖<b>*</b></text>
+ <text class="title1_a">浜鸿劯鐓х墖<b style="color: red;">*</b></text>
<text class="title1_b">1銆佽鎻愪緵浜斿畼娓呮櫚锛屼汉鑴稿眳涓殑姝ｉ潰浜鸿劯鍏嶅啝鐓х墖锛�</text>
<text class="title1_b">2銆佺収鐗囨棤閫嗗厜銆佹棤PS銆佹棤杩囧害缇庨澶勭悊</text>
</view>
--
Gitblit v1.9.3