diff --git a/miniprogram/app.js b/miniprogram/app.js
index e0372c0..e46517c 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -37,5 +37,6 @@
     selectProjectId: '', // 选择的项目id
     selectProjectName: '', // 选择的项目名称
     updateSignImageId: '', // 更新签名图片id
+    position: [], // 记录点击标记点的气泡跳转详情页时的设备编号
    }
 })

diff --git a/miniprogram/app.js b/miniprogram/app.js
index e0372c0..e46517c 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -37,5 +37,6 @@
     selectProjectId: '', // 选择的项目id
     selectProjectName: '', // 选择的项目名称
     updateSignImageId: '', // 更新签名图片id
+    position: [], // 记录点击标记点的气泡跳转详情页时的设备编号
    }
 })
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index fe0f76f..0535dd4 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -170,31 +170,31 @@
     })
 
 
-//获取井类型下拉列表
-wx.request({
-  method: "POST",
-  url: app.globalData.httpsUrl + "appDeviceAdd/getWellTypeList",   
-  header: {
+    //获取井类型下拉列表
+    wx.request({
+    method: "POST",
+    url: app.globalData.httpsUrl + "appDeviceAdd/getWellTypeList",   
+    header: {
     'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
-  },
-  success(res){
+    },
+    success(res){
     if (res.data) {
-      var welltype = res.data
-      var welltypeArr = [];
-      for (var i = 0; i < welltype.length; i++) {
+        var welltype = res.data
+        var welltypeArr = [];
+        for (var i = 0; i < welltype.length; i++) {
         var type = {
-          text: welltype[i].text,
-          value: welltype[i].value
+            text: welltype[i].text,
+            value: welltype[i].value
         };
         welltypeArr.push(type);
-      }
-      console.log('------', welltypeArr)
-      that.setData({
+        }
+        console.log('------', welltypeArr)
+        that.setData({
         option1: welltypeArr
-      })
+        })
     }
-  }
-})
+    }
+    })
 
     //获取人员下拉列表
     wx.request({
@@ -288,6 +288,9 @@
         }
       }
     })
+
+    // 粘贴经纬度
+    this.paste()
   },
 
 

diff --git a/miniprogram/app.js b/miniprogram/app.js
index e0372c0..e46517c 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -37,5 +37,6 @@
     selectProjectId: '', // 选择的项目id
     selectProjectName: '', // 选择的项目名称
     updateSignImageId: '', // 更新签名图片id
+    position: [], // 记录点击标记点的气泡跳转详情页时的设备编号
    }
 })
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index fe0f76f..0535dd4 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -170,31 +170,31 @@
     })
 
 
-//获取井类型下拉列表
-wx.request({
-  method: "POST",
-  url: app.globalData.httpsUrl + "appDeviceAdd/getWellTypeList",   
-  header: {
+    //获取井类型下拉列表
+    wx.request({
+    method: "POST",
+    url: app.globalData.httpsUrl + "appDeviceAdd/getWellTypeList",   
+    header: {
     'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
-  },
-  success(res){
+    },
+    success(res){
     if (res.data) {
-      var welltype = res.data
-      var welltypeArr = [];
-      for (var i = 0; i < welltype.length; i++) {
+        var welltype = res.data
+        var welltypeArr = [];
+        for (var i = 0; i < welltype.length; i++) {
         var type = {
-          text: welltype[i].text,
-          value: welltype[i].value
+            text: welltype[i].text,
+            value: welltype[i].value
         };
         welltypeArr.push(type);
-      }
-      console.log('------', welltypeArr)
-      that.setData({
+        }
+        console.log('------', welltypeArr)
+        that.setData({
         option1: welltypeArr
-      })
+        })
     }
-  }
-})
+    }
+    })
 
     //获取人员下拉列表
     wx.request({
@@ -288,6 +288,9 @@
         }
       }
     })
+
+    // 粘贴经纬度
+    this.paste()
   },
 
 
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index cfcd359..03cbe1c 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -22,9 +22,9 @@
 </van-cell-group>
 <van-cell-group>
 	<van-field data-id="longitude" value="{{longitude}}" label="经度" placeholder="116.12345" bind:clear="clearLongitude" bind:blur="confirm" border="{{ true }}"  clearable required />
-		<van-field data-id="latitude" value="{{latitude}}" label="纬度" placeholder="39.1237" bind:clear="clearLatitude" use-icon-slot bind:click-icon="paste" bind:blur="confirm" clearable required>
-				<van-icon name="edit" size="50rpx" slot="right-icon" />
-			</van-field>
+    <van-field data-id="latitude" value="{{latitude}}" label="纬度" placeholder="39.1237" bind:clear="clearLatitude" use-icon-slot bind:click-icon="paste" bind:blur="confirm" clearable required>
+        <!-- <van-icon name="edit" size="50rpx" slot="right-icon" /> -->
+    </van-field>
 	
 <van-field data-id="area" value="{{form.area}}" label="区" placeholder="" bind:blur="confirm" clearable  />
 <van-field data-id="street" value="{{form.street}}" label="街道" placeholder="" bind:blur="confirm" clearable  />
@@ -86,7 +86,7 @@
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />
-	<van-uploader upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
+	<van-uploader  upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
 
 <!-- <view class="container">
  <view>

diff --git a/miniprogram/app.js b/miniprogram/app.js
index e0372c0..e46517c 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -37,5 +37,6 @@
     selectProjectId: '', // 选择的项目id
     selectProjectName: '', // 选择的项目名称
     updateSignImageId: '', // 更新签名图片id
+    position: [], // 记录点击标记点的气泡跳转详情页时的设备编号
    }
 })
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index fe0f76f..0535dd4 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -170,31 +170,31 @@
     })
 
 
-//获取井类型下拉列表
-wx.request({
-  method: "POST",
-  url: app.globalData.httpsUrl + "appDeviceAdd/getWellTypeList",   
-  header: {
+    //获取井类型下拉列表
+    wx.request({
+    method: "POST",
+    url: app.globalData.httpsUrl + "appDeviceAdd/getWellTypeList",   
+    header: {
     'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
-  },
-  success(res){
+    },
+    success(res){
     if (res.data) {
-      var welltype = res.data
-      var welltypeArr = [];
-      for (var i = 0; i < welltype.length; i++) {
+        var welltype = res.data
+        var welltypeArr = [];
+        for (var i = 0; i < welltype.length; i++) {
         var type = {
-          text: welltype[i].text,
-          value: welltype[i].value
+            text: welltype[i].text,
+            value: welltype[i].value
         };
         welltypeArr.push(type);
-      }
-      console.log('------', welltypeArr)
-      that.setData({
+        }
+        console.log('------', welltypeArr)
+        that.setData({
         option1: welltypeArr
-      })
+        })
     }
-  }
-})
+    }
+    })
 
     //获取人员下拉列表
     wx.request({
@@ -288,6 +288,9 @@
         }
       }
     })
+
+    // 粘贴经纬度
+    this.paste()
   },
 
 
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index cfcd359..03cbe1c 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -22,9 +22,9 @@
 </van-cell-group>
 <van-cell-group>
 	<van-field data-id="longitude" value="{{longitude}}" label="经度" placeholder="116.12345" bind:clear="clearLongitude" bind:blur="confirm" border="{{ true }}"  clearable required />
-		<van-field data-id="latitude" value="{{latitude}}" label="纬度" placeholder="39.1237" bind:clear="clearLatitude" use-icon-slot bind:click-icon="paste" bind:blur="confirm" clearable required>
-				<van-icon name="edit" size="50rpx" slot="right-icon" />
-			</van-field>
+    <van-field data-id="latitude" value="{{latitude}}" label="纬度" placeholder="39.1237" bind:clear="clearLatitude" use-icon-slot bind:click-icon="paste" bind:blur="confirm" clearable required>
+        <!-- <van-icon name="edit" size="50rpx" slot="right-icon" /> -->
+    </van-field>
 	
 <van-field data-id="area" value="{{form.area}}" label="区" placeholder="" bind:blur="confirm" clearable  />
 <van-field data-id="street" value="{{form.street}}" label="街道" placeholder="" bind:blur="confirm" clearable  />
