diff --git a/src/api/xuncha.js b/src/api/xuncha.js
index 7d9088d..6de841b 100644
--- a/src/api/xuncha.js
+++ b/src/api/xuncha.js
@@ -54,12 +54,12 @@
 }
 
 // // 删除任务
-export function patrolTaskId(id) {
-  return request({
-    url: '/business/patrolTask/' + id,
-    method: 'delete',
-  });
-}
+// export function patrolTaskId(id) {
+//   return request({
+//     url: '/business/patrolTask/' + id,
+//     method: 'delete',
+//   });
+// }
 
 // 重新巡查
 export function patrolTaskRestartPatrol(query) {

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
index 7d9088d..6de841b 100644
--- a/src/api/xuncha.js
+++ b/src/api/xuncha.js
@@ -54,12 +54,12 @@
 }
 
 // // 删除任务
-export function patrolTaskId(id) {
-  return request({
-    url: '/business/patrolTask/' + id,
-    method: 'delete',
-  });
-}
+// export function patrolTaskId(id) {
+//   return request({
+//     url: '/business/patrolTask/' + id,
+//     method: 'delete',
+//   });
+// }
 
 // 重新巡查
 export function patrolTaskRestartPatrol(query) {
diff --git a/src/assets/images/login/head_img.png b/src/assets/images/login/head_img.png
new file mode 100644
index 0000000..87e5840
--- /dev/null
+++ b/src/assets/images/login/head_img.png
Binary files differ

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
index 7d9088d..6de841b 100644
--- a/src/api/xuncha.js
+++ b/src/api/xuncha.js
@@ -54,12 +54,12 @@
 }
 
 // // 删除任务
-export function patrolTaskId(id) {
-  return request({
-    url: '/business/patrolTask/' + id,
-    method: 'delete',
-  });
-}
+// export function patrolTaskId(id) {
+//   return request({
+//     url: '/business/patrolTask/' + id,
+//     method: 'delete',
+//   });
+// }
 
 // 重新巡查
 export function patrolTaskRestartPatrol(query) {
diff --git a/src/assets/images/login/head_img.png b/src/assets/images/login/head_img.png
new file mode 100644
index 0000000..87e5840
--- /dev/null
+++ b/src/assets/images/login/head_img.png
Binary files differ
diff --git a/src/assets/images/login/loginBg.png b/src/assets/images/login/loginBg.png
index b5afe0a..14bb503 100644
--- a/src/assets/images/login/loginBg.png
+++ b/src/assets/images/login/loginBg.png
Binary files differ

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
index 7d9088d..6de841b 100644
--- a/src/api/xuncha.js
+++ b/src/api/xuncha.js
@@ -54,12 +54,12 @@
 }
 
 // // 删除任务
-export function patrolTaskId(id) {
-  return request({
-    url: '/business/patrolTask/' + id,
-    method: 'delete',
-  });
-}
+// export function patrolTaskId(id) {
+//   return request({
+//     url: '/business/patrolTask/' + id,
+//     method: 'delete',
+//   });
+// }
 
 // 重新巡查
 export function patrolTaskRestartPatrol(query) {
diff --git a/src/assets/images/login/head_img.png b/src/assets/images/login/head_img.png
new file mode 100644
index 0000000..87e5840
--- /dev/null
+++ b/src/assets/images/login/head_img.png
Binary files differ
diff --git a/src/assets/images/login/loginBg.png b/src/assets/images/login/loginBg.png
index b5afe0a..14bb503 100644
--- a/src/assets/images/login/loginBg.png
+++ b/src/assets/images/login/loginBg.png
Binary files differ
diff --git a/src/utils/gis/CoorTransform.js b/src/utils/gis/CoorTransform.js
new file mode 100644
index 0000000..31c2aea
--- /dev/null
+++ b/src/utils/gis/CoorTransform.js
@@ -0,0 +1,116 @@
+const ATTRIBUTES = {
+    x_PI : 3.14159265358979324 * 3000.0 / 180.0,
+    PI : 3.1415926535897932384626,
+    a :6378245.0,
+    ee : 0.00669342162296594323
+}
+
+export default class CoordTransform  {
+
+    /**
+     * 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02) 的转换
+     * 即 百度 转 谷歌、高德
+     * @param bd_lng
+     * @param bd_lat
+     * @returns {*[]}
+     */
+    static bd09togcj02 (bd_lng, bd_lat) {
+        let x = bd_lng - 0.0065
+        let y = bd_lat - 0.006
+        let z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * ATTRIBUTES.x_PI)
+        let theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * ATTRIBUTES.x_PI)
+        let gg_lng = z * Math.cos(theta)
+        let gg_lat = z * Math.sin(theta)
+        return [gg_lng, gg_lat]
+    }
+
+    /**
+     * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+     * 即 谷歌、高德 转 百度
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static gcj02tobd09 (lng, lat) {
+        let z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * ATTRIBUTES.x_PI)
+        let theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * ATTRIBUTES.x_PI)
+        let bd_lng = z * Math.cos(theta) + 0.0065
+        let bd_lat = z * Math.sin(theta) + 0.006
+        return [bd_lng, bd_lat]
+    }
+
+    /**
+     * WGS-84 转 GCJ-02
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static wgs84togcj02 (lng, lat) {
+        if (CoordTransform.out_of_china(lng, lat)) {
+            return [lng, lat]
+        } else {
+            let dlat = CoordTransform.transformlat(lng - 105.0, lat - 35.0)
+            let dlng = CoordTransform.transformlng(lng - 105.0, lat - 35.0)
+            let radlat = lat / 180.0 * ATTRIBUTES.PI
+            let magic = Math.sin(radlat)
+            magic = 1 - ATTRIBUTES.ee * magic * magic
+            let sqrtmagic = Math.sqrt(magic)
+            dlat = (dlat * 180.0) / ((ATTRIBUTES.a * (1 - ATTRIBUTES.ee)) / (magic * sqrtmagic) * ATTRIBUTES.PI)
+            dlng = (dlng * 180.0) / (ATTRIBUTES.a / sqrtmagic * Math.cos(radlat) * ATTRIBUTES.PI)
+            let mglat = lat + dlat
+            let mglng = lng + dlng
+            return [mglng, mglat]
+        }
+    }
+
+    /**
+     * GCJ-02 转换为 WGS-84
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static gcj02towgs84 (lng, lat) {
+        if (CoordTransform.out_of_china(lng, lat)) {
+            return [lng, lat]
+        } else {
+            let dlat = CoordTransform.transformlat(lng - 105.0, lat - 35.0)
+            let dlng = CoordTransform.transformlng(lng - 105.0, lat - 35.0)
+            let radlat = lat / 180.0 * ATTRIBUTES.PI
+            let magic = Math.sin(radlat)
+            magic = 1 - ATTRIBUTES.ee * magic * magic
+            let sqrtmagic = Math.sqrt(magic)
+            dlat = (dlat * 180.0) / ((ATTRIBUTES.a * (1 - ATTRIBUTES.ee)) / (magic * sqrtmagic) * ATTRIBUTES.PI)
+            dlng = (dlng * 180.0) / (ATTRIBUTES.a / sqrtmagic * Math.cos(radlat) * ATTRIBUTES.PI)
+            let mglat = lat + dlat
+            let mglng = lng + dlng
+            return [lng * 2 - mglng, lat * 2 - mglat]
+        }
+    }
+
+    static transformlat (lng, lat) {
+        let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng))
+        ret += (20.0 * Math.sin(6.0 * lng * ATTRIBUTES.PI) + 20.0 * Math.sin(2.0 * lng * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (20.0 * Math.sin(lat * ATTRIBUTES.PI) + 40.0 * Math.sin(lat / 3.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (160.0 * Math.sin(lat / 12.0 * ATTRIBUTES.PI) + 320 * Math.sin(lat * ATTRIBUTES.PI / 30.0)) * 2.0 / 3.0
+        return ret
+    }
+
+    static transformlng (lng, lat) {
+        let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
+        ret += (20.0 * Math.sin(6.0 * lng * ATTRIBUTES.PI) + 20.0 * Math.sin(2.0 * lng * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (20.0 * Math.sin(lng * ATTRIBUTES.PI) + 40.0 * Math.sin(lng / 3.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (150.0 * Math.sin(lng / 12.0 * ATTRIBUTES.PI) + 300.0 * Math.sin(lng / 30.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        return ret
+    }
+
+    /**
+     * 判断是否在国内，不在国内则不做偏移
+     * @param lng
+     * @param lat
+     * @returns {boolean}
+     */
+    static out_of_china (lng, lat) {
+        // 纬度 3.86~53.55, 经度 73.66~135.05
+        return !(lng > 73.66 && lng < 135.05 && lat > 3.86 && lat < 53.55)
+    }
+}

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
index 7d9088d..6de841b 100644
--- a/src/api/xuncha.js
+++ b/src/api/xuncha.js
@@ -54,12 +54,12 @@
 }
 
 // // 删除任务
