Browse Source

Merge remote-tracking branch 'origin/feature/dev_point_manage' into feature/dev_point_manage

# Conflicts:
#	src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
master
wanggongfeng 3 years ago
parent
commit
277b33945e
  1. 36
      src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
  2. 29
      src/views/modules/plugins/point/icpointnucleicmonitoring.vue
  3. 38
      src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
  4. 54
      src/views/modules/plugins/point/icpointvaccinesinoculation.vue

36
src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue

@ -148,8 +148,8 @@ export default {
serveTime: "",
mobile: "",
address: "",
longitude: "120.38945519",
latitude: "36.0722275",
longitude: '',
latitude: '',
},
keyWords: null,
organizationList: [],
@ -247,12 +247,14 @@ export default {
},
// init
initMap() {
let { latitude, longitude } = this.dataForm;
//
let _this = this;
var center = new window.TMap.LatLng(
_this.dataForm.latitude,
_this.dataForm.longitude
);
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
}
console.log(latitude,longitude);
var center = new window.TMap.LatLng(latitude, longitude);
// map TMap.Map()
map = new window.TMap.Map(document.getElementById("map_add"), {
center: center, //
@ -297,7 +299,6 @@ export default {
//
search
.searchRectangle({
// keyword: this.keyWords,
keyword: this.dataForm.address,
bounds: map.getBounds(),
})
@ -307,6 +308,7 @@ export default {
const {
location: { lat, lng },
} = data[0];
map.setCenter(new TMap.LatLng(lat, lng));
this.setMarker(lat, lng);
this.dataForm.latitude = lat;
@ -340,8 +342,14 @@ export default {
geocoder
.getAddress({ location: location }) //
.then((result) => {
this.dataForm.address = result.result.address;
this.dataForm.address =
this.dataForm.address !== "" &&
this.dataForm.address !== null &&
(this.dataForm.longitude === "" || this.dataForm.longitude === null)
? this.dataForm.address
: result.result.address;
//
console.log(this.dataForm.address);
});
},
@ -363,7 +371,7 @@ export default {
this.$http
.post(`/gov/org/agency/communityListByCustomerId`)
.then(({ data: res }) => {
if (res.code !== 0) {
if (tMapres.code !== 0) {
return this.$message.error(res.msg);
}
this.organizationList = res.data;
@ -376,8 +384,7 @@ export default {
if (this.dataForm.id) {
this.getInfo();
} else {
this.dataForm.longitude = "120.38945519";
this.dataForm.latitude = "36.0722275";
this.initMap();
}
});
@ -395,11 +402,6 @@ export default {
...this.dataForm,
...res.data,
};
if (!this.dataForm.longitude && !this.dataForm.latitude) {
this.dataForm.longitude = "120.38945519";
this.dataForm.latitude = "36.0722275";
}
this.initMap();
})
.catch(() => {});

29
src/views/modules/plugins/point/icpointnucleicmonitoring.vue

@ -112,13 +112,12 @@
v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;height:564px;"
>
<el-table-column
type="selection"
style="width: 100%; height: 564px"
><el-table-column
label="序号"
header-align="center"
align="center"
type="index"
width="50"
></el-table-column>
<el-table-column
@ -181,16 +180,14 @@
</template>
</el-table-column>
</el-table>
<el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"
>
</el-pagination>
<el-pagination @size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="limit"
layout="sizes, prev, pager, next, total"
:total="total">
</el-pagination>
</div>
<!-- 弹窗, 新增 / 修改 -->
<el-dialog
@ -509,7 +506,7 @@ export default {
border-radius: 5px;
padding: 10px;
}
.dialog-h >>> .el-dialog__body{
.dialog-h >>> .el-dialog__body {
overflow: scroll;
}
</style>

38
src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue

@ -123,7 +123,7 @@
>查询</el-button
> -->
<div
id="map_app"
id="map_add"
class="div_map"
style="width: 500px; height: 300px; margin-top: 20px"
></div>
@ -188,8 +188,8 @@ export default {
noAvailableVaccines: '1',
mobile: "",
address: "",
longitude: "120.38945519",
latitude: "36.0722275",
longitude: "",
latitude: "",
},
keyWords: null,
// organizationList: [],
@ -333,14 +333,16 @@ export default {
},
// init
initMap() {
let { latitude, longitude } = this.dataForm;
//
let _this = this;
var center = new window.TMap.LatLng(
_this.dataForm.latitude,
_this.dataForm.longitude
);
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
}
console.log(latitude,longitude);
var center = new window.TMap.LatLng(latitude, longitude);
// map TMap.Map()
map = new window.TMap.Map(document.getElementById("map_app"), {
map = new window.TMap.Map(document.getElementById("map_add"), {
center: center, //
zoom: 17.2, //
pitch: 43.5, //
@ -353,12 +355,14 @@ export default {
geometries: [],
});
infoWindowList = Array(10);
geocoder = new TMap.service.Geocoder(); //
//
map.on("panend", () => {
this.handleMoveCenter();
});
this.handleMoveCenter();
// this.handleMoveCenter()
this.convert();
},
handleMoveCenter() {
@ -381,7 +385,6 @@ export default {
//
search
.searchRectangle({
// keyword: this.keyWords,
keyword: this.dataForm.address,
bounds: map.getBounds(),
})
@ -391,6 +394,7 @@ export default {
const {
location: { lat, lng },
} = data[0];
map.setCenter(new TMap.LatLng(lat, lng));
this.setMarker(lat, lng);
this.dataForm.latitude = lat;
@ -424,8 +428,14 @@ export default {
geocoder
.getAddress({ location: location }) //
.then((result) => {
this.dataForm.address = result.result.address;
this.dataForm.address =
this.dataForm.address !== "" &&
this.dataForm.address !== null &&
(this.dataForm.longitude === "" || this.dataForm.longitude === null)
? this.dataForm.address
: result.result.address;
//
console.log(this.dataForm.address);
});
},
@ -461,8 +471,6 @@ export default {
if (this.dataForm.id) {
this.getInfo();
} else {
this.dataForm.longitude = "120.38945519";
this.dataForm.latitude = "36.0722275";
this.initMap();
}
});
@ -479,6 +487,8 @@ export default {
...this.dataForm,
...res.data,
};
this.morningTime = [res.data.moStartTime,res.data.moEndTime]
this.afterTime = [res.data.afStartTime,res.data.afEndTime]
if(res.data.moStartTime !== ''){
this.morningTime = [res.data.moStartTime,res.data.moEndTime]
this.afterTime = [res.data.afStartTime,res.data.afEndTime]

54
src/views/modules/plugins/point/icpointvaccinesinoculation.vue

@ -102,13 +102,13 @@
v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;height:564px;"
style="width: 100%; height: 564px"
>
<el-table-column
type="selection"
label="序号"
header-align="center"
align="center"
type="index"
width="50"
></el-table-column>
<!--<el-table-column-->
@ -130,29 +130,23 @@
align="center"
></el-table-column>
<el-table-column
prop="moStartTime"
label="接种上午开始时间"
label="接种上午时间"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="moEndTime"
label="接种上午结束时间"
header-align="center"
align="center"
></el-table-column>
>
<template slot-scope="scope">
<div>{{ scope.row.moStartTime }} - {{ scope.row.moEndTime }}</div>
</template>
</el-table-column>
<el-table-column
prop="afStartTime"
label="接种下午开始时间"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="afEndTime"
label="接种下午结束时间"
header-align="center"
align="center"
></el-table-column>
>
<template slot-scope="scope">
<div>{{ scope.row.afStartTime }} - {{ scope.row.afEndTime }}</div>
</template>
</el-table-column>
<el-table-column
prop="noAvailableVaccines"
label="暂无疫苗"
@ -201,16 +195,14 @@
</template>
</el-table-column>
</el-table>
<el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"
>
</el-pagination>
<el-pagination @size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="limit"
layout="sizes, prev, pager, next, total"
:total="total">
</el-pagination>
</div>
<!-- 弹窗, 新增 / 修改 -->
<el-dialog
@ -493,7 +485,7 @@ export default {
border-radius: 5px;
padding: 10px;
}
.dialog-h{
.dialog-h {
overflow: scroll;
}
</style>

Loading…
Cancel
Save