@@ -86,7 +86,7 @@
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />
-	<van-uploader upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
+	<van-uploader  upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
 
 <!-- <view class="container">
  <view>
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index f83d272..65a940f 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -245,6 +245,24 @@
         }
         fileList.push(file3)
       }
+      if (formObject.photopath4 != "") {
+        var file4 = {
+          url: app.globalData.httpsUrl + "static/" + formObject.photopath4
+        }
+        fileList.push(file4)
+      }
+      if (formObject.photopath5 != "") {
+        var file5 = {
+          url: app.globalData.httpsUrl + "static/" + formObject.photopath5
+        }
+        fileList.push(file5)
+      }
+      if (formObject.photopath6 != "") {
+        var file6 = {
+          url: app.globalData.httpsUrl + "static/" + formObject.photopath6
+        }
+        fileList.push(file6)
+      }
       _this.setData({
         fileList
       });
@@ -511,6 +529,15 @@
     // }
     var that = this;
     var fileList = that.data.fileList;
+    console.log('要保存的图片列表', fileList);
+    that.setData({
+        'form.photopath1' : '',
+        'form.photopath2' : '',
+        'form.photopath3' : '',
+        'form.photopath4' : '',
+        'form.photopath5' : '',
+        'form.photopath6' : '',
+    })
     for (var i = 0; i < fileList.length; i++) {
       var photopath = 'form.photopath' + [Number(i) + 1]
       this.setData({
@@ -707,9 +734,12 @@
       success: function (res) {
         if (res.confirm) {
           fileList_new.splice(image_index, 1);
+          console.log('新的照片列表', fileList_new);
           that.setData({
             fileList: fileList_new
           })
+          console.log('新的照片列表111', that.data.fileList);
+
           wx.request({
             method: "POST",
             url: app.globalData.httpsUrl + "appDeviceLog/deletePhoto",

diff --git a/miniprogram/app.js b/miniprogram/app.js
index e0372c0..e46517c 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -37,5 +37,6 @@
     selectProjectId: '', // 选择的项目id
     selectProjectName: '', // 选择的项目名称
     updateSignImageId: '', // 更新签名图片id
+    position: [], // 记录点击标记点的气泡跳转详情页时的设备编号
    }
 })
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index fe0f76f..0535dd4 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -170,31 +170,31 @@
     })
 
 
-//获取井类型下拉列表
-wx.request({
-  method: "POST",
-  url: app.globalData.httpsUrl + "appDeviceAdd/getWellTypeList",   
-  header: {
+    //获取井类型下拉列表
+    wx.request({
+    method: "POST",
+    url: app.globalData.httpsUrl + "appDeviceAdd/getWellTypeList",   
+    header: {
     'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
-  },
-  success(res){
+    },
+    success(res){
     if (res.data) {
-      var welltype = res.data
-      var welltypeArr = [];
-      for (var i = 0; i < welltype.length; i++) {
+        var welltype = res.data
+        var welltypeArr = [];
+        for (var i = 0; i < welltype.length; i++) {
         var type = {
-          text: welltype[i].text,
-          value: welltype[i].value
+            text: welltype[i].text,
+            value: welltype[i].value
         };
         welltypeArr.push(type);
-      }
-      console.log('------', welltypeArr)
-      that.setData({
+        }
+        console.log('------', welltypeArr)
+        that.setData({
         option1: welltypeArr
-      })
+        })
     }
-  }
-})
+    }
+    })
 
     //获取人员下拉列表
     wx.request({
@@ -288,6 +288,9 @@
         }
       }
     })
+
+    // 粘贴经纬度
+    this.paste()
   },
 
 
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index cfcd359..03cbe1c 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -22,9 +22,9 @@
 </van-cell-group>
 <van-cell-group>
 	<van-field data-id="longitude" value="{{longitude}}" label="经度" placeholder="116.12345" bind:clear="clearLongitude" bind:blur="confirm" border="{{ true }}"  clearable required />
-		<van-field data-id="latitude" value="{{latitude}}" label="纬度" placeholder="39.1237" bind:clear="clearLatitude" use-icon-slot bind:click-icon="paste" bind:blur="confirm" clearable required>
-				<van-icon name="edit" size="50rpx" slot="right-icon" />
-			</van-field>
+    <van-field data-id="latitude" value="{{latitude}}" label="纬度" placeholder="39.1237" bind:clear="clearLatitude" use-icon-slot bind:click-icon="paste" bind:blur="confirm" clearable required>
+        <!-- <van-icon name="edit" size="50rpx" slot="right-icon" /> -->
+    </van-field>
 	
 <van-field data-id="area" value="{{form.area}}" label="区" placeholder="" bind:blur="confirm" clearable  />
 <van-field data-id="street" value="{{form.street}}" label="街道" placeholder="" bind:blur="confirm" clearable  />
@@ -86,7 +86,7 @@
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />
-	<van-uploader upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
+	<van-uploader  upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
 
 <!-- <view class="container">
  <view>
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index f83d272..65a940f 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -245,6 +245,24 @@
         }
         fileList.push(file3)
       }
+      if (formObject.photopath4 != "") {
+        var file4 = {
+          url: app.globalData.httpsUrl + "static/" + formObject.photopath4
+        }
+        fileList.push(file4)
+      }
+      if (formObject.photopath5 != "") {
+        var file5 = {
+          url: app.globalData.httpsUrl + "static/" + formObject.photopath5
+        }
+        fileList.push(file5)
+      }
+      if (formObject.photopath6 != "") {
+        var file6 = {
+          url: app.globalData.httpsUrl + "static/" + formObject.photopath6
+        }
+        fileList.push(file6)
+      }
       _this.setData({
         fileList
       });
@@ -511,6 +529,15 @@
     // }
     var that = this;
     var fileList = that.data.fileList;
