diff --git a/miniprogram/app.js b/miniprogram/app.js
index 1be30c7..6204504 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://logapi.smartlog.work/", // 正式域名
     // httpsUrl: "http://111.198.10.15:11638/", // 15
-    // httpsUrl: "http://192.168.95.39:5905/", // 周甜
+    httpsUrl: "http://192.168.165.39:5905/", // 周甜
     // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,

diff --git a/miniprogram/app.js b/miniprogram/app.js
index 1be30c7..6204504 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://logapi.smartlog.work/", // 正式域名
     // httpsUrl: "http://111.198.10.15:11638/", // 15
-    // httpsUrl: "http://192.168.95.39:5905/", // 周甜
+    httpsUrl: "http://192.168.165.39:5905/", // 周甜
     // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index b397d10..014fd99 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -59,6 +59,7 @@
       devcode: "",
       wellcode: "",
       welltype: "",
+      dept: "", // 辖区派出所
       welldepth: "",
       installheigt: "",
       installperson: "",
@@ -93,6 +94,22 @@
     showCamera: false,
     flashMode: 'torch', // 闪光灯模式: off | on | auto
     maxCount: 6, // 最多能上传几张图片
+    deptList: [
+        {text: "西长安街", value: '1'},
+        {text: "府右街", value: '2'},
+        {text: "香山派出所", value: '3'},
+        {text: "西华门", value: '4'},
+        {text: "东华门", value: '5'},
+        {text: "王府井大街", value: '6'},
+        {text: "东方广场", value: '7'},
+        {text: "建国门", value: '8'},
+        {text: "东交民巷", value: '9'},
+        {text: "建国门南", value: '10'},
+        {text: "故宫", value: '11'},
+        {text: "中山公园", value: '12'},
+        {text: "劳动人民文化宫", value: '13'},
+        {text: "天安门分局", value: '14'},
+    ]
   },
 
   onDisplay() {
@@ -579,6 +596,15 @@
       })
       return false
     }
+
+    if (this.data.form.dept == "") {
+        wx.showToast({
+          icon: 'none',
+          title: '辖区派出所不能为空！',
+        })
+        return false
+      }
+  
     
 
     
@@ -847,6 +873,16 @@
       [devtype]: event.detail
     })
   },
+
+  //   设置辖区派出所
+  selectDeptValue(event) {
+    var that = this;
+    var dept = 'form.dept';
+    that.setData({
+      [dept]: event.detail
+    })
+  },
+
   //设置运维人员
   selectpersonValue(event) {
     var that = this;

diff --git a/miniprogram/app.js b/miniprogram/app.js
index 1be30c7..6204504 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://logapi.smartlog.work/", // 正式域名
     // httpsUrl: "http://111.198.10.15:11638/", // 15
-    // httpsUrl: "http://192.168.95.39:5905/", // 周甜
+    httpsUrl: "http://192.168.165.39:5905/", // 周甜
     // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index b397d10..014fd99 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -59,6 +59,7 @@
       devcode: "",
       wellcode: "",
       welltype: "",
+      dept: "", // 辖区派出所
       welldepth: "",
       installheigt: "",
       installperson: "",
@@ -93,6 +94,22 @@
     showCamera: false,
     flashMode: 'torch', // 闪光灯模式: off | on | auto
     maxCount: 6, // 最多能上传几张图片
+    deptList: [
+        {text: "西长安街", value: '1'},
+        {text: "府右街", value: '2'},
+        {text: "香山派出所", value: '3'},
+        {text: "西华门", value: '4'},
+        {text: "东华门", value: '5'},
+        {text: "王府井大街", value: '6'},
+        {text: "东方广场", value: '7'},
+        {text: "建国门", value: '8'},
+        {text: "东交民巷", value: '9'},
+        {text: "建国门南", value: '10'},
+        {text: "故宫", value: '11'},
+        {text: "中山公园", value: '12'},
+        {text: "劳动人民文化宫", value: '13'},
+        {text: "天安门分局", value: '14'},
+    ]
   },
 
   onDisplay() {
@@ -579,6 +596,15 @@
       })
       return false
     }
+
+    if (this.data.form.dept == "") {
+        wx.showToast({
+          icon: 'none',
+          title: '辖区派出所不能为空！',
+        })
+        return false
+      }
+  
     
 
     
@@ -847,6 +873,16 @@
       [devtype]: event.detail
     })
   },
