From 5c2431e67c44c7f578b3a918b56d4e1d64537dfb Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 03 Jul 2021 10:46:31 +0800
Subject: [PATCH] 警情处理
---
xcxMapJQLG/js/vueMain.js | 68 ++++++++++++++++++++++------------
pages/alarm_list/alarm_list.vue | 2
pages/map/map.vue | 4 +-
pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue | 20 ++++++++-
components/seeImges/seeImges.vue | 12 +++--
5 files changed, 71 insertions(+), 35 deletions(-)
diff --git a/components/seeImges/seeImges.vue b/components/seeImges/seeImges.vue
index e6e3d22..59d2797 100644
--- a/components/seeImges/seeImges.vue
+++ b/components/seeImges/seeImges.vue
@@ -100,9 +100,9 @@
// border: 1px solid #0000FF;
white-space: nowrap;
box-sizing: border-box;
- overflow: scroll;
- display: flex;
- align-items: center;
+ overflow: auto;
+ // display: flex;
+ // align-items: center;
// position: absolute;
// right: 0;
// z-index: 110;
@@ -110,13 +110,14 @@
.imgs {
display: inline-block;
padding-top: 0.5rem;
- width: 3rem;
- height: 3rem;
+ width: 4rem;
+ height: 4rem;
padding: 0 0.2rem 0 0.2rem;
margin: 0 0.2rem 0 0.2rem;
// border-right: 1px solid rgba($color: #000000, $alpha: 0.5);
position: relative;
// border: 1px solid #0000FF;
+ top: 0.22rem;
image {
width: 100%;
@@ -136,6 +137,7 @@
// border-right: 1px solid rgba($color: #000000, $alpha: 0.5);
position: relative;
// border: 1px solid #0000FF;
+ top: 0.22rem;
video {
width: 100%;
diff --git a/pages/alarm_list/alarm_list.vue b/pages/alarm_list/alarm_list.vue
index 6696bcc..42e0c65 100644
--- a/pages/alarm_list/alarm_list.vue
+++ b/pages/alarm_list/alarm_list.vue
@@ -229,7 +229,7 @@
var data = [datas]; //传给地图的参数
- console.log(data)
+ // console.log(data)
uni.navigateTo({
url: '/pages/map/map?data=' + JSON.stringify(data) + '&html=xcxMapJQLG/xcxmap.html'
})
diff --git a/pages/map/map.vue b/pages/map/map.vue
index 448381e..50dfb33 100644
--- a/pages/map/map.vue
+++ b/pages/map/map.vue
@@ -30,9 +30,9 @@
} else {
data = options.data;
}
- console.log(options.html)
+ // console.log(options.html)
var a = options.html != undefined ? options.html : "xcxMapJQ/xcxmap.html";
- console.log(a)
+ // console.log(a)
this.urls = "http://s16s652780.51mypc.cn/" + a + "?data=" + data;
// this.dataList = data;
// console.log(this.urls);
diff --git a/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue b/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue
index 2712a4b..e05b7fe 100644
--- a/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue
+++ b/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue
@@ -21,14 +21,14 @@
<image @tap="takePhoto" src="../../../../static/JQimg/相机.png" mode=""></image>
</view>
</view>
- <seeImgs :imgs="imgs" :videos="[]" @del="delImg" :type="'imgs'"></seeImgs>
+ <seeImgs class="seeImgs" :imgs="imgs" :videos="[]" @del="delImg" :type="'imgs'"></seeImgs>
<view class="title">视频上传:</view>
<view class="s">
<view class="main">
<image @tap="takeVideo" src="../../../../static/JQimg/视频.png" mode=""></image>
</view>
</view>
- <seeImgs :imgs="[]" :videos="videos" @del="delVideo" :type="'videos'"></seeImgs>
+ <seeImgs class="seeImgsVideo" :imgs="[]" :videos="videos" @del="delVideo" :type="'videos'"></seeImgs>
<view class="butb" @click="upData">
提交
</view>
@@ -82,7 +82,7 @@
title: "提交中...",
mask: true
})
- console.log(dataList);
+ // console.log(dataList);
wx.request({
url: 'http://s16s652780.51mypc.cn/api/feedback/feedback/saves', //仅为示例，并非真实接口地址。
data: dataList,
@@ -203,6 +203,7 @@
// console.log(JSON.parse(data.data).data)
}
});
+
// } catch (e) {
// console.log(e);
// wx.showToast({
@@ -311,4 +312,17 @@
background-image: linear-gradient(to right, #4adeff, #55ffff);
}
}
+
+.seeImgs{
+ width: 80%;
+ position:absolute ;
+ top: 13.3rem;
+ right: 0;
+}
+.seeImgsVideo{
+ width: 80%;
+ position:absolute ;
+ top: 19.8rem;
+ right: 0;
+}
</style>
diff --git a/xcxMapJQLG/js/vueMain.js b/xcxMapJQLG/js/vueMain.js
index 5282b53..359a6dc 100644
--- a/xcxMapJQLG/js/vueMain.js
+++ b/xcxMapJQLG/js/vueMain.js
@@ -62,7 +62,7 @@
this.oldlng = data[0].jd;
},
changeDom(data) {
- console.log(data, 'changeDom');
+ // console.log(data, 'changeDom');
function changeDoms(dom, item) {
$(dom).empty();
@@ -83,9 +83,6 @@
$('#jieshou').show();
$('#wanchen').hide();
}
- // if (this.isFromJQ == false) {
- // $('#wanchen').show();
- // }
},
//url解码
@@ -191,17 +188,44 @@
return map; //抛出map
},
Submit() {
- $('#loding').show();
- var time = setTimeout(() => {
- $('#loding').hide();
- }, 2000)
+ var data = this.getdata[0];
+ console.log(data)
+ // receives() {// 接受任务
+ var url = data.url,
+ Pid = data.id,
+ id = data.userid, //警察id
+ name = data.username, //警察id
+ data = {
+ id: Pid,
+ securityId: id,
+ alarmPeople: name
+ };
+ // console.log(data);
+ axios({
+ url: url,
+ data: data,
+ header: {
+ "content-type": "application/x-www-form-urlencoded"
+ },
+ method: 'POST',
+ success(res) {
+ console.log(res);
+
+ $('#loding').show();
+ var time = setTimeout(() => {
+ $('#loding').hide();
+ }, 1000)
+ $('#jieshou').show();
+ $('#wanchen').hide();
+ }
+ })
},
SubmitDown() {
// $('#SubmitDown').show();
console.log(uni.navigateTo)
uni.navigateTo({
- url: '/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao'
+ url: '/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao?id=' + this.getdata[0].id
});
},
SubmitSD() {
@@ -227,7 +251,7 @@
// console.log([this.lat, this.lng])
this.map.setView([this.lat, this.lng], 20);
},
- toJQposition(){
+ toJQposition() {
this.map.setView([this.oldlat, this.oldlng], 20);
},
// 获取实时位置
@@ -248,7 +272,7 @@
that.lat = position.lat; //
that.lng = position.lng; //火星坐标 //TODO 实现业务代码逻辑
that.haveShishiweizhi++; //控制只执行一次
- console.log(that.haveShishiweizhi)
+ // console.log(that.haveShishiweizhi)
if (that.haveShishiweizhi == 2) {
// console.log(position)
if (that.LXdhStart == null) {
@@ -320,7 +344,7 @@
} else {
var resdata = res.data.result.coords;
- console.log(resdata)
+ // console.log(res)
var data = [];
for (var i = 0; i < resdata.length; i++) {
var xy = [];
@@ -328,15 +352,15 @@
xy.push(resdata[i][0]);
data.push(xy);
}
- var w = resdata[0][0] - resdata[resdata.length - 1][0];
- w = Math.abs(w);
- w = w / 0.00000899;
- w = w.toFixed(2);
- console.log(w);
+ // var w = resdata[0][0] - resdata[resdata.length - 1][0];
+ // w = Math.abs(w);
+ // w = w / 0.00000899;
+ // w = w.toFixed(2);
+ // console.log(w);
$('#t-mi').empty();
- $('#t-mi').append(w + '米');
+ $('#t-mi').append(res.data.result.dist + '米');
$('#t-fz').empty();
- $('#t-fz').append(w / 30 + '分钟');
+ $('#t-fz').append(res.data.result.flen + '分钟');
if (that.LXdhEnd != null) {
that.map.removeLayer(that.LXdhEnd);
@@ -390,10 +414,6 @@
console.log('shuaxin')
},
- // resultFeedbackClick() { //结果反馈跳转小程序
- // uni.webView.navigateTo({
- // url: `../poput/workbench/policeDetails/policeDetails?id=${this.seedata.id}`
- // });
},
created() {},
mounted() {
@@ -401,7 +421,7 @@
var time = setInterval(() => {
if (this.haveShishiweizhi == 1) {
this.getLocationData();
- console.log(this.haveShishiweizhi)
+ // console.log(this.haveShishiweizhi)
} else if (this.haveShishiweizhi == 2) {
clearInterval(time);
--
Gitblit v1.9.3