From 5965c857d575f5b4ebc6e73345c992f4f5def4a3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 19 三月 2025 15:25:21 +0800
Subject: [PATCH] 优化
---
admin/src/views/combo/record.vue | 14 ++++++++++----
admin/src/views/operation/site.vue | 7 +++----
admin/src/views/operation/components/AMap.vue | 10 +++++-----
admin/.env.production | 4 ++--
admin/src/views/business/analysis.vue | 2 +-
5 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/admin/.env.production b/admin/.env.production
index 68e7229..8ac942f 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -5,9 +5,9 @@
VUE_APP_CONTEXT_PATH = '/bike_admin'
# VUE_APP_API_BASE_URL = 'http://localhost:80/meeting_admin_interface'
-# VUE_APP_API_BASE_URL = 'https://dmtest.ahapp.net/bike_admin_api'
+VUE_APP_API_BASE_URL = 'https://dmtest.ahapp.net/bike_admin_api'
-VUE_APP_API_BASE_URL = 'https://bikes.yxbhlt.cn/bike_admin_api/'
+# VUE_APP_API_BASE_URL = 'https://bikes.yxbhlt.cn/bike_admin_api/'
# VUE_APP_API_BASE_URL = 'https://skinai.beikepai.com/admin_interface'
# https://dmtest.ahapp.net/meeting_admin_interface/doc.html
diff --git a/admin/src/views/business/analysis.vue b/admin/src/views/business/analysis.vue
index 4438759..5104a24 100644
--- a/admin/src/views/business/analysis.vue
+++ b/admin/src/views/business/analysis.vue
@@ -172,7 +172,7 @@
}
</script>
<style lang="scss" scoped>
- ::v-deep .el-table tr:last-child {
+ ::v-deep .el-table tbody tr:last-child {
font-size: 16px;
font-weight: bold;
background-color: #f3f3fb;
diff --git a/admin/src/views/combo/record.vue b/admin/src/views/combo/record.vue
index d87a233..9e99055 100644
--- a/admin/src/views/combo/record.vue
+++ b/admin/src/views/combo/record.vue
@@ -6,7 +6,7 @@
<div class="table_btns">
<el-button plain type="primary" @click="handleEx">瀵煎嚭</el-button>
<el-button plain type="danger" @click="openModal('zuofei')">浣滃簾</el-button>
- <el-button plain @click="openModal('tiaozheng')">濂楅璋冩暣</el-button>
+ <el-button plain type="primary" @click="openModal('tiaozheng')">濂楅璋冩暣</el-button>
</div>
<el-table v-loading="loading" :data="list" stripe border @selection-change="handleSelectionChange">
<el-table-column fixed="left" align="center" type="selection" :selectable="handleDisable" width="55" />
@@ -209,13 +209,19 @@
},
handleEx() {
const { pagination, filters } = this
+ let form = JSON.parse(JSON.stringify(filters))
+ if (form.createDate && form.createDate.length > 0) {
+ form.startCreateDate = form.createDate[0] + ' 00:00:00'
+ form.endCreateDate = form.createDate[1] + ' 23:59:59'
+ delete form.createDate
+ }
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
this.loading = true
comboSaleEx({
page: 1,
capacity: 1000000,
- model: filters
+ model: form
})
.then(response => {
this.download(response)
@@ -244,8 +250,8 @@
if (page) { pagination.page = page }
let form = JSON.parse(JSON.stringify(filters))
if (form.createDate && form.createDate.length > 0) {
- form.startCreateDate = form.createDate[0]
- form.endCreateDate = form.createDate[1]
+ form.startCreateDate = form.createDate[0] + ' 00:00:00'
+ form.endCreateDate = form.createDate[1] + ' 23:59:59'
delete form.createDate
}
comboSalePage({
diff --git a/admin/src/views/operation/components/AMap.vue b/admin/src/views/operation/components/AMap.vue
index 52da152..5627175 100644
--- a/admin/src/views/operation/components/AMap.vue
+++ b/admin/src/views/operation/components/AMap.vue
@@ -1,6 +1,6 @@
<template>
<GlobalWindow title="缁樺埗杩愯惀鍖哄煙" :visible.sync="isShowModal" :confirm-working="isWorking" @close="close"
- @confirm="confirm" width="1000px">
+ @confirm="confirm" width="100%">
<div class="map_title">缁樺埗锛氶紶鏍囧乏閿偣鍑诲強绉诲姩鍗冲彲缁樺埗鍥惧舰锛岀粯鍒惰繃绋嬩腑鎸変笅esc閿彲涓柇璇ヨ繃绋�</div>
<div class="map_title">榧犳爣宸﹂敭鍙屽嚮鍗冲彲缁撴潫褰撳墠澶氳竟褰㈢粯鍒讹紝澶氳竟褰細鑷姩闂悎锛�</div>
<div class="map_wrap">
@@ -52,11 +52,11 @@
// maximumAge: 0 // 绂佺敤缂撳瓨
// }
// )
- console.log('-----')
+ console.log('-----', this.row)
map = new TMap.Map("containera", {
- zoom: 16, // 璁剧疆鍦板浘缂╂斁绾у埆
- center: new TMap.LatLng(31.722763, 117.385480) // 璁剧疆鍦板浘涓績鐐瑰潗鏍�
+ zoom: this.polygons.length > 0 ? 20 : 16, // 璁剧疆鍦板浘缂╂斁绾у埆
+ center: this.polygons.length > 0 ? new TMap.LatLng(this.polygons[0].lat, this.polygons[0].lng) : new TMap.LatLng(31.722763, 117.385480) // 璁剧疆鍦板浘涓績鐐瑰潗鏍�
})
var tempList = []
if (this.polygons.length > 0) {
@@ -157,4 +157,4 @@
z-index: 99999999999;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/admin/src/views/operation/site.vue b/admin/src/views/operation/site.vue
index cee6a24..60daae8 100644
--- a/admin/src/views/operation/site.vue
+++ b/admin/src/views/operation/site.vue
@@ -92,7 +92,6 @@
},
methods: {
changeMap(e, row) {
- console.log(e);
updateById({ ...row, electronicFence: JSON.stringify(e) }).then(res => {
if (res) {
Message.success('璁剧疆鎴愬姛')
@@ -104,9 +103,9 @@
this.$refs.MapRef.isShowModal = true
this.$nextTick(() => {
this.$refs.MapRef.row = row
- // if (row.electronicFence) {
- // this.$refs.MapRef.polygons = JSON.parse(row.electronicFence)
- // }
+ if (row.electronicFence) {
+ this.$refs.MapRef.polygons = JSON.parse(row.electronicFence)
+ }
this.$refs.MapRef.initMap()
})
--
Gitblit v1.9.3