+
+  //   设置辖区派出所
+  selectDeptValue(event) {
+    var that = this;
+    var dept = 'form.dept';
+    that.setData({
+      [dept]: event.detail
+    })
+  },
+
   //设置运维人员
   selectpersonValue(event) {
     var that = this;
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 51e4e7a..f8374a3 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -48,7 +48,17 @@
 	</van-row>
     <!-- 井名称 -->
     <van-field data-id="wellname" value="{{form.wellname}}" label="井名称" bind:blur="confirm" clearable />
-
+    <!-- 辖区派出所 -->
+    <van-row custom-class='row-class'>
+        <van-col span="12">
+            <van-field disabled label="辖区派出所" border="{{ true }}" required/>
+        </van-col>
+        <van-col span="12">
+            <van-dropdown-menu  active-color="#ffcf00">
+                <van-dropdown-item value="{{ form.dept }}" options="{{ deptList }}" bind:change="selectDeptValue"/>
+            </van-dropdown-menu>
+        </van-col>
+    </van-row>
 	<van-field data-id="welldepth" value="{{form.welldepth}}" label="井深/埋深" bind:blur="confirm" clearable />
 
 	<van-field data-id="installheigt" value="{{form.installheigt}}" label="到井口距离" bind:blur="confirm" clearable />

diff --git a/miniprogram/app.js b/miniprogram/app.js
index 1be30c7..6204504 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://logapi.smartlog.work/", // 正式域名
     // httpsUrl: "http://111.198.10.15:11638/", // 15
-    // httpsUrl: "http://192.168.95.39:5905/", // 周甜
+    httpsUrl: "http://192.168.165.39:5905/", // 周甜
     // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index b397d10..014fd99 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -59,6 +59,7 @@
       devcode: "",
       wellcode: "",
       welltype: "",
+      dept: "", // 辖区派出所
       welldepth: "",
       installheigt: "",
       installperson: "",
@@ -93,6 +94,22 @@
     showCamera: false,
     flashMode: 'torch', // 闪光灯模式: off | on | auto
     maxCount: 6, // 最多能上传几张图片
+    deptList: [
+        {text: "西长安街", value: '1'},
+        {text: "府右街", value: '2'},
+        {text: "香山派出所", value: '3'},
+        {text: "西华门", value: '4'},
+        {text: "东华门", value: '5'},
+        {text: "王府井大街", value: '6'},
+        {text: "东方广场", value: '7'},
+        {text: "建国门", value: '8'},
+        {text: "东交民巷", value: '9'},
+        {text: "建国门南", value: '10'},
+        {text: "故宫", value: '11'},
+        {text: "中山公园", value: '12'},
+        {text: "劳动人民文化宫", value: '13'},
+        {text: "天安门分局", value: '14'},
+    ]
   },
 
   onDisplay() {
@@ -579,6 +596,15 @@
       })
       return false
     }
+
+    if (this.data.form.dept == "") {
+        wx.showToast({
+          icon: 'none',
+          title: '辖区派出所不能为空！',
+        })
+        return false
+      }
+  
     
 
     
@@ -847,6 +873,16 @@
       [devtype]: event.detail
     })
   },
+
+  //   设置辖区派出所
+  selectDeptValue(event) {
+    var that = this;
+    var dept = 'form.dept';
+    that.setData({
+      [dept]: event.detail
+    })
+  },
+
   //设置运维人员
   selectpersonValue(event) {
     var that = this;
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 51e4e7a..f8374a3 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -48,7 +48,17 @@
 	</van-row>
     <!-- 井名称 -->
     <van-field data-id="wellname" value="{{form.wellname}}" label="井名称" bind:blur="confirm" clearable />
-
+    <!-- 辖区派出所 -->
+    <van-row custom-class='row-class'>
+        <van-col span="12">
+            <van-field disabled label="辖区派出所" border="{{ true }}" required/>
+        </van-col>
+        <van-col span="12">
+            <van-dropdown-menu  active-color="#ffcf00">
+                <van-dropdown-item value="{{ form.dept }}" options="{{ deptList }}" bind:change="selectDeptValue"/>
+            </van-dropdown-menu>
+        </van-col>
+    </van-row>
 	<van-field data-id="welldepth" value="{{form.welldepth}}" label="井深/埋深" bind:blur="confirm" clearable />
 
 	<van-field data-id="installheigt" value="{{form.installheigt}}" label="到井口距离" bind:blur="confirm" clearable />
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index dafd5de..8b76d7e 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -48,11 +48,28 @@
             value: '6',
         },
     ],
+    deptList: [
+        {text: "西长安街", value: '1'},
+        {text: "府右街", value: '2'},
+        {text: "香山派出所", value: '3'},
+        {text: "西华门", value: '4'},
+        {text: "东华门", value: '5'},
+        {text: "王府井大街", value: '6'},
+        {text: "东方广场", value: '7'},
+        {text: "建国门", value: '8'},
+        {text: "东交民巷", value: '9'},
+        {text: "建国门南", value: '10'},
+        {text: "故宫", value: '11'},
+        {text: "中山公园", value: '12'},
+        {text: "劳动人民文化宫", value: '13'},
+        {text: "天安门分局", value: '14'},
+    ],
     form: {
       devcode: "",
       wellcode: "",
       welltype: "",
       welldepth: "",
+      dept: "", // 辖区派出所
       installheigt: "",
       installperson: "",
       installtimeFmt: "",
@@ -422,6 +439,13 @@
       })
       return false
     }