+    console.log('要保存的图片列表', fileList);
+    that.setData({
+        'form.photopath1' : '',
+        'form.photopath2' : '',
+        'form.photopath3' : '',
+        'form.photopath4' : '',
+        'form.photopath5' : '',
+        'form.photopath6' : '',
+    })
     for (var i = 0; i < fileList.length; i++) {
       var photopath = 'form.photopath' + [Number(i) + 1]
       this.setData({
@@ -707,9 +734,12 @@
       success: function (res) {
         if (res.confirm) {
           fileList_new.splice(image_index, 1);
+          console.log('新的照片列表', fileList_new);
           that.setData({
             fileList: fileList_new
           })
+          console.log('新的照片列表111', that.data.fileList);
+
           wx.request({
             method: "POST",
             url: app.globalData.httpsUrl + "appDeviceLog/deletePhoto",
diff --git a/miniprogram/pages/earth/earth.js b/miniprogram/pages/earth/earth.js
index ab1a56e..4099ea4 100644
--- a/miniprogram/pages/earth/earth.js
+++ b/miniprogram/pages/earth/earth.js
@@ -180,96 +180,110 @@
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
- //输入设备编号获取marker位置信息
- var that = this;
- if ( app.globalData.devcode!="") {
-  var devcode = app.globalData.devcode
-  wx.request({
-    method: "POST",
-    url: app.globalData.httpsUrl + "appDeviceAdd/findListByCodes",
-    data: {
-      devcodes: devcode,
-    },
-    header: {
-      'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
-    },
-    success(res) {
-      app.globalData.devcode="";
-      if (res.data.code == 200) {
-        var listResultData = res.data.data;
-        that.setData({
-          listData: listResultData
-        })
-        var markersArr = that.data.markers;
-        for (var i = 0; i < listResultData.length; i++) {
-          markersArr = markersArr.concat({
-            iconPath: "../../images/locat.png",
-            id: Number(listResultData[i].id),
-            callout: {
-              content: "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
-              fontSize: '14',
-              padding: true,
-              color: '#000000',
-              borderColor: '#F4EA2A',
-              bgColor: '#F4EA2A',
-              borderWidth: 5,
-              display: 'ALWAYS',
-              textAlign: 'left',
-              // borderRadius: 15
-            },
-            latitude: listResultData[i].latitude,
-            longitude: listResultData[i].longitude,
-            width: 40,
-            height: 40
-          });
+onShow: function () {
+    //输入设备编号获取marker位置信息
+    var that = this;
+    if (app.globalData.devcode!="") {
+    var devcode = app.globalData.devcode
+    wx.request({
+        method: "POST",
+        url: app.globalData.httpsUrl + "appDeviceAdd/findListByCodes",
+        data: {
+        devcodes: devcode,
+        },
+        header: {
+        'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
+        },
+        success(res) {
+        app.globalData.devcode="";
+        if (res.data.code == 200) {
+            var listResultData = res.data.data;
+            that.setData({
+            listData: listResultData
+            })
+            var markersArr = that.data.markers;
+            for (var i = 0; i < listResultData.length; i++) {
+            markersArr = markersArr.concat({
+                iconPath: "../../images/locat.png",
+                id: Number(listResultData[i].id),
+                callout: {
+                    content: "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
+                    fontSize: '14',
+                    padding: true,
+                    color: '#000000',
+                    borderColor: '#F4EA2A',
+                    bgColor: '#F4EA2A',
+                    borderWidth: 5,
+                    display: 'ALWAYS',
+                    textAlign: 'left',
+                    devcode: listResultData[i].devcode
+                    // borderRadius: 15
+                },
+                latitude: listResultData[i].latitude,
+                longitude: listResultData[i].longitude,
+                width: 40,
+                height: 40,
+                devcode: listResultData[i].devcode
+            });
+            }
+            that.setData({
+                markers: markersArr,
+                latitude: listResultData[0].latitude,
+                longitude: listResultData[0].longitude,
+                marker_latitude: listResultData[0].latitude,
+                marker_longitude: listResultData[0].longitude,
+                title: listResultData[0].devcode
+            })
+            
         }
-        that.setData({
-          markers: markersArr,
-          latitude: listResultData[0].latitude,
-          longitude: listResultData[0].longitude,
-          marker_latitude: listResultData[0].latitude,
-          marker_longitude: listResultData[0].longitude,
-          title: listResultData[0].devcode
-        })
-      }
-    },
-    fail(err) {
-      app.globalData.devcode="";
-      wx.showToast({
-        title: "无法获取设备地理信息！",
-        icon: 'none',
-        duration: 2000
-      })
-    }
-  })
+        },
+        fail(err) {
+            app.globalData.devcode="";
+            wx.showToast({
+                title: "无法获取设备地理信息！",
+                icon: 'none',
+                duration: 2000
+            })
+        }
+    })
 } else {
-  //获取当前坐标（gcj02）
-  wx.getLocation({
-    type: "gcj02",
-    altitude: true,
-    success: function (res) {
-      that.setData({
-        latitude: parseFloat(res.latitude).toFixed(6),
-        longitude: parseFloat(res.longitude).toFixed(6),
-        // markers: [{
-        //   latitude: res.latitude,
-        //   longitude: res.longitude,
-        // }]
-      })
-      //获取当前坐标（wgs84）,特别注意需要放在加载里面，否则获取有误
-      wx.getLocation({
-        type: "wgs84",
-        altitude: true,
-        success: function (res) {
-          that.setData({
-            latitude84: parseFloat(res.latitude).toFixed(6),
-            longitude84: parseFloat(res.longitude).toFixed(6)
-          })
-        }
-      })
+    
+    if(app.globalData.position && app.globalData.position.length) {
+        console.log('-0-0-0-0',app.globalData.position );
+        that.setData({
+            latitude: app.globalData.position[0].latitude,
+            longitude: app.globalData.position[0].longitude,
+        })
+    } else {
+
+        //获取当前坐标（gcj02）
+        wx.getLocation({
+            type: "gcj02",
+            altitude: true,
+            success: function (res) {
+                that.setData({
+                    latitude: parseFloat(res.latitude).toFixed(6),
+                    longitude: parseFloat(res.longitude).toFixed(6),
+                    // markers: [{
+                    //   latitude: res.latitude,
+                    //   longitude: res.longitude,
+                    // }]
+                })
+                //获取当前坐标（wgs84）,特别注意需要放在加载里面，否则获取有误
+                wx.getLocation({
+                    type: "wgs84",
+                    altitude: true,
+                    success: function (res) {
+                    that.setData({
+                        latitude84: parseFloat(res.latitude).toFixed(6),
+                        longitude84: parseFloat(res.longitude).toFixed(6)
+                    })
+                    }
+                })
+            }
+        })
     }
-  })
+
 }
 
 
@@ -311,7 +325,6 @@
   },
 
   //定位出来
-
   locationPosition: function () {
     var that = this;
     //获取当前坐标（gcj02）
@@ -371,6 +384,7 @@
                 title: '坐标已获取',
                 duration: 1000
               })
+           
         }
       })
       wx.navigateTo({
@@ -419,11 +433,14 @@
 
   //获取设备maker
   leave() {
-
     var that = this;
     if (that.data.devcodes == "") {
-        that.setData({
-            markers:[]
+        // that.setData({
+        //     markers:[]
+        // })
+        wx.showToast({
+            icon: 'none',
+            title: '请先输入定位设备编号',
         })
       return false;
     }
@@ -446,7 +463,7 @@
           for (var i = 0; i < listResultData.length; i++) {
             let arr = {
               iconPath: "../../images/locat.png",
-              id: listResultData[i].id,
+              id: Number(listResultData[i].id),
               callout: {
                 content:  "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
                 fontSize: '14',
@@ -458,11 +475,13 @@
                 display: 'ALWAYS',
                 textAlign: 'left',
                 // borderRadius: 15
+                devcode: listResultData[i].devcode
               },
               latitude: listResultData[i].latitude,
               longitude: listResultData[i].longitude,
               width: 40,
-              height: 40
+              height: 40,
+              devcode: listResultData[i].devcode
             };
             markersArr.push(arr)
           }
@@ -474,6 +493,9 @@
             marker_longitude: listResultData[0].longitude,
             title: listResultData[0].devcode
           })
+          that.setData({
+            show: false
+          });
         }
       },
       fail(err) {
@@ -486,7 +508,36 @@
     })
   },
 
+  showLoading: function (message) {
+    if (wx.showLoading) {
+      // 基础库 1.1.0 微信6.5.6版本开始支持，低版本需做兼容处理
+      wx.showLoading({
+        title: message,
+        mask: true
+      });
+    } else {
+      // 低版本采用Toast兼容处理并将时间设为20秒以免自动消失
+      wx.showToast({
+        title: message,
+        icon: 'loading',
+        mask: true,
+        duration: 20000
+      });
+    }
+  },
+
+  hideLoading: function () {
+    if (wx.hideLoading) {
+      // 基础库 1.1.0 微信6.5.6版本开始支持，低版本需做兼容处理
+      wx.hideLoading();
+    } else {
+      wx.hideToast();
+    }
+  },
+
+  //   点击标记点
   markertap(e) {
+    console.log('点击标记点')
     var that = this;
     for (var i = 0; i < this.data.listData.length; i++) {
       if (e.markerId == this.data.listData[i].id) {
@@ -503,6 +554,57 @@
       //   scale: 35
       // })
     }
+
+    //    点击的标记点可以做气泡的显隐
+    const index = this.data.markers.findIndex(item => item.id === e.markerId)
+    if(index !== -1) {
+        let  tempMarkers = this.data.markers.map((item, i) => {
+            if(index === i) {
+                item.callout.display = item.callout.display === "BYCLICK" ? 'ALWAYS' : "BYCLICK"
+            } 
+            return item
+        })
+        this.setData({
+            markers: tempMarkers
+        })
+    }
+
+  },
+  //   点击气泡
+  bindcallouttap: function (e) {
+    var that = this;
+    const index = this.data.markers.findIndex(item => Number(item.id) === Number(e.markerId))
+    if(index !== -1) {
+        that.showLoading("数据请求中...");
+        wx.request({
+          method: "POST",
+          url: app.globalData.httpsUrl + "appDeviceLog/deviceDetail",
+          data: {
+            devcode: this.data.markers[index].devcode,
+          },
+          header: {
+            'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
+          },
+          success(res) {
+            that.hideLoading();
+            // var resultObject = JSON.parse(res.data);
+            var resultObject = res.data;
+            var pageName = '../applog/applog'
+            if (resultObject.code == 200) {
+                wx.setStorageSync('resultObject', resultObject.data)
+                wx.navigateTo({
+                    url: '../addDevicelog/addDeviceLog?detail=' + "&pageName=" + pageName
+                })
+            //   app.globalData.positionDevcode = this.data.markers[index].devcode
+                app.globalData.position = [that.data.markers[index].marker_latitude, that.data.markers[index].marker_longitude]
+                console.log(app.globalData.position);
+            }
+          },
+          fail(err) {
+            that.hideLoading();
+          }
+        })
+    }
   },
 
 

diff --git a/miniprogram/app.js b/miniprogram/app.js
index e0372c0..e46517c 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -37,5 +37,6 @@
     selectProjectId: '', // 选择的项目id
     selectProjectName: '', // 选择的项目名称
     updateSignImageId: '', // 更新签名图片id
+    position: [], // 记录点击标记点的气泡跳转详情页时的设备编号
    }
 })
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index fe0f76f..0535dd4 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -170,31 +170,31 @@
     })
 
 
-//获取井类型下拉列表
-wx.request({
-  method: "POST",
-  url: app.globalData.httpsUrl + "appDeviceAdd/getWellTypeList",   
-  header: {
+    //获取井类型下拉列表
+    wx.request({
+    method: "POST",
+    url: app.globalData.httpsUrl + "appDeviceAdd/getWellTypeList",   
+    header: {
     'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
-  },
-  success(res){
+    },
+    success(res){
     if (res.data) {
-      var welltype = res.data
-      var welltypeArr = [];
-      for (var i = 0; i < welltype.length; i++) {
+        var welltype = res.data
+        var welltypeArr = [];
+        for (var i = 0; i < welltype.length; i++) {
         var type = {
-          text: welltype[i].text,
-          value: welltype[i].value
+            text: welltype[i].text,
+            value: welltype[i].value
         };
         welltypeArr.push(type);
-      }
-      console.log('------', welltypeArr)
-      that.setData({
+        }
+        console.log('------', welltypeArr)
+        that.setData({
         option1: welltypeArr
-      })
+        })
     }
-  }
-})
+    }
+    })
 
     //获取人员下拉列表
     wx.request({
@@ -288,6 +288,9 @@
         }
       }
     })
