Browse Source

更新地图

dev-warehouse
zhangsiyu 2 years ago
parent
commit
9a9a2a40e6
  1. 13
      src/router/views/index.js
  2. 24
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
  3. 4
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  4. 4
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  5. 4
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue
  6. 109
      src/views/distribution/reservation/atlas1.vue
  7. 4
      vite.config.js

13
src/router/views/index.js

@ -423,6 +423,19 @@ export default [
},
],
},
{
path: '/distribution/reservation/atlas1',
component: Layout,
redirect: '/distribution/reservation/atlas1',
children: [
{
path: '/distribution/reservation/atlas1',
name: '地图展示',
id:'id',
component: () => import('@/views/distribution/reservation/atlas1.vue'),
},
],
},
{
path: '/distribution/reservation/reservationDetails',
component: Layout,

24
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@ -109,8 +109,8 @@
<span> 请选择上架类型 </span>
<template #footer>
<span class="buts">
<el-button type="primary" @click="showupt">按服务号</el-button>
<el-button type="primary">按自编号</el-button>
<el-button type="primary" @click="showupt(1)">按服务号</el-button>
<el-button type="primary" @click="showupt(2)">按自编号</el-button>
<el-button type="primary">按包件</el-button>
<el-button type="primary">按托盘</el-button>
<el-button type="danger">禁用</el-button>
@ -121,7 +121,7 @@
<div class="disbox">
<div class="headtopscan">
<div>
<el-select filterable v-model="checkselect" class="" placeholder="请选择仓库">
<el-select filterable v-model="checkindex" class="" placeholder="请选择仓库">
<el-option
v-for="item in arrlist"
:key="item.id"
@ -240,7 +240,7 @@ let details = reactive({
checksele: 0,
checkregionselect: 0,
checkregionse: 0,
checkindex: 0,
checkindex: '',
contenbxsty: {
'--length': 1,
},
@ -271,8 +271,15 @@ onMounted(() => {
async function initconfig() {
let res = await getstoreCargo();
details.arrlist = res.data.data;
console.log(res.data, 'configconfigconfigconfigconfig');
if (details.arrlist[details.checkselect]?.warehouseGoodsAreaVOList.length > 0) {
details.checkregionselect = 0;
details.checksele = 0;
checkshelves()
} else {
details.checkregionselect = '';
}
console.log(res.data, 'configconfigconfigconfigconfig');
}
function initpage(){
// let warehousearr=
@ -281,8 +288,11 @@ const checkcso = () => {
if (details.arrlist[details.checkselect]?.warehouseGoodsAreaVOList.length > 0) {
details.checkregionselect = 0;
details.checksele = 0;
checkshelves()
} else {
details.checkregionselect = '';
details.contenarr=[]
details.contenbxsty['--length'] =0
}
};
const checkregion = () => {
@ -322,9 +332,9 @@ async function checkshelves() {
// console.error(error);
// }
// };
const showupt = () => {
const showupt = (value) => {
console.log('112312');
details.isshowupt = true;
details.isshowupt = value;
};
const addhuoj = scope => {
console.log(scope);

4
src/views/distribution/deliverylist/distributionDeliveryList.vue

@ -594,9 +594,9 @@ export default {
const { row } = scope;
console.log("row>>>>>>xxxx",row);
this.$router.push({
path: '/distribution/reservation/atlas',
path: '/distribution/reservation/atlas1',
query: {
id: row.reservationId,
item: JSON.stringify(row),
type:'2'
}
});

4
src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@ -570,9 +570,9 @@ export default {
const { row } = scope;
console.log("row>>>>>>xxxx",row);
this.$router.push({
path: '/distribution/reservation/atlas',
path: '/distribution/reservation/atlas1',
query: {
id: row.reservationId,
item: JSON.stringify(row),
type:'2'
}
});

4
src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@ -593,9 +593,9 @@ export default {
const { row } = scope;
console.log("row>>>>>>xxxx",row);
this.$router.push({
path: '/distribution/reservation/atlas',
path: '/distribution/reservation/atlas1',
query: {
id: row.reservationId,
item: JSON.stringify(row),
type:'2'
}
});

109
src/views/distribution/reservation/atlas1.vue

@ -0,0 +1,109 @@
<template>
<div class="bmap" id="container" style="float: left"></div>
<div
style="
border: 1px solid pink;
margin-left: 5px;
height: 600px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
"
>
<!-- @change="handleCheckedCitiesChange"-->
<el-checkbox-group v-model="reservationIds">
<el-col v-for="(item, index) in reservationData">
<el-checkbox :label="item.id" :key="item.id"
>{{ item.consignee }}&emsp;{{ item.deliveryAddress }}&emsp;{{
item.deliveryPhone
}}</el-checkbox
>
</el-col>
</el-checkbox-group>
</div>
<div style="margin-left: 40%; margin-top: 5%; float: bottom">
<el-button icon="el-icon-circle-close" @click="back"> </el-button>
</div>
</template>
<script setup>
import { useStore } from 'vuex';
import { getReservationAddr } from '@/api/distribution/distributionReservation';
import { getDictionaryBiz } from '@/api/system/dict';
import { onMounted, reactive, toRefs, watchEffect } from 'vue';
import { useRouter } from 'vue-router';
let router = useRouter();
let details = reactive({
name: 'BmapDemo',
item: null,
error: null,
addressList: [],
reservationData: [],
reservationIds: [],
mapLoc: null,
});
onMounted(() => {
details.item = JSON.parse(router.currentRoute.value.query.item);
setTimeout(() => {
init();
}, 1500);
// setTimeout(()=>{
// details.mapLoc.clearOverlays();
// },9500)
});
function init() {
details.mapLoc = new BMapGL.Map('container'); //
let point = new BMapGL.Point(116.404, 39.915); //
details.mapLoc.centerAndZoom(point, 12);
details.mapLoc.enableScrollWheelZoom(true);
// maplabel()
if (details.mapLoc) {
details.mapLoc.clearOverlays(); //label
}
maplabel('四川成都龙泉驿区','展示的内容', 0);
}
function maplabel(address,contents, index) {
let myGeo = new BMapGL.Geocoder();
myGeo.getPoint(address, function (point) {
if (point) {
console.log(point, '---------------');
if (index == 0) {
details.mapLoc.centerAndZoom(point, 12);
}
let content = contents;
let label = new BMapGL.Label(content, {
//
position: point,
offset: new BMapGL.Size(10, 20),
});
details.mapLoc.addOverlay(label); //
label.setStyle({
// label
color: '#000',
fontSize: '10px',
border: '1px solid #1E90FF',
borderRadius: '20px',
padding: '5px 10px',
});
console.log(label, '---------------');
} else {
// alert('');
console.log(point);
console.log('您选择的地址没有解析到结果!');
}
});
}
function back() {
router.back(-1);
}
const { reservationIds }=toRefs(details)
</script>
<style scoped>
.bmap {
width: 800px;
height: 600px;
border: 1px solid pink;
}
</style>

4
vite.config.js

@ -12,8 +12,8 @@ export default ({ mode, command }) => {
port: 2888,
proxy: {
'/api': {
target: 'http://192.168.10.126:8889',
// target: 'http://192.168.10.75:8777',
// target: 'http://192.168.10.126:8889',
target: 'http://192.168.10.75:8777',
//target: 'http://test3.javablade.com',
changeOrigin: true,
rewrite: path => path.replace(/^\/api/, ''),

Loading…
Cancel
Save