+    if (this.data.form.dept == "") {
+        wx.showToast({
+          icon: 'none',
+          title: '辖区派出所不能为空！',
+        })
+        return false
+      }
     if (this.data.form.installType == "") {
         wx.showToast({
           icon: 'none',
@@ -699,6 +723,15 @@
           [installType]: value.detail
         })
       },
+    //   设置辖区派出所
+    selectDeptValue(event) {
+        var that = this;
+        var dept = 'form.dept';
+        that.setData({
+        [dept]: event.detail
+        })
+    },
+
     
   //运维人员默认为登录人
   // selectpersonValue(event) {

diff --git a/miniprogram/app.js b/miniprogram/app.js
index 1be30c7..6204504 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://logapi.smartlog.work/", // 正式域名
     // httpsUrl: "http://111.198.10.15:11638/", // 15
-    // httpsUrl: "http://192.168.95.39:5905/", // 周甜
+    httpsUrl: "http://192.168.165.39:5905/", // 周甜
     // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index b397d10..014fd99 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -59,6 +59,7 @@
       devcode: "",
       wellcode: "",
       welltype: "",
+      dept: "", // 辖区派出所
       welldepth: "",
       installheigt: "",
       installperson: "",
@@ -93,6 +94,22 @@
     showCamera: false,
     flashMode: 'torch', // 闪光灯模式: off | on | auto
     maxCount: 6, // 最多能上传几张图片
+    deptList: [
+        {text: "西长安街", value: '1'},
+        {text: "府右街", value: '2'},
+        {text: "香山派出所", value: '3'},
+        {text: "西华门", value: '4'},
+        {text: "东华门", value: '5'},
+        {text: "王府井大街", value: '6'},
+        {text: "东方广场", value: '7'},
+        {text: "建国门", value: '8'},
+        {text: "东交民巷", value: '9'},
+        {text: "建国门南", value: '10'},
+        {text: "故宫", value: '11'},
+        {text: "中山公园", value: '12'},
+        {text: "劳动人民文化宫", value: '13'},
+        {text: "天安门分局", value: '14'},
+    ]
   },
 
   onDisplay() {
@@ -579,6 +596,15 @@
       })
       return false
     }
+
+    if (this.data.form.dept == "") {
+        wx.showToast({
+          icon: 'none',
+          title: '辖区派出所不能为空！',
+        })
+        return false
+      }
+  
     
 
     
@@ -847,6 +873,16 @@
       [devtype]: event.detail
     })
   },
+
+  //   设置辖区派出所
+  selectDeptValue(event) {
+    var that = this;
+    var dept = 'form.dept';
+    that.setData({
+      [dept]: event.detail
+    })
+  },
+
   //设置运维人员
   selectpersonValue(event) {
     var that = this;
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 51e4e7a..f8374a3 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -48,7 +48,17 @@
 	</van-row>
     <!-- 井名称 -->
     <van-field data-id="wellname" value="{{form.wellname}}" label="井名称" bind:blur="confirm" clearable />
-
+    <!-- 辖区派出所 -->
+    <van-row custom-class='row-class'>
+        <van-col span="12">
+            <van-field disabled label="辖区派出所" border="{{ true }}" required/>
+        </van-col>
+        <van-col span="12">
+            <van-dropdown-menu  active-color="#ffcf00">
+                <van-dropdown-item value="{{ form.dept }}" options="{{ deptList }}" bind:change="selectDeptValue"/>
+            </van-dropdown-menu>
+        </van-col>
+    </van-row>
 	<van-field data-id="welldepth" value="{{form.welldepth}}" label="井深/埋深" bind:blur="confirm" clearable />
 
 	<van-field data-id="installheigt" value="{{form.installheigt}}" label="到井口距离" bind:blur="confirm" clearable />
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index dafd5de..8b76d7e 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -48,11 +48,28 @@
             value: '6',
         },
     ],
+    deptList: [
+        {text: "西长安街", value: '1'},
+        {text: "府右街", value: '2'},
+        {text: "香山派出所", value: '3'},
+        {text: "西华门", value: '4'},
+        {text: "东华门", value: '5'},
+        {text: "王府井大街", value: '6'},
+        {text: "东方广场", value: '7'},
+        {text: "建国门", value: '8'},
+        {text: "东交民巷", value: '9'},
+        {text: "建国门南", value: '10'},
+        {text: "故宫", value: '11'},
+        {text: "中山公园", value: '12'},
+        {text: "劳动人民文化宫", value: '13'},
+        {text: "天安门分局", value: '14'},
+    ],
     form: {
       devcode: "",
       wellcode: "",
       welltype: "",
       welldepth: "",
+      dept: "", // 辖区派出所
       installheigt: "",
       installperson: "",
       installtimeFmt: "",
@@ -422,6 +439,13 @@
       })
       return false
     }