+
+    // 粘贴经纬度
+    this.paste()
   },
 
 
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index cfcd359..03cbe1c 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -22,9 +22,9 @@
 </van-cell-group>
 <van-cell-group>
 	<van-field data-id="longitude" value="{{longitude}}" label="经度" placeholder="116.12345" bind:clear="clearLongitude" bind:blur="confirm" border="{{ true }}"  clearable required />
-		<van-field data-id="latitude" value="{{latitude}}" label="纬度" placeholder="39.1237" bind:clear="clearLatitude" use-icon-slot bind:click-icon="paste" bind:blur="confirm" clearable required>
-				<van-icon name="edit" size="50rpx" slot="right-icon" />
-			</van-field>
+    <van-field data-id="latitude" value="{{latitude}}" label="纬度" placeholder="39.1237" bind:clear="clearLatitude" use-icon-slot bind:click-icon="paste" bind:blur="confirm" clearable required>
+        <!-- <van-icon name="edit" size="50rpx" slot="right-icon" /> -->
+    </van-field>
 	
 <van-field data-id="area" value="{{form.area}}" label="区" placeholder="" bind:blur="confirm" clearable  />
 <van-field data-id="street" value="{{form.street}}" label="街道" placeholder="" bind:blur="confirm" clearable  />
@@ -86,7 +86,7 @@
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />
-	<van-uploader upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
+	<van-uploader  upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
 
 <!-- <view class="container">
  <view>
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index f83d272..65a940f 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -245,6 +245,24 @@
         }
         fileList.push(file3)
       }
+      if (formObject.photopath4 != "") {
+        var file4 = {
+          url: app.globalData.httpsUrl + "static/" + formObject.photopath4
+        }
+        fileList.push(file4)
+      }
+      if (formObject.photopath5 != "") {
+        var file5 = {
+          url: app.globalData.httpsUrl + "static/" + formObject.photopath5
+        }
+        fileList.push(file5)
+      }
+      if (formObject.photopath6 != "") {
+        var file6 = {
+          url: app.globalData.httpsUrl + "static/" + formObject.photopath6
+        }
+        fileList.push(file6)
+      }
       _this.setData({
         fileList
       });
@@ -511,6 +529,15 @@
     // }
     var that = this;
     var fileList = that.data.fileList;
