From 3aa3e034d30b201dde95d9bc33e5b1250dd8f256 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 03 三月 2025 11:08:25 +0800
Subject: [PATCH] ll
---
admin/src/views/operation/components/QRcode.vue | 180 +++++++++++++++++++++++----------------------
admin/src/views/operation/site.vue | 6
admin/src/views/business/miniproSetting.vue | 4
admin/src/views/combo/components/Edit.vue | 2
admin/src/views/operation/components/AMap.vue | 22 ++++
admin/src/views/operation/tram.vue | 9 +-
admin/src/views/business/components/Map.vue | 2
admin/.env.development | 4
8 files changed, 125 insertions(+), 104 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 368d9b7..fe7c9be 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -11,7 +11,7 @@
# http://192.168.0.36:10012/doc.html#/home
# 钀嶅鏈湴
- VUE_APP_API_BASE_URL = 'http://192.168.0.104:10026'
+# VUE_APP_API_BASE_URL = 'http://192.168.0.129:10026'
# 鍚庣鎺ュ彛鍦板潃
-#VUE_APP_API_BASE_URL = 'https://dmtest.ahapp.net/bike_admin_api'
+VUE_APP_API_BASE_URL = 'https://dmtest.ahapp.net/bike_admin_api'
diff --git a/admin/src/views/business/components/Map.vue b/admin/src/views/business/components/Map.vue
index 102de26..101232f 100644
--- a/admin/src/views/business/components/Map.vue
+++ b/admin/src/views/business/components/Map.vue
@@ -39,7 +39,7 @@
methods: {
initMap() {
map = new TMap.Map("container", {
- zoom: 15, // 璁剧疆鍦板浘缂╂斁绾у埆
+ zoom: 16, // 璁剧疆鍦板浘缂╂斁绾у埆
center: new TMap.LatLng(31.722763, 117.385480) // 璁剧疆鍦板浘涓績鐐瑰潗鏍�
})
var tempList = []
diff --git a/admin/src/views/business/miniproSetting.vue b/admin/src/views/business/miniproSetting.vue
index d234c77..2490bf5 100644
--- a/admin/src/views/business/miniproSetting.vue
+++ b/admin/src/views/business/miniproSetting.vue
@@ -37,8 +37,8 @@
<div class="tips">褰撹溅杈嗘弧杞借秴杩囦互涓婇厤缃椂锛屾彁绀虹鐞嗗憳</div>
</el-form-item>
<el-form-item label="鐢靛姩杞︿复鏃跺仠杞﹂檺鍒�">
- <el-radio v-model="form.pauseBikeType" :label="0">鍋滆溅鐐瑰唴鍋滆溅</el-radio>
- <el-radio v-model="form.pauseBikeType" :label="1">杩愯惀鍖哄唴鍋滆溅</el-radio>
+ <el-radio v-model="form.pauseBikeType" label="0">鍋滆溅鐐瑰唴鍋滆溅</el-radio>
+ <el-radio v-model="form.pauseBikeType" label="1">杩愯惀鍖哄唴鍋滆溅</el-radio>
</el-form-item>
<el-form-item label="鐢靛姩杞︿复鏃惰嚜鍔ㄥ叧閿�">
<el-input v-model="form.pauseAutoCloseTime"
diff --git a/admin/src/views/combo/components/Edit.vue b/admin/src/views/combo/components/Edit.vue
index ee6f0a0..e89d27f 100644
--- a/admin/src/views/combo/components/Edit.vue
+++ b/admin/src/views/combo/components/Edit.vue
@@ -227,7 +227,7 @@
comboDetailPost(id).then(res => {
this.param = res
this.$set(this.param, 'saleDate', [res.startDate, res.endDate])
- if (res.useStartDate && res.useEndDate && res.type != 0) {
+ if (res.useStartDate && res.useEndDate && res.useType != 2) {
this.$set(this.param, 'useDate', [res.useStartDate, res.useEndDate])
}
this.$set(this.param, 'id', type == 'copy' ? null : this.param.id)
diff --git a/admin/src/views/operation/components/AMap.vue b/admin/src/views/operation/components/AMap.vue
index 9b6a4c1..52da152 100644
--- a/admin/src/views/operation/components/AMap.vue
+++ b/admin/src/views/operation/components/AMap.vue
@@ -10,7 +10,7 @@
<!-- <el-button plain @click="reset">閲嶆柊缁樺埗</el-button> -->
<!-- <el-button plain type="danger" @click="deleteObj">鍒犻櫎</el-button> -->
</div>
- <div id="container" style="width: 100%; height: 100%"></div>
+ <div id="containera" style="width: 100%; height: 100%"></div>
</div>
</GlobalWindow>
</template>
@@ -38,8 +38,24 @@
},
methods: {
initMap() {
- map = new TMap.Map("container", {
- zoom: 15, // 璁剧疆鍦板浘缂╂斁绾у埆
+ // navigator.geolocation.getCurrentPosition(
+ // (position) => {
+ // const { latitude, longitude } = position.coords
+ // console.log(`褰撳墠瀹氫綅: 绾害 ${latitude}, 缁忓害 ${longitude}`)
+ // },
+ // (error) => {
+ // console.error("瀹氫綅澶辫触:", error.message)
+ // },
+ // {
+ // enableHighAccuracy: true, // 鎻愰珮瀹氫綅绮惧害
+ // timeout: 5000, // 瓒呮椂鏃堕棿
+ // maximumAge: 0 // 绂佺敤缂撳瓨
+ // }
+ // )
+ console.log('-----')
+
+ map = new TMap.Map("containera", {
+ zoom: 16, // 璁剧疆鍦板浘缂╂斁绾у埆
center: new TMap.LatLng(31.722763, 117.385480) // 璁剧疆鍦板浘涓績鐐瑰潗鏍�
})
var tempList = []
diff --git a/admin/src/views/operation/components/QRcode.vue b/admin/src/views/operation/components/QRcode.vue
index 0f8670c..80b3e77 100644
--- a/admin/src/views/operation/components/QRcode.vue
+++ b/admin/src/views/operation/components/QRcode.vue
@@ -1,26 +1,24 @@
<template>
- <GlobalWindow
- title="鏌ョ湅鍥剧墖"
- :visible.sync="visible"
- :confirm-working="isWorking"
- confirmText="鎵撳嵃浜岀淮鐮�"
- >
- <div class="box" id="print-content">
- <div class="box_item" v-for="(item, index) in list" :key="index">
-<!-- <div class="box_item_title">寰俊</div>-->
- <div class="box_item_qr">
- <img :src="item.imgurl" />
-<!-- <span>{{item.siteId}}/{{item.code}}</span>-->
- </div>
-<!-- <div class="box_item_footer">鎵爜鍙栬溅</div>-->
- </div>
+ <GlobalWindow title="鏌ョ湅鍥剧墖" :visible.sync="visible" :confirm-working="isWorking" confirmText="鎵撳嵃浜岀淮鐮�">
+ <div class="box" id="print-content">
+ <template v-for="(item, index) in list">
+ <div class="box_item" v-if="item.imgurl" :key="index">
+ <!-- <div class="box_item_title">寰俊</div>-->
+ <div class="box_item_qr">
+ <img :src="item.imgurl" />
+ <!-- <span>{{item.siteId}}/{{item.code}}</span>-->
+ </div>
+ <!-- <div class="box_item_footer">鎵爜鍙栬溅</div>-->
</div>
- <template v-slot:footer>
-<!-- <el-button type="primary" v-print="'#print-content'">鎵撳嵃</el-button>-->
- <el-button type="primary" :loading="isWorking.export" @click="exportImages">鎵撳寘涓嬭浇</el-button>
- <el-button @click="close">杩斿洖</el-button>
- </template>
- </GlobalWindow>
+ </template>
+
+ </div>
+ <template v-slot:footer>
+ <!-- <el-button type="primary" v-print="'#print-content'">鎵撳嵃</el-button>-->
+ <el-button type="primary" :loading="isWorking.export" @click="exportImages">鎵撳寘涓嬭浇</el-button>
+ <el-button @click="close">杩斿洖</el-button>
+ </template>
+ </GlobalWindow>
</template>
<script>
@@ -31,92 +29,98 @@
name: 'QRcode',
extends: BaseOpera,
components: { GlobalWindow },
- data () {
+ data() {
return {
- siteId:'',
- isLoading : true,
+ siteId: '',
+ isLoading: true,
list: []
}
},
- created () {
+ created() {
this.config({
api: '/business/sites',
'field.id': 'id'
})
},
methods: {
- open (title, id) {
+ open(title, id) {
this.visible = true
},
- close () {
+ close() {
this.visible = false
},
- exportImages () {
- downloadImgs( this.siteId)
- .then(response => {
- this.download(response)
- })
- .catch(e => {
- this.$tip.apiFailed(e)
- })
- .finally(() => {
- this.isWorking.export = false
- })
+ exportImages() {
+ downloadImgs(this.siteId)
+ .then(response => {
+ this.download(response)
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.isWorking.export = false
+ })
}
}
}
</script>
<style lang="scss" scoped>
- .box {
- width: 100%;
- display: flex;
- align-items: center;
- /*justify-content: space-between;*/
- flex-wrap: wrap;
- .box_item {
- width: 152px;
- height: auto;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- align-items: center;
- background: #FFFFFF;
- border: 1px solid #BBBBBB;
- padding: 3px 0 4px 0;
- box-sizing: border-box;
- margin-top: 50px;
- margin-left: 35px;
- .box_item_title {
- font-size: 21px;
- font-weight: 400;
- color: #222222;
- }
- .box_item_qr {
- width: 139px;
- height: 154px;
- padding: 6px 7px;
- box-sizing: border-box;
- background: #282828;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: space-between;
- img {
- width: 126px;
- height: 146px;
- }
- span {
- font-size: 13px;
- font-weight: 400;
- color: #FFFFFF;
- }
- }
- .box_item_footer {
- font-size: 23px;
- font-weight: bold;
- color: #222222;
- }
- }
+.box {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ /*justify-content: space-between;*/
+ flex-wrap: wrap;
+
+ .box_item {
+ width: 152px;
+ height: auto;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: center;
+ background: #FFFFFF;
+ border: 1px solid #BBBBBB;
+ padding: 3px 0 4px 0;
+ box-sizing: border-box;
+ margin-top: 50px;
+ margin-left: 35px;
+
+ .box_item_title {
+ font-size: 21px;
+ font-weight: 400;
+ color: #222222;
}
+
+ .box_item_qr {
+ width: 139px;
+ height: 154px;
+ padding: 6px 7px;
+ box-sizing: border-box;
+ background: #282828;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: space-between;
+
+ img {
+ width: 126px;
+ height: 146px;
+ }
+
+ span {
+ font-size: 13px;
+ font-weight: 400;
+ color: #FFFFFF;
+ }
+ }
+
+ .box_item_footer {
+ font-size: 23px;
+ font-weight: bold;
+ color: #222222;
+ }
+ }
+}
</style>
diff --git a/admin/src/views/operation/site.vue b/admin/src/views/operation/site.vue
index 512cfdb..cee6a24 100644
--- a/admin/src/views/operation/site.vue
+++ b/admin/src/views/operation/site.vue
@@ -104,9 +104,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()
})
diff --git a/admin/src/views/operation/tram.vue b/admin/src/views/operation/tram.vue
index 3f221de..65e7cda 100644
--- a/admin/src/views/operation/tram.vue
+++ b/admin/src/views/operation/tram.vue
@@ -8,10 +8,10 @@
<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="name">
- <el-select v-model="searchForm.status" placeholder="鐢甸噺鎯呭喌" @change="search">
- <el-option label="姝ｅ父" value="0" />
- <el-option label="鐢甸噺浣�" value="1" />
+ <el-form-item label="鐢甸噺鎯呭喌" prop="lowVoltage">
+ <el-select v-model="searchForm.lowVoltage" placeholder="鐢甸噺鎯呭喌" @change="search">
+ <el-option label="姝ｅ父" :value="0" />
+ <el-option label="鐢甸噺浣�" :value="1" />
</el-select>
</el-form-item>
<section>
@@ -106,6 +106,7 @@
code: '',
status: '',
lockNum: '',
+ lowVoltage: '',
ip: '',
type: 1,
clientVersion: ''
--
Gitblit v1.9.3