yunxi
/
ningxiaWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yunxi:9de3b259f83987ed9da715ee3f56d8f471e1443d
Branches Tags
yunxi:dev-jingling
yunxi:dev-wenjie
yunxi:master
...
compare: yunxi:d02a0dfcc93c167573358bf0e066df58f714d903
Branches Tags
yunxi:dev-jingling
yunxi:dev-wenjie
yunxi:master

2 Commits
9de3b259f8 ... d02a0dfcc9

Author SHA1 Message Date
jevononlie d02a0dfcc9 Merge branch 'master' of http://222.71.165.188:3000/yunxi/ningxiaWeb
5 months ago
jevononlie f0b5d94cc7 map
5 months ago
5 changed files with 562 additions and 557 deletions
Show Stats

6
jnpf-java-boot/jnpf-web/src/utils/apiUrl.js
Unescape View File

@ -2,13 +2,13 @@
* @Author: 王文杰 * @Author: 王文杰
* @Date: 2024-02-02 14:19:40 * @Date: 2024-02-02 14:19:40
* @LastEditors: jevononlie 728254585@qq.com * @LastEditors: jevononlie 728254585@qq.com
* @LastEditTime: 2024-05-21 09:35:25 * @LastEditTime: 2024-05-21 16:23:01
* @FilePath: /jnpf-web/src/utils/apiUrl.js * @FilePath: /jnpf-web/src/utils/apiUrl.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
module.exports = { module.exports = {
// 开发环境接口配置 // 开发环境接口配置
// APIURl: 'http://127.0.0.1:30000' APIURl: 'http://127.0.0.1:30000'
// 测试环境接口配置 // 测试环境接口配置
APIURl: 'http://192.168.0.23:30000' // APIURl: 'http://192.168.0.23:30000'
} }

8
jnpf-java-boot/jnpf-web/src/views/stationarea/Detail.vue
Unescape View File