+    console.log('要保存的图片列表', fileList);
+    that.setData({
+        'form.photopath1' : '',
+        'form.photopath2' : '',
+        'form.photopath3' : '',
+        'form.photopath4' : '',
+        'form.photopath5' : '',
+        'form.photopath6' : '',
+    })
     for (var i = 0; i < fileList.length; i++) {
       var photopath = 'form.photopath' + [Number(i) + 1]
       this.setData({
@@ -707,9 +734,12 @@
       success: function (res) {
         if (res.confirm) {
           fileList_new.splice(image_index, 1);
+          console.log('新的照片列表', fileList_new);
           that.setData({
             fileList: fileList_new
           })
+          console.log('新的照片列表111', that.data.fileList);
+
           wx.request({
             method: "POST",
             url: app.globalData.httpsUrl + "appDeviceLog/deletePhoto",
diff --git a/miniprogram/pages/earth/earth.js b/miniprogram/pages/earth/earth.js
index ab1a56e..4099ea4 100644
--- a/miniprogram/pages/earth/earth.js
+++ b/miniprogram/pages/earth/earth.js
@@ -180,96 +180,110 @@
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
- //输入设备编号获取marker位置信息
- var that = this;
- if ( app.globalData.devcode!="") {
-  var devcode = app.globalData.devcode
-  wx.request({
-    method: "POST",
-    url: app.globalData.httpsUrl + "appDeviceAdd/findListByCodes",
-    data: {
-      devcodes: devcode,
-    },
-    header: {
-      'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
-    },
-    success(res) {
-      app.globalData.devcode="";
-      if (res.data.code == 200) {
-        var listResultData = res.data.data;
-        that.setData({
-          listData: listResultData
-        })
-        var markersArr = that.data.markers;
-        for (var i = 0; i < listResultData.length; i++) {
-          markersArr = markersArr.concat({
-            iconPath: "../../images/locat.png",
-            id: Number(listResultData[i].id),
-            callout: {
-              content: "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
-              fontSize: '14',
-              padding: true,
-              color: '#000000',
-              borderColor: '#F4EA2A',
-              bgColor: '#F4EA2A',
-              borderWidth: 5,
-              display: 'ALWAYS',
-              textAlign: 'left',
-              // borderRadius: 15
-            },
-            latitude: listResultData[i].latitude,
-            longitude: listResultData[i].longitude,
-            width: 40,
-            height: 40
-          });
+onShow: function () {
+    //输入设备编号获取marker位置信息
+    var that = this;
+    if (app.globalData.devcode!="") {
+    var devcode = app.globalData.devcode
+    wx.request({
+        method: "POST",
+        url: app.globalData.httpsUrl + "appDeviceAdd/findListByCodes",
+        data: {
+        devcodes: devcode,
+        },
+        header: {
+        'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
+        },
+        success(res) {
+        app.globalData.devcode="";
+        if (res.data.code == 200) {
+            var listResultData = res.data.data;
+            that.setData({
+            listData: listResultData
+            })
+            var markersArr = that.data.markers;
+            for (var i = 0; i < listResultData.length; i++) {
+            markersArr = markersArr.concat({
+                iconPath: "../../images/locat.png",
+                id: Number(listResultData[i].id),
+                callout: {
+                    content: "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
+                    fontSize: '14',
+                    padding: true,
+                    color: '#000000',
+                    borderColor: '#F4EA2A',
+                    bgColor: '#F4EA2A',
+                    borderWidth: 5,
+                    display: 'ALWAYS',
+                    textAlign: 'left',
+                    devcode: listResultData[i].devcode
+                    // borderRadius: 15
+                },
+                latitude: listResultData[i].latitude,
+                longitude: listResultData[i].longitude,
+                width: 40,
+                height: 40,
+                devcode: listResultData[i].devcode
+            });
+            }
+            that.setData({
+                markers: markersArr,
+                latitude: listResultData[0].latitude,
+                longitude: listResultData[0].longitude,
+                marker_latitude: listResultData[0].latitude,
+                marker_longitude: listResultData[0].longitude,
+                title: listResultData[0].devcode
+            })
+            
         }
-        that.setData({
-          markers: markersArr,
-          latitude: listResultData[0].latitude,
-          longitude: listResultData[0].longitude,
-          marker_latitude: listResultData[0].latitude,
-          marker_longitude: listResultData[0].longitude,
-          title: listResultData[0].devcode
-        })
-      }
-    },
-    fail(err) {
-      app.globalData.devcode="";
-      wx.showToast({
-        title: "无法获取设备地理信息！",
-        icon: 'none',
-        duration: 2000
-      })
-    }
-  })
+        },
+        fail(err) {
+            app.globalData.devcode="";
+            wx.showToast({
+                title: "无法获取设备地理信息！",
+                icon: 'none',
+                duration: 2000
+            })
+        }
+    })
 } else {
-  //获取当前坐标（gcj02）
-  wx.getLocation({
-    type: "gcj02",
-    altitude: true,
-    success: function (res) {
-      that.setData({
-        latitude: parseFloat(res.latitude).toFixed(6),
-        longitude: parseFloat(res.longitude).toFixed(6),
-        // markers: [{
-        //   latitude: res.latitude,
-        //   longitude: res.longitude,
-        // }]
-      })
-      //获取当前坐标（wgs84）,特别注意需要放在加载里面，否则获取有误
-      wx.getLocation({
-        type: "wgs84",
-        altitude: true,
-        success: function (res) {
-          that.setData({
-            latitude84: parseFloat(res.latitude).toFixed(6),
-            longitude84: parseFloat(res.longitude).toFixed(6)
-          })
-        }
-      })
+    
+    if(app.globalData.position && app.globalData.position.length) {
+        console.log('-0-0-0-0',app.globalData.position );
+        that.setData({
+            latitude: app.globalData.position[0].latitude,
+            longitude: app.globalData.position[0].longitude,
+        })
+    } else {
+
+        //获取当前坐标（gcj02）
+        wx.getLocation({
+            type: "gcj02",
+            altitude: true,
+            success: function (res) {
+                that.setData({
+                    latitude: parseFloat(res.latitude).toFixed(6),
+                    longitude: parseFloat(res.longitude).toFixed(6),
+                    // markers: [{
+                    //   latitude: res.latitude,
+                    //   longitude: res.longitude,
+                    // }]
+                })
+                //获取当前坐标（wgs84）,特别注意需要放在加载里面，否则获取有误
+                wx.getLocation({
+                    type: "wgs84",
+                    altitude: true,
+                    success: function (res) {
+                    that.setData({
+                        latitude84: parseFloat(res.latitude).toFixed(6),
+                        longitude84: parseFloat(res.longitude).toFixed(6)
+                    })
+                    }
+                })
+            }
+        })
     }
-  })
+
 }
 
 
@@ -311,7 +325,6 @@
   },
 
   //定位出来
-
   locationPosition: function () {
     var that = this;
     //获取当前坐标（gcj02）
@@ -371,6 +384,7 @@
                 title: '坐标已获取',
                 duration: 1000
               })
+           
         }
       })
       wx.navigateTo({
@@ -419,11 +433,14 @@
 
   //获取设备maker
   leave() {
-
     var that = this;
     if (that.data.devcodes == "") {
-        that.setData({
-            markers:[]
+        // that.setData({
+        //     markers:[]
+        // })
+        wx.showToast({
+            icon: 'none',
+            title: '请先输入定位设备编号',
         })
       return false;
     }
@@ -446,7 +463,7 @@
           for (var i = 0; i < listResultData.length; i++) {
             let arr = {
               iconPath: "../../images/locat.png",
-              id: listResultData[i].id,
+              id: Number(listResultData[i].id),
               callout: {
                 content:  "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
                 fontSize: '14',
@@ -458,11 +475,13 @@
                 display: 'ALWAYS',
                 textAlign: 'left',
                 // borderRadius: 15
+                devcode: listResultData[i].devcode
               },
               latitude: listResultData[i].latitude,
               longitude: listResultData[i].longitude,
               width: 40,
-              height: 40
+              height: 40,
+              devcode: listResultData[i].devcode
             };
             markersArr.push(arr)
           }
@@ -474,6 +493,9 @@
             marker_longitude: listResultData[0].longitude,
             title: listResultData[0].devcode
           })
+          that.setData({
+            show: false
+          });
         }
       },
       fail(err) {
@@ -486,7 +508,36 @@
     })
   },
 
+  showLoading: function (message) {
+    if (wx.showLoading) {
+      // 基础库 1.1.0 微信6.5.6版本开始支持，低版本需做兼容处理
+      wx.showLoading({
+        title: message,
+        mask: true
+      });
+    } else {
+      // 低版本采用Toast兼容处理并将时间设为20秒以免自动消失
+      wx.showToast({
+        title: message,
+        icon: 'loading',
+        mask: true,
+        duration: 20000
+      });
+    }
+  },
+
+  hideLoading: function () {
+    if (wx.hideLoading) {
+      // 基础库 1.1.0 微信6.5.6版本开始支持，低版本需做兼容处理
+      wx.hideLoading();
+    } else {
+      wx.hideToast();
+    }
+  },
+
+  //   点击标记点
   markertap(e) {
+    console.log('点击标记点')
     var that = this;
     for (var i = 0; i < this.data.listData.length; i++) {
       if (e.markerId == this.data.listData[i].id) {
@@ -503,6 +554,57 @@
       //   scale: 35
       // })
     }
+
+    //    点击的标记点可以做气泡的显隐
+    const index = this.data.markers.findIndex(item => item.id === e.markerId)
+    if(index !== -1) {
+        let  tempMarkers = this.data.markers.map((item, i) => {
+            if(index === i) {
+                item.callout.display = item.callout.display === "BYCLICK" ? 'ALWAYS' : "BYCLICK"
+            } 
+            return item
+        })
+        this.setData({
+            markers: tempMarkers
+        })
+    }
+
+  },
+  //   点击气泡
+  bindcallouttap: function (e) {
+    var that = this;
+    const index = this.data.markers.findIndex(item => Number(item.id) === Number(e.markerId))
+    if(index !== -1) {
+        that.showLoading("数据请求中...");
+        wx.request({
+          method: "POST",
+          url: app.globalData.httpsUrl + "appDeviceLog/deviceDetail",
+          data: {
+            devcode: this.data.markers[index].devcode,
+          },
+          header: {
+            'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
+          },
+          success(res) {
+            that.hideLoading();
+            // var resultObject = JSON.parse(res.data);
+            var resultObject = res.data;
+            var pageName = '../applog/applog'
+            if (resultObject.code == 200) {
+                wx.setStorageSync('resultObject', resultObject.data)
+                wx.navigateTo({
+                    url: '../addDevicelog/addDeviceLog?detail=' + "&pageName=" + pageName
+                })
+            //   app.globalData.positionDevcode = this.data.markers[index].devcode
+                app.globalData.position = [that.data.markers[index].marker_latitude, that.data.markers[index].marker_longitude]
+                console.log(app.globalData.position);
+            }
+          },
+          fail(err) {
+            that.hideLoading();
+          }
+        })
+    }
   },
 
 
diff --git a/miniprogram/pages/earth/earth.json b/miniprogram/pages/earth/earth.json
index f60c42c..4f535f7 100644
--- a/miniprogram/pages/earth/earth.json
+++ b/miniprogram/pages/earth/earth.json
@@ -2,7 +2,8 @@
   "usingComponents": {
     "van-field": "../../miniprogram_npm/@vant/weapp/field",
     "van-popup": "../../miniprogram_npm/@vant/weapp/popup",
-    "van-search": "../../miniprogram_npm/@vant/weapp/search"
+    "van-search": "../../miniprogram_npm/@vant/weapp/search",
+    "van-button": "../../miniprogram_npm/@vant/weapp/button/index"
   },
   "navigationBarTitleText": "地图"
 }

diff --git a/miniprogram/app.js b/miniprogram/app.js
index e0372c0..e46517c 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -37,5 +37,6 @@
     selectProjectId: '', // 选择的项目id
     selectProjectName: '', // 选择的项目名称
     updateSignImageId: '', // 更新签名图片id
+    position: [], // 记录点击标记点的气泡跳转详情页时的设备编号
    }
 })
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index fe0f76f..0535dd4 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -170,31 +170,31 @@
     })
 
 