+    if (this.data.form.dept == "") {
+        wx.showToast({
+          icon: 'none',
+          title: '辖区派出所不能为空！',
+        })
+        return false
+      }
     if (this.data.form.installType == "") {
         wx.showToast({
           icon: 'none',
@@ -699,6 +723,15 @@
           [installType]: value.detail
         })
       },
+    //   设置辖区派出所
+    selectDeptValue(event) {
+        var that = this;
+        var dept = 'form.dept';
+        that.setData({
+        [dept]: event.detail
+        })
+    },
+
     
   //运维人员默认为登录人
   // selectpersonValue(event) {
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.wxml b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
index de4cb95..c9b8288 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.wxml
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
@@ -99,7 +99,17 @@
 		</van-col>
 	</van-row> -->
 	<van-field disabled label="所属项目" value="{{projectName}}" border="{{ true }}" required/>
-
+    <!-- 辖区派出所 -->
+    <van-row custom-class='row-class'>
+        <van-col span="12">
+            <van-field disabled label="辖区派出所" border="{{ true }}" required/>
+        </van-col>
+        <van-col span="12">
+            <van-dropdown-menu  active-color="#ffcf00">
+                <van-dropdown-item value="{{ form.dept }}" options="{{ deptList }}" bind:change="selectDeptValue"/>
+            </van-dropdown-menu>
+        </van-col>
+    </van-row>
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field  data-id="workmsg" value="{{form.workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm"  required /> -->
 	<van-field data-id="logs"  type="textarea" autosize="true"  wx:if="{{ !showMask }}" value="{{form.logs}}" label="历史记录" placeholder="" disabled/>

diff --git a/miniprogram/app.js b/miniprogram/app.js
index 1be30c7..6204504 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://logapi.smartlog.work/", // 正式域名
     // httpsUrl: "http://111.198.10.15:11638/", // 15
-    // httpsUrl: "http://192.168.95.39:5905/", // 周甜
+    httpsUrl: "http://192.168.165.39:5905/", // 周甜
     // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index b397d10..014fd99 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -59,6 +59,7 @@
       devcode: "",
       wellcode: "",
       welltype: "",
+      dept: "", // 辖区派出所
       welldepth: "",
       installheigt: "",
       installperson: "",
@@ -93,6 +94,22 @@
     showCamera: false,
     flashMode: 'torch', // 闪光灯模式: off | on | auto
     maxCount: 6, // 最多能上传几张图片
+    deptList: [
+        {text: "西长安街", value: '1'},
+        {text: "府右街", value: '2'},
+        {text: "香山派出所", value: '3'},
+        {text: "西华门", value: '4'},
+        {text: "东华门", value: '5'},
+        {text: "王府井大街", value: '6'},
+        {text: "东方广场", value: '7'},
+        {text: "建国门", value: '8'},
+        {text: "东交民巷", value: '9'},
+        {text: "建国门南", value: '10'},
+        {text: "故宫", value: '11'},
+        {text: "中山公园", value: '12'},
+        {text: "劳动人民文化宫", value: '13'},
+        {text: "天安门分局", value: '14'},
+    ]
   },
 
   onDisplay() {
@@ -579,6 +596,15 @@
       })
       return false
     }
+
+    if (this.data.form.dept == "") {
+        wx.showToast({
+          icon: 'none',
+          title: '辖区派出所不能为空！',
+        })
+        return false
+      }
+  
     
 
     
@@ -847,6 +873,16 @@
       [devtype]: event.detail
     })
   },
+
+  //   设置辖区派出所
+  selectDeptValue(event) {
+    var that = this;
+    var dept = 'form.dept';
+    that.setData({
+      [dept]: event.detail
+    })
+  },
+
   //设置运维人员
   selectpersonValue(event) {
     var that = this;
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 51e4e7a..f8374a3 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -48,7 +48,17 @@
 	</van-row>
     <!-- 井名称 -->
     <van-field data-id="wellname" value="{{form.wellname}}" label="井名称" bind:blur="confirm" clearable />
-
+    <!-- 辖区派出所 -->
+    <van-row custom-class='row-class'>
+        <van-col span="12">
+            <van-field disabled label="辖区派出所" border="{{ true }}" required/>
+        </van-col>
+        <van-col span="12">
+            <van-dropdown-menu  active-color="#ffcf00">
+                <van-dropdown-item value="{{ form.dept }}" options="{{ deptList }}" bind:change="selectDeptValue"/>
+            </van-dropdown-menu>
+        </van-col>
+    </van-row>
 	<van-field data-id="welldepth" value="{{form.welldepth}}" label="井深/埋深" bind:blur="confirm" clearable />
 
 	<van-field data-id="installheigt" value="{{form.installheigt}}" label="到井口距离" bind:blur="confirm" clearable />
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index dafd5de..8b76d7e 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -48,11 +48,28 @@
             value: '6',
         },
     ],