@ -31,9 +31,9 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="站点编号" <jnpf-form-tip-item label="绑定商户"
prop="stationCode" tip-label="绑定站点编码" > prop="companyId" tip-label="绑定商户" >
<p>{{dataForm.stationCode}}</p> <p>{{dataForm.companyId}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
@ -87,7 +87,7 @@
areaName : '', areaName : '',
areaType : "", areaType : "",
status : "1", status : "1",
stationCode : "", companyId : [],
areaMapInfo : '', areaMapInfo : '',
areaDesc : '', areaDesc : '',
creatorUserId : "", creatorUserId : "",

19
jnpf-java-boot/jnpf-web/src/views/stationarea/areaDialog.vue
Unescape View File

@ -8,7 +8,7 @@
</div> </div>
<div id="mapFencecontainer" class="mapBox"> <div id="mapFencecontainer" class="mapBox">
<div class="mapBtn"> <div class="mapBtn">
<!-- <el-button size="small" type="danger" @click="delpolygon()">删除多边形</el-button> --> <el-button size="small" type="danger" @click="delpolygon()">删除多边形</el-button>
<el-button size="small" type="danger" @click="clearOverlays()">清除</el-button> <el-button size="small" type="danger" @click="clearOverlays()">清除</el-button>
<el-button size="small" type="primary" @click="sendLngLat">确认</el-button> <el-button size="small" type="primary" @click="sendLngLat">确认</el-button>
<!-- <el-button size="small" type="primary" @click="sendMsg">返回</el-button> --> <!-- <el-button size="small" type="primary" @click="sendMsg">返回</el-button> -->
@ -77,12 +77,15 @@ export default {
}, },
// 地图初始化 // 地图初始化
init() { init() {
const lat = this.position.lat const lat = '34.81098454894641' || this.position.lat
const lng = this.position.lng const lng = '113.64789962768555' || this.position.lng
map = new qq.maps.Map(document.getElementById('mapFencecontainer'), { map = new qq.maps.Map(document.getElementById('mapFencecontainer'), {
center: new qq.maps.LatLng(lat, lng), // 暂时默认郑州 center: new qq.maps.LatLng(lat, lng), // 暂时默认郑州
zoom: 22 zoom: 22
}); });
qq.maps.event.addListener(map, "click", function (event) {
console.log('您点击的位置为: [' + event.latLng.getLat() + ', ' + event.latLng.getLng() + ']');
});
// 多边形绘制及回显 // 多边形绘制及回显
// 设置多边形路径以便回显 // 设置多边形路径以便回显
// path4 = []; // path4 = [];
@ -93,7 +96,7 @@ export default {
console.log(path4); console.log(path4);
this.showpolygon(path4); this.showpolygon(path4);
// 绘制 // 绘制,操作
this.addpolygon(); this.addpolygon();
}, },
/** /**
@ -136,6 +139,7 @@ export default {
drawingManager.setMap(map); drawingManager.setMap(map);
qq.maps.event.addListener(drawingManager, 'overlaycomplete', function (event) { qq.maps.event.addListener(drawingManager, 'overlaycomplete', function (event) {
// clearOverlays(overlaysArray) // clearOverlays(overlaysArray)
console.log('event',event); // 获得相应的经纬度值
lngLat = []; lngLat = [];
overlaysArray.push(event.overlay); overlaysArray.push(event.overlay);
for (const item of event.overlay.getPath().elems) { for (const item of event.overlay.getPath().elems) {
@ -147,9 +151,14 @@ export default {
lng: lng lng: lng
}); });
} }
console.log('overlaycomplete',lngLat, overlaysArray); // 获得相应的经纬度值
});
console.log('overlaycomplete',lngLat); // 获得相应的经纬度值 qq.maps.event.addListener(drawingManager, 'markercomplete', function (event) {
console.log('markercomplete', event); // 获得相应的经纬度值
}); });
}, },
// 初始化回显 // 初始化回显
showpolygon(path3) { showpolygon(path3) {

2
jnpf-java-boot/jnpf-web/src/views/stationarea/columnList.js
View File

File diff suppressed because one or more lines are too long

86
jnpf-java-boot/jnpf-web/src/views/stationarea/form.vue
Unescape View File

@ -1,8 +1,12 @@
<template> <template>
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" /> <el-page-header @back="goBack"
:content="!dataForm.id ? '新建':'编辑'"/>
<div class="options"> <div class="options">
<el-dropdown class="dropdown" placement="bottom"> <el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px"> <el-button style="width:70px">
@ -17,50 +21,49 @@
{{'下一条'}} {{'下一条'}}
</el-dropdown-item> </el-dropdown-item>
</template> </template>
<el-dropdown-item type="primary" @click.native="dataFormSubmit(2)" :loading="continueBtnLoading" <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
:disabled='btnLoading'> :loading="continueBtnLoading" :disabled='btnLoading'>
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item> {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
存</el-button>
<el-button @click="goBack"> 取 消</el-button> <el-button @click="goBack"> 取 消</el-button>
</div> </div>
</div> </div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}"> <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" >
label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<!-- 具体表单 --> <!-- 具体表单 -->
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="区域名称" tipLabel="围栏区域名称" prop="areaName"> <jnpf-form-tip-item
<JnpfInput v-model="dataForm.areaName" @change="changeData('areaName', -1)" placeholder="电子围栏名称" label="区域名称" tipLabel="围栏区域名称" prop="areaName" >
clearable :style='{ "width": "100%" }'> <JnpfInput v-model="dataForm.areaName" @change="changeData('areaName',-1)"
placeholder="电子围栏名称" clearable :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="区域类型" tipLabel="请选择围栏类型" prop="areaType"> <jnpf-form-tip-item
<JnpfSelect v-model="dataForm.areaType" @change="changeData('areaType', -1)" placeholder="请选择围栏类型" label="区域类型" tipLabel="请选择围栏类型" prop="areaType" >
clearable :style='{ "width": "100%" }' :options="areaTypeOptions" :props="areaTypeProps"> <JnpfSelect v-model="dataForm.areaType" @change="changeData('areaType',-1)"
placeholder="请选择围栏类型" clearable :style='{"width":"100%"}' :options="areaTypeOptions" :props="areaTypeProps" >
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="是否启用" prop="status"> <jnpf-form-tip-item
<JnpfRadio v-model="dataForm.status" @change="changeData('status', -1)" optionType="default" label="是否启用" prop="status" >
direction="horizontal" size="small" :options="statusOptions" :props="statusProps"> <JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)"
optionType="default" direction="horizontal" size="small" :options="statusOptions" :props="statusProps" >
</JnpfRadio> </JnpfRadio>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="站点编号" tipLabel="绑定站点编码" prop="stationCode"> <jnpf-form-tip-item
<JnpfPopupSelect v-model="dataForm.stationCode" @change="changeData('stationCode', -1)" :rowIndex="null" label="绑定商户" tipLabel="绑定商户" prop="companyId" >
:formData="dataForm" :templateJson="interfaceRes.stationCode" placeholder="请选择为那个站点绘制区域" hasPage <JnpfOrganizeSelect v-model="dataForm.companyId" @change="changeData('companyId',-1)"
propsValue="station_code" popupWidth="800px" popupTitle="选择数据" popupType="dialog" placeholder="请选择商户" selectType="all" :ableIds="ableAll.companyIdableIds" clearable :style='{"width":"100%"}'>
relationField='station_name' field='stationCode' interfaceId="520259300875047493" :pageSize="20" </JnpfOrganizeSelect>
:columnOptions="stationCodecolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
@ -72,22 +75,24 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="区域描述" tipLabel="请输入区域描述" prop="areaDesc"> <jnpf-form-tip-item
label="区域描述" tipLabel="请输入区域描述" prop="areaDesc" >
<JnpfTextarea v-model="dataForm.areaDesc" @change="changeData('areaDesc',-1)" <JnpfTextarea v-model="dataForm.areaDesc" @change="changeData('areaDesc',-1)"
placeholder="请输入不超过两百字的区域描述" :style='{ "width": "100%" }' true type="textarea" placeholder="请输入不超过两百字的区域描述" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}' >
:autosize='{ "minRows": 4, "maxRows": 4 }'>
</JnpfTextarea> </JnpfTextarea>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="修改用户" prop="lastModifyUserId"> <jnpf-form-tip-item
label="修改用户" prop="lastModifyUserId" >
<JnpfInput v-model="dataForm.lastModifyUserId" @change="changeData('lastModifyUserId',-1)" <JnpfInput v-model="dataForm.lastModifyUserId" @change="changeData('lastModifyUserId',-1)"
placeholder="系统自动生成" readonly :style='{"width":"100%"}'> placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="修改时间" prop="lastModifyTime"> <jnpf-form-tip-item
label="修改时间" prop="lastModifyTime" >
<JnpfInput v-model="dataForm.lastModifyTime" @change="changeData('lastModifyTime',-1)" <JnpfInput v-model="dataForm.lastModifyTime" @change="changeData('lastModifyTime',-1)"
placeholder="系统自动生成" readonly :style='{"width":"100%"}'> placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
@ -96,9 +101,7 @@
<!-- 表单结束 --> <!-- 表单结束 -->
</template> </template>
</el-form> </el-form>
<area-dialog :position="position" :areaMapInfo="dataForm.areaMapInfo" v-if="areaVisible" @areaVisibleChange="handleAreaVisibleChange" <area-dialog :position="position" :areaMapInfo="dataForm.areaMapInfo" v-if="areaVisible" @areaVisibleChange="handleAreaVisibleChange" />
ref="JNPFForm" />
<!-- <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" <!-- <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/> --> ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/> -->
</el-row> </el-row>
@ -118,14 +121,12 @@ import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js' import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { components: { areaDialog },
areaDialog
},
props: [], props: [],
data() { data() {
return { return {
areaVisible: false,
position: {}, position: {},
areaVisible: false,
dataFormSubmitType: 0, dataFormSubmitType: 0,
continueBtnLoading: false, continueBtnLoading: false,
index: 0, index: 0,
@ -155,7 +156,7 @@ export default {
areaName : undefined, areaName : undefined,
areaType : undefined, areaType : undefined,
status : "1", status : "1",
stationCode: undefined, companyId : [],
areaMapInfo : undefined, areaMapInfo : undefined,
areaDesc : undefined, areaDesc : undefined,
creatorUserId : undefined, creatorUserId : undefined,
@ -187,10 +188,10 @@ export default {
trigger: 'change' trigger: 'change'
}, },
], ],
stationCode: [ companyId: [
{ {
required: true, required: true,
message: '请选择为那个站点绘制区域', message: '请至少选择一个',
trigger: 'change' trigger: 'change'
}, },
], ],
@ -206,14 +207,13 @@ export default {
areaTypeProps:{"label":"fullName","value":"enCode" }, areaTypeProps:{"label":"fullName","value":"enCode" },
statusOptions:[], statusOptions:[],
statusProps:{"label":"fullName","value":"enCode" }, statusProps:{"label":"fullName","value":"enCode" },
stationCodecolumnOptions: [{ "label": "站点编码", "value": "station_code" }, { "label": "站点名称", "value": "station_name" },],
childIndex:-1, childIndex:-1,
isEdit:false, isEdit:false,
interfaceRes: { interfaceRes: {
areaName:[] , areaName:[] ,
areaType:[] , areaType:[] ,
status:[] , status:[] ,
stationCode: [], companyId:[] ,
areaMapInfo:[] , areaMapInfo:[] ,
areaDesc:[] , areaDesc:[] ,
creatorUserId:[] , creatorUserId:[] ,
@ -221,7 +221,6 @@ export default {
lastModifyUserId:[] , lastModifyUserId:[] ,
lastModifyTime:[] , lastModifyTime:[] ,
}, },
} }
}, },
computed: { computed: {
@ -256,11 +255,8 @@ export default {
handLeArea() { handLeArea() {
this.getPosition() this.getPosition()
}, },
handleAreaVisibleChange(areaVisible, areaMapInfo) { handleAreaVisibleChange(areaVisible) {
this.areaVisible = areaVisible this.areaVisible = areaVisible
if (areaMapInfo) {
this.dataForm.areaMapInfo = areaMapInfo
}
}, },
prev() { prev() {
this.index-- this.index--

Write Preview
Loading…
Cancel
Save