-export function patrolTaskId(id) {
-  return request({
-    url: '/business/patrolTask/' + id,
-    method: 'delete',
-  });
-}
+// export function patrolTaskId(id) {
+//   return request({
+//     url: '/business/patrolTask/' + id,
+//     method: 'delete',
+//   });
+// }
 
 // 重新巡查
 export function patrolTaskRestartPatrol(query) {
diff --git a/src/assets/images/login/head_img.png b/src/assets/images/login/head_img.png
new file mode 100644
index 0000000..87e5840
--- /dev/null
+++ b/src/assets/images/login/head_img.png
Binary files differ
diff --git a/src/assets/images/login/loginBg.png b/src/assets/images/login/loginBg.png
index b5afe0a..14bb503 100644
--- a/src/assets/images/login/loginBg.png
+++ b/src/assets/images/login/loginBg.png
Binary files differ
diff --git a/src/utils/gis/CoorTransform.js b/src/utils/gis/CoorTransform.js
new file mode 100644
index 0000000..31c2aea
--- /dev/null
+++ b/src/utils/gis/CoorTransform.js
@@ -0,0 +1,116 @@
+const ATTRIBUTES = {
+    x_PI : 3.14159265358979324 * 3000.0 / 180.0,
+    PI : 3.1415926535897932384626,
+    a :6378245.0,
+    ee : 0.00669342162296594323
+}
+
+export default class CoordTransform  {
+
+    /**
+     * 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02) 的转换
+     * 即 百度 转 谷歌、高德
+     * @param bd_lng
+     * @param bd_lat
+     * @returns {*[]}
+     */
+    static bd09togcj02 (bd_lng, bd_lat) {
+        let x = bd_lng - 0.0065
+        let y = bd_lat - 0.006
+        let z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * ATTRIBUTES.x_PI)
+        let theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * ATTRIBUTES.x_PI)
+        let gg_lng = z * Math.cos(theta)
+        let gg_lat = z * Math.sin(theta)
+        return [gg_lng, gg_lat]
+    }
+
+    /**
+     * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+     * 即 谷歌、高德 转 百度
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static gcj02tobd09 (lng, lat) {
+        let z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * ATTRIBUTES.x_PI)
+        let theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * ATTRIBUTES.x_PI)
+        let bd_lng = z * Math.cos(theta) + 0.0065
+        let bd_lat = z * Math.sin(theta) + 0.006
+        return [bd_lng, bd_lat]
+    }
+
+    /**
+     * WGS-84 转 GCJ-02
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static wgs84togcj02 (lng, lat) {
+        if (CoordTransform.out_of_china(lng, lat)) {
+            return [lng, lat]
+        } else {
+            let dlat = CoordTransform.transformlat(lng - 105.0, lat - 35.0)
+            let dlng = CoordTransform.transformlng(lng - 105.0, lat - 35.0)
+            let radlat = lat / 180.0 * ATTRIBUTES.PI
+            let magic = Math.sin(radlat)
+            magic = 1 - ATTRIBUTES.ee * magic * magic
+            let sqrtmagic = Math.sqrt(magic)
+            dlat = (dlat * 180.0) / ((ATTRIBUTES.a * (1 - ATTRIBUTES.ee)) / (magic * sqrtmagic) * ATTRIBUTES.PI)
+            dlng = (dlng * 180.0) / (ATTRIBUTES.a / sqrtmagic * Math.cos(radlat) * ATTRIBUTES.PI)
+            let mglat = lat + dlat
+            let mglng = lng + dlng
+            return [mglng, mglat]
+        }
+    }
+
+    /**
+     * GCJ-02 转换为 WGS-84
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static gcj02towgs84 (lng, lat) {
+        if (CoordTransform.out_of_china(lng, lat)) {
+            return [lng, lat]
+        } else {
+            let dlat = CoordTransform.transformlat(lng - 105.0, lat - 35.0)
+            let dlng = CoordTransform.transformlng(lng - 105.0, lat - 35.0)
+            let radlat = lat / 180.0 * ATTRIBUTES.PI
+            let magic = Math.sin(radlat)
+            magic = 1 - ATTRIBUTES.ee * magic * magic
+            let sqrtmagic = Math.sqrt(magic)
+            dlat = (dlat * 180.0) / ((ATTRIBUTES.a * (1 - ATTRIBUTES.ee)) / (magic * sqrtmagic) * ATTRIBUTES.PI)
+            dlng = (dlng * 180.0) / (ATTRIBUTES.a / sqrtmagic * Math.cos(radlat) * ATTRIBUTES.PI)
+            let mglat = lat + dlat
+            let mglng = lng + dlng
+            return [lng * 2 - mglng, lat * 2 - mglat]
+        }
+    }
+
+    static transformlat (lng, lat) {
+        let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng))
+        ret += (20.0 * Math.sin(6.0 * lng * ATTRIBUTES.PI) + 20.0 * Math.sin(2.0 * lng * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (20.0 * Math.sin(lat * ATTRIBUTES.PI) + 40.0 * Math.sin(lat / 3.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (160.0 * Math.sin(lat / 12.0 * ATTRIBUTES.PI) + 320 * Math.sin(lat * ATTRIBUTES.PI / 30.0)) * 2.0 / 3.0
+        return ret
+    }
+
+    static transformlng (lng, lat) {
+        let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
+        ret += (20.0 * Math.sin(6.0 * lng * ATTRIBUTES.PI) + 20.0 * Math.sin(2.0 * lng * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (20.0 * Math.sin(lng * ATTRIBUTES.PI) + 40.0 * Math.sin(lng / 3.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (150.0 * Math.sin(lng / 12.0 * ATTRIBUTES.PI) + 300.0 * Math.sin(lng / 30.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        return ret
+    }
+
+    /**
+     * 判断是否在国内，不在国内则不做偏移
+     * @param lng
+     * @param lat
+     * @returns {boolean}
+     */
+    static out_of_china (lng, lat) {
+        // 纬度 3.86~53.55, 经度 73.66~135.05
+        return !(lng > 73.66 && lng < 135.05 && lat > 3.86 && lat < 53.55)
+    }
+}
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index 3841be3..c2ba432 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -63,16 +63,18 @@
 });
 </script>
 <style lang="less">
-.headerpage {
-  .van-nav-bar {
-    .van-icon {
-      color: #333;
-    }
-    .van-nav-bar__title {
-      color: #333;
-      font-weight: 400;
-      font-size: 32px;
-    }
+.van-nav-bar {
+  .van-icon {
+    color: #fff !important;
   }
+  .van-nav-bar__title {
+    color: #fff !important;
+    font-weight: 400;
+    font-size: 32px;
+  }
+}
+
+.headerpage {
+  background: linear-gradient(-30deg, #145bf7, #52befe);
 }
 </style>

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
index 7d9088d..6de841b 100644
--- a/src/api/xuncha.js
+++ b/src/api/xuncha.js
@@ -54,12 +54,12 @@
 }
 
 // // 删除任务
-export function patrolTaskId(id) {
-  return request({
-    url: '/business/patrolTask/' + id,
-    method: 'delete',
-  });
-}
+// export function patrolTaskId(id) {
+//   return request({
+//     url: '/business/patrolTask/' + id,
+//     method: 'delete',
+//   });
+// }
 
 // 重新巡查
 export function patrolTaskRestartPatrol(query) {
diff --git a/src/assets/images/login/head_img.png b/src/assets/images/login/head_img.png
new file mode 100644
index 0000000..87e5840
--- /dev/null
+++ b/src/assets/images/login/head_img.png
Binary files differ
diff --git a/src/assets/images/login/loginBg.png b/src/assets/images/login/loginBg.png
index b5afe0a..14bb503 100644
--- a/src/assets/images/login/loginBg.png
+++ b/src/assets/images/login/loginBg.png
Binary files differ
diff --git a/src/utils/gis/CoorTransform.js b/src/utils/gis/CoorTransform.js
new file mode 100644
index 0000000..31c2aea
--- /dev/null
+++ b/src/utils/gis/CoorTransform.js
@@ -0,0 +1,116 @@
+const ATTRIBUTES = {
+    x_PI : 3.14159265358979324 * 3000.0 / 180.0,
+    PI : 3.1415926535897932384626,
+    a :6378245.0,
+    ee : 0.00669342162296594323
+}
+
+export default class CoordTransform  {
+
+    /**
+     * 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02) 的转换
+     * 即 百度 转 谷歌、高德
+     * @param bd_lng
+     * @param bd_lat
+     * @returns {*[]}
+     */
+    static bd09togcj02 (bd_lng, bd_lat) {
+        let x = bd_lng - 0.0065
+        let y = bd_lat - 0.006
+        let z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * ATTRIBUTES.x_PI)
+        let theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * ATTRIBUTES.x_PI)
+        let gg_lng = z * Math.cos(theta)
+        let gg_lat = z * Math.sin(theta)
+        return [gg_lng, gg_lat]
+    }
+
+    /**
+     * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+     * 即 谷歌、高德 转 百度
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static gcj02tobd09 (lng, lat) {
+        let z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * ATTRIBUTES.x_PI)
+        let theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * ATTRIBUTES.x_PI)
+        let bd_lng = z * Math.cos(theta) + 0.0065
+        let bd_lat = z * Math.sin(theta) + 0.006
+        return [bd_lng, bd_lat]
+    }
+
+    /**
+     * WGS-84 转 GCJ-02
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static wgs84togcj02 (lng, lat) {
+        if (CoordTransform.out_of_china(lng, lat)) {
+            return [lng, lat]
+        } else {
+            let dlat = CoordTransform.transformlat(lng - 105.0, lat - 35.0)
+            let dlng = CoordTransform.transformlng(lng - 105.0, lat - 35.0)
+            let radlat = lat / 180.0 * ATTRIBUTES.PI
+            let magic = Math.sin(radlat)
+            magic = 1 - ATTRIBUTES.ee * magic * magic
+            let sqrtmagic = Math.sqrt(magic)
+            dlat = (dlat * 180.0) / ((ATTRIBUTES.a * (1 - ATTRIBUTES.ee)) / (magic * sqrtmagic) * ATTRIBUTES.PI)
+            dlng = (dlng * 180.0) / (ATTRIBUTES.a / sqrtmagic * Math.cos(radlat) * ATTRIBUTES.PI)
+            let mglat = lat + dlat
+            let mglng = lng + dlng
+            return [mglng, mglat]
+        }
+    }
+
+    /**
+     * GCJ-02 转换为 WGS-84
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static gcj02towgs84 (lng, lat) {
+        if (CoordTransform.out_of_china(lng, lat)) {
+            return [lng, lat]
+        } else {
+            let dlat = CoordTransform.transformlat(lng - 105.0, lat - 35.0)
+            let dlng = CoordTransform.transformlng(lng - 105.0, lat - 35.0)
+            let radlat = lat / 180.0 * ATTRIBUTES.PI
+            let magic = Math.sin(radlat)
+            magic = 1 - ATTRIBUTES.ee * magic * magic
+            let sqrtmagic = Math.sqrt(magic)
+            dlat = (dlat * 180.0) / ((ATTRIBUTES.a * (1 - ATTRIBUTES.ee)) / (magic * sqrtmagic) * ATTRIBUTES.PI)
+            dlng = (dlng * 180.0) / (ATTRIBUTES.a / sqrtmagic * Math.cos(radlat) * ATTRIBUTES.PI)
+            let mglat = lat + dlat
+            let mglng = lng + dlng
+            return [lng * 2 - mglng, lat * 2 - mglat]
+        }
+    }
+
+    static transformlat (lng, lat) {
+        let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng))
+        ret += (20.0 * Math.sin(6.0 * lng * ATTRIBUTES.PI) + 20.0 * Math.sin(2.0 * lng * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (20.0 * Math.sin(lat * ATTRIBUTES.PI) + 40.0 * Math.sin(lat / 3.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (160.0 * Math.sin(lat / 12.0 * ATTRIBUTES.PI) + 320 * Math.sin(lat * ATTRIBUTES.PI / 30.0)) * 2.0 / 3.0
+        return ret
+    }
+
+    static transformlng (lng, lat) {
+        let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
+        ret += (20.0 * Math.sin(6.0 * lng * ATTRIBUTES.PI) + 20.0 * Math.sin(2.0 * lng * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (20.0 * Math.sin(lng * ATTRIBUTES.PI) + 40.0 * Math.sin(lng / 3.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (150.0 * Math.sin(lng / 12.0 * ATTRIBUTES.PI) + 300.0 * Math.sin(lng / 30.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        return ret
+    }
+
+    /**
+     * 判断是否在国内，不在国内则不做偏移
+     * @param lng
+     * @param lat
+     * @returns {boolean}
+     */
+    static out_of_china (lng, lat) {
+        // 纬度 3.86~53.55, 经度 73.66~135.05
+        return !(lng > 73.66 && lng < 135.05 && lat > 3.86 && lat < 53.55)
+    }
+}
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index 3841be3..c2ba432 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -63,16 +63,18 @@
 });
 </script>
 <style lang="less">
-.headerpage {
-  .van-nav-bar {
-    .van-icon {
-      color: #333;
-    }
-    .van-nav-bar__title {
-      color: #333;
-      font-weight: 400;
-      font-size: 32px;
-    }
+.van-nav-bar {
+  .van-icon {
+    color: #fff !important;
   }
+  .van-nav-bar__title {
+    color: #fff !important;
+    font-weight: 400;
+    font-size: 32px;
+  }
+}
+
+.headerpage {
+  background: linear-gradient(-30deg, #145bf7, #52befe);
 }
 </style>
diff --git a/src/views/home/home_homePage.vue b/src/views/home/home_homePage.vue
index d4bd4c8..9761a73 100644
--- a/src/views/home/home_homePage.vue
+++ b/src/views/home/home_homePage.vue
@@ -304,7 +304,8 @@
   #HeaderBG {
     width: 100%;
     height: 410px;
-    background: linear-gradient(90deg, #3d84ff 0%, #53c0fe 100%);
+    // background: linear-gradient(90deg, #3d84ff 0%, #53c0fe 100%);
+    background: url('@/assets/images/login/head_img.png');
     box-sizing: border-box;
     padding-top: 30px;
     #HeaderTop {
@@ -318,11 +319,12 @@
       #HeaderName {
         height: 90px;
         line-height: 120px;
-        font-family: PingFang SC;
+        font-family: SourceHanSansCN-Heavy;
         font-weight: bold;
-        font-size: 34px;
-        color: #ffffff;
+        font-size: 50px;
+        color: #ffffffff;
         width: calc(100% - 110px);
+        font-style: oblique;
       }
       #locationName {
         height: 70px;

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
index 7d9088d..6de841b 100644
--- a/src/api/xuncha.js
+++ b/src/api/xuncha.js
@@ -54,12 +54,12 @@
 }
 
 // // 删除任务
-export function patrolTaskId(id) {
-  return request({
-    url: '/business/patrolTask/' + id,
-    method: 'delete',
-  });
-}
+// export function patrolTaskId(id) {
+//   return request({
+//     url: '/business/patrolTask/' + id,
+//     method: 'delete',
+//   });
+// }
 
 // 重新巡查
 export function patrolTaskRestartPatrol(query) {
diff --git a/src/assets/images/login/head_img.png b/src/assets/images/login/head_img.png
new file mode 100644
index 0000000..87e5840
--- /dev/null
+++ b/src/assets/images/login/head_img.png
Binary files differ
diff --git a/src/assets/images/login/loginBg.png b/src/assets/images/login/loginBg.png
index b5afe0a..14bb503 100644
--- a/src/assets/images/login/loginBg.png
+++ b/src/assets/images/login/loginBg.png
Binary files differ
diff --git a/src/utils/gis/CoorTransform.js b/src/utils/gis/CoorTransform.js
new file mode 100644
index 0000000..31c2aea
--- /dev/null
+++ b/src/utils/gis/CoorTransform.js
@@ -0,0 +1,116 @@
+const ATTRIBUTES = {
+    x_PI : 3.14159265358979324 * 3000.0 / 180.0,
+    PI : 3.1415926535897932384626,
+    a :6378245.0,
+    ee : 0.00669342162296594323
+}
+
+export default class CoordTransform  {
+
+    /**
+     * 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02) 的转换
+     * 即 百度 转 谷歌、高德
+     * @param bd_lng
+     * @param bd_lat
+     * @returns {*[]}
+     */
+    static bd09togcj02 (bd_lng, bd_lat) {
+        let x = bd_lng - 0.0065
+        let y = bd_lat - 0.006
+        let z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * ATTRIBUTES.x_PI)
+        let theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * ATTRIBUTES.x_PI)
+        let gg_lng = z * Math.cos(theta)
+        let gg_lat = z * Math.sin(theta)
+        return [gg_lng, gg_lat]
+    }
+
+    /**
+     * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+     * 即 谷歌、高德 转 百度
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static gcj02tobd09 (lng, lat) {
+        let z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * ATTRIBUTES.x_PI)
+        let theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * ATTRIBUTES.x_PI)
+        let bd_lng = z * Math.cos(theta) + 0.0065
+        let bd_lat = z * Math.sin(theta) + 0.006
+        return [bd_lng, bd_lat]
+    }
+
+    /**
+     * WGS-84 转 GCJ-02
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static wgs84togcj02 (lng, lat) {
+        if (CoordTransform.out_of_china(lng, lat)) {
+            return [lng, lat]
+        } else {
+            let dlat = CoordTransform.transformlat(lng - 105.0, lat - 35.0)
+            let dlng = CoordTransform.transformlng(lng - 105.0, lat - 35.0)
+            let radlat = lat / 180.0 * ATTRIBUTES.PI
+            let magic = Math.sin(radlat)
+            magic = 1 - ATTRIBUTES.ee * magic * magic
+            let sqrtmagic = Math.sqrt(magic)
+            dlat = (dlat * 180.0) / ((ATTRIBUTES.a * (1 - ATTRIBUTES.ee)) / (magic * sqrtmagic) * ATTRIBUTES.PI)
+            dlng = (dlng * 180.0) / (ATTRIBUTES.a / sqrtmagic * Math.cos(radlat) * ATTRIBUTES.PI)
+            let mglat = lat + dlat
+            let mglng = lng + dlng
+            return [mglng, mglat]
+        }
+    }
+
+    /**
+     * GCJ-02 转换为 WGS-84
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static gcj02towgs84 (lng, lat) {
+        if (CoordTransform.out_of_china(lng, lat)) {
+            return [lng, lat]
+        } else {
+            let dlat = CoordTransform.transformlat(lng - 105.0, lat - 35.0)
+            let dlng = CoordTransform.transformlng(lng - 105.0, lat - 35.0)
+            let radlat = lat / 180.0 * ATTRIBUTES.PI
+            let magic = Math.sin(radlat)
+            magic = 1 - ATTRIBUTES.ee * magic * magic
+            let sqrtmagic = Math.sqrt(magic)
+            dlat = (dlat * 180.0) / ((ATTRIBUTES.a * (1 - ATTRIBUTES.ee)) / (magic * sqrtmagic) * ATTRIBUTES.PI)
+            dlng = (dlng * 180.0) / (ATTRIBUTES.a / sqrtmagic * Math.cos(radlat) * ATTRIBUTES.PI)
+            let mglat = lat + dlat
+            let mglng = lng + dlng
+            return [lng * 2 - mglng, lat * 2 - mglat]
+        }
+    }
+
+    static transformlat (lng, lat) {
+        let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng))
+        ret += (20.0 * Math.sin(6.0 * lng * ATTRIBUTES.PI) + 20.0 * Math.sin(2.0 * lng * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (20.0 * Math.sin(lat * ATTRIBUTES.PI) + 40.0 * Math.sin(lat / 3.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (160.0 * Math.sin(lat / 12.0 * ATTRIBUTES.PI) + 320 * Math.sin(lat * ATTRIBUTES.PI / 30.0)) * 2.0 / 3.0
+        return ret
+    }
+
+    static transformlng (lng, lat) {
+        let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
+        ret += (20.0 * Math.sin(6.0 * lng * ATTRIBUTES.PI) + 20.0 * Math.sin(2.0 * lng * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (20.0 * Math.sin(lng * ATTRIBUTES.PI) + 40.0 * Math.sin(lng / 3.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (150.0 * Math.sin(lng / 12.0 * ATTRIBUTES.PI) + 300.0 * Math.sin(lng / 30.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        return ret
+    }
+
+    /**
+     * 判断是否在国内，不在国内则不做偏移
+     * @param lng
+     * @param lat
+     * @returns {boolean}
+     */
+    static out_of_china (lng, lat) {
+        // 纬度 3.86~53.55, 经度 73.66~135.05
+        return !(lng > 73.66 && lng < 135.05 && lat > 3.86 && lat < 53.55)
+    }
+}
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index 3841be3..c2ba432 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -63,16 +63,18 @@
 });
 </script>
 <style lang="less">