+    deptList: [
+        {text: "西长安街", value: '1'},
+        {text: "府右街", value: '2'},
+        {text: "香山派出所", value: '3'},
+        {text: "西华门", value: '4'},
+        {text: "东华门", value: '5'},
+        {text: "王府井大街", value: '6'},
+        {text: "东方广场", value: '7'},
+        {text: "建国门", value: '8'},
+        {text: "东交民巷", value: '9'},
+        {text: "建国门南", value: '10'},
+        {text: "故宫", value: '11'},
+        {text: "中山公园", value: '12'},
+        {text: "劳动人民文化宫", value: '13'},
+        {text: "天安门分局", value: '14'},
+    ],
     form: {
       devcode: "",
       wellcode: "",
       welltype: "",
       welldepth: "",
+      dept: "", // 辖区派出所
       installheigt: "",
       installperson: "",
       installtimeFmt: "",
@@ -422,6 +439,13 @@
       })
       return false
     }
+    if (this.data.form.dept == "") {
+        wx.showToast({
+          icon: 'none',
+          title: '辖区派出所不能为空！',
+        })
+        return false
+      }
     if (this.data.form.installType == "") {
         wx.showToast({
           icon: 'none',
@@ -699,6 +723,15 @@
           [installType]: value.detail
         })
       },
+    //   设置辖区派出所
+    selectDeptValue(event) {
+        var that = this;
+        var dept = 'form.dept';
+        that.setData({
+        [dept]: event.detail
+        })
+    },
+
     
   //运维人员默认为登录人
   // selectpersonValue(event) {
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.wxml b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
index de4cb95..c9b8288 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.wxml
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
@@ -99,7 +99,17 @@
 		</van-col>
 	</van-row> -->
 	<van-field disabled label="所属项目" value="{{projectName}}" border="{{ true }}" required/>
-
+    <!-- 辖区派出所 -->
+    <van-row custom-class='row-class'>
+        <van-col span="12">
+            <van-field disabled label="辖区派出所" border="{{ true }}" required/>
+        </van-col>
+        <van-col span="12">
+            <van-dropdown-menu  active-color="#ffcf00">
+                <van-dropdown-item value="{{ form.dept }}" options="{{ deptList }}" bind:change="selectDeptValue"/>
+            </van-dropdown-menu>
+        </van-col>
+    </van-row>
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field  data-id="workmsg" value="{{form.workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm"  required /> -->
 	<van-field data-id="logs"  type="textarea" autosize="true"  wx:if="{{ !showMask }}" value="{{form.logs}}" label="历史记录" placeholder="" disabled/>
diff --git a/miniprogram/pages/defineMap/defineMap.js b/miniprogram/pages/defineMap/defineMap.js
index 7b56018..154bd86 100644
--- a/miniprogram/pages/defineMap/defineMap.js
+++ b/miniprogram/pages/defineMap/defineMap.js
@@ -74,9 +74,9 @@
         showTAMSelect: false, // 是否显示天安门井
       longitude: "116.627340",
       latitude: "39.874390",
-      scale: 22,
-      minScale: 2,
-      maxScale: 22,
+      scale: 20,
+      minScale: 3,
+      maxScale: 20,
       markers: [],
       activeMarkerId: null,
       activeMarker: null,

diff --git a/miniprogram/app.js b/miniprogram/app.js
index 1be30c7..6204504 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://logapi.smartlog.work/", // 正式域名
     // httpsUrl: "http://111.198.10.15:11638/", // 15
-    // httpsUrl: "http://192.168.95.39:5905/", // 周甜
+    httpsUrl: "http://192.168.165.39:5905/", // 周甜
     // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index b397d10..014fd99 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -59,6 +59,7 @@
       devcode: "",
       wellcode: "",
       welltype: "",
+      dept: "", // 辖区派出所
       welldepth: "",
       installheigt: "",
       installperson: "",
@@ -93,6 +94,22 @@
     showCamera: false,
     flashMode: 'torch', // 闪光灯模式: off | on | auto
     maxCount: 6, // 最多能上传几张图片
+    deptList: [
+        {text: "西长安街", value: '1'},
+        {text: "府右街", value: '2'},
+        {text: "香山派出所", value: '3'},
+        {text: "西华门", value: '4'},
+        {text: "东华门", value: '5'},
+        {text: "王府井大街", value: '6'},
+        {text: "东方广场", value: '7'},
+        {text: "建国门", value: '8'},
+        {text: "东交民巷", value: '9'},
+        {text: "建国门南", value: '10'},
+        {text: "故宫", value: '11'},
+        {text: "中山公园", value: '12'},
+        {text: "劳动人民文化宫", value: '13'},
+        {text: "天安门分局", value: '14'},
+    ]
   },
 
   onDisplay() {
@@ -579,6 +596,15 @@
       })
       return false
     }
+
+    if (this.data.form.dept == "") {
+        wx.showToast({
+          icon: 'none',
+          title: '辖区派出所不能为空！',
+        })
+        return false
+      }
+  
     
 
     
@@ -847,6 +873,16 @@
       [devtype]: event.detail
     })
   },
+
+  //   设置辖区派出所
+  selectDeptValue(event) {
+    var that = this;
+    var dept = 'form.dept';
+    that.setData({
+      [dept]: event.detail
+    })
+  },
+
   //设置运维人员
   selectpersonValue(event) {
     var that = this;
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 51e4e7a..f8374a3 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -48,7 +48,17 @@
 	</van-row>
     <!-- 井名称 -->
     <van-field data-id="wellname" value="{{form.wellname}}" label="井名称" bind:blur="confirm" clearable />
-
+    <!-- 辖区派出所 -->
+    <van-row custom-class='row-class'>
+        <van-col span="12">
+            <van-field disabled label="辖区派出所" border="{{ true }}" required/>
+        </van-col>
+        <van-col span="12">
+            <van-dropdown-menu  active-color="#ffcf00">
+                <van-dropdown-item value="{{ form.dept }}" options="{{ deptList }}" bind:change="selectDeptValue"/>
+            </van-dropdown-menu>
+        </van-col>
+    </van-row>
 	<van-field data-id="welldepth" value="{{form.welldepth}}" label="井深/埋深" bind:blur="confirm" clearable />
 
 	<van-field data-id="installheigt" value="{{form.installheigt}}" label="到井口距离" bind:blur="confirm" clearable />
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index dafd5de..8b76d7e 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -48,11 +48,28 @@
             value: '6',
         },
     ],
+    deptList: [
+        {text: "西长安街", value: '1'},
+        {text: "府右街", value: '2'},
+        {text: "香山派出所", value: '3'},
+        {text: "西华门", value: '4'},
+        {text: "东华门", value: '5'},
+        {text: "王府井大街", value: '6'},
+        {text: "东方广场", value: '7'},
+        {text: "建国门", value: '8'},
+        {text: "东交民巷", value: '9'},
+        {text: "建国门南", value: '10'},
+        {text: "故宫", value: '11'},
+        {text: "中山公园", value: '12'},
+        {text: "劳动人民文化宫", value: '13'},
+        {text: "天安门分局", value: '14'},
+    ],
     form: {
       devcode: "",
       wellcode: "",
       welltype: "",
       welldepth: "",
+      dept: "", // 辖区派出所
       installheigt: "",
       installperson: "",
       installtimeFmt: "",
@@ -422,6 +439,13 @@
       })
       return false
     }
+    if (this.data.form.dept == "") {
+        wx.showToast({
+          icon: 'none',
+          title: '辖区派出所不能为空！',
+        })
+        return false
+      }
     if (this.data.form.installType == "") {
         wx.showToast({
           icon: 'none',
@@ -699,6 +723,15 @@
           [installType]: value.detail
         })
       },
+    //   设置辖区派出所
+    selectDeptValue(event) {
+        var that = this;
+        var dept = 'form.dept';
+        that.setData({
+        [dept]: event.detail
+        })
+    },
+
     
   //运维人员默认为登录人
   // selectpersonValue(event) {
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.wxml b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
index de4cb95..c9b8288 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.wxml
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
@@ -99,7 +99,17 @@
 		</van-col>
 	</van-row> -->
 	<van-field disabled label="所属项目" value="{{projectName}}" border="{{ true }}" required/>
-
+    <!-- 辖区派出所 -->
+    <van-row custom-class='row-class'>
+        <van-col span="12">
+            <van-field disabled label="辖区派出所" border="{{ true }}" required/>
+        </van-col>
+        <van-col span="12">
+            <van-dropdown-menu  active-color="#ffcf00">
+                <van-dropdown-item value="{{ form.dept }}" options="{{ deptList }}" bind:change="selectDeptValue"/>
+            </van-dropdown-menu>
+        </van-col>
+    </van-row>
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field  data-id="workmsg" value="{{form.workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm"  required /> -->
 	<van-field data-id="logs"  type="textarea" autosize="true"  wx:if="{{ !showMask }}" value="{{form.logs}}" label="历史记录" placeholder="" disabled/>
diff --git a/miniprogram/pages/defineMap/defineMap.js b/miniprogram/pages/defineMap/defineMap.js
index 7b56018..154bd86 100644
--- a/miniprogram/pages/defineMap/defineMap.js
+++ b/miniprogram/pages/defineMap/defineMap.js
@@ -74,9 +74,9 @@
         showTAMSelect: false, // 是否显示天安门井
       longitude: "116.627340",
       latitude: "39.874390",
-      scale: 22,
-      minScale: 2,
-      maxScale: 22,
+      scale: 20,
+      minScale: 3,
+      maxScale: 20,
       markers: [],
       activeMarkerId: null,
       activeMarker: null,
diff --git a/miniprogram/pages/defineMap/defineMap.wxml b/miniprogram/pages/defineMap/defineMap.wxml
index 55df235..b942b58 100644
--- a/miniprogram/pages/defineMap/defineMap.wxml
+++ b/miniprogram/pages/defineMap/defineMap.wxml
@@ -55,11 +55,11 @@
       <text>井找不到</text>
     </view>
   </button> -->
