guoyuepeng
/
qa-prevention-gwj-first-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/liujun-2023-12-11-地图插件更新' into zy20231108

zy20231108
zhaoyu 2023-12-11 18:05:32 +08:00
parent a942769ef9 fbcb460ad1
commit c03f657beb
27 changed files with 295 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hybrid/html/js/uni.webview.1.5.4.js Normal file
View File

File diff suppressed because one or more lines are too long

60
hybrid/html/newMap.html Normal file
View File

@ -0,0 +1,60 @@
<!DOCTYPE html>
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
</head>
<script src="http://api.tianditu.gov.cn/api?v=4.0&tk=e8a16137fd226a62a23cc7ba5c9c78ce" type="text/javascript">
</script>
<script src="./js/uni.webview.1.5.4.js"></script>
<body onLoad="onLoad()">
<div id="mapDiv" style="position:absolute;width:100vw; height:100vh"></div>
</body>
<style>
* {
margin: 0;
padding: 0;
}
</style>
<script>
var map;
var zoom = 14;
function getUrlParam(name) {
const reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
const r = window.location.search.substr(1).match(reg);
if (r != null) return decodeURI(r[2]);
return "";
}
function onLoad() {
map = new T.Map('mapDiv');
var imageURL = "http://t0.tianditu.gov.cn/img_w/wmts?" +
"SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles" +
"&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=e8a16137fd226a62a23cc7ba5c9c78ce";
lay = new T.TileLayer(imageURL, {minZoom: 1, maxZoom: 18});
var config = {layers: [lay]};
map = new T.Map("mapDiv", config);
map.centerAndZoom(new T.LngLat(getUrlParam('longitude'), getUrlParam('latitude')), zoom);
map.enableScrollWheelZoom();
addMapClick()
}
function addMapClick() {
map.addEventListener("click", MapClick);
}
function MapClick(event) {
var marker = new T.Marker(new T.LngLat(event.lnglat.getLng(), event.lnglat.getLat()));
map.clearOverLays();
map.addOverLay(marker);
console.log(event.lnglat.getLng(), event.lnglat.getLat());
uni.postMessage({
data: {
"longitue": event.lnglat.getLng(),
"latitude": event.lnglat.getLat(),
}
})
}
</script>
</html>

4
pages.json
View File

@ -331,6 +331,10 @@
"path" : "pages/map/map", "path" : "pages/map/map",
"style" : {} "style" : {}
}, },
{
"path" : "pages/map/mapPro",
"style" : {}
},
{ {
"path": "pages/application/high-risk-work/home", "path": "pages/application/high-risk-work/home",
"style": {} "style": {}

2
pages/application/accesscontrol/carmanage/deptapproval/detail.vue
View File

@ -312,7 +312,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/accesscontrol/carmanage/depttoexamine/detail.vue
View File

@ -315,7 +315,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/accesscontrol/carmanage/sceneconfirm/detail.vue
View File

@ -315,7 +315,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/accesscontrol/outsidersmanage/deptapproval/detail.vue
View File

@ -263,7 +263,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/accesscontrol/outsidersmanage/depttoexamine/detail.vue
View File

@ -265,7 +265,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/accesscontrol/outsidersmanage/sceneconfirm/detail.vue
View File

@ -290,7 +290,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/eight-assignments/hotwork/apply/detail.vue
View File

@ -1605,7 +1605,7 @@
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/eight-assignments/super-hotwork/detail.vue
View File

@ -1161,7 +1161,7 @@
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/fire-management/hidden-trouble-app/exclude-form.vue
View File

@ -1426,7 +1426,7 @@ export default {
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function(e) { acceptDataFromOpenedPage: function(e) {

2
pages/application/fire-management/hidden-trouble-app/other-hidden-add.vue
View File

@ -1286,7 +1286,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue
View File

@ -1220,7 +1220,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-edit.vue
View File

@ -1212,7 +1212,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
View File

@ -1305,7 +1305,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
View File

@ -1190,7 +1190,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/high-risk-work/blind-work/apply/detail.vue
View File

@ -530,7 +530,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

7
pages/application/high-risk-work/electricity/apply/detail.vue
View File

@ -897,17 +897,12 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {
// console.log(e.data)
// console.info(e.data.longitue)
_this.$set( _this.pd, 'WORK_LONGITUDE', e.data.longitue ) _this.$set( _this.pd, 'WORK_LONGITUDE', e.data.longitue )
_this.$set( _this.pd, 'WORK_LATITUDE', e.data.latitude ) _this.$set( _this.pd, 'WORK_LATITUDE', e.data.latitude )
// _this.pd.WORK_LONGITUDE = e.data.longitue;
// _this.pd.WORK_LATITUDE = e.data.latitude;
// console.info(_this.pd)
} }
}, },
}) })

5
pages/application/high-risk-work/high-work/high-work-apply/high-work-apply-detail.vue
View File

@ -994,15 +994,12 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {
// console.log(e.data)
// console.info(e.data.longitue)
_this.pd.WORK_LONGITUDE = e.data.longitue; _this.pd.WORK_LONGITUDE = e.data.longitue;
_this.pd.WORK_LATITUDE = e.data.latitude; _this.pd.WORK_LATITUDE = e.data.latitude;
// console.info(_this.pd)
} }
}, },
}) })

2
pages/application/high-risk-work/lifting-safety-work/apply/detail.vue
View File

@ -716,7 +716,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/high-risk-work/limited-space/apply/detail.vue
View File

@ -742,7 +742,7 @@ export default {
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/key-project-management/AI-warning/detail.vue
View File

@ -1158,7 +1158,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function(e) { acceptDataFromOpenedPage: function(e) {

9
pages/application/key-project-management/hidden-management/detail.vue
View File

@ -159,7 +159,7 @@
</view> </view>
<view class="cu-form-group" v-if="punishForm.HANDLE_IMG"> <view class="cu-form-group" v-if="punishForm.HANDLE_IMG">
<view class="grid col-4 grid-square flex-sub"> <view class="grid col-4 grid-square flex-sub">
<view class="bg-img"> <view class="bg-img" @tap="viewImagePunish">
<image :src="baseImgPath + punishForm.HANDLE_IMG" mode="aspectFill"></image> <image :src="baseImgPath + punishForm.HANDLE_IMG" mode="aspectFill"></image>
</view> </view>
</view> </view>
@ -265,6 +265,13 @@ export default {
} }
}) })
}, },
viewImagePunish(e) {
let files = [];
files.push(this.baseImgPath + this.punishForm.HANDLE_IMG)
uni.previewImage({
urls: files
});
},
ViewImage(e) { ViewImage(e) {
let files = []; let files = [];
for (var i = 0; i < this.hiddenForm.hiddenImgs.length; i++) { for (var i = 0; i < this.hiddenForm.hiddenImgs.length; i++) {

2
pages/application/key-project-management/safety-environmental-inspection/detail.vue
View File

@ -1409,7 +1409,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function(e) { acceptDataFromOpenedPage: function(e) {

2
pages/application/safety-environmental-inspection/apply/detail.vue
View File

@ -1240,7 +1240,7 @@ export default {
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/basics/risk-distribution/risk-distribution-detail.vue
View File

@ -212,7 +212,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {