From 43b0c9ec4a73faafce3b3cbf323fecb7284cd91c Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 03 Jul 2021 09:56:43 +0800
Subject: [PATCH] 警情反馈 警情地图
---
/dev/null | 41 ----------
xcxMapJQLG/js/vueMain.js | 12 ++
pages.json | 3
xcxMapJQLG/css/body.css | 12 ++
pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue | 41 ++++++----
components/seeImges/seeImges.vue | 74 ++++++++----------
xcxMapJQLG/xcxmap.html | 5
xcxMapJQLG/img/手.png | 0
8 files changed, 81 insertions(+), 107 deletions(-)
diff --git a/components/seeImges/seeImges.vue b/components/seeImges/seeImges.vue
index 891a859..e6e3d22 100644
--- a/components/seeImges/seeImges.vue
+++ b/components/seeImges/seeImges.vue
@@ -71,7 +71,7 @@
urls: photoList
});
},
-
+
//视频删除
deleltevideo(index) {
var that = this;
@@ -96,82 +96,72 @@
<style lang="scss" scoped>
.seeImgs {
width: 100%;
- height: 10rem;
+ height: 4.3rem;
// border: 1px solid #0000FF;
white-space: nowrap;
box-sizing: border-box;
overflow: scroll;
+ display: flex;
+ align-items: center;
+ // position: absolute;
+ // right: 0;
+ // z-index: 110;
.imgs {
display: inline-block;
padding-top: 0.5rem;
- width: 9rem;
- height: 9rem;
+ width: 3rem;
+ height: 3rem;
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;
image {
width: 100%;
height: 100%;
}
- .close {
- background-color: #fff;
- width: 1.6rem;
- height: 1.6rem;
- text-align: center;
- line-height: 1.6rem;
- position: absolute;
- top: 0.2rem;
- right: 0.5rem;
- font-size: 1.5rem;
- color: red;
- border-radius: 1.5rem;
- border: 1px solid red;
- &:hover {
- color: red;
- border: 1px solid red;
- }
- }
}
.videos {
display: inline-block;
padding-top: 0.5rem;
- width: 9rem;
- height: 9rem;
+ 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;
video {
width: 100%;
height: 100%;
}
+ }
+ }
- .close {
- background-color: #fff;
- width: 1.6rem;
- height: 1.6rem;
- text-align: center;
- line-height: 1.6rem;
- position: absolute;
- top: 0.2rem;
- right: 0.5rem;
- font-size: 1.5rem;
- color: red;
- border-radius: 1.5rem;
- border: 1px solid red;
+ .close {
+ background-color: #fff;
+ width: 0.9rem;
+ height: 0.9rem;
+ text-align: center;
+ line-height: 0.8rem;
+ position: absolute;
+ top: 0.1rem;
+ right: 0.2rem;
+ font-size: 0.5rem;
+ color: red;
+ border-radius: 1.5rem;
+ border: 1px solid red;
+ z-index: 111;
- &:hover {
- color: red;
- border: 1px solid red;
- }
- }
+ &:hover {
+ color: red;
+ border: 1px solid red;
}
}
</style>
diff --git a/pages.json b/pages.json
index bc30032..891df99 100644
--- a/pages.json
+++ b/pages.json
@@ -282,8 +282,7 @@
"name": "mapJQtijiao",
"style": {
"navigationBarTitleText": "处理结果",
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
+ "navigationBarBackgroundColor": "#0cd7e5"
}
},
{
diff --git a/pages/map/MapJQLG.vue b/pages/map/MapJQLG.vue
deleted file mode 100644
index e129482..0000000
--- a/pages/map/MapJQLG.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
- <view class="content">
- <web-view :src="urls"></web-view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- urls: '',
- // dataList: [],
- }
- },
- methods: {},
- mounted() {},
- onLoad: function(options) {
- var data = [];
- if (options.data == undefined) {
- data = [{
- "id": '100000',
- "place": '无数据',
- "state": '0',
- "dtype": '0',
- "size": '300',
- "jd": "115.822311",
- "wd": "28.646341"
- }]
- data = JSON.stringify(data);
- }else{
- data = options.data;
- }
- this.urls = "http://s16s652780.51mypc.cn/xcxMapJQLG/xcxmap.html?data=" + data;
- // this.dataList = data;
- console.log(this.urls);
- },
- }
-</script>
-
-<style>
-</style>
diff --git a/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue b/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue
index c66b750..2712a4b 100644
--- a/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue
+++ b/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue
@@ -1,13 +1,13 @@
<template>
<view class="mapJQtijiao">
- <view class="head">
+ <!-- <view class="head">
<u-navbar :is-fixed="false" :border-bottom="false" :is-back="false" title=""
:background="{ background: '#0cd7e5' }">
<div>
处理结果
</div>
</u-navbar>
- </view>
+ </view> -->
<view class="mapJQtijiaomain">
<view class="title" style="padding-top: 0.5rem;">请输入处理结果:</view>
<view class="f">
@@ -82,6 +82,7 @@
title: "提交中...",
mask: true
})
+ console.log(dataList);
wx.request({
url: 'http://s16s652780.51mypc.cn/api/feedback/feedback/saves', //仅为示例，并非真实接口地址。
data: dataList,
@@ -95,6 +96,13 @@
title: '提交成功！',
duration: 2000
});
+ var time = setTimeout(()=>{
+ clearTimeout(time);
+ time = null;
+ uni.navigateTo({
+ url: '/pages/alarm_list/alarm_list'
+ });
+ },3000)
}
}
});
@@ -230,20 +238,20 @@
height: 100%;
margin: 0 auto;
- .head {
- position: relative;
- top: 0;
- left: 0;
- z-index: 1;
- font-size: 16px;
- font-weight: 600;
- text-align: center;
+ // .head {
+ // position: relative;
+ // top: 0;
+ // left: 0;
+ // z-index: 1;
+ // font-size: 16px;
+ // font-weight: 600;
+ // text-align: center;
- div {
- width: 100%;
- border: 1px solid rgba($color: #000000, $alpha: 0);
- }
- }
+ // div {
+ // width: 100%;
+ // border: 1px solid rgba($color: #000000, $alpha: 0);
+ // }
+ // }
.mapJQtijiaomain {
width: 100%;
@@ -266,6 +274,7 @@
.main {
margin: 0.5rem;
border: 1px solid rgba($color: #000000, $alpha: 0.5);
+ height: 8rem;
}
}
@@ -289,7 +298,7 @@
.butb {
- margin: 2rem auto;
+ margin: 1rem auto;
width: 6rem;
height: 3rem;
// border: 1px solid rgb(46, 118, 228);
diff --git a/xcxMapJQLG/css/body.css b/xcxMapJQLG/css/body.css
index 6344536..251a528 100644
--- a/xcxMapJQLG/css/body.css
+++ b/xcxMapJQLG/css/body.css
@@ -106,10 +106,20 @@
align-items: center;
padding-left: 1rem;
}
-
+#Umain .Um-m:last-child .um-m-t{
+ /* border: 1px solid #169BD5; */
+ padding: 0 0.5rem 0 0.5rem;
+ border-radius: 0.5rem;
+ box-shadow: 1px 1px 1px 0px #169BD5;
+}
#Umain .Um-m img {
margin-right: 0.5rem;
}
+#heads{
+ position: absolute;
+ top: 76%;
+ left: 0;
+}
#Umain .Um-m .um-m-t {
font-size: 14px;
diff --git "a/xcxMapJQLG/img/\346\211\213.png" "b/xcxMapJQLG/img/\346\211\213.png"
new file mode 100644
index 0000000..d690869
--- /dev/null
+++ "b/xcxMapJQLG/img/\346\211\213.png"
Binary files differ
diff --git a/xcxMapJQLG/js/vueMain.js b/xcxMapJQLG/js/vueMain.js
index 91b99d6..5282b53 100644
--- a/xcxMapJQLG/js/vueMain.js
+++ b/xcxMapJQLG/js/vueMain.js
@@ -198,7 +198,11 @@
},
SubmitDown() {
- $('#SubmitDown').show();
+ // $('#SubmitDown').show();
+ console.log(uni.navigateTo)
+ uni.navigateTo({
+ url: '/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao'
+ });
},
SubmitSD() {
console.log(this.chulijieguo, 'chulijieguo')
@@ -221,8 +225,10 @@
//定位当前位置
locationMap() {
// console.log([this.lat, this.lng])
- // this.map.setView([this.lat, this.lng], 20);
- this.getLocationData();
+ this.map.setView([this.lat, this.lng], 20);
+ },
+ toJQposition(){
+ this.map.setView([this.oldlat, this.oldlng], 20);
},
// 获取实时位置
getLocationData() {
diff --git a/xcxMapJQLG/xcxmap.html b/xcxMapJQLG/xcxmap.html
index b8637a3..cf89456 100644
--- a/xcxMapJQLG/xcxmap.html
+++ b/xcxMapJQLG/xcxmap.html
@@ -32,7 +32,7 @@
<!-- elementui -->
<script src="./lid/elementUi.js"></script>
<!-- <link rel="stylesheet" href="../map/lib/elementUi.css"> -->
- <link rel="stylesheet" href="./lid/elementUi.css">
+ <link rel="stylesheet" href="./css/elementUi.css">
<!-- <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> -->
<!-- jqurey -->
@@ -101,7 +101,8 @@
<img style="width: 1rem" src="./img/文件.png" alt="">
<div class="um-m-t" id="um-m-t-bz">现场引导员与一插队男子发生冲突纠纷</div>
</div>
- <div class="Um-m">
+ <div class="Um-m" @click="toJQposition">
+ <img id="heads" style="width: 1rem" src="./img/手.png" alt="">
<img style="width: 1rem" src="./img/定位.png" alt="">
<div class="um-m-t" id="um-m-t-dz">江西省南昌市第二附属医院住院部</div>
</div>
--
Gitblit v1.9.3