-  <button class="tam-btn" bindtap="showPopupTAMSelect" wx:if="{{ (activeMarker.manholeInfo.isInStall !== '1' ) && activeMarker }}">
+  <!-- <button class="tam-btn" bindtap="showPopupTAMSelect" wx:if="{{ (activeMarker.manholeInfo.isInStall !== '1' ) && activeMarker }}">
     <view class="filter-btn-content">
       <text>广场井盖</text>
     </view>
-  </button>
+  </button> -->
   <button wx:if="{{(activeMarker.manholeInfo.isInStall !== '6' && (activeMarker.manholeInfo.wellType === '燃气井' || activeMarker.manholeInfo.wellType === '雨水井' || activeMarker.manholeInfo.wellType === '污水井')) || (activeMarker.manholeInfo.isInStall === '0') }}" class="updateWellType-btn" bindtap="updateWellType">
     <view class="filter-btn-content">
       <text>雨污燃井</text>

diff --git a/miniprogram/app.js b/miniprogram/app.js
index 1be30c7..6204504 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 正式域名
+    // httpsUrl: "https://logapi.smartlog.work/", // 正式域名
     // httpsUrl: "http://111.198.10.15:11638/", // 15
-    // httpsUrl: "http://192.168.95.39:5905/", // 周甜
+    httpsUrl: "http://192.168.165.39:5905/", // 周甜
     // httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名
     openid: null,
     indexCount:1,
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index b397d10..014fd99 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -59,6 +59,7 @@
       devcode: "",
       wellcode: "",
       welltype: "",
+      dept: "", // 辖区派出所
       welldepth: "",
       installheigt: "",
       installperson: "",
@@ -93,6 +94,22 @@
     showCamera: false,
     flashMode: 'torch', // 闪光灯模式: off | on | auto
     maxCount: 6, // 最多能上传几张图片
+    deptList: [
+        {text: "西长安街", value: '1'},
+        {text: "府右街", value: '2'},
+        {text: "香山派出所", value: '3'},
+        {text: "西华门", value: '4'},
+        {text: "东华门", value: '5'},
+        {text: "王府井大街", value: '6'},
+        {text: "东方广场", value: '7'},
+        {text: "建国门", value: '8'},
+        {text: "东交民巷", value: '9'},
+        {text: "建国门南", value: '10'},
+        {text: "故宫", value: '11'},
+        {text: "中山公园", value: '12'},
+        {text: "劳动人民文化宫", value: '13'},
+        {text: "天安门分局", value: '14'},
+    ]
   },
 
   onDisplay() {
@@ -579,6 +596,15 @@
       })
       return false
     }
+
+    if (this.data.form.dept == "") {
+        wx.showToast({
+          icon: 'none',
+          title: '辖区派出所不能为空！',
+        })
+        return false
+      }
+  
     
 
     
@@ -847,6 +873,16 @@
       [devtype]: event.detail
     })
   },
+
+  //   设置辖区派出所
+  selectDeptValue(event) {
+    var that = this;
+    var dept = 'form.dept';
+    that.setData({
+      [dept]: event.detail
+    })
+  },
+
   //设置运维人员
   selectpersonValue(event) {
     var that = this;
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 51e4e7a..f8374a3 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -48,7 +48,17 @@
 	</van-row>
     <!-- 井名称 -->
     <van-field data-id="wellname" value="{{form.wellname}}" label="井名称" bind:blur="confirm" clearable />
-
+    <!-- 辖区派出所 -->
+    <van-row custom-class='row-class'>
+        <van-col span="12">
+            <van-field disabled label="辖区派出所" border="{{ true }}" required/>
+        </van-col>
+        <van-col span="12">
+            <van-dropdown-menu  active-color="#ffcf00">
+                <van-dropdown-item value="{{ form.dept }}" options="{{ deptList }}" bind:change="selectDeptValue"/>
+            </van-dropdown-menu>
+        </van-col>
+    </van-row>
 	<van-field data-id="welldepth" value="{{form.welldepth}}" label="井深/埋深" bind:blur="confirm" clearable />
 
 	<van-field data-id="installheigt" value="{{form.installheigt}}" label="到井口距离" bind:blur="confirm" clearable />
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index dafd5de..8b76d7e 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -48,11 +48,28 @@
             value: '6',
         },
     ],
+    deptList: [
+        {text: "西长安街", value: '1'},
+        {text: "府右街", value: '2'},
+        {text: "香山派出所", value: '3'},
+        {text: "西华门", value: '4'},
+        {text: "东华门", value: '5'},
+        {text: "王府井大街", value: '6'},
+        {text: "东方广场", value: '7'},
+        {text: "建国门", value: '8'},
+        {text: "东交民巷", value: '9'},
+        {text: "建国门南", value: '10'},
+        {text: "故宫", value: '11'},
+        {text: "中山公园", value: '12'},
+        {text: "劳动人民文化宫", value: '13'},
+        {text: "天安门分局", value: '14'},
+    ],
     form: {
       devcode: "",
       wellcode: "",
       welltype: "",
       welldepth: "",
+      dept: "", // 辖区派出所
       installheigt: "",
       installperson: "",
       installtimeFmt: "",
@@ -422,6 +439,13 @@
       })
       return false
     }