-//获取井类型下拉列表
-wx.request({
-  method: "POST",
-  url: app.globalData.httpsUrl + "appDeviceAdd/getWellTypeList",   
-  header: {
+    //获取井类型下拉列表
+    wx.request({
+    method: "POST",
+    url: app.globalData.httpsUrl + "appDeviceAdd/getWellTypeList",   
+    header: {
     'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
-  },
-  success(res){
+    },
+    success(res){
     if (res.data) {
-      var welltype = res.data
-      var welltypeArr = [];
-      for (var i = 0; i < welltype.length; i++) {
+        var welltype = res.data
+        var welltypeArr = [];
+        for (var i = 0; i < welltype.length; i++) {
         var type = {
-          text: welltype[i].text,
-          value: welltype[i].value
+            text: welltype[i].text,
+            value: welltype[i].value
         };
         welltypeArr.push(type);
-      }
-      console.log('------', welltypeArr)
-      that.setData({
+        }
+        console.log('------', welltypeArr)
+        that.setData({
         option1: welltypeArr
-      })
+        })
     }
-  }
-})
+    }
+    })
 
     //获取人员下拉列表
     wx.request({
@@ -288,6 +288,9 @@
         }
       }
     })
+
+    // 粘贴经纬度
+    this.paste()
   },
 
 
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index cfcd359..03cbe1c 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -22,9 +22,9 @@
 </van-cell-group>
 <van-cell-group>
 	<van-field data-id="longitude" value="{{longitude}}" label="经度" placeholder="116.12345" bind:clear="clearLongitude" bind:blur="confirm" border="{{ true }}"  clearable required />
-		<van-field data-id="latitude" value="{{latitude}}" label="纬度" placeholder="39.1237" bind:clear="clearLatitude" use-icon-slot bind:click-icon="paste" bind:blur="confirm" clearable required>
-				<van-icon name="edit" size="50rpx" slot="right-icon" />
-			</van-field>
+    <van-field data-id="latitude" value="{{latitude}}" label="纬度" placeholder="39.1237" bind:clear="clearLatitude" use-icon-slot bind:click-icon="paste" bind:blur="confirm" clearable required>
+        <!-- <van-icon name="edit" size="50rpx" slot="right-icon" /> -->
+    </van-field>
 	
 <van-field data-id="area" value="{{form.area}}" label="区" placeholder="" bind:blur="confirm" clearable  />
 <van-field data-id="street" value="{{form.street}}" label="街道" placeholder="" bind:blur="confirm" clearable  />
@@ -86,7 +86,7 @@
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />
-	<van-uploader upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
+	<van-uploader  upload-text="现场照片" file-list="{{ fileList }}" max-count="6" bind:after-read="afterRead" bind:delete="deletePhoto" />
 
 <!-- <view class="container">
  <view>
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index f83d272..65a940f 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -245,6 +245,24 @@
         }
         fileList.push(file3)
       }
+      if (formObject.photopath4 != "") {
+        var file4 = {
+          url: app.globalData.httpsUrl + "static/" + formObject.photopath4
+        }
+        fileList.push(file4)
+      }
+      if (formObject.photopath5 != "") {
+        var file5 = {
+          url: app.globalData.httpsUrl + "static/" + formObject.photopath5
+        }
+        fileList.push(file5)
+      }
+      if (formObject.photopath6 != "") {
+        var file6 = {
+          url: app.globalData.httpsUrl + "static/" + formObject.photopath6
+        }
+        fileList.push(file6)
+      }
       _this.setData({
         fileList
       });
@@ -511,6 +529,15 @@
     // }
     var that = this;
     var fileList = that.data.fileList;
