Merge branch 'dev'

This commit is contained in:
wkc
2026-03-06 13:40:54 +08:00
18 changed files with 997 additions and 14 deletions

View File

@@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = UAT支行数智管理平台系统
VUE_APP_TITLE = DEV支行数智管理平台系统
# 开发环境配置
ENV = 'development'

View File

@@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = PRE支行数智管理平台系统
VUE_APP_TITLE = UAT支行数智管理平台系统
NODE_ENV = staging

View File

@@ -18,7 +18,7 @@
</style>
<script>
// 这里一定要配置ak 否则无法使用
window.BMAP_AUTHENTIC_KEY = "t6k6UC2IZR40Un8kkqM4RXlaQb4FulyM"
window.BMAP_AUTHENTIC_KEY = "mokVj0S4sGE9av6NBwy8WHY0xnQsucbE"
</script>
<script>
const result = new URLSearchParams(window.location.search)

View File

@@ -18,7 +18,7 @@
</style>
<script>
// 这里一定要配置ak 否则无法使用
window.BMAP_AUTHENTIC_KEY = "t6k6UC2IZR40Un8kkqM4RXlaQb4FulyM"
window.BMAP_AUTHENTIC_KEY = "mokVj0S4sGE9av6NBwy8WHY0xnQsucbE"
</script>
<script>

View File

@@ -18,7 +18,7 @@
</style>
<script>
// 这里一定要配置ak 否则无法使用
window.BMAP_AUTHENTIC_KEY = "t6k6UC2IZR40Un8kkqM4RXlaQb4FulyM"
window.BMAP_AUTHENTIC_KEY = "mokVj0S4sGE9av6NBwy8WHY0xnQsucbE"
</script>
<script>
const result = new URLSearchParams(window.location.search)

View File

@@ -23,7 +23,7 @@
</style>
<script>
// 这里一定要配置ak 否则无法使用
window.BMAP_AUTHENTIC_KEY = "t6k6UC2IZR40Un8kkqM4RXlaQb4FulyM"
window.BMAP_AUTHENTIC_KEY = "mokVj0S4sGE9av6NBwy8WHY0xnQsucbE"
</script>
<script type="text/javascript" src="./script/getscript.js?type=webgl&v=1.0&services=&t=20230529114224"></script>
<!-- 引入logisticsgl的sdk -->

View File