-.headerpage {
-  .van-nav-bar {
-    .van-icon {
-      color: #333;
-    }
-    .van-nav-bar__title {
-      color: #333;
-      font-weight: 400;
-      font-size: 32px;
-    }
+.van-nav-bar {
+  .van-icon {
+    color: #fff !important;
   }
+  .van-nav-bar__title {
+    color: #fff !important;
+    font-weight: 400;
+    font-size: 32px;
+  }
+}
+
+.headerpage {
+  background: linear-gradient(-30deg, #145bf7, #52befe);
 }
 </style>
diff --git a/src/views/home/home_homePage.vue b/src/views/home/home_homePage.vue
index d4bd4c8..9761a73 100644
--- a/src/views/home/home_homePage.vue
+++ b/src/views/home/home_homePage.vue
@@ -304,7 +304,8 @@
   #HeaderBG {
     width: 100%;
     height: 410px;
-    background: linear-gradient(90deg, #3d84ff 0%, #53c0fe 100%);
+    // background: linear-gradient(90deg, #3d84ff 0%, #53c0fe 100%);
+    background: url('@/assets/images/login/head_img.png');
     box-sizing: border-box;
     padding-top: 30px;
     #HeaderTop {
@@ -318,11 +319,12 @@
       #HeaderName {
         height: 90px;
         line-height: 120px;
-        font-family: PingFang SC;
+        font-family: SourceHanSansCN-Heavy;
         font-weight: bold;
-        font-size: 34px;
-        color: #ffffff;
+        font-size: 50px;
+        color: #ffffffff;
         width: calc(100% - 110px);
+        font-style: oblique;
       }
       #locationName {
         height: 70px;
diff --git a/src/views/login.vue b/src/views/login.vue
index 8174527..ab764f6 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -172,11 +172,12 @@
     .van-cell {
       margin: 30px auto;
       border-radius: 40px;
-      background: transparent;
+      background-color: #ffffffff;
+      // background: transparent;
 
       .van-field__control {
         padding-left: 20px;
-        color: #fff;
+        color: #000;
       }
       input:-internal-autofill-selected {
         background: transparent !important;
@@ -190,7 +191,7 @@
         -webkit-transition: color 11111s ease-out, background-color 111111s ease-out;
       }
       .van-icon:before {
-        color: #fff;
+        color: #1680ffff;
       }
     }
     .van-checkbox {

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
index 7d9088d..6de841b 100644
--- a/src/api/xuncha.js
+++ b/src/api/xuncha.js
@@ -54,12 +54,12 @@
 }
 
 // // 删除任务
-export function patrolTaskId(id) {
-  return request({
-    url: '/business/patrolTask/' + id,
-    method: 'delete',
-  });
-}
+// export function patrolTaskId(id) {
+//   return request({
+//     url: '/business/patrolTask/' + id,
+//     method: 'delete',
+//   });
+// }
 
 // 重新巡查
 export function patrolTaskRestartPatrol(query) {
diff --git a/src/assets/images/login/head_img.png b/src/assets/images/login/head_img.png
new file mode 100644
index 0000000..87e5840
--- /dev/null
+++ b/src/assets/images/login/head_img.png
Binary files differ
diff --git a/src/assets/images/login/loginBg.png b/src/assets/images/login/loginBg.png
index b5afe0a..14bb503 100644
--- a/src/assets/images/login/loginBg.png
+++ b/src/assets/images/login/loginBg.png
Binary files differ
diff --git a/src/utils/gis/CoorTransform.js b/src/utils/gis/CoorTransform.js
new file mode 100644
index 0000000..31c2aea
--- /dev/null
+++ b/src/utils/gis/CoorTransform.js
@@ -0,0 +1,116 @@
+const ATTRIBUTES = {
+    x_PI : 3.14159265358979324 * 3000.0 / 180.0,
+    PI : 3.1415926535897932384626,
+    a :6378245.0,
+    ee : 0.00669342162296594323
+}
+
+export default class CoordTransform  {
+
+    /**
+     * 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02) 的转换
+     * 即 百度 转 谷歌、高德
+     * @param bd_lng
+     * @param bd_lat
+     * @returns {*[]}
+     */
+    static bd09togcj02 (bd_lng, bd_lat) {
+        let x = bd_lng - 0.0065
+        let y = bd_lat - 0.006
+        let z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * ATTRIBUTES.x_PI)
+        let theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * ATTRIBUTES.x_PI)
+        let gg_lng = z * Math.cos(theta)
+        let gg_lat = z * Math.sin(theta)
+        return [gg_lng, gg_lat]
+    }
+
+    /**
+     * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+     * 即 谷歌、高德 转 百度
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static gcj02tobd09 (lng, lat) {
+        let z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * ATTRIBUTES.x_PI)
+        let theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * ATTRIBUTES.x_PI)
+        let bd_lng = z * Math.cos(theta) + 0.0065
+        let bd_lat = z * Math.sin(theta) + 0.006
+        return [bd_lng, bd_lat]
+    }
+
+    /**
+     * WGS-84 转 GCJ-02
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static wgs84togcj02 (lng, lat) {
+        if (CoordTransform.out_of_china(lng, lat)) {
+            return [lng, lat]
+        } else {
+            let dlat = CoordTransform.transformlat(lng - 105.0, lat - 35.0)
+            let dlng = CoordTransform.transformlng(lng - 105.0, lat - 35.0)
+            let radlat = lat / 180.0 * ATTRIBUTES.PI
+            let magic = Math.sin(radlat)
+            magic = 1 - ATTRIBUTES.ee * magic * magic
+            let sqrtmagic = Math.sqrt(magic)
+            dlat = (dlat * 180.0) / ((ATTRIBUTES.a * (1 - ATTRIBUTES.ee)) / (magic * sqrtmagic) * ATTRIBUTES.PI)
+            dlng = (dlng * 180.0) / (ATTRIBUTES.a / sqrtmagic * Math.cos(radlat) * ATTRIBUTES.PI)
+            let mglat = lat + dlat
+            let mglng = lng + dlng
+            return [mglng, mglat]
+        }
+    }
+
+    /**
+     * GCJ-02 转换为 WGS-84
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static gcj02towgs84 (lng, lat) {
+        if (CoordTransform.out_of_china(lng, lat)) {
+            return [lng, lat]
+        } else {
+            let dlat = CoordTransform.transformlat(lng - 105.0, lat - 35.0)
+            let dlng = CoordTransform.transformlng(lng - 105.0, lat - 35.0)
+            let radlat = lat / 180.0 * ATTRIBUTES.PI
+            let magic = Math.sin(radlat)
+            magic = 1 - ATTRIBUTES.ee * magic * magic
+            let sqrtmagic = Math.sqrt(magic)
+            dlat = (dlat * 180.0) / ((ATTRIBUTES.a * (1 - ATTRIBUTES.ee)) / (magic * sqrtmagic) * ATTRIBUTES.PI)
+            dlng = (dlng * 180.0) / (ATTRIBUTES.a / sqrtmagic * Math.cos(radlat) * ATTRIBUTES.PI)
+            let mglat = lat + dlat
+            let mglng = lng + dlng
+            return [lng * 2 - mglng, lat * 2 - mglat]
+        }
+    }
+
+    static transformlat (lng, lat) {
+        let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng))
+        ret += (20.0 * Math.sin(6.0 * lng * ATTRIBUTES.PI) + 20.0 * Math.sin(2.0 * lng * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (20.0 * Math.sin(lat * ATTRIBUTES.PI) + 40.0 * Math.sin(lat / 3.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (160.0 * Math.sin(lat / 12.0 * ATTRIBUTES.PI) + 320 * Math.sin(lat * ATTRIBUTES.PI / 30.0)) * 2.0 / 3.0
+        return ret
+    }
+
+    static transformlng (lng, lat) {
+        let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
+        ret += (20.0 * Math.sin(6.0 * lng * ATTRIBUTES.PI) + 20.0 * Math.sin(2.0 * lng * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (20.0 * Math.sin(lng * ATTRIBUTES.PI) + 40.0 * Math.sin(lng / 3.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (150.0 * Math.sin(lng / 12.0 * ATTRIBUTES.PI) + 300.0 * Math.sin(lng / 30.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        return ret
+    }
+
+    /**
+     * 判断是否在国内，不在国内则不做偏移
+     * @param lng
+     * @param lat
+     * @returns {boolean}
+     */
+    static out_of_china (lng, lat) {
+        // 纬度 3.86~53.55, 经度 73.66~135.05
+        return !(lng > 73.66 && lng < 135.05 && lat > 3.86 && lat < 53.55)
+    }
+}
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index 3841be3..c2ba432 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -63,16 +63,18 @@
 });
 </script>
 <style lang="less">