+    console.log('要保存的图片列表', fileList);
+    that.setData({
+        'form.photopath1' : '',
+        'form.photopath2' : '',
+        'form.photopath3' : '',
+        'form.photopath4' : '',
+        'form.photopath5' : '',
+        'form.photopath6' : '',
+    })
     for (var i = 0; i < fileList.length; i++) {
       var photopath = 'form.photopath' + [Number(i) + 1]
       this.setData({
@@ -707,9 +734,12 @@
       success: function (res) {
         if (res.confirm) {
           fileList_new.splice(image_index, 1);
+          console.log('新的照片列表', fileList_new);
           that.setData({
             fileList: fileList_new
           })
+          console.log('新的照片列表111', that.data.fileList);
+
           wx.request({
             method: "POST",
             url: app.globalData.httpsUrl + "appDeviceLog/deletePhoto",
diff --git a/miniprogram/pages/earth/earth.js b/miniprogram/pages/earth/earth.js
index ab1a56e..4099ea4 100644
--- a/miniprogram/pages/earth/earth.js
+++ b/miniprogram/pages/earth/earth.js
@@ -180,96 +180,110 @@
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
- //输入设备编号获取marker位置信息
- var that = this;
- if ( app.globalData.devcode!="") {
-  var devcode = app.globalData.devcode
-  wx.request({
-    method: "POST",
-    url: app.globalData.httpsUrl + "appDeviceAdd/findListByCodes",
-    data: {
-      devcodes: devcode,
-    },
-    header: {
-      'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
-    },
-    success(res) {
-      app.globalData.devcode="";
-      if (res.data.code == 200) {
-        var listResultData = res.data.data;
-        that.setData({
-          listData: listResultData
-        })
-        var markersArr = that.data.markers;
-        for (var i = 0; i < listResultData.length; i++) {
-          markersArr = markersArr.concat({
-            iconPath: "../../images/locat.png",
-            id: Number(listResultData[i].id),
-            callout: {
-              content: "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
-              fontSize: '14',
-              padding: true,
-              color: '#000000',
-              borderColor: '#F4EA2A',
-              bgColor: '#F4EA2A',
-              borderWidth: 5,
-              display: 'ALWAYS',
-              textAlign: 'left',
-              // borderRadius: 15
-            },
-            latitude: listResultData[i].latitude,
-            longitude: listResultData[i].longitude,
-            width: 40,
-            height: 40
-          });
+onShow: function () {
+    //输入设备编号获取marker位置信息
+    var that = this;
+    if (app.globalData.devcode!="") {
+    var devcode = app.globalData.devcode
+    wx.request({
+        method: "POST",
+        url: app.globalData.httpsUrl + "appDeviceAdd/findListByCodes",
+        data: {
+        devcodes: devcode,
+        },
+        header: {
+        'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
+        },
+        success(res) {
+        app.globalData.devcode="";
+        if (res.data.code == 200) {
+            var listResultData = res.data.data;
+            that.setData({
+            listData: listResultData
+            })
+            var markersArr = that.data.markers;
+            for (var i = 0; i < listResultData.length; i++) {
+            markersArr = markersArr.concat({
+                iconPath: "../../images/locat.png",
+                id: Number(listResultData[i].id),
+                callout: {
+                    content: "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
+                    fontSize: '14',
+                    padding: true,
+                    color: '#000000',
+                    borderColor: '#F4EA2A',
+                    bgColor: '#F4EA2A',
+                    borderWidth: 5,
+                    display: 'ALWAYS',
+                    textAlign: 'left',
+                    devcode: listResultData[i].devcode
+                    // borderRadius: 15
+                },
+                latitude: listResultData[i].latitude,
+                longitude: listResultData[i].longitude,
+                width: 40,
+                height: 40,
+                devcode: listResultData[i].devcode
+            });
+            }
+            that.setData({
+                markers: markersArr,
+                latitude: listResultData[0].latitude,
+                longitude: listResultData[0].longitude,
+                marker_latitude: listResultData[0].latitude,
+                marker_longitude: listResultData[0].longitude,
+                title: listResultData[0].devcode
+            })
+            
         }
-        that.setData({
-          markers: markersArr,
-          latitude: listResultData[0].latitude,
-          longitude: listResultData[0].longitude,
-          marker_latitude: listResultData[0].latitude,
-          marker_longitude: listResultData[0].longitude,
-          title: listResultData[0].devcode
-        })
-      }
-    },
-    fail(err) {
-      app.globalData.devcode="";
-      wx.showToast({
-        title: "无法获取设备地理信息！",
-        icon: 'none',
-        duration: 2000
-      })
-    }
-  })
+        },
+        fail(err) {
+            app.globalData.devcode="";
+            wx.showToast({
+                title: "无法获取设备地理信息！",
+                icon: 'none',
+                duration: 2000
+            })
+        }
+    })
 } else {
-  //获取当前坐标（gcj02）
-  wx.getLocation({
-    type: "gcj02",
-    altitude: true,
-    success: function (res) {
-      that.setData({
-        latitude: parseFloat(res.latitude).toFixed(6),
-        longitude: parseFloat(res.longitude).toFixed(6),
-        // markers: [{
-        //   latitude: res.latitude,
-        //   longitude: res.longitude,
-        // }]
-      })
-      //获取当前坐标（wgs84）,特别注意需要放在加载里面，否则获取有误
-      wx.getLocation({
-        type: "wgs84",
-        altitude: true,
-        success: function (res) {
-          that.setData({
-            latitude84: parseFloat(res.latitude).toFixed(6),
-            longitude84: parseFloat(res.longitude).toFixed(6)
-          })
-        }
-      })
+    
+    if(app.globalData.position && app.globalData.position.length) {
+        console.log('-0-0-0-0',app.globalData.position );
+        that.setData({
+            latitude: app.globalData.position[0].latitude,
+            longitude: app.globalData.position[0].longitude,
+        })
+    } else {
+
+        //获取当前坐标（gcj02）
+        wx.getLocation({
+            type: "gcj02",
+            altitude: true,
+            success: function (res) {
+                that.setData({
+                    latitude: parseFloat(res.latitude).toFixed(6),
+                    longitude: parseFloat(res.longitude).toFixed(6),
+                    // markers: [{
+                    //   latitude: res.latitude,
+                    //   longitude: res.longitude,
+                    // }]
+                })
+                //获取当前坐标（wgs84）,特别注意需要放在加载里面，否则获取有误
+                wx.getLocation({
+                    type: "wgs84",
+                    altitude: true,
+                    success: function (res) {
+                    that.setData({
+                        latitude84: parseFloat(res.latitude).toFixed(6),
+                        longitude84: parseFloat(res.longitude).toFixed(6)
+                    })
+                    }
+                })
+            }
+        })
     }
-  })
+
 }
 
 
@@ -311,7 +325,6 @@
   },
 
   //定位出来
-
   locationPosition: function () {
     var that = this;
     //获取当前坐标（gcj02）
@@ -371,6 +384,7 @@
                 title: '坐标已获取',
                 duration: 1000
               })
+           
         }
       })
       wx.navigateTo({
@@ -419,11 +433,14 @@
 
   //获取设备maker
   leave() {
-
     var that = this;
     if (that.data.devcodes == "") {
-        that.setData({
-            markers:[]
+        // that.setData({
+        //     markers:[]
+        // })
+        wx.showToast({
+            icon: 'none',
+            title: '请先输入定位设备编号',
         })
       return false;
     }
@@ -446,7 +463,7 @@
           for (var i = 0; i < listResultData.length; i++) {
             let arr = {
               iconPath: "../../images/locat.png",
-              id: listResultData[i].id,
+              id: Number(listResultData[i].id),
               callout: {
                 content:  "编号:"+listResultData[i].devcode+"\r\n位置:"+listResultData[i].position+"\r\n时间:"+listResultData[i].createtime,
                 fontSize: '14',
@@ -458,11 +475,13 @@
                 display: 'ALWAYS',
                 textAlign: 'left',
                 // borderRadius: 15
+                devcode: listResultData[i].devcode
               },
               latitude: listResultData[i].latitude,
               longitude: listResultData[i].longitude,
               width: 40,
-              height: 40
+              height: 40,
+              devcode: listResultData[i].devcode
             };
             markersArr.push(arr)
           }
@@ -474,6 +493,9 @@
             marker_longitude: listResultData[0].longitude,
             title: listResultData[0].devcode
           })
+          that.setData({
+            show: false
+          });
         }
       },
       fail(err) {
@@ -486,7 +508,36 @@
     })
   },
 
+  showLoading: function (message) {
+    if (wx.showLoading) {
+      // 基础库 1.1.0 微信6.5.6版本开始支持，低版本需做兼容处理
+      wx.showLoading({
+        title: message,
+        mask: true
+      });
+    } else {
+      // 低版本采用Toast兼容处理并将时间设为20秒以免自动消失
+      wx.showToast({
+        title: message,
+        icon: 'loading',
+        mask: true,
+        duration: 20000
+      });
+    }
+  },
+
+  hideLoading: function () {
+    if (wx.hideLoading) {
+      // 基础库 1.1.0 微信6.5.6版本开始支持，低版本需做兼容处理
+      wx.hideLoading();
+    } else {
+      wx.hideToast();
+    }
+  },
+
+  //   点击标记点
   markertap(e) {
+    console.log('点击标记点')
     var that = this;
     for (var i = 0; i < this.data.listData.length; i++) {
       if (e.markerId == this.data.listData[i].id) {
@@ -503,6 +554,57 @@
       //   scale: 35
       // })
     }
+
+    //    点击的标记点可以做气泡的显隐
+    const index = this.data.markers.findIndex(item => item.id === e.markerId)
+    if(index !== -1) {
+        let  tempMarkers = this.data.markers.map((item, i) => {
+            if(index === i) {
+                item.callout.display = item.callout.display === "BYCLICK" ? 'ALWAYS' : "BYCLICK"
+            } 
+            return item
+        })
+        this.setData({
+            markers: tempMarkers
+        })
+    }
+
+  },
+  //   点击气泡
+  bindcallouttap: function (e) {
+    var that = this;
+    const index = this.data.markers.findIndex(item => Number(item.id) === Number(e.markerId))
+    if(index !== -1) {
+        that.showLoading("数据请求中...");
+        wx.request({
+          method: "POST",
+          url: app.globalData.httpsUrl + "appDeviceLog/deviceDetail",
+          data: {
+            devcode: this.data.markers[index].devcode,
+          },
+          header: {
+            'content-type': 'application/x-www-form-urlencoded;charset=utf-8'
+          },
+          success(res) {
+            that.hideLoading();
+            // var resultObject = JSON.parse(res.data);
+            var resultObject = res.data;
+            var pageName = '../applog/applog'
+            if (resultObject.code == 200) {
+                wx.setStorageSync('resultObject', resultObject.data)
+                wx.navigateTo({
+                    url: '../addDevicelog/addDeviceLog?detail=' + "&pageName=" + pageName
+                })
+            //   app.globalData.positionDevcode = this.data.markers[index].devcode
+                app.globalData.position = [that.data.markers[index].marker_latitude, that.data.markers[index].marker_longitude]
+                console.log(app.globalData.position);
+            }
+          },
+          fail(err) {
+            that.hideLoading();
+          }
+        })
+    }
   },
 
 
diff --git a/miniprogram/pages/earth/earth.json b/miniprogram/pages/earth/earth.json
index f60c42c..4f535f7 100644
--- a/miniprogram/pages/earth/earth.json
+++ b/miniprogram/pages/earth/earth.json
@@ -2,7 +2,8 @@
   "usingComponents": {
     "van-field": "../../miniprogram_npm/@vant/weapp/field",
     "van-popup": "../../miniprogram_npm/@vant/weapp/popup",
-    "van-search": "../../miniprogram_npm/@vant/weapp/search"
+    "van-search": "../../miniprogram_npm/@vant/weapp/search",
+    "van-button": "../../miniprogram_npm/@vant/weapp/button/index"
   },
   "navigationBarTitleText": "地图"
 }
diff --git a/miniprogram/pages/earth/earth.wxml b/miniprogram/pages/earth/earth.wxml
index ad97bcf..bbe0c4d 100644
--- a/miniprogram/pages/earth/earth.wxml
+++ b/miniprogram/pages/earth/earth.wxml
@@ -1,38 +1,42 @@
 <!--miniprogram/pages/earth/earth.wxml-->
-<view class="" hover-class="none" hover-stop-propagation="false" style="width: 100%; height: 100%;">
+<view class="earth" hover-class="none" hover-stop-propagation="false" style="width: 100%; height: 100%;">
  <!-- <navigator open-type="switchTab" url="{{urlTab}}"><view>返回日志页</view></navigator> -->
 	<!-- <view class="map_container"> -->
 	<van-search value="{{ value }}" label="地址"  shape="round" background="#ffcf00" placeholder="请输入搜索关键词" bind:change="onChange">
 	</van-search>
 
-	<map id="map" longitude="{{longitude}}" latitude=" {{latitude}}" bindcontroltap="controltap" markers="{{markers}}" bindmarkertap="markertap"   scale="20"  bindregionchange="bindregionchange" enable-satellite="{{enableSsatellite}}" scale="13" show-location style="width: 100%; height: 100%;">
-		<cover-view wx:if="{{isShow}}" class="map-search-list {{isShow ? '' : 'map-hide'}}">
+	<map id="map" longitude="{{longitude}}" latitude=" {{latitude}}" bindcontroltap="controltap" markers="{{markers}}" bindmarkertap="markertap" bindcallouttap="bindcallouttap"   scale="20"  bindregionchange="bindregionchange" enable-satellite="{{enableSsatellite}}" scale="13" show-location style="width: 100%; height: 100%;">
+		<!-- <cover-view wx:if="{{isShow}}" class="map-search-list {{isShow ? '' : 'map-hide'}}">
 			<cover-view bindtouchstart="bindSearch" wx:key="searchId" data-keywords="{{item.title}}" data-location="{{item.location}}" class="map-box" wx:for="{{tips}}">
 				{{item.title}} {{item.address}}
 			</cover-view>
-		</cover-view>
-
+		</cover-view> -->
+        <cover-view slot="callout">
+        <!-- <cover-view class="zh-marker-label" marker-id="{{id}}">
+            这是一个自定义气泡
+        </cover-view> -->
+    </cover-view>
 		<cover-view class="cover">{{longitude}},{{latitude}}</cover-view>
 
         <!-- <cover-view class="cover1" wx:for="{{ controls }} wx:key={{ item.id }}">
             <cover-image src="../../images/add.png" style="{{item.position}}" mode=""/>
         </cover-view> -->
-        <cover-image 
-            src="../../images/copy.png" style="position: absolute;right: {{position1.right}};top: {{position1.top}};width:  60rpx;height:  60rpx;" mode=""  bindtap="controltap" data-controlId='1' />
-        <cover-image src="../../images/write.png" style="position: absolute;right: {{position2.right}};top: {{position2.top}};width:  60rpx;height:  60rpx;" mode=""  bindtap="controltap" data-controlId='2'/>
-        <cover-image src="../../images/add.png" style="position: absolute;right: {{position3.right}};top: {{position3.top}};width:  60rpx;height:  60rpx;" mode=""  bindtap="controltap" data-controlId='3'/>
-        <cover-image src="../../images/navigation.png" style="position: absolute;right: {{position4.right}};bottom: {{position4.bottom}};width: 60rpx;height: 60rpx;" mode=""  bindtap="controltap" data-controlId='4'/>
-        <cover-image src="../../images/gps.png" style="position: absolute;left: {{position5.left}};bottom: {{position5.bottom}};width: 60rpx;height: 60rpx;" mode=""  bindtap="controltap" data-controlId='5'/>
-        <cover-image src="../../images/aim.png" style="position: absolute;left: {{position6.left}};bottom: {{position6.bottom}};width: 60rpx;height: 60rpx;" mode=""  bindtap="controltap" data-controlId='6'/>
-        <cover-image src="../../images/applocat.png" style="position: absolute;left: {{position7.left}};top: {{position7.top}};width: 60rpx;height: 60rpx;" mode="" />
-        <cover-image src="../../images/back.png" style="position: absolute;right: {{position8.right}};bottom: {{position8.bottom}};width: 60rpx;height: 60rpx;" mode=""  bindtap="controltap" data-controlId='8'/>
+        <image src="../../images/copy.png" style="position: absolute;right: {{position1.right}};top: {{position1.top}};width:  60rpx;height:  60rpx;" mode=""  bindtap="controltap" data-controlId='1' />
+        <image src="../../images/write.png" style="position: absolute;right: {{position2.right}};top: {{position2.top}};width:  60rpx;height:  60rpx;" mode=""  bindtap="controltap" data-controlId='2'/>
+        <image src="../../images/add.png" style="position: absolute;right: {{position3.right}};top: {{position3.top}};width:  60rpx;height:  60rpx;" mode=""  bindtap="controltap" data-controlId='3'/>
+        <image src="../../images/navigation.png" style="position: absolute;right: {{position4.right}};bottom: {{position4.bottom}};width: 60rpx;height: 60rpx;" mode=""  bindtap="controltap" data-controlId='4'/>
+        <image src="../../images/gps.png" style="position: absolute;left: {{position5.left}};bottom: {{position5.bottom}};width: 60rpx;height: 60rpx;" mode=""  bindtap="controltap" data-controlId='5'/>
+        <image src="../../images/aim.png" style="position: absolute;left: {{position6.left}};bottom: {{position6.bottom}};width: 60rpx;height: 60rpx;" mode=""  bindtap="controltap" data-controlId='6'/>
+        <image src="../../images/applocat.png" style="position: absolute;left: {{position7.left}};top: {{position7.top}};width: 60rpx;height: 60rpx;" mode="" />
+        <image src="../../images/back.png" style="position: absolute;right: {{position8.right}};bottom: {{position8.bottom}};width: 60rpx;height: 60rpx;" mode=""  bindtap="controltap" data-controlId='8'/>
 	</map>
 
 
 </view>
-<van-popup show="{{ show }}" closeable close-icon="close" position="bottom" custom-style="height: 70%;" bind:close="onClose" bind:after-leave="leave">
-	<van-cell-group>
-		<van-field   type="textarea"  bind:blur="confirmdevcodes"
-		placeholder="请输入定位设备编号用换行隔开" autosize border="{{ false }}" />
+<!-- <van-popup show="{{ show }}" closeable close-icon="close" position="bottom" custom-style="height: 70%;" bind:close="onClose" bind:after-leave="leave"> -->
+<van-popup show="{{ show }}"  position="bottom" custom-style="height: 800rpx" bind:close="onClose" >
+	<van-button bindtap="leave" type="primary" style="margin: 10px 10px 0 0;position: fixed;right: 0rpx;bottom: 700rpx;z-index: 100;">查询</van-button>
+    <van-cell-group>
+		<van-field adjust-position="false" style="height: 100%;overflow: auto;"   type="textarea"  bind:blur="confirmdevcodes" placeholder="请输入定位设备编号用换行隔开" autosize border="{{ false }}" />
 	</van-cell-group>
 </van-popup>
\ No newline at end of file