@@ -39,7 +39,7 @@
<script>
const sdk = new QuHuaSdk({
ak: 'L7KaAZUYPVSD40nYT09rWWgIdZKUesiX',
webAk: 't6k6UC2IZR40Un8kkqM4RXlaQb4FulyM',
webAk: 'mokVj0S4sGE9av6NBwy8WHY0xnQsucbE',
domId: 'box',
defaultCenterCity: "杭州市", // 非必填
_baseUrl: window.NODE_ENV === "production" ? "http://64.202.32.20:5001/logisticsWeb-quhua-intranet" : "http://158.234.96.76:5001/logisticsWeb-quhua-intranet", // 固定格式,必填

View File

@@ -19,7 +19,7 @@
</style>
<script>
// 这里一定要配置ak 否则无法使用
window.BMAP_AUTHENTIC_KEY = "t6k6UC2IZR40Un8kkqM4RXlaQb4FulyM"
window.BMAP_AUTHENTIC_KEY = "mokVj0S4sGE9av6NBwy8WHY0xnQsucbE"
</script>
<script>
const result = new URLSearchParams(window.location.search)

View File

@@ -34,7 +34,7 @@
</style>
<script>
// 这里一定要配置ak 否则无法使用
window.BMAP_AUTHENTIC_KEY = "t6k6UC2IZR40Un8kkqM4RXlaQb4FulyM"
window.BMAP_AUTHENTIC_KEY = "mokVj0S4sGE9av6NBwy8WHY0xnQsucbE"
</script>
<script>

View File

@@ -19,7 +19,7 @@
</style>
<script>
// 这里一定要配置ak 否则无法使用
window.BMAP_AUTHENTIC_KEY = "t6k6UC2IZR40Un8kkqM4RXlaQb4FulyM"
window.BMAP_AUTHENTIC_KEY = "mokVj0S4sGE9av6NBwy8WHY0xnQsucbE"
</script>
<script>
const result = new URLSearchParams(window.location.search)

View File

@@ -8,9 +8,10 @@
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<script>
// 这里一定要配置ak 否则无法使用
window.BMAP_AUTHENTIC_KEY = "t6k6UC2IZR40Un8kkqM4RXlaQb4FulyM"
window.BMAP_AUTHENTIC_KEY = "mokVj0S4sGE9av6NBwy8WHY0xnQsucbE"
</script>
<script type="text/javascript" src="<%= VUE_APP_BAIDU_PATH %>"></script>
<!-- <script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=mokVj0S4sGE9av6NBwy8WHY0xnQsucbE"></script> -->
<link rel="stylesheet" type="text/css" href="<%= VUE_APP_BAIDU_CSS_PATH %>" />
<script type="text/javascript" src="\baidu\script\index.umd.min.js"></script>

View File

@@ -237,6 +237,14 @@
@click.stop="updateAreaInfo"
/>
</el-tooltip>
<!-- 查看客户 -->
<el-tooltip placement="top" effect="light" content="查看客户">
<i
class="el-icon-user icon-area"
@click.stop="previewCustomer"
/>
</el-tooltip>
<!-- 删除区域 -->
<el-tooltip placement="top" effect="light" content="删除区域">
<el-popconfirm
title="确定删除吗?"
@@ -271,6 +279,13 @@
</div>
</div>
</transition>
<!-- 查看客户模态框 -->
<customer-modal
ref="customerModal"
cardType="featured"
:detailInfo="areaForm"
:btnType="'2'"
/>
<div class="search-box">
<el-form size="small" class="myForm">
<el-form-item style="width: 130px">
@@ -337,6 +352,7 @@ import { businessBelongList } from '@/views/grid/create/utils'
import { mapGetters } from 'vuex'
import { Message } from 'element-ui'
import { isEmpty } from 'lodash'
import CustomerModal from '@/views/grid/map/draw-area/customer-modal.vue'
const polygonOptions = {
strokeColor: '#5E87DB',
strokeWeight: 3,
@@ -355,6 +371,9 @@ const labelOptions = {
}
export default {
name: 'BMapPolygonEditor',
components: {
CustomerModal
},
props: ['layerInfo'],
data() {
return {
@@ -1207,6 +1226,12 @@ export default {
this.$store.dispatch('setIsDrawing', true)
this.currentPolygon.enableEditing()
},
/**
* 查看客户
*/
previewCustomer() {
this.$refs.customerModal.onOpen()
},
setForm(data) {
this.areaForm = data
this.visible = true

View File

@@ -35,7 +35,7 @@ export default {
initSdk(){
this.sdk = new QuHuaSdk({
ak: 'L7KaAZUYPVSD40nYT09rWWgIdZKUesiX',
webAk: 't6k6UC2IZR40Un8kkqM4RXlaQb4FulyM',
webAk: 'mokVj0S4sGE9av6NBwy8WHY0xnQsucbE',
domId: 'box',
defaultCenterCity: "杭州市", // 非必填
_baseUrl: "http://158.234.96.76:5001/logisticsWeb-quhua-intranet", // 固定格式,必填
@@ -137,7 +137,7 @@ export default {
onChange(){
this.sdk = new QuHuaSdk({
ak: 'L7KaAZUYPVSD40nYT09rWWgIdZKUesiX',
webAk: 't6k6UC2IZR40Un8kkqM4RXlaQb4FulyM',
webAk: 'mokVj0S4sGE9av6NBwy8WHY0xnQsucbE',
domId: 'box',
defaultCenterCity: "杭州市", // 非必填
_baseUrl: "http://158.234.96.76:5001/logisticsWeb-quhua-intranet", // 固定格式,必填