+    if (this.data.form.dept == "") {
+        wx.showToast({
+          icon: 'none',
+          title: '辖区派出所不能为空！',
+        })
+        return false
+      }
     if (this.data.form.installType == "") {
         wx.showToast({
           icon: 'none',
@@ -699,6 +723,15 @@
           [installType]: value.detail
         })
       },
+    //   设置辖区派出所
+    selectDeptValue(event) {
+        var that = this;
+        var dept = 'form.dept';
+        that.setData({
+        [dept]: event.detail
+        })
+    },
+
     
   //运维人员默认为登录人
   // selectpersonValue(event) {
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.wxml b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
index de4cb95..c9b8288 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.wxml
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
@@ -99,7 +99,17 @@
 		</van-col>
 	</van-row> -->
 	<van-field disabled label="所属项目" value="{{projectName}}" border="{{ true }}" required/>
-
+    <!-- 辖区派出所 -->
+    <van-row custom-class='row-class'>
+        <van-col span="12">
+            <van-field disabled label="辖区派出所" border="{{ true }}" required/>
+        </van-col>
+        <van-col span="12">
+            <van-dropdown-menu  active-color="#ffcf00">
+                <van-dropdown-item value="{{ form.dept }}" options="{{ deptList }}" bind:change="selectDeptValue"/>
+            </van-dropdown-menu>
+        </van-col>
+    </van-row>
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field  data-id="workmsg" value="{{form.workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm"  required /> -->
 	<van-field data-id="logs"  type="textarea" autosize="true"  wx:if="{{ !showMask }}" value="{{form.logs}}" label="历史记录" placeholder="" disabled/>
diff --git a/miniprogram/pages/defineMap/defineMap.js b/miniprogram/pages/defineMap/defineMap.js
index 7b56018..154bd86 100644
--- a/miniprogram/pages/defineMap/defineMap.js
+++ b/miniprogram/pages/defineMap/defineMap.js
@@ -74,9 +74,9 @@
         showTAMSelect: false, // 是否显示天安门井
       longitude: "116.627340",
       latitude: "39.874390",
-      scale: 22,
-      minScale: 2,
-      maxScale: 22,
+      scale: 20,
+      minScale: 3,
+      maxScale: 20,
       markers: [],
       activeMarkerId: null,
       activeMarker: null,
diff --git a/miniprogram/pages/defineMap/defineMap.wxml b/miniprogram/pages/defineMap/defineMap.wxml
index 55df235..b942b58 100644
--- a/miniprogram/pages/defineMap/defineMap.wxml
+++ b/miniprogram/pages/defineMap/defineMap.wxml
@@ -55,11 +55,11 @@
       <text>井找不到</text>
     </view>
   </button> -->
-  <button class="tam-btn" bindtap="showPopupTAMSelect" wx:if="{{ (activeMarker.manholeInfo.isInStall !== '1' ) && activeMarker }}">
+  <!-- <button class="tam-btn" bindtap="showPopupTAMSelect" wx:if="{{ (activeMarker.manholeInfo.isInStall !== '1' ) && activeMarker }}">
     <view class="filter-btn-content">
       <text>广场井盖</text>
     </view>
-  </button>
+  </button> -->
   <button wx:if="{{(activeMarker.manholeInfo.isInStall !== '6' && (activeMarker.manholeInfo.wellType === '燃气井' || activeMarker.manholeInfo.wellType === '雨水井' || activeMarker.manholeInfo.wellType === '污水井')) || (activeMarker.manholeInfo.isInStall === '0') }}" class="updateWellType-btn" bindtap="updateWellType">
     <view class="filter-btn-content">
       <text>雨污燃井</text>
diff --git a/miniprogram/pages/defineMap/defineMap.wxss b/miniprogram/pages/defineMap/defineMap.wxss
index b961164..1d5becd 100644
--- a/miniprogram/pages/defineMap/defineMap.wxss
+++ b/miniprogram/pages/defineMap/defineMap.wxss
@@ -165,7 +165,7 @@
   .create-btn {
     position: fixed;
     right: 30rpx;
-    bottom: 280rpx;
+    bottom: 180rpx;
     width: 220rpx;
     height: 80rpx;
     background-color: rgba(0, 87, 255, 0.7);
@@ -218,7 +218,7 @@
   .tam-btn {
     position: fixed;
     right: 30rpx;
-    bottom: 180rpx;
+    bottom: 280rpx;
     width: 220rpx;
     height: 80rpx;
     background-color: rgba(250, 38, 250, 0.7);