-.headerpage {
-  .van-nav-bar {
-    .van-icon {
-      color: #333;
-    }
-    .van-nav-bar__title {
-      color: #333;
-      font-weight: 400;
-      font-size: 32px;
-    }
+.van-nav-bar {
+  .van-icon {
+    color: #fff !important;
   }
+  .van-nav-bar__title {
+    color: #fff !important;
+    font-weight: 400;
+    font-size: 32px;
+  }
+}
+
+.headerpage {
+  background: linear-gradient(-30deg, #145bf7, #52befe);
 }
 </style>
diff --git a/src/views/home/home_homePage.vue b/src/views/home/home_homePage.vue
index d4bd4c8..9761a73 100644
--- a/src/views/home/home_homePage.vue
+++ b/src/views/home/home_homePage.vue
@@ -304,7 +304,8 @@
   #HeaderBG {
     width: 100%;
     height: 410px;
-    background: linear-gradient(90deg, #3d84ff 0%, #53c0fe 100%);
+    // background: linear-gradient(90deg, #3d84ff 0%, #53c0fe 100%);
+    background: url('@/assets/images/login/head_img.png');
     box-sizing: border-box;
     padding-top: 30px;
     #HeaderTop {
@@ -318,11 +319,12 @@
       #HeaderName {
         height: 90px;
         line-height: 120px;
-        font-family: PingFang SC;
+        font-family: SourceHanSansCN-Heavy;
         font-weight: bold;
-        font-size: 34px;
-        color: #ffffff;
+        font-size: 50px;
+        color: #ffffffff;
         width: calc(100% - 110px);
+        font-style: oblique;
       }
       #locationName {
         height: 70px;
diff --git a/src/views/login.vue b/src/views/login.vue
index 8174527..ab764f6 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -172,11 +172,12 @@
     .van-cell {
       margin: 30px auto;
       border-radius: 40px;
-      background: transparent;
+      background-color: #ffffffff;
+      // background: transparent;
 
       .van-field__control {
         padding-left: 20px;
-        color: #fff;
+        color: #000;
       }
       input:-internal-autofill-selected {
         background: transparent !important;
@@ -190,7 +191,7 @@
         -webkit-transition: color 11111s ease-out, background-color 111111s ease-out;
       }
       .van-icon:before {
-        color: #fff;
+        color: #1680ffff;
       }
     }
     .van-checkbox {
diff --git a/src/views/xuncha/TaskInspection.vue b/src/views/xuncha/TaskInspection.vue
index 606f35f..e197f64 100644
--- a/src/views/xuncha/TaskInspection.vue
+++ b/src/views/xuncha/TaskInspection.vue
@@ -284,8 +284,8 @@
 const getTaskTypeNum = () => {
   let query = {
     taskUserId: pinias.userNo,
-
     taskName: AllData.searchV,
+    statusList: AllData.ActiveID == 'to_start' ? 'to_start,expired' : AllData.ActiveID,
   };
   status_statistics(query).then((res) => {
     if (res && res.code == 200) {
@@ -353,7 +353,7 @@
     overflow: auto;
     box-sizing: border-box;
     padding: 30px;
-
+    // background: yellowgreen;
     .dataList {
       width: 100%;
       height: auto;

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
index 7d9088d..6de841b 100644
--- a/src/api/xuncha.js
+++ b/src/api/xuncha.js
@@ -54,12 +54,12 @@
 }
 
 // // 删除任务
-export function patrolTaskId(id) {
-  return request({
-    url: '/business/patrolTask/' + id,
-    method: 'delete',
-  });
-}
+// export function patrolTaskId(id) {
+//   return request({
+//     url: '/business/patrolTask/' + id,
+//     method: 'delete',
+//   });
+// }
 
 // 重新巡查
 export function patrolTaskRestartPatrol(query) {
diff --git a/src/assets/images/login/head_img.png b/src/assets/images/login/head_img.png
new file mode 100644
index 0000000..87e5840
--- /dev/null
+++ b/src/assets/images/login/head_img.png
Binary files differ
diff --git a/src/assets/images/login/loginBg.png b/src/assets/images/login/loginBg.png
index b5afe0a..14bb503 100644
--- a/src/assets/images/login/loginBg.png
+++ b/src/assets/images/login/loginBg.png
Binary files differ
diff --git a/src/utils/gis/CoorTransform.js b/src/utils/gis/CoorTransform.js
new file mode 100644
index 0000000..31c2aea
--- /dev/null
+++ b/src/utils/gis/CoorTransform.js
@@ -0,0 +1,116 @@
+const ATTRIBUTES = {
+    x_PI : 3.14159265358979324 * 3000.0 / 180.0,
+    PI : 3.1415926535897932384626,
+    a :6378245.0,
+    ee : 0.00669342162296594323
+}
+
+export default class CoordTransform  {
+
+    /**
+     * 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02) 的转换
+     * 即 百度 转 谷歌、高德
+     * @param bd_lng
+     * @param bd_lat
+     * @returns {*[]}
+     */
+    static bd09togcj02 (bd_lng, bd_lat) {
+        let x = bd_lng - 0.0065
+        let y = bd_lat - 0.006
+        let z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * ATTRIBUTES.x_PI)
+        let theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * ATTRIBUTES.x_PI)
+        let gg_lng = z * Math.cos(theta)
+        let gg_lat = z * Math.sin(theta)
+        return [gg_lng, gg_lat]
+    }
+
+    /**
+     * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+     * 即 谷歌、高德 转 百度
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static gcj02tobd09 (lng, lat) {
+        let z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * ATTRIBUTES.x_PI)
+        let theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * ATTRIBUTES.x_PI)
+        let bd_lng = z * Math.cos(theta) + 0.0065
+        let bd_lat = z * Math.sin(theta) + 0.006
+        return [bd_lng, bd_lat]
+    }
+
+    /**
+     * WGS-84 转 GCJ-02
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static wgs84togcj02 (lng, lat) {
+        if (CoordTransform.out_of_china(lng, lat)) {
+            return [lng, lat]
+        } else {
+            let dlat = CoordTransform.transformlat(lng - 105.0, lat - 35.0)
+            let dlng = CoordTransform.transformlng(lng - 105.0, lat - 35.0)
+            let radlat = lat / 180.0 * ATTRIBUTES.PI
+            let magic = Math.sin(radlat)
+            magic = 1 - ATTRIBUTES.ee * magic * magic
+            let sqrtmagic = Math.sqrt(magic)
+            dlat = (dlat * 180.0) / ((ATTRIBUTES.a * (1 - ATTRIBUTES.ee)) / (magic * sqrtmagic) * ATTRIBUTES.PI)
+            dlng = (dlng * 180.0) / (ATTRIBUTES.a / sqrtmagic * Math.cos(radlat) * ATTRIBUTES.PI)
+            let mglat = lat + dlat
+            let mglng = lng + dlng
+            return [mglng, mglat]
+        }
+    }
+
+    /**
+     * GCJ-02 转换为 WGS-84
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static gcj02towgs84 (lng, lat) {
+        if (CoordTransform.out_of_china(lng, lat)) {
+            return [lng, lat]
+        } else {
+            let dlat = CoordTransform.transformlat(lng - 105.0, lat - 35.0)
+            let dlng = CoordTransform.transformlng(lng - 105.0, lat - 35.0)
+            let radlat = lat / 180.0 * ATTRIBUTES.PI
+            let magic = Math.sin(radlat)
+            magic = 1 - ATTRIBUTES.ee * magic * magic
+            let sqrtmagic = Math.sqrt(magic)
+            dlat = (dlat * 180.0) / ((ATTRIBUTES.a * (1 - ATTRIBUTES.ee)) / (magic * sqrtmagic) * ATTRIBUTES.PI)
+            dlng = (dlng * 180.0) / (ATTRIBUTES.a / sqrtmagic * Math.cos(radlat) * ATTRIBUTES.PI)
+            let mglat = lat + dlat
+            let mglng = lng + dlng
+            return [lng * 2 - mglng, lat * 2 - mglat]
+        }
+    }
+
+    static transformlat (lng, lat) {
+        let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng))
+        ret += (20.0 * Math.sin(6.0 * lng * ATTRIBUTES.PI) + 20.0 * Math.sin(2.0 * lng * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (20.0 * Math.sin(lat * ATTRIBUTES.PI) + 40.0 * Math.sin(lat / 3.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (160.0 * Math.sin(lat / 12.0 * ATTRIBUTES.PI) + 320 * Math.sin(lat * ATTRIBUTES.PI / 30.0)) * 2.0 / 3.0
+        return ret
+    }
+
+    static transformlng (lng, lat) {
+        let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
+        ret += (20.0 * Math.sin(6.0 * lng * ATTRIBUTES.PI) + 20.0 * Math.sin(2.0 * lng * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (20.0 * Math.sin(lng * ATTRIBUTES.PI) + 40.0 * Math.sin(lng / 3.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (150.0 * Math.sin(lng / 12.0 * ATTRIBUTES.PI) + 300.0 * Math.sin(lng / 30.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        return ret
+    }
+
+    /**
+     * 判断是否在国内，不在国内则不做偏移
+     * @param lng
+     * @param lat
+     * @returns {boolean}
+     */
+    static out_of_china (lng, lat) {
+        // 纬度 3.86~53.55, 经度 73.66~135.05
+        return !(lng > 73.66 && lng < 135.05 && lat > 3.86 && lat < 53.55)
+    }
+}
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index 3841be3..c2ba432 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -63,16 +63,18 @@
 });
 </script>
 <style lang="less">
-.headerpage {
-  .van-nav-bar {
-    .van-icon {
-      color: #333;
-    }
-    .van-nav-bar__title {
-      color: #333;
-      font-weight: 400;
-      font-size: 32px;
-    }
+.van-nav-bar {
+  .van-icon {
+    color: #fff !important;
   }
+  .van-nav-bar__title {
+    color: #fff !important;
+    font-weight: 400;
+    font-size: 32px;
+  }
+}
+
+.headerpage {
+  background: linear-gradient(-30deg, #145bf7, #52befe);
 }
 </style>
diff --git a/src/views/home/home_homePage.vue b/src/views/home/home_homePage.vue
index d4bd4c8..9761a73 100644
--- a/src/views/home/home_homePage.vue
+++ b/src/views/home/home_homePage.vue
@@ -304,7 +304,8 @@
   #HeaderBG {
     width: 100%;
     height: 410px;
-    background: linear-gradient(90deg, #3d84ff 0%, #53c0fe 100%);
+    // background: linear-gradient(90deg, #3d84ff 0%, #53c0fe 100%);
+    background: url('@/assets/images/login/head_img.png');
     box-sizing: border-box;
     padding-top: 30px;
     #HeaderTop {
@@ -318,11 +319,12 @@
       #HeaderName {
         height: 90px;
         line-height: 120px;
-        font-family: PingFang SC;
+        font-family: SourceHanSansCN-Heavy;
         font-weight: bold;
-        font-size: 34px;
-        color: #ffffff;
+        font-size: 50px;
+        color: #ffffffff;
         width: calc(100% - 110px);
+        font-style: oblique;
       }
       #locationName {
         height: 70px;
diff --git a/src/views/login.vue b/src/views/login.vue
index 8174527..ab764f6 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -172,11 +172,12 @@
     .van-cell {
       margin: 30px auto;
       border-radius: 40px;
-      background: transparent;
+      background-color: #ffffffff;
+      // background: transparent;
 
       .van-field__control {
         padding-left: 20px;
-        color: #fff;
+        color: #000;
       }
       input:-internal-autofill-selected {
         background: transparent !important;
@@ -190,7 +191,7 @@
         -webkit-transition: color 11111s ease-out, background-color 111111s ease-out;
       }
       .van-icon:before {
-        color: #fff;
+        color: #1680ffff;
       }
     }
     .van-checkbox {
diff --git a/src/views/xuncha/TaskInspection.vue b/src/views/xuncha/TaskInspection.vue
index 606f35f..e197f64 100644
--- a/src/views/xuncha/TaskInspection.vue
+++ b/src/views/xuncha/TaskInspection.vue
@@ -284,8 +284,8 @@
 const getTaskTypeNum = () => {
   let query = {
     taskUserId: pinias.userNo,
-
     taskName: AllData.searchV,
+    statusList: AllData.ActiveID == 'to_start' ? 'to_start,expired' : AllData.ActiveID,
   };
   status_statistics(query).then((res) => {
     if (res && res.code == 200) {
@@ -353,7 +353,7 @@
     overflow: auto;
     box-sizing: border-box;
     padding: 30px;
-
+    // background: yellowgreen;
     .dataList {
       width: 100%;
       height: auto;
diff --git a/src/views/xuncha/components/inspection.vue b/src/views/xuncha/components/inspection.vue
index ec82515..4f8309a 100644
--- a/src/views/xuncha/components/inspection.vue
+++ b/src/views/xuncha/components/inspection.vue
@@ -36,17 +36,15 @@
 <script setup>
 import { reactive, ref, getCurrentInstance, watch, onMounted, onBeforeUnmount } from 'vue';
 import { timestampToTime, checkUserSystem, getCurrentPositon } from '@/utils/common.js';
-
-import { patrolTaskFinishPatrol, patrolTaskId } from '@/api/xuncha';
-
+import { patrolTaskFinishPatrol, PatrolTaskID } from '@/api/xuncha';
+import CoordTransform from '@/utils/gis/CoorTransform.js';
 import WKT from 'terraformer-wkt-parser';
-
 import { useRouter, useRoute } from 'vue-router';
-
+import { useStore } from '@/pinia/store.js';
 import TaskForm from './TaskForm'; // 表单组件
 const router = useRouter();
 const route = useRoute();
-// const pinias = useStore();
+const pinias = useStore();
 
 const props = defineProps({
   patrolLogId: String,
@@ -170,6 +168,96 @@
     window.webkit.messageHandlers.stopLocation.postMessage({ data: { refid: props.patrolLogId } });
   }
 }
+// 开始巡检--阶段性获取经纬度变化信息
+const startGetPosition = () => {
+  AllData.IntervalKry = setInterval(() => {
+    getPostionNow();
+  }, 3000);
+};
+/**
+ * 获取当前定位
+ */
+const getPostionNow = () => {
+  AllData.PostionValue = {
+    patrolDatetime: null,
+    lonLat: null,
+    refType: null,
+    refid: null,
+    userName: null,
+  };
+  getCurrentPositon((lng, lat, address) => {
+    // console.log('获取安卓定位参数--', address);
+    let timer = timestampToTime(Date.now());
+    let NewLonLat = CoordTransform.gcj02towgs84(Number(lng), Number(lat));
+    AllData.PostionValue = {
+      patrolDatetime: timer,
+      lonLat: NewLonLat[0] + ',' + NewLonLat[1],
+      refType: 'patrolLog',
+      refid: AllData.patrolLogId,
+      userName: pinias.userName,
+    };
+  });
+};
+/**
+ * 获取当前巡检任务详情
+ */
+const getInspectionInfo = (id) => {
+  PatrolTaskID(id).then((res) => {
+    if (res && res.code == 200) {
+      // 保存当前巡检ID
+      AllData.taskID = res.data.id;
+      console.log(AllData.taskID, 'AllData.taskID');
+      // 保存当前巡查段编号
+      // AllData.patrolSectionId = res.data.patrolSectionId;
+      // 保存日志编号
+      // AllData.patrolLogId = res.data.patrolLogId;
+      // 保存巡检记录
+      // AllData.patrolPathLngLat = res.data.patrolPathLngLat;
+      // AllData.patrolLogId = '1630380590036803588'
+      // 标题时间内容拼接
+      let d = new Date();
+      AllData.NoticeFont = `${d.getFullYear()}年${d.getMonth() + 1}月${d.getDate()}日开始${
+        res.data.taskName
+      }的巡查工作`;
+      startGetPosition(); //开始获取原生定位
+      sendSocketMessage(); //安卓、ios原生发送websocket
+    }
+  });
+};
+
+// 通过socket 发送数据
+const sendSocketMessage = (msg) => {
+  let systems = checkUserSystem();
+  if (systems == 'Android') {
+    console.log('安卓发送websocket---');
+    let timer = timestampToTime(Date.now());
+    let initObj = {
+      patrolDatetime: timer,
+      lonLat: '',
+      refType: 'patrolLog',
+      refid: AllData.patrolLogId,
+      userName: pinias.userName,
+    };
+    console.log('安卓发送websocket---', initObj);
+    //给Android发送参数，通知给后端发送websocket
+    window.android.initwebSocket(JSON.stringify(initObj));
+  } else if (systems == 'IOS') {
+    console.log('IOS开始发送websocket---');
+    let timer = timestampToTime(Date.now());
+    let initObj = {
+      callId: 'sendCurrentLocationIOS',
+      data: {
+        patrolDatetime: timer,
+        lonLat: '',
+        refType: 'patrolLog',
+        refid: AllData.patrolLogId,
+        userName: pinias.userName,
+      },
+    };
+    //给ios发送参数，通知给后端发送websocket
+    window.webkit.messageHandlers.sendLocation.postMessage(initObj);
+  }
+};
 
 watch(
   route,
@@ -178,6 +266,8 @@
     setTimeout(() => {
       //option为object类型，会序列化上个页面传递的参数
       console.log('传递的参数222--', route.query.id); //打印出上个页面传递的参数。
+      //获取当前巡检任务详情
+      getInspectionInfo(route.query.id);
     });
   },
   { immediate: true }

diff --git a/src/api/xuncha.js b/src/api/xuncha.js
index 7d9088d..6de841b 100644
--- a/src/api/xuncha.js
+++ b/src/api/xuncha.js
@@ -54,12 +54,12 @@
 }
 
 // // 删除任务
-export function patrolTaskId(id) {
-  return request({
-    url: '/business/patrolTask/' + id,
-    method: 'delete',
-  });
-}
+// export function patrolTaskId(id) {
+//   return request({
+//     url: '/business/patrolTask/' + id,
+//     method: 'delete',
+//   });
+// }
 
 // 重新巡查
 export function patrolTaskRestartPatrol(query) {
diff --git a/src/assets/images/login/head_img.png b/src/assets/images/login/head_img.png
new file mode 100644
index 0000000..87e5840
--- /dev/null
+++ b/src/assets/images/login/head_img.png
Binary files differ
diff --git a/src/assets/images/login/loginBg.png b/src/assets/images/login/loginBg.png
index b5afe0a..14bb503 100644
--- a/src/assets/images/login/loginBg.png
+++ b/src/assets/images/login/loginBg.png
Binary files differ
diff --git a/src/utils/gis/CoorTransform.js b/src/utils/gis/CoorTransform.js
new file mode 100644
index 0000000..31c2aea
--- /dev/null
+++ b/src/utils/gis/CoorTransform.js
@@ -0,0 +1,116 @@
+const ATTRIBUTES = {
+    x_PI : 3.14159265358979324 * 3000.0 / 180.0,
+    PI : 3.1415926535897932384626,
+    a :6378245.0,
+    ee : 0.00669342162296594323
+}
+
+export default class CoordTransform  {
+
+    /**
+     * 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02) 的转换
+     * 即 百度 转 谷歌、高德
+     * @param bd_lng
+     * @param bd_lat
+     * @returns {*[]}
+     */
+    static bd09togcj02 (bd_lng, bd_lat) {
+        let x = bd_lng - 0.0065
+        let y = bd_lat - 0.006
+        let z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * ATTRIBUTES.x_PI)
+        let theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * ATTRIBUTES.x_PI)
+        let gg_lng = z * Math.cos(theta)
+        let gg_lat = z * Math.sin(theta)
+        return [gg_lng, gg_lat]
+    }
+
+    /**
+     * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+     * 即 谷歌、高德 转 百度
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static gcj02tobd09 (lng, lat) {
+        let z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * ATTRIBUTES.x_PI)
+        let theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * ATTRIBUTES.x_PI)
+        let bd_lng = z * Math.cos(theta) + 0.0065
+        let bd_lat = z * Math.sin(theta) + 0.006
+        return [bd_lng, bd_lat]
+    }
+
+    /**
+     * WGS-84 转 GCJ-02
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static wgs84togcj02 (lng, lat) {
+        if (CoordTransform.out_of_china(lng, lat)) {
+            return [lng, lat]
+        } else {
+            let dlat = CoordTransform.transformlat(lng - 105.0, lat - 35.0)
+            let dlng = CoordTransform.transformlng(lng - 105.0, lat - 35.0)
+            let radlat = lat / 180.0 * ATTRIBUTES.PI
+            let magic = Math.sin(radlat)
+            magic = 1 - ATTRIBUTES.ee * magic * magic
+            let sqrtmagic = Math.sqrt(magic)
+            dlat = (dlat * 180.0) / ((ATTRIBUTES.a * (1 - ATTRIBUTES.ee)) / (magic * sqrtmagic) * ATTRIBUTES.PI)
+            dlng = (dlng * 180.0) / (ATTRIBUTES.a / sqrtmagic * Math.cos(radlat) * ATTRIBUTES.PI)
+            let mglat = lat + dlat
+            let mglng = lng + dlng
+            return [mglng, mglat]
+        }
+    }
+
+    /**
+     * GCJ-02 转换为 WGS-84
+     * @param lng
+     * @param lat
+     * @returns {*[]}
+     */
+    static gcj02towgs84 (lng, lat) {
+        if (CoordTransform.out_of_china(lng, lat)) {
+            return [lng, lat]
+        } else {
+            let dlat = CoordTransform.transformlat(lng - 105.0, lat - 35.0)
+            let dlng = CoordTransform.transformlng(lng - 105.0, lat - 35.0)
+            let radlat = lat / 180.0 * ATTRIBUTES.PI
+            let magic = Math.sin(radlat)
+            magic = 1 - ATTRIBUTES.ee * magic * magic
+            let sqrtmagic = Math.sqrt(magic)
+            dlat = (dlat * 180.0) / ((ATTRIBUTES.a * (1 - ATTRIBUTES.ee)) / (magic * sqrtmagic) * ATTRIBUTES.PI)
+            dlng = (dlng * 180.0) / (ATTRIBUTES.a / sqrtmagic * Math.cos(radlat) * ATTRIBUTES.PI)
+            let mglat = lat + dlat
+            let mglng = lng + dlng
+            return [lng * 2 - mglng, lat * 2 - mglat]
+        }
+    }
+
+    static transformlat (lng, lat) {
+        let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng))
+        ret += (20.0 * Math.sin(6.0 * lng * ATTRIBUTES.PI) + 20.0 * Math.sin(2.0 * lng * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (20.0 * Math.sin(lat * ATTRIBUTES.PI) + 40.0 * Math.sin(lat / 3.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (160.0 * Math.sin(lat / 12.0 * ATTRIBUTES.PI) + 320 * Math.sin(lat * ATTRIBUTES.PI / 30.0)) * 2.0 / 3.0
+        return ret
+    }
+
+    static transformlng (lng, lat) {
+        let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
+        ret += (20.0 * Math.sin(6.0 * lng * ATTRIBUTES.PI) + 20.0 * Math.sin(2.0 * lng * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (20.0 * Math.sin(lng * ATTRIBUTES.PI) + 40.0 * Math.sin(lng / 3.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        ret += (150.0 * Math.sin(lng / 12.0 * ATTRIBUTES.PI) + 300.0 * Math.sin(lng / 30.0 * ATTRIBUTES.PI)) * 2.0 / 3.0
+        return ret
+    }
+
+    /**
+     * 判断是否在国内，不在国内则不做偏移
+     * @param lng
+     * @param lat
+     * @returns {boolean}
+     */
+    static out_of_china (lng, lat) {
+        // 纬度 3.86~53.55, 经度 73.66~135.05
+        return !(lng > 73.66 && lng < 135.05 && lat > 3.86 && lat < 53.55)
+    }
+}
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index 3841be3..c2ba432 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -63,16 +63,18 @@
 });
 </script>
 <style lang="less">
-.headerpage {
-  .van-nav-bar {
-    .van-icon {
-      color: #333;
-    }
-    .van-nav-bar__title {
-      color: #333;
-      font-weight: 400;
-      font-size: 32px;
-    }
+.van-nav-bar {
+  .van-icon {
+    color: #fff !important;
   }
+  .van-nav-bar__title {
+    color: #fff !important;
+    font-weight: 400;
+    font-size: 32px;
+  }
+}
+
+.headerpage {
+  background: linear-gradient(-30deg, #145bf7, #52befe);
 }
 </style>
diff --git a/src/views/home/home_homePage.vue b/src/views/home/home_homePage.vue
index d4bd4c8..9761a73 100644
--- a/src/views/home/home_homePage.vue
+++ b/src/views/home/home_homePage.vue
@@ -304,7 +304,8 @@
   #HeaderBG {
     width: 100%;
     height: 410px;
-    background: linear-gradient(90deg, #3d84ff 0%, #53c0fe 100%);
+    // background: linear-gradient(90deg, #3d84ff 0%, #53c0fe 100%);
+    background: url('@/assets/images/login/head_img.png');
     box-sizing: border-box;
     padding-top: 30px;
     #HeaderTop {
@@ -318,11 +319,12 @@
       #HeaderName {
         height: 90px;
         line-height: 120px;
-        font-family: PingFang SC;
+        font-family: SourceHanSansCN-Heavy;
         font-weight: bold;
-        font-size: 34px;
-        color: #ffffff;
+        font-size: 50px;
+        color: #ffffffff;
         width: calc(100% - 110px);
+        font-style: oblique;
       }
       #locationName {
         height: 70px;
diff --git a/src/views/login.vue b/src/views/login.vue
index 8174527..ab764f6 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -172,11 +172,12 @@
     .van-cell {
       margin: 30px auto;
       border-radius: 40px;
-      background: transparent;
+      background-color: #ffffffff;
+      // background: transparent;
 
       .van-field__control {
         padding-left: 20px;
-        color: #fff;
+        color: #000;
       }
       input:-internal-autofill-selected {
         background: transparent !important;
@@ -190,7 +191,7 @@
         -webkit-transition: color 11111s ease-out, background-color 111111s ease-out;
       }
       .van-icon:before {
-        color: #fff;
+        color: #1680ffff;
       }
     }
     .van-checkbox {
diff --git a/src/views/xuncha/TaskInspection.vue b/src/views/xuncha/TaskInspection.vue
index 606f35f..e197f64 100644
--- a/src/views/xuncha/TaskInspection.vue
+++ b/src/views/xuncha/TaskInspection.vue
@@ -284,8 +284,8 @@
 const getTaskTypeNum = () => {
   let query = {
     taskUserId: pinias.userNo,
-
     taskName: AllData.searchV,
+    statusList: AllData.ActiveID == 'to_start' ? 'to_start,expired' : AllData.ActiveID,
   };
   status_statistics(query).then((res) => {
     if (res && res.code == 200) {
@@ -353,7 +353,7 @@
     overflow: auto;
     box-sizing: border-box;
     padding: 30px;
-
+    // background: yellowgreen;
     .dataList {
       width: 100%;
       height: auto;
diff --git a/src/views/xuncha/components/inspection.vue b/src/views/xuncha/components/inspection.vue
index ec82515..4f8309a 100644
--- a/src/views/xuncha/components/inspection.vue
+++ b/src/views/xuncha/components/inspection.vue
@@ -36,17 +36,15 @@
 <script setup>
 import { reactive, ref, getCurrentInstance, watch, onMounted, onBeforeUnmount } from 'vue';
 import { timestampToTime, checkUserSystem, getCurrentPositon } from '@/utils/common.js';
-
-import { patrolTaskFinishPatrol, patrolTaskId } from '@/api/xuncha';
-
+import { patrolTaskFinishPatrol, PatrolTaskID } from '@/api/xuncha';
+import CoordTransform from '@/utils/gis/CoorTransform.js';
 import WKT from 'terraformer-wkt-parser';
-
 import { useRouter, useRoute } from 'vue-router';
-
+import { useStore } from '@/pinia/store.js';
 import TaskForm from './TaskForm'; // 表单组件
 const router = useRouter();
 const route = useRoute();
-// const pinias = useStore();
+const pinias = useStore();
 
 const props = defineProps({
   patrolLogId: String,
@@ -170,6 +168,96 @@
     window.webkit.messageHandlers.stopLocation.postMessage({ data: { refid: props.patrolLogId } });
   }
 }
+// 开始巡检--阶段性获取经纬度变化信息
+const startGetPosition = () => {
+  AllData.IntervalKry = setInterval(() => {
+    getPostionNow();
+  }, 3000);
+};
+/**
+ * 获取当前定位
+ */
+const getPostionNow = () => {
+  AllData.PostionValue = {
+    patrolDatetime: null,
+    lonLat: null,
+    refType: null,
+    refid: null,
+    userName: null,
+  };
+  getCurrentPositon((lng, lat, address) => {
+    // console.log('获取安卓定位参数--', address);
+    let timer = timestampToTime(Date.now());
+    let NewLonLat = CoordTransform.gcj02towgs84(Number(lng), Number(lat));
+    AllData.PostionValue = {
+      patrolDatetime: timer,
+      lonLat: NewLonLat[0] + ',' + NewLonLat[1],
+      refType: 'patrolLog',
+      refid: AllData.patrolLogId,
+      userName: pinias.userName,
+    };
+  });
+};
+/**
+ * 获取当前巡检任务详情
+ */
+const getInspectionInfo = (id) => {
+  PatrolTaskID(id).then((res) => {
+    if (res && res.code == 200) {
+      // 保存当前巡检ID
+      AllData.taskID = res.data.id;
+      console.log(AllData.taskID, 'AllData.taskID');
+      // 保存当前巡查段编号
+      // AllData.patrolSectionId = res.data.patrolSectionId;
+      // 保存日志编号
+      // AllData.patrolLogId = res.data.patrolLogId;
+      // 保存巡检记录
+      // AllData.patrolPathLngLat = res.data.patrolPathLngLat;
+      // AllData.patrolLogId = '1630380590036803588'
+      // 标题时间内容拼接
+      let d = new Date();
+      AllData.NoticeFont = `${d.getFullYear()}年${d.getMonth() + 1}月${d.getDate()}日开始${
+        res.data.taskName
+      }的巡查工作`;
+      startGetPosition(); //开始获取原生定位
+      sendSocketMessage(); //安卓、ios原生发送websocket
+    }
+  });
+};
+
+// 通过socket 发送数据
+const sendSocketMessage = (msg) => {
+  let systems = checkUserSystem();
+  if (systems == 'Android') {
+    console.log('安卓发送websocket---');
+    let timer = timestampToTime(Date.now());
+    let initObj = {
+      patrolDatetime: timer,
+      lonLat: '',
+      refType: 'patrolLog',
+      refid: AllData.patrolLogId,
+      userName: pinias.userName,
+    };
+    console.log('安卓发送websocket---', initObj);
+    //给Android发送参数，通知给后端发送websocket
+    window.android.initwebSocket(JSON.stringify(initObj));
+  } else if (systems == 'IOS') {
+    console.log('IOS开始发送websocket---');
+    let timer = timestampToTime(Date.now());
+    let initObj = {
+      callId: 'sendCurrentLocationIOS',
+      data: {
+        patrolDatetime: timer,
+        lonLat: '',
+        refType: 'patrolLog',
+        refid: AllData.patrolLogId,
+        userName: pinias.userName,
+      },
+    };
+    //给ios发送参数，通知给后端发送websocket
+    window.webkit.messageHandlers.sendLocation.postMessage(initObj);
+  }
+};
 
 watch(
   route,
@@ -178,6 +266,8 @@
     setTimeout(() => {
       //option为object类型，会序列化上个页面传递的参数
       console.log('传递的参数222--', route.query.id); //打印出上个页面传递的参数。
+      //获取当前巡检任务详情
+      getInspectionInfo(route.query.id);
     });
   },
   { immediate: true }
diff --git a/vite.config.js b/vite.config.js
index d43716a..f43437e 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -10,8 +10,8 @@
 const Timestamp = new Date().getTime(); //随机时间戳
 
 // const targetUrl = 'http://192.168.16.100:7200'; //陈迁
-// const targetUrl = 'http://192.168.1.6:7300'; //杨辉
-const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
+const targetUrl = 'http://192.168.20.52:7300'; //杨辉
+// const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
 
 export default defineConfig({
   // 地址是和router中和ngix